Merge Group 1: Sprint 3

build.gradle

@@ -6,7 +6,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.3.1'
+        classpath 'com.android.tools.build:gradle:8.1.4'
     }
 }
 

src/main/java/de/dennisguse/opentracks/TrackListActivity.java

@@ -47,6 +47,7 @@
 import de.dennisguse.opentracks.data.ContentProviderUtils;
 import de.dennisguse.opentracks.data.models.Track;
 import de.dennisguse.opentracks.databinding.TrackListBinding;
+import de.dennisguse.opentracks.databinding.TrackRecordingBinding;
 import de.dennisguse.opentracks.services.RecordingStatus;
 import de.dennisguse.opentracks.services.TrackRecordingService;
 import de.dennisguse.opentracks.services.TrackRecordingServiceConnection;
@@ -81,6 +82,8 @@ public class TrackListActivity extends AbstractTrackDeleteActivity implements Co
 
     private TrackListBinding viewBinding;
 
+    private TrackRecordingBinding recordingBinding;
+
     // Preferences
     private UnitSystem unitSystem = UnitSystem.defaultUnitSystem();
 
@@ -150,6 +153,8 @@ protected void onCreate(Bundle savedInstanceState) {
 
         requestRequiredPermissions();
 
+        recordingBinding = TrackRecordingBinding.inflate(getLayoutInflater());
+
         recordingStatusConnection = new TrackRecordingServiceConnection(bindChangedCallback);
 
         viewBinding.friendsButton.setOnClickListener((view)->startActivity(IntentUtils.newIntent(this, FriendsActivity.class)));
@@ -158,6 +163,14 @@ protected void onCreate(Bundle savedInstanceState) {
         viewBinding.leaderboardButton.setOnClickListener((view) -> startActivity(IntentUtils.newIntent(this, LeaderboardActivity.class)));
         viewBinding.sensorStartButton.setOnClickListener((view) -> {
             LocationManager locationManager = (LocationManager) this.getSystemService(Context.LOCATION_SERVICE);
+
+            //Check if location is actually null
+/*            if (locationManager == null) {
+                // Handle the scenario where LocationManager is null
+                Toast.makeText(this, "Unable to access location services.", Toast.LENGTH_SHORT).show();
+                return;
+            }*/
+
             if (locationManager != null && !locationManager.isProviderEnabled(LocationManager.GPS_PROVIDER)) {
                 startActivity(new Intent(Settings.ACTION_LOCATION_SOURCE_SETTINGS));
             } else {
@@ -191,6 +204,19 @@ protected void onCreate(Bundle savedInstanceState) {
                 startActivity(newIntent);
             });
         });
+
+        recordingBinding.trackRecordingPause.setOnLongClickListener((view) -> {
+            if (!recordingStatus.isRecording()) {
+                return false;
+            }
+
+            // Recording -> Pause
+            ActivityUtils.vibrate(this, 1000);
+            updateGpsMenuItem(true, false);
+            recordingBinding.trackRecordingPause.setImageResource(R.drawable.ic_button_pause);
+            return true;
+        });
+
         viewBinding.trackListFabAction.setOnLongClickListener((view) -> {
             if (!recordingStatus.isRecording()) {
                 return false;
@@ -200,8 +226,23 @@ protected void onCreate(Bundle savedInstanceState) {
             ActivityUtils.vibrate(this, 1000);
             updateGpsMenuItem(false, false);
             recordingStatusConnection.stopRecording(TrackListActivity.this);
-            viewBinding.trackListFabAction.setImageResource(R.drawable.ic_baseline_record_24);
-            viewBinding.trackListFabAction.setBackgroundTintList(ContextCompat.getColorStateList(this, R.color.red_dark));
+/*            viewBinding.trackListFabAction.setImageResource(R.drawable.ic_baseline_record_24);
+            viewBinding.trackListFabAction.setBackgroundTintList(ContextCompat.getColorStateList(this, R.color.red_dark));*/
+            viewBinding.trackListFabAction.setImageResource(R.drawable.ic_button_start_arrow);
+            return true;
+        });
+
+        recordingBinding.trackRecordingPause.setOnLongClickListener((view) -> {
+            if (recordingStatus.isRecording()) {
+                return false;
+            }
+
+            // Pause -> Recording
+            ActivityUtils.vibrate(this, 1000);
+            updateGpsMenuItem(true, true);
+            TrackRecordingServiceConnection.execute(this, (service, connection) -> {
+                service.resumeTrack(getRecordingTrackId());
+            });
             return true;
         });
 
@@ -441,8 +482,9 @@ public void onGpsStatusChanged(GpsStatusValue newStatus) {
     }
 
     private void setFloatButton() {
-        viewBinding.trackListFabAction.setImageResource(recordingStatus.isRecording() ? R.drawable.ic_baseline_stop_24 : R.drawable.ic_baseline_record_24);
-        viewBinding.trackListFabAction.setBackgroundTintList(ContextCompat.getColorStateList(this, recordingStatus.isRecording() ? R.color.opentracks : R.color.red_dark));
+//        viewBinding.trackListFabAction.setImageResource(recordingStatus.isRecording() ? R.drawable.ic_baseline_stop_24 : R.drawable.ic_baseline_record_24);
+        viewBinding.trackListFabAction.setImageResource(recordingStatus.isRecording() ? R.drawable.ic_button_stop : R.drawable.ic_button_start_arrow);
+//        viewBinding.trackListFabAction.setBackgroundTintList(ContextCompat.getColorStateList(this, recordingStatus.isRecording() ? R.color.opentracks : R.color.red_dark));
     }
 
     private void onRecordingStatusChanged(RecordingStatus status) {

src/main/java/de/dennisguse/opentracks/TrackRecordedActivity.java

@@ -147,7 +147,6 @@ private void saveSelectedValue(int value) {
     @Override
     protected void onStart() {
         super.onStart();
-
         trackDataHub.start();
     }
 

src/main/java/de/dennisguse/opentracks/TrackRecordingActivity.java

@@ -76,6 +76,8 @@ public class TrackRecordingActivity extends AbstractActivity implements ChooseAc
 
     private RecordingStatus recordingStatus = TrackRecordingService.STATUS_DEFAULT;
 
+    public Track track;
+
     private final TrackRecordingServiceConnection.Callback bindChangedCallback = (service, unused) -> {
         service.getRecordingStatusObservable()
                 .observe(TrackRecordingActivity.this, this::onRecordingStatusChanged);
@@ -104,7 +106,7 @@ public class TrackRecordingActivity extends AbstractActivity implements ChooseAc
         }
         if (key == null) return;
 
-        runOnUiThread(TrackRecordingActivity.this::invalidateOptionsMenu); //TODO Should not be necessary
+//        runOnUiThread(TrackRecordingActivity.this::invalidateOptionsMenu); //TODO Should not be necessary
     };
 
     @Override
@@ -132,22 +134,47 @@ protected void onCreate(Bundle savedInstanceState) {
             viewBinding.trackDetailActivityViewPager.setCurrentItem(savedInstanceState.getInt(CURRENT_TAB_TAG_KEY));
         }
 
-        viewBinding.trackRecordingFabAction.setImageResource(R.drawable.ic_baseline_stop_24);
+/*        viewBinding.trackRecordingFabAction.setImageResource(R.drawable.ic_baseline_stop_24);
         viewBinding.trackRecordingFabAction.setBackgroundTintList(ContextCompat.getColorStateList(this, R.color.opentracks));
-        viewBinding.trackRecordingFabAction.setBackgroundColor(ContextCompat.getColor(this, R.color.opentracks));
-        viewBinding.trackRecordingFabAction.setOnLongClickListener((view) -> {
-            ActivityUtils.vibrate(this, 1000);
+        viewBinding.trackRecordingFabAction.setBackgroundColor(ContextCompat.getColor(this, R.color.opentracks));*/
+
+
+        viewBinding.trackRecordingFabAction.setImageResource(R.drawable.ic_button_stop);
+
+        viewBinding.trackRecordingFabAction.setOnClickListener((view) -> {
+            ActivityUtils.vibrate(this, 200);
             trackRecordingServiceConnection.stopRecording(TrackRecordingActivity.this);
+            String time_setting = getString(R.string.stats_time_units_key);
+            String[] parts = time_setting.split("\\s+");
+            String firstPart = parts[0];
+//            int time_key = Integer.parseInt(firstPart);
+//            long totalTimeSeconds = track.getTrackStatistics().getTotalTime().getSeconds();
+//            if(totalTimeSeconds < time_key) {
+//                Log.i("HELLO", "HELLO");
+//            }
             Intent newIntent = IntentUtils.newIntent(TrackRecordingActivity.this, TrackStoppedActivity.class)
                     .putExtra(TrackStoppedActivity.EXTRA_TRACK_ID, trackId);
             startActivity(newIntent);
             overridePendingTransition(android.R.anim.fade_in, android.R.anim.fade_out);
             finish();
-            return true;
         });
-        viewBinding.trackRecordingFabAction.setOnClickListener((view) -> Toast.makeText(TrackRecordingActivity.this, getString(R.string.hold_to_stop), Toast.LENGTH_LONG).show());
 
-        setSupportActionBar(viewBinding.bottomAppBar);
+        viewBinding.trackRecordingPause.setImageResource(R.drawable.ic_baseline_record_pause);
+        viewBinding.trackRecordingPause.setOnClickListener((view) -> {
+            ActivityUtils.vibrate(this, 200);
+            trackRecordingServiceConnection.pauseRecording(TrackRecordingActivity.this);
+            view.setVisibility(View.GONE);
+        });
+
+        viewBinding.trackRecordingResume.setImageResource(R.drawable.ic_button_resume);
+        viewBinding.trackRecordingResume.setOnClickListener((view) -> {
+            ActivityUtils.vibrate(this, 200);
+            trackRecordingServiceConnection.resumeRecording(trackId);
+            viewBinding.trackRecordingPause.setVisibility(View.VISIBLE);
+        });
+
+
+                setSupportActionBar(viewBinding.bottomAppBar);
     }
 
     @Override

src/main/java/de/dennisguse/opentracks/TrackStoppedActivity.java

@@ -6,6 +6,9 @@
 import android.util.Pair;
 import android.view.View;
 import android.widget.ArrayAdapter;
+import android.widget.Toast;
+
+import androidx.preference.ListPreference;
 
 import de.dennisguse.opentracks.data.ContentProviderUtils;
 import de.dennisguse.opentracks.data.models.ActivityType;
@@ -14,13 +17,18 @@
 import de.dennisguse.opentracks.data.models.Track;
 import de.dennisguse.opentracks.databinding.TrackStoppedBinding;
 import de.dennisguse.opentracks.fragments.ChooseActivityTypeDialogFragment;
+import de.dennisguse.opentracks.services.TrackDeleteService;
 import de.dennisguse.opentracks.services.TrackRecordingServiceConnection;
+import de.dennisguse.opentracks.settings.DefaultsSettingsFragment;
 import de.dennisguse.opentracks.settings.PreferencesUtils;
+import de.dennisguse.opentracks.settings.TimeUnitSystem;
+import de.dennisguse.opentracks.stats.TrackStatistics;
 import de.dennisguse.opentracks.ui.aggregatedStatistics.ConfirmDeleteDialogFragment;
 import de.dennisguse.opentracks.util.ExportUtils;
 import de.dennisguse.opentracks.util.IntentUtils;
 import de.dennisguse.opentracks.util.StringUtils;
 import de.dennisguse.opentracks.util.TrackUtils;
+import androidx.preference.PreferenceManager;
 
 public class TrackStoppedActivity extends AbstractTrackDeleteActivity implements ChooseActivityTypeDialogFragment.ChooseActivityTypeCaller {
 
@@ -34,6 +42,10 @@ public class TrackStoppedActivity extends AbstractTrackDeleteActivity implements
 
     private boolean isDiscarding = false;
 
+    public ListPreference statsTimePreferences;
+    public DefaultsSettingsFragment dfs;
+
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -91,6 +103,27 @@ protected void onCreate(Bundle savedInstanceState) {
         }
 
         viewBinding.finishButton.setOnClickListener(v -> {
+            TimeUnitSystem timeUnitSystem = PreferencesUtils.getTimeUnit();
+            Log.i("timeUnitSystem", timeUnitSystem.toString());
+
+            String customTime = DefaultsSettingsFragment.getCustomTime(this);
+            System.out.println("CustomTime value: " + customTime);
+            if (customTime != null) {
+                System.out.println("Custom time valid");
+                int time_key = Integer.parseInt(customTime);
+                long totalTimeSeconds = track.getTrackStatistics().getTotalTime().getSeconds();
+                if(totalTimeSeconds < time_key) {
+                    System.out.println("Track deleted");
+                    onConfirmDeleteDone(trackId);
+                }
+            } else {
+                String[] parts = timeUnitSystem.toString().split("_");
+                int time_key = convertInt(parts[0]);
+                long totalTimeSeconds = track.getTrackStatistics().getTotalTime().getSeconds();
+                if (totalTimeSeconds < time_key) {
+                    onConfirmDeleteDone(trackId);
+                }
+            }
             storeTrackMetaData(contentProviderUtils, track);
             ExportUtils.postWorkoutExport(this, trackId);
             finish();
@@ -110,6 +143,18 @@ private void storeTrackMetaData(ContentProviderUtils contentProviderUtils, Track
                 contentProviderUtils);
     }
 
+    public int convertInt(String s) {
+        int val = 0;
+        if (s.equals("FIVE")) {
+            val = 5;
+        } else if (s.equals("TEN")) {
+            val = 10;
+        } else if (s.equals("TWENTY")) {
+            val = 20;
+        }
+        return val;
+    }
+
     @Override
     public void onBackPressed() {
         if (isDiscarding) {

src/main/java/de/dennisguse/opentracks/fragments/StatisticsRecordedFragment.java

@@ -25,11 +25,15 @@
 import android.view.View;
 import android.view.ViewGroup;
 
+import android.widget.Toast;
+
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.core.content.ContextCompat;
 import androidx.fragment.app.Fragment;
 
+import java.util.Objects;
+
 import de.dennisguse.opentracks.R;
 import de.dennisguse.opentracks.TrackRecordedActivity;
 import de.dennisguse.opentracks.data.ContentProviderUtils;
@@ -138,7 +142,7 @@ public void onDestroyView() {
     }
 
     public void loadStatistics() {
-        if (isResumed()) {
+        if (isResumed() && getActivity() != null) {
             getActivity().runOnUiThread(() -> {
                 if (isResumed()) {
                     Track track = contentProviderUtils.getTrack(trackId);
@@ -164,6 +168,10 @@ public void loadStatistics() {
                 }
             });
         }
+        //add logs
+        else {
+            Log.w(TAG, "Activity is null when loading statistics");
+        }
     }
 
     private void loadTrackDescription(@NonNull Track track) {
@@ -173,6 +181,17 @@ private void loadTrackDescription(@NonNull Track track) {
     }
 
     private void updateUI() {
+
+        // Check if track is null
+        if (track == null) {
+            Log.e(TAG, "track cannot be null");
+            Toast.makeText(getContext(), "Error: Track cannot be null. Please retry.", Toast.LENGTH_SHORT).show();
+
+            requireActivity().finish();
+            return;
+        }
+
+
         TrackStatistics trackStatistics = track.getTrackStatistics();
         // Set total distance
         {

src/main/java/de/dennisguse/opentracks/services/TrackRecordingManager.java

@@ -109,6 +109,17 @@ boolean resumeExistingTrack(@NonNull Track.Id resumeTrackId) {
         return true;
     }
 
+    void pauseCurrentTrack() {
+        if (trackId == null) {
+            Log.w(TAG, "No trackId to pause.");
+            return;
+        }
+
+        TrackPoint segmentEnd = trackPointCreator.createSegmentEnd();
+        insertTrackPoint(segmentEnd, true);
+        handler.removeCallbacks(ON_IDLE);
+    }
+
     void endCurrentTrack() {
         TrackPoint segmentEnd = trackPointCreator.createSegmentEnd();
         insertTrackPoint(segmentEnd, true);