From 0bebfdccac2976def563a26c613f4087ba2f6771 Mon Sep 17 00:00:00 2001
From: Irfan Latif <mirfatif@gmail.com>
Date: Sat, 29 Jun 2024 13:31:00 +0500
Subject: [PATCH] v1.26

---
 .../main/PkgLongPressDialogFrag.java          | 10 ++++++---
 .../permissionmanagerx/svc/LogcatSvc.java     |  5 ++++-
 app/src/main/res/values/strings.xml           |  2 ++
 app/src/release/AndroidManifest.xml           | 22 +++++++++++++++++++
 .../metadata/android/en-US/changelogs/126.txt |  1 +
 5 files changed, 36 insertions(+), 4 deletions(-)
 create mode 100644 app/src/release/AndroidManifest.xml
 create mode 100644 fastlane/metadata/android/en-US/changelogs/126.txt

diff --git a/app/src/main/java/com/mirfatif/permissionmanagerx/main/PkgLongPressDialogFrag.java b/app/src/main/java/com/mirfatif/permissionmanagerx/main/PkgLongPressDialogFrag.java
index eb9075c..1c3bedb 100644
--- a/app/src/main/java/com/mirfatif/permissionmanagerx/main/PkgLongPressDialogFrag.java
+++ b/app/src/main/java/com/mirfatif/permissionmanagerx/main/PkgLongPressDialogFrag.java
@@ -174,9 +174,13 @@ private void openAppInfo() {
     }
     int pkgUserId = UserUtils.getUserId(mPkg.getUid());
     if (UserUtils.getUserId() == pkgUserId) {
-      startActivity(
-          new Intent(android.provider.Settings.ACTION_APPLICATION_DETAILS_SETTINGS)
-              .setData(Uri.parse("package:" + mPkg.getName())));
+      try {
+        startActivity(
+            new Intent(android.provider.Settings.ACTION_APPLICATION_DETAILS_SETTINGS)
+                .setData(Uri.parse("package:" + mPkg.getName())));
+      } catch (ActivityNotFoundException ignored) {
+        UiUtils.showToast(R.string.opening_app_info_failed_toast);
+      }
     } else if (DaemonHandler.INS.isDaemonAlive()) {
       BgRunner.execute(() -> DaemonIface.INS.openAppInfo(mPkg.getName(), pkgUserId));
     } else {
diff --git a/app/src/main/java/com/mirfatif/permissionmanagerx/svc/LogcatSvc.java b/app/src/main/java/com/mirfatif/permissionmanagerx/svc/LogcatSvc.java
index 574dadb..22e5f7d 100644
--- a/app/src/main/java/com/mirfatif/permissionmanagerx/svc/LogcatSvc.java
+++ b/app/src/main/java/com/mirfatif/permissionmanagerx/svc/LogcatSvc.java
@@ -92,7 +92,10 @@ public void onDestroy() {
 
     mTimer.cancel();
 
-    mLogWriter.close();
+    var logWriter = mLogWriter;
+    if (logWriter != null) {
+      logWriter.close();
+    }
 
     MySettings.INS.setDebugLog(false);
   }
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index aa2ec8c..ee16ef0 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -435,6 +435,8 @@
   <string name="install">Install</string>
   <!-- CHAR LIMIT: 20 -->
   <string name="wrun_not_installed">WhatsRunning not installed</string>
+  <!-- CHAR LIMIT: 20 -->
+  <string name="opening_app_info_failed_toast">Android failed to open app info</string>
 
   <!-- PackageActivity -->
   <string name="crowdin_comment_break_strings_19" translatable="false">Crowdin comment break</string>
diff --git a/app/src/release/AndroidManifest.xml b/app/src/release/AndroidManifest.xml
new file mode 100644
index 0000000..4a7ccb7
--- /dev/null
+++ b/app/src/release/AndroidManifest.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+  xmlns:tools="http://schemas.android.com/tools">
+
+  <!-- Not required. It's added by build system due to libadb targeting Android SDK < 4 -->
+  <uses-permission
+    android:name="android.permission.READ_PHONE_STATE"
+    tools:node="remove" />
+
+  <!-- Not required. It's added by build system due to libadb targeting Android SDK < 4 -->
+  <uses-permission
+    android:name="android.permission.READ_EXTERNAL_STORAGE"
+    tools:ignore="ScopedStorage"
+    tools:node="remove" />
+
+  <!-- Not required. It's added by build system due to libadb targeting Android SDK < 4 -->
+  <uses-permission
+    android:name="android.permission.WRITE_EXTERNAL_STORAGE"
+    tools:ignore="ScopedStorage"
+    tools:node="remove" />
+
+</manifest>
diff --git a/fastlane/metadata/android/en-US/changelogs/126.txt b/fastlane/metadata/android/en-US/changelogs/126.txt
new file mode 100644
index 0000000..ea6788c
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/126.txt
@@ -0,0 +1 @@
+- Minor fixes and improvements