SW/mattermost-mobile
2
0
Fork 0
forked from Ivasoft/mattermost-mobile
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Gekidou MM-47224] Don’t show in app notifications for the active thread (#6704)

Browse Source 
* Conditions fix

* Comments fix
This commit is contained in:
Anurag Shivarathri
2022-10-28 14:04:58 +01:00
committed by GitHub
parent d26d000ce3
commit 04c3533b95
1 changed files with 26 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
app/init/push_notifications.ts
View File

@@ -95,19 +95,38 @@ class PushNotifications {
const isTabletDevice = await isTablet();
const displayName = await queryServerName(DatabaseManager.appDatabase!.database, serverUrl);
const channelId = await getCurrentChannelId(database);
const isCRTEnabled = await getIsCRTEnabled(database);
let serverName;
if (Object.keys(DatabaseManager.serverDatabases).length > 1) {
serverName = displayName;
}
const isDifferentChannel = payload?.channel_id !== channelId;
const isVisibleThread = payload?.root_id === EphemeralStore.getCurrentThreadId();
let isChannelScreenVisible = NavigationStore.getNavigationTopComponentId() === Screens.CHANNEL;
if (isTabletDevice) {
isChannelScreenVisible = NavigationStore.getVisibleTab() === Screens.HOME;
}
const isThreadNotification = Boolean(payload?.root_id);
if (isDifferentChannel || (!isChannelScreenVisible && !isVisibleThread)) {
const isSameChannelNotification = payload?.channel_id === channelId;
const isSameThreadNotification = isThreadNotification && payload?.root_id === EphemeralStore.getCurrentThreadId();
let isInChannelScreen = NavigationStore.getNavigationTopComponentId() === Screens.CHANNEL;
if (isTabletDevice) {
isInChannelScreen = NavigationStore.getVisibleTab() === Screens.HOME;
}
const isInThreadScreen = NavigationStore.getNavigationTopComponentId() === Screens.THREAD;
// Conditions:
// 1. If not in channel screen or thread screen, show the notification
const condition1 = !isInChannelScreen && !isInThreadScreen;
// 2. If is in channel screen,
// - Show notification of other channels
// or
// - Show notification if CRT is enabled and it's a thread notification (doesn't matter if it's the same channel)
const condition2 = isInChannelScreen && (!isSameChannelNotification || (isCRTEnabled && isThreadNotification));
// 3. If is in thread screen,
// - Show the notification if it doesn't belong to the thread
const condition3 = isInThreadScreen && !isSameThreadNotification;
if (condition1 || condition2 || condition3) {
DeviceEventEmitter.emit(Navigation.NAVIGATION_SHOW_OVERLAY);
const screen = Screens.IN_APP_NOTIFICATION;