From 4f4bf580021f197acf4b1388e141b596cc3c485a Mon Sep 17 00:00:00 2001
From: Maxime Graulich <maxime.graulich@gmail.com>
Date: Thu, 16 May 2013 12:55:39 +0000
Subject: [PATCH] Fix opening files with the splash screen
---
.../Android/src/org/geuz/onelab/MainActivity.java | 1 +
.../Android/src/org/geuz/onelab/SplashScreen.java | 11 +++++++++--
2 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/contrib/mobile/Android/src/org/geuz/onelab/MainActivity.java b/contrib/mobile/Android/src/org/geuz/onelab/MainActivity.java
index 9b819c69f3..b29bde9d8d 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 e45ccf3d84..c1649880fd 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);
--
GitLab