forked from uazo/cromite
-
Notifications
You must be signed in to change notification settings - Fork 0
/
Copy pathRemove-SMS-integration.patch
442 lines (412 loc) · 20.1 KB
/
Remove-SMS-integration.patch
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
From: csagan5 <[email protected]>
Date: Sun, 3 Nov 2019 08:22:29 +0100
Subject: Remove SMS integration
License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
---
.../browser/language/AppLocaleUtils.java | 45 -------
.../content/browser/sms/SmsProviderGms.java | 29 +---
.../browser/sms/SmsUserConsentReceiver.java | 48 +------
.../browser/sms/SmsVerificationReceiver.java | 126 +-----------------
.../content/browser/sms/Wrappers.java | 27 +---
5 files changed, 8 insertions(+), 267 deletions(-)
diff --git a/chrome/browser/language/android/java/src/org/chromium/chrome/browser/language/AppLocaleUtils.java b/chrome/browser/language/android/java/src/org/chromium/chrome/browser/language/AppLocaleUtils.java
--- a/chrome/browser/language/android/java/src/org/chromium/chrome/browser/language/AppLocaleUtils.java
+++ b/chrome/browser/language/android/java/src/org/chromium/chrome/browser/language/AppLocaleUtils.java
@@ -121,51 +121,6 @@ public class AppLocaleUtils {
return Locale.forLanguageTag("en-US");
}
- /**
- * Download the language split. If successful set the application language shared preference.
- * If set to null the system language will be used.
- * @param languageName String BCP-47 code of language to download.
- */
- public static void setAppLanguagePref(String languageName) {
- setAppLanguagePref(languageName, success -> {});
- }
-
- /**
- * Download the language split using the provided listener for callbacks. If successful set the
- * application language shared preference. If called from an APK build where no bundle needs to
- * be downloaded the listener's on complete function is immediately called. If languageName is
- * null the system language will be used.
- * @param languageName String BCP-47 code of language to download.
- * @param listener LanguageSplitInstaller.InstallListener to use for callbacks.
- */
- public static void setAppLanguagePref(
- String languageName, LanguageSplitInstaller.InstallListener listener) {
- // Wrap the install listener so that on success the app override preference is set.
- LanguageSplitInstaller.InstallListener wrappedListener =
- (success) -> {
- if (success) {
- if (shouldUseSystemManagedLocale()) {
- setSystemManagedAppLanguage(languageName);
- } else {
- ChromeSharedPreferences.getInstance()
- .writeString(
- ChromePreferenceKeys.APPLICATION_OVERRIDE_LANGUAGE,
- languageName);
- }
- }
- listener.onComplete(success);
- };
-
- // If this is not a bundle build or the default system language is being used the language
- // split should not be installed. Instead indicate that the listener completed successfully
- // since the language resources will already be present.
- if (!BundleUtils.isBundle() || isFollowSystemLanguage(languageName)) {
- wrappedListener.onComplete(true);
- } else {
- LanguageSplitInstaller.getInstance().installLanguage(languageName, wrappedListener);
- }
- }
-
/**
* Sets the {@link LocaleManager} App language to |languageName|.
* TODO(crbug.com/1333981) Move to Android T.
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
@@ -6,9 +6,6 @@ package org.chromium.content.browser.sms;
import androidx.annotation.VisibleForTesting;
-import com.google.android.gms.common.ConnectionResult;
-import com.google.android.gms.common.GoogleApiAvailability;
-
import org.jni_zero.CalledByNative;
import org.jni_zero.JNINamespace;
import org.jni_zero.NativeMethods;
@@ -47,17 +44,11 @@ public class SmsProviderGms {
public SmsProviderGms(
long smsProviderGmsAndroid,
@GmsBackend int backend,
- boolean isVerificationBackendAvailable) {
+ boolean ignored) {
mSmsProviderGmsAndroid = smsProviderGmsAndroid;
mBackend = backend;
mContext = new Wrappers.WebOTPServiceContext(ContextUtils.getApplicationContext(), this);
- // Creates an mVerificationReceiver regardless of the backend to support requests from
- // remote devices.
- if (isVerificationBackendAvailable) {
- mVerificationReceiver = new SmsVerificationReceiver(this, mContext);
- }
-
if (mBackend == GmsBackend.AUTO || mBackend == GmsBackend.USER_CONSENT) {
mUserConsentReceiver = new SmsUserConsentReceiver(this, mContext);
}
@@ -89,13 +80,7 @@ public class SmsProviderGms {
@CalledByNative
private static SmsProviderGms create(long smsProviderGmsAndroid, @GmsBackend int backend) {
Log.d(TAG, "Creating SmsProviderGms");
- boolean isVerificationBackendAvailable =
- GoogleApiAvailability.getInstance()
- .isGooglePlayServicesAvailable(
- ContextUtils.getApplicationContext(),
- MIN_GMS_VERSION_NUMBER_WITH_CODE_BROWSER_BACKEND)
- == ConnectionResult.SUCCESS;
- return new SmsProviderGms(smsProviderGmsAndroid, backend, isVerificationBackendAvailable);
+ return new SmsProviderGms(smsProviderGmsAndroid, backend, false);
}
@CalledByNative
@@ -191,16 +176,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;
}
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.ContextUtils;
import org.chromium.base.Log;
import org.chromium.ui.base.WindowAndroid;
@@ -33,30 +26,12 @@ 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);
- ContextUtils.registerExportedBroadcastReceiver(
- mContext, this, filter, SmsRetriever.SEND_PERMISSION);
- }
-
- public SmsRetrieverClient createClient() {
- return SmsRetriever.getClient(mContext);
}
public void destroy() {
if (mDestroyed) return;
if (DEBUG) Log.d(TAG, "Destroying SmsUserConsentReceiver.");
mDestroyed = true;
- mContext.unregisterReceiver(this);
}
@Override
@@ -67,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;
}
@@ -105,29 +80,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, GmsBackend.USER_CONSENT);
- } 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<Void> 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.ContextUtils;
import org.chromium.base.Log;
import org.chromium.base.metrics.RecordHistogram;
@@ -64,65 +54,13 @@ public class SmsVerificationReceiver extends BroadcastReceiver {
// 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);
-
- // The SEND_PERMISSION permission is not documented to held by the sender of this broadcast,
- // but it's coming from the same place the UserConsent (SmsRetriever.SMS_RETRIEVED_ACTION)
- // broadcast is coming from, so the sender will be holding this permission. This prevents
- // other apps from spoofing verification codes.
- ContextUtils.registerExportedBroadcastReceiver(
- mContext, this, filter, SmsRetriever.SEND_PERMISSION);
- }
-
- public SmsCodeBrowserClient createClient() {
- return SmsCodeRetriever.getBrowserClient(mContext);
}
public void destroy() {
- if (mDestroyed) return;
- 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) {
- return;
- }
-
- if (!SmsCodeRetriever.SMS_CODE_RETRIEVED_ACTION.equals(intent.getAction())) {
- return;
- }
-
- if (intent.getExtras() == null) {
- return;
- }
-
- final Status status;
-
- try {
- status = (Status) intent.getParcelableExtra(SmsRetriever.EXTRA_STATUS);
- } catch (Throwable e) {
- if (DEBUG) Log.d(TAG, "Error getting parceable");
- return;
- }
-
- switch (status.getStatusCode()) {
- case CommonStatusCodes.SUCCESS:
- String message = intent.getExtras().getString(SmsCodeRetriever.EXTRA_SMS_CODE_LINE);
- if (DEBUG) Log.d(TAG, "Got message: %s!", message);
- mProvider.onReceive(message, GmsBackend.VERIFICATION);
- break;
- case CommonStatusCodes.TIMEOUT:
- if (DEBUG) Log.d(TAG, "Timeout");
- mProvider.onTimeout();
- break;
- }
}
public void onPermissionDone(int resultCode, boolean isLocalRequest) {
@@ -142,72 +80,10 @@ public class SmsVerificationReceiver extends BroadcastReceiver {
* task.
*/
public void onRetrieverTaskFailure(boolean isLocalRequest, Exception e) {
- if (DEBUG) Log.d(TAG, "Task failed. Attempting recovery.", e);
- ApiException exception = (ApiException) e;
- if (exception.getStatusCode() == SmsRetrieverStatusCodes.API_NOT_CONNECTED) {
- reportBackendAvailability(BackendAvailability.API_NOT_CONNECTED);
- mProvider.onMethodNotAvailable(isLocalRequest);
- Log.d(TAG, "update GMS services.");
- } else if (exception.getStatusCode() == SmsRetrieverStatusCodes.PLATFORM_NOT_SUPPORTED) {
- reportBackendAvailability(BackendAvailability.PLATFORM_NOT_SUPPORTED);
- mProvider.onMethodNotAvailable(isLocalRequest);
- Log.d(TAG, "old android platform.");
- } else if (exception.getStatusCode() == SmsRetrieverStatusCodes.API_NOT_AVAILABLE) {
- reportBackendAvailability(BackendAvailability.API_NOT_AVAILABLE);
- mProvider.onMethodNotAvailable(isLocalRequest);
- Log.d(TAG, "not the default browser.");
- } else if (exception.getStatusCode() == SmsRetrieverStatusCodes.USER_PERMISSION_REQUIRED) {
- cancelRequestAndReportBackendAvailability();
- Log.d(TAG, "user permission is required.");
- } else if (exception.getStatusCode() == CommonStatusCodes.RESOLUTION_REQUIRED) {
- if (exception instanceof ResolvableApiException) {
- // This occurs if the default browser is in NONE permission
- // state. Resolve it by calling PendingIntent.send() method.
- // This shows the consent dialog to user so they grant
- // one-time permission. The dialog result will be received
- // via `onPermissionDone()`
- ResolvableApiException rex = (ResolvableApiException) exception;
- try {
- PendingIntent resolutionIntent = rex.getResolution();
- mProvider
- .getWindow()
- .showIntent(
- resolutionIntent,
- new WindowAndroid.IntentCallback() {
- @Override
- public void onIntentCompleted(int resultCode, Intent data) {
- // Backend availability will be recorded inside
- // |onPermissionDone|.
- onPermissionDone(resultCode, isLocalRequest);
- }
- },
- null);
- } catch (Exception ex) {
- cancelRequestAndReportBackendAvailability();
- Log.e(TAG, "Cannot launch user permission", ex);
- }
- }
- } else {
- Log.w(TAG, "Unexpected exception", e);
- }
}
public void listen(boolean isLocalRequest) {
- Wrappers.SmsRetrieverClientWrapper client = mProvider.getClient();
- Task<Void> task = client.startSmsCodeBrowserRetriever();
-
- task.addOnSuccessListener(
- unused -> {
- this.reportBackendAvailability(BackendAvailability.AVAILABLE);
- mProvider.verificationReceiverSucceeded(isLocalRequest);
- });
- task.addOnFailureListener(
- (Exception e) -> {
- this.onRetrieverTaskFailure(isLocalRequest, e);
- mProvider.verificationReceiverFailed(isLocalRequest);
- });
-
- if (DEBUG) Log.d(TAG, "Installed task");
+ if (DEBUG) Log.d(TAG, "Ignored task");
}
public void reportBackendAvailability(BackendAvailability availability) {
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
@@ -14,27 +14,15 @@ import android.os.Handler;
import androidx.annotation.RequiresApi;
-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() {}
/** 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) {
@@ -44,14 +32,6 @@ class Wrappers {
public WebOTPServiceContext getContext() {
return mContext;
}
-
- public Task<Void> startSmsCodeBrowserRetriever() {
- return mSmsCodeBrowserClient.startSmsCodeRetriever();
- }
-
- public Task<Void> startSmsUserConsent(String senderAddress) {
- return mSmsRetrieverClient.startSmsUserConsent(senderAddress);
- }
}
/**
@@ -81,11 +61,6 @@ class Wrappers {
}
private void onRegisterReceiver(BroadcastReceiver receiver, IntentFilter filter) {
- if (filter.hasAction(SmsCodeRetriever.SMS_CODE_RETRIEVED_ACTION)) {
- mVerificationReceiver = receiver;
- } else {
- mUserConsentReceiver = receiver;
- }
}
// ---------------------------------------------------------------------
--