From 715908d14e8c558a8ab6bb6494bce6288e453956 Mon Sep 17 00:00:00 2001
From: Kaarel Kaljurand <kaljurand@gmail.com>
Date: Sat, 18 Jul 2020 14:45:56 +0200
Subject: [PATCH] Add android.permission.QUERY_ALL_PACKAGES (Android v11)

+ small fixes
---
 app/build.gradle                                  | 11 +++++++----
 app/src/main/AndroidManifest.xml                  |  7 +++----
 .../ioc/phon/android/speak/model/RecService.java  | 15 +++++++++++----
 .../ee/ioc/phon/android/speak/utils/Utils.java    |  4 ++--
 build.gradle                                      |  2 +-
 5 files changed, 24 insertions(+), 15 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index d0ae4841..7df6941d 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -26,8 +26,8 @@ android {
         applicationId 'ee.ioc.phon.android.speak'
         minSdkVersion 16
         targetSdkVersion 30
-        versionCode 1733
-        versionName '1.7.33'
+        versionCode 1734
+        versionName '1.7.34'
         vectorDrawables.useSupportLibrary = true
         // Keep only en and et resources
         resConfigs "en", "et"
@@ -85,6 +85,7 @@ if (project.hasProperty('storePassword') &&
     android.signingConfigs.release.storePassword = storePassword
     android.signingConfigs.release.keyPassword = keyPassword
 } else {
+    println "WARNING: The release will not be signed"
     android.buildTypes.release.signingConfig = null
 }
 
@@ -97,11 +98,13 @@ task deploy {
 
         def version = android.defaultConfig.versionName
 
+        def name = 'K6nele'
+
         def outputs = 'build/outputs/'
         def apk1 = outputs + 'apk/release/app-release.apk'
-        def apk2 = "${deploy_dir}K6nele-${version}.apk"
+        def apk2 = "${deploy_dir}${name}-${version}.apk"
         def mapping1 = outputs + 'mapping/release/mapping.txt'
-        def mapping2 = "${deploy_dir}K6nele-mapping-${version}.txt"
+        def mapping2 = "${deploy_dir}${name}-mapping-${version}.txt"
 
         exec {
             commandLine 'cp', '--verbose', apk1, apk2
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 85b27c24..1df5f350 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -42,14 +42,13 @@
     <uses-permission android:name="android.permission.ACCESS_NOTIFICATION_POLICY" />
 
     <!-- TODO: try to avoid having to request this permission.
-    We query packages for 2 reasons:
+    Android v11. We query packages for 3 reasons:
     1) finding speech recognizer providers (this query is declared below in the queries-section)
     2) listing apps (with icon and launch intent) that have previously launched Kõnele
-    It is unclear if the latter use-case can be declared via the queries-section.
+    3) launching intents (e.g. setting the alarm or opening maps) via rewrites
+    It is unclear if use-cases 2 and 3 could be instead declared via the queries-section.
     -->
-    <!--
     <uses-permission android:name="android.permission.QUERY_ALL_PACKAGES" />
-    -->
 
     <!-- Custom permission required by GetPutPreferenceActivity to be able to read/write the Kõnele settings. -->
     <!--
diff --git a/app/src/main/java/ee/ioc/phon/android/speak/model/RecService.java b/app/src/main/java/ee/ioc/phon/android/speak/model/RecService.java
index fad5e45b..bbede010 100644
--- a/app/src/main/java/ee/ioc/phon/android/speak/model/RecService.java
+++ b/app/src/main/java/ee/ioc/phon/android/speak/model/RecService.java
@@ -3,6 +3,7 @@
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
+import android.content.pm.PackageManager;
 import android.content.pm.ServiceInfo;
 import android.graphics.drawable.Drawable;
 import android.util.Pair;
@@ -22,17 +23,23 @@ public class RecService {
     private final ComponentName mComponentName;
 
     public RecService(Context context, String id) {
+        String mDesc1 = "";
         // Can return <null, "">
         Pair<ComponentName, String> pair = RecognitionServiceManager.unflattenFromString(id);
         mComponentName = pair.first;
+
         mLabel = RecognitionServiceManager.getServiceLabel(context, mComponentName);
         ServiceInfo si = RecognitionServiceManager.getServiceInfo(context, mComponentName);
         int resId = si.descriptionRes;
-        if (resId == 0) {
-            mDesc = "";
-        } else {
-            mDesc = context.getString(si.descriptionRes);
+        if (resId != 0) {
+            try {
+                PackageManager manager = context.getPackageManager();
+                mDesc1 = manager.getResourcesForApplication(mComponentName.getPackageName()).getString(resId);
+            } catch (PackageManager.NameNotFoundException e) {
+                // Should not happen
+            }
         }
+        mDesc = mDesc1;
         try {
             mSettingsActivity = RecognitionServiceManager.getSettingsActivity(context, si);
             Log.i(mSettingsActivity);
diff --git a/app/src/main/java/ee/ioc/phon/android/speak/utils/Utils.java b/app/src/main/java/ee/ioc/phon/android/speak/utils/Utils.java
index 7dd2b5cd..20696f89 100644
--- a/app/src/main/java/ee/ioc/phon/android/speak/utils/Utils.java
+++ b/app/src/main/java/ee/ioc/phon/android/speak/utils/Utils.java
@@ -101,7 +101,7 @@ public static String idToValue(Context context, Uri contentUri, String columnId,
      * is Theme.Translucent.NoTitleBar then the dialog is unstyled (maybe an Android bug?)
      */
     public static AlertDialog getLaunchIntentDialog(final AppCompatActivity activity, String msg, final Intent intent) {
-        return new AlertDialog.Builder(activity, android.R.style.Theme_DeviceDefault_Dialog)
+        return new AlertDialog.Builder(activity, R.style.Theme_K6nele_Dialog)
                 .setPositiveButton(activity.getString(R.string.buttonGoToSettings), (dialog, id) -> {
                     activity.startActivity(intent);
                     activity.finish();
@@ -127,7 +127,7 @@ public static AlertDialog getYesNoDialog(Context context, String confirmationMes
     }
 
     public static AlertDialog getYesNoDialog(Context context, String confirmationMessage, final Executable ex1, final Executable ex2) {
-        AlertDialog.Builder builder = new AlertDialog.Builder(context, android.R.style.Theme_DeviceDefault_Dialog);
+        AlertDialog.Builder builder = new AlertDialog.Builder(context, R.style.Theme_K6nele_Dialog);
         builder
                 .setMessage(confirmationMessage)
                 .setCancelable(false)
diff --git a/build.gradle b/build.gradle
index a9184780..65840da3 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.0.0'
+        classpath 'com.android.tools.build:gradle:4.0.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }