100% open-source IoT Platform - Integrate your devices, add intelligence, build custom apps
Java asset-managementbuildingdashboarddataplatformdevice-managementedge-computingenergyenergy-managementenergy-monitorfleet-managementfleet-telematicsiotiot-applicationiot-platformmodbusmqttmqtt-brokerota-updaterules-enginesmartcity
Console: Fix for opening app when push is tapped (#698)
Rich Turner8255c32014fd
diff --git a/console/android/ORLib/build.gradle b/console/android/ORLib/build.gradleindex 5f17b0bd2..ab19f0b86 100644--- a/console/android/ORLib/build.gradle+++ b/console/android/ORLib/build.gradle@@ -27,11 +27,11 @@ android {viewBinding true}compileOptions {- sourceCompatibility JavaVersion.VERSION_11- targetCompatibility JavaVersion.VERSION_11+ sourceCompatibility JavaVersion.VERSION_17+ targetCompatibility JavaVersion.VERSION_17}kotlinOptions {- jvmTarget = '1.8'+ jvmTarget = '17'}}@@ -40,10 +40,10 @@ dependencies {implementation 'androidx.core:core-ktx:1.7.0'implementation 'androidx.appcompat:appcompat:1.4.1'implementation 'com.google.android.material:material:1.5.0'- implementation 'androidx.preference:preference-ktx:1.1.1'+ implementation 'androidx.preference:preference-ktx:1.2.0'implementation "com.google.android.gms:play-services-location:19.0.1"implementation 'com.google.android.gms:play-services-vision:20.1.3'- implementation "com.fasterxml.jackson.module:jackson-module-kotlin:2.9.8"+ implementation 'com.fasterxml.jackson.module:jackson-module-kotlin:2.13.1'implementation platform('com.google.firebase:firebase-bom:26.0.0')implementation 'com.google.firebase:firebase-messaging-ktx'-}\ No newline at end of file+}diff --git a/console/android/ORLib/src/main/java/io/openremote/orlib/service/ORFirebaseMessagingService.kt b/console/android/ORLib/src/main/java/io/openremote/orlib/service/ORFirebaseMessagingService.ktindex daeb32af7..585f005c4 100644--- a/console/android/ORLib/src/main/java/io/openremote/orlib/service/ORFirebaseMessagingService.kt+++ b/console/android/ORLib/src/main/java/io/openremote/orlib/service/ORFirebaseMessagingService.kt@@ -20,6 +20,7 @@ import io.openremote.orlib.ui.OrMainActivityimport java.util.logging.Levelimport java.util.logging.Logger+class ORFirebaseMessagingService : com.google.firebase.messaging.FirebaseMessagingService() {private var notificationResource: NotificationResource? = null@@ -161,6 +162,10 @@ class ORFirebaseMessagingService : com.google.firebase.messaging.FirebaseMessagiactionOR: ORAlertAction?,buttonORS: Array<ORAlertButton>?) {+ val pm = packageManager+ val notificationIntent = pm.getLaunchIntentForPackage(packageName)+ notificationIntent?.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK)+ val pendingIntent = PendingIntent.getActivity(this, 0, notificationIntent, 0)val notificationBuilder = NotificationCompat.Builder(this,@@ -169,7 +174,8 @@ class ORFirebaseMessagingService : com.google.firebase.messaging.FirebaseMessagi.setContentTitle(title).setStyle(NotificationCompat.BigTextStyle().bigText(body)).setContentText(body)- .setSmallIcon(R.drawable.notification_icon)+ .setSmallIcon(R.drawable.ic_notification)+ .setContentIntent(pendingIntent).setDeleteIntent(createActionIntent(notificationId, "\"CLOSED\"", null))if (actionOR != null) {notificationBuilder.setContentIntent(createActionIntent(notificationId, null, actionOR))@@ -222,4 +228,4 @@ class ORFirebaseMessagingService : com.google.firebase.messaging.FirebaseMessagiORFirebaseMessagingService::class.java.name)}-}\ No newline at end of file+}diff --git a/console/iOS/ORLib/ORLib.xcodeproj/project.pbxproj b/console/iOS/ORLib/ORLib.xcodeproj/project.pbxprojindex c53fc3a47..13dc9c16b 100644--- a/console/iOS/ORLib/ORLib.xcodeproj/project.pbxproj+++ b/console/iOS/ORLib/ORLib.xcodeproj/project.pbxproj@@ -34,7 +34,7 @@/* End PBXBuildFile section *//* Begin PBXFileReference section */- 1C9C6FD79D9EB69E704225EB /* Pods-ORLib.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ORLib.debug.xcconfig"; path = "../../../michael/Documents/OR/Code/eindhoven/console/beatrixkanaal/iOS/Beatrixkanaal/Pods/Target Support Files/Pods-ORLib/Pods-ORLib.debug.xcconfig"; sourceTree = "<group>"; };+ 1C9C6FD79D9EB69E704225EB /* Pods-ORLib.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ORLib.debug.xcconfig"; path = "../../../michael/Documents/OR/Code/k2/console/iOS/K2/Pods/Target Support Files/Pods-ORLib/Pods-ORLib.debug.xcconfig"; sourceTree = "<group>"; };3883826F504367290A57B876 /* Pods-ORLibrary.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ORLibrary.debug.xcconfig"; path = "../../../michael/Documents/OR/Code/eindhoven/console/beatrixkanaal/iOS/Beatrixkanaal/Pods/Target Support Files/Pods-ORLibrary/Pods-ORLibrary.debug.xcconfig"; sourceTree = "<group>"; };4C0E4A0F274BDCE0008CB352 /* ScannerOverlayPreviewLayer.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ScannerOverlayPreviewLayer.swift; sourceTree = "<group>"; };4C0E4A11274BE411008CB352 /* QrScannerProvider.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = QrScannerProvider.swift; sourceTree = "<group>"; };@@ -60,7 +60,7 @@4CF5D06527143F1F00D705BE /* ORPushNotificationAction.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ORPushNotificationAction.swift; sourceTree = "<group>"; };4CF5D06727143F1F00D705BE /* ORNotificationResource.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ORNotificationResource.swift; sourceTree = "<group>"; };4CF5D06827143F1F00D705BE /* ApiManager.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ApiManager.swift; sourceTree = "<group>"; };- 6622F2FF5F233FCAA9475FCC /* Pods-ORLib.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ORLib.release.xcconfig"; path = "../../../michael/Documents/OR/Code/eindhoven/console/beatrixkanaal/iOS/Beatrixkanaal/Pods/Target Support Files/Pods-ORLib/Pods-ORLib.release.xcconfig"; sourceTree = "<group>"; };+ 6622F2FF5F233FCAA9475FCC /* Pods-ORLib.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ORLib.release.xcconfig"; path = "../../../michael/Documents/OR/Code/k2/console/iOS/K2/Pods/Target Support Files/Pods-ORLib/Pods-ORLib.release.xcconfig"; sourceTree = "<group>"; };9AE68221D73F2C0743A39184 /* Pods-ORLibrary.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ORLibrary.release.xcconfig"; path = "../../../michael/Documents/OR/Code/eindhoven/console/beatrixkanaal/iOS/Beatrixkanaal/Pods/Target Support Files/Pods-ORLibrary/Pods-ORLibrary.release.xcconfig"; sourceTree = "<group>"; };F721AAB633C4A25ACBDD59EE /* Pods_ORLib.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_ORLib.framework; sourceTree = BUILT_PRODUCTS_DIR; };/* End PBXFileReference section */@@ -341,7 +341,7 @@GENERATE_INFOPLIST_FILE = YES;INFOPLIST_KEY_NSHumanReadableCopyright = "";INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";- IPHONEOS_DEPLOYMENT_TARGET = 15.2;+ IPHONEOS_DEPLOYMENT_TARGET = 14.5;LD_RUNPATH_SEARCH_PATHS = ("$(inherited)","@executable_path/Frameworks",@@ -375,7 +375,7 @@GENERATE_INFOPLIST_FILE = YES;INFOPLIST_KEY_NSHumanReadableCopyright = "";INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";- IPHONEOS_DEPLOYMENT_TARGET = 15.2;+ IPHONEOS_DEPLOYMENT_TARGET = 14.5;LD_RUNPATH_SEARCH_PATHS = ("$(inherited)","@executable_path/Frameworks",diff --git a/console/iOS/ORLib/ORLib.xcodeproj/xcuserdata/michael.xcuserdatad/xcschemes/xcschememanagement.plist b/console/iOS/ORLib/ORLib.xcodeproj/xcuserdata/michael.xcuserdatad/xcschemes/xcschememanagement.plistindex 57c9da2cb..9e65c27c9 100644--- a/console/iOS/ORLib/ORLib.xcodeproj/xcuserdata/michael.xcuserdatad/xcschemes/xcschememanagement.plist+++ b/console/iOS/ORLib/ORLib.xcodeproj/xcuserdata/michael.xcuserdatad/xcschemes/xcschememanagement.plist@@ -7,7 +7,7 @@<key>ORLib.xcscheme_^#shared#^_</key><dict><key>orderHint</key>- <integer>20</integer>+ <integer>19</integer></dict><key>ORLibrary.xcscheme_^#shared#^_</key><dict>