From 8307b482138653b8164f3631c13af48c660f1e88 Mon Sep 17 00:00:00 2001 From: Mario Danic Date: Sun, 23 Feb 2020 23:24:45 +0100 Subject: [PATCH] Cleanup Signed-off-by: Mario Danic --- .../java/com/nextcloud/talk/jobs/MessageNotificationWorker.kt | 2 +- .../java/com/nextcloud/talk/newarch/services/CallService.kt | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/app/src/main/java/com/nextcloud/talk/jobs/MessageNotificationWorker.kt b/app/src/main/java/com/nextcloud/talk/jobs/MessageNotificationWorker.kt index f76458bb7..256c83e8f 100644 --- a/app/src/main/java/com/nextcloud/talk/jobs/MessageNotificationWorker.kt +++ b/app/src/main/java/com/nextcloud/talk/jobs/MessageNotificationWorker.kt @@ -307,7 +307,7 @@ class MessageNotificationWorker( target, null, CircleCropTransformation() ) - Coil.loader().load(request) + componentsWithEmptyCookieJar.getImageLoader().load(request) } else { notificationBuilder.setStyle(getStyle(decryptedPushMessage, adjustedConversationType, person.build(), style)) NotificationManagerCompat.from(applicationContext).notify(notificationId, notificationBuilder.build()) diff --git a/app/src/main/java/com/nextcloud/talk/newarch/services/CallService.kt b/app/src/main/java/com/nextcloud/talk/newarch/services/CallService.kt index dc07afcb1..44db2f3ff 100644 --- a/app/src/main/java/com/nextcloud/talk/newarch/services/CallService.kt +++ b/app/src/main/java/com/nextcloud/talk/newarch/services/CallService.kt @@ -10,7 +10,6 @@ import android.media.AudioAttributes import android.media.AudioManager import android.net.Uri import android.os.Bundle -import android.os.Handler import android.os.IBinder import android.util.Base64 import android.util.Log @@ -40,7 +39,6 @@ import com.nextcloud.talk.newarch.domain.repository.offline.ConversationsReposit import com.nextcloud.talk.newarch.domain.repository.offline.UsersRepository import com.nextcloud.talk.newarch.domain.usecases.GetConversationUseCase import com.nextcloud.talk.newarch.domain.usecases.GetParticipantsForCallUseCase -import com.nextcloud.talk.newarch.domain.usecases.base.UseCase import com.nextcloud.talk.newarch.domain.usecases.base.UseCaseResponse import com.nextcloud.talk.newarch.local.models.UserNgEntity import com.nextcloud.talk.newarch.utils.ComponentsWithEmptyCookieJar @@ -62,10 +60,8 @@ import retrofit2.Retrofit import java.security.InvalidKeyException import java.security.NoSuchAlgorithmException import java.security.PrivateKey -import java.util.* import javax.crypto.Cipher import javax.crypto.NoSuchPaddingException -import kotlin.concurrent.timerTask import kotlin.coroutines.CoroutineContext class CallService : Service(), KoinComponent, CoroutineScope {