Merge fab390f into 4d64675

Author: kaibolay

firebase-appdistribution-api/src/main/java/com/google/firebase/appdistribution/FirebaseAppDistribution.java

@@ -177,7 +177,7 @@ public interface FirebaseAppDistribution {
    * @param screenshot URI to a bitmap containing a screenshot that will be included with the
    *     report, or null to not include a screenshot
    */
-  void startFeedback(@NonNull CharSequence infoText, @Nullable Uri screenshotUri);
+  void startFeedback(@NonNull CharSequence infoText, @Nullable Uri screenshot);
 
   /** Gets the singleton {@link FirebaseAppDistribution} instance. */
   @NonNull

firebase-appdistribution/test-app/src/main/java/com/googletest/firebase/appdistribution/testapp/MainActivity.kt

@@ -46,7 +46,6 @@ class MainActivity : AppCompatActivity() {
     lateinit var feedbackTriggerMenu: TextInputLayout
 
     var updateTask: Task<Void>? = null
-    var release: AppDistributionRelease? = null
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -67,6 +66,10 @@ class MainActivity : AppCompatActivity() {
         signInStatus = findViewById(R.id.sign_in_status)
         progressBar = findViewById(R.id.progress_bar)
 
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+            NotificationFeedbackTrigger.requestPermission(this)
+        }
+
         // Set up feedback trigger menu
         feedbackTriggerMenu = findViewById(R.id.feedbackTriggerMenu)
         val items = listOf(
@@ -181,10 +184,11 @@ class MainActivity : AppCompatActivity() {
             firebaseAppDistribution
                 .checkForNewRelease()
                 .addOnSuccessListener {
-                    setupUI(
-                        isSignedIn = firebaseAppDistribution.isTesterSignedIn,
-                        isUpdateAvailable = it != null,
-                        release = it)
+                        release ->
+                            setupUI(
+                                isSignedIn = firebaseAppDistribution.isTesterSignedIn,
+                                isUpdateAvailable = release != null,
+                                release = release)
                 }
                 .addOnFailureListener { failureListener(it) }
         }
@@ -194,11 +198,11 @@ class MainActivity : AppCompatActivity() {
                 firebaseAppDistribution
                     .checkForNewRelease()
                     .addOnSuccessListener {
-                        release = it
-                        setupUI(
-                            isSignedIn = firebaseAppDistribution.isTesterSignedIn,
-                            isUpdateAvailable = release != null,
-                            release = release)
+                            release ->
+                                setupUI(
+                                    isSignedIn = firebaseAppDistribution.isTesterSignedIn,
+                                    isUpdateAvailable = release != null,
+                                    release = release)
                     }
                     .addOnFailureListener { failureListener(it) }
             }