[keep-awake] Fix mixing tags breaks keepAwake functionality (#7197)

* [keep-awake] Fix mixing tags breaks keepAwake functionality * [keep-awake] Update changelog
expo · Mar 9, 2020 · 0a3bd63 · 0a3bd63
1 parent 179e068
commit 0a3bd63
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -17,6 +17,7 @@ This is the log of notable changes to the Expo client that are developer-facing.
 ### 🐛 Bug fixes
 
 - Fixed `Brightness.requestPermissionsAsync` throwing `permission cannot be null or empty` error on Android. ([#7276](https://github.com/expo/expo/pull/7276) by [@lukmccall](https://github.com/lukmccall))
+- Fixed `KeepAwake.activateKeepAwake` not working with multiple tags on Android. ([#7197](https://github.com/expo/expo/pull/7197) by [@lukmccall](https://github.com/lukmccall))
 
 ## 37.0.0
 

diff --git a/...es/expo-keep-awake/android/src/main/java/expo/modules/keepawake/ExpoKeepAwakeManager.java b/...es/expo-keep-awake/android/src/main/java/expo/modules/keepawake/ExpoKeepAwakeManager.java
@@ -49,7 +49,8 @@ public void activate(final String tag, final Runnable done) throws CurrentActivi
   @Override
   public void deactivate(final String tag, final Runnable done) throws CurrentActivityNotFoundException {
     final Activity activity = getCurrentActivity();
-    if (isActivated() && activity != null) {
+
+    if (mTags.size() == 1 && mTags.contains(tag) && activity != null) {
       activity.runOnUiThread(() -> activity.getWindow().clearFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON));
     }
     mTags.remove(tag);