Merge pull request #3543 from dimagi/hotfix_fix-login-redirect-crash-from-non-activity-context

[Hotfix] Fix login redirection issues

Author: avazirna

app/src/org/commcare/CommCareApplication.java

@@ -415,7 +415,10 @@ public void expireUserSession() {
         synchronized (serviceLock) {
             closeUserSession();
             SessionRegistrationHelper.registerSessionExpiration();
-            sendBroadcast(new Intent(SessionRegistrationHelper.USER_SESSION_EXPIRED));
+            sendBroadcast(
+                    new Intent(SessionRegistrationHelper.USER_SESSION_EXPIRED)
+                            .setPackage(this.getPackageName())
+            );
         }
     }
 

app/src/org/commcare/utils/SessionRegistrationHelper.java

@@ -1,5 +1,6 @@
 package org.commcare.utils;
 
+import android.app.Activity;
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
@@ -98,7 +99,10 @@ public static void unregisterSessionExpiration() {
      */
     public static void redirectToLogin(Context context) {
         Intent i = new Intent(context.getApplicationContext(), DispatchActivity.class);
-        i.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
+        i.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
+        if (!(context instanceof Activity)) {
+            i.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+        }
         context.startActivity(i);
     }
 }