hongshaorou/openrocket
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix behavior when cancelling a failure to open an Ork file. This had finished the activity when it was its own activity. Now it just cancels the dialog.

Browse Source
This commit is contained in:
Kevin Ruland 2012-07-10 03:08:03 +00:00
parent d7d647d47d
commit 568b7aeb5d
2 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
android/res/values/strings.xml
View File

@ -20,6 +20,7 @@
<string name="no">No</string> <string name="no">No</string>
<string name="yes">Yes</string> <string name="yes">Yes</string>
<string name="autoSaveMessage">Automatically saving rocket</string> <string name="autoSaveMessage">Automatically saving rocket</string>
<string name="loadingErrorMessage">Error Loading File</string>
<string-array name="PreferenceMotorBrowserGroupingEntries"> <string-array name="PreferenceMotorBrowserGroupingEntries">
<item>Case</item> <item>Case</item>

15
android/src/net/sf/openrocket/android/rocket/OpenRocketLoaderActivity.java
View File

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