Remove-SMS-integration.patch 4.6 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118
  1. From: csagan5 <32685696+csagan5@users.noreply.github.com>
  2. Date: Sun, 3 Nov 2019 08:22:29 +0100
  3. Subject: Remove SMS integration
  4. ---
  5. .../content/browser/sms/SmsReceiver.java | 29 +++----------------
  6. .../content/browser/sms/Wrappers.java | 11 +------
  7. 2 files changed, 5 insertions(+), 35 deletions(-)
  8. diff --git a/content/public/android/java/src/org/chromium/content/browser/sms/SmsReceiver.java b/content/public/android/java/src/org/chromium/content/browser/sms/SmsReceiver.java
  9. --- a/content/public/android/java/src/org/chromium/content/browser/sms/SmsReceiver.java
  10. +++ b/content/public/android/java/src/org/chromium/content/browser/sms/SmsReceiver.java
  11. @@ -11,11 +11,6 @@ import android.content.IntentFilter;
  12. import androidx.annotation.VisibleForTesting;
  13. -import com.google.android.gms.auth.api.phone.SmsRetriever;
  14. -import com.google.android.gms.common.api.CommonStatusCodes;
  15. -import com.google.android.gms.common.api.Status;
  16. -import com.google.android.gms.tasks.Task;
  17. -
  18. import org.chromium.base.ContextUtils;
  19. import org.chromium.base.Log;
  20. import org.chromium.base.annotations.CalledByNative;
  21. @@ -42,18 +37,6 @@ public class SmsReceiver extends BroadcastReceiver {
  22. mSmsProviderAndroid = smsProviderAndroid;
  23. mContext = new Wrappers.SmsReceiverContext(ContextUtils.getApplicationContext());
  24. -
  25. - // A broadcast receiver is registered upon the creation of this class
  26. - // which happens when the SMS Retriever API is used for the first time
  27. - // since chrome last restarted (which, on android, happens frequently).
  28. - // The broadcast receiver is fairly lightweight (e.g. it responds
  29. - // quickly without much computation).
  30. - // If this broadcast receiver becomes more heavyweight, we should make
  31. - // this registration expire after the SMS message is received.
  32. - if (DEBUG) Log.d(TAG, "Registering intent filters.");
  33. - IntentFilter filter = new IntentFilter();
  34. - filter.addAction(SmsRetriever.SMS_RETRIEVED_ACTION);
  35. - mContext.registerReceiver(this, filter);
  36. }
  37. @CalledByNative
  38. @@ -77,7 +60,7 @@ public class SmsReceiver extends BroadcastReceiver {
  39. return;
  40. }
  41. - if (!SmsRetriever.SMS_RETRIEVED_ACTION.equals(intent.getAction())) {
  42. +/* if (!SmsRetriever.SMS_RETRIEVED_ACTION.equals(intent.getAction())) {
  43. return;
  44. }
  45. @@ -104,22 +87,18 @@ public class SmsReceiver extends BroadcastReceiver {
  46. if (DEBUG) Log.d(TAG, "Timeout");
  47. SmsReceiverJni.get().onTimeout(mSmsProviderAndroid);
  48. break;
  49. - }
  50. + } */
  51. }
  52. @CalledByNative
  53. private void listen() {
  54. - Wrappers.SmsRetrieverClientWrapper client = getClient();
  55. - Task<Void> task = client.startSmsRetriever();
  56. -
  57. - if (DEBUG) Log.d(TAG, "Installed task");
  58. }
  59. private Wrappers.SmsRetrieverClientWrapper getClient() {
  60. - if (mClient != null) {
  61. +/* if (mClient != null) {
  62. return mClient;
  63. }
  64. - mClient = new Wrappers.SmsRetrieverClientWrapper(SmsRetriever.getClient(mContext));
  65. + mClient = new Wrappers.SmsRetrieverClientWrapper(SmsRetriever.getClient(mContext)); */
  66. return mClient;
  67. }
  68. 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
  69. --- a/content/public/android/java/src/org/chromium/content/browser/sms/Wrappers.java
  70. +++ b/content/public/android/java/src/org/chromium/content/browser/sms/Wrappers.java
  71. @@ -10,9 +10,6 @@ import android.content.ContextWrapper;
  72. import android.content.Intent;
  73. import android.content.IntentFilter;
  74. -import com.google.android.gms.auth.api.phone.SmsRetrieverClient;
  75. -import com.google.android.gms.tasks.Task;
  76. -
  77. class Wrappers {
  78. // Prevent instantiation.
  79. private Wrappers() {}
  80. @@ -21,11 +18,9 @@ class Wrappers {
  81. * Wraps com.google.android.gms.auth.api.phone.SmsRetrieverClient.
  82. */
  83. static class SmsRetrieverClientWrapper {
  84. - private final SmsRetrieverClient mSmsRetrieverClient;
  85. private SmsReceiverContext mContext;
  86. - public SmsRetrieverClientWrapper(SmsRetrieverClient smsRetrieverClient) {
  87. - mSmsRetrieverClient = smsRetrieverClient;
  88. + public SmsRetrieverClientWrapper() {
  89. }
  90. public void setContext(SmsReceiverContext context) {
  91. @@ -35,10 +30,6 @@ class Wrappers {
  92. public SmsReceiverContext getContext() {
  93. return mContext;
  94. }
  95. -
  96. - public Task<Void> startSmsRetriever() {
  97. - return mSmsRetrieverClient.startSmsRetriever();
  98. - }
  99. }
  100. /**
  101. --
  102. 2.17.1