v1.7.3

- fix dialog not showing
Yanndroid · Dec 22, 2023 · 4a4a299 · 4a4a299
1 parent da5ac8b
commit 4a4a299
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 7 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -19,8 +19,8 @@ android {
         applicationId "de.dlyt.yanndroid.notinotes"
         minSdk 26
         targetSdk 34
-        versionCode 13
-        versionName "1.7.2"
+        versionCode 14
+        versionName "1.7.3"
 
         resConfigs locales
     }
@@ -30,6 +30,10 @@ android {
             minifyEnabled true
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
+        debug {
+            minifyEnabled true
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+        }
     }
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8

diff --git a/app/release/app-release.aab b/app/release/app-release.aab
diff --git a/app/release/app-release.apk b/app/release/app-release.apk
diff --git a/app/release/output-metadata.json b/app/release/output-metadata.json
@@ -11,8 +11,8 @@
       "type": "SINGLE",
       "filters": [],
       "attributes": [],
-      "versionCode": 13,
-      "versionName": "1.7.2",
+      "versionCode": 14,
+      "versionName": "1.7.3",
       "outputFile": "app-release.apk"
     }
   ],

diff --git a/app/src/main/java/de/dlyt/yanndroid/notinotes/DialogActivity.kt b/app/src/main/java/de/dlyt/yanndroid/notinotes/DialogActivity.kt
@@ -55,9 +55,12 @@ class DialogActivity : AppCompatActivity() {
             }
         }
 
-        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.S) {
+        try {
             sendBroadcast(Intent(Intent.ACTION_CLOSE_SYSTEM_DIALOGS))
+        } catch (e: SecurityException) {
+            e.printStackTrace()
         }
+
         mKeyguardManager = getSystemService(Context.KEYGUARD_SERVICE) as KeyguardManager
         mKeyguardManager.requestDismissKeyguard(this, null)
 

diff --git a/app/src/main/java/de/dlyt/yanndroid/notinotes/Notification.kt b/app/src/main/java/de/dlyt/yanndroid/notinotes/Notification.kt
@@ -2,7 +2,9 @@ package de.dlyt.yanndroid.notinotes
 
 import android.app.NotificationChannel
 import android.app.NotificationManager
+import android.app.PendingIntent
 import android.content.Context
+import android.content.Intent
 import android.content.res.Configuration
 import android.graphics.Color
 import android.view.LayoutInflater
@@ -50,15 +52,15 @@ class Notification {
                 .addAction(
                     R.drawable.ic_edit,
                     context.getString(R.string.edit),
-                    ActionReceiver.getPendingIntent(context, note, ActionReceiver.ACTION_EDIT)
+                    getPendingIntentActivity(context, note, ActionReceiver.ACTION_EDIT)
                 )
                 .addAction(
                     R.drawable.ic_delete,
                     context.getString(R.string.del),
                     ActionReceiver.getPendingIntent(context, note, ActionReceiver.ACTION_DELETE)
                 )
                 .setContentIntent(
-                    ActionReceiver.getPendingIntent(context, note, ActionReceiver.ACTION_SHOW)
+                    getPendingIntentActivity(context, note, ActionReceiver.ACTION_SHOW)
                 )
                 .setDeleteIntent(
                     ActionReceiver.getPendingIntent(context, note, ActionReceiver.ACTION_DISMISS)
@@ -117,5 +119,18 @@ class Notification {
             )
         }
 
+        private fun getPendingIntentActivity(context: Context, note: Notes.Note, action: String): PendingIntent {
+            val intent = Intent(context, DialogActivity::class.java)
+            intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+            intent.action = action
+            intent.putExtra(ActionReceiver.EXTRA_NOTE, note)
+            return PendingIntent.getActivity(
+                context,
+                note.id,
+                intent,
+                PendingIntent.FLAG_IMMUTABLE or PendingIntent.FLAG_UPDATE_CURRENT
+            )
+        }
+
     }
 }