Fix: Several crashes reported to Play Store, bump version for Beta to…

… v2.33.153

EngineDriver/src/main/AndroidManifest.xml

@@ -2,8 +2,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     package="jmri.enginedriver"
-    android:versionCode="152"
-    android:versionName="2.33.152" android:installLocation="auto">
+    android:versionCode="153"
+    android:versionName="2.33.153" android:installLocation="auto">
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" tools:ignore="ScopedStorage" />

EngineDriver/src/main/assets/about_page.html

@@ -25,7 +25,8 @@ <h1>Engine Driver Throttle for Android</h1>
     <li>Fix: manual turnout buttons not enabling</li>
     <li>Fix: tolerate FKeys > 28</li>
     <li>New: Preference to alter the Heartbeat Response Factor (percentage of the heartbeat period)</li>
-    <li>New: Preference to have the App Icon an App Name on the Action Bar act as an emergency stop</li>
+    <li>New: Preference to have the App Icon and App Name act as an emergency stop</li>
+    <li>Fix: Several crashes reported to Play Store</li>
 </ul>
 <p><em><a
         href="https://raw.githubusercontent.com/JMRI/EngineDriver/master/changelog-and-todo-list.txt"

EngineDriver/src/main/java/jmri/enginedriver/reconnect_status.java

@@ -213,7 +213,7 @@ protected void attachBaseContext(Context base) {
     // common startActivity()
     // used for swipes for the main activities only - Throttle, Turnouts, Routs, Web
     protected void startACoreActivity(Activity activity, Intent in, boolean swipe, float deltaX) {
-        if (activity != null) {
+        if (activity != null && in != null) {
             in.setFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT);
             startActivity(in);
             overridePendingTransition(mainapp.getFadeIn(swipe, deltaX), mainapp.getFadeOut(swipe, deltaX));

EngineDriver/src/main/java/jmri/enginedriver/routes.java

@@ -806,7 +806,7 @@ public boolean dispatchKeyEvent(KeyEvent event) {
     // common startActivity()
     // used for swipes for the main activities only - Throttle, Turnouts, Routs, Web
     void startACoreActivity(Activity activity, Intent in, boolean swipe, float deltaX) {
-        if (activity != null) {
+        if (activity != null && in != null) {
             in.setFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT);
             startActivity(in);
             overridePendingTransition(mainapp.getFadeIn(swipe, deltaX), mainapp.getFadeOut(swipe, deltaX));

EngineDriver/src/main/java/jmri/enginedriver/threaded_application.java

@@ -1406,7 +1406,7 @@ private void process_consist_list(String response_str) {
             Log.d("Engine_Driver", "t_a: consist header, addr='" + consist_addr
                     + "', name='" + consist_name + "', desc='" + consist_desc + "'");
             //don't add empty consists to list
-            if (consist_desc.length() > 0) {
+            if (consist_entries != null && consist_desc.length() > 0) {
                 consist_entries.put(consist_addr, consist_desc.toString());
             } else {
                 Log.d("Engine_Driver", "skipping empty consist '" + consist_name + "'");

EngineDriver/src/main/java/jmri/enginedriver/throttle.java

@@ -7906,9 +7906,9 @@ protected void loadSounds() {
     }
 
     // common startActivity()
-    // used for swipes for the main activities only - Throttle, Turnouts, Routs, Web
+    // used for swipes for the main activities only - Throttle, Turnouts, Routes, Web
     protected void startACoreActivity(Activity activity, Intent in, boolean swipe, float deltaX) {
-        if (activity != null) {
+        if (activity != null && in != null) {
             in.setFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT);
             startActivity(in);
             overridePendingTransition(mainapp.getFadeIn(swipe, deltaX), mainapp.getFadeOut(swipe, deltaX));

EngineDriver/src/main/java/jmri/enginedriver/turnouts.java

@@ -1448,7 +1448,7 @@ public boolean dispatchKeyEvent(KeyEvent event) {
     // common startActivity()
     // used for swipes for the main activities only - Throttle, Turnouts, Routs, Web
     void startACoreActivity(Activity activity, Intent in, boolean swipe, float deltaX) {
-        if (activity != null) {
+        if (activity != null && in != null) {
             in.setFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT);
             startActivity(in);
             overridePendingTransition(mainapp.getFadeIn(swipe, deltaX), mainapp.getFadeOut(swipe, deltaX));

EngineDriver/src/main/java/jmri/enginedriver/web_activity.java

@@ -750,7 +750,7 @@ public boolean dispatchKeyEvent(KeyEvent event) {
     // common startActivity()
     // used for swipes for the main activities only - Throttle, Turnouts, Routs, Web
     void startACoreActivity(Activity activity, Intent in, boolean swipe, float deltaX) {
-        if (activity != null) {
+        if (activity != null && in != null) {
             in.setFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT);
             startActivity(in);
             overridePendingTransition(mainapp.getFadeIn(swipe, deltaX), mainapp.getFadeOut(swipe, deltaX));

EngineDriver/src/main/res/values/strings.xml

@@ -511,7 +511,7 @@
     <string name="prefSelectedLocoIndicatorDefaultValue" translatable="false">None</string>  <!-- DO NOT TRANSLATE -->
 
     <string name="prefAppIconActionTitle">App Icon Action</string>
-    <string name="prefAppIconActionSummary">What happens when you click the App Icon aor App Name on the Action Bar.</string>
+    <string name="prefAppIconActionSummary">What happens when you click the App Icon or App Name on the Action Bar.</string>
     <string name="prefAppIconActionDefaultValue" translatable="false">None</string>  <!-- DO NOT TRANSLATE -->
 
     <string name="prefDisableVolumeKeysTitle">Disable Volume keys?</string>

changelog-and-todo-list.txt

@@ -7,6 +7,8 @@
  * add some padding to Port heading on Connect
  * Show menu on Disconnect Screen
  * Fix: tolerate FKeys > 28
+ * New: Preference to alter the Heartbeat Response Factor (percentage of the heartbeat period)
+ * New: Preference to have the App Icon and App Name act as an emergency stop
 **Version 2.32.150
  * Fix: soft keyboard stayed up after exit from Loco Select in some conditions
  * Fix: roster icon url / location (broken in 148)