Move FeedbackSender instantiation to getInstance()

Author: lfkellogg

firebase-appdistribution/src/androidTest/java/com/google/firebase/appdistribution/impl/FeedbackActivityTest.java

@@ -0,0 +1,52 @@
+package com.google.firebase.appdistribution.impl;
+
+import static androidx.test.espresso.Espresso.onView;
+import static androidx.test.espresso.matcher.ViewMatchers.withId;
+import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation;
+
+import android.content.res.Resources;
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.espresso.action.ViewActions;
+import androidx.test.ext.junit.rules.ActivityScenarioRule;
+import androidx.test.runner.AndroidJUnit4;
+import com.google.firebase.FirebaseApp;
+import com.google.firebase.FirebaseOptions;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@RunWith(AndroidJUnit4.class)
+public class FeedbackActivityTest {
+  private static final String TEST_API_KEY = "AIzaSyabcdefghijklmnopqrstuvwxyz1234567";
+  private static final String TEST_APP_ID_1 = "1:123456789:android:abcdef";
+  private static final String TEST_PROJECT_ID = "test-project-id";
+
+  @Rule
+  public ActivityScenarioRule<FeedbackActivity> activityRule =
+      new ActivityScenarioRule<>(FeedbackActivity.class);
+
+  @Before
+  public void setup() {
+    FirebaseApp.initializeApp(
+        ApplicationProvider.getApplicationContext(),
+        new FirebaseOptions.Builder()
+            .setApplicationId(TEST_APP_ID_1)
+            .setProjectId(TEST_PROJECT_ID)
+            .setApiKey(TEST_API_KEY)
+            .build());
+  }
+
+  @Test
+  public void testEvent() {
+    // ActivityScenario<FeedbackActivity> scenario = activityRule.getScenario();
+    onView(withId(getResourceId("feedbackText"))).perform(ViewActions.typeText("The feedback"));
+    onView(withId(getResourceId("submitButton"))).perform(ViewActions.click());
+  }
+
+  private static int getResourceId(String xmlResourceName) {
+    Resources r = getInstrumentation().getTargetContext().getResources();
+    return r.getIdentifier(
+        xmlResourceName, "xml", getInstrumentation().getTargetContext().getPackageName());
+  }
+}

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

@@ -20,7 +20,6 @@
 import android.widget.EditText;
 import android.widget.Toast;
 import androidx.appcompat.app.AppCompatActivity;
-import com.google.firebase.FirebaseApp;
 
 /** Activity for tester to compose and submit feedback. */
 public class FeedbackActivity extends AppCompatActivity {
@@ -41,7 +40,7 @@ protected void onCreate(Bundle savedInstanceState) {
     super.onCreate(savedInstanceState);
     releaseName = getIntent().getStringExtra(RELEASE_NAME_EXTRA_KEY);
     screenshot = getIntent().getParcelableExtra(SCREENSHOT_EXTRA_KEY);
-    feedbackSender = FirebaseApp.getInstance().get(FeedbackSender.class);
+    feedbackSender = FeedbackSender.getInstance();
     setContentView(R.layout.activity_feedback);
   }
 

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

@@ -15,7 +15,11 @@
 package com.google.firebase.appdistribution.impl;
 
 import android.graphics.Bitmap;
+import androidx.annotation.NonNull;
 import com.google.android.gms.tasks.Task;
+import com.google.firebase.FirebaseApp;
+import com.google.firebase.appdistribution.FirebaseAppDistribution;
+import com.google.firebase.appdistribution.internal.FirebaseAppDistributionProxy;
 
 /** Sends tester feedback to the Tester API. */
 class FeedbackSender {
@@ -26,6 +30,11 @@ class FeedbackSender {
     this.testerApiClient = testerApiClient;
   }
 
+  @NonNull
+  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