Fad logs file provider (#2999)

* FAD Adding logging and fixing file provider * Fixing up files * Fixing Install Activity * Fixing Install Activity * Adding another log message * Fixing file provider * Fixing logging * Making log wrapper public * Making logging methods public * Fixing comma error * Cleaning code * Fixing llint * Making tests pass Co-authored-by: Manny Jimenez <[email protected]>
firebase · Sep 23, 2021 · 5f29bb7 · 5f29bb7
1 parent b0a78ba
commit 5f29bb7
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 25 deletions.
diff --git a/...tribution/src/main/java/com/google/firebase/appdistribution/CheckForNewReleaseClient.java b/...tribution/src/main/java/com/google/firebase/appdistribution/CheckForNewReleaseClient.java
@@ -132,6 +132,7 @@ AppDistributionReleaseInternal getNewReleaseFromClient(
         return retrievedNewRelease;
       } else {
         // Return null if retrieved new release is older or currently installed
+        LogWrapper.getInstance().v(TAG + "New Release is older or is currently installed");
         return null;
       }
     } catch (NumberFormatException e) {
@@ -207,6 +208,7 @@ private boolean hasSameHashAsInstalledRelease(AppDistributionReleaseInternal new
         // TODO: Consider removing this when all returned releases have the efficient ApkHash
         String externalCodeHash =
             releaseIdentifierStorage.getExternalCodeHash(installedReleaseApkHash);
+        LogWrapper.getInstance().v(TAG + "Defaulting to external codehash " + externalCodeHash);
         return externalCodeHash != null && externalCodeHash.equals(newRelease.getCodeHash());
       }
       // If the hash of the zipped APK for the retrieved newRelease is equal to the stored hash

diff --git a/...main/java/com/google/firebase/appdistribution/FirebaseAppDistributionTesterApiClient.java b/...main/java/com/google/firebase/appdistribution/FirebaseAppDistributionTesterApiClient.java
@@ -14,13 +14,11 @@
 
 package com.google.firebase.appdistribution;
 
-import static android.content.ContentValues.TAG;
 import static com.google.firebase.appdistribution.FirebaseAppDistributionException.Status.AUTHENTICATION_FAILURE;
 import static com.google.firebase.appdistribution.FirebaseAppDistributionException.Status.NETWORK_FAILURE;
 
 import android.content.Context;
 import android.content.pm.PackageManager;
-import android.util.Log;
 import androidx.annotation.NonNull;
 import com.google.android.gms.common.util.AndroidUtilsLight;
 import com.google.android.gms.common.util.Hex;
@@ -114,7 +112,7 @@ class FirebaseAppDistributionTesterApiClient {
     } finally {
       connection.disconnect();
     }
-
+    LogWrapper.getInstance().v("Zip hash for the new release " + newRelease.getApkHash());
     return newRelease;
   }
 
@@ -219,13 +217,12 @@ private String getFingerprintHashForPackage(Context context) {
       hash = AndroidUtilsLight.getPackageCertificateHashBytes(context, context.getPackageName());
 
       if (hash == null) {
-        Log.e(TAG, "Could not get fingerprint hash for package: " + context.getPackageName());
         return null;
       } else {
         return Hex.bytesToStringUppercase(hash, /* zeroTerminated= */ false);
       }
     } catch (PackageManager.NameNotFoundException e) {
-      Log.e(TAG, "No such package: " + context.getPackageName(), e);
+      LogWrapper.getInstance().e(TAG + "No such package: " + context.getPackageName(), e);
       return null;
     }
   }

diff --git a/...e-app-distribution/src/main/java/com/google/firebase/appdistribution/InstallActivity.java b/...e-app-distribution/src/main/java/com/google/firebase/appdistribution/InstallActivity.java
@@ -52,7 +52,7 @@ protected void onCreate(@NonNull Bundle savedInstanceState) {
       Uri apkUri =
           FileProvider.getUriForFile(
               getApplicationContext(),
-              getApplicationContext().getPackageName() + ".appdistro.fileprovider",
+              getApplicationContext().getPackageName() + ".FirebaseAppDistributionFileProvider",
               apkFile);
       intent.setDataAndType(apkUri, APK_MIME_TYPE);
       intent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);

diff --git a/firebase-app-distribution/src/main/java/com/google/firebase/appdistribution/LogWrapper.java b/firebase-app-distribution/src/main/java/com/google/firebase/appdistribution/LogWrapper.java
@@ -15,13 +15,15 @@
 package com.google.firebase.appdistribution;
 
 import android.util.Log;
+import androidx.annotation.NonNull;
 
 /** Wrapper that handles Android logcat logging. */
-class LogWrapper {
+public class LogWrapper {
 
   private static final String LOG_TAG = "FirebaseAppDistribution";
   private static LogWrapper instance;
 
+  @NonNull
   public static synchronized LogWrapper getInstance() {
     if (instance == null) {
       instance = new LogWrapper();
@@ -30,27 +32,27 @@ public static synchronized LogWrapper getInstance() {
     return instance;
   }
 
-  void d(String msg) {
+  public void d(@NonNull String msg) {
     Log.d(LOG_TAG, msg);
   }
 
-  void v(String msg) {
+  public void v(@NonNull String msg) {
     Log.v(LOG_TAG, msg);
   }
 
-  void i(String msg) {
+  public void i(@NonNull String msg) {
     Log.i(LOG_TAG, msg);
   }
 
-  void w(String msg) {
+  public void w(@NonNull String msg) {
     Log.w(LOG_TAG, msg);
   }
 
-  void e(String msg) {
+  public void e(@NonNull String msg) {
     Log.e(LOG_TAG, msg);
   }
 
-  void e(String msg, Throwable tr) {
+  public void e(@NonNull String msg, @NonNull Throwable tr) {
     Log.e(LOG_TAG, msg, tr);
   }
 

diff --git a/...rc/main/java/com/google/firebase/appdistribution/internal/ReleaseIdentificationUtils.java b/...rc/main/java/com/google/firebase/appdistribution/internal/ReleaseIdentificationUtils.java
@@ -17,9 +17,9 @@
 import android.content.Context;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
-import android.util.Log;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import com.google.firebase.appdistribution.LogWrapper;
 import java.io.File;
 import java.io.IOException;
 import java.nio.ByteBuffer;
@@ -46,15 +46,15 @@ public static String extractInternalAppSharingArtifactId(@NonNull Context appCon
       }
       return packageInfo.applicationInfo.metaData.getString("com.android.vending.internal.apk.id");
     } catch (PackageManager.NameNotFoundException e) {
-      Log.w(TAG, "Could not extract internal app sharing artifact ID");
+      LogWrapper.getInstance().w(TAG + "Could not extract internal app sharing artifact ID");
       return null;
     }
   }
 
   @Nullable
   public static String calculateApkHash(@NonNull File file) {
-    Log.v(TAG, String.format("Calculating release id for %s", file.getPath()));
-    Log.v(TAG, String.format("File size: %d", file.length()));
+    LogWrapper.getInstance().v(TAG + "Calculating release id for " + file.getPath());
+    LogWrapper.getInstance().v(TAG + "File size: " + file.length());
 
     long start = System.currentTimeMillis();
     long entries = 0;
@@ -90,20 +90,23 @@ public static String calculateApkHash(@NonNull File file) {
       zipFingerprint = sb.toString();
 
     } catch (IOException | NoSuchAlgorithmException e) {
-      Log.v(TAG, String.format("id calculation failed for %s", file.getPath()));
+      LogWrapper.getInstance().v(TAG + "id calculation failed for " + file.getPath());
       return null;
     } finally {
       long elapsed = System.currentTimeMillis() - start;
       if (elapsed > 2 * 1000) {
-        Log.v(
-            TAG,
-            String.format(
-                "Long id calculation time %d ms and %d entries for %s",
-                elapsed, entries, file.getPath()));
+        LogWrapper.getInstance()
+            .v(
+                TAG
+                    + String.format(
+                        "Long id calculation time %d ms and %d entries for %s",
+                        elapsed, entries, file.getPath()));
       }
 
-      Log.v(TAG, String.format("Finished calculating %d entries in %d ms", entries, elapsed));
-      Log.v(TAG, String.format("%s hashes to %s", file.getPath(), zipFingerprint));
+      LogWrapper.getInstance()
+          .v(TAG + String.format("Finished calculating %d entries in %d ms", entries, elapsed));
+      LogWrapper.getInstance()
+          .v(TAG + String.format("%s hashes to %s", file.getPath(), zipFingerprint));
     }
 
     return zipFingerprint;