git-svn-id: https://openrocket.svn.sourceforge.net/svnroot/openrocket/trunk@807 180e2...

[debian/openrocket] / android / src / net / sf / openrocket / android / rocket / OpenRocketViewer.java

diff --git a/android/src/net/sf/openrocket/android/rocket/OpenRocketViewer.java b/android/src/net/sf/openrocket/android/rocket/OpenRocketViewer.java
index 94beaffe2b410254d635bc1c85d0852feaf1f978..58bb82759458577b5f3ea3069234c930d85358ba 100644 (file)
--- a/android/src/net/sf/openrocket/android/rocket/OpenRocketViewer.java
+++ b/android/src/net/sf/openrocket/android/rocket/OpenRocketViewer.java
@@ -10,6 +10,7 @@ import net.sf.openrocket.android.simulation.SimulationChart;
 import net.sf.openrocket.android.simulation.SimulationViewActivity;\r
 import net.sf.openrocket.android.simulation.SimulationViewFragment;\r
 import net.sf.openrocket.android.util.AndroidLogWrapper;\r
+import net.sf.openrocket.document.OpenRocketDocument;\r
 import net.sf.openrocket.document.Simulation;\r
 import android.app.AlertDialog;\r
 import android.content.Intent;\r
@@ -36,12 +37,24 @@ implements Simulations.OnSimulationSelectedListener
        private final static int TABSIZE = 4;\r
 \r
        private OpenRocketViewerPagerAdapter viewPagerAdapter;\r
+       \r
+       private MenuItem saveAction;\r
 \r
        @Override\r
        protected void onCreate(Bundle savedInstanceState) {\r
                super.onCreate(savedInstanceState);\r
 \r
-               setTitle(CurrentRocketHolder.getCurrentRocket().getRocketDocument().getRocket().getName());\r
+               // If the application sleeps for a long time, the CurrentRocketHolder might get cleaned\r
+               // up.  When this happens, we cannot restore this state, so instead we just\r
+               // go home.\r
+               OpenRocketDocument rocDoc = CurrentRocketHolder.getCurrentRocket().getRocketDocument();\r
+               if ( rocDoc == null ) {\r
+                       AndroidLogWrapper.d(OpenRocketViewer.class, "No document - go home");\r
+                       ActivityHelpers.goHome(this);\r
+                       finish();\r
+                       return;\r
+               }\r
+               setTitle(rocDoc.getRocket().getName());\r
                getSupportActionBar().setHomeButtonEnabled(true);\r
 \r
                setContentView(R.layout.openrocketviewer);\r
@@ -59,10 +72,7 @@ implements Simulations.OnSimulationSelectedListener
        @Override\r
        protected void onResume() {\r
                RocketChangedEventHandler handler = new RocketChangedEventHandler();\r
-               // Fire change notices so the displayed lists get updated.\r
-               // This is primarily because simulations run in the background\r
-               handler.doSimsChanged();\r
-               CurrentRocketHolder.getCurrentRocket().setHandler( handler );\r
+               CurrentRocketHolder.getCurrentRocket().setHandler(handler);\r
                super.onResume();\r
        }\r
 \r
@@ -70,6 +80,7 @@ implements Simulations.OnSimulationSelectedListener
        public boolean onCreateOptionsMenu(Menu menu) {\r
                MenuInflater inflater = getSupportMenuInflater();\r
                inflater.inflate(R.menu.rocket_viewer_option_menu, menu);\r
+               saveAction = menu.findItem(R.id.menu_save);\r
                return true;\r
        }\r
 \r
@@ -85,6 +96,8 @@ implements Simulations.OnSimulationSelectedListener
                        // FIXME - Probably want to open a dialog here.\r
                        try {\r
                                CurrentRocketHolder.getCurrentRocket().saveOpenRocketDocument();\r
+                               saveAction.setVisible(false);\r
+                               invalidateOptionsMenu();\r
                        } catch ( IOException iex ) {\r
                                AndroidLogWrapper.d(OpenRocketViewer.class, iex.getMessage());\r
                        }\r
@@ -141,10 +154,13 @@ implements Simulations.OnSimulationSelectedListener
        }\r
 \r
        private class RocketChangedEventHandler extends net.sf.openrocket.android.RocketChangedEventHandler {\r
-\r
                \r
                @Override\r
                protected void doSimsChanged() {\r
+                       if (saveAction != null ) {\r
+                               saveAction.setVisible(true);\r
+                               invalidateOptionsMenu();\r
+                       }\r
                        Simulations sims = (Simulations) viewPagerAdapter.getFragmentAtPos(SIMS_POS);\r
                        if ( sims != null ) {\r
                                sims.refreshSimulationList();\r
@@ -153,6 +169,10 @@ implements Simulations.OnSimulationSelectedListener
 \r
                @Override\r
                protected void doMotorConfigsChanged() {\r
+                       if (saveAction != null ) {\r
+                               saveAction.setVisible(true);\r
+                               invalidateOptionsMenu();\r
+                       }\r
                        Configurations configs = (Configurations) viewPagerAdapter.getFragmentAtPos(CONFIGS_POS);\r
                        if ( configs != null ) {\r
                                configs.refreshConfigsList();\r