DynamicLinks: Improve logging

microg · Aug 19, 2024 · 5d4437e · 5d4437e
1 parent 967663a
commit 5d4437e
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 14 deletions.
diff --git a/...ynamic-links/src/main/java/com/google/firebase/dynamiclinks/internal/DynamicLinkData.java b/...ynamic-links/src/main/java/com/google/firebase/dynamiclinks/internal/DynamicLinkData.java
@@ -14,6 +14,7 @@
 
 import android.os.Bundle;
 import android.net.Uri;
+import org.microg.gms.utils.ToStringHelper;
 
 public class DynamicLinkData extends AbstractSafeParcelable {
     @Field(1)
@@ -43,6 +44,19 @@ public DynamicLinkData(@Param(1) String dynamicLink, @Param(2) String deepLink,
         this.redirectUrl = redirectUrl;
     }
 
+    @NonNull
+    @Override
+    public String toString() {
+        return ToStringHelper.name("DynamicLinkData")
+                .field("dynamicLink", dynamicLink)
+                .field("deepLink", deepLink)
+                .field("minVersion", minVersion)
+                .field("clickTimestamp", clickTimestamp)
+                .field("extensionBundle", extensionBundle)
+                .field("redirectUrl", redirectUrl)
+                .end();
+    }
+
     @Override
     public void writeToParcel(@NonNull Parcel dest, int flags) {
         CREATOR.writeToParcel(this, dest, flags);

diff --git a/play-services-appinvite/core/src/main/kotlin/org/microg/gms/appinivite/AppInviteService.kt b/play-services-appinvite/core/src/main/kotlin/org/microg/gms/appinivite/AppInviteService.kt
@@ -26,7 +26,6 @@ private const val TAG = "AppInviteService"
 class AppInviteService : BaseService(TAG, GmsService.APP_INVITE) {
     override fun handleServiceRequest(callback: IGmsCallbacks, request: GetServiceRequest, service: GmsService) {
         PackageUtils.getAndCheckCallingPackage(this, request.packageName)
-        Log.d(TAG, "callb: $callback ; req: $request ; serv: $service")
         callback.onPostInitComplete(0, AppInviteServiceImpl(this, request.packageName, request.extras), null)
     }
 }

diff --git a/...services-core/src/main/java/org/microg/gms/firebase/dynamiclinks/DynamicLinksService.java b/...services-core/src/main/java/org/microg/gms/firebase/dynamiclinks/DynamicLinksService.java
@@ -16,34 +16,25 @@
 
 package org.microg.gms.firebase.dynamiclinks;
 
-import android.app.Service;
-import android.content.Intent;
-import android.os.IBinder;
-import android.util.Log;
 import android.os.RemoteException;
 
-import com.google.android.gms.common.api.CommonStatusCodes;
 import com.google.android.gms.common.internal.GetServiceRequest;
 import com.google.android.gms.common.internal.IGmsCallbacks;
 
 import org.microg.gms.BaseService;
 import org.microg.gms.common.GmsService;
 import org.microg.gms.common.PackageUtils;
 
-import org.microg.gms.firebase.dynamiclinks.DynamicLinksServiceImpl;
-
 public class DynamicLinksService extends BaseService {
-    private static final String TAG = "GmsDynamicLinksService";
+    private static final String TAG = "DynamicLinksService";
 
     public DynamicLinksService() {
-        super("GmsDynamicLinksSvc", GmsService.DYNAMIC_LINKS);
+        super(TAG, GmsService.DYNAMIC_LINKS);
     }
 
     @Override
     public void handleServiceRequest(IGmsCallbacks callback, GetServiceRequest request, GmsService service) throws RemoteException {
         PackageUtils.getAndCheckCallingPackage(this, request.packageName);
-        Log.d(TAG, "callb: " + callback + " ; req: " + request + " ; serv: " + service);
-
         callback.onPostInitComplete(0, new DynamicLinksServiceImpl(this, request.packageName, request.extras), null);
     }
 }
diff --git a/...ices-core/src/main/java/org/microg/gms/firebase/dynamiclinks/DynamicLinksServiceImpl.java b/...ices-core/src/main/java/org/microg/gms/firebase/dynamiclinks/DynamicLinksServiceImpl.java
@@ -22,15 +22,14 @@
 
 
 public class DynamicLinksServiceImpl extends IDynamicLinksService.Stub {
-    private static final String TAG = "GmsDynamicLinksServImpl";
+    private static final String TAG = "DynamicLinksServImpl";
 
     private String packageName;
 
     public DynamicLinksServiceImpl(Context context, String packageName, Bundle extras) {
         this.packageName = packageName;
     }
 
-
     @Override
     public void getDynamicLink(IDynamicLinksCallbacks callback, String link) throws RemoteException {
         if (link != null) {
@@ -54,15 +53,19 @@ public void getDynamicLink(IDynamicLinksCallbacks callback, String link) throws
                     null,
                     null
             );
+            Log.d(TAG, "getDynamicLink: " + link + " -> " + data);
             callback.onStatusDynamicLinkData(Status.SUCCESS, data);
         } else {
+            Log.d(TAG, "getDynamicLink: " + null + " -> " + null);
             callback.onStatusDynamicLinkData(Status.SUCCESS, null);
         }
     }
 
 
     @Override
     public void createShortDynamicLink(IDynamicLinksCallbacks callback, Bundle extras) throws RemoteException {
+        extras.keySet(); // Unparcel
+        Log.d(TAG, "createShortDynamicLink: " + extras);
         callback.onStatusShortDynamicLink(Status.SUCCESS, new ShortDynamicLinkImpl());
     }