From be26905e366c0e419ad4a5009d14d4c0942866bc Mon Sep 17 00:00:00 2001 From: AndyScherzinger Date: Wed, 23 Aug 2017 16:35:44 +0200 Subject: [PATCH 1/4] fix push notifications for 12.0.2 --- build.gradle | 2 +- .../services/firebase/NCFirebaseMessagingService.java | 6 ++++-- src/gplay/java/com/owncloud/android/utils/PushUtils.java | 4 ++++ .../services/firebase/NCFirebaseMessagingService.java | 6 ++++-- 4 files changed, 13 insertions(+), 5 deletions(-) diff --git a/build.gradle b/build.gradle index bf81ece1768d..3bd8b1bd4709 100644 --- a/build.gradle +++ b/build.gradle @@ -184,7 +184,7 @@ dependencies { /// dependencies for app building implementation name: 'touch-image-view' implementation 'com.android.support:multidex:1.0.2' - implementation 'com.github.nextcloud:android-library:1.0.25' + implementation 'com.github.nextcloud:android-library:1.0.26' implementation "com.android.support:support-v4:${supportLibraryVersion}" implementation "com.android.support:design:${supportLibraryVersion}" implementation 'com.jakewharton:disklrucache:2.0.2' diff --git a/src/gplay/java/com/owncloud/android/services/firebase/NCFirebaseMessagingService.java b/src/gplay/java/com/owncloud/android/services/firebase/NCFirebaseMessagingService.java index 0a641cd45cb8..c41e70843f2e 100644 --- a/src/gplay/java/com/owncloud/android/services/firebase/NCFirebaseMessagingService.java +++ b/src/gplay/java/com/owncloud/android/services/firebase/NCFirebaseMessagingService.java @@ -23,6 +23,7 @@ import android.app.PendingIntent; import android.content.Context; import android.content.Intent; +import android.graphics.BitmapFactory; import android.media.RingtoneManager; import android.net.Uri; import android.support.v4.app.NotificationCompat; @@ -49,9 +50,10 @@ private void sendNotification(String contentTitle) { PendingIntent pendingIntent = PendingIntent.getActivity(this, 0, intent, PendingIntent.FLAG_ONE_SHOT); - Uri defaultSoundUri= RingtoneManager.getDefaultUri(RingtoneManager.TYPE_NOTIFICATION); + Uri defaultSoundUri = RingtoneManager.getDefaultUri(RingtoneManager.TYPE_NOTIFICATION); NotificationCompat.Builder notificationBuilder = new NotificationCompat.Builder(this) - .setSmallIcon(R.mipmap.ic_launcher) + .setSmallIcon(R.drawable.notification_icon) + .setLargeIcon(BitmapFactory.decodeResource(getResources(),R.drawable.notification_icon)) .setContentTitle(contentTitle) .setSound(defaultSoundUri) .setAutoCancel(true) diff --git a/src/gplay/java/com/owncloud/android/utils/PushUtils.java b/src/gplay/java/com/owncloud/android/utils/PushUtils.java index 908a8be7ed4e..185d626b9b05 100644 --- a/src/gplay/java/com/owncloud/android/utils/PushUtils.java +++ b/src/gplay/java/com/owncloud/android/utils/PushUtils.java @@ -26,6 +26,7 @@ import android.content.Context; import android.text.TextUtils; import android.util.Base64; +import android.util.Log; import com.google.gson.Gson; import com.owncloud.android.MainApp; @@ -105,6 +106,8 @@ private static int generateRsa2048KeyPair() { String publicKeyPath = keyPath + File.separator + KEYPAIR_FILE_NAME + KEYPAIR_PUB_EXTENSION; File keyPathFile = new File(keyPath); + Log.d(TAG, publicKeyPath); + if (!new File(privateKeyPath).exists() && !new File(publicKeyPath).exists()) { try { if (!keyPathFile.exists()) { @@ -226,6 +229,7 @@ public static void pushRegistrationToServer() { publicKey, context.getResources().getString(R.string.push_server_url)); + Log.d(TAG, pushTokenHash); RemoteOperationResult remoteOperationResult = registerAccountDeviceForNotificationsOperation. execute(mClient); diff --git a/src/modified/java/com/owncloud/android/services/firebase/NCFirebaseMessagingService.java b/src/modified/java/com/owncloud/android/services/firebase/NCFirebaseMessagingService.java index 0a641cd45cb8..c41e70843f2e 100644 --- a/src/modified/java/com/owncloud/android/services/firebase/NCFirebaseMessagingService.java +++ b/src/modified/java/com/owncloud/android/services/firebase/NCFirebaseMessagingService.java @@ -23,6 +23,7 @@ import android.app.PendingIntent; import android.content.Context; import android.content.Intent; +import android.graphics.BitmapFactory; import android.media.RingtoneManager; import android.net.Uri; import android.support.v4.app.NotificationCompat; @@ -49,9 +50,10 @@ private void sendNotification(String contentTitle) { PendingIntent pendingIntent = PendingIntent.getActivity(this, 0, intent, PendingIntent.FLAG_ONE_SHOT); - Uri defaultSoundUri= RingtoneManager.getDefaultUri(RingtoneManager.TYPE_NOTIFICATION); + Uri defaultSoundUri = RingtoneManager.getDefaultUri(RingtoneManager.TYPE_NOTIFICATION); NotificationCompat.Builder notificationBuilder = new NotificationCompat.Builder(this) - .setSmallIcon(R.mipmap.ic_launcher) + .setSmallIcon(R.drawable.notification_icon) + .setLargeIcon(BitmapFactory.decodeResource(getResources(),R.drawable.notification_icon)) .setContentTitle(contentTitle) .setSound(defaultSoundUri) .setAutoCancel(true) From 35db685639a772746353eed4bce15cb1afec8afa Mon Sep 17 00:00:00 2001 From: AndyScherzinger Date: Wed, 23 Aug 2017 16:38:35 +0200 Subject: [PATCH 2/4] remove logging --- src/gplay/java/com/owncloud/android/utils/PushUtils.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/gplay/java/com/owncloud/android/utils/PushUtils.java b/src/gplay/java/com/owncloud/android/utils/PushUtils.java index 185d626b9b05..138a14764617 100644 --- a/src/gplay/java/com/owncloud/android/utils/PushUtils.java +++ b/src/gplay/java/com/owncloud/android/utils/PushUtils.java @@ -106,8 +106,6 @@ private static int generateRsa2048KeyPair() { String publicKeyPath = keyPath + File.separator + KEYPAIR_FILE_NAME + KEYPAIR_PUB_EXTENSION; File keyPathFile = new File(keyPath); - Log.d(TAG, publicKeyPath); - if (!new File(privateKeyPath).exists() && !new File(publicKeyPath).exists()) { try { if (!keyPathFile.exists()) { From 037b2a363d3f12b53afed912cbe35969c0135507 Mon Sep 17 00:00:00 2001 From: AndyScherzinger Date: Wed, 23 Aug 2017 16:40:59 +0200 Subject: [PATCH 3/4] fix code review --- .../android/services/firebase/NCFirebaseMessagingService.java | 3 +-- src/gplay/java/com/owncloud/android/utils/PushUtils.java | 1 - .../android/services/firebase/NCFirebaseMessagingService.java | 3 +-- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/src/gplay/java/com/owncloud/android/services/firebase/NCFirebaseMessagingService.java b/src/gplay/java/com/owncloud/android/services/firebase/NCFirebaseMessagingService.java index c41e70843f2e..87caf51994c9 100644 --- a/src/gplay/java/com/owncloud/android/services/firebase/NCFirebaseMessagingService.java +++ b/src/gplay/java/com/owncloud/android/services/firebase/NCFirebaseMessagingService.java @@ -50,12 +50,11 @@ private void sendNotification(String contentTitle) { PendingIntent pendingIntent = PendingIntent.getActivity(this, 0, intent, PendingIntent.FLAG_ONE_SHOT); - Uri defaultSoundUri = RingtoneManager.getDefaultUri(RingtoneManager.TYPE_NOTIFICATION); NotificationCompat.Builder notificationBuilder = new NotificationCompat.Builder(this) .setSmallIcon(R.drawable.notification_icon) .setLargeIcon(BitmapFactory.decodeResource(getResources(),R.drawable.notification_icon)) .setContentTitle(contentTitle) - .setSound(defaultSoundUri) + .setSound(RingtoneManager.getDefaultUri(RingtoneManager.TYPE_NOTIFICATION)) .setAutoCancel(true) .setContentIntent(pendingIntent); diff --git a/src/gplay/java/com/owncloud/android/utils/PushUtils.java b/src/gplay/java/com/owncloud/android/utils/PushUtils.java index 138a14764617..167742281ff3 100644 --- a/src/gplay/java/com/owncloud/android/utils/PushUtils.java +++ b/src/gplay/java/com/owncloud/android/utils/PushUtils.java @@ -227,7 +227,6 @@ public static void pushRegistrationToServer() { publicKey, context.getResources().getString(R.string.push_server_url)); - Log.d(TAG, pushTokenHash); RemoteOperationResult remoteOperationResult = registerAccountDeviceForNotificationsOperation. execute(mClient); diff --git a/src/modified/java/com/owncloud/android/services/firebase/NCFirebaseMessagingService.java b/src/modified/java/com/owncloud/android/services/firebase/NCFirebaseMessagingService.java index c41e70843f2e..87caf51994c9 100644 --- a/src/modified/java/com/owncloud/android/services/firebase/NCFirebaseMessagingService.java +++ b/src/modified/java/com/owncloud/android/services/firebase/NCFirebaseMessagingService.java @@ -50,12 +50,11 @@ private void sendNotification(String contentTitle) { PendingIntent pendingIntent = PendingIntent.getActivity(this, 0, intent, PendingIntent.FLAG_ONE_SHOT); - Uri defaultSoundUri = RingtoneManager.getDefaultUri(RingtoneManager.TYPE_NOTIFICATION); NotificationCompat.Builder notificationBuilder = new NotificationCompat.Builder(this) .setSmallIcon(R.drawable.notification_icon) .setLargeIcon(BitmapFactory.decodeResource(getResources(),R.drawable.notification_icon)) .setContentTitle(contentTitle) - .setSound(defaultSoundUri) + .setSound(RingtoneManager.getDefaultUri(RingtoneManager.TYPE_NOTIFICATION)) .setAutoCancel(true) .setContentIntent(pendingIntent); From e4028493fd35d051ba26ded2386be266ee61f4ad Mon Sep 17 00:00:00 2001 From: AndyScherzinger Date: Wed, 23 Aug 2017 16:46:03 +0200 Subject: [PATCH 4/4] fix --- src/gplay/java/com/owncloud/android/utils/PushUtils.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/gplay/java/com/owncloud/android/utils/PushUtils.java b/src/gplay/java/com/owncloud/android/utils/PushUtils.java index 167742281ff3..908a8be7ed4e 100644 --- a/src/gplay/java/com/owncloud/android/utils/PushUtils.java +++ b/src/gplay/java/com/owncloud/android/utils/PushUtils.java @@ -26,7 +26,6 @@ import android.content.Context; import android.text.TextUtils; import android.util.Base64; -import android.util.Log; import com.google.gson.Gson; import com.owncloud.android.MainApp;