-
-
Notifications
You must be signed in to change notification settings - Fork 28
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #2448 from dimagi/memory-leak
Handle receiver register/unregister calls in onResume and onPause only
- Loading branch information
Showing
7 changed files
with
28 additions
and
28 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -14,14 +14,14 @@ | |
* | ||
* @author Phillip Mates ([email protected]) | ||
*/ | ||
public class SessionActivityRegistration { | ||
private static final String TAG = SessionActivityRegistration.class.getSimpleName(); | ||
public class SessionRegistrationHelper { | ||
private static final String TAG = SessionRegistrationHelper.class.getSimpleName(); | ||
|
||
public static final String USER_SESSION_EXPIRED = | ||
"org.commcare.dalvik.application.user_session_expired"; | ||
|
||
private static final IntentFilter expirationFilter = | ||
new IntentFilter(SessionActivityRegistration.USER_SESSION_EXPIRED); | ||
new IntentFilter(SessionRegistrationHelper.USER_SESSION_EXPIRED); | ||
|
||
private static boolean unredirectedSessionExpiration; | ||
private static final Object registrationLock = new Object(); | ||
|
@@ -40,9 +40,7 @@ public void onReceive(Context context, Intent intent) { | |
* listen for session expiration broadcasts. Call this method in onResume | ||
* methods of activities that are session sensitive. | ||
*/ | ||
public static boolean handleOrListenForSessionExpiration(AppCompatActivity activity) { | ||
activity.registerReceiver(userSessionExpiredReceiver, expirationFilter); | ||
|
||
public static boolean handleSessionExpiration(AppCompatActivity activity) { | ||
synchronized (registrationLock) { | ||
if (unredirectedSessionExpiration) { | ||
unredirectedSessionExpiration = false; | ||
|
@@ -53,6 +51,10 @@ public static boolean handleOrListenForSessionExpiration(AppCompatActivity activ | |
} | ||
} | ||
|
||
public static void registerSessionExpirationReceiver(AppCompatActivity activity) { | ||
activity.registerReceiver(userSessionExpiredReceiver, expirationFilter); | ||
} | ||
|
||
/** | ||
* Stop activity from listening for session expiration broadcasts. Call | ||
* this method in onPause methods of activities that are session sensitive. | ||
|