projects
/
debian
/
openrocket
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rework the loading workflow to be more natural and fix some nasty bugs. Make the...
[debian/openrocket]
/
android
/
src
/
net
/
sf
/
openrocket
/
android
/
Main.java
diff --git
a/android/src/net/sf/openrocket/android/Main.java
b/android/src/net/sf/openrocket/android/Main.java
index 9c94130da2a8055950227993648122120900d788..7b6eb48e3e39a03e34205d3cfa1c9d04824ea2b9 100644
(file)
--- a/
android/src/net/sf/openrocket/android/Main.java
+++ b/
android/src/net/sf/openrocket/android/Main.java
@@
-2,7
+2,6
@@
package net.sf.openrocket.android;
\r
import net.sf.openrocket.R;
\r
import net.sf.openrocket.android.rocket.OpenRocketLoaderActivity;
\r
\r
import net.sf.openrocket.R;
\r
import net.sf.openrocket.android.rocket.OpenRocketLoaderActivity;
\r
-import android.content.Intent;
\r
import android.os.Bundle;
\r
import android.view.View;
\r
import android.widget.Button;
\r
import android.os.Bundle;
\r
import android.view.View;
\r
import android.widget.Button;
\r
@@
-13,17
+12,10
@@
import com.actionbarsherlock.view.MenuItem;
\r
public class Main extends OpenRocketLoaderActivity {
\r
\r
\r
public class Main extends OpenRocketLoaderActivity {
\r
\r
- public final static String restartFlag = "restart";
\r
-
\r
/** Called when the activity is first created. */
\r
@Override
\r
public void onCreate(Bundle icicle) {
\r
super.onCreate(icicle);
\r
/** Called when the activity is first created. */
\r
@Override
\r
public void onCreate(Bundle icicle) {
\r
super.onCreate(icicle);
\r
- Intent i = getIntent();
\r
- // Rocket already loaded. go to viewer unless we want to restart.
\r
- if ( ( i.getBooleanExtra(restartFlag, false) == false) && CurrentRocketHolder.getCurrentRocket().getRocketDocument() != null ) {
\r
- moveOnToViewer();
\r
- }
\r
setContentView(R.layout.main);
\r
((Button) findViewById(R.id.main_open)).setOnClickListener(
\r
new View.OnClickListener() {
\r
setContentView(R.layout.main);
\r
((Button) findViewById(R.id.main_open)).setOnClickListener(
\r
new View.OnClickListener() {
\r
@@
-48,6
+40,15
@@
public class Main extends OpenRocketLoaderActivity {
});
\r
}
\r
\r
});
\r
}
\r
\r
+ @Override
\r
+ protected void onPostResume() {
\r
+ super.onPostResume();
\r
+ // Rocket already loaded.
\r
+ if ( !isLoading() && CurrentRocketHolder.getCurrentRocket().getRocketDocument() != null ) {
\r
+ moveOnToViewer();
\r
+ }
\r
+ }
\r
+
\r
@Override
\r
public boolean onCreateOptionsMenu(Menu menu) {
\r
MenuInflater inflater = getSupportMenuInflater();
\r
@Override
\r
public boolean onCreateOptionsMenu(Menu menu) {
\r
MenuInflater inflater = getSupportMenuInflater();
\r