Skip to content

Update google-services.json Firebase config and simplify notification null checks #61

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Miggets7 wants to merge 1 commit into
base: main
Choose a base branch
from
+6 −23
Open

Update google-services.json Firebase config and simplify notification null checks #61

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 3 additions & 20 deletions GenericApp/app/google-services.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"project_number": "667022545910",
"firebase_url": "https://openremoteapp-a6a60.firebaseio.com",
"project_id": "openremoteapp-a6a60",
"storage_bucket": "openremoteapp-a6a60.appspot.com"
"storage_bucket": "openremoteapp-a6a60.firebasestorage.app"
},
"client": [
{
Expand All @@ -13,32 +13,15 @@
"package_name": "io.openremote.app"
}
},
"oauth_client": [
{
"client_id": "667022545910-g53k1fiocps3sso32hqvotr34fe2libr.apps.googleusercontent.com",
"client_type": 3
}
],
"oauth_client": [],
"api_key": [
{
"current_key": "AIzaSyCXUqMM_P0Vo_pGmebCLgyD8RWeSN71TxU"
}
],
"services": {
"appinvite_service": {
"other_platform_oauth_client": [
{
"client_id": "667022545910-g53k1fiocps3sso32hqvotr34fe2libr.apps.googleusercontent.com",
"client_type": 3
},
{
"client_id": "667022545910-9fee9uvb8iguprjtimmq8uea6cqt2p5i.apps.googleusercontent.com",
"client_type": 2,
"ios_info": {
"bundle_id": "io.openremote.app"
}
}
]
"other_platform_oauth_client": []
}
}
}
Expand Down
6 changes: 3 additions & 3 deletions ORLib/src/main/java/io/openremote/orlib/service/ORFirebaseMessagingService.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ class ORFirebaseMessagingService : com.google.firebase.messaging.FirebaseMessagi
// Mark as delivered on the server
val notificationIdStr = messageData["notification-id"]
var notificationId: Long? = null
if (notificationIdStr != null && notificationIdStr.isNotEmpty()) {
if (!notificationIdStr.isNullOrEmpty()) {
notificationId = notificationIdStr.toLong()
val consoleId: String? = getSharedPreferences(
applicationContext.getString(R.string.app_name),
Expand Down Expand Up @@ -105,7 +105,7 @@ class ORFirebaseMessagingService : com.google.firebase.messaging.FirebaseMessagi
// Check for action (to be executed when notification is clicked)
if (messageData.containsKey("action")) {
val actionJson = messageData["action"]
if (actionJson != null && actionJson.isNotEmpty()) {
if (!actionJson.isNullOrEmpty()) {
try {
actionOR = jacksonObjectMapper().readValue(
actionJson,
Expand All @@ -120,7 +120,7 @@ class ORFirebaseMessagingService : com.google.firebase.messaging.FirebaseMessagi
// Check for buttons
if (messageData.containsKey("buttons")) {
val buttonsJson = messageData["buttons"]
if (buttonsJson != null && buttonsJson.isNotEmpty()) {
if (!buttonsJson.isNullOrEmpty()) {
try {
buttonORS = jacksonObjectMapper().readValue(
buttonsJson,
Expand Down