Merge pull request #957 from gerhardol/feature/play-crash

Play Console crashes
jonasoreland · Aug 10, 2020 · ba282ac · ba282ac
2 parents 51ccb4b + 22e2205
commit ba282ac
Show file tree

Hide file tree

Showing 7 changed files with 146 additions and 32 deletions.
diff --git a/app/assets/changes.html b/app/assets/changes.html
@@ -5,6 +5,13 @@
 </head>
 <body>
 <h1>What's new</h1>
+<h2>v2.2.1.0</h2>
+<p>
+<ul>
+    <li>#957 Transifex lt</li>
+    <li>#957 Pebble crash at init</li>
+    <li>#957 MapViewer crash with only one marker</li>
+</ul>
 <h2>v2.2.0.3</h2>
 <p>
 <ul>
@@ -623,4 +630,4 @@ <h2>v1.12</h2>
     <li>Add audio mute feature (contributed by Calle Sollander)</li>
 </ul>
 </body>
-</html>
+</html>
diff --git a/app/res/values-lt/cues.xml b/app/res/values-lt/cues.xml
@@ -65,12 +65,30 @@
     <item quantity="many">%s mylios</item>
     <item quantity="other">%s mylios</item>
   </plurals>
+  <plurals name="cue_kilometers_per_hour">
+    <item quantity="one">%s kilometras per valandą</item>
+    <item quantity="few">%s kilometrai per valandą</item>
+    <item quantity="many">%s kilometrų per valandą</item>
+    <item quantity="other">%s kilometrai per valandą</item>
+  </plurals>
+  <plurals name="cue_miles_per_hour">
+    <item quantity="one">%s mylia per valandą</item>
+    <item quantity="few">%s mylios per valandą</item>
+    <item quantity="many">%s mylių per valandą</item>
+    <item quantity="other">%s mylios per valandą</item>
+  </plurals>
   <plurals name="cue_bpm">
     <item quantity="one">%d bpm</item>
     <item quantity="few">%d bpm</item>
     <item quantity="many">%d bpm</item>
     <item quantity="other">%d bpm</item>
   </plurals>
+  <plurals name="cue_rpm">
+    <item quantity="one">%d dpm</item>
+    <item quantity="few">%d dpm</item>
+    <item quantity="many">%d dpm</item>
+    <item quantity="other">%d dpm</item>
+  </plurals>
   <string name="cue_activity_paused">veikla pristabdyta</string>
   <string name="cue_activity_resumed">veikla tęsiama</string>
   <string name="cue_activity_stopped">veikla sustabdyta</string>

diff --git a/app/src/main/org/runnerup/tracker/component/TrackerPebble.java b/app/src/main/org/runnerup/tracker/component/TrackerPebble.java
@@ -22,6 +22,8 @@
 import android.graphics.BitmapFactory;
 import android.preference.PreferenceManager;
 import androidx.localbroadcastmanager.content.LocalBroadcastManager;
+
+import android.util.Log;
 import android.widget.Toast;
 
 import com.getpebble.android.kit.Constants;
@@ -98,8 +100,7 @@ public void receiveData(final Context pebbleContext, final int transactionId, fi
     }
 
     private void sendLocalBroadcast(String action) {
-        Intent intent = new Intent()
-                .setAction(action);
+        Intent intent = new Intent().setAction(action);
         LocalBroadcastManager.getInstance(context).sendBroadcast(intent);
     }
 
@@ -111,7 +112,14 @@ public void onBind(HashMap<String, Object> bindValues) {
 
     @Override
     public boolean isConnected() {
-        return PebbleKit.isWatchConnected(context);
+        try {
+            return PebbleKit.isWatchConnected(context);
+        } catch (NullPointerException ex) {
+            // Occasional crashes in Play console
+            Toast.makeText(context, "Failure for isWatchConnected: " + ex.toString(), Toast.LENGTH_LONG).show();
+            Log.w(getName(), "Failure for isWatchConnected: " + ex.toString());
+        }
+        return false;
     }
 
     @Override

diff --git a/app/src/main/org/runnerup/util/MapWrapper.java b/app/src/main/org/runnerup/util/MapWrapper.java
@@ -216,18 +216,24 @@ protected Route doInBackground(LoadParam... params) {
             }
             ll.close();
 
-            //Track is normally ended with a pause not always followed by an end
+            // Track is normally ended with a pause, not always followed by an end
             // Ignore the pause
-            if (!route.markers.isEmpty()) {
+            if (route.markers.size() >= 2) {
                 SymbolOptions m = route.markers.get(route.markers.size() - 2);
                 SymbolOptions me = route.markers.get(route.markers.size() - 1);
                 if (m.getIconImage().equals(((Integer) DB.LOCATION.TYPE_PAUSE).toString() )&&
                         me.getIconImage().equals(((Integer) DB.LOCATION.TYPE_END).toString())) {
                     route.markers.remove(route.markers.size() - 2);
-                } else if (me.getIconImage().equals(((Integer) DB.LOCATION.TYPE_PAUSE).toString() )) {
+                }
+            }
+
+            if (route.markers.size() >= 1) {
+                SymbolOptions me = route.markers.get(route.markers.size() - 1);
+                if (me.getIconImage().equals(((Integer) DB.LOCATION.TYPE_PAUSE).toString() )) {
                     me.withIconImage(((Integer) DB.LOCATION.TYPE_END).toString());
                 }
             }
+
             return route;
         }
 

diff --git a/build.gradle b/build.gradle
@@ -30,8 +30,8 @@ project.ext {
     mockitoVersion = '2.3.7'
 
     //The Git tag for the release must be identical for F-Droid
-    versionName = '2.2.0.3'
-    versionCode = 253
+    versionName = '2.2.1.0'
+    versionCode = 254
     latestBaseVersionCode = 15000000
 
     travisBuild = System.getenv("TRAVIS") == "true"

diff --git a/common/src/main/res/values-lt/array.xml b/common/src/main/res/values-lt/array.xml
@@ -4,6 +4,10 @@
     <item>Mylios</item>
     <item>Kilometrai</item>
   </string-array>
+  <string-array name="speedUnitEntries">
+    <item>Tempas</item>
+    <item>Greitis</item>
+  </string-array>
   <!--Note: keep in same order as DB.INTENSITY-->
   <string-array name="step_intensity_types">
     <item>Apšilimas</item>
@@ -18,7 +22,7 @@
     <item>Atstumas</item>
   </string-array>
   <string-array name="target_types">
-    <item>Nieko</item>
+    <item>Nėra</item>
     <item>Tempas</item>
     <item>Širdies ritmo zona</item>
   </string-array>
@@ -39,4 +43,8 @@
     <item>Moteris</item>
   </string-array>
   <!--Note: keep in same order as DB-->
+  <string-array name="path_simplification_algorithm_titles">
+    <item>Radialinis atstumas (greitas)</item>
+    <item>Ramer-Douglas-Peucker (aukštos kokybės)</item>
+  </string-array>
 </resources>