Merge branch 'release/0.2.7'

Author: thelicato

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "droidground",
-  "version": "0.2.6",
+  "version": "0.2.7",
   "type": "module",
   "author": "Angelo Delicato",
   "scripts": {

package.json

@@ -76,6 +76,11 @@ class RESTManager {
     return res;
   }
 
+  async closeDialogs(): Promise<AxiosResponse<IGenericResultRes>> {
+    const res = await http.post<IGenericResultRes>(E.DIALOGS);
+    return res;
+  }
+
   async shutdown(): Promise<AxiosResponse<IGenericResultRes>> {
     const res = await http.post<IGenericResultRes>(E.SHUTDOWN);
     return res;

src/client/api/rest.ts

@@ -41,6 +41,16 @@ export const Overview: React.FC = () => {
     }
   };
 
+  const closeDialogs = async () => {
+    try {
+      await RESTManagerInstance.closeDialogs();
+      toast.success("Request issued correctly");
+    } catch (e) {
+      console.error(e);
+      toast.error("Error while closing system dialogs.");
+    }
+  };
+
   const runBugreportz = async () => {
     try {
       await RESTManagerInstance.startBugreportz();
@@ -181,6 +191,17 @@ export const Overview: React.FC = () => {
               </div>
             </div>
 
+            <div className="flex w-full justify-between items-center">
+              <p>
+                Close <b>System Dialogs</b>
+              </p>
+              <div className="join">
+                <button className="btn btn-accent join-item rounded-r-md" onClick={closeDialogs}>
+                  Close
+                </button>
+              </div>
+            </div>
+
             {featuresConfig.startActivityEnabled && (
               <div className="flex w-full justify-between items-center">
                 <p>

src/client/views/Overview.tsx

@@ -296,6 +296,18 @@ class APIController {
     }
   };
 
+  closeDialogs: RequestHandler = async (req: Request, res: Response<IGenericResultRes | IGenericErrRes>) => {
+    Logger.info(`Received ${req.method} request on ${req.path}`);
+    try {
+      const adb = await ManagerSingleton.getInstance().getAdb();
+      await adb.subprocess.noneProtocol.spawnWait(`am broadcast -a android.intent.action.CLOSE_SYSTEM_DIALOGS`);
+      res.json({ result: "System dialogs closed" }).end();
+    } catch (error: any) {
+      Logger.error(`Error closing system dialogs: ${error}`);
+      res.status(500).json({ error: "An error occurred while closing system dialogs." }).end();
+    }
+  };
+
   shutdown: RequestHandler = async (req: Request, res: Response<IGenericResultRes | IGenericErrRes>) => {
     Logger.info(`Received ${req.method} request on ${req.path}`);
     try {

src/server/api/controller.ts

@@ -76,6 +76,7 @@ export default (app: Router) => {
   endpoint.get(E.FEATURES, APIController.features);
   endpoint.get(E.INFO, APIController.info);
   endpoint.post(E.RESTART, APIController.restartApp);
+  endpoint.post(E.DIALOGS, APIController.closeDialogs);
   endpoint.post(E.SHUTDOWN, checkFeatureEnabled(features.shutdownEnabled), APIController.shutdown);
   endpoint.post(E.REBOOT, checkFeatureEnabled(features.rebootEnabled), APIController.reboot);
   endpoint.post(E.LOGCAT, checkFeatureEnabled(features.logcatEnabled), APIController.dumpLogcat);

src/server/api/routes.ts

@@ -6,6 +6,7 @@ export const REST_API_ENDPOINTS = {
   ACTIVITY: "/activity",
   BROADCAST: "/broadcast",
   SERVICE: "/service",
+  DIALOGS: "/closeDialogs",
   SHUTDOWN: "/shutdown",
   REBOOT: "/reboot",
   LOGCAT: "/logcat",