TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-08-13 10:07:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Reinstate push v1

Browse Source
This commit is contained in:
andrew
2023-06-14 18:46:28 +09:30
parent 288b70bb14
commit 153aa4ceaa
5 changed files with 45 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -218,10 +218,6 @@ public class ApplicationContext extends Application implements DefaultLifecycleO
broadcaster = new Broadcaster(this);
LokiAPIDatabase apiDB = getDatabaseComponent().lokiAPIDatabase();
SnodeModule.Companion.configure(apiDB, broadcaster);
String userPublicKey = TextSecurePreferences.getLocalNumber(this);
if (userPublicKey != null) {
registerForPnIfNeeded(false);
}
initializeExpiringMessageManager();
initializeTypingStatusRepository();
initializeTypingStatusSender();
@@ -512,10 +508,7 @@ public class ApplicationContext extends Application implements DefaultLifecycleO
}
public void clearAllData(boolean isMigratingToV2KeyPair) {
String token = TextSecurePreferences.getFCMToken(this);
if (token != null && !token.isEmpty()) {
PushNotificationAPI.unregister(token);
}
PushNotificationAPI.unregister();
if (firebaseInstanceIdJob != null && firebaseInstanceIdJob.isActive()) {
firebaseInstanceIdJob.cancel(null);
}

7
app/src/play/kotlin/org/thoughtcrime/securesms/notifications/FirebasePushManager.kt
View File

@@ -146,7 +146,7 @@ class FirebasePushManager(private val context: Context, private val prefs: TextS
if (response.success == true) {
Log.d(TAG, "Unsubscribe FCM success")
TextSecurePreferences.setFCMToken(context, null)
PushNotificationAPI.unregister(token)
PushNotificationAPI.unregister()
} else {
Log.e(TAG, "Couldn't unregister for FCM due to error: ${response.message}")
}
@@ -161,7 +161,10 @@ class FirebasePushManager(private val context: Context, private val prefs: TextS
val oldToken = TextSecurePreferences.getFCMToken(context)
val lastUploadDate = TextSecurePreferences.getLastFCMUploadTime(context)
if (!force && token == oldToken && System.currentTimeMillis() - lastUploadDate < tokenExpirationInterval) return
// if (!force && token == oldToken && System.currentTimeMillis() - lastUploadDate < tokenExpirationInterval) {
// Log.d(TAG, "not registering now... not forced or expired")
// return
// }
val pnKey = getOrCreateNotificationKey()

4
app/src/play/kotlin/org/thoughtcrime/securesms/notifications/PushNotificationService.kt
View File

@@ -24,7 +24,9 @@ class PushNotificationService : FirebaseMessagingService() {
super.onNewToken(token)
Log.d("Loki", "New FCM token: $token.")
TextSecurePreferences.getLocalNumber(this) ?: return
pushManager.refresh(true)
if (TextSecurePreferences.getLocalNumber(this) != token) {
pushManager.refresh(true)
}
}
override fun onMessageReceived(message: RemoteMessage) {