Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-04-23 10:20:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

Attempt automated SMS verification in change number flow.

Browse Source
This commit is contained in:
Cody Henthorne
2022-08-19 10:56:56 -04:00
committed by Greyson Parrelli
parent 8036aaa985
commit c6c30f25a2
4 changed files with 117 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
app/src/main/java/org/thoughtcrime/securesms/registration/RegistrationNavigationActivity.java
View File

@@ -1,9 +1,7 @@
package org.thoughtcrime.securesms.registration;
import android.content.BroadcastReceiver;
import android.content.Context;
import android.content.Intent;
import android.content.IntentFilter;
import android.os.Bundle;
import androidx.annotation.NonNull;
@@ -12,19 +10,11 @@ import androidx.appcompat.app.AppCompatActivity;
import androidx.appcompat.app.AppCompatDelegate;
import androidx.lifecycle.ViewModelProvider;
import com.google.android.gms.auth.api.phone.SmsRetriever;
import com.google.android.gms.common.api.CommonStatusCodes;
import com.google.android.gms.common.api.Status;
import org.greenrobot.eventbus.EventBus;
import org.signal.core.util.logging.Log;
import org.thoughtcrime.securesms.R;
import org.thoughtcrime.securesms.registration.viewmodel.RegistrationViewModel;
import org.thoughtcrime.securesms.service.VerificationCodeParser;
import org.thoughtcrime.securesms.util.CommunicationActions;
import java.util.Optional;
public final class RegistrationNavigationActivity extends AppCompatActivity {
@@ -93,49 +83,14 @@ public final class RegistrationNavigationActivity extends AppCompatActivity {
}
private void initializeChallengeListener() {
smsRetrieverReceiver = new SmsRetrieverReceiver();
registerReceiver(smsRetrieverReceiver, new IntentFilter(SmsRetriever.SMS_RETRIEVED_ACTION));
smsRetrieverReceiver = new SmsRetrieverReceiver(getApplication());
smsRetrieverReceiver.registerReceiver();
}
private void shutdownChallengeListener() {
if (smsRetrieverReceiver != null) {
unregisterReceiver(smsRetrieverReceiver);
smsRetrieverReceiver.unregisterReceiver();
smsRetrieverReceiver = null;
}
}
private class SmsRetrieverReceiver extends BroadcastReceiver {
@Override
public void onReceive(Context context, Intent intent) {
Log.i(TAG, "SmsRetrieverReceiver received a broadcast...");
if (SmsRetriever.SMS_RETRIEVED_ACTION.equals(intent.getAction())) {
Bundle extras = intent.getExtras();
Status status = (Status) extras.get(SmsRetriever.EXTRA_STATUS);
switch (status.getStatusCode()) {
case CommonStatusCodes.SUCCESS:
Optional<String> code = VerificationCodeParser.parse((String) extras.get(SmsRetriever.EXTRA_SMS_MESSAGE));
if (code.isPresent()) {
Log.i(TAG, "Received verification code.");
handleVerificationCodeReceived(code.get());
} else {
Log.w(TAG, "Could not parse verification code.");
}
break;
case CommonStatusCodes.TIMEOUT:
Log.w(TAG, "Hit a timeout waiting for the SMS to arrive.");
break;
}
} else {
Log.w(TAG, "SmsRetrieverReceiver received the wrong action?");
}
}
}
private void handleVerificationCodeReceived(@NonNull String code) {
EventBus.getDefault().post(new ReceivedSmsEvent(code));
}
}

71
app/src/main/java/org/thoughtcrime/securesms/registration/SmsRetrieverReceiver.java Normal file
View File

@@ -0,0 +1,71 @@
package org.thoughtcrime.securesms.registration;
import android.app.Application;
import android.content.BroadcastReceiver;
import android.content.Context;
import android.content.Intent;
import android.content.IntentFilter;
import android.os.Bundle;
import androidx.annotation.NonNull;
import com.google.android.gms.auth.api.phone.SmsRetriever;
import com.google.android.gms.common.api.CommonStatusCodes;
import com.google.android.gms.common.api.Status;
import org.greenrobot.eventbus.EventBus;
import org.signal.core.util.logging.Log;
import org.thoughtcrime.securesms.service.VerificationCodeParser;
import java.util.Optional;
/**
* Listen for SMS verification codes sent during registration or change number.
*/
public class SmsRetrieverReceiver extends BroadcastReceiver {
private static final String TAG = Log.tag(SmsRetrieverReceiver.class);
private final Context context;
public SmsRetrieverReceiver(@NonNull Application context) {
this.context = context;
}
public void registerReceiver() {
Log.d(TAG, "Registering SMS retriever receiver");
context.registerReceiver(this, new IntentFilter(SmsRetriever.SMS_RETRIEVED_ACTION));
}
public void unregisterReceiver() {
Log.d(TAG, "Unregistering SMS retriever receiver");
context.unregisterReceiver(this);
}
@Override
public void onReceive(Context context, Intent intent) {
Log.i(TAG, "SmsRetrieverReceiver received a broadcast...");
if (SmsRetriever.SMS_RETRIEVED_ACTION.equals(intent.getAction())) {
Bundle extras = intent.getExtras();
Status status = (Status) extras.get(SmsRetriever.EXTRA_STATUS);
switch (status.getStatusCode()) {
case CommonStatusCodes.SUCCESS:
Optional<String> code = VerificationCodeParser.parse((String) extras.get(SmsRetriever.EXTRA_SMS_MESSAGE));
if (code.isPresent()) {
Log.i(TAG, "Received verification code.");
EventBus.getDefault().post(new ReceivedSmsEvent(code.get()));
} else {
Log.w(TAG, "Could not parse verification code.");
}
break;
case CommonStatusCodes.TIMEOUT:
Log.w(TAG, "Hit a timeout waiting for the SMS to arrive.");
break;
}
} else {
Log.w(TAG, "SmsRetrieverReceiver received the wrong action?");
}
}
}