From f7257af2c26ed0fc219adb3a3a6004d5264cc781 Mon Sep 17 00:00:00 2001 From: AndyScherzinger Date: Wed, 21 Feb 2018 21:49:53 +0100 Subject: [PATCH] codacy: Avoid unused private fields --- .../services/firebase/MagicFirebaseInstanceIDService.java | 1 - .../talk/services/firebase/MagicFirebaseMessagingService.java | 1 - .../com/nextcloud/talk/adapters/items/NewCallHeaderItem.java | 1 - .../com/nextcloud/talk/controllers/CallsListController.java | 2 -- .../nextcloud/talk/controllers/SwitchAccountController.java | 1 - .../talk/controllers/bottomsheet/CallMenuController.java | 4 ---- .../talk/controllers/bottomsheet/EntryMenuController.java | 1 - .../controllers/bottomsheet/OperationsMenuController.java | 1 - .../java/com/nextcloud/talk/jobs/creator/MagicJobCreator.java | 1 - .../main/java/com/nextcloud/talk/utils/NotificationUtils.java | 1 - app/src/main/java/com/nextcloud/talk/utils/ShareUtils.java | 1 - .../com/nextcloud/talk/utils/database/user/UserUtils.java | 1 - .../java/com/nextcloud/talk/webrtc/MagicAudioManager.java | 4 +--- .../com/nextcloud/talk/webrtc/MagicPeerConnectionWrapper.java | 4 ---- 14 files changed, 1 insertion(+), 23 deletions(-) diff --git a/app/src/GPlay/java/com/nextcloud/talk/services/firebase/MagicFirebaseInstanceIDService.java b/app/src/GPlay/java/com/nextcloud/talk/services/firebase/MagicFirebaseInstanceIDService.java index 79641126f..89d54edb8 100644 --- a/app/src/GPlay/java/com/nextcloud/talk/services/firebase/MagicFirebaseInstanceIDService.java +++ b/app/src/GPlay/java/com/nextcloud/talk/services/firebase/MagicFirebaseInstanceIDService.java @@ -33,7 +33,6 @@ import autodagger.AutoInjector; @AutoInjector(NextcloudTalkApplication.class) public class MagicFirebaseInstanceIDService extends FirebaseInstanceIdService { - private static final String TAG = "MagicFirebaseInstanceIDService"; @Inject AppPreferences appPreferences; diff --git a/app/src/GPlay/java/com/nextcloud/talk/services/firebase/MagicFirebaseMessagingService.java b/app/src/GPlay/java/com/nextcloud/talk/services/firebase/MagicFirebaseMessagingService.java index bacb05460..b36192339 100644 --- a/app/src/GPlay/java/com/nextcloud/talk/services/firebase/MagicFirebaseMessagingService.java +++ b/app/src/GPlay/java/com/nextcloud/talk/services/firebase/MagicFirebaseMessagingService.java @@ -30,7 +30,6 @@ import com.nextcloud.talk.jobs.NotificationJob; import com.nextcloud.talk.utils.bundle.BundleKeys; public class MagicFirebaseMessagingService extends FirebaseMessagingService { - private static final String TAG = "MagicFirebaseMessagingService"; @SuppressLint("LongLogTag") @Override diff --git a/app/src/main/java/com/nextcloud/talk/adapters/items/NewCallHeaderItem.java b/app/src/main/java/com/nextcloud/talk/adapters/items/NewCallHeaderItem.java index 4cffd6cf7..2bb2300cf 100644 --- a/app/src/main/java/com/nextcloud/talk/adapters/items/NewCallHeaderItem.java +++ b/app/src/main/java/com/nextcloud/talk/adapters/items/NewCallHeaderItem.java @@ -36,7 +36,6 @@ import eu.davidea.viewholders.FlexibleViewHolder; public class NewCallHeaderItem extends AbstractHeaderItem implements IHeader { - private static final String TAG = "NewCallHeaderItem"; HeaderViewHolder headerViewHolder; diff --git a/app/src/main/java/com/nextcloud/talk/controllers/CallsListController.java b/app/src/main/java/com/nextcloud/talk/controllers/CallsListController.java index 9f7a58993..5bc4322dd 100644 --- a/app/src/main/java/com/nextcloud/talk/controllers/CallsListController.java +++ b/app/src/main/java/com/nextcloud/talk/controllers/CallsListController.java @@ -122,7 +122,6 @@ public class CallsListController extends BaseController implements SearchView.On private BottomSheet bottomSheet; private MenuItem searchItem; - private Menu menuVariable; private SearchView searchView; private String searchQuery; @@ -247,7 +246,6 @@ public class CallsListController extends BaseController implements SearchView.On super.onCreateOptionsMenu(menu, inflater); inflater.inflate(R.menu.menu_conversation_plus_filter, menu); - menuVariable = menu; searchItem = menu.findItem(R.id.action_search); initSearchView(); } diff --git a/app/src/main/java/com/nextcloud/talk/controllers/SwitchAccountController.java b/app/src/main/java/com/nextcloud/talk/controllers/SwitchAccountController.java index 073110a2d..7ae89d7fd 100644 --- a/app/src/main/java/com/nextcloud/talk/controllers/SwitchAccountController.java +++ b/app/src/main/java/com/nextcloud/talk/controllers/SwitchAccountController.java @@ -65,7 +65,6 @@ import io.reactivex.disposables.Disposable; @AutoInjector(NextcloudTalkApplication.class) public class SwitchAccountController extends BaseController { - private static final String TAG = "SwitchAccountController"; @Inject UserUtils userUtils; diff --git a/app/src/main/java/com/nextcloud/talk/controllers/bottomsheet/CallMenuController.java b/app/src/main/java/com/nextcloud/talk/controllers/bottomsheet/CallMenuController.java index fa21c6e84..f14985449 100644 --- a/app/src/main/java/com/nextcloud/talk/controllers/bottomsheet/CallMenuController.java +++ b/app/src/main/java/com/nextcloud/talk/controllers/bottomsheet/CallMenuController.java @@ -79,8 +79,6 @@ public class CallMenuController extends BaseController implements FlexibleAdapte private MenuType menuType; private Intent shareIntent; - private UserEntity currentUser; - public CallMenuController(Bundle args) { super(args); this.room = Parcels.unwrap(args.getParcelable(BundleKeys.KEY_ROOM)); @@ -98,8 +96,6 @@ public class CallMenuController extends BaseController implements FlexibleAdapte protected void onViewBound(@NonNull View view) { super.onViewBound(view); NextcloudTalkApplication.getSharedApplication().getComponentApplication().inject(this); - - currentUser = userUtils.getCurrentUser(); prepareViews(); } diff --git a/app/src/main/java/com/nextcloud/talk/controllers/bottomsheet/EntryMenuController.java b/app/src/main/java/com/nextcloud/talk/controllers/bottomsheet/EntryMenuController.java index c35e9cf11..e15a24bee 100644 --- a/app/src/main/java/com/nextcloud/talk/controllers/bottomsheet/EntryMenuController.java +++ b/app/src/main/java/com/nextcloud/talk/controllers/bottomsheet/EntryMenuController.java @@ -59,7 +59,6 @@ import studio.carbonylgroup.textfieldboxes.TextFieldBoxes; @AutoInjector(NextcloudTalkApplication.class) public class EntryMenuController extends BaseController { - private static final String TAG = "EntryMenuController"; @BindView(R.id.ok_button) Button proceedButton; 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 8cf1d6d21..e022db638 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 @@ -68,7 +68,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; diff --git a/app/src/main/java/com/nextcloud/talk/jobs/creator/MagicJobCreator.java b/app/src/main/java/com/nextcloud/talk/jobs/creator/MagicJobCreator.java index d9367c005..32eb814e4 100644 --- a/app/src/main/java/com/nextcloud/talk/jobs/creator/MagicJobCreator.java +++ b/app/src/main/java/com/nextcloud/talk/jobs/creator/MagicJobCreator.java @@ -31,7 +31,6 @@ import com.nextcloud.talk.jobs.NotificationJob; import com.nextcloud.talk.jobs.PushRegistrationJob; public class MagicJobCreator implements JobCreator { - private static final String TAG = "MagicJobCreator"; @Nullable @Override diff --git a/app/src/main/java/com/nextcloud/talk/utils/NotificationUtils.java b/app/src/main/java/com/nextcloud/talk/utils/NotificationUtils.java index be166e66e..77ddbc4c7 100644 --- a/app/src/main/java/com/nextcloud/talk/utils/NotificationUtils.java +++ b/app/src/main/java/com/nextcloud/talk/utils/NotificationUtils.java @@ -32,7 +32,6 @@ import android.os.Build; public class NotificationUtils { public static final String NOTIFICATION_CHANNEL_CALLS = "NOTIFICATION_CHANNEL_CALLS"; public static final String NOTIFICATION_CHANNEL_MESSAGES = "NOTIFICATION_CHANNEL_MESSAGES"; - private static final String TAG = "NotificationUtils"; @TargetApi(Build.VERSION_CODES.O) public static void createNotificationChannel(NotificationManager notificationManager, diff --git a/app/src/main/java/com/nextcloud/talk/utils/ShareUtils.java b/app/src/main/java/com/nextcloud/talk/utils/ShareUtils.java index 7a864ad52..20d613c01 100644 --- a/app/src/main/java/com/nextcloud/talk/utils/ShareUtils.java +++ b/app/src/main/java/com/nextcloud/talk/utils/ShareUtils.java @@ -42,7 +42,6 @@ import java.util.List; import java.util.Set; public class ShareUtils { - private static final String TAG = "ShareUtils"; public static String getStringForIntent(Context context, @Nullable String password, UserUtils userUtils, Room room) { diff --git a/app/src/main/java/com/nextcloud/talk/utils/database/user/UserUtils.java b/app/src/main/java/com/nextcloud/talk/utils/database/user/UserUtils.java index b8fb74561..d57a25d4c 100644 --- a/app/src/main/java/com/nextcloud/talk/utils/database/user/UserUtils.java +++ b/app/src/main/java/com/nextcloud/talk/utils/database/user/UserUtils.java @@ -37,7 +37,6 @@ import io.requery.query.Result; import io.requery.reactivex.ReactiveEntityStore; public class UserUtils { - private static final String TAG = "UserUtils"; private ReactiveEntityStore dataStore; UserUtils(ReactiveEntityStore dataStore) { diff --git a/app/src/main/java/com/nextcloud/talk/webrtc/MagicAudioManager.java b/app/src/main/java/com/nextcloud/talk/webrtc/MagicAudioManager.java index 9c400797e..c9da88bc8 100644 --- a/app/src/main/java/com/nextcloud/talk/webrtc/MagicAudioManager.java +++ b/app/src/main/java/com/nextcloud/talk/webrtc/MagicAudioManager.java @@ -56,7 +56,6 @@ import java.util.Set; public class MagicAudioManager { private static final String TAG = "MagicAudioManager"; private static final String SPEAKERPHONE_AUTO = "auto"; - private static final String SPEAKERPHONE_TRUE = "true"; private static final String SPEAKERPHONE_FALSE = "false"; private final Context magicContext; // Contains speakerphone setting: auto, true or false @@ -91,7 +90,7 @@ public class MagicAudioManager { private MagicProximitySensor proximitySensor = null; // Contains a list of available audio devices. A Set collection is used to // avoid duplicate elements. - private Set audioDevices = new HashSet(); + private Set audioDevices = new HashSet<>(); // Broadcast receiver for wired headset intent broadcasts. private BroadcastReceiver wiredHeadsetReceiver; // Callback method for changes in audio focus. @@ -620,7 +619,6 @@ public class MagicAudioManager { private static final int STATE_UNPLUGGED = 0; private static final int STATE_PLUGGED = 1; private static final int HAS_NO_MIC = 0; - private static final int HAS_MIC = 1; @Override public void onReceive(Context context, Intent intent) { 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 d9c11fe18..5567cf5d6 100644 --- a/app/src/main/java/com/nextcloud/talk/webrtc/MagicPeerConnectionWrapper.java +++ b/app/src/main/java/com/nextcloud/talk/webrtc/MagicPeerConnectionWrapper.java @@ -53,9 +53,7 @@ public class MagicPeerConnectionWrapper { private static String TAG = "MagicPeerConnectionWrapper"; List iceCandidates = new ArrayList<>(); private PeerConnection peerConnection; - private List iceServers; private String sessionId; - private String localSession; private String nick; private MediaConstraints mediaConstraints; private DataChannel magicDataChannel; @@ -73,8 +71,6 @@ public class MagicPeerConnectionWrapper { MediaConstraints mediaConstraints, String sessionId, String localSession, MediaStream mediaStream) { - this.iceServers = iceServerList; - this.localSession = localSession; this.localMediaStream = mediaStream; this.sessionId = sessionId;