summaryrefslogtreecommitdiff
path: root/src/java/io
diff options
context:
space:
mode:
Diffstat (limited to 'src/java/io')
-rw-r--r--src/java/io/cons/carddav_sync/SplashActivity.java16
1 files changed, 10 insertions, 6 deletions
diff --git a/src/java/io/cons/carddav_sync/SplashActivity.java b/src/java/io/cons/carddav_sync/SplashActivity.java
index 9bdc24e..b6b2b84 100644
--- a/src/java/io/cons/carddav_sync/SplashActivity.java
+++ b/src/java/io/cons/carddav_sync/SplashActivity.java
@@ -23,12 +23,16 @@ public class SplashActivity extends Activity {
public void onCreate(Bundle bundle) {
super.onCreate(bundle);
+ Intent selector = getIntent().getSelector();
+ if (selector == null) {
+ selector = new Intent("io.cons.carddav_sync.MAIN");
+ }
if (firstLaunch) {
firstLaunch = false;
setupSplash();
- loadClojure();
+ loadClojure(selector);
} else {
- proceed();
+ proceed(selector);
}
}
@@ -43,12 +47,12 @@ public class SplashActivity extends Activity {
circleView.startAnimation(rotation);
}
- public void proceed() {
- startActivity(new Intent("io.cons.carddav_sync.MAIN"));
+ public void proceed(final Intent selector) {
+ startActivity(selector);
finish();
}
- public void loadClojure() {
+ public void loadClojure(final Intent selector) {
new Thread(new Runnable(){
@Override
public void run() {
@@ -59,7 +63,7 @@ public class SplashActivity extends Activity {
Var INIT = RT.var("neko.application", "init-application");
INIT.invoke(SplashActivity.this.getApplication());
- proceed();
+ proceed(selector);
}
}).start();
}