[TIMOB-25756] Include softRestart

tidev · Aug 1, 2018 · 91f1cfb · 91f1cfb
1 parent bfdbf6d
commit 91f1cfb
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 20 deletions.
diff --git a/android/modules/app/src/java/ti/modules/titanium/app/AppModule.java b/android/modules/app/src/java/ti/modules/titanium/app/AppModule.java
@@ -54,8 +54,6 @@ public class AppModule extends KrollModule implements SensorEventListener
 	private boolean proximityState;
 	private int proximityEventListenerCount = 0;
 
-	private static final String APP_PATH = "Resources/app.js";
-
 	public AppModule()
 	{
 		super("App");
@@ -219,23 +217,7 @@ public boolean getAccessibilityEnabled()
 	@Kroll.method(name = "_restart")
 	public void restart()
 	{
-		KrollRuntime runtime = KrollRuntime.getInstance();
-
-		// prevent termination of root activity via TiBaseActivity.shouldFinishRootActivity()
-		TiBaseActivity.canFinishRoot = false;
-
-		// terminate all activities excluding root
-		TiApplication.terminateActivityStack();
-
-		// allow termination again
-		TiBaseActivity.canFinishRoot = true;
-
-		// restart kroll runtime
-		runtime.doDispose();
-		runtime.initRuntime();
-
-		// manually re-launch app
-		runtime.doRunModule(KrollAssetHelper.readAsset(APP_PATH), APP_PATH, getActivityProxy());
+		TiApplication.getInstance().softRestart();
 	}
 
 	@Kroll.method

diff --git a/android/titanium/src/java/org/appcelerator/titanium/TiApplication.java b/android/titanium/src/java/org/appcelerator/titanium/TiApplication.java
@@ -756,6 +756,28 @@ public void scheduleRestart(int delay)
 		}
 	}
 
+	public void softRestart()
+	{
+		KrollRuntime runtime = KrollRuntime.getInstance();
+
+		// prevent termination of root activity via TiBaseActivity.shouldFinishRootActivity()
+		TiBaseActivity.canFinishRoot = false;
+
+		// terminate all activities excluding root
+		TiApplication.terminateActivityStack();
+
+		// allow termination again
+		TiBaseActivity.canFinishRoot = true;
+
+		// restart kroll runtime
+		runtime.doDispose();
+		runtime.initRuntime();
+
+		// manually re-launch app
+		runtime.doRunModule(KrollAssetHelper.readAsset(TiC.PATH_APP_JS), TiC.URL_APP_JS,
+							((TiBaseActivity) getRootOrCurrentActivity()).getActivityProxy());
+	}
+
 	public boolean isRestartPending()
 	{
 		return restartPending;
@@ -814,7 +836,7 @@ private void startLocaleMonitor()
 			@Override
 			public void onReceive(Context context, Intent intent)
 			{
-				TiApplication.getInstance().scheduleRestart(0);
+				TiApplication.getInstance().softRestart();
 			}
 		};
 

diff --git a/android/titanium/src/java/org/appcelerator/titanium/TiC.java b/android/titanium/src/java/org/appcelerator/titanium/TiC.java
@@ -3478,4 +3478,5 @@ public class TiC
 	public static final String URL_APP_SCHEME = "app";
 	public static final String URL_APP_JS = "app://app.js";
 	public static final String URL_ANDROID_ASSET_RESOURCES = "file:///android_asset/Resources/";
+	public static final String PATH_APP_JS = "Resources/app.js";
 }