add public api check, fix review comments

OpenTracksApp · Jul 24, 2024 · eed2ff5 · eed2ff5
1 parent aa31db8
commit eed2ff5
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 40 deletions.
diff --git a/src/main/java/de/dennisguse/opentracks/publicapi/CreateMarkerActivity.java b/src/main/java/de/dennisguse/opentracks/publicapi/CreateMarkerActivity.java
@@ -7,6 +7,7 @@
 import android.view.View;
 import android.widget.Toast;
 
+import androidx.annotation.NonNull;
 import androidx.appcompat.app.AppCompatActivity;
 
 import java.time.Instant;
@@ -18,6 +19,7 @@
 import de.dennisguse.opentracks.data.models.TrackPoint;
 import de.dennisguse.opentracks.services.TrackRecordingService;
 import de.dennisguse.opentracks.services.TrackRecordingServiceConnection;
+import de.dennisguse.opentracks.settings.PreferencesUtils;
 import de.dennisguse.opentracks.ui.markers.MarkerEditActivity;
 import de.dennisguse.opentracks.util.IntentUtils;
 
@@ -35,22 +37,15 @@ public class CreateMarkerActivity extends AppCompatActivity {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
-        // TODO: do we want to check if public API is enabled?
-
-        Track.Id trackId;
-        if (getIntent().hasExtra(EXTRA_TRACK_ID)) {
-            trackId = new Track.Id(getIntent().getLongExtra(EXTRA_TRACK_ID, 0L));
-        } else {
-            trackId = null;
-        }
-        TrackPoint trackPoint;
-        if (getIntent().hasExtra(EXTRA_LOCATION)) {
-            Location location = getIntent().getParcelableExtra(EXTRA_LOCATION);
-            trackPoint = new TrackPoint(location, Instant.now());
-        } else {
-            trackPoint = null;
+        if (!PreferencesUtils.isPublicAPIenabled()) {
+            Toast.makeText(this, R.string.publicapi_disabled, Toast.LENGTH_LONG).show();
+            finish();
+            return;
         }
 
+        Track.Id trackId = new Track.Id(getIntent().getLongExtra(EXTRA_TRACK_ID, 0L));
+        TrackPoint trackPoint = new TrackPoint(getIntent().<Location>getParcelableExtra(EXTRA_LOCATION), Instant.now());
+
         TrackRecordingServiceConnection.execute(this, (service, self) -> {
             Marker.Id marker = createNewMarker(trackId, trackPoint, service);
             if (marker == null) {
@@ -67,16 +62,8 @@ protected void onCreate(Bundle savedInstanceState) {
         });
     }
 
-    private Marker.Id createNewMarker(Track.Id trackId, TrackPoint trackPoint, TrackRecordingService trackRecordingService) {
-        try {
-            if (trackPoint == null || trackId == null) {
-                throw new IllegalStateException("TrackPoint or Track.Id is null");
-            }
-            return trackRecordingService.insertMarker("", "", "", null, trackId, trackPoint);
-        } catch (IllegalStateException e) {
-            Log.e(TAG, "Unable to add marker.", e);
-        }
-        return null;
+    private Marker.Id createNewMarker(@NonNull Track.Id trackId, @NonNull TrackPoint trackPoint, TrackRecordingService trackRecordingService) {
+        return trackRecordingService.insertMarker("", "", "", null, trackId, trackPoint);
     }
 
 }
diff --git a/src/main/java/de/dennisguse/opentracks/publicapi/ShowMarkerActivity.java b/src/main/java/de/dennisguse/opentracks/publicapi/ShowMarkerActivity.java
@@ -44,17 +44,10 @@ public class ShowMarkerActivity extends AppCompatActivity {
     protected void onCreate(Bundle bundle) {
         super.onCreate(bundle);
 
-        Marker.Id markerId = null;
-        if (getIntent().hasExtra(EXTRA_MARKER_ID)) {
-            markerId = new Marker.Id(getIntent().getLongExtra(EXTRA_MARKER_ID, 0));
-        }
-        if (markerId == null) {
-            Log.d(TAG, "invalid marker id");
-        } else {
-            Intent intent = IntentUtils.newIntent(this, MarkerDetailActivity.class)
-                    .putExtra(MarkerDetailActivity.EXTRA_MARKER_ID, markerId);
-            startActivity(intent);
-        }
+        Marker.Id markerId = new Marker.Id(getIntent().getLongExtra(EXTRA_MARKER_ID, 0));
+        Intent intent = IntentUtils.newIntent(this, MarkerDetailActivity.class)
+                .putExtra(MarkerDetailActivity.EXTRA_MARKER_ID, markerId);
+        startActivity(intent);
         finish();
     }
 

diff --git a/src/main/java/de/dennisguse/opentracks/services/TrackRecordingService.java b/src/main/java/de/dennisguse/opentracks/services/TrackRecordingService.java
@@ -26,6 +26,7 @@
 import android.util.Log;
 import android.util.Pair;
 
+import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.VisibleForTesting;
 import androidx.core.app.ServiceCompat;
@@ -273,11 +274,7 @@ public void newGpsStatus(GpsStatusValue gpsStatusValue) {
         gpsStatusObservable.postValue(gpsStatusValue);
     }
 
-    public Marker.Id insertMarker(String name, String category, String description, String photoUrl, Track.Id trackId, TrackPoint trackPoint) {
-        if (trackId == null || trackPoint == null) {
-            return null;
-        }
-
+    public Marker.Id insertMarker(String name, String category, String description, String photoUrl, @NonNull Track.Id trackId, @NonNull TrackPoint trackPoint) {
         return trackRecordingManager.insertMarker(name, category, description, photoUrl, trackId, trackPoint);
     }
 

diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
@@ -687,4 +687,5 @@ limitations under the License.
     <string name="settings_announcements_lap_power">Lap power</string>
     <string name="power_x_watt">Power {x, plural,  =1 {1 watt} other {# watts} }</string>
     <string name="power">Power</string>
+    <string name="publicapi_disabled">Public API is disabled</string>
 </resources>