chore: pr comments

Author: NathanWalker

test-app/app/src/main/java/com/tns/NativeScriptRuntime.java

@@ -9,6 +9,6 @@ public static boolean reloadApplication() {
     }
 
     public static boolean reloadApplication(String baseDir) {
-        return RuntimeHelper.reloadApplication();
+        return RuntimeHelper.reloadApplication(baseDir);
     }
 }

test-app/app/src/main/java/com/tns/RuntimeHelper.java

@@ -245,6 +245,11 @@ public static Runtime initRuntime(Context context) {
         }
     }
 
+    // The overload is kept for API parity with ios, but not needed with android.
+    public static synchronized boolean reloadApplication(String baseDir) {
+        return reloadApplication();
+    }
+
     public static synchronized boolean reloadApplication() {
         final Context context = applicationContext;
         if (context == null || reloadScheduled) {
@@ -307,6 +312,12 @@ private static void waitForLiveSync(Context context) {
     }
 
     private static void registerTimezoneChangedListener(Context context, final Runtime runtime) {
+        // Register/unregister against the application context so the same Context
+        // instance is used across initial launch and reload. Using the passed-in
+        // context (which may be an Activity on first launch but applicationContext
+        // on reload) would make unregisterReceiver fail and leak the old receiver.
+        final Context receiverContext = applicationContext != null ? applicationContext : context;
+
         IntentFilter timezoneFilter = new IntentFilter(Intent.ACTION_TIMEZONE_CHANGED);
 
         BroadcastReceiver timezoneReceiver = new BroadcastReceiver() {
@@ -339,14 +350,14 @@ public void onReceive(Context context, Intent intent) {
 
         if (timezoneChangedReceiver != null) {
             try {
-                context.unregisterReceiver(timezoneChangedReceiver);
+                receiverContext.unregisterReceiver(timezoneChangedReceiver);
             } catch (IllegalArgumentException e) {
                 // Already unregistered.
             }
         }
 
         timezoneChangedReceiver = timezoneReceiver;
-        context.registerReceiver(timezoneChangedReceiver, timezoneFilter);
+        receiverContext.registerReceiver(timezoneChangedReceiver, timezoneFilter);
     }
 
     public static void initLiveSync(Application app) {

test-app/runtime/src/main/cpp/com_tns_Runtime.cpp

@@ -357,6 +357,7 @@ extern "C" JNIEXPORT void Java_com_tns_Runtime_WorkerGlobalOnMessageCallback(JNI
     auto runtime = TryGetRuntime(runtimeId);
     if (runtime == nullptr) {
         // TODO: Pete: Log message informing the developer of the failure
+        return;
     }
 
     auto isolate = runtime->GetIsolate();
@@ -375,6 +376,7 @@ extern "C" JNIEXPORT void Java_com_tns_Runtime_WorkerObjectOnMessageCallback(JNI
     auto runtime = TryGetRuntime(runtimeId);
     if (runtime == nullptr) {
         // TODO: Pete: Log message informing the developer of the failure
+        return;
     }
 
     auto isolate = runtime->GetIsolate();
@@ -440,6 +442,7 @@ extern "C" JNIEXPORT void Java_com_tns_Runtime_ClearWorkerPersistent(JNIEnv* env
     auto runtime = TryGetRuntime(runtimeId);
     if (runtime == nullptr) {
         // TODO: Pete: Log message informing the developer of the failure
+        return;
     }
 
     auto isolate = runtime->GetIsolate();
@@ -458,6 +461,7 @@ extern "C" JNIEXPORT void Java_com_tns_Runtime_CallWorkerObjectOnErrorHandleMain
     auto runtime = TryGetRuntime(runtimeId);
     if (runtime == nullptr) {
         // TODO: Pete: Log message informing the developer of the failure
+        return;
     }
 
     auto isolate = runtime->GetIsolate();