From 67c3c7bb99122940aedb83a341069f7afa8f8ab2 Mon Sep 17 00:00:00 2001
From: emanuele-f <black.silver@hotmail.it>
Date: Mon, 22 Nov 2021 18:19:16 +0100
Subject: [PATCH] Add CaptureCtrl status request

---
 .../activities/CaptureCtrl.java               | 21 ++++++++++---------
 app/src/main/res/values/styles.xml            |  3 ++-
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/app/src/main/java/com/emanuelef/remote_capture/activities/CaptureCtrl.java b/app/src/main/java/com/emanuelef/remote_capture/activities/CaptureCtrl.java
index 7ba64ad5..a81bfedd 100644
--- a/app/src/main/java/com/emanuelef/remote_capture/activities/CaptureCtrl.java
+++ b/app/src/main/java/com/emanuelef/remote_capture/activities/CaptureCtrl.java
@@ -52,6 +52,7 @@ import com.emanuelef.remote_capture.model.CtrlPermissions;
 public class CaptureCtrl extends AppCompatActivity {
     public static final String ACTION_START = "start";
     public static final String ACTION_STOP = "stop";
+    public static final String ACTION_STATUS = "status";
     private static final String TAG = "CaptureCtrl";
     private static AppDescriptor mStarterApp = null; // the app which started the capture, may be unknown
     private CaptureHelper mCapHelper;
@@ -63,9 +64,8 @@ public class CaptureCtrl extends AppCompatActivity {
         requestWindowFeature(Window.FEATURE_NO_TITLE);
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
             final WindowInsetsController insetsController = getWindow().getInsetsController();
-            if (insetsController != null) {
+            if (insetsController != null)
                 insetsController.hide(WindowInsets.Type.statusBars());
-            }
         } else {
             getWindow().setFlags(
                     WindowManager.LayoutParams.FLAG_FULLSCREEN,
@@ -112,12 +112,8 @@ public class CaptureCtrl extends AppCompatActivity {
 
         // Show authorization window
         setContentView(R.layout.ctrl_consent);
-        findViewById(R.id.allow_btn).setOnClickListener(v -> {
-            controlAction(intent, action, true);
-        });
-        findViewById(R.id.deny_btn).setOnClickListener(v -> {
-            controlAction(intent, action, false);
-        });
+        findViewById(R.id.allow_btn).setOnClickListener(v -> controlAction(intent, action, true));
+        findViewById(R.id.deny_btn).setOnClickListener(v -> controlAction(intent, action, false));
 
         if(app != null) {
             ((TextView)findViewById(R.id.app_name)).setText(app.getName());
@@ -161,7 +157,7 @@ public class CaptureCtrl extends AppCompatActivity {
     }
 
     private boolean isControlApp(@NonNull String action) {
-        // Automatically authorize an app to stop the capture it started
+        // By default, only the app which started the capture can perform other actions
         return !action.equals(ACTION_START) && (mStarterApp != null)
                 && (mStarterApp.getPackageName().equals(getCallingPackage()));
     }
@@ -184,6 +180,7 @@ public class CaptureCtrl extends AppCompatActivity {
     }
 
     private void processRequest(Intent req_intent, @NonNull String action) {
+        Intent res = new Intent();
         Utils.showToast(this, R.string.ctrl_consent_allowed);
 
         if(action.equals(ACTION_START)) {
@@ -198,13 +195,17 @@ public class CaptureCtrl extends AppCompatActivity {
 
             CaptureService.stopService();
             mStarterApp = null;
+        } else if(action.equals(ACTION_STATUS)) {
+            Log.d(TAG, "Returning status");
+
+            res.putExtra("running", CaptureService.isServiceActive());
         } else {
             Log.e(TAG, "unknown action: " + action);
             abort();
             return;
         }
 
-        setResult(RESULT_OK, null);
+        setResult(RESULT_OK, res);
         finish();
     }
 }
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 86dd84d4..48065e67 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -45,7 +45,8 @@
 
     <style name="AppTheme.Floating" parent="AppTheme">
         <item name="android:windowIsFloating">true</item>
-        <item name="android:windowNoTitle">true</item>
+        <item name="windowNoTitle">true</item>
+        <item name="windowActionBar">false</item>
         <item name="android:windowIsTranslucent">true</item>
         <item name="android:windowBackground">@android:color/transparent</item>
     </style>