Rework the loading workflow to be more natural and fix some nasty bugs. Make the...
[debian/openrocket] / android / src / net / sf / openrocket / android / rocket / OpenRocketLoaderActivity.java
index 366581407af197942aa2d09c09d0b244d5d37002..9a3a84310d9890cfc508b68abf28f6ef9044e4a2 100644 (file)
 package net.sf.openrocket.android.rocket;\r
 \r
 import java.io.File;\r
+import java.util.Set;\r
 \r
 import net.sf.openrocket.R;\r
 import net.sf.openrocket.aerodynamics.WarningSet;\r
-import net.sf.openrocket.android.Application;\r
-import android.app.AlertDialog;\r
-import android.app.Dialog;\r
-import android.app.ProgressDialog;\r
-import android.content.DialogInterface;\r
+import net.sf.openrocket.android.CurrentRocketHolder;\r
+import net.sf.openrocket.android.filebrowser.SimpleFileBrowser;\r
+import net.sf.openrocket.android.thrustcurve.TCMissingMotorDownloadAction;\r
+import net.sf.openrocket.android.thrustcurve.TCQueryAction;\r
+import net.sf.openrocket.android.util.AndroidLogWrapper;\r
+import net.sf.openrocket.motor.ThrustCurveMotorPlaceholder;\r
+import net.sf.openrocket.rocketcomponent.Rocket;\r
+import android.content.ActivityNotFoundException;\r
 import android.content.Intent;\r
+import android.content.SharedPreferences;\r
+import android.content.res.Resources;\r
 import android.net.Uri;\r
 import android.os.Bundle;\r
+import android.preference.PreferenceManager;\r
 import android.support.v4.app.DialogFragment;\r
-import android.support.v4.app.FragmentActivity;\r
-import android.util.Log;\r
 \r
-public class OpenRocketLoaderActivity extends FragmentActivity {\r
-       private static final String TAG = "OpenRocketLoader";\r
+import com.actionbarsherlock.app.SherlockFragmentActivity;\r
 \r
-       private ProgressDialog progress;\r
+public class OpenRocketLoaderActivity extends SherlockFragmentActivity\r
+implements TCQueryAction.OnTCQueryCompleteListener, OpenRocketLoaderFragment.OnOpenRocketFileLoaded\r
+{\r
+\r
+       private static final int PICK_ORK_FILE_RESULT = 1;\r
+\r
+       private final static String MISSING_MOTOR_DIAG_FRAGMENT_TAG = "missingmotordialog";\r
+       private final static String MISSING_MOTOR_DOWNLOAD_FRAGMENT_TAG = "missingmotortask";\r
+\r
+       /*\r
+        * Set to true when we have started to load a file.  Is saved in InstanceState.\r
+        */\r
+       private boolean isLoading = false;\r
+       /*\r
+        * Set to the Uri of the file we are supposed to load.  Is saved in InstanceState.\r
+        */\r
+       private Uri fileToLoad = null;\r
+       \r
+       protected boolean isLoading() {\r
+               AndroidLogWrapper.d(OpenRocketLoaderActivity.class, "isLoading " + this.hashCode());\r
+               AndroidLogWrapper.d(OpenRocketLoaderActivity.class, "isLoading = " + isLoading);\r
+               return isLoading;\r
+       }\r
 \r
        @Override\r
-       protected void onCreate(Bundle savedInstanceState) {\r
-               super.onCreate(savedInstanceState);\r
-               setContentView(R.layout.main);\r
+       protected void onPostCreate(Bundle savedInstanceState) {\r
+               super.onPostCreate(savedInstanceState);\r
                Intent i = getIntent();\r
-               Uri file = i.getData();\r
-               loadOrkFile(file);\r
+               if (Intent.ACTION_VIEW.equals(i.getAction()) && i.getData() != null ) {\r
+                       Uri file = i.getData();\r
+                       fileToLoad = file;\r
+                       loadOrkFile();\r
+               } else {\r
+               }\r
+       }\r
+\r
+       @Override\r
+       protected void onSaveInstanceState(Bundle outState) {\r
+               AndroidLogWrapper.d(OpenRocketLoaderActivity.class, "onSaveInstanceState " + this.hashCode());\r
+               AndroidLogWrapper.d(OpenRocketLoaderActivity.class, "isLoading = " + isLoading);\r
+               outState.putBoolean("isLoading", isLoading);\r
+               if ( fileToLoad != null ) {\r
+                       outState.putParcelable("fileToLoad", fileToLoad);\r
+               }\r
+               super.onSaveInstanceState(outState);\r
+       }\r
+\r
+       @Override\r
+       protected void onRestoreInstanceState(Bundle savedInstanceState) {\r
+               AndroidLogWrapper.d(OpenRocketLoaderActivity.class, "onRestoreInstanceState");\r
+               isLoading = savedInstanceState.getBoolean("isLoading",false);\r
+               AndroidLogWrapper.d(OpenRocketLoaderActivity.class, "isLoading = " + isLoading);\r
+               if ( savedInstanceState.containsKey("fileToLoad") ) {\r
+                       fileToLoad = savedInstanceState.getParcelable("fileToLoad");\r
+               }\r
+               super.onRestoreInstanceState(savedInstanceState);\r
        }\r
 \r
        @Override\r
-       protected void onDestroy() {\r
-               if ( progress != null ) {\r
-                       if ( progress.isShowing() ) {\r
-                               progress.dismiss();\r
+       protected void onResume() {\r
+               AndroidLogWrapper.d(OpenRocketLoaderActivity.class, "onResume");\r
+               super.onResume();\r
+               // Start loading a file if we have a file and are not already loading one.\r
+               if ( fileToLoad != null && !isLoading ) {\r
+                       loadOrkFile();\r
+               }\r
+       }\r
+\r
+       /* (non-Javadoc)\r
+        * @see android.app.Activity#onActivityResult(int, int, android.content.Intent)\r
+        */\r
+       @Override\r
+       protected void onActivityResult(int requestCode, int resultCode, Intent data) {\r
+               AndroidLogWrapper.d(OpenRocketLoaderActivity.class, "onActivityResult");\r
+               switch ( requestCode ) {\r
+               case PICK_ORK_FILE_RESULT:\r
+                       if(resultCode==RESULT_OK){\r
+                               Uri file = data.getData();\r
+                               fileToLoad = file;\r
+                               // It would be nice to just start loading the file - but that doesn't work correctly.\r
+                               // I'm uncertain if it is a bug in Android 14/15 or a bug in the v4 support library.\r
+                               // essentially what happens is, when the FileBrowserActivity is brought up,\r
+                               // this activity goes through the saveInstanceState calls to push it to the background.\r
+                               // When the FileBrowserActivity returns the result, this.onActivityResult is called\r
+                               // prior to any of the other lifecycle methods (onRestoreInstanceState as documented, but onStart is\r
+                               // a bug. Since onStart hasn't been called, this activity is not able to create fragments - which \r
+                               // are used to indicate progress etc.\r
+                               // Instead of calling loadOrkFile() here, we push the file Uri into a member variable,\r
+                               // then check the member variable in onResume to actuall kick off the work.\r
                        }\r
-                       progress = null;\r
+                       break;\r
+               default:\r
+                       super.onActivityResult(requestCode, resultCode, data);\r
                }\r
-               super.onDestroy();\r
        }\r
 \r
-       private void loadOrkFile( Uri file ) {\r
-               Log.d(TAG,"Use ork file: " + file);\r
-               String path = file.getPath();\r
-               File orkFile = new File(path);\r
-               progress = ProgressDialog.show(this, "Loading file", "");\r
-\r
-               final OpenRocketLoaderTask task = new OpenRocketLoaderTask() {\r
-\r
-                       /* (non-Javadoc)\r
-                        * @see android.os.AsyncTask#onPostExecute(java.lang.Object)\r
-                        */\r
-                       @Override\r
-                       protected void onPostExecute(OpenRocketLoaderResult result) {\r
-                               super.onPostExecute(result);\r
-                               Log.d(TAG,"Finished loading " + OpenRocketLoaderActivity.this);\r
-                               finishedLoading(result);\r
+       protected void pickOrkFiles( ) {\r
+               Resources resources = this.getResources();\r
+               String key = resources.getString(R.string.PreferenceUseInternalFileBrowserOption);\r
+               SharedPreferences pref = PreferenceManager.getDefaultSharedPreferences(this);\r
+\r
+               boolean useinternalbrowser = pref.getBoolean(key, true);\r
+\r
+               if ( useinternalbrowser ) {\r
+                       Intent intent = new Intent(OpenRocketLoaderActivity.this, SimpleFileBrowser.class);\r
+                       startActivityForResult(intent,PICK_ORK_FILE_RESULT);\r
+               } else {\r
+                       try {\r
+                               Intent intent = new Intent(Intent.ACTION_GET_CONTENT);\r
+                               intent.setType("file/*");\r
+                               startActivityForResult(intent,PICK_ORK_FILE_RESULT);\r
+                       } catch ( ActivityNotFoundException ex ) { \r
+                               // No activity for ACTION_GET_CONTENT  use internal file browser\r
+                               // update the preference value.\r
+                               pref.edit().putBoolean(key, false).commit();\r
+                               // fire our browser\r
+                               Intent intent = new Intent(OpenRocketLoaderActivity.this, SimpleFileBrowser.class);\r
+                               startActivityForResult(intent,PICK_ORK_FILE_RESULT);\r
                        }\r
+               }               \r
+       }\r
+\r
+       private void loadOrkFile( ) {\r
+               // a little protection.\r
+               if ( fileToLoad == null ) {\r
+                       return;\r
+               }\r
+               isLoading = true;\r
+               CurrentRocketHolder.getCurrentRocket().setFileUri( fileToLoad );\r
+               AndroidLogWrapper.d(OpenRocketLoaderActivity.class,"Use ork file: " + fileToLoad);\r
+               String path = fileToLoad.getPath();\r
+               File orkFile = new File(path);\r
+\r
+               // Also need commitAllowingState loss because of a bug in v4 dialog show.\r
+               getSupportFragmentManager().beginTransaction()\r
+                 .add( OpenRocketLoaderFragment.newInstance(orkFile), "loader")\r
+                 .commitAllowingStateLoss();\r
+\r
+       }\r
 \r
-               };\r
+       /**\r
+        * Called by the OpenRocketLoaderTask when it completes.\r
+        * is default visibility so it can be called from this package.\r
+        * \r
+        * @param result\r
+        */\r
+       public void onOpenRocketFileLoaded(OpenRocketLoaderResult result) {\r
+               if ( result.loadingError != null ) {\r
 \r
-               task.execute(orkFile);\r
+                       ErrorLoadingFileDialogFragment errorDialog = ErrorLoadingFileDialogFragment.newInstance(R.string.loadingErrorMessage, result.loadingError.getLocalizedMessage());\r
+                       errorDialog.show(getSupportFragmentManager(),"errorDialog");\r
 \r
+               } else {\r
+                       CurrentRocketHolder.getCurrentRocket().setRocketDocument( result.rocket );\r
+                       CurrentRocketHolder.getCurrentRocket().setWarnings( result.warnings );\r
+\r
+                       updateMissingMotors();\r
+               }\r
        }\r
-       \r
-       private void finishedLoading(OpenRocketLoaderResult result) {\r
-               if ( progress.isShowing() ) {\r
-                       progress.dismiss();\r
+\r
+       private void updateMissingMotors() {\r
+               Rocket rocket = CurrentRocketHolder.getCurrentRocket().getRocketDocument().getRocket();\r
+               Set<ThrustCurveMotorPlaceholder> missingMotors = MissingMotorHelpers.findMissingMotors(rocket);\r
+\r
+               if ( missingMotors.size() > 0 ) {\r
+                       MissingMotorDialogFragment missingMotorDialog = MissingMotorDialogFragment.newInstance( missingMotors );\r
+                       missingMotorDialog.show(getSupportFragmentManager(), MISSING_MOTOR_DIAG_FRAGMENT_TAG);\r
+                       return;\r
                }\r
 \r
-               WarningSet warnings = result.warnings;\r
+               displayWarningDialog();\r
+       }\r
+\r
+       /**\r
+        * Called when the TCMissingMotorDownload process finishes.\r
+        */\r
+       @Override\r
+       public void onTCQueryComplete(String message) {\r
+\r
+               Rocket rocket = CurrentRocketHolder.getCurrentRocket().getRocketDocument().getRocket();\r
+               WarningSet warnings = CurrentRocketHolder.getCurrentRocket().getWarnings();\r
+               // Need to update the motor references.\r
+               MissingMotorHelpers.updateMissingMotors(rocket, warnings);\r
+\r
+               displayWarningDialog();\r
+       }\r
+\r
+       private void displayWarningDialog() {\r
+               WarningSet warnings = CurrentRocketHolder.getCurrentRocket().getWarnings();\r
                if (warnings == null || warnings.isEmpty()) {\r
-                       ((Application)OpenRocketLoaderActivity.this.getApplication()).setRocketDocument( result.rocket );\r
-                       Intent i = new Intent(this,OpenRocketViewer.class);\r
-                       startActivity(i);\r
-                       finish();\r
                } else {\r
-                       // TODO - Build a warning listing dialog\r
                        DialogFragment newFragment = WarningDialogFragment.newInstance();\r
                        newFragment.show(getSupportFragmentManager(), "dialog");\r
+                       return;\r
                }\r
+\r
+               moveOnToViewer();\r
        }\r
 \r
-    public void doPositiveClick() {\r
-        // Do stuff here.\r
-        Log.i("FragmentAlertDialog", "Positive click!");\r
-        finish();\r
-    }\r
-\r
-    public void doNegativeClick() {\r
-        // Do stuff here.\r
-        Log.i("FragmentAlertDialog", "Negative click!");\r
-        finish();\r
-    }\r
-\r
-    public static class WarningDialogFragment extends DialogFragment {\r
-\r
-           public static WarningDialogFragment newInstance() {\r
-               WarningDialogFragment frag = new WarningDialogFragment();\r
-               Bundle args = new Bundle();\r
-               frag.setArguments(args);\r
-               return frag;\r
-           }\r
-\r
-           @Override\r
-           public Dialog onCreateDialog(Bundle savedInstanceState) {\r
-\r
-               return new AlertDialog.Builder(getActivity())\r
-//                     .setIcon(android.R.drawable.alert_dialog_icon)\r
-                       .setTitle("Warnings")\r
-                       .setPositiveButton("OK",\r
-                           new DialogInterface.OnClickListener() {\r
-                               public void onClick(DialogInterface dialog, int whichButton) {\r
-                                   ((OpenRocketLoaderActivity)getActivity()).doPositiveClick();\r
-                               }\r
-                           }\r
-                       )\r
-                       .setNegativeButton("Cancel",\r
-                           new DialogInterface.OnClickListener() {\r
-                               public void onClick(DialogInterface dialog, int whichButton) {\r
-                                   ((OpenRocketLoaderActivity)getActivity()).doNegativeClick();\r
-                               }\r
-                           }\r
-                       )\r
-                       .create();\r
-           }\r
+       public void doFixMissingMotors() {\r
+               Rocket rocket = CurrentRocketHolder.getCurrentRocket().getRocketDocument().getRocket();\r
+               Set<ThrustCurveMotorPlaceholder> missingMotors = MissingMotorHelpers.findMissingMotors(rocket);\r
+\r
+               TCMissingMotorDownloadAction motorfrag = TCMissingMotorDownloadAction.newInstance( missingMotors );\r
+               getSupportFragmentManager().beginTransaction().add( motorfrag, MISSING_MOTOR_DOWNLOAD_FRAGMENT_TAG).commit();\r
+\r
+       }\r
+\r
+       public void doNotFixMissingMotors() {\r
+               displayWarningDialog();\r
+       }\r
+\r
+       public void doDismissErrorDialog() {\r
+               isLoading = false;\r
+               fileToLoad = null;\r
+       }\r
+       \r
+       public void moveOnToViewer() {\r
+               isLoading = false;\r
+               Intent i = new Intent(this,OpenRocketViewer.class);\r
+               startActivity(i);\r
+               finish();\r
        }\r
 }\r