owen/moshidon
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix notification settings getting reset on app update

Browse Source
This commit is contained in:
Grishka
2022-04-28 23:32:43 +03:00
parent f73849dbb7
commit 620bc2285c
2 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
mastodon/src/main/java/org/joinmastodon/android/api/PushSubscriptionManager.java
View File

@@ -121,10 +121,6 @@ public class PushSubscriptionManager{
return !TextUtils.isEmpty(deviceToken); return !TextUtils.isEmpty(deviceToken);
} }
public void registerAccountForPush(){
registerAccountForPush(null);
}
public void registerAccountForPush(PushSubscription subscription){ public void registerAccountForPush(PushSubscription subscription){
if(TextUtils.isEmpty(deviceToken)) if(TextUtils.isEmpty(deviceToken))
throw new IllegalStateException("No device push token available"); throw new IllegalStateException("No device push token available");
@@ -367,7 +363,7 @@ public class PushSubscriptionManager{
private static void registerAllAccountsForPush(boolean forceReRegister){ private static void registerAllAccountsForPush(boolean forceReRegister){
for(AccountSession session:AccountSessionManager.getInstance().getLoggedInAccounts()){ for(AccountSession session:AccountSessionManager.getInstance().getLoggedInAccounts()){
if(session.pushSubscription==null || forceReRegister) if(session.pushSubscription==null || forceReRegister)
session.getPushSubscriptionManager().registerAccountForPush(); session.getPushSubscriptionManager().registerAccountForPush(session.pushSubscription);
else if(session.needUpdatePushSettings) else if(session.needUpdatePushSettings)
session.getPushSubscriptionManager().updatePushSettings(session.pushSubscription); session.getPushSubscriptionManager().updatePushSettings(session.pushSubscription);
} }

2
mastodon/src/main/java/org/joinmastodon/android/api/session/AccountSessionManager.java
View File

@@ -100,7 +100,7 @@ public class AccountSessionManager{
writeAccountsFile(); writeAccountsFile();
updateInstanceEmojis(instance, instance.uri); updateInstanceEmojis(instance, instance.uri);
if(PushSubscriptionManager.arePushNotificationsAvailable()){ if(PushSubscriptionManager.arePushNotificationsAvailable()){
session.getPushSubscriptionManager().registerAccountForPush(); session.getPushSubscriptionManager().registerAccountForPush(null);
} }
} }