Change logic in check for update so it correctly prompts on new APK releases (#2898)

Author: rachaprince

firebase-app-distribution/src/main/java/com/google/firebase/appdistribution/CheckForUpdateClient.java

@@ -115,7 +115,7 @@ AppDistributionReleaseInternal getLatestReleaseFromClient(
           firebaseAppDistributionTesterApiClient.fetchLatestRelease(fid, appId, apiKey, authToken);
 
       if (isNewerBuildVersion(retrievedLatestRelease)
-          && !isInstalledRelease(retrievedLatestRelease)) {
+          || !isInstalledRelease(retrievedLatestRelease)) {
         return retrievedLatestRelease;
       } else {
         // Return null if retrieved latest release is older or currently installed
@@ -132,13 +132,14 @@ AppDistributionReleaseInternal getLatestReleaseFromClient(
   private boolean isNewerBuildVersion(AppDistributionReleaseInternal latestRelease)
       throws FirebaseAppDistributionException {
     return Long.parseLong(latestRelease.getBuildVersion())
-        >= getInstalledAppVersionCode(firebaseApp.getApplicationContext());
+        > getInstalledAppVersionCode(firebaseApp.getApplicationContext());
   }
 
   private boolean isInstalledRelease(AppDistributionReleaseInternal latestRelease) {
     if (latestRelease.getBinaryType().equals(BinaryType.APK)) {
-      // TODO(rachelprince): APK codehash verification
-      return false;
+      // TODO(rachelprince): APK codehash verification. For now assume
+      // the release is identical unless the build version is different
+      return true;
     }
 
     if (latestRelease.getIasArtifactId() == null) {

firebase-app-distribution/src/test/java/com/google/firebase/appdistribution/CheckForUpdateClientTest.java

@@ -149,7 +149,7 @@ public void checkForUpdateTask_whenCalledMultipleTimes_returnsTheSameTask() {
   @Test
   public void checkForUpdate_succeeds() throws Exception {
     when(mockFirebaseAppDistributionTesterApiClient.fetchLatestRelease(any(), any(), any(), any()))
-        .thenReturn(TEST_RELEASE_CURRENT);
+        .thenReturn(TEST_RELEASE_NEWER_APK);
     when(mockFirebaseInstallations.getId()).thenReturn(Tasks.forResult(TEST_FID_1));
     when(mockFirebaseInstallations.getToken(false))
         .thenReturn(Tasks.forResult(mockInstallationTokenResult));
@@ -160,7 +160,7 @@ public void checkForUpdate_succeeds() throws Exception {
     task.addOnCompleteListener(testExecutor, onCompleteListener);
 
     AppDistributionReleaseInternal appDistributionReleaseInternal = onCompleteListener.await();
-    assertEquals(TEST_RELEASE_CURRENT, appDistributionReleaseInternal);
+    assertEquals(TEST_RELEASE_NEWER_APK, appDistributionReleaseInternal);
     verify(mockFirebaseInstallations, times(1)).getId();
     verify(mockFirebaseInstallations, times(1)).getToken(false);
   }
@@ -227,18 +227,11 @@ public void getLatestReleaseFromClient_whenLatestReleaseIsNewerBuildThanInstalle
   }
 
   @Test
-  public void getLatestReleaseFromClient_whenLatestReleaseIsOlderBuildThanInstalled_returnsNull()
+  public void getLatestReleaseFromClient_whenLatestReleaseIsSameRelease_returnsNull()
       throws Exception {
-    AppDistributionReleaseInternal olderTestRelease =
-        AppDistributionReleaseInternal.builder()
-            .setBinaryType(BinaryType.APK)
-            .setBuildVersion("1")
-            .setDisplayVersion("1.0")
-            .setReleaseNotes("Older version.")
-            .build();
     when(mockFirebaseAppDistributionTesterApiClient.fetchLatestRelease(
             TEST_FID_1, TEST_APP_ID_1, TEST_API_KEY, TEST_AUTH_TOKEN))
-        .thenReturn(olderTestRelease);
+        .thenReturn(TEST_RELEASE_CURRENT);
 
     AppDistributionReleaseInternal release =
         checkForUpdateClient.getLatestReleaseFromClient(