initial update to checking permission

Author: jbsession

app/src/main/java/org/thoughtcrime/securesms/conversation/v2/utilities/AttachmentManager.java

@@ -24,7 +24,6 @@
 import android.content.ActivityNotFoundException;
 import android.content.Context;
 import android.content.Intent;
-import android.content.pm.PackageManager;
 import android.database.Cursor;
 import android.net.Uri;
 import android.os.AsyncTask;
@@ -35,8 +34,6 @@
 import android.widget.Toast;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-import androidx.core.app.ActivityCompat;
-import androidx.core.content.ContextCompat;
 
 import com.bumptech.glide.RequestManager;
 import com.squareup.phrase.Phrase;
@@ -349,13 +346,13 @@ public static void selectGallery(Activity activity, int requestCode, @NonNull Ad
                 .execute();
     }
 
-    public static boolean hasFullAccess(Activity activity) {
+    public static boolean hasFullAccess(Context c) {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
-            return Permissions.hasAll(activity,
+            return Permissions.hasAll(c,
                     Manifest.permission.READ_MEDIA_IMAGES,
                     Manifest.permission.READ_MEDIA_VIDEO);
         } else {
-            return Permissions.hasAll(activity, android.Manifest.permission.READ_EXTERNAL_STORAGE);
+            return Permissions.hasAll(c, android.Manifest.permission.READ_EXTERNAL_STORAGE);
         }
     }
 
@@ -386,9 +383,9 @@ public static void managePhotoAccess(@NonNull Activity activity, @Nullable Runna
         }
     }
 
-    public static boolean shouldShowManagePhoto(@NonNull Activity activity){
+    public static boolean shouldShowManagePhoto(@NonNull Context c){
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE){
-            return !hasFullAccess(activity) && hasPartialAccess(activity);
+            return !hasFullAccess(c) && hasPartialAccess(c);
         }else{
             // No partial access for <= API 33
             return false;

app/src/main/java/org/thoughtcrime/securesms/mediasend/MediaSendActivity.kt

@@ -55,7 +55,7 @@ import javax.inject.Inject
  * It will return the [Media] that the user decided to send.
  */
 @AndroidEntryPoint
-class MediaSendActivity : ScreenLockActionBarActivity(), MediaPickerFolderFragment.Controller,
+class MediaSendActivity : ScreenLockActionBarActivity(), MediaPickerFolderComposeFragment.Controller,
     MediaPickerItemComposeFragment.Controller, MediaSendFragment.Controller,
     ImageEditorFragment.Controller {
 

app/src/main/java/org/thoughtcrime/securesms/mediasend/MediaSendViewModel.kt

@@ -3,6 +3,7 @@ package org.thoughtcrime.securesms.mediasend
 import android.app.Application
 import android.content.Context
 import android.net.Uri
+import android.os.Build
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.asLiveData
 import com.annimon.stream.Stream
@@ -21,6 +22,8 @@ import org.session.libsignal.utilities.Log
 import org.session.libsignal.utilities.guava.Optional
 import org.thoughtcrime.securesms.ApplicationContext
 import org.thoughtcrime.securesms.InputbarViewModel
+import org.thoughtcrime.securesms.conversation.v2.utilities.AttachmentManager.hasFullAccess
+import org.thoughtcrime.securesms.conversation.v2.utilities.AttachmentManager.hasPartialAccess
 import org.thoughtcrime.securesms.database.RecipientRepository
 import org.thoughtcrime.securesms.mms.MediaConstraints
 import org.thoughtcrime.securesms.pro.ProStatusManager
@@ -337,6 +340,14 @@ class MediaSendViewModel @Inject constructor(
         lastImageCapture = Optional.absent()
     }
 
+    fun refreshPhotoAccessUi() {
+        val show = Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE &&
+                !hasFullAccess(context) &&
+                hasPartialAccess(context)
+
+        _uiState.update { it.copy(showManagePhotoAccess = show) }
+    }
+
     fun saveDrawState(state: Map<Uri, Any>) {
         savedDrawState.clear()
         savedDrawState.putAll(state)
@@ -499,6 +510,7 @@ class MediaSendViewModel @Inject constructor(
         val position: Int = -1,
         val countVisibility: CountButtonState.Visibility = CountButtonState.Visibility.FORCED_OFF,
         val showCameraButton: Boolean = false,
+        val showManagePhotoAccess : Boolean = false
     ) {
         val count: Int get() = selectedMedia.size
 

app/src/main/java/org/thoughtcrime/securesms/mediasend/compose/MediaPickerFolderComposeFragment.kt

@@ -16,6 +16,8 @@ import network.loki.messenger.R
 import org.session.libsession.utilities.StringSubstitutionConstants
 import org.session.libsession.utilities.recipients.Recipient
 import org.session.libsession.utilities.recipients.displayName
+import org.thoughtcrime.securesms.conversation.v2.utilities.AttachmentManager
+import org.thoughtcrime.securesms.mediasend.MediaFolder
 import org.thoughtcrime.securesms.mediasend.MediaPickerFolderFragment
 import org.thoughtcrime.securesms.mediasend.MediaSendViewModel
 import org.thoughtcrime.securesms.ui.setThemedContent
@@ -26,11 +28,11 @@ class MediaPickerFolderComposeFragment : Fragment() {
     private val viewModel: MediaSendViewModel by activityViewModels()
 
     private var recipientName: String? = null
-    private var controller: MediaPickerFolderFragment.Controller? = null
+    private var controller: Controller? = null
 
     override fun onAttach(context: Context) {
         super.onAttach(context)
-        controller = activity as? MediaPickerFolderFragment.Controller
+        controller = activity as? Controller
             ?: throw IllegalStateException("Parent activity must implement controller class.")
     }
 
@@ -42,6 +44,7 @@ class MediaPickerFolderComposeFragment : Fragment() {
     override fun onResume() {
         super.onResume()
         viewModel.onFolderPickerStarted()
+        viewModel.refreshPhotoAccessUi()
     }
 
     override fun onCreateView(
@@ -68,12 +71,19 @@ class MediaPickerFolderComposeFragment : Fragment() {
                     },
                     onFolderClick = { folder ->
                         controller?.onFolderSelected(folder)
-                    }
+                    },
+                    manageMediaAccess = ::manageMediaAccess
                 )
             }
         }
     }
 
+    fun manageMediaAccess() {
+        AttachmentManager.managePhotoAccess(requireActivity()) {
+            viewModel.refreshFolders()
+        }
+    }
+
     companion object {
         private const val KEY_RECIPIENT_NAME = "recipient_name"
 
@@ -85,4 +95,8 @@ class MediaPickerFolderComposeFragment : Fragment() {
             }
         }
     }
+
+    interface Controller {
+        fun onFolderSelected(folder: MediaFolder)
+    }
 }

app/src/main/java/org/thoughtcrime/securesms/mediasend/compose/MediaPickerFolderScreen.kt

@@ -21,17 +21,13 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
-import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalConfiguration
-import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.dimensionResource
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
-import androidx.fragment.app.FragmentActivity
 import network.loki.messenger.R
-import org.thoughtcrime.securesms.conversation.v2.utilities.AttachmentManager
 import org.thoughtcrime.securesms.mediasend.MediaFolder
 import org.thoughtcrime.securesms.mediasend.MediaSendViewModel
 import org.thoughtcrime.securesms.ui.components.BackAppBar
@@ -43,7 +39,8 @@ fun MediaPickerFolderScreen(
     viewModel: MediaSendViewModel,
     onFolderClick: (MediaFolder) -> Unit,
     title: String,
-    handleBack: () -> Unit
+    handleBack: () -> Unit,
+    manageMediaAccess: () -> Unit
 ) {
     val uiState by viewModel.uiState.collectAsState()
 
@@ -57,7 +54,8 @@ fun MediaPickerFolderScreen(
         onFolderClick = onFolderClick,
         title = title,
         handleBack = handleBack,
-        refreshFolders = { viewModel.refreshFolders() }
+        showManageMediaAccess = uiState.showManagePhotoAccess,
+        manageMediaAccess = manageMediaAccess
     )
 }
 
@@ -69,31 +67,24 @@ private fun MediaPickerFolder(
     onFolderClick: (folder: MediaFolder) -> Unit,
     title: String,
     handleBack: () -> Unit,
-    refreshFolders: () -> Unit
+    showManageMediaAccess: Boolean,
+    manageMediaAccess : () -> Unit
 ) {
 
     // span logic: screenWidth / media_picker_folder_width
     val folderWidth = dimensionResource(R.dimen.media_picker_folder_width)
     val columns = maxOf(1, (LocalConfiguration.current.screenWidthDp.dp / folderWidth).toInt())
 
-    val context = LocalContext.current
-    val activity = context as? FragmentActivity
-    val showManage = remember(activity) {
-        activity?.let { AttachmentManager.shouldShowManagePhoto(it) } == true
-    }
-
     Scaffold(
         topBar = {
             BackAppBar(
                 title = title,
                 onBack = handleBack,
                 actions = {
-                    if (showManage && activity != null) {
+                    if (showManageMediaAccess) {
                         IconButton(
                             onClick = {
-                                AttachmentManager.managePhotoAccess(activity) {
-                                    refreshFolders()
-                                }
+                                manageMediaAccess()
                             }
                         ) {
                             Icon(
@@ -159,6 +150,7 @@ private fun MediaPickerFolderPreview() {
         onFolderClick = {},
         title = "Folders",
         handleBack = {},
-        refreshFolders = {}
+        showManageMediaAccess = true,
+        manageMediaAccess = {}
     )
 }