gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-03-12 02:19:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add toast for debug mode if failed to get NC notification

Browse Source 
+ remove unused code

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
This commit is contained in:
Marcel Hibbe 2023-03-03 17:21:17 +01:00
parent b72fad3607
commit 2de0029c0e
No known key found for this signature in database
GPG Key ID: C793F8B59F43CE7B
1 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -33,11 +33,14 @@ import android.media.MediaPlayer
import android.net.Uri import android.net.Uri
import android.os.Build import android.os.Build
import android.os.Bundle import android.os.Bundle
import android.os.Handler
import android.os.Looper
import android.os.SystemClock import android.os.SystemClock
import android.service.notification.StatusBarNotification 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
import android.widget.Toast
import androidx.annotation.RequiresApi import androidx.annotation.RequiresApi
import androidx.core.app.NotificationCompat import androidx.core.app.NotificationCompat
import androidx.core.app.NotificationManagerCompat import androidx.core.app.NotificationManagerCompat
@ -51,6 +54,7 @@ import androidx.work.Worker
import androidx.work.WorkerParameters import androidx.work.WorkerParameters
import autodagger.AutoInjector import autodagger.AutoInjector
import com.bluelinelabs.logansquare.LoganSquare import com.bluelinelabs.logansquare.LoganSquare
import com.nextcloud.talk.BuildConfig
import com.nextcloud.talk.R import com.nextcloud.talk.R
import com.nextcloud.talk.activities.CallNotificationActivity import com.nextcloud.talk.activities.CallNotificationActivity
import com.nextcloud.talk.activities.MainActivity import com.nextcloud.talk.activities.MainActivity
@ -315,13 +319,17 @@ class NotificationWorker(context: Context, workerParams: WorkerParameters) : Wor
val ncNotification = notificationOverall.ocs!!.notification val ncNotification = notificationOverall.ocs!!.notification
if (ncNotification != null) { if (ncNotification != null) {
enrichPushMessageByNcNotificationData(ncNotification) enrichPushMessageByNcNotificationData(ncNotification)
// val newIntent = enrichIntentByNcNotificationData(intent, ncNotification)
showNotification(intent, ncNotification) showNotification(intent, ncNotification)
} }
} }
override fun onError(e: Throwable) { override fun onError(e: Throwable) {
Log.e(TAG, "Failed to get notification", e) Log.e(TAG, "Failed to get NC notification", e)
if (BuildConfig.DEBUG) {
Handler(Looper.getMainLooper()).post {
Toast.makeText(context, "Failed to get NC notification", Toast.LENGTH_LONG).show()
}
}
} }
override fun onComplete() { override fun onComplete() {
@ -330,15 +338,6 @@ class NotificationWorker(context: Context, workerParams: WorkerParameters) : Wor
}) })
} }
private fun enrichIntentByNcNotificationData(
intent: Intent,
ncNotification: com.nextcloud.talk.models.json.notifications.Notification
): Intent {
val newIntent = Intent(intent)
return newIntent
}
private fun enrichPushMessageByNcNotificationData( private fun enrichPushMessageByNcNotificationData(
ncNotification: com.nextcloud.talk.models.json.notifications.Notification ncNotification: com.nextcloud.talk.models.json.notifications.Notification
) { ) {