Merge remote-tracking branch 'origin/dconeybe/CountFromDFE' into dconeybe/CountFromDFE

Author: wu-hui

buildSrc/src/main/java/com/google/firebase/gradle/plugins/license/ThirdPartyLicensesExtension.java

@@ -14,6 +14,7 @@
 
 package com.google.firebase.gradle.plugins.license;
 
+import java.io.File;
 import java.io.Serializable;
 import java.net.URI;
 import java.util.ArrayList;
@@ -27,18 +28,25 @@ public class ThirdPartyLicensesExtension {
    * supported
    */
   public void add(String name, String... licenseUris) {
-    customLicenses.add(new CustomLicense(name, licenseUris));
+    customLicenses.add(CustomLicense.buildFromStrings(name, licenseUris));
   }
 
   static class CustomLicense implements Serializable {
     final String name;
-    final List<URI> licenseUris = new ArrayList<>();
+    final List<URI> licenseUris;
 
-    CustomLicense(String name, String[] licenseUris) {
+    CustomLicense(String name, List<URI> licenseUris) {
       this.name = name;
+      this.licenseUris = licenseUris;
+    }
+
+    static CustomLicense buildFromStrings(String name, String[] licenseUris) {
+      List<URI> uris = new ArrayList<>();
       for (String s : licenseUris) {
-        this.licenseUris.add(URI.create(s));
+        File file = new File(s);
+        uris.add(file.toURI());
       }
+      return new CustomLicense(name, uris);
     }
   }
 

buildSrc/src/main/java/com/google/firebase/gradle/plugins/publish/PublishingPlugin.java

@@ -17,7 +17,7 @@
 import com.google.common.collect.ImmutableMap;
 import com.google.firebase.gradle.plugins.FirebaseLibraryExtension;
 import digital.wup.android_maven_publish.AndroidMavenPublishPlugin;
-import java.net.URI;
+import java.io.File;
 import java.util.Arrays;
 import java.util.Set;
 import java.util.stream.Collectors;
@@ -118,11 +118,9 @@ public void apply(Project project) {
                         repos ->
                             repos.maven(
                                 repo -> {
-                                  repo.setUrl(
-                                      URI.create(
-                                          "file://"
-                                              + sub.getRootProject().getBuildDir()
-                                              + "/m2repository"));
+                                  String s = sub.getRootProject().getBuildDir() + "/m2repository";
+                                  File file = new File(s);
+                                  repo.setUrl(file.toURI());
                                   repo.setName("BuildDir");
                                 }));
                     publishing.publications(

buildSrc/src/test/kotlin/com/google/firebase/gradle/plugins/LicenseResolverPluginTests.kt

@@ -79,7 +79,7 @@ class LicenseResolverPluginTests {
             android.compileSdkVersion = 26
 
             thirdPartyLicenses {
-                add 'customLib', "file:///${File("non_existent_path.txt").absolutePath}"
+                add 'customLib', "${File("non_existent_path.txt").absolutePath}"
             }
         """)
 
@@ -141,7 +141,7 @@ class LicenseResolverPluginTests {
         }
 
         thirdPartyLicenses {
-            add 'customLib1', "file:///${File("src/test/fixtures/license.txt").absolutePath}"
+            add 'customLib1', "${File("src/test/fixtures/license.txt").absolutePath}"
         }
         """
     }

firebase-appdistribution-api/api.txt

@@ -15,6 +15,7 @@ package com.google.firebase.appdistribution {
 
   public interface FirebaseAppDistribution {
     method @NonNull public com.google.android.gms.tasks.Task<com.google.firebase.appdistribution.AppDistributionRelease> checkForNewRelease();
+    method public void collectAndSendFeedback();
     method @NonNull public static com.google.firebase.appdistribution.FirebaseAppDistribution getInstance();
     method public boolean isTesterSignedIn();
     method @NonNull public com.google.android.gms.tasks.Task<java.lang.Void> signInTester();

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

@@ -109,6 +109,20 @@ public interface FirebaseAppDistribution {
   @NonNull
   UpdateTask updateApp();
 
+  /**
+   * Takes a screenshot, and starts an activity to collect and submit feedback from the tester.
+   *
+   * <p>Performs the following actions:
+   *
+   * <ol>
+   *   <li>Takes a screenshot of the current activity
+   *   <li>If tester is not signed in, presents the tester with a Google Sign-in UI
+   *   <li>Looks up the currently installed App Distribution release
+   *   <li>Starts a full screen activity for the tester to compose and submit the feedback
+   * </ol>
+   */
+  void collectAndSendFeedback();
+
   /** Gets the singleton {@link FirebaseAppDistribution} instance. */
   @NonNull
   static FirebaseAppDistribution getInstance() {

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

@@ -24,7 +24,6 @@ public interface UpdateProgress {
    * @returns the number of bytes downloaded, or -1 if called when updating to an AAB or if no new
    *     release is available.
    */
-  @NonNull
   long getApkBytesDownloaded();
 
   /**
@@ -33,7 +32,6 @@ public interface UpdateProgress {
    * @returns the file size in bytes, or -1 if called when updating to an AAB or if no new release
    *     is available.
    */
-  @NonNull
   long getApkFileTotalBytes();
 
   /** Returns the current {@link UpdateStatus} of the update. */

firebase-appdistribution-api/src/main/java/com/google/firebase/appdistribution/internal/FirebaseAppDistributionProxy.java

@@ -71,4 +71,9 @@ public synchronized Task<AppDistributionRelease> checkForNewRelease() {
   public UpdateTask updateApp() {
     return delegate.updateApp();
   }
+
+  @Override
+  public void collectAndSendFeedback() {
+    delegate.collectAndSendFeedback();
+  }
 }

firebase-appdistribution-api/src/main/java/com/google/firebase/appdistribution/internal/FirebaseAppDistributionStub.java

@@ -73,6 +73,11 @@ public UpdateTask updateApp() {
     return new NotImplementedUpdateTask();
   }
 
+  @Override
+  public void collectAndSendFeedback() {
+    return;
+  }
+
   private static <TResult> Task<TResult> getNotImplementedTask() {
     return Tasks.forException(
         new FirebaseAppDistributionException(

firebase-appdistribution/firebase-appdistribution.gradle

@@ -63,4 +63,5 @@ dependencies {
     annotationProcessor 'com.google.auto.value:auto-value:1.6.5'
     implementation 'androidx.appcompat:appcompat:1.3.0'
     implementation "androidx.browser:browser:1.3.0"
+    implementation "androidx.constraintlayout:constraintlayout:2.1.4"
 }

firebase-appdistribution/src/main/AndroidManifest.xml

@@ -29,6 +29,7 @@
                 android:name="com.google.firebase.components:com.google.firebase.appdistribution.impl.FirebaseAppDistributionRegistrar"
                 android:value="com.google.firebase.components.ComponentRegistrar" />
         </service>
+
         <!-- The launch mode for Install Activity is singleTask to ensure that after the unknown sources UI
         or the installation flow is complete, the Install Activity does not get recreated which causes loss of state
          See here for more info - https://developer.android.com/guide/components/activities/tasks-and-back-stack#ManifestForTasks -->
@@ -45,6 +46,11 @@
             </intent-filter>
         </activity>
 
+        <activity
+            android:name=".FeedbackActivity"
+            android:exported="false"
+            android:theme="@style/Theme.AppCompat.Light.NoActionBar" />
+
         <provider
             android:name="com.google.firebase.appdistribution.impl.FirebaseAppDistributionFileProvider"
             android:authorities="${applicationId}.FirebaseAppDistributionFileProvider"

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

@@ -26,7 +26,7 @@ class ErrorMessages {
       "Failed to authenticate the tester. The tester was either not signed in, or something went wrong. Try signing in again.";
 
   static final String AUTHORIZATION_ERROR =
-      "Failed to authorize the tester. The tester is not authorized to test this app. Verify that the tester has accepted an invitation to test this app.";
+      "Failed to authorize the tester. The tester does not have access to this resource (or it may not exist).";
 
   static final String AUTHENTICATION_CANCELED = "Tester canceled the authentication flow.";
 
@@ -46,7 +46,7 @@ class ErrorMessages {
       "Download URL not found. This was a most likely due to a transient condition and may be corrected by retrying.";
 
   static final String HOST_ACTIVITY_INTERRUPTED =
-      "Host activity interrupted while dialog was showing. Try calling updateIfNewReleaseAvailable() again.";
+      "Host activity interrupted while dialog was showing. Try calling the API again.";
 
   static final String APK_INSTALLATION_FAILED =
       "The APK failed to install or installation was canceled by the tester.";

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

@@ -0,0 +1,70 @@
+// Copyright 2022 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package com.google.firebase.appdistribution.impl;
+
+import android.graphics.Bitmap;
+import android.os.Bundle;
+import android.view.View;
+import android.widget.EditText;
+import android.widget.Toast;
+import androidx.appcompat.app.AppCompatActivity;
+
+/** Activity for tester to compose and submit feedback. */
+public class FeedbackActivity extends AppCompatActivity {
+
+  private static final String TAG = "FeedbackActivity";
+
+  public static final String RELEASE_NAME_EXTRA_KEY =
+      "com.google.firebase.appdistribution.FeedbackActivity.RELEASE_NAME";
+  public static final String SCREENSHOT_EXTRA_KEY =
+      "com.google.firebase.appdistribution.FeedbackActivity.SCREENSHOT";
+
+  private FeedbackSender feedbackSender;
+  private String releaseName;
+  private Bitmap screenshot;
+
+  @Override
+  protected void onCreate(Bundle savedInstanceState) {
+    super.onCreate(savedInstanceState);
+    releaseName = getIntent().getStringExtra(RELEASE_NAME_EXTRA_KEY);
+    screenshot = getIntent().getParcelableExtra(SCREENSHOT_EXTRA_KEY);
+    feedbackSender = FeedbackSender.getInstance();
+    setContentView(R.layout.activity_feedback);
+  }
+
+  public void submitFeedback(View view) {
+    setSubmittingStateEnabled(true);
+    EditText feedbackText = (EditText) findViewById(R.id.feedbackText);
+    feedbackSender
+        .sendFeedback(releaseName, feedbackText.getText().toString(), screenshot)
+        .addOnSuccessListener(
+            unused -> {
+              LogWrapper.getInstance().i(TAG, "Feedback submitted");
+              Toast.makeText(this, "Feedback submitted", Toast.LENGTH_LONG).show();
+              finish();
+            })
+        .addOnFailureListener(
+            e -> {
+              LogWrapper.getInstance().e(TAG, "Failed to submit feedback", e);
+              Toast.makeText(this, "Error submitting feedback", Toast.LENGTH_LONG).show();
+              setSubmittingStateEnabled(false);
+            });
+  }
+
+  public void setSubmittingStateEnabled(boolean loading) {
+    findViewById(R.id.submitButton).setVisibility(loading ? View.INVISIBLE : View.VISIBLE);
+    findViewById(R.id.loadingLabel).setVisibility(loading ? View.VISIBLE : View.INVISIBLE);
+  }
+}

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

@@ -0,0 +1,42 @@
+// Copyright 2022 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package com.google.firebase.appdistribution.impl;
+
+import android.graphics.Bitmap;
+import com.google.android.gms.tasks.Task;
+import com.google.firebase.FirebaseApp;
+
+/** Sends tester feedback to the Tester API. */
+class FeedbackSender {
+
+  private final FirebaseAppDistributionTesterApiClient testerApiClient;
+
+  FeedbackSender(FirebaseAppDistributionTesterApiClient testerApiClient) {
+    this.testerApiClient = testerApiClient;
+  }
+
+  /** Get an instance of FeedbackSender. */
+  static FeedbackSender getInstance() {
+    return FirebaseApp.getInstance().get(FeedbackSender.class);
+  }
+
+  /** Send feedback text and screenshot to the Tester API for the given release. */
+  Task<Void> sendFeedback(String releaseName, String feedbackText, Bitmap screenshot) {
+    return testerApiClient
+        .createFeedback(releaseName, feedbackText)
+        .onSuccessTask(feedbackName -> testerApiClient.attachScreenshot(feedbackName, screenshot))
+        .onSuccessTask(testerApiClient::commitFeedback);
+  }
+}