Merge branch 'develop' into release/1.1.2

# Conflicts:
#	app/build.gradle

Author: sds100

app/proguard-rules.pro

@@ -19,3 +19,4 @@
 # If you keep the line number information, uncomment this to
 # hide the original source file name.
 #-renamesourcefileattribute SourceFile
+-keepclassmembers enum * { *; }

app/src/ci/res/values/strings.xml

@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="app_name">Key Mapper CI</string>
+    <string name="ime_service_label" translatable="false">Key Mapper CI Keyboard</string>
 </resources>

app/src/debug/res/values/strings.xml

@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="app_name">Key Mapper Debug</string>
+    <string name="ime_service_label" translatable="false">Key Mapper Debug Keyboard</string>
 </resources>

app/src/main/java/io/github/sds100/keymapper/KeyMap.kt

@@ -63,8 +63,6 @@ class KeyMap(
     }
 
     fun containsTrigger(keyCodes: List<Int>): Boolean {
-        return triggerList.any { trigger ->
-            trigger.keys.toTypedArray().contentEquals(keyCodes.toTypedArray())
-        }
+        return triggerList.any { trigger -> keyCodes.containsAll(trigger.keys) }
     }
 }

app/src/main/java/io/github/sds100/keymapper/activity/IntroActivity.kt

@@ -1,11 +1,13 @@
 package io.github.sds100.keymapper.activity
 
+import android.Manifest
 import android.content.Context
 import android.content.Intent
 import android.os.Build
 import android.os.Bundle
 import android.os.PowerManager
 import android.provider.Settings
+import androidx.annotation.RequiresApi
 import androidx.core.content.edit
 import com.heinrichreimersoftware.materialintro.app.IntroActivity
 import com.heinrichreimersoftware.materialintro.slide.SimpleSlide
@@ -14,13 +16,16 @@ import io.github.sds100.keymapper.Constants
 import io.github.sds100.keymapper.R
 import io.github.sds100.keymapper.util.DexUtils.isDexSupported
 import io.github.sds100.keymapper.util.FirebaseUtils
+import io.github.sds100.keymapper.util.PermissionUtils
+import io.github.sds100.keymapper.util.isPermissionGranted
 import io.github.sds100.keymapper.util.str
 import org.jetbrains.anko.defaultSharedPreferences
 
 /**
  * Created by sds100 on 07/07/2019.
  */
 
+@RequiresApi(Build.VERSION_CODES.M)
 class IntroActivity : IntroActivity() {
 
     companion object {
@@ -93,6 +98,23 @@ class IntroActivity : IntroActivity() {
         }.build()
     }
 
+    private val mDndAccessSlide: Slide by lazy {
+        SimpleSlide.Builder().apply {
+            title(R.string.showcase_dnd_access_title)
+            description(R.string.showcase_dnd_access_description)
+            background(R.color.red)
+            backgroundDark(R.color.redDark)
+            image(R.drawable.ic_do_not_disturb_white_64dp)
+            canGoBackward(true)
+            scrollable(true)
+
+            buttonCtaLabel(R.string.pos_grant)
+            buttonCtaClickListener {
+                PermissionUtils.requestPermission(this@IntroActivity, Manifest.permission.ACCESS_NOTIFICATION_POLICY)
+            }
+        }.build()
+    }
+
     private val currentSlide: Slide
         get() = getSlide(currentSlidePosition)
 
@@ -115,6 +137,10 @@ class IntroActivity : IntroActivity() {
         }
 
         addSlide(mDataCollectionSlide)
+
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+            addSlide(mDndAccessSlide)
+        }
     }
 
     override fun onResume() {
@@ -130,5 +156,10 @@ class IntroActivity : IntroActivity() {
             nextSlide()
             removeSlide(mBatteryOptimisationSlide)
         }
+
+        if (isPermissionGranted(Manifest.permission.ACCESS_NOTIFICATION_POLICY) && currentSlide == mDndAccessSlide) {
+            nextSlide()
+            removeSlide(mDndAccessSlide)
+        }
     }
 }

app/src/main/java/io/github/sds100/keymapper/service/MyIMEService.kt

@@ -12,10 +12,8 @@ import android.view.inputmethod.InputConnection
 import android.view.inputmethod.InputMethodManager
 import io.github.sds100.keymapper.Constants.PACKAGE_NAME
 import io.github.sds100.keymapper.Result
-import io.github.sds100.keymapper.R
 import io.github.sds100.keymapper.handle
 import io.github.sds100.keymapper.result
-import org.jetbrains.anko.toast
 
 /**
  * Created by sds100 on 28/09/2018.
@@ -60,7 +58,8 @@ class MyIMEService : InputMethodService() {
                     Settings.Secure.DEFAULT_INPUT_METHOD
             )
 
-            return chosenImeId.contains(PACKAGE_NAME)
+            val imeManager = ctx.getSystemService(Context.INPUT_METHOD_SERVICE) as InputMethodManager
+            return imeManager.inputMethodList.find { it.id == chosenImeId }?.packageName == PACKAGE_NAME
         }
     }
 

app/src/main/java/io/github/sds100/keymapper/util/ErrorCodeUtils.kt

@@ -47,13 +47,13 @@ object ErrorCodeUtils {
     const val ERROR_CODE_SDK_VERSION_TOO_HIGH = 15
 
     private val FIXABLE_ERRORS = arrayOf(
-            ERROR_CODE_APP_DISABLED,
-            ERROR_CODE_APP_UNINSTALLED,
-            ERROR_CODE_PERMISSION_DENIED,
-            ERROR_CODE_SHORTCUT_NOT_FOUND,
-            ERROR_CODE_IME_SERVICE_NOT_CHOSEN,
-            ERROR_CODE_IME_SERVICE_DISABLED,
-            ERROR_CODE_GOOGLE_APP_NOT_INSTALLED
+        ERROR_CODE_APP_DISABLED,
+        ERROR_CODE_APP_UNINSTALLED,
+        ERROR_CODE_PERMISSION_DENIED,
+        ERROR_CODE_SHORTCUT_NOT_FOUND,
+        ERROR_CODE_IME_SERVICE_NOT_CHOSEN,
+        ERROR_CODE_IME_SERVICE_DISABLED,
+        ERROR_CODE_GOOGLE_APP_NOT_INSTALLED
     )
 
     /**
@@ -75,7 +75,13 @@ object ErrorCodeUtils {
 
             ERROR_CODE_SHORTCUT_NOT_FOUND -> PackageUtils.viewAppOnline(ctx, errorResult.data!!)
 
-            ERROR_CODE_IME_SERVICE_NOT_CHOSEN -> KeyboardUtils.switchToKeyMapperIme(ctx)
+            ERROR_CODE_IME_SERVICE_NOT_CHOSEN -> {
+                if (ctx.haveWriteSecureSettingsPermission) {
+                    KeyboardUtils.switchToKeyMapperIme(ctx)
+                } else {
+                    KeyboardUtils.showInputMethodPicker(ctx)
+                }
+            }
 
             ERROR_CODE_IME_SERVICE_DISABLED -> KeyboardUtils.openImeSettings(ctx)
 

app/src/main/res/drawable/ic_do_not_disturb_white_64dp.xml

@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="64dp"
+    android:height="64dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM17,13L7,13v-2h10v2z" />
+</vector>

app/src/main/res/values/strings.xml

@@ -132,6 +132,7 @@
     <string name="pos_opt_in">Opt in</string>
     <string name="pos_help_page">Help page</string>
     <string name="pos_enable_root_features">Enable root features</string>
+    <string name="pos_grant">Grant</string>
 
     <string name="neg_stay_out">Stay out</string>
     <string name="neg_no">No</string>
@@ -157,7 +158,7 @@
 
     <string name="notification_action_open_app">Open App</string>
     <string name="notification_action_stop_acc_service">Stop Accessibility Service</string>
-    
+
     <string name="notification_keyboard_hidden_title">Keyboard is hidden!</string>
     <string name="notification_keyboard_hidden_text">Tap to start showing the keyboard again.</string>
     <!-- Notification strings -->
@@ -265,6 +266,9 @@
 
     <string name="showcase_data_collection_title">Anonymous analytics</string>
     <string name="showcase_data_collection_message">Do you want to allow Key Mapper to anonymously collect data about how it is used (e.g crash reports)? You have to opt in and the data is collected by Google Firebase. The privacy policy is located in the About activity. Click "opt in" to opt in. If you don\'t then you remain opted out.</string>
+
+    <string name="showcase_dnd_access_title">Do Not Disturb Access</string>
+    <string name="showcase_dnd_access_description">The app needs Do Not Disturb access if you want actions which change the volume and remapped volume buttons to work while in Do Not Disturb mode.</string>
     <!-- Showcase -->
 
     <!-- system action options -->

gradle.properties

@@ -12,4 +12,5 @@ org.gradle.jvmargs=-Xmx1536m
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
 android.useAndroidX=true
-android.enableJetifier=true
+android.enableJetifier=true
+android.enableR8=true