Skip to content

GitLab

S
signal-gcm-less
Commit 8412ef80 authored by CapsLock's avatar CapsLock
Browse files
Options

Merge branch 'capslock-master-patch-02828' into 'master' 

Mettre à jour destroy-gcm-support.patch

See merge request !49
parents 4d86993b c0290530
Pipeline #720 passed with stage
    in 33 minutes and 29 seconds
    Hide whitespace changes
    Inline Side-by-side
    Showing with 61 additions and 62 deletions
    destroy-gcm-support.patch
    View file @ 8412ef80
    diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
    index 1221f99d4..c1a332c86 100644
    index 7606e5809..f3e976cd1 100644
    --- a/app/src/main/AndroidManifest.xml
    +++ b/app/src/main/AndroidManifest.xml
    @@ -578,13 +578,13 @@
    @@ -589,13 +589,13 @@
    <service android:name=".service.GenericForegroundService"/>
    - <service android:name=".gcm.FcmFetchService" />
    +<!-- <service android:name=".gcm.FcmFetchService" />-->
    + <!-- <service android:name=".gcm.FcmFetchService" /> -->
    - <service android:name=".gcm.FcmReceiveService">
    - <intent-filter>
    - <action android:name="com.google.firebase.MESSAGING_EVENT" />
    - </intent-filter>
    + <!-- <service android:name=".gcm.FcmReceiveService">
    <intent-filter>
    <action android:name="com.google.firebase.MESSAGING_EVENT" />
    </intent-filter>
    - </service>
    +<!-- <service android:name=".gcm.FcmReceiveService">-->
    +<!-- <intent-filter>-->
    +<!-- <action android:name="com.google.firebase.MESSAGING_EVENT" />-->
    +<!-- </intent-filter>-->
    +<!-- </service>-->
    + </service> -->
    <receiver android:name=".service.SmsListener"
    android:permission="android.permission.BROADCAST_SMS"
    diff --git a/app/src/main/java/org/thoughtcrime/securesms/registration/fragments/EnterPhoneNumberFragment.java b/app/src/main/java/org/thoughtcrime/securesms/registration/fragments/EnterPhoneNumberFragment.java
    index 84dad4f3f..7b8610852 100644
    index 679575419..f4beccd6f 100644
    --- a/app/src/main/java/org/thoughtcrime/securesms/registration/fragments/EnterPhoneNumberFragment.java
    +++ b/app/src/main/java/org/thoughtcrime/securesms/registration/fragments/EnterPhoneNumberFragment.java
    @@ -146,16 +146,16 @@ public final class EnterPhoneNumberFragment extends BaseRegistrationFragment {
    ......@@ -31,32 +28,32 @@ index 84dad4f3f..7b8610852 100644
    PlayServicesUtil.PlayServicesStatus fcmStatus = PlayServicesUtil.getPlayServicesStatus(context);
    - if (fcmStatus == PlayServicesUtil.PlayServicesStatus.SUCCESS) {
    - handleRequestVerification(context, e164number, true);
    - confirmNumberPrompt(context, e164number, () -> handleRequestVerification(context, e164number, true));
    - } else if (fcmStatus == PlayServicesUtil.PlayServicesStatus.MISSING) {
    +// if (fcmStatus == PlayServicesUtil.PlayServicesStatus.SUCCESS) {
    +// handleRequestVerification(context, e164number, true);
    +// } else if (fcmStatus == PlayServicesUtil.PlayServicesStatus.MISSING) {
    handlePromptForNoPlayServices(context, e164number);
    + // 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));
    +// }
    + // } 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 2bebb0a1e..c8623ea16 100644
    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
    @@ -210,6 +210,7 @@ public final class CodeVerificationRequest {
    @@ -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;
    ......@@ -65,23 +62,24 @@ index 2bebb0a1e..c8623ea16 100644
    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 fe629ba90..c7b3d94d1 100644
    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,40 +22,40 @@ public class PlayServicesUtil {
    @@ -22,41 +22,41 @@ public class PlayServicesUtil {
    }
    public static PlayServicesStatus getPlayServicesStatus(Context context) {
    int gcmStatus = 0;
    -
    - 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);
    + // try {
    + // gcmStatus = GoogleApiAvailability.getInstance().isGooglePlayServicesAvailable(context);
    + // } catch (Throwable t) {
    + // Log.w(TAG, t);
    return PlayServicesStatus.MISSING;
    - }
    -
    ......@@ -111,49 +109,50 @@ index fe629ba90..c7b3d94d1 100644
    - default:
    - return PlayServicesStatus.TRANSIENT_ERROR;
    - }
    +// }
    + // }
    +
    +// Log.i(TAG, "Play Services: " + gcmStatus);
    + // 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);
    + // 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);
    +// }
    + // 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;
    +// }
    + // 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 8c388ec07..c48dd1c88 100644
    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
    @@ -445,7 +445,8 @@ public class TextSecurePreferences {
    @@ -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 getBooleanPreference(context, GCM_DISABLED_PREF, false);
    + return true;
    }
    public static void setFcmDisabled(Context context, boolean disabled) {
    --
    2.25.4
    Markdown is supported
    0% or .
    You are about to add 0 people to the discussion. Proceed with caution.
    Finish editing this message first!
    Please register or to comment