From 4b38eb1d19aebcb41414dda62bab4ebb60deda39 Mon Sep 17 00:00:00 2001 From: Mario Danic Date: Tue, 29 Oct 2019 15:22:04 +0100 Subject: [PATCH] More cleanups Signed-off-by: Mario Danic --- .../talk/adapters/items/ConversationItem.kt | 6 ------ .../talk/adapters/items/NotificationSoundItem.kt | 13 ------------- .../messages/MagicPreviewMessageViewHolder.kt | 1 - .../nextcloud/talk/controllers/CallController.java | 1 - .../talk/controllers/SettingsController.kt | 1 - .../repository/offline/MessagesRepositoryImpl.kt | 2 -- .../domain/repository/offline/MessagesRepository.kt | 1 - .../conversationsList/ConversationsListViewModel.kt | 1 - .../local/converters/ExternalSignalingConverter.kt | 2 -- .../local/converters/SystemMessageTypeConverter.kt | 5 ----- .../newarch/local/converters/UserStatusConverter.kt | 1 - .../nextcloud/talk/newarch/local/dao/MessagesDao.kt | 2 -- .../java/com/nextcloud/talk/utils/DisplayUtils.kt | 12 ------------ 13 files changed, 48 deletions(-) diff --git a/app/src/main/java/com/nextcloud/talk/adapters/items/ConversationItem.kt b/app/src/main/java/com/nextcloud/talk/adapters/items/ConversationItem.kt index 5000e9266..5ffa253ea 100644 --- a/app/src/main/java/com/nextcloud/talk/adapters/items/ConversationItem.kt +++ b/app/src/main/java/com/nextcloud/talk/adapters/items/ConversationItem.kt @@ -26,12 +26,6 @@ import android.graphics.drawable.LayerDrawable import android.text.TextUtils import android.text.format.DateUtils import android.view.View -import android.widget.ImageView -import android.widget.ProgressBar -import android.widget.TextView -import androidx.emoji.widget.EmojiTextView -import butterknife.BindView -import butterknife.ButterKnife import coil.api.load import coil.transform.CircleCropTransformation import com.nextcloud.talk.R diff --git a/app/src/main/java/com/nextcloud/talk/adapters/items/NotificationSoundItem.kt b/app/src/main/java/com/nextcloud/talk/adapters/items/NotificationSoundItem.kt index cd90e378c..6da588120 100644 --- a/app/src/main/java/com/nextcloud/talk/adapters/items/NotificationSoundItem.kt +++ b/app/src/main/java/com/nextcloud/talk/adapters/items/NotificationSoundItem.kt @@ -20,29 +20,16 @@ package com.nextcloud.talk.adapters.items -import android.content.res.Resources -import android.graphics.drawable.ColorDrawable -import android.graphics.drawable.Drawable import android.view.View import android.widget.ImageView import android.widget.TextView import butterknife.BindView import butterknife.ButterKnife -import coil.Coil import coil.api.load -import coil.request.LoadRequest -import coil.request.Request -import coil.request.RequestBuilder -import coil.target.Target -import coil.transform.CircleCropTransformation -import com.nextcloud.talk.R -import com.nextcloud.talk.R.color import com.nextcloud.talk.R.drawable import com.nextcloud.talk.R.id import com.nextcloud.talk.R.layout import com.nextcloud.talk.adapters.items.NotificationSoundItem.NotificationSoundItemViewHolder -import com.nextcloud.talk.application.NextcloudTalkApplication.Companion.sharedApplication -import com.nextcloud.talk.newarch.utils.Images import eu.davidea.flexibleadapter.FlexibleAdapter import eu.davidea.flexibleadapter.items.AbstractFlexibleItem import eu.davidea.flexibleadapter.items.IFlexible diff --git a/app/src/main/java/com/nextcloud/talk/adapters/messages/MagicPreviewMessageViewHolder.kt b/app/src/main/java/com/nextcloud/talk/adapters/messages/MagicPreviewMessageViewHolder.kt index fcc2d9ac6..4fbe7adf8 100644 --- a/app/src/main/java/com/nextcloud/talk/adapters/messages/MagicPreviewMessageViewHolder.kt +++ b/app/src/main/java/com/nextcloud/talk/adapters/messages/MagicPreviewMessageViewHolder.kt @@ -55,7 +55,6 @@ import com.nextcloud.talk.utils.DrawableUtils.getDrawableResourceIdForMimeType import com.nextcloud.talk.utils.bundle.BundleKeys.KEY_ACCOUNT import com.nextcloud.talk.utils.bundle.BundleKeys.KEY_FILE_ID import com.stfalcon.chatkit.messages.MessageHolders.IncomingImageMessageViewHolder -import eu.davidea.flexibleadapter.Payload import io.reactivex.Single import io.reactivex.SingleObserver import io.reactivex.disposables.Disposable diff --git a/app/src/main/java/com/nextcloud/talk/controllers/CallController.java b/app/src/main/java/com/nextcloud/talk/controllers/CallController.java index b3218d1ad..3dbaa925f 100644 --- a/app/src/main/java/com/nextcloud/talk/controllers/CallController.java +++ b/app/src/main/java/com/nextcloud/talk/controllers/CallController.java @@ -119,7 +119,6 @@ import javax.inject.Inject; import me.zhanghai.android.effortlesspermissions.AfterPermissionDenied; import me.zhanghai.android.effortlesspermissions.EffortlessPermissions; import me.zhanghai.android.effortlesspermissions.OpenAppDetailsDialogFragment; -import okhttp3.Cache; import org.apache.commons.lang3.StringEscapeUtils; import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.Subscribe; diff --git a/app/src/main/java/com/nextcloud/talk/controllers/SettingsController.kt b/app/src/main/java/com/nextcloud/talk/controllers/SettingsController.kt index 1bb4d9f78..b3c10b7f6 100644 --- a/app/src/main/java/com/nextcloud/talk/controllers/SettingsController.kt +++ b/app/src/main/java/com/nextcloud/talk/controllers/SettingsController.kt @@ -86,7 +86,6 @@ import io.reactivex.schedulers.Schedulers import net.orange_box.storebox.listeners.OnPreferenceValueChangedListener import org.koin.android.ext.android.inject import java.io.IOException -import java.net.Proxy import java.net.URI import java.net.URISyntaxException import java.util.ArrayList diff --git a/app/src/main/java/com/nextcloud/talk/newarch/data/repository/offline/MessagesRepositoryImpl.kt b/app/src/main/java/com/nextcloud/talk/newarch/data/repository/offline/MessagesRepositoryImpl.kt index 2aaf7496b..84b68d145 100644 --- a/app/src/main/java/com/nextcloud/talk/newarch/data/repository/offline/MessagesRepositoryImpl.kt +++ b/app/src/main/java/com/nextcloud/talk/newarch/data/repository/offline/MessagesRepositoryImpl.kt @@ -21,11 +21,9 @@ package com.nextcloud.talk.newarch.data.repository.offline import androidx.lifecycle.LiveData -import androidx.lifecycle.map import com.nextcloud.talk.models.json.chat.ChatMessage import com.nextcloud.talk.newarch.domain.repository.offline.MessagesRepository import com.nextcloud.talk.newarch.local.dao.MessagesDao -import com.nextcloud.talk.newarch.local.models.toConversation class MessagesRepositoryImpl(val messagesDao: MessagesDao): MessagesRepository { override fun getMessagesWithUserForConversation( diff --git a/app/src/main/java/com/nextcloud/talk/newarch/domain/repository/offline/MessagesRepository.kt b/app/src/main/java/com/nextcloud/talk/newarch/domain/repository/offline/MessagesRepository.kt index a03a9b4d4..9600de5ba 100644 --- a/app/src/main/java/com/nextcloud/talk/newarch/domain/repository/offline/MessagesRepository.kt +++ b/app/src/main/java/com/nextcloud/talk/newarch/domain/repository/offline/MessagesRepository.kt @@ -22,7 +22,6 @@ package com.nextcloud.talk.newarch.domain.repository.offline import androidx.lifecycle.LiveData import com.nextcloud.talk.models.json.chat.ChatMessage -import com.nextcloud.talk.models.json.conversations.Conversation interface MessagesRepository { fun getMessagesWithUserForConversation(userId: Int, conversationId: String): LiveData> diff --git a/app/src/main/java/com/nextcloud/talk/newarch/features/conversationsList/ConversationsListViewModel.kt b/app/src/main/java/com/nextcloud/talk/newarch/features/conversationsList/ConversationsListViewModel.kt index c3b8366d1..d00fb869a 100644 --- a/app/src/main/java/com/nextcloud/talk/newarch/features/conversationsList/ConversationsListViewModel.kt +++ b/app/src/main/java/com/nextcloud/talk/newarch/features/conversationsList/ConversationsListViewModel.kt @@ -41,7 +41,6 @@ import com.nextcloud.talk.newarch.domain.usecases.GetConversationsUseCase import com.nextcloud.talk.newarch.domain.usecases.LeaveConversationUseCase import com.nextcloud.talk.newarch.domain.usecases.SetConversationFavoriteValueUseCase import com.nextcloud.talk.newarch.domain.usecases.base.UseCaseResponse -import com.nextcloud.talk.newarch.utils.ViewState import com.nextcloud.talk.newarch.utils.ViewState.LOADING import com.nextcloud.talk.utils.ShareUtils import com.nextcloud.talk.utils.database.user.UserUtils diff --git a/app/src/main/java/com/nextcloud/talk/newarch/local/converters/ExternalSignalingConverter.kt b/app/src/main/java/com/nextcloud/talk/newarch/local/converters/ExternalSignalingConverter.kt index d04f46e0c..5c52e761e 100644 --- a/app/src/main/java/com/nextcloud/talk/newarch/local/converters/ExternalSignalingConverter.kt +++ b/app/src/main/java/com/nextcloud/talk/newarch/local/converters/ExternalSignalingConverter.kt @@ -23,8 +23,6 @@ package com.nextcloud.talk.newarch.local.converters import androidx.room.TypeConverter import com.bluelinelabs.logansquare.LoganSquare import com.nextcloud.talk.models.ExternalSignalingServer -import com.nextcloud.talk.models.json.capabilities.Capabilities -import com.nextcloud.talk.models.json.push.PushConfigurationState class ExternalSignalingConverter { @TypeConverter diff --git a/app/src/main/java/com/nextcloud/talk/newarch/local/converters/SystemMessageTypeConverter.kt b/app/src/main/java/com/nextcloud/talk/newarch/local/converters/SystemMessageTypeConverter.kt index 9330b4abd..3cc8101a1 100644 --- a/app/src/main/java/com/nextcloud/talk/newarch/local/converters/SystemMessageTypeConverter.kt +++ b/app/src/main/java/com/nextcloud/talk/newarch/local/converters/SystemMessageTypeConverter.kt @@ -21,7 +21,6 @@ package com.nextcloud.talk.newarch.local.converters import androidx.room.TypeConverter -import com.nextcloud.talk.models.json.chat.ChatMessage import com.nextcloud.talk.models.json.chat.ChatMessage.SystemMessageType import com.nextcloud.talk.models.json.chat.ChatMessage.SystemMessageType.CALL_ENDED import com.nextcloud.talk.models.json.chat.ChatMessage.SystemMessageType.CALL_JOINED @@ -42,10 +41,6 @@ import com.nextcloud.talk.models.json.chat.ChatMessage.SystemMessageType.PASSWOR import com.nextcloud.talk.models.json.chat.ChatMessage.SystemMessageType.PASSWORD_SET import com.nextcloud.talk.models.json.chat.ChatMessage.SystemMessageType.USER_ADDED import com.nextcloud.talk.models.json.chat.ChatMessage.SystemMessageType.USER_REMOVED -import com.nextcloud.talk.newarch.local.models.other.UserStatus -import com.nextcloud.talk.newarch.local.models.other.UserStatus.ACTIVE -import com.nextcloud.talk.newarch.local.models.other.UserStatus.DORMANT -import com.nextcloud.talk.newarch.local.models.other.UserStatus.PENDING_DELETE class SystemMessageTypeConverter { @TypeConverter diff --git a/app/src/main/java/com/nextcloud/talk/newarch/local/converters/UserStatusConverter.kt b/app/src/main/java/com/nextcloud/talk/newarch/local/converters/UserStatusConverter.kt index 82c70af04..a5da5aab8 100644 --- a/app/src/main/java/com/nextcloud/talk/newarch/local/converters/UserStatusConverter.kt +++ b/app/src/main/java/com/nextcloud/talk/newarch/local/converters/UserStatusConverter.kt @@ -21,7 +21,6 @@ package com.nextcloud.talk.newarch.local.converters import androidx.room.TypeConverter -import com.nextcloud.talk.models.json.conversations.Conversation.LobbyState import com.nextcloud.talk.newarch.local.models.other.UserStatus import com.nextcloud.talk.newarch.local.models.other.UserStatus.ACTIVE import com.nextcloud.talk.newarch.local.models.other.UserStatus.DORMANT diff --git a/app/src/main/java/com/nextcloud/talk/newarch/local/dao/MessagesDao.kt b/app/src/main/java/com/nextcloud/talk/newarch/local/dao/MessagesDao.kt index edb26927d..ba293590e 100644 --- a/app/src/main/java/com/nextcloud/talk/newarch/local/dao/MessagesDao.kt +++ b/app/src/main/java/com/nextcloud/talk/newarch/local/dao/MessagesDao.kt @@ -25,8 +25,6 @@ import androidx.room.Dao import androidx.room.Insert import androidx.room.OnConflictStrategy import androidx.room.Query -import com.nextcloud.talk.models.json.chat.ChatMessage -import com.nextcloud.talk.newarch.local.models.ConversationEntity import com.nextcloud.talk.newarch.local.models.MessageEntity @Dao diff --git a/app/src/main/java/com/nextcloud/talk/utils/DisplayUtils.kt b/app/src/main/java/com/nextcloud/talk/utils/DisplayUtils.kt index 7445343ba..17f3c0c4e 100644 --- a/app/src/main/java/com/nextcloud/talk/utils/DisplayUtils.kt +++ b/app/src/main/java/com/nextcloud/talk/utils/DisplayUtils.kt @@ -24,14 +24,12 @@ import android.annotation.SuppressLint import android.content.Context import android.content.Intent import android.content.res.ColorStateList -import android.content.res.Configuration import android.content.res.Resources import android.graphics.Bitmap import android.graphics.Canvas import android.graphics.Typeface import android.graphics.drawable.BitmapDrawable import android.graphics.drawable.Drawable -import android.graphics.drawable.VectorDrawable import android.net.Uri import android.os.Build import android.text.Spannable @@ -59,21 +57,13 @@ import androidx.core.content.ContextCompat import androidx.core.graphics.drawable.DrawableCompat import androidx.emoji.text.EmojiCompat import coil.Coil -import coil.ImageLoader import coil.api.load import coil.target.Target import coil.transform.CircleCropTransformation -import com.facebook.common.executors.UiThreadImmediateExecutorService -import com.facebook.common.references.CloseableReference -import com.facebook.datasource.DataSource -import com.facebook.drawee.backends.pipeline.Fresco import com.facebook.drawee.view.SimpleDraweeView import com.facebook.imagepipeline.common.RotationOptions -import com.facebook.imagepipeline.datasource.BaseBitmapDataSubscriber -import com.facebook.imagepipeline.image.CloseableImage import com.facebook.imagepipeline.image.ImageInfo import com.facebook.imagepipeline.postprocessors.RoundAsCirclePostprocessor -import com.facebook.imagepipeline.postprocessors.RoundPostprocessor import com.facebook.imagepipeline.request.ImageRequest import com.facebook.imagepipeline.request.ImageRequestBuilder import com.facebook.widget.text.span.BetterImageSpan @@ -83,12 +73,10 @@ import com.nextcloud.talk.application.NextcloudTalkApplication import com.nextcloud.talk.events.UserMentionClickEvent import com.nextcloud.talk.models.database.UserEntity import com.nextcloud.talk.newarch.utils.Images -import com.nextcloud.talk.utils.preferences.AppPreferences import com.nextcloud.talk.utils.text.Spans import org.greenrobot.eventbus.EventBus import java.lang.reflect.InvocationTargetException import java.util.regex.Pattern -import org.koin.android.ext.android.inject object DisplayUtils {