Merge branch 'app' into app-publish

Freegle · Jun 27, 2023 · 13b2316 · 13b2316
2 parents 0c9e022 + eac52cf
commit 13b2316
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -6,7 +6,7 @@ android {
         applicationId "org.ilovefreegle.direct"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 1203
+        versionCode 1204
         versionName "3.0.3"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         aaptOptions {

diff --git a/stores/mobile.js b/stores/mobile.js
@@ -386,7 +386,9 @@ export const useMobileStore = defineStore({ // Do not persist
       //console.log('push notification', notificationType)
       console.log(notification)
       const data = notification.data
-      // const foreground = data.foreground.toString() === 'true' // Was first called in foreground or background
+      let foreground = false
+      if( 'foreground' in data) foreground = data.foreground
+
       // let msgid = new Date().getTime() // Can't tell if double event if notId not given
       let msgid = 0
       if ('notId' in data) {
@@ -449,7 +451,7 @@ export const useMobileStore = defineStore({ // Do not persist
         })
       }*/
 
-      if (this.route) {
+      if (this.route && !foreground) {
         this.route = this.route.replace('/chat/', '/chats/') // Match redirects in nuxt.config.js
         console.log('router.currentRoute', router.currentRoute)
         if (router.currentRoute.path !== this.route) {