diff --git a/app/src/gplay/java/com/nextcloud/talk/services/firebase/MagicFirebaseMessagingService.kt b/app/src/gplay/java/com/nextcloud/talk/services/firebase/MagicFirebaseMessagingService.kt index e77ab4ffb..319565de7 100644 --- a/app/src/gplay/java/com/nextcloud/talk/services/firebase/MagicFirebaseMessagingService.kt +++ b/app/src/gplay/java/com/nextcloud/talk/services/firebase/MagicFirebaseMessagingService.kt @@ -292,7 +292,6 @@ class MagicFirebaseMessagingService : FirebaseMessagingService() { } } - @SuppressLint("LongLogTag") private fun checkIfCallIsActive( signatureVerification: SignatureVerification, decryptedPushMessage: DecryptedPushMessage @@ -351,10 +350,4 @@ class MagicFirebaseMessagingService : FirebaseMessagingService() { } }) } - - companion object { - - private val TAG = "MagicFirebaseMessagingService" - private const val ID_DELETE_CONVERSATION_DIALOG = 0 - } } diff --git a/app/src/main/java/com/nextcloud/talk/activities/MainActivity.kt b/app/src/main/java/com/nextcloud/talk/activities/MainActivity.kt index b0669d7b7..486253ec9 100644 --- a/app/src/main/java/com/nextcloud/talk/activities/MainActivity.kt +++ b/app/src/main/java/com/nextcloud/talk/activities/MainActivity.kt @@ -28,7 +28,6 @@ import android.os.Bundle import android.os.Handler import android.provider.ContactsContract import android.text.TextUtils -import android.util.Log import android.view.ViewGroup import androidx.annotation.RequiresApi import autodagger.AutoInjector diff --git a/app/src/main/java/com/nextcloud/talk/controllers/CallNotificationController.java b/app/src/main/java/com/nextcloud/talk/controllers/CallNotificationController.java index f537c8531..b225c12d8 100644 --- a/app/src/main/java/com/nextcloud/talk/controllers/CallNotificationController.java +++ b/app/src/main/java/com/nextcloud/talk/controllers/CallNotificationController.java @@ -208,7 +208,6 @@ public class CallNotificationController extends BaseController { .pushChangeHandler(new HorizontalChangeHandler())); } - @SuppressLint("LongLogTag") private void checkIfAnyParticipantsRemainInRoom() { int apiVersion = ApiUtils.getConversationApiVersion(userBeingCalled, new int[] {1}); @@ -260,7 +259,6 @@ public class CallNotificationController extends BaseController { } - @SuppressLint("LongLogTag") private void handleFromNotification() { int apiVersion = ApiUtils.getConversationApiVersion(userBeingCalled, new int[] {4, 3, 1}); diff --git a/app/src/main/java/com/nextcloud/talk/controllers/ChatController.kt b/app/src/main/java/com/nextcloud/talk/controllers/ChatController.kt index 23ef78133..5c65fe353 100644 --- a/app/src/main/java/com/nextcloud/talk/controllers/ChatController.kt +++ b/app/src/main/java/com/nextcloud/talk/controllers/ChatController.kt @@ -115,7 +115,6 @@ import com.nextcloud.talk.utils.DateUtils import com.nextcloud.talk.utils.DisplayUtils import com.nextcloud.talk.utils.KeyboardUtils import com.nextcloud.talk.utils.MagicCharPolicy -import com.nextcloud.talk.utils.NoSupportedApiException import com.nextcloud.talk.utils.NotificationUtils import com.nextcloud.talk.utils.UriUtils import com.nextcloud.talk.utils.bundle.BundleKeys @@ -335,10 +334,6 @@ class ChatController(args: Bundle) : } private fun handleFromNotification() { - if (ncApi == null) { - return - } - val apiVersion = ApiUtils.getConversationApiVersion(conversationUser, intArrayOf(1)) ncApi?.getRooms(credentials, ApiUtils.getUrlForRooms(apiVersion, conversationUser?.baseUrl)) diff --git a/app/src/main/java/com/nextcloud/talk/controllers/ConversationInfoController.kt b/app/src/main/java/com/nextcloud/talk/controllers/ConversationInfoController.kt index 8ebe51416..ab8dde0e5 100644 --- a/app/src/main/java/com/nextcloud/talk/controllers/ConversationInfoController.kt +++ b/app/src/main/java/com/nextcloud/talk/controllers/ConversationInfoController.kt @@ -20,13 +20,11 @@ package com.nextcloud.talk.controllers -import android.annotation.SuppressLint import android.content.Context import android.graphics.drawable.Drawable import android.graphics.drawable.LayerDrawable import android.os.Bundle import android.text.TextUtils -import android.util.Log import android.view.LayoutInflater import android.view.MenuItem import android.view.View @@ -300,7 +298,6 @@ class ConversationInfoController(args: Bundle) : BaseController(args), FlexibleA } } - @SuppressLint("LongLogTag") fun submitLobbyChanges() { val state = if ( ( @@ -443,7 +440,6 @@ class ConversationInfoController(args: Bundle) : BaseController(args), FlexibleA } } - @SuppressLint("LongLogTag") private fun getListOfParticipants() { val apiVersion = ApiUtils.getConversationApiVersion(conversationUser, intArrayOf(1)) @@ -535,7 +531,6 @@ class ConversationInfoController(args: Bundle) : BaseController(args), FlexibleA router.setBackstack(backstack, HorizontalChangeHandler()) } - @SuppressLint("LongLogTag") private fun fetchRoomInfo() { val apiVersion = ApiUtils.getConversationApiVersion(conversationUser, intArrayOf(1)) @@ -682,7 +677,6 @@ class ConversationInfoController(args: Bundle) : BaseController(args), FlexibleA } } - @SuppressLint("LongLogTag") override fun onItemClick(view: View?, position: Int): Boolean { val userItem = adapter?.getItem(position) as UserItem val participant = userItem.model @@ -794,7 +788,6 @@ class ConversationInfoController(args: Bundle) : BaseController(args), FlexibleA companion object { - private val TAG = "ConversationInfoController" private const val ID_DELETE_CONVERSATION_DIALOG = 0 } 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 0fff10672..cbd437428 100644 --- a/app/src/main/java/com/nextcloud/talk/controllers/ConversationsListController.java +++ b/app/src/main/java/com/nextcloud/talk/controllers/ConversationsListController.java @@ -23,7 +23,6 @@ package com.nextcloud.talk.controllers; import android.animation.AnimatorInflater; -import android.annotation.SuppressLint; import android.app.SearchManager; import android.content.Context; import android.content.Intent; @@ -33,7 +32,6 @@ import android.os.Bundle; import android.os.Handler; import android.text.InputType; import android.text.TextUtils; -import android.util.Log; import android.view.LayoutInflater; import android.view.Menu; import android.view.MenuInflater; @@ -410,7 +408,6 @@ public class ConversationsListController extends BaseController implements Searc searchItem.expandActionView(); } - @SuppressLint("LongLogTag") private void fetchData(boolean fromBottomSheet) { dispose(null); diff --git a/app/src/main/java/com/nextcloud/talk/controllers/bottomsheet/OperationsMenuController.java b/app/src/main/java/com/nextcloud/talk/controllers/bottomsheet/OperationsMenuController.java index 5c16c3e38..4b1f61976 100644 --- a/app/src/main/java/com/nextcloud/talk/controllers/bottomsheet/OperationsMenuController.java +++ b/app/src/main/java/com/nextcloud/talk/controllers/bottomsheet/OperationsMenuController.java @@ -20,7 +20,6 @@ package com.nextcloud.talk.controllers.bottomsheet; -import android.annotation.SuppressLint; import android.app.Activity; import android.content.Intent; import android.net.Uri; @@ -83,8 +82,6 @@ import retrofit2.HttpException; @AutoInjector(NextcloudTalkApplication.class) public class OperationsMenuController extends BaseController { - private static final String TAG = "OperationsMenuController"; - @BindView(R.id.progress_bar) ProgressBar progressBar; @@ -172,7 +169,6 @@ public class OperationsMenuController extends BaseController { processOperation(); } - @SuppressLint("LongLogTag") private void processOperation() { currentUser = userUtils.getCurrentUser(); OperationsObserver operationsObserver = new OperationsObserver(); @@ -393,9 +389,7 @@ public class OperationsMenuController extends BaseController { } } - @SuppressLint("LongLogTag") private void performGroupCallWorkaround(String credentials) { - int apiVersion = ApiUtils.getConversationApiVersion(currentUser, new int[] {1}); ncApi.makeRoomPrivate(credentials, ApiUtils.getUrlForRoomPublic(apiVersion, currentUser.getBaseUrl(), @@ -546,7 +540,6 @@ public class OperationsMenuController extends BaseController { }); } - @SuppressLint("LongLogTag") private void inviteUsersToAConversation() { RetrofitBucket retrofitBucket; final ArrayList localInvitedUsers = invitedUsers; diff --git a/app/src/main/java/com/nextcloud/talk/jobs/AddParticipantsToConversation.java b/app/src/main/java/com/nextcloud/talk/jobs/AddParticipantsToConversation.java index 09039daa3..cf0b6846e 100644 --- a/app/src/main/java/com/nextcloud/talk/jobs/AddParticipantsToConversation.java +++ b/app/src/main/java/com/nextcloud/talk/jobs/AddParticipantsToConversation.java @@ -20,9 +20,7 @@ package com.nextcloud.talk.jobs; -import android.annotation.SuppressLint; import android.content.Context; -import android.util.Log; import com.nextcloud.talk.api.NcApi; import com.nextcloud.talk.application.NextcloudTalkApplication; @@ -35,8 +33,6 @@ import com.nextcloud.talk.utils.database.user.UserUtils; import org.greenrobot.eventbus.EventBus; -import java.util.ArrayList; - import javax.inject.Inject; import androidx.annotation.NonNull; @@ -48,8 +44,6 @@ import io.reactivex.schedulers.Schedulers; @AutoInjector(NextcloudTalkApplication.class) public class AddParticipantsToConversation extends Worker { - private static final String TAG = "AddParticipantsToConversation"; - @Inject NcApi ncApi; @@ -64,7 +58,6 @@ public class AddParticipantsToConversation extends Worker { NextcloudTalkApplication.Companion.getSharedApplication().getComponentApplication().inject(this); } - @SuppressLint("LongLogTag") @NonNull @Override public Result doWork() { diff --git a/app/src/main/java/com/nextcloud/talk/jobs/DeleteConversationWorker.java b/app/src/main/java/com/nextcloud/talk/jobs/DeleteConversationWorker.java index 2b94215b1..b22e1adfd 100644 --- a/app/src/main/java/com/nextcloud/talk/jobs/DeleteConversationWorker.java +++ b/app/src/main/java/com/nextcloud/talk/jobs/DeleteConversationWorker.java @@ -20,10 +20,7 @@ package com.nextcloud.talk.jobs; -import android.annotation.SuppressLint; import android.content.Context; -import android.util.Log; - import androidx.annotation.NonNull; import androidx.work.Data; import androidx.work.Worker; @@ -50,7 +47,6 @@ import java.net.CookieManager; @AutoInjector(NextcloudTalkApplication.class) public class DeleteConversationWorker extends Worker { - private static final String TAG = "DeleteConversationWorker"; @Inject Retrofit retrofit; @@ -70,7 +66,6 @@ public class DeleteConversationWorker extends Worker { NextcloudTalkApplication.Companion.getSharedApplication().getComponentApplication().inject(this); } - @SuppressLint("LongLogTag") @NonNull @Override public Result doWork() { diff --git a/app/src/main/java/com/nextcloud/talk/jobs/LeaveConversationWorker.java b/app/src/main/java/com/nextcloud/talk/jobs/LeaveConversationWorker.java index b2d52ea33..3704b5d2f 100644 --- a/app/src/main/java/com/nextcloud/talk/jobs/LeaveConversationWorker.java +++ b/app/src/main/java/com/nextcloud/talk/jobs/LeaveConversationWorker.java @@ -21,8 +21,6 @@ package com.nextcloud.talk.jobs; import android.content.Context; -import android.util.Log; - import androidx.annotation.NonNull; import androidx.work.Data; import androidx.work.Worker; @@ -50,8 +48,6 @@ import java.net.CookieManager; @AutoInjector(NextcloudTalkApplication.class) public class LeaveConversationWorker extends Worker { - private static final String TAG = "LeaveConversationWorker"; - @Inject Retrofit retrofit; diff --git a/app/src/main/java/com/nextcloud/talk/presenters/MentionAutocompletePresenter.java b/app/src/main/java/com/nextcloud/talk/presenters/MentionAutocompletePresenter.java index 501fbedba..c998feaf3 100644 --- a/app/src/main/java/com/nextcloud/talk/presenters/MentionAutocompletePresenter.java +++ b/app/src/main/java/com/nextcloud/talk/presenters/MentionAutocompletePresenter.java @@ -20,9 +20,7 @@ package com.nextcloud.talk.presenters; -import android.annotation.SuppressLint; import android.content.Context; -import android.util.Log; import android.view.View; import androidx.annotation.Nullable; import androidx.recyclerview.widget.RecyclerView; @@ -49,7 +47,6 @@ import java.util.List; @AutoInjector(NextcloudTalkApplication.class) public class MentionAutocompletePresenter extends RecyclerViewPresenter implements FlexibleAdapter.OnItemClickListener { - private static final String TAG = "MentionAutocompletePresenter"; @Inject NcApi ncApi; @Inject @@ -84,7 +81,6 @@ public class MentionAutocompletePresenter extends RecyclerViewPresenter return adapter; } - @SuppressLint("LongLogTag") @Override protected void onQuery(@Nullable CharSequence query) { diff --git a/app/src/main/java/com/nextcloud/talk/utils/NoSupportedApiException.kt b/app/src/main/java/com/nextcloud/talk/utils/NoSupportedApiException.kt index 53cdd2076..450963486 100644 --- a/app/src/main/java/com/nextcloud/talk/utils/NoSupportedApiException.kt +++ b/app/src/main/java/com/nextcloud/talk/utils/NoSupportedApiException.kt @@ -1,3 +1,23 @@ +/* + * Nextcloud Talk application + * + * @author Joas Schilling + * Copyright (C) 2021 Joas Schilling + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.nextcloud.talk.utils -class NoSupportedApiException : RuntimeException("No supported API version found") \ No newline at end of file +class NoSupportedApiException : RuntimeException("No supported API version found") diff --git a/app/src/main/java/com/nextcloud/talk/utils/preferences/preferencestorage/DatabaseStorageModule.java b/app/src/main/java/com/nextcloud/talk/utils/preferences/preferencestorage/DatabaseStorageModule.java index a1847836c..b0b5b3cc2 100644 --- a/app/src/main/java/com/nextcloud/talk/utils/preferences/preferencestorage/DatabaseStorageModule.java +++ b/app/src/main/java/com/nextcloud/talk/utils/preferences/preferencestorage/DatabaseStorageModule.java @@ -22,8 +22,6 @@ package com.nextcloud.talk.utils.preferences.preferencestorage; import android.os.Bundle; import android.text.TextUtils; -import android.util.Log; - import autodagger.AutoInjector; import com.nextcloud.talk.api.NcApi; import com.nextcloud.talk.application.NextcloudTalkApplication; @@ -42,8 +40,6 @@ import java.util.Set; @AutoInjector(NextcloudTalkApplication.class) public class DatabaseStorageModule implements StorageModule { - private static final String TAG = "DatabaseStorageModule"; - @Inject ArbitraryStorageUtils arbitraryStorageUtils; 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 e35c6f267..8882e3b77 100644 --- a/app/src/main/java/com/nextcloud/talk/webrtc/WebSocketConnectionHelper.java +++ b/app/src/main/java/com/nextcloud/talk/webrtc/WebSocketConnectionHelper.java @@ -20,9 +20,6 @@ package com.nextcloud.talk.webrtc; -import android.annotation.SuppressLint; -import android.util.Log; - import autodagger.AutoInjector; import com.nextcloud.talk.application.NextcloudTalkApplication; import com.nextcloud.talk.models.database.UserEntity; @@ -37,8 +34,6 @@ import java.util.Map; @AutoInjector(NextcloudTalkApplication.class) public class WebSocketConnectionHelper { - private static final String TAG = "WebSocketConnectionHelper"; - private static Map magicWebSocketInstanceMap = new HashMap<>(); @Inject @@ -92,7 +87,6 @@ public class WebSocketConnectionHelper { } } - @SuppressLint("LongLogTag") HelloOverallWebSocketMessage getAssembledHelloModel(UserEntity userEntity, String ticket) { int apiVersion = ApiUtils.getSignalingApiVersion(userEntity, new int[] {2, 1});