Don't auto resubscribe to PNs for muted closed groups
This commit is contained in:
parent
6d2044f230
commit
1d1d63c979
|
@ -45,8 +45,8 @@ public final class PushNotificationAPI : NSObject {
|
||||||
SNLog("Couldn't unregister from push notifications.")
|
SNLog("Couldn't unregister from push notifications.")
|
||||||
}
|
}
|
||||||
// Unsubscribe from all closed groups
|
// Unsubscribe from all closed groups
|
||||||
Storage.shared.getUserClosedGroupPublicKeys().forEach { closedGroup in
|
Storage.shared.getUserClosedGroupPublicKeys().forEach { closedGroupPublicKey in
|
||||||
performOperation(.unsubscribe, for: closedGroup, publicKey: getUserHexEncodedPublicKey())
|
performOperation(.unsubscribe, for: closedGroupPublicKey, publicKey: getUserHexEncodedPublicKey())
|
||||||
}
|
}
|
||||||
return promise
|
return promise
|
||||||
}
|
}
|
||||||
|
@ -87,8 +87,14 @@ public final class PushNotificationAPI : NSObject {
|
||||||
SNLog("Couldn't register device token.")
|
SNLog("Couldn't register device token.")
|
||||||
}
|
}
|
||||||
// Subscribe to all closed groups
|
// Subscribe to all closed groups
|
||||||
Storage.shared.getUserClosedGroupPublicKeys().forEach { closedGroup in
|
Storage.shared.getUserClosedGroupPublicKeys().forEach { closedGroupPublicKey in
|
||||||
performOperation(.subscribe, for: closedGroup, publicKey: publicKey)
|
let groupID = LKGroupUtilities.getEncodedClosedGroupIDAsData(closedGroupPublicKey)
|
||||||
|
let threadOrNil = TSGroupThread.fetch(uniqueId: TSGroupThread.threadId(fromGroupId: groupID))
|
||||||
|
if threadOrNil?.isMuted == true {
|
||||||
|
// Do nothing
|
||||||
|
} else {
|
||||||
|
performOperation(.subscribe, for: closedGroupPublicKey, publicKey: publicKey)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
return promise
|
return promise
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue