From 0bc3be1b6e9a42256a9ff1a65baabbb963e5b61f Mon Sep 17 00:00:00 2001 From: Andy Scherzinger Date: Mon, 17 May 2021 13:35:34 +0200 Subject: [PATCH] codacy: Avoid unused imports Signed-off-by: Andy Scherzinger --- .../talk/adapters/ParticipantsAdapter.java | 1 - .../talk/adapters/items/AdvancedUserItem.java | 21 ++++++---- .../talk/adapters/items/CallItem.java | 18 ++++---- .../MagicPreviewMessageViewHolder.java | 6 +-- .../MagicUnreadNoticeMessageViewHolder.java | 1 - .../MentionAutocompleteCallback.java | 2 - .../AccountVerificationController.java | 32 +++++++------- .../ConversationsListController.java | 3 -- .../controllers/WebViewLoginController.java | 42 +++++++++++-------- .../talk/dagger/modules/RestModule.java | 38 +++++++++++------ .../talk/jobs/SignalingSettingsWorker.java | 20 ++++++--- .../utils/preferences/AppPreferences.java | 9 +++- .../webrtc/MagicPeerConnectionWrapper.java | 22 +++++++--- .../webrtc/WebSocketConnectionHelper.java | 21 ++++++++-- .../talk/utils/DoNotDisturbUtilsTest.java | 3 +- .../nextcloud/talk/utils/ShareUtilsTest.java | 2 +- .../talk/utils/TextMatchersTest.java | 2 +- 17 files changed, 150 insertions(+), 93 deletions(-) diff --git a/app/src/main/java/com/nextcloud/talk/adapters/ParticipantsAdapter.java b/app/src/main/java/com/nextcloud/talk/adapters/ParticipantsAdapter.java index 2a29274cb..83a8ec453 100644 --- a/app/src/main/java/com/nextcloud/talk/adapters/ParticipantsAdapter.java +++ b/app/src/main/java/com/nextcloud/talk/adapters/ParticipantsAdapter.java @@ -1,7 +1,6 @@ package com.nextcloud.talk.adapters; import android.content.Context; -import android.graphics.Color; import android.util.Log; import android.view.LayoutInflater; import android.view.View; diff --git a/app/src/main/java/com/nextcloud/talk/adapters/items/AdvancedUserItem.java b/app/src/main/java/com/nextcloud/talk/adapters/items/AdvancedUserItem.java index 75c55baab..ad4c75c6b 100644 --- a/app/src/main/java/com/nextcloud/talk/adapters/items/AdvancedUserItem.java +++ b/app/src/main/java/com/nextcloud/talk/adapters/items/AdvancedUserItem.java @@ -23,12 +23,12 @@ package com.nextcloud.talk.adapters.items; import android.accounts.Account; import android.net.Uri; import android.view.View; -import android.widget.*; -import androidx.annotation.Nullable; -import androidx.emoji.widget.EmojiTextView; +import android.widget.ImageButton; +import android.widget.ImageView; +import android.widget.LinearLayout; +import android.widget.RelativeLayout; +import android.widget.TextView; -import butterknife.BindView; -import butterknife.ButterKnife; import com.facebook.drawee.backends.pipeline.Fresco; import com.facebook.drawee.interfaces.DraweeController; import com.facebook.drawee.view.SimpleDraweeView; @@ -38,15 +38,20 @@ import com.nextcloud.talk.models.database.UserEntity; import com.nextcloud.talk.models.json.participants.Participant; import com.nextcloud.talk.utils.ApiUtils; import com.nextcloud.talk.utils.DisplayUtils; + +import java.util.List; +import java.util.regex.Pattern; + +import androidx.annotation.Nullable; +import androidx.emoji.widget.EmojiTextView; +import butterknife.BindView; +import butterknife.ButterKnife; import eu.davidea.flexibleadapter.FlexibleAdapter; import eu.davidea.flexibleadapter.items.AbstractFlexibleItem; import eu.davidea.flexibleadapter.items.IFilterable; import eu.davidea.flexibleadapter.utils.FlexibleUtils; import eu.davidea.viewholders.FlexibleViewHolder; -import java.util.List; -import java.util.regex.Pattern; - public class AdvancedUserItem extends AbstractFlexibleItem implements IFilterable { diff --git a/app/src/main/java/com/nextcloud/talk/adapters/items/CallItem.java b/app/src/main/java/com/nextcloud/talk/adapters/items/CallItem.java index 2ecbbc6ed..4958ee569 100644 --- a/app/src/main/java/com/nextcloud/talk/adapters/items/CallItem.java +++ b/app/src/main/java/com/nextcloud/talk/adapters/items/CallItem.java @@ -26,12 +26,7 @@ import android.text.format.DateUtils; import android.view.View; import android.widget.ImageButton; import android.widget.ImageView; -import android.widget.TextView; -import androidx.emoji.widget.EmojiTextView; - -import butterknife.BindView; -import butterknife.ButterKnife; import com.facebook.drawee.backends.pipeline.Fresco; import com.facebook.drawee.interfaces.DraweeController; import com.facebook.drawee.view.SimpleDraweeView; @@ -42,15 +37,20 @@ import com.nextcloud.talk.models.database.UserEntity; import com.nextcloud.talk.models.json.conversations.Conversation; import com.nextcloud.talk.utils.ApiUtils; import com.nextcloud.talk.utils.DisplayUtils; + +import org.greenrobot.eventbus.EventBus; + +import java.util.List; +import java.util.regex.Pattern; + +import androidx.emoji.widget.EmojiTextView; +import butterknife.BindView; +import butterknife.ButterKnife; import eu.davidea.flexibleadapter.FlexibleAdapter; import eu.davidea.flexibleadapter.items.AbstractFlexibleItem; import eu.davidea.flexibleadapter.items.IFilterable; import eu.davidea.flexibleadapter.utils.FlexibleUtils; import eu.davidea.viewholders.FlexibleViewHolder; -import org.greenrobot.eventbus.EventBus; - -import java.util.List; -import java.util.regex.Pattern; public class CallItem extends AbstractFlexibleItem implements IFilterable { diff --git a/app/src/main/java/com/nextcloud/talk/adapters/messages/MagicPreviewMessageViewHolder.java b/app/src/main/java/com/nextcloud/talk/adapters/messages/MagicPreviewMessageViewHolder.java index 1787cb5e9..216310853 100644 --- a/app/src/main/java/com/nextcloud/talk/adapters/messages/MagicPreviewMessageViewHolder.java +++ b/app/src/main/java/com/nextcloud/talk/adapters/messages/MagicPreviewMessageViewHolder.java @@ -35,7 +35,6 @@ import android.util.Log; import android.view.Gravity; import android.view.View; import android.widget.PopupMenu; -import android.widget.Toast; import com.google.common.util.concurrent.ListenableFuture; import com.nextcloud.talk.R; @@ -55,6 +54,8 @@ import com.nextcloud.talk.utils.DrawableUtils; import com.nextcloud.talk.utils.bundle.BundleKeys; import com.stfalcon.chatkit.messages.MessageHolders; +import org.jetbrains.annotations.NotNull; + import java.io.File; import java.util.List; import java.util.concurrent.Callable; @@ -69,9 +70,6 @@ import androidx.work.Data; import androidx.work.OneTimeWorkRequest; import androidx.work.WorkInfo; import androidx.work.WorkManager; - -import org.jetbrains.annotations.NotNull; - import autodagger.AutoInjector; import butterknife.BindView; import butterknife.ButterKnife; diff --git a/app/src/main/java/com/nextcloud/talk/adapters/messages/MagicUnreadNoticeMessageViewHolder.java b/app/src/main/java/com/nextcloud/talk/adapters/messages/MagicUnreadNoticeMessageViewHolder.java index 5e309e978..aac615f2c 100644 --- a/app/src/main/java/com/nextcloud/talk/adapters/messages/MagicUnreadNoticeMessageViewHolder.java +++ b/app/src/main/java/com/nextcloud/talk/adapters/messages/MagicUnreadNoticeMessageViewHolder.java @@ -23,7 +23,6 @@ package com.nextcloud.talk.adapters.messages; import android.view.View; import com.nextcloud.talk.models.json.chat.ChatMessage; -import com.stfalcon.chatkit.commons.ViewHolder; import com.stfalcon.chatkit.messages.MessageHolders; public class MagicUnreadNoticeMessageViewHolder extends MessageHolders.SystemMessageViewHolder { diff --git a/app/src/main/java/com/nextcloud/talk/callbacks/MentionAutocompleteCallback.java b/app/src/main/java/com/nextcloud/talk/callbacks/MentionAutocompleteCallback.java index 8e1d21501..bb7b5381a 100644 --- a/app/src/main/java/com/nextcloud/talk/callbacks/MentionAutocompleteCallback.java +++ b/app/src/main/java/com/nextcloud/talk/callbacks/MentionAutocompleteCallback.java @@ -25,8 +25,6 @@ import android.text.Editable; import android.text.Spanned; import android.widget.EditText; -import androidx.emoji.text.EmojiCompat; - import com.facebook.widget.text.span.BetterImageSpan; import com.nextcloud.talk.R; import com.nextcloud.talk.models.database.UserEntity; diff --git a/app/src/main/java/com/nextcloud/talk/controllers/AccountVerificationController.java b/app/src/main/java/com/nextcloud/talk/controllers/AccountVerificationController.java index 30f1f532b..4553034de 100644 --- a/app/src/main/java/com/nextcloud/talk/controllers/AccountVerificationController.java +++ b/app/src/main/java/com/nextcloud/talk/controllers/AccountVerificationController.java @@ -29,12 +29,7 @@ import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.widget.TextView; -import androidx.annotation.NonNull; -import androidx.work.Data; -import androidx.work.OneTimeWorkRequest; -import androidx.work.WorkManager; -import autodagger.AutoInjector; -import butterknife.BindView; + import com.bluelinelabs.conductor.RouterTransaction; import com.bluelinelabs.conductor.changehandler.HorizontalChangeHandler; import com.nextcloud.talk.R; @@ -48,7 +43,6 @@ import com.nextcloud.talk.jobs.SignalingSettingsWorker; import com.nextcloud.talk.models.database.UserEntity; import com.nextcloud.talk.models.json.capabilities.CapabilitiesOverall; import com.nextcloud.talk.models.json.generic.Status; -import com.nextcloud.talk.models.json.conversations.RoomsOverall; import com.nextcloud.talk.models.json.userprofile.UserProfileOverall; import com.nextcloud.talk.utils.ApiUtils; import com.nextcloud.talk.utils.ClosedInterfaceImpl; @@ -57,19 +51,27 @@ import com.nextcloud.talk.utils.database.user.UserUtils; import com.nextcloud.talk.utils.preferences.AppPreferences; import com.nextcloud.talk.utils.singletons.ApplicationWideMessageHolder; +import org.greenrobot.eventbus.EventBus; +import org.greenrobot.eventbus.Subscribe; +import org.greenrobot.eventbus.ThreadMode; + +import java.net.CookieManager; +import java.util.ArrayList; +import java.util.List; + +import javax.inject.Inject; + +import androidx.annotation.NonNull; +import androidx.work.Data; +import androidx.work.OneTimeWorkRequest; +import androidx.work.WorkManager; +import autodagger.AutoInjector; +import butterknife.BindView; import io.reactivex.CompletableObserver; import io.reactivex.Observer; import io.reactivex.android.schedulers.AndroidSchedulers; import io.reactivex.disposables.Disposable; import io.reactivex.schedulers.Schedulers; -import org.greenrobot.eventbus.EventBus; -import org.greenrobot.eventbus.Subscribe; -import org.greenrobot.eventbus.ThreadMode; - -import javax.inject.Inject; -import java.net.CookieManager; -import java.util.ArrayList; -import java.util.List; @AutoInjector(NextcloudTalkApplication.class) diff --git a/app/src/main/java/com/nextcloud/talk/controllers/ConversationsListController.java b/app/src/main/java/com/nextcloud/talk/controllers/ConversationsListController.java index 26839b2aa..7c076c198 100644 --- a/app/src/main/java/com/nextcloud/talk/controllers/ConversationsListController.java +++ b/app/src/main/java/com/nextcloud/talk/controllers/ConversationsListController.java @@ -26,7 +26,6 @@ import android.animation.AnimatorInflater; import android.annotation.SuppressLint; import android.app.SearchManager; import android.content.Context; -import android.content.Intent; import android.graphics.Bitmap; import android.os.Build; import android.os.Bundle; @@ -47,7 +46,6 @@ import android.widget.RelativeLayout; import com.bluelinelabs.conductor.RouterTransaction; import com.bluelinelabs.conductor.changehandler.HorizontalChangeHandler; import com.bluelinelabs.conductor.changehandler.VerticalChangeHandler; -import com.bluelinelabs.conductor.internal.NoOpControllerChangeHandler; import com.facebook.common.executors.UiThreadImmediateExecutorService; import com.facebook.common.references.CloseableReference; import com.facebook.datasource.DataSource; @@ -60,7 +58,6 @@ import com.google.android.material.button.MaterialButton; import com.google.android.material.floatingactionbutton.FloatingActionButton; import com.kennyc.bottomsheet.BottomSheet; import com.nextcloud.talk.R; -import com.nextcloud.talk.activities.MagicCallActivity; import com.nextcloud.talk.activities.MainActivity; import com.nextcloud.talk.adapters.items.CallItem; import com.nextcloud.talk.adapters.items.ConversationItem; diff --git a/app/src/main/java/com/nextcloud/talk/controllers/WebViewLoginController.java b/app/src/main/java/com/nextcloud/talk/controllers/WebViewLoginController.java index a3e4f560b..c6fc63550 100644 --- a/app/src/main/java/com/nextcloud/talk/controllers/WebViewLoginController.java +++ b/app/src/main/java/com/nextcloud/talk/controllers/WebViewLoginController.java @@ -33,17 +33,16 @@ import android.text.TextUtils; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; -import android.webkit.*; +import android.webkit.ClientCertRequest; +import android.webkit.CookieSyncManager; +import android.webkit.SslErrorHandler; +import android.webkit.WebResourceRequest; +import android.webkit.WebResourceResponse; +import android.webkit.WebSettings; +import android.webkit.WebView; +import android.webkit.WebViewClient; import android.widget.ProgressBar; -import androidx.annotation.NonNull; -import androidx.appcompat.app.AppCompatActivity; -import androidx.core.content.res.ResourcesCompat; -import androidx.work.OneTimeWorkRequest; -import androidx.work.WorkManager; -import autodagger.AutoInjector; -import butterknife.BindView; - import com.bluelinelabs.conductor.RouterTransaction; import com.bluelinelabs.conductor.changehandler.HorizontalChangeHandler; import com.nextcloud.talk.R; @@ -60,17 +59,8 @@ import com.nextcloud.talk.utils.preferences.AppPreferences; import com.nextcloud.talk.utils.singletons.ApplicationWideMessageHolder; import com.nextcloud.talk.utils.ssl.MagicTrustManager; -import de.cotech.hw.fido.WebViewFidoBridge; -import io.reactivex.android.schedulers.AndroidSchedulers; -import io.reactivex.disposables.Disposable; -import io.reactivex.schedulers.Schedulers; -import io.requery.Persistable; -import io.requery.reactivex.ReactiveEntityStore; - import org.greenrobot.eventbus.EventBus; -import javax.inject.Inject; - import java.lang.reflect.Field; import java.net.CookieManager; import java.net.URLDecoder; @@ -81,6 +71,22 @@ import java.util.HashMap; import java.util.Locale; import java.util.Map; +import javax.inject.Inject; + +import androidx.annotation.NonNull; +import androidx.appcompat.app.AppCompatActivity; +import androidx.core.content.res.ResourcesCompat; +import androidx.work.OneTimeWorkRequest; +import androidx.work.WorkManager; +import autodagger.AutoInjector; +import butterknife.BindView; +import de.cotech.hw.fido.WebViewFidoBridge; +import io.reactivex.android.schedulers.AndroidSchedulers; +import io.reactivex.disposables.Disposable; +import io.reactivex.schedulers.Schedulers; +import io.requery.Persistable; +import io.requery.reactivex.ReactiveEntityStore; + @AutoInjector(NextcloudTalkApplication.class) public class WebViewLoginController extends BaseController { diff --git a/app/src/main/java/com/nextcloud/talk/dagger/modules/RestModule.java b/app/src/main/java/com/nextcloud/talk/dagger/modules/RestModule.java index de2a058db..05c4c30e6 100644 --- a/app/src/main/java/com/nextcloud/talk/dagger/modules/RestModule.java +++ b/app/src/main/java/com/nextcloud/talk/dagger/modules/RestModule.java @@ -23,8 +23,7 @@ package com.nextcloud.talk.dagger.modules; import android.content.Context; import android.text.TextUtils; import android.util.Log; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; + import com.github.aurae.retrofit2.LoganSquareConverterFactory; import com.nextcloud.talk.BuildConfig; import com.nextcloud.talk.R; @@ -38,18 +37,7 @@ import com.nextcloud.talk.utils.singletons.AvatarStatusCodeHolder; import com.nextcloud.talk.utils.ssl.MagicKeyManager; import com.nextcloud.talk.utils.ssl.MagicTrustManager; import com.nextcloud.talk.utils.ssl.SSLSocketFactoryCompat; -import dagger.Module; -import dagger.Provides; -import io.reactivex.schedulers.Schedulers; -import okhttp3.*; -import okhttp3.internal.tls.OkHostnameVerifier; -import okhttp3.logging.HttpLoggingInterceptor; -import retrofit2.Retrofit; -import retrofit2.adapter.rxjava2.RxJava2CallAdapterFactory; -import javax.inject.Singleton; -import javax.net.ssl.KeyManagerFactory; -import javax.net.ssl.X509KeyManager; import java.io.IOException; import java.net.CookieManager; import java.net.InetSocketAddress; @@ -61,6 +49,30 @@ import java.security.UnrecoverableKeyException; import java.security.cert.CertificateException; import java.util.concurrent.TimeUnit; +import javax.inject.Singleton; +import javax.net.ssl.KeyManagerFactory; +import javax.net.ssl.X509KeyManager; + +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import dagger.Module; +import dagger.Provides; +import io.reactivex.schedulers.Schedulers; +import okhttp3.Authenticator; +import okhttp3.Cache; +import okhttp3.Credentials; +import okhttp3.Dispatcher; +import okhttp3.Interceptor; +import okhttp3.JavaNetCookieJar; +import okhttp3.OkHttpClient; +import okhttp3.Request; +import okhttp3.Response; +import okhttp3.Route; +import okhttp3.internal.tls.OkHostnameVerifier; +import okhttp3.logging.HttpLoggingInterceptor; +import retrofit2.Retrofit; +import retrofit2.adapter.rxjava2.RxJava2CallAdapterFactory; + @Module(includes = DatabaseModule.class) public class RestModule { diff --git a/app/src/main/java/com/nextcloud/talk/jobs/SignalingSettingsWorker.java b/app/src/main/java/com/nextcloud/talk/jobs/SignalingSettingsWorker.java index 7d640dbc1..fad4021bf 100644 --- a/app/src/main/java/com/nextcloud/talk/jobs/SignalingSettingsWorker.java +++ b/app/src/main/java/com/nextcloud/talk/jobs/SignalingSettingsWorker.java @@ -22,9 +22,7 @@ package com.nextcloud.talk.jobs; import android.content.Context; import android.util.Log; -import androidx.annotation.NonNull; -import androidx.work.*; -import autodagger.AutoInjector; + import com.bluelinelabs.logansquare.LoganSquare; import com.nextcloud.talk.api.NcApi; import com.nextcloud.talk.application.NextcloudTalkApplication; @@ -35,15 +33,25 @@ import com.nextcloud.talk.models.json.signaling.settings.SignalingSettingsOveral import com.nextcloud.talk.utils.ApiUtils; import com.nextcloud.talk.utils.bundle.BundleKeys; import com.nextcloud.talk.utils.database.user.UserUtils; -import io.reactivex.Observer; -import io.reactivex.disposables.Disposable; + import org.greenrobot.eventbus.EventBus; -import javax.inject.Inject; import java.io.IOException; import java.util.ArrayList; import java.util.List; +import javax.inject.Inject; + +import androidx.annotation.NonNull; +import androidx.work.Data; +import androidx.work.OneTimeWorkRequest; +import androidx.work.WorkManager; +import androidx.work.Worker; +import androidx.work.WorkerParameters; +import autodagger.AutoInjector; +import io.reactivex.Observer; +import io.reactivex.disposables.Disposable; + @AutoInjector(NextcloudTalkApplication.class) public class SignalingSettingsWorker extends Worker { private static final String TAG = "SignalingSettingsJob"; diff --git a/app/src/main/java/com/nextcloud/talk/utils/preferences/AppPreferences.java b/app/src/main/java/com/nextcloud/talk/utils/preferences/AppPreferences.java index 8595bb145..bb0e053e5 100644 --- a/app/src/main/java/com/nextcloud/talk/utils/preferences/AppPreferences.java +++ b/app/src/main/java/com/nextcloud/talk/utils/preferences/AppPreferences.java @@ -21,7 +21,14 @@ package com.nextcloud.talk.utils.preferences; import com.nextcloud.talk.R; -import net.orange_box.storebox.annotations.method.*; + +import net.orange_box.storebox.annotations.method.ClearMethod; +import net.orange_box.storebox.annotations.method.DefaultValue; +import net.orange_box.storebox.annotations.method.KeyByResource; +import net.orange_box.storebox.annotations.method.KeyByString; +import net.orange_box.storebox.annotations.method.RegisterChangeListenerMethod; +import net.orange_box.storebox.annotations.method.RemoveMethod; +import net.orange_box.storebox.annotations.method.UnregisterChangeListenerMethod; import net.orange_box.storebox.annotations.option.SaveOption; import net.orange_box.storebox.enums.SaveMode; import net.orange_box.storebox.listeners.OnPreferenceValueChangedListener; diff --git a/app/src/main/java/com/nextcloud/talk/webrtc/MagicPeerConnectionWrapper.java b/app/src/main/java/com/nextcloud/talk/webrtc/MagicPeerConnectionWrapper.java index 1d971e7a4..7733262f3 100644 --- a/app/src/main/java/com/nextcloud/talk/webrtc/MagicPeerConnectionWrapper.java +++ b/app/src/main/java/com/nextcloud/talk/webrtc/MagicPeerConnectionWrapper.java @@ -24,8 +24,7 @@ package com.nextcloud.talk.webrtc; import android.content.Context; import android.text.TextUtils; import android.util.Log; -import androidx.annotation.Nullable; -import autodagger.AutoInjector; + import com.bluelinelabs.logansquare.LoganSquare; import com.nextcloud.talk.R; import com.nextcloud.talk.application.NextcloudTalkApplication; @@ -37,16 +36,29 @@ import com.nextcloud.talk.models.json.signaling.DataChannelMessage; import com.nextcloud.talk.models.json.signaling.DataChannelMessageNick; import com.nextcloud.talk.models.json.signaling.NCIceCandidate; import com.nextcloud.talk.utils.LoggingUtils; -import org.greenrobot.eventbus.EventBus; -import org.webrtc.*; -import javax.inject.Inject; +import org.greenrobot.eventbus.EventBus; +import org.webrtc.DataChannel; +import org.webrtc.IceCandidate; +import org.webrtc.MediaConstraints; +import org.webrtc.MediaStream; +import org.webrtc.PeerConnection; +import org.webrtc.PeerConnectionFactory; +import org.webrtc.RtpReceiver; +import org.webrtc.SdpObserver; +import org.webrtc.SessionDescription; + import java.io.IOException; import java.nio.ByteBuffer; import java.util.ArrayList; import java.util.HashMap; import java.util.List; +import javax.inject.Inject; + +import androidx.annotation.Nullable; +import autodagger.AutoInjector; + @AutoInjector(NextcloudTalkApplication.class) public class MagicPeerConnectionWrapper { private static String TAG = "MagicPeerConnectionWrapper"; diff --git a/app/src/main/java/com/nextcloud/talk/webrtc/WebSocketConnectionHelper.java b/app/src/main/java/com/nextcloud/talk/webrtc/WebSocketConnectionHelper.java index 8a11a8ee4..004027087 100644 --- a/app/src/main/java/com/nextcloud/talk/webrtc/WebSocketConnectionHelper.java +++ b/app/src/main/java/com/nextcloud/talk/webrtc/WebSocketConnectionHelper.java @@ -20,18 +20,31 @@ package com.nextcloud.talk.webrtc; -import autodagger.AutoInjector; import com.nextcloud.talk.application.NextcloudTalkApplication; import com.nextcloud.talk.models.database.UserEntity; import com.nextcloud.talk.models.json.signaling.NCMessageWrapper; -import com.nextcloud.talk.models.json.websocket.*; +import com.nextcloud.talk.models.json.websocket.ActorWebSocketMessage; +import com.nextcloud.talk.models.json.websocket.AuthParametersWebSocketMessage; +import com.nextcloud.talk.models.json.websocket.AuthWebSocketMessage; +import com.nextcloud.talk.models.json.websocket.CallOverallWebSocketMessage; +import com.nextcloud.talk.models.json.websocket.CallWebSocketMessage; +import com.nextcloud.talk.models.json.websocket.HelloOverallWebSocketMessage; +import com.nextcloud.talk.models.json.websocket.HelloWebSocketMessage; +import com.nextcloud.talk.models.json.websocket.RequestOfferOverallWebSocketMessage; +import com.nextcloud.talk.models.json.websocket.RequestOfferSignalingMessage; +import com.nextcloud.talk.models.json.websocket.RoomOverallWebSocketMessage; +import com.nextcloud.talk.models.json.websocket.RoomWebSocketMessage; +import com.nextcloud.talk.models.json.websocket.SignalingDataWebSocketMessageForOffer; import com.nextcloud.talk.utils.ApiUtils; -import okhttp3.OkHttpClient; -import javax.inject.Inject; import java.util.HashMap; import java.util.Map; +import javax.inject.Inject; + +import autodagger.AutoInjector; +import okhttp3.OkHttpClient; + @AutoInjector(NextcloudTalkApplication.class) public class WebSocketConnectionHelper { private static Map magicWebSocketInstanceMap = new HashMap<>(); diff --git a/app/src/test/java/com/nextcloud/talk/utils/DoNotDisturbUtilsTest.java b/app/src/test/java/com/nextcloud/talk/utils/DoNotDisturbUtilsTest.java index 96398d70b..b996253f5 100644 --- a/app/src/test/java/com/nextcloud/talk/utils/DoNotDisturbUtilsTest.java +++ b/app/src/test/java/com/nextcloud/talk/utils/DoNotDisturbUtilsTest.java @@ -40,7 +40,8 @@ import org.powermock.modules.junit4.PowerMockRunner; import java.lang.reflect.Field; import java.lang.reflect.Modifier; -import static org.junit.Assert.*; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; import static org.mockito.Mockito.when; import static org.powermock.api.mockito.PowerMockito.mockStatic; diff --git a/app/src/test/java/com/nextcloud/talk/utils/ShareUtilsTest.java b/app/src/test/java/com/nextcloud/talk/utils/ShareUtilsTest.java index ef71397db..6ddd1ab3d 100644 --- a/app/src/test/java/com/nextcloud/talk/utils/ShareUtilsTest.java +++ b/app/src/test/java/com/nextcloud/talk/utils/ShareUtilsTest.java @@ -38,7 +38,7 @@ import org.powermock.api.mockito.PowerMockito; import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.when; import static org.powermock.api.mockito.PowerMockito.mockStatic; diff --git a/app/src/test/java/com/nextcloud/talk/utils/TextMatchersTest.java b/app/src/test/java/com/nextcloud/talk/utils/TextMatchersTest.java index 28c8c6de8..fb295f317 100644 --- a/app/src/test/java/com/nextcloud/talk/utils/TextMatchersTest.java +++ b/app/src/test/java/com/nextcloud/talk/utils/TextMatchersTest.java @@ -24,7 +24,7 @@ import com.nextcloud.talk.models.json.chat.ChatMessage; import org.junit.Test; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; public class TextMatchersTest {