mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-11-25 14:45:47 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #3944 from nextcloud/directlyHidePush

Browse source 
Directly hide push notification, show it again in case of error
This commit is contained in:
Andy Scherzinger 2019-05-03 20:16:41 +02:00 committed by GitHub
commit 3629cfb7c4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 24 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
src/main/java/com/owncloud/android/jobs/NotificationJob.java
View file

@ -33,6 +33,8 @@ import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.graphics.BitmapFactory; import android.graphics.BitmapFactory;
import android.media.RingtoneManager; import android.media.RingtoneManager;
import android.os.Build;
import android.service.notification.StatusBarNotification;
import android.text.TextUtils; import android.text.TextUtils;
import android.util.Base64; import android.util.Base64;
import android.util.Log; import android.util.Log;
@ -91,13 +93,13 @@ public class NotificationJob extends Job {
private static final String KEY_NOTIFICATION_ACTION_TYPE = "KEY_NOTIFICATION_ACTION_TYPE"; private static final String KEY_NOTIFICATION_ACTION_TYPE = "KEY_NOTIFICATION_ACTION_TYPE";
private static final String PUSH_NOTIFICATION_ID = "PUSH_NOTIFICATION_ID"; private static final String PUSH_NOTIFICATION_ID = "PUSH_NOTIFICATION_ID";
private static final String NUMERIC_NOTIFICATION_ID = "NUMERIC_NOTIFICATION_ID"; private static final String NUMERIC_NOTIFICATION_ID = "NUMERIC_NOTIFICATION_ID";
public static final String APP_SPREED = "spreed"; private static final String APP_SPREED = "spreed";
private SecureRandom randomId = new SecureRandom(); private SecureRandom randomId = new SecureRandom();
private Context context; private Context context;
private UserAccountManager accountManager; private UserAccountManager accountManager;
public NotificationJob(final Context context, final UserAccountManager accountManager) { NotificationJob(final Context context, final UserAccountManager accountManager) {
this.context = context; this.context = context;
this.accountManager = accountManager; this.accountManager = accountManager;
} }
@ -260,6 +262,21 @@ public class NotificationJob extends Job {
if (numericNotificationId != 0) { if (numericNotificationId != 0) {
new Thread(() -> { new Thread(() -> {
NotificationManager notificationManager = (NotificationManager) context.getSystemService(
Activity.NOTIFICATION_SERVICE);
android.app.Notification oldNotification = null;
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M && notificationManager != null) {
for (StatusBarNotification statusBarNotification : notificationManager.getActiveNotifications()) {
if (pushNotificationId == statusBarNotification.getId()) {
oldNotification = statusBarNotification.getNotification();
break;
}
}
cancel(context, pushNotificationId);
}
try { try {
Account currentAccount = AccountUtils.getOwnCloudAccountByName(context, accountName); Account currentAccount = AccountUtils.getOwnCloudAccountByName(context, accountName);
@ -286,8 +303,12 @@ public class NotificationJob extends Job {
} }
if (success) { if (success) {
if (oldNotification == null) {
cancel(context, pushNotificationId); cancel(context, pushNotificationId);
} }
} else if (notificationManager != null) {
notificationManager.notify(pushNotificationId, oldNotification);
}
} catch (com.owncloud.android.lib.common.accounts.AccountUtils.AccountNotFoundException | } catch (com.owncloud.android.lib.common.accounts.AccountUtils.AccountNotFoundException |
IOException | OperationCanceledException | AuthenticatorException e) { IOException | OperationCanceledException | AuthenticatorException e) {
Log_OC.e(TAG, "Error initializing client", e); Log_OC.e(TAG, "Error initializing client", e);