From: csagan5 <32685696+csagan5@users.noreply.github.com> Date: Sun, 3 Nov 2019 08:22:29 +0100 Subject: Remove SMS integration --- .../content/browser/sms/SmsProviderGms.java | 9 +--- .../browser/sms/SmsUserConsentReceiver.java | 46 ++----------------- .../browser/sms/SmsVerificationReceiver.java | 43 +++-------------- .../content/browser/sms/Wrappers.java | 28 +---------- 4 files changed, 12 insertions(+), 114 deletions(-) diff --git a/content/public/android/java/src/org/chromium/content/browser/sms/SmsProviderGms.java b/content/public/android/java/src/org/chromium/content/browser/sms/SmsProviderGms.java --- a/content/public/android/java/src/org/chromium/content/browser/sms/SmsProviderGms.java +++ b/content/public/android/java/src/org/chromium/content/browser/sms/SmsProviderGms.java @@ -126,13 +126,6 @@ public class SmsProviderGms { } public Wrappers.SmsRetrieverClientWrapper getClient() { - if (mClient != null) { - return mClient; - } - mClient = new Wrappers.SmsRetrieverClientWrapper( - mUserConsentReceiver != null ? mUserConsentReceiver.createClient() : null, - mVerificationReceiver != null ? mVerificationReceiver.createClient() : null); - return mClient; } @@ -153,4 +146,4 @@ public class SmsProviderGms { void onTimeout(long nativeSmsProviderGms); void onCancel(long nativeSmsProviderGms); } -} \ No newline at end of file +} diff --git a/content/public/android/java/src/org/chromium/content/browser/sms/SmsUserConsentReceiver.java b/content/public/android/java/src/org/chromium/content/browser/sms/SmsUserConsentReceiver.java --- a/content/public/android/java/src/org/chromium/content/browser/sms/SmsUserConsentReceiver.java +++ b/content/public/android/java/src/org/chromium/content/browser/sms/SmsUserConsentReceiver.java @@ -10,13 +10,6 @@ import android.content.Context; import android.content.Intent; import android.content.IntentFilter; -import com.google.android.gms.auth.api.phone.SmsRetriever; -import com.google.android.gms.auth.api.phone.SmsRetrieverClient; -import com.google.android.gms.common.api.CommonStatusCodes; -import com.google.android.gms.common.api.Status; -import com.google.android.gms.tasks.OnFailureListener; -import com.google.android.gms.tasks.Task; - import org.chromium.base.Log; import org.chromium.ui.base.WindowAndroid; @@ -34,28 +27,11 @@ public class SmsUserConsentReceiver extends BroadcastReceiver { mDestroyed = false; mProvider = provider; mContext = context; - - // A broadcast receiver is registered upon the creation of this class - // which happens when the SMS Retriever API is used for the first time - // since chrome last restarted (which, on android, happens frequently). - // The broadcast receiver is fairly lightweight (e.g. it responds - // quickly without much computation). - // If this broadcast receiver becomes more heavyweight, we should make - // this registration expire after the SMS message is received. - if (DEBUG) Log.d(TAG, "Registering intent filters."); - IntentFilter filter = new IntentFilter(); - filter.addAction(SmsRetriever.SMS_RETRIEVED_ACTION); - mContext.registerReceiver(this, filter); - } - - public SmsRetrieverClient createClient() { - return SmsRetriever.getClient(mContext); } public void destroy() { if (DEBUG) Log.d(TAG, "Destroying SmsUserConsentReceiver."); mDestroyed = true; - mContext.unregisterReceiver(this); } @Override @@ -66,7 +42,7 @@ public class SmsUserConsentReceiver extends BroadcastReceiver { return; } - if (!SmsRetriever.SMS_RETRIEVED_ACTION.equals(intent.getAction())) { + /*if (!SmsRetriever.SMS_RETRIEVED_ACTION.equals(intent.getAction())) { return; } @@ -100,28 +76,14 @@ public class SmsUserConsentReceiver extends BroadcastReceiver { if (DEBUG) Log.d(TAG, "Timeout"); mProvider.onTimeout(); break; - } + } */ } void onConsentResult(int resultCode, Intent data) { - if (resultCode == Activity.RESULT_OK) { - String message = data.getStringExtra(SmsRetriever.EXTRA_SMS_MESSAGE); - mProvider.onReceive(message); - } else if (resultCode == Activity.RESULT_CANCELED) { - if (DEBUG) Log.d(TAG, "Activity result cancelled."); - mProvider.onCancel(); - } + if (DEBUG) Log.d(TAG, "Activity result discarded."); } public void listen(WindowAndroid windowAndroid) { - Task task = mProvider.getClient().startSmsUserConsent(null); - - task.addOnFailureListener(new OnFailureListener() { - @Override - public void onFailure(Exception e) { - Log.e(TAG, "Task failed to start", e); - } - }); - if (DEBUG) Log.d(TAG, "Installed task"); + if (DEBUG) Log.d(TAG, "Ignored task"); } } diff --git a/content/public/android/java/src/org/chromium/content/browser/sms/SmsVerificationReceiver.java b/content/public/android/java/src/org/chromium/content/browser/sms/SmsVerificationReceiver.java --- a/content/public/android/java/src/org/chromium/content/browser/sms/SmsVerificationReceiver.java +++ b/content/public/android/java/src/org/chromium/content/browser/sms/SmsVerificationReceiver.java @@ -11,16 +11,6 @@ import android.content.Context; import android.content.Intent; import android.content.IntentFilter; -import com.google.android.gms.auth.api.phone.SmsCodeBrowserClient; -import com.google.android.gms.auth.api.phone.SmsCodeRetriever; -import com.google.android.gms.auth.api.phone.SmsRetriever; -import com.google.android.gms.auth.api.phone.SmsRetrieverStatusCodes; -import com.google.android.gms.common.api.ApiException; -import com.google.android.gms.common.api.CommonStatusCodes; -import com.google.android.gms.common.api.ResolvableApiException; -import com.google.android.gms.common.api.Status; -import com.google.android.gms.tasks.Task; - import org.chromium.base.Log; import org.chromium.ui.base.WindowAndroid; @@ -46,35 +36,18 @@ public class SmsVerificationReceiver extends BroadcastReceiver { mDestroyed = false; mProvider = provider; mContext = context; - - // A broadcast receiver is registered upon the creation of this class which happens when the - // SMS Retriever API or SMS Browser Code API is used for the first time since chrome last - // restarted (which, on android, happens frequently). The broadcast receiver is fairly - // lightweight (e.g. it responds quickly without much computation). If this broadcast - // receiver becomes more heavyweight, we should make this registration expire after the SMS - // message is received. - if (DEBUG) Log.i(TAG, "Registering intent filters."); - IntentFilter filter = new IntentFilter(); - filter.addAction(SmsCodeRetriever.SMS_CODE_RETRIEVED_ACTION); - - mContext.registerReceiver(this, filter); - } - - public SmsCodeBrowserClient createClient() { - return SmsCodeRetriever.getBrowserClient(mContext); } public void destroy() { if (DEBUG) Log.d(TAG, "Destroying SmsVerificationReceiver."); mDestroyed = true; - mContext.unregisterReceiver(this); } @Override public void onReceive(Context context, Intent intent) { if (DEBUG) Log.d(TAG, "Received something!"); - if (mDestroyed) { + /*if (mDestroyed) { return; } @@ -105,7 +78,7 @@ public class SmsVerificationReceiver extends BroadcastReceiver { if (DEBUG) Log.d(TAG, "Timeout"); mProvider.onTimeout(); break; - } + }*/ } public void onPermissionDone(WindowAndroid window, int resultCode) { @@ -125,7 +98,7 @@ public class SmsVerificationReceiver extends BroadcastReceiver { * task. */ public void onRetrieverTaskFailure(WindowAndroid window, Exception e) { - if (DEBUG) Log.d(TAG, "Task failed. Attempting recovery.", e); +/* if (DEBUG) Log.d(TAG, "Task failed. Attempting recovery.", e); ApiException exception = (ApiException) e; if (exception.getStatusCode() == SmsRetrieverStatusCodes.API_NOT_CONNECTED) { mProvider.onMethodNotAvailable(); @@ -162,15 +135,11 @@ public class SmsVerificationReceiver extends BroadcastReceiver { } } else { Log.w(TAG, "Unexpected exception", e); - } + }*/ + Log.w(TAG, "Unexpected exception", e); } public void listen(WindowAndroid window) { - Wrappers.SmsRetrieverClientWrapper client = mProvider.getClient(); - Task task = client.startSmsCodeBrowserRetriever(); - - task.addOnFailureListener((Exception e) -> { this.onRetrieverTaskFailure(window, e); }); - - if (DEBUG) Log.d(TAG, "Installed task"); + if (DEBUG) Log.d(TAG, "Ignored task"); } } diff --git a/content/public/android/java/src/org/chromium/content/browser/sms/Wrappers.java b/content/public/android/java/src/org/chromium/content/browser/sms/Wrappers.java --- a/content/public/android/java/src/org/chromium/content/browser/sms/Wrappers.java +++ b/content/public/android/java/src/org/chromium/content/browser/sms/Wrappers.java @@ -10,11 +10,6 @@ import android.content.ContextWrapper; import android.content.Intent; import android.content.IntentFilter; -import com.google.android.gms.auth.api.phone.SmsCodeBrowserClient; -import com.google.android.gms.auth.api.phone.SmsCodeRetriever; -import com.google.android.gms.auth.api.phone.SmsRetrieverClient; -import com.google.android.gms.tasks.Task; - class Wrappers { // Prevent instantiation. private Wrappers() {} @@ -23,16 +18,9 @@ class Wrappers { * Wraps com.google.android.gms.auth.api.phone.SmsRetrieverClient. */ static class SmsRetrieverClientWrapper { - // Used for user consent flow. - private final SmsRetrieverClient mSmsRetrieverClient; - // Used for browser code flow. - private final SmsCodeBrowserClient mSmsCodeBrowserClient; private WebOTPServiceContext mContext; - public SmsRetrieverClientWrapper( - SmsRetrieverClient smsRetrieverClient, SmsCodeBrowserClient smsCodeBrowserClient) { - mSmsRetrieverClient = smsRetrieverClient; - mSmsCodeBrowserClient = smsCodeBrowserClient; + public SmsRetrieverClientWrapper() { } public void setContext(WebOTPServiceContext context) { @@ -42,14 +30,6 @@ class Wrappers { public WebOTPServiceContext getContext() { return mContext; } - - public Task startSmsCodeBrowserRetriever() { - return mSmsCodeBrowserClient.startSmsCodeRetriever(); - } - - public Task startSmsUserConsent(String senderAddress) { - return mSmsRetrieverClient.startSmsUserConsent(senderAddress); - } } /** @@ -77,12 +57,6 @@ class Wrappers { @Override public Intent registerReceiver(BroadcastReceiver receiver, IntentFilter filter) { - if (filter.hasAction(SmsCodeRetriever.SMS_CODE_RETRIEVED_ACTION)) { - mVerificationReceiver = receiver; - } else { - mUserConsentReceiver = receiver; - } - return super.registerReceiver(receiver, filter); } -- 2.17.1