Add @StringRes annotation

Author: lfkellogg

firebase-appdistribution-api/api.txt

@@ -18,13 +18,13 @@ package com.google.firebase.appdistribution {
     method @NonNull public com.google.android.gms.tasks.Task<com.google.firebase.appdistribution.AppDistributionRelease> checkForNewRelease();
     method @NonNull public static com.google.firebase.appdistribution.FirebaseAppDistribution getInstance();
     method public boolean isTesterSignedIn();
-    method public void showFeedbackNotification(int, @NonNull com.google.firebase.appdistribution.InterruptionLevel);
+    method public void showFeedbackNotification(@StringRes int, @NonNull com.google.firebase.appdistribution.InterruptionLevel);
     method public void showFeedbackNotification(@NonNull CharSequence, @NonNull com.google.firebase.appdistribution.InterruptionLevel);
     method @NonNull public com.google.android.gms.tasks.Task<java.lang.Void> signInTester();
     method public void signOutTester();
-    method public void startFeedback(int);
+    method public void startFeedback(@StringRes int);
     method public void startFeedback(@NonNull CharSequence);
-    method public void startFeedback(int, @Nullable android.net.Uri);
+    method public void startFeedback(@StringRes int, @Nullable android.net.Uri);
     method public void startFeedback(@NonNull CharSequence, @Nullable android.net.Uri);
     method @NonNull public com.google.firebase.appdistribution.UpdateTask updateApp();
     method @NonNull public com.google.firebase.appdistribution.UpdateTask updateIfNewReleaseAvailable();

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

@@ -18,6 +18,7 @@
 import android.net.Uri;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.annotation.StringRes;
 import com.google.android.gms.tasks.Task;
 import com.google.firebase.FirebaseApp;
 import com.google.firebase.appdistribution.internal.FirebaseAppDistributionProxy;
@@ -127,7 +128,7 @@ public interface FirebaseAppDistribution {
    * @param infoTextResourceId string resource ID of text to display to the tester before collecting
    *     feedback data (e.g. Terms and Conditions)
    */
-  void startFeedback(int infoTextResourceId);
+  void startFeedback(@StringRes int infoTextResourceId);
 
   /**
    * Takes a screenshot, and starts an activity to collect and submit feedback from the tester.
@@ -161,7 +162,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(int infoTextResourceId, @Nullable Uri screenshot);
+  void startFeedback(@StringRes int infoTextResourceId, @Nullable Uri screenshot);
 
   /**
    * Starts an activity to collect and submit feedback from the tester, along with the given
@@ -207,7 +208,7 @@ public interface FirebaseAppDistribution {
    *     be changed except by the user.
    */
   void showFeedbackNotification(
-      int infoTextResourceId, @NonNull InterruptionLevel interruptionLevel);
+      @StringRes int infoTextResourceId, @NonNull InterruptionLevel interruptionLevel);
 
   /**
    * Displays a notification that, when tapped, will take a screenshot of the current activity, then

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

@@ -17,6 +17,7 @@
 import android.net.Uri;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.annotation.StringRes;
 import com.google.android.gms.tasks.Task;
 import com.google.firebase.appdistribution.AppDistributionRelease;
 import com.google.firebase.appdistribution.FirebaseAppDistribution;
@@ -76,7 +77,7 @@ public UpdateTask updateApp() {
   }
 
   @Override
-  public void startFeedback(int infoTextResourceId) {
+  public void startFeedback(@StringRes int infoTextResourceId) {
     delegate.startFeedback(infoTextResourceId);
   }
 
@@ -86,7 +87,7 @@ public void startFeedback(@NonNull CharSequence infoText) {
   }
 
   @Override
-  public void startFeedback(int infoTextResourceId, @Nullable Uri screenshotUri) {
+  public void startFeedback(@StringRes int infoTextResourceId, @Nullable Uri screenshotUri) {
     delegate.startFeedback(infoTextResourceId, screenshotUri);
   }
 
@@ -97,7 +98,7 @@ public void startFeedback(@NonNull CharSequence infoText, @Nullable Uri screensh
 
   @Override
   public void showFeedbackNotification(
-      int infoTextResourceId, @NonNull InterruptionLevel interruptionLevel) {
+      @StringRes int infoTextResourceId, @NonNull InterruptionLevel interruptionLevel) {
     delegate.showFeedbackNotification(infoTextResourceId, interruptionLevel);
   }
 

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

@@ -18,6 +18,7 @@
 import android.net.Uri;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.annotation.StringRes;
 import com.google.android.gms.tasks.Continuation;
 import com.google.android.gms.tasks.OnCanceledListener;
 import com.google.android.gms.tasks.OnCompleteListener;
@@ -74,20 +75,20 @@ public UpdateTask updateApp() {
   }
 
   @Override
-  public void startFeedback(int infoTextResourceId) {}
+  public void startFeedback(@StringRes int infoTextResourceId) {}
 
   @Override
   public void startFeedback(@NonNull CharSequence infoText) {}
 
   @Override
-  public void startFeedback(int infoTextResourceId, @Nullable Uri screenshotUri) {}
+  public void startFeedback(@StringRes int infoTextResourceId, @Nullable Uri screenshotUri) {}
 
   @Override
   public void startFeedback(@NonNull CharSequence infoText, @Nullable Uri screenshotUri) {}
 
   @Override
   public void showFeedbackNotification(
-      int infoTextResourceId, @NonNull InterruptionLevel interruptionLevel) {}
+      @StringRes int infoTextResourceId, @NonNull InterruptionLevel interruptionLevel) {}
 
   @Override
   public void showFeedbackNotification(

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

@@ -29,6 +29,7 @@
 import androidx.annotation.GuardedBy;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.annotation.StringRes;
 import androidx.annotation.VisibleForTesting;
 import com.google.android.gms.tasks.Task;
 import com.google.android.gms.tasks.TaskCompletionSource;
@@ -311,7 +312,7 @@ private UpdateTask updateApp(boolean showDownloadInNotificationManager) {
   }
 
   @Override
-  public void startFeedback(int infoTextResourceId) {
+  public void startFeedback(@StringRes int infoTextResourceId) {
     // TODO(lkellogg): Once we have the real FeedbackActivity view implemented, we should write a
     // test that checks that <a> tags are preserved
     startFeedback(firebaseApp.getApplicationContext().getText(infoTextResourceId));
@@ -338,7 +339,7 @@ public void startFeedback(@NonNull CharSequence infoText) {
   }
 
   @Override
-  public void startFeedback(int infoTextResourceId, @Nullable Uri screenshotUri) {
+  public void startFeedback(@StringRes int infoTextResourceId, @Nullable Uri screenshotUri) {
     startFeedback(getText(infoTextResourceId), screenshotUri);
   }
 
@@ -354,7 +355,7 @@ public void startFeedback(@NonNull CharSequence infoText, @Nullable Uri screensh
 
   @Override
   public void showFeedbackNotification(
-      int infoTextResourceId, @NonNull InterruptionLevel interruptionLevel) {
+      @StringRes int infoTextResourceId, @NonNull InterruptionLevel interruptionLevel) {
     showFeedbackNotification(getText(infoTextResourceId), interruptionLevel);
   }
 

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

@@ -15,7 +15,6 @@ import android.widget.ProgressBar
 import android.widget.TextView
 import androidx.appcompat.app.AppCompatActivity
 import androidx.appcompat.widget.AppCompatButton
-import androidx.core.app.NotificationManagerCompat
 import androidx.core.widget.doOnTextChanged
 import com.google.android.gms.tasks.Task
 import com.google.android.material.textfield.TextInputLayout