altosdroid: Attempt to avoid some reported altosdroid crashes

Just looking at stack traces, maybe these changes will avoid some problems?

Signed-off-by: Keith Packard <keithp@keithp.com>

diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroidTab.java b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroidTab.java
index 71309897b6751b4bb71878f37e82be88ca759583..ec73f5e3c4ba5f102278719b7ec20ee4a3283ec9 100644 (file)
--- a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroidTab.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroidTab.java
@@ -63,7 +63,10 @@ public abstract class AltosDroidTab extends Fragment implements AltosUnitsListen
                        show(last_telem_state, last_state, last_from_receiver, last_receiver);
                } else
                        ft.hide(this);
-               ft.commitAllowingStateLoss();
+               try {
+                       ft.commitAllowingStateLoss();
+               } catch (IllegalStateException ie) {
+               }
        }
 
        @Override

diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/SetupActivity.java b/altosdroid/src/org/altusmetrum/AltosDroid/SetupActivity.java
index d970fc4f2f3b65de920ac67c551ae4df47556b59..6c2d9d7ae9eefc9758c85361cbf631e7f3569662 100644 (file)
--- a/altosdroid/src/org/altusmetrum/AltosDroid/SetupActivity.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/SetupActivity.java
@@ -256,6 +256,12 @@ public class SetupActivity extends Activity {
        protected void onCreate(Bundle savedInstanceState) {
                super.onCreate(savedInstanceState);
 
+               AltosDebug.init(this);
+               AltosDebug.debug("+++ ON CREATE +++");
+
+               // Initialise preferences
+               AltosDroidPreferences.init(this);
+
                // Setup the window
                requestWindowFeature(Window.FEATURE_INDETERMINATE_PROGRESS);
                setContentView(R.layout.setup);