gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-06-20 20:19:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Refactoring & fix for earlier Nc versions

Browse Source 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
This commit is contained in:
Mario Danic 2019-08-25 23:24:18 +02:00
parent eade532f79
commit 530e8b0547
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
app/src/main/java/com/nextcloud/talk/jobs/NotificationWorker.java
View File

@ -93,7 +93,6 @@ import java.net.CookieManager;
import java.security.InvalidKeyException; import java.security.InvalidKeyException;
import java.security.NoSuchAlgorithmException; import java.security.NoSuchAlgorithmException;
import java.security.PrivateKey; import java.security.PrivateKey;
import java.util.Calendar;
import java.util.HashMap; import java.util.HashMap;
import java.util.zip.CRC32; import java.util.zip.CRC32;
@ -113,7 +112,7 @@ public class NotificationWorker extends Worker {
@Inject @Inject
OkHttpClient okHttpClient; OkHttpClient okHttpClient;
NcApi ncApi; private NcApi ncApi;
private DecryptedPushMessage decryptedPushMessage; private DecryptedPushMessage decryptedPushMessage;
private Context context; private Context context;
@ -161,7 +160,11 @@ public class NotificationWorker extends Worker {
} else { } else {
conversationType = "public"; conversationType = "public";
} }
showMessageNotificationWithObjectData(intent); if (decryptedPushMessage.getNotificationId() != Long.MIN_VALUE) {
showNotificationWithObjectData(intent);
} else {
showNotification(intent);
}
} }
} }
@ -177,7 +180,7 @@ public class NotificationWorker extends Worker {
} }
} }
private void showMessageNotificationWithObjectData(Intent intent) { private void showNotificationWithObjectData(Intent intent) {
UserEntity userEntity = signatureVerification.getUserEntity(); UserEntity userEntity = signatureVerification.getUserEntity();
ncApi.getNotification(credentials, ApiUtils.getUrlForNotificationWithId(userEntity.getBaseUrl(), ncApi.getNotification(credentials, ApiUtils.getUrlForNotificationWithId(userEntity.getBaseUrl(),
Long.toString(decryptedPushMessage.getNotificationId()))) Long.toString(decryptedPushMessage.getNotificationId())))
@ -584,7 +587,7 @@ public class NotificationWorker extends Worker {
break; break;
case "chat": case "chat":
if (decryptedPushMessage.getNotificationId() != Long.MIN_VALUE) { if (decryptedPushMessage.getNotificationId() != Long.MIN_VALUE) {
showMessageNotificationWithObjectData(intent); showNotificationWithObjectData(intent);
} else { } else {
showNotification(intent); showNotification(intent);
} }