diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 7606e5809..f3e976cd1 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -589,13 +589,13 @@ - + - + handleRequestVerification(context, e164number, true)); - } else if (fcmStatus == PlayServicesUtil.PlayServicesStatus.MISSING) { + // if (fcmStatus == PlayServicesUtil.PlayServicesStatus.SUCCESS) { + // confirmNumberPrompt(context, e164number, () -> handleRequestVerification(context, e164number, true)); + // } else if (fcmStatus == PlayServicesUtil.PlayServicesStatus.MISSING) { confirmNumberPrompt(context, e164number, () -> handlePromptForNoPlayServices(context, e164number)); - } else if (fcmStatus == PlayServicesUtil.PlayServicesStatus.NEEDS_UPDATE) { - GoogleApiAvailability.getInstance().getErrorDialog(requireActivity(), ConnectionResult.SERVICE_VERSION_UPDATE_REQUIRED, 0).show(); - } else { - Dialogs.showAlertDialog(context, getString(R.string.RegistrationActivity_play_services_error), - getString(R.string.RegistrationActivity_google_play_services_is_updating_or_unavailable)); - } + // } else if (fcmStatus == PlayServicesUtil.PlayServicesStatus.NEEDS_UPDATE) { + // GoogleApiAvailability.getInstance().getErrorDialog(requireActivity(), ConnectionResult.SERVICE_VERSION_UPDATE_REQUIRED, 0).show(); + // } else { + // Dialogs.showAlertDialog(context, getString(R.string.RegistrationActivity_play_services_error), + // getString(R.string.RegistrationActivity_google_play_services_is_updating_or_unavailable)); + // } } private void handleRequestVerification(@NonNull Context context, @NonNull String e164number, boolean fcmSupported) { diff --git a/app/src/main/java/org/thoughtcrime/securesms/registration/service/CodeVerificationRequest.java b/app/src/main/java/org/thoughtcrime/securesms/registration/service/CodeVerificationRequest.java index 9c0ccf56c..b851cab54 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/registration/service/CodeVerificationRequest.java +++ b/app/src/main/java/org/thoughtcrime/securesms/registration/service/CodeVerificationRequest.java @@ -209,6 +209,7 @@ public final class CodeVerificationRequest { String registrationLockV2 = kbsData != null ? kbsData.getMasterKey().deriveRegistrationLock() : null; String registrationLockV1 = isV2RegistrationLock ? null : pin; boolean hasFcm = fcmToken != null; + hasFcm = false; Log.i(TAG, "Calling verifyAccountWithCode(): reglockV1? " + !TextUtils.isEmpty(registrationLockV1) + ", reglockV2? " + !TextUtils.isEmpty(registrationLockV2)); diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/PlayServicesUtil.java b/app/src/main/java/org/thoughtcrime/securesms/util/PlayServicesUtil.java index 07928f3da..30f81a4bf 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/util/PlayServicesUtil.java +++ b/app/src/main/java/org/thoughtcrime/securesms/util/PlayServicesUtil.java @@ -22,41 +22,41 @@ public class PlayServicesUtil { } public static PlayServicesStatus getPlayServicesStatus(Context context) { - int gcmStatus = 0; + // int gcmStatus = 0; - try { - gcmStatus = GoogleApiAvailability.getInstance().isGooglePlayServicesAvailable(context); - } catch (Throwable t) { - Log.w(TAG, t); + // try { + // gcmStatus = GoogleApiAvailability.getInstance().isGooglePlayServicesAvailable(context); + // } catch (Throwable t) { + // Log.w(TAG, t); return PlayServicesStatus.MISSING; - } - - Log.i(TAG, "Play Services: " + gcmStatus); - - switch (gcmStatus) { - case ConnectionResult.SUCCESS: - return PlayServicesStatus.SUCCESS; - case ConnectionResult.SERVICE_VERSION_UPDATE_REQUIRED: - try { - ApplicationInfo applicationInfo = context.getPackageManager().getApplicationInfo("com.google.android.gms", 0); - - if (applicationInfo != null && !applicationInfo.enabled) { - return PlayServicesStatus.MISSING; - } - } catch (PackageManager.NameNotFoundException e) { - Log.w(TAG, e); - } - - return PlayServicesStatus.NEEDS_UPDATE; - case ConnectionResult.SERVICE_DISABLED: - case ConnectionResult.SERVICE_MISSING: - case ConnectionResult.SERVICE_INVALID: - case ConnectionResult.API_UNAVAILABLE: - case ConnectionResult.SERVICE_MISSING_PERMISSION: - return PlayServicesStatus.MISSING; - default: - return PlayServicesStatus.TRANSIENT_ERROR; - } + // } + + // Log.i(TAG, "Play Services: " + gcmStatus); + + // switch (gcmStatus) { + // case ConnectionResult.SUCCESS: + // return PlayServicesStatus.SUCCESS; + // case ConnectionResult.SERVICE_VERSION_UPDATE_REQUIRED: + // try { + // ApplicationInfo applicationInfo = context.getPackageManager().getApplicationInfo("com.google.android.gms", 0); + + // if (applicationInfo != null && !applicationInfo.enabled) { + // return PlayServicesStatus.MISSING; + // } + // } catch (PackageManager.NameNotFoundException e) { + // Log.w(TAG, e); + // } + + // return PlayServicesStatus.NEEDS_UPDATE; + // case ConnectionResult.SERVICE_DISABLED: + // case ConnectionResult.SERVICE_MISSING: + // case ConnectionResult.SERVICE_INVALID: + // case ConnectionResult.API_UNAVAILABLE: + // case ConnectionResult.SERVICE_MISSING_PERMISSION: + // return PlayServicesStatus.MISSING; + // default: + // return PlayServicesStatus.TRANSIENT_ERROR; + // } } } diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/TextSecurePreferences.java b/app/src/main/java/org/thoughtcrime/securesms/util/TextSecurePreferences.java index 6d8325d02..7ac27044e 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/util/TextSecurePreferences.java +++ b/app/src/main/java/org/thoughtcrime/securesms/util/TextSecurePreferences.java @@ -443,7 +443,8 @@ public class TextSecurePreferences { } public static boolean isFcmDisabled(Context context) { - return getBooleanPreference(context, GCM_DISABLED_PREF, false); + // return getBooleanPreference(context, GCM_DISABLED_PREF, false); + return true; } public static void setFcmDisabled(Context context, boolean disabled) { -- 2.25.4