From d78ef5648930361e37a8cdeee6d2f07717a59ea4 Mon Sep 17 00:00:00 2001
From: Matthieu <24-artectrex@users.noreply.shinice.net>
Date: Thu, 3 Nov 2022 15:16:27 +0100
Subject: [PATCH] Update permissions

---
 app/src/main/AndroidManifest.xml              | 11 ++--------
 .../java/org/pixeldroid/app/MainActivity.kt   | 21 +++++++++++++++++--
 .../NotificationsWorker.kt                    | 13 ++++++++++--
 3 files changed, 32 insertions(+), 13 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 8334af4a..39ff12e9 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -4,6 +4,7 @@
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+    <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.CAMERA" />
 
@@ -20,13 +21,11 @@
 
     <application
         android:name=".utils.PixelDroidApplication"
-        android:allowBackup="false"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
-        android:theme="@style/AppTheme"
-        tools:replace="android:allowBackup">
+        android:theme="@style/AppTheme">
         <activity
             android:name=".posts.AlbumActivity"
             android:exported="false"
@@ -135,12 +134,6 @@
                     android:scheme="@string/auth_scheme" />
             </intent-filter>
         </activity>
-        <activity
-            android:name="com.yalantis.ucrop.UCropActivity"
-            android:exported="true"
-            android:screenOrientation="sensorPortrait"
-            android:theme="@style/AppTheme.NoActionBar"
-            tools:ignore="LockedOrientationActivity" />
         <activity
             android:name=".searchDiscover.SearchActivity"
             android:exported="true"
diff --git a/app/src/main/java/org/pixeldroid/app/MainActivity.kt b/app/src/main/java/org/pixeldroid/app/MainActivity.kt
index 3042802f..4c0e1f74 100644
--- a/app/src/main/java/org/pixeldroid/app/MainActivity.kt
+++ b/app/src/main/java/org/pixeldroid/app/MainActivity.kt
@@ -1,15 +1,21 @@
 package org.pixeldroid.app
 
+import android.Manifest
 import android.content.Context
 import android.content.Intent
+import android.content.pm.PackageManager
 import android.graphics.drawable.Drawable
 import android.net.Uri
+import android.os.Build
 import android.os.Bundle
 import android.util.Log
 import android.view.MenuItem
 import android.view.View
 import android.widget.ImageView
+import androidx.activity.result.contract.ActivityResultContracts
+import androidx.appcompat.app.AlertDialog
 import androidx.appcompat.app.AppCompatActivity
+import androidx.core.app.ActivityCompat
 import androidx.core.content.ContextCompat
 import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
 import androidx.core.view.GravityCompat
@@ -121,11 +127,22 @@ class MainActivity : BaseThemedWithoutBarActivity() {
             if(showNotification){
                 binding.viewPager.currentItem = 3
             }
-
-            enablePullNotifications(this)
+            if (ActivityCompat.checkSelfPermission(applicationContext,
+                    Manifest.permission.POST_NOTIFICATIONS
+                ) == PackageManager.PERMISSION_GRANTED
+            ) enablePullNotifications(this)
+            else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+                notificationPermissionLauncher.launch(Manifest.permission.POST_NOTIFICATIONS)
+            }
         }
     }
 
+    private val notificationPermissionLauncher = registerForActivityResult(
+        ActivityResultContracts.RequestPermission()
+    ) { isGranted: Boolean ->
+        if (isGranted) enablePullNotifications(this)
+    }
+
     // Checks if the activity was launched from a notification from another account than the
     // current active one, and if so switches to that account
     private fun notificationFromOtherUser(): Boolean {
diff --git a/app/src/main/java/org/pixeldroid/app/utils/notificationsWorker/NotificationsWorker.kt b/app/src/main/java/org/pixeldroid/app/utils/notificationsWorker/NotificationsWorker.kt
index af1d924e..0637f796 100644
--- a/app/src/main/java/org/pixeldroid/app/utils/notificationsWorker/NotificationsWorker.kt
+++ b/app/src/main/java/org/pixeldroid/app/utils/notificationsWorker/NotificationsWorker.kt
@@ -1,12 +1,15 @@
 package org.pixeldroid.app.utils.notificationsWorker
 
+import android.Manifest
 import android.app.NotificationChannel
 import android.app.NotificationChannelGroup
 import android.app.NotificationManager
 import android.app.PendingIntent
 import android.content.Context
 import android.content.Intent
+import android.content.pm.PackageManager
 import android.os.Build
+import androidx.core.app.ActivityCompat
 import androidx.core.app.NotificationCompat
 import androidx.core.app.NotificationManagerCompat
 import androidx.work.CoroutineWorker
@@ -143,7 +146,10 @@ class NotificationsWorker(
             )
 
         with(NotificationManagerCompat.from(applicationContext)) {
-            notify(uniqueUserId.hashCode(), groupBuilder.build())
+            if (ActivityCompat.checkSelfPermission(applicationContext,
+                    Manifest.permission.POST_NOTIFICATIONS
+                ) == PackageManager.PERMISSION_GRANTED
+            ) notify(uniqueUserId.hashCode(), groupBuilder.build())
         }
 
     }
@@ -216,7 +222,10 @@ class NotificationsWorker(
 
         with(NotificationManagerCompat.from(applicationContext)) {
             // notificationId is a unique int for each notification
-            notify((uniqueUserId + notification.id).hashCode(), builder.build())
+            if (ActivityCompat.checkSelfPermission(applicationContext,
+                    Manifest.permission.POST_NOTIFICATIONS
+                ) == PackageManager.PERMISSION_GRANTED
+            ) notify((uniqueUserId + notification.id).hashCode(), builder.build())
         }
     }