Fix behavior when cancelling a failure to open an Ork file. This had finished the...

git-svn-id: https://openrocket.svn.sourceforge.net/svnroot/openrocket/trunk@875 180e2498-e6e9-4542-8430-84ac67f01cd8

diff --git a/android/res/values/strings.xml b/android/res/values/strings.xml
index 81c048b6684f8a63cb2d0fbbada37f845e4dc0df..386c17d6d4a2d695096af146c967fe08ddb55e79 100644 (file)
--- a/android/res/values/strings.xml
+++ b/android/res/values/strings.xml
@@ -20,6 +20,7 @@
     <string name="no">No</string>\r
     <string name="yes">Yes</string>\r
     <string name="autoSaveMessage">Automatically saving rocket</string>\r
+    <string name="loadingErrorMessage">Error Loading File</string>\r
 \r
     <string-array name="PreferenceMotorBrowserGroupingEntries">\r
         <item>Case</item>\r

diff --git a/android/src/net/sf/openrocket/android/rocket/OpenRocketLoaderActivity.java b/android/src/net/sf/openrocket/android/rocket/OpenRocketLoaderActivity.java
index 6724744c56277dfa5c323de8dfe155f4b4cbefbb..46398da33528adad9b431ae68aa3d5fdeea3a904 100644 (file)
--- a/android/src/net/sf/openrocket/android/rocket/OpenRocketLoaderActivity.java
+++ b/android/src/net/sf/openrocket/android/rocket/OpenRocketLoaderActivity.java
@@ -13,8 +13,8 @@ import net.sf.openrocket.android.util.AndroidLogWrapper;
 import net.sf.openrocket.motor.ThrustCurveMotorPlaceholder;\r
 import net.sf.openrocket.rocketcomponent.Rocket;\r
 import android.app.AlertDialog;\r
+import android.app.Dialog;\r
 import android.content.ActivityNotFoundException;\r
-import android.content.DialogInterface;\r
 import android.content.Intent;\r
 import android.content.SharedPreferences;\r
 import android.content.res.Resources;\r
@@ -168,15 +168,12 @@ implements TCQueryAction.OnTCQueryCompleteListener, OpenRocketLoaderFragment.OnO
                if ( result.loadingError != null ) {\r
 \r
                        AlertDialog.Builder dialogBuilder = new AlertDialog.Builder(this);\r
-                       dialogBuilder.setTitle("Error Loading File" );\r
+                       dialogBuilder.setTitle( R.string.loadingErrorMessage );\r
                        dialogBuilder.setMessage( result.loadingError.getLocalizedMessage());\r
-                       dialogBuilder.setOnCancelListener( new DialogInterface.OnCancelListener() {\r
-                               @Override\r
-                               public void onCancel(DialogInterface dialog) {\r
-                                       OpenRocketLoaderActivity.this.finish();\r
-                               }\r
-                       });\r
-                       dialogBuilder.create().show();\r
+                       dialogBuilder.setCancelable(true);\r
+                       Dialog d = dialogBuilder.create();\r
+                       d.setCanceledOnTouchOutside(true);\r
+                       d.show();\r
 \r
                } else {\r
                        CurrentRocketHolder.getCurrentRocket().setRocketDocument( result.rocket );\r