From e90ce370d4d4a80070c025c037df7bda1355feec Mon Sep 17 00:00:00 2001
From: Marvin W <git@larma.de>
Date: Wed, 6 Oct 2021 10:22:29 +0200
Subject: [PATCH] Don't log callbacks of Google Sign-In page to logcat

Google seems to include sensitive account details in some of these fields.
Fixes #1567
---
 .../org/microg/gms/auth/login/LoginActivity.java   | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/play-services-core/src/main/java/org/microg/gms/auth/login/LoginActivity.java b/play-services-core/src/main/java/org/microg/gms/auth/login/LoginActivity.java
index 94706145..d139f244 100644
--- a/play-services-core/src/main/java/org/microg/gms/auth/login/LoginActivity.java
+++ b/play-services-core/src/main/java/org/microg/gms/auth/login/LoginActivity.java
@@ -389,7 +389,7 @@ public class LoginActivity extends AssistantActivity {
 
         @JavascriptInterface
         public final void addAccount(String json) {
-            Log.d(TAG, "JSBridge: addAccount " + json);
+            Log.d(TAG, "JSBridge: addAccount");
         }
 
         @JavascriptInterface
@@ -425,7 +425,7 @@ public class LoginActivity extends AssistantActivity {
         @JavascriptInterface
         public final String getAndroidId() {
             long androidId = LastCheckinInfo.read(LoginActivity.this).getAndroidId();
-            Log.d(TAG, "JSBridge: getAndroidId " + androidId);
+            Log.d(TAG, "JSBridge: getAndroidId");
             if (androidId == 0 || androidId == -1) return null;
             return Long.toHexString(androidId);
         }
@@ -442,7 +442,7 @@ public class LoginActivity extends AssistantActivity {
 
         @JavascriptInterface
         public final void getDroidGuardResult(String s) {
-            Log.d(TAG, "JSBridge: getDroidGuardResult: " + s);
+            Log.d(TAG, "JSBridge: getDroidGuardResult");
         }
 
         @JavascriptInterface
@@ -492,7 +492,6 @@ public class LoginActivity extends AssistantActivity {
 
         @JavascriptInterface
         public final void hideKeyboard() {
-            Log.d(TAG, "JSBridge: hideKeyboard");
             inputMethodManager.hideSoftInputFromWindow(webView.getWindowToken(), 0);
         }
 
@@ -508,7 +507,7 @@ public class LoginActivity extends AssistantActivity {
 
         @JavascriptInterface
         public final void log(String s) {
-            Log.d(TAG, "JSBridge: log " + s);
+            Log.d(TAG, "JSBridge: log");
         }
 
         @JavascriptInterface
@@ -518,13 +517,12 @@ public class LoginActivity extends AssistantActivity {
 
         @JavascriptInterface
         public final void setAccountIdentifier(String accountIdentifier) {
-            Log.d(TAG, "JSBridge: setAccountIdentifier " + accountIdentifier);
+            Log.d(TAG, "JSBridge: setAccountIdentifier");
         }
 
         @TargetApi(HONEYCOMB)
         @JavascriptInterface
         public final void setBackButtonEnabled(boolean backButtonEnabled) {
-            Log.d(TAG, "JSBridge: setBackButtonEnabled: " + backButtonEnabled);
             if (SDK_INT <= GINGERBREAD_MR1) return;
             int visibility = getWindow().getDecorView().getSystemUiVisibility();
             if (backButtonEnabled)
@@ -542,13 +540,11 @@ public class LoginActivity extends AssistantActivity {
 
         @JavascriptInterface
         public final void showKeyboard() {
-            Log.d(TAG, "JSBridge: showKeyboard");
             inputMethodManager.showSoftInput(webView, SHOW_IMPLICIT);
         }
 
         @JavascriptInterface
         public final void showView() {
-            Log.d(TAG, "JSBridge: showView");
             runOnUiThread(() -> webView.setVisibility(VISIBLE));
         }