X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=android%2Fsrc%2Fnet%2Fsf%2Fopenrocket%2Fandroid%2FMain.java;fp=android%2Fsrc%2Fnet%2Fsf%2Fopenrocket%2Fandroid%2FMain.java;h=7b6eb48e3e39a03e34205d3cfa1c9d04824ea2b9;hb=9349577cdfdff682b2aabd6daa24fdc3a7449b58;hp=06e581386f48503ac0957c6bf9a6c25ec2dca1c0;hpb=30ba0a882f0c061176ba14dbf86d3d6fad096c02;p=debian%2Fopenrocket

diff --git a/android/src/net/sf/openrocket/android/Main.java b/android/src/net/sf/openrocket/android/Main.java
index 06e58138..7b6eb48e 100644
--- a/android/src/net/sf/openrocket/android/Main.java
+++ b/android/src/net/sf/openrocket/android/Main.java
@@ -1,30 +1,21 @@
 package net.sf.openrocket.android;
 
 import net.sf.openrocket.R;
-import net.sf.openrocket.android.actionbarcompat.ActionBarFragmentActivity;
-import net.sf.openrocket.android.filebrowser.SimpleFileBrowser;
-import android.content.ActivityNotFoundException;
-import android.content.Intent;
-import android.content.SharedPreferences;
-import android.content.res.Resources;
-import android.net.Uri;
+import net.sf.openrocket.android.rocket.OpenRocketLoaderActivity;
 import android.os.Bundle;
-import android.preference.PreferenceManager;
-import android.view.Menu;
-import android.view.MenuInflater;
-import android.view.MenuItem;
 import android.view.View;
 import android.widget.Button;
 
-public class Main extends ActionBarFragmentActivity {
+import com.actionbarsherlock.view.Menu;
+import com.actionbarsherlock.view.MenuInflater;
+import com.actionbarsherlock.view.MenuItem;
 
-	private static final int PICK_ORK_FILE_RESULT = 1;
+public class Main extends OpenRocketLoaderActivity {
 
 	/** Called when the activity is first created. */
 	@Override
 	public void onCreate(Bundle icicle) {
 		super.onCreate(icicle);
-		setTitle("");
 		setContentView(R.layout.main);
 		((Button) findViewById(R.id.main_open)).setOnClickListener(
 				new View.OnClickListener() {
@@ -49,9 +40,18 @@ public class Main extends ActionBarFragmentActivity {
 				});
 	}
 
+	@Override
+	protected void onPostResume() {
+		super.onPostResume();
+		// Rocket already loaded.
+		if ( !isLoading() && CurrentRocketHolder.getCurrentRocket().getRocketDocument() != null ) {
+			moveOnToViewer();
+		}
+	}
+
 	@Override
 	public boolean onCreateOptionsMenu(Menu menu) {
-		MenuInflater inflater = getMenuInflater();
+		MenuInflater inflater = getSupportMenuInflater();
 		inflater.inflate(R.menu.main_menu, menu);
 		return true;
 	}
@@ -69,55 +69,4 @@ public class Main extends ActionBarFragmentActivity {
 		return super.onOptionsItemSelected(item);
 	}
 
-	/* (non-Javadoc)
-	 * @see android.app.Activity#onActivityResult(int, int, android.content.Intent)
-	 */
-	@Override
-	protected void onActivityResult(int requestCode, int resultCode, Intent data) {
-		switch ( requestCode ) {
-		case PICK_ORK_FILE_RESULT:
-			if(resultCode==RESULT_OK){
-				Uri file = data.getData();
-				Intent intent = new Intent(Intent.ACTION_VIEW);
-				intent.setData(file);
-				startActivity(intent);
-			}
-			break;
-		}
-		super.onActivityResult(requestCode, resultCode, data);
-	}
-
-	private void pickOrkFiles( ) {
-		Resources resources = this.getResources();
-		String key = resources.getString(R.string.PreferenceUseInternalFileBrowserOption);
-		SharedPreferences pref = PreferenceManager.getDefaultSharedPreferences(this);
-
-		boolean useinternalbrowser = pref.getBoolean(key, false);
-
-		if ( useinternalbrowser ) {
-			Intent intent = new Intent(Main.this, SimpleFileBrowser.class);
-			startActivityForResult(intent,PICK_ORK_FILE_RESULT);
-		} else {
-			try {
-				Intent intent = new Intent(Intent.ACTION_GET_CONTENT);
-				intent.setType("file/*");
-				startActivityForResult(intent,PICK_ORK_FILE_RESULT);
-			} catch ( ActivityNotFoundException ex ) { 
-				// No activity for ACTION_GET_CONTENT  use internal file browser
-				// update the preference value.
-				pref.edit().putBoolean(key, false).commit();
-				// fire our browser
-				Intent intent = new Intent(Main.this, SimpleFileBrowser.class);
-				startActivityForResult(intent,PICK_ORK_FILE_RESULT);
-			}
-		}		
-	}
-	public void pickOrkFiles( View v ) {
-		pickOrkFiles();
-	}
-
-	public void browseMotors( View v ) {
-		ActivityHelpers.browseMotors(this);
-	}
-
 }