Use plain Activity Results API to avoid having to raise compile/target SDK version

Author: lfkellogg

firebase-appdistribution/firebase-appdistribution.gradle

@@ -22,11 +22,11 @@ firebaseLibrary {
 }
 
 android {
-    compileSdk 31
+    compileSdkVersion project.targetSdkVersion
 
     defaultConfig {
         minSdkVersion 16
-        targetSdkVersion 31
+        targetSdkVersion project.targetSdkVersion
         multiDexEnabled true
         versionName version
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@@ -71,7 +71,6 @@ dependencies {
 
     compileOnly 'com.google.auto.value:auto-value-annotations:1.6.5'
     annotationProcessor 'com.google.auto.value:auto-value:1.6.5'
-    implementation 'androidx.activity:activity:1.6.1'
     implementation 'androidx.appcompat:appcompat:1.3.1'
     implementation "androidx.browser:browser:1.3.0"
     implementation "androidx.constraintlayout:constraintlayout:2.1.4"

firebase-appdistribution/src/main/java/com/google/firebase/appdistribution/impl/FeedbackActivity.java

@@ -17,6 +17,8 @@
 import static android.view.View.GONE;
 import static android.view.View.VISIBLE;
 
+import android.app.Activity;
+import android.content.Intent;
 import android.graphics.Bitmap;
 import android.net.Uri;
 import android.os.Bundle;
@@ -27,9 +29,9 @@
 import android.widget.ImageView;
 import android.widget.TextView;
 import android.widget.Toast;
+import androidx.activity.result.ActivityResult;
 import androidx.activity.result.ActivityResultLauncher;
-import androidx.activity.result.PickVisualMediaRequest;
-import androidx.activity.result.contract.ActivityResultContracts.PickVisualMedia;
+import androidx.activity.result.contract.ActivityResultContracts.StartActivityForResult;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.AppCompatActivity;
@@ -52,6 +54,9 @@ public class FeedbackActivity extends AppCompatActivity {
   public static final String SCREENSHOT_URI_KEY =
       "com.google.firebase.appdistribution.FeedbackActivity.SCREENSHOT_URI";
 
+  private final ActivityResultLauncher<Intent> chooseScreenshotLauncher =
+      registerForActivityResult(new StartActivityForResult(), this::handleChooseScreenshotResult);
+
   @Inject FeedbackSender feedbackSender;
   @Inject @Blocking Executor blockingExecutor;
   @Inject @UiThread Executor uiThreadExecutor;
@@ -81,6 +86,7 @@ protected void onCreate(Bundle savedInstanceState) {
         screenshotUri = Uri.parse(getIntent().getStringExtra(SCREENSHOT_URI_KEY));
       }
     }
+
     setupView();
   }
 
@@ -103,27 +109,14 @@ private void setupView() {
     findViewById(R.id.backButton).setOnClickListener(v -> finish());
     findViewById(R.id.sendButton).setOnClickListener(this::submitFeedback);
 
-    // Registers a photo picker activity launcher in single-select mode
-    ActivityResultLauncher<PickVisualMediaRequest> pickMedia =
-        registerForActivityResult(
-            new PickVisualMedia(),
-            uri -> {
-              if (uri != null) {
-                LogWrapper.d(TAG, "Selected custom screenshot URI: " + uri);
-                screenshotUri = uri;
-                setupScreenshot();
-              } else {
-                LogWrapper.d(TAG, "No custom screenshot selected. Not changing screenshot URI.");
-              }
-            });
-
     findViewById(R.id.chooseScreenshotButton)
         .setOnClickListener(
-            v ->
-                pickMedia.launch(
-                    new PickVisualMediaRequest.Builder()
-                        .setMediaType(new PickVisualMedia.SingleMimeType("image/png"))
-                        .build()));
+            v -> {
+              Intent intent = new Intent(Intent.ACTION_OPEN_DOCUMENT);
+              intent.addCategory(Intent.CATEGORY_OPENABLE);
+              intent.setType("image/png");
+              chooseScreenshotLauncher.launch(intent);
+            });
 
     setupScreenshot();
   }
@@ -157,6 +150,19 @@ private void setupScreenshot() {
         });
   }
 
+  private void handleChooseScreenshotResult(ActivityResult activityResult) {
+    int resultCode = activityResult.getResultCode();
+    Intent intent = activityResult.getData();
+    if (resultCode == Activity.RESULT_OK && intent != null && intent.getData() != null) {
+      Uri uri = intent.getData();
+      LogWrapper.d(TAG, "Selected custom screenshot URI: " + uri);
+      screenshotUri = uri;
+      setupScreenshot();
+    } else {
+      LogWrapper.d(TAG, "No custom screenshot selected. Not changing screenshot URI.");
+    }
+  }
+
   @Nullable
   private Bitmap readScreenshot(@Nullable Uri uri) {
     if (uri == null) {