Merge branch 'develop'

Author: tagavari

app/build.gradle

@@ -52,8 +52,8 @@ android {
 		applicationId "me.tagavari.airmessage"
 		minSdkVersion 23
 		targetSdkVersion 31
-		versionName "3.4.0"
-		versionCode 133
+		versionName "3.4.1"
+		versionCode 134
 
 		resConfigs "en", "fr", "ja"
 

app/src/main/java/me/tagavari/airmessage/fragment/FragmentMessagingAttachments.java

@@ -11,7 +11,6 @@
 import android.content.ContentUris;
 import android.content.Context;
 import android.content.Intent;
-import android.content.IntentSender;
 import android.content.pm.PackageManager;
 import android.database.Cursor;
 import android.database.sqlite.SQLiteException;
@@ -38,6 +37,7 @@
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.cardview.widget.CardView;
+import androidx.core.content.ContextCompat;
 import androidx.core.content.FileProvider;
 import androidx.lifecycle.AndroidViewModel;
 import androidx.lifecycle.MutableLiveData;
@@ -172,6 +172,14 @@ public Intent createIntent(@NonNull Context context, @NonNull Uri input) {
 					.putExtra(MediaStore.EXTRA_VIDEO_QUALITY, 0);
 		}
 	}, cameraResultCallback);
+	
+	private Runnable cameraPermissionsCallback = null;
+	private final ActivityResultLauncher<String> requestCameraPermissionLauncher = registerForActivityResult(new ActivityResultContracts.RequestPermission(), granted -> {
+		if(granted && cameraPermissionsCallback != null) {
+			cameraPermissionsCallback.run();
+		}
+	});
+	
 	private final ActivityResultLauncher<Intent> mediaSelectorLauncher = registerForActivityResult(new ActivityResultContracts.StartActivityForResult(), result -> {
 		if(result.getResultCode() != Activity.RESULT_OK) return;
 
@@ -688,6 +696,13 @@ private void setSystemPickerBubbleState(CardView view, boolean bubble, int tileS
 	 * @param video Whether to capture a video instead of a picture
 	 */
 	private void requestCamera(boolean video) {
+		//Check if we need permission
+		if(ContextCompat.checkSelfPermission(requireContext(), Manifest.permission.CAMERA) != PackageManager.PERMISSION_GRANTED) {
+			cameraPermissionsCallback = () -> requestCamera(video);
+			requestCameraPermissionLauncher.launch(Manifest.permission.CAMERA);
+			return;
+		}
+		
 		//Finding a free file
 		File targetFile = AttachmentStorageHelper.prepareContentFile(requireContext(), AttachmentStorageHelper.dirNameDraftPrepare, video ? FileNameConstants.videoName : FileNameConstants.pictureName);
 		viewModel.targetFileIntent = targetFile;

app/src/main/java/me/tagavari/airmessage/util/TaskManagerLongBehavior.kt

@@ -10,7 +10,7 @@ import io.reactivex.rxjava3.subjects.BehaviorSubject
  * A helper class that manages [Observable] running tasks and caching their results in the form of a [BehaviorSubject<T>]
  * @param <T> The result type of this manager's tasks
  */
-class TaskManagerLongBehavior<T> {
+class TaskManagerLongBehavior<T : Any> {
 	private val requestMap = LongSparseArray<BehaviorSubject<T>>()
 
 	/**
@@ -22,11 +22,14 @@ class TaskManagerLongBehavior<T> {
 	@CheckReturnValue
 	fun run(id: Long, taskSupplier: Supplier<Observable<T>>): BehaviorSubject<T> {
 		//If we already have a request with a matching key, return that
-		var subject = requestMap[id]
-		if(subject != null && subject.throwable == null) return subject
+		requestMap[id]?.let { subject ->
+			if(subject.throwable != null) {
+				return subject
+			}
+		}
 
 		//Otherwise, create a new request
-		subject = BehaviorSubject.create()
+		val subject = BehaviorSubject.create<T>()
 		requestMap.put(id, subject)
 		taskSupplier.get().subscribe(subject)
 		return subject