Merge pull request #190 from shankari/fix_android_strings

Fix android strings
e-mission · May 29, 2021 · f5d10bd · f5d10bd
2 parents e152c94 + bbf5b42
commit f5d10bd
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 11 deletions.
diff --git a/res/android/values/dc_strings.xml b/res/android/values/dc_strings.xml
@@ -2,32 +2,25 @@
 <resources>
     <!-- GeofenceActions -->
     <string name="unable_detect_current_location">Unable to detect current location even after forcing, will retry at next sync</string>
-    <!-- ActivityRecognitionChangeIntentService.java -->
-    <string name="recording_activity">Recording activity </string>
+    <!-- ActivityRecognitionChangeIntentService.java (debug mode only) -->
     <string name="detected_new_activity">Detected new activity %1$s</string>
     <string name="activity_transport">transport</string>
     <string name="activity_cycling">cycling</string>
     <string name="activity_walking">walking</string>
     <string name="activity_still">still</string>
     <string name="activity_unknown">unknown</string>
     <string name="activity_tilting">tilting</string>
-    <!-- GeofenceExitIntentService -->
-    <string name="handling_geofence_exit">Handling geofence exit </string>
-    <!-- LocationChangeIntentService -->
-    <string name="recording_location">Recording location </string>
     <!-- TripDiaryStateMachineReceiver -->
     <string name="new_data_collection_terms">New data collection terms - collection paused until consent</string>
+    <!-- debug mode only -->
     <string name="battery_level">Interact with me! Battery level is %1$d</string>
     <!-- TripDiaryStateMachineService and Ongoing-->
-    <string name="google_connection_suspended">google API client connection suspended %1$s</string>
-    <string name="google_connection_failed">google API client connection failed %1$s</string>
     <string name="success_moving_new_state">Success moving to %1$s</string>
-    <string name="error_creating_geofence">Error %1$d while creating geofence</string>
     <string name="failed_moving_new_state">Failed moving to %1$s</string>
     <string name="location_permission_off_enable">Location permission off, click to enable</string>
     <string name="background_loc_permission_off_enable">Background location permission off, click to enable</string>
     <string name="activity_permission_off_enable">Activity permission off, click to enable</string>
-    <string name="error_location_settings">Error %1$d in location settings</string>
+    <string name="error_location_settings">Error in location settings, click to resolve</string>
     <string name="unknown_error_location_settings">Unknown error while reading location, please check your settings</string>
     <string name="notify_curr_state">In state %1$s</string>
     <!-- TripDiaryStateMachineForegroundService -->

diff --git a/src/android/verification/SensorControlBackgroundChecker.java b/src/android/verification/SensorControlBackgroundChecker.java
@@ -173,7 +173,7 @@ private static void checkLocationSettings(final Context ctxt,
                           // Show the dialog by calling startResolutionForResult(),
                           // and check the result in onActivityResult().
                                     NotificationHelper.createResolveNotification(ctxt, Constants.TRACKING_ERROR_ID,
-                            ctxt.getString(R.string.error_location_settings, exception.getStatusCode()),
+                            ctxt.getString(R.string.error_location_settings),
                             resolvable.getResolution());
                             ctxt.sendBroadcast(new ExplicitIntent(ctxt, R.string.transition_tracking_error));
                         } catch (ClassCastException e) {