TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-12-06 11:01:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix Huawei push notifications

Browse Source
This commit is contained in:
andrew
2023-08-04 13:36:09 +09:30
parent cc6f880665
commit a27f81db30
10 changed files with 70 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/org/thoughtcrime/securesms/ApplicationContext.java
View File

@@ -506,10 +506,10 @@ public class ApplicationContext extends Application implements DefaultLifecycleO
firebaseInstanceIdJob.cancel(null);
}
String displayName = TextSecurePreferences.getProfileName(this);
boolean isUsingFCM = TextSecurePreferences.isUsingFCM(this);
boolean isUsingFCM = TextSecurePreferences.isPushEnabled(this);
TextSecurePreferences.clearAll(this);
if (isMigratingToV2KeyPair) {
TextSecurePreferences.setIsUsingFCM(this, isUsingFCM);
TextSecurePreferences.setPushEnabled(this, isUsingFCM);
TextSecurePreferences.setProfileName(this, displayName);
}
getSharedPreferences(PREFERENCES_NAME, 0).edit().clear().commit();

2
app/src/main/java/org/thoughtcrime/securesms/notifications/FcmTokenManager.kt
View File

@@ -12,7 +12,7 @@ class FcmTokenManager @Inject constructor(
) {
private val expiryManager = ExpiryManager(context)
val isUsingFCM get() = TextSecurePreferences.isUsingFCM(context)
val isUsingFCM get() = TextSecurePreferences.isPushEnabled(context)
var fcmToken
get() = TextSecurePreferences.getFCMToken(context)

2
app/src/main/java/org/thoughtcrime/securesms/notifications/PushHandler.kt
View File

@@ -33,7 +33,7 @@ class PushHandler @Inject constructor(@ApplicationContext val context: Context)
onPush(dataMap?.asByteArray())
}
private fun onPush(data: ByteArray?) {
fun onPush(data: ByteArray?) {
if (data == null) {
onPush()
return

2
app/src/main/java/org/thoughtcrime/securesms/onboarding/PNModeActivity.kt
View File

@@ -165,7 +165,7 @@ class PNModeActivity : BaseActionBarActivity() {
return
}
TextSecurePreferences.setIsUsingFCM(this, (selectedOptionView == binding.fcmOptionView))
TextSecurePreferences.setPushEnabled(this, (selectedOptionView == binding.fcmOptionView))
val application = ApplicationContext.getInstance(this)
application.startPollingIfNeeded()
pushManager.refresh(true)

4
app/src/main/java/org/thoughtcrime/securesms/preferences/NotificationsPreferenceFragment.java
View File

@@ -45,10 +45,10 @@ public class NotificationsPreferenceFragment extends ListSummaryPreferenceFragme
// Set up FCM toggle
String fcmKey = "pref_key_use_fcm";
((SwitchPreferenceCompat)findPreference(fcmKey)).setChecked(TextSecurePreferences.isUsingFCM(getContext()));
((SwitchPreferenceCompat)findPreference(fcmKey)).setChecked(TextSecurePreferences.isPushEnabled(getContext()));
this.findPreference(fcmKey)
.setOnPreferenceChangeListener((preference, newValue) -> {
TextSecurePreferences.setIsUsingFCM(getContext(), (boolean) newValue);
TextSecurePreferences.setPushEnabled(getContext(), (boolean) newValue);
pushManager.refresh(true);
return true;
});