diff --git a/contrib/mobile/Android/src/org/geuz/onelab/MainActivity.java b/contrib/mobile/Android/src/org/geuz/onelab/MainActivity.java index 9b819c69f39691a6823bc9aeb09c018300d5379f..b29bde9d8dc7555143fa4c1d2f6f9515579c2f09 100644 --- a/contrib/mobile/Android/src/org/geuz/onelab/MainActivity.java +++ b/contrib/mobile/Android/src/org/geuz/onelab/MainActivity.java @@ -102,6 +102,7 @@ public class MainActivity extends Activity { loadNative(); if(intent != null && intent.getAction() != null && intent.getAction().equals(Intent.ACTION_VIEW)) { String tmp = intent.getData().getPath(); + pager.setCurrentItem(1); gmsh.load(tmp); } else if(modelList.size() > 0){ diff --git a/contrib/mobile/Android/src/org/geuz/onelab/SplashScreen.java b/contrib/mobile/Android/src/org/geuz/onelab/SplashScreen.java index e45ccf3d849b60bfce46801a3cb2df3dba53de56..c1649880fd654062e0e0dd2e547000f00014074a 100644 --- a/contrib/mobile/Android/src/org/geuz/onelab/SplashScreen.java +++ b/contrib/mobile/Android/src/org/geuz/onelab/SplashScreen.java @@ -11,13 +11,14 @@ public class SplashScreen extends Activity{ private static final int STOPSPLASH = 0; private static final int EXITAPP = 1; + private Intent newIntent; + private final Handler handler = new Handler() { public void handleMessage(Message msg) { switch (msg.what) { case STOPSPLASH: - final Intent intent = new Intent(SplashScreen.this, MainActivity.class); - startActivity(intent); + startActivity(newIntent); finish(); break; case EXITAPP: @@ -32,6 +33,12 @@ public class SplashScreen extends Activity{ protected void onCreate(android.os.Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.splash); + newIntent = new Intent(SplashScreen.this, MainActivity.class); + Intent oldIntent = this.getIntent(); + if(oldIntent != null && oldIntent.getAction() != null && oldIntent.getAction().equals(Intent.ACTION_VIEW)){ + newIntent.setAction(oldIntent.getAction()); + newIntent.setData(oldIntent.getData()); + } final Message msg = new Message(); msg.what = STOPSPLASH; handler.sendMessageDelayed(msg, SPLASHTIME);