Merge pull request #1 from stas3112rus/update-setFlag-params

update setFlags params - use only one parameter for toggling state
Livan-pro · Oct 19, 2024 · fa984f3 · fa984f3
2 parents ce98a8c + 9467834
commit fa984f3
Showing 1 changed file with 21 additions and 27 deletions.
diff --git a/android/src/main/java/com/activityutils/ActivityUtilsModule.java b/android/src/main/java/com/activityutils/ActivityUtilsModule.java
@@ -28,35 +28,29 @@ public String getName() {
 
   @ReactMethod
   public void setFlags(ReadableMap params, Promise promise) {
-    final var activity = getCurrentActivity();
 
-    if (activity == null) {
-      promise.reject("Missing activity in setFlags");
-      return;
-    }
+    UiThreadUtil.runOnUiThread(new Runnable() {
+      @Override
+      public void run() {
+        final var activity = getCurrentActivity();
 
-    if (params.hasKey("turnScreenOn")) {
-      boolean value = params.getBoolean("turnScreenOn");
-      activity.setTurnScreenOn(value);
-    }
-
-    if (params.hasKey("showWhenLocked")) {
-      boolean value = params.getBoolean("showWhenLocked");
-      activity.setShowWhenLocked(value);
-    }
-
-    if (params.hasKey("keepScreenOn")) {
-      boolean value = params.getBoolean("keepScreenOn");
+        if (activity == null) {
+          promise.reject("Missing activity in setFlags");
+          return;
+        }
 
-      UiThreadUtil.runOnUiThread(new Runnable() {
-        @Override
-        public void run() {
-          final var activity = getCurrentActivity();
+        if (params.hasKey("turnScreenOn")) {
+          boolean value = params.getBoolean("turnScreenOn");
+          activity.setTurnScreenOn(value);
+        }    
 
-          if (activity == null) {
-            promise.reject("Missing activity in keepScreenOn");
-            return;
-          }
+        if (params.hasKey("showWhenLocked")) {
+          boolean value = params.getBoolean("showWhenLocked");
+          activity.setShowWhenLocked(value);
+        }
+
+        if (params.hasKey("keepScreenOn")) {
+          boolean value = params.getBoolean("keepScreenOn");
 
           final var window = activity.getWindow();
           if (window == null) {
@@ -70,8 +64,8 @@ public void run() {
             window.clearFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
           }
         }
-      });
-    }
+      }
+    });
 
     promise.resolve(null);
   }