diff --git a/app/src/main/java/com/nextcloud/talk/activities/BaseActivity.kt b/app/src/main/java/com/nextcloud/talk/activities/BaseActivity.kt index 79b2d9b90..01347075b 100644 --- a/app/src/main/java/com/nextcloud/talk/activities/BaseActivity.kt +++ b/app/src/main/java/com/nextcloud/talk/activities/BaseActivity.kt @@ -23,7 +23,6 @@ package com.nextcloud.talk.activities import android.annotation.SuppressLint import android.content.Context import android.os.Build -import android.os.Bundle import android.util.Log import android.view.WindowManager import android.webkit.SslErrorHandler diff --git a/app/src/main/java/com/nextcloud/talk/adapters/messages/MagicOutcomingTextMessageViewHolder.kt b/app/src/main/java/com/nextcloud/talk/adapters/messages/MagicOutcomingTextMessageViewHolder.kt index a63cba48e..3ff1c114c 100644 --- a/app/src/main/java/com/nextcloud/talk/adapters/messages/MagicOutcomingTextMessageViewHolder.kt +++ b/app/src/main/java/com/nextcloud/talk/adapters/messages/MagicOutcomingTextMessageViewHolder.kt @@ -38,7 +38,6 @@ import com.nextcloud.talk.models.json.chat.ChatMessage import com.nextcloud.talk.utils.DisplayUtils.getMessageSelector import com.nextcloud.talk.utils.DisplayUtils.searchAndReplaceWithMentionSpan import com.nextcloud.talk.utils.TextMatchers -import com.nextcloud.talk.utils.database.user.UserUtils import com.stfalcon.chatkit.messages.MessageHolders.OutcomingTextMessageViewHolder import org.koin.core.KoinComponent import org.koin.core.inject diff --git a/app/src/main/java/com/nextcloud/talk/controllers/CallNotificationController.kt b/app/src/main/java/com/nextcloud/talk/controllers/CallNotificationController.kt index cc662a5f0..551dc50d9 100644 --- a/app/src/main/java/com/nextcloud/talk/controllers/CallNotificationController.kt +++ b/app/src/main/java/com/nextcloud/talk/controllers/CallNotificationController.kt @@ -55,14 +55,12 @@ import com.nextcloud.talk.controllers.base.BaseController import com.nextcloud.talk.events.ConfigurationChangeEvent import com.nextcloud.talk.models.RingtoneSettings import com.nextcloud.talk.models.database.ArbitraryStorageEntity -import com.nextcloud.talk.models.database.UserEntity import com.nextcloud.talk.models.json.conversations.Conversation import com.nextcloud.talk.models.json.conversations.RoomsOverall import com.nextcloud.talk.models.json.participants.Participant import com.nextcloud.talk.models.json.participants.ParticipantsOverall import com.nextcloud.talk.newarch.local.models.UserNgEntity import com.nextcloud.talk.newarch.local.models.getCredentials -import com.nextcloud.talk.newarch.utils.getCredentials import com.nextcloud.talk.utils.ApiUtils import com.nextcloud.talk.utils.DoNotDisturbUtils import com.nextcloud.talk.utils.bundle.BundleKeys diff --git a/app/src/main/java/com/nextcloud/talk/controllers/ContactsController.kt b/app/src/main/java/com/nextcloud/talk/controllers/ContactsController.kt index 87cfdd6fe..b33134225 100644 --- a/app/src/main/java/com/nextcloud/talk/controllers/ContactsController.kt +++ b/app/src/main/java/com/nextcloud/talk/controllers/ContactsController.kt @@ -90,15 +90,8 @@ import org.parceler.Parcels import java.util.ArrayList import java.util.HashMap import java.util.HashSet -import kotlin.Any -import kotlin.Boolean -import kotlin.CharSequence import kotlin.Comparator -import kotlin.Exception -import kotlin.Int import kotlin.String -import kotlin.Throwable -import kotlin.getValue class ContactsController : BaseController, SearchView.OnQueryTextListener, diff --git a/app/src/main/java/com/nextcloud/talk/controllers/SwitchAccountController.kt b/app/src/main/java/com/nextcloud/talk/controllers/SwitchAccountController.kt index 1b59def44..19ddb224c 100644 --- a/app/src/main/java/com/nextcloud/talk/controllers/SwitchAccountController.kt +++ b/app/src/main/java/com/nextcloud/talk/controllers/SwitchAccountController.kt @@ -44,7 +44,6 @@ import com.nextcloud.talk.newarch.local.models.UserNgEntity import com.nextcloud.talk.newarch.local.models.other.UserStatus import com.nextcloud.talk.utils.AccountUtils import com.nextcloud.talk.utils.bundle.BundleKeys -import com.nextcloud.talk.utils.database.user.UserUtils import eu.davidea.flexibleadapter.FlexibleAdapter import eu.davidea.flexibleadapter.common.SmoothScrollLinearLayoutManager import eu.davidea.flexibleadapter.items.AbstractFlexibleItem diff --git a/app/src/main/java/com/nextcloud/talk/jobs/PushRegistrationWorker.kt b/app/src/main/java/com/nextcloud/talk/jobs/PushRegistrationWorker.kt index 62e1d2ad4..c18580b96 100644 --- a/app/src/main/java/com/nextcloud/talk/jobs/PushRegistrationWorker.kt +++ b/app/src/main/java/com/nextcloud/talk/jobs/PushRegistrationWorker.kt @@ -25,7 +25,6 @@ import android.app.Application import android.content.Context import android.text.TextUtils import android.util.Base64 -import android.util.Log import androidx.work.CoroutineWorker import androidx.work.ListenableWorker.Result import androidx.work.WorkerParameters @@ -42,7 +41,6 @@ import com.nextcloud.talk.utils.PushUtils import com.nextcloud.talk.utils.preferences.AppPreferences import io.reactivex.Observer import io.reactivex.disposables.Disposable -import io.reactivex.schedulers.Schedulers import kotlinx.coroutines.GlobalScope import kotlinx.coroutines.launch import org.greenrobot.eventbus.EventBus diff --git a/app/src/main/java/com/nextcloud/talk/models/json/chat/ChatMessage.java b/app/src/main/java/com/nextcloud/talk/models/json/chat/ChatMessage.java index 1db353524..7e691d61a 100644 --- a/app/src/main/java/com/nextcloud/talk/models/json/chat/ChatMessage.java +++ b/app/src/main/java/com/nextcloud/talk/models/json/chat/ChatMessage.java @@ -44,7 +44,6 @@ import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.Objects; import lombok.Data; diff --git a/app/src/main/java/com/nextcloud/talk/models/json/conversations/Conversation.kt b/app/src/main/java/com/nextcloud/talk/models/json/conversations/Conversation.kt index c89382bb5..74186489d 100644 --- a/app/src/main/java/com/nextcloud/talk/models/json/conversations/Conversation.kt +++ b/app/src/main/java/com/nextcloud/talk/models/json/conversations/Conversation.kt @@ -29,7 +29,6 @@ import com.nextcloud.talk.application.NextcloudTalkApplication import com.nextcloud.talk.models.json.chat.ChatMessage import com.nextcloud.talk.models.json.converters.* import com.nextcloud.talk.models.json.participants.Participant -import com.nextcloud.talk.newarch.local.models.ConversationEntity import com.nextcloud.talk.newarch.local.models.UserNgEntity import lombok.Data import org.parceler.Parcel diff --git a/app/src/main/java/com/nextcloud/talk/newarch/data/repository/offline/ConversationsRepositoryImpl.kt b/app/src/main/java/com/nextcloud/talk/newarch/data/repository/offline/ConversationsRepositoryImpl.kt index 3b0719125..c18851c47 100644 --- a/app/src/main/java/com/nextcloud/talk/newarch/data/repository/offline/ConversationsRepositoryImpl.kt +++ b/app/src/main/java/com/nextcloud/talk/newarch/data/repository/offline/ConversationsRepositoryImpl.kt @@ -20,7 +20,9 @@ package com.nextcloud.talk.newarch.data.repository.offline -import androidx.lifecycle.* +import androidx.lifecycle.LiveData +import androidx.lifecycle.distinctUntilChanged +import androidx.lifecycle.map import com.nextcloud.talk.models.json.conversations.Conversation import com.nextcloud.talk.newarch.domain.repository.offline.ConversationsRepository import com.nextcloud.talk.newarch.local.dao.ConversationsDao diff --git a/app/src/main/java/com/nextcloud/talk/newarch/data/repository/offline/UsersRepositoryImpl.kt b/app/src/main/java/com/nextcloud/talk/newarch/data/repository/offline/UsersRepositoryImpl.kt index b2285eea6..74f22e188 100644 --- a/app/src/main/java/com/nextcloud/talk/newarch/data/repository/offline/UsersRepositoryImpl.kt +++ b/app/src/main/java/com/nextcloud/talk/newarch/data/repository/offline/UsersRepositoryImpl.kt @@ -21,7 +21,6 @@ package com.nextcloud.talk.newarch.data.repository.offline import androidx.lifecycle.LiveData -import androidx.lifecycle.Transformations import androidx.lifecycle.distinctUntilChanged import com.nextcloud.talk.newarch.domain.repository.offline.UsersRepository import com.nextcloud.talk.newarch.local.dao.UsersDao diff --git a/app/src/main/java/com/nextcloud/talk/newarch/data/source/remote/ApiService.kt b/app/src/main/java/com/nextcloud/talk/newarch/data/source/remote/ApiService.kt index 58ddd8d1e..519f56710 100644 --- a/app/src/main/java/com/nextcloud/talk/newarch/data/source/remote/ApiService.kt +++ b/app/src/main/java/com/nextcloud/talk/newarch/data/source/remote/ApiService.kt @@ -23,7 +23,6 @@ package com.nextcloud.talk.newarch.data.source.remote import com.nextcloud.talk.models.json.conversations.RoomOverall import com.nextcloud.talk.models.json.conversations.RoomsOverall import com.nextcloud.talk.models.json.generic.GenericOverall -import io.reactivex.Observable import retrofit2.http.* interface ApiService { diff --git a/app/src/main/java/com/nextcloud/talk/newarch/features/chat/ChatViewModel.kt b/app/src/main/java/com/nextcloud/talk/newarch/features/chat/ChatViewModel.kt index 682f209cf..54ced469c 100644 --- a/app/src/main/java/com/nextcloud/talk/newarch/features/chat/ChatViewModel.kt +++ b/app/src/main/java/com/nextcloud/talk/newarch/features/chat/ChatViewModel.kt @@ -4,7 +4,6 @@ import android.app.Application import androidx.lifecycle.MutableLiveData import androidx.lifecycle.Transformations import androidx.lifecycle.viewModelScope -import com.nextcloud.talk.models.json.chat.ChatMessage import com.nextcloud.talk.models.json.conversations.Conversation import com.nextcloud.talk.models.json.conversations.RoomOverall import com.nextcloud.talk.models.json.generic.GenericOverall @@ -15,8 +14,6 @@ import com.nextcloud.talk.newarch.domain.repository.offline.MessagesRepository import com.nextcloud.talk.newarch.domain.usecases.ExitConversationUseCase import com.nextcloud.talk.newarch.domain.usecases.JoinConversationUseCase import com.nextcloud.talk.newarch.domain.usecases.base.UseCaseResponse -import com.nextcloud.talk.newarch.features.conversationsList.ConversationsListViewState -import com.nextcloud.talk.newarch.local.models.MessageEntity import com.nextcloud.talk.newarch.local.models.UserNgEntity import kotlinx.coroutines.launch import org.koin.core.parameter.parametersOf diff --git a/app/src/main/java/com/nextcloud/talk/newarch/features/conversationsList/ConversationsListView.kt b/app/src/main/java/com/nextcloud/talk/newarch/features/conversationsList/ConversationsListView.kt index 95fe9740d..031abcd1b 100644 --- a/app/src/main/java/com/nextcloud/talk/newarch/features/conversationsList/ConversationsListView.kt +++ b/app/src/main/java/com/nextcloud/talk/newarch/features/conversationsList/ConversationsListView.kt @@ -26,7 +26,6 @@ import android.graphics.drawable.Drawable import android.os.Build import android.os.Bundle import android.text.InputType -import android.util.Log import android.view.* import android.view.inputmethod.EditorInfo import androidx.appcompat.widget.SearchView @@ -34,7 +33,6 @@ import androidx.appcompat.widget.SearchView.OnQueryTextListener import androidx.core.view.MenuItemCompat import androidx.lifecycle.MutableLiveData import androidx.lifecycle.Observer -import androidx.lifecycle.distinctUntilChanged import androidx.recyclerview.widget.RecyclerView.ViewHolder import butterknife.OnClick import coil.ImageLoader diff --git a/app/src/main/java/com/nextcloud/talk/utils/PushUtils.kt b/app/src/main/java/com/nextcloud/talk/utils/PushUtils.kt index 350774ea9..0b41a32e7 100644 --- a/app/src/main/java/com/nextcloud/talk/utils/PushUtils.kt +++ b/app/src/main/java/com/nextcloud/talk/utils/PushUtils.kt @@ -21,25 +21,15 @@ package com.nextcloud.talk.utils import android.content.Context -import android.text.TextUtils import android.util.Base64 import android.util.Log -import com.bluelinelabs.logansquare.LoganSquare -import com.nextcloud.talk.R.string import com.nextcloud.talk.api.NcApi import com.nextcloud.talk.application.NextcloudTalkApplication.Companion.sharedApplication -import com.nextcloud.talk.events.EventStatus -import com.nextcloud.talk.events.EventStatus.EventType.PUSH_REGISTRATION import com.nextcloud.talk.models.SignatureVerification -import com.nextcloud.talk.models.database.UserEntity import com.nextcloud.talk.models.json.push.PushConfigurationState -import com.nextcloud.talk.models.json.push.PushRegistrationOverall import com.nextcloud.talk.newarch.domain.repository.offline.UsersRepository import com.nextcloud.talk.newarch.local.models.UserNgEntity import com.nextcloud.talk.utils.preferences.AppPreferences -import io.reactivex.Observer -import io.reactivex.disposables.Disposable -import io.reactivex.schedulers.Schedulers import org.greenrobot.eventbus.EventBus import org.koin.core.KoinComponent import org.koin.core.inject @@ -48,8 +38,6 @@ import java.security.* import java.security.spec.InvalidKeySpecException import java.security.spec.PKCS8EncodedKeySpec import java.security.spec.X509EncodedKeySpec -import java.util.* -import kotlin.experimental.and class PushUtils(val usersRepository: UsersRepository) : KoinComponent { val appPreferences: AppPreferences by inject()