New build version now includes different version name (#3259)

* New build version now includes different version name

* Fixing tests

* Responding to comments

* Responding to comments part 2

* Adding try catch to getPackageInfo

Co-authored-by: Manny Jimenez <[email protected]>

Author: manny-jimenez

firebase-app-distribution/src/main/java/com/google/firebase/app/distribution/NewReleaseFetcher.java

@@ -135,7 +135,8 @@ AppDistributionReleaseInternal getNewReleaseFromClient(
       }
 
       if (isNewerBuildVersion(retrievedNewRelease)
-          || !isSameAsInstalledRelease(retrievedNewRelease)) {
+          || !isSameAsInstalledRelease(retrievedNewRelease)
+          || hasDifferentAppVersionName(retrievedNewRelease)) {
         return retrievedNewRelease;
       } else {
         // Return null if retrieved new release is older or currently installed
@@ -163,6 +164,13 @@ private boolean isNewerBuildVersion(AppDistributionReleaseInternal newRelease)
         > getInstalledAppVersionCode(firebaseApp.getApplicationContext());
   }
 
+  private boolean hasDifferentAppVersionName(AppDistributionReleaseInternal newRelease)
+      throws FirebaseAppDistributionException {
+    return !newRelease
+        .getDisplayVersion()
+        .equals(getInstalledAppVersionName(firebaseApp.getApplicationContext()));
+  }
+
   @VisibleForTesting
   boolean isSameAsInstalledRelease(AppDistributionReleaseInternal newRelease)
       throws FirebaseAppDistributionException {
@@ -182,17 +190,25 @@ boolean isSameAsInstalledRelease(AppDistributionReleaseInternal newRelease)
   }
 
   private long getInstalledAppVersionCode(Context context) throws FirebaseAppDistributionException {
-    PackageInfo pInfo;
+    return PackageInfoCompat.getLongVersionCode(getPackageInfo(context));
+  }
+
+  private String getInstalledAppVersionName(Context context)
+      throws FirebaseAppDistributionException {
+    return getPackageInfo(context).versionName;
+  }
+
+  private PackageInfo getPackageInfo(Context context) throws FirebaseAppDistributionException {
     try {
-      pInfo = context.getPackageManager().getPackageInfo(context.getPackageName(), 0);
+      return context.getPackageManager().getPackageInfo(context.getPackageName(), 0);
     } catch (PackageManager.NameNotFoundException e) {
-      LogWrapper.getInstance().e(TAG + "Unable to locate Firebase App.", e);
+      LogWrapper.getInstance()
+          .e(TAG + "Unable to find package with name " + context.getPackageName(), e);
       throw new FirebaseAppDistributionException(
           Constants.ErrorMessages.UNKNOWN_ERROR,
           FirebaseAppDistributionException.Status.UNKNOWN,
           e);
     }
-    return PackageInfoCompat.getLongVersionCode(pInfo);
   }
 
   @VisibleForTesting

firebase-app-distribution/src/test/java/com/google/firebase/app/distribution/NewReleaseFetcherTest.java

@@ -118,6 +118,7 @@ public void setup() {
             .setApplicationInfo(applicationInfo)
             .build();
     packageInfo.setLongVersionCode(INSTALLED_VERSION_CODE);
+    packageInfo.versionName = "1.0";
     shadowPackageManager.installPackage(packageInfo);
 
     newReleaseFetcher =
@@ -265,25 +266,42 @@ public void getNewReleaseFromClient_whenNewReleaseIsLowerVersionCode_returnsNull
 
   @Test
   public void handleNewReleaseFromClient_whenNewAabIsAvailable_returnsRelease() throws Exception {
+    AppDistributionReleaseInternal expectedRelease =
+        getTestNewRelease()
+            .setDownloadUrl("http://fake-download-url")
+            .setIasArtifactId("test-ias-artifact-id-2")
+            .setBinaryType(BinaryType.AAB)
+            .build();
     when(mockFirebaseAppDistributionTesterApiClient.fetchNewRelease(
             any(), any(), any(), any(), any()))
-        .thenReturn(
-            getTestNewRelease()
-                .setDownloadUrl("http://fake-download-url")
-                .setIasArtifactId("test-ias-artifact-id-2")
-                .setBinaryType(BinaryType.AAB)
-                .build());
+        .thenReturn(expectedRelease);
 
     AppDistributionReleaseInternal result =
         newReleaseFetcher.getNewReleaseFromClient(
             TEST_FID_1, TEST_APP_ID_1, TEST_API_KEY, TEST_AUTH_TOKEN);
-    assertEquals(
+
+    assertEquals(expectedRelease, result);
+  }
+
+  @Test
+  public void
+      handleNewReleaseFromClient_whenNewReleaseHasDifferentVersionNameThanInstalled_returnsRelease()
+          throws Exception {
+    AppDistributionReleaseInternal expectedRelease =
         getTestNewRelease()
             .setDownloadUrl("http://fake-download-url")
-            .setIasArtifactId("test-ias-artifact-id-2")
+            .setIasArtifactId(TEST_IAS_ARTIFACT_ID)
             .setBinaryType(BinaryType.AAB)
-            .build(),
-        result);
+            .setDisplayVersion("2.0")
+            .build();
+    when(mockFirebaseAppDistributionTesterApiClient.fetchNewRelease(
+            any(), any(), any(), any(), any()))
+        .thenReturn(expectedRelease);
+
+    AppDistributionReleaseInternal result =
+        newReleaseFetcher.getNewReleaseFromClient(
+            TEST_FID_1, TEST_APP_ID_1, TEST_API_KEY, TEST_AUTH_TOKEN);
+    assertEquals(expectedRelease, result);
   }
 
   @Test