From f7257af2c26ed0fc219adb3a3a6004d5264cc781 Mon Sep 17 00:00:00 2001 From: AndyScherzinger Date: Wed, 21 Feb 2018 21:49:53 +0100 Subject: [PATCH 01/11] 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; From 4440e1e192a97849d53e545d603c0c89b04c7bd9 Mon Sep 17 00:00:00 2001 From: AndyScherzinger Date: Wed, 21 Feb 2018 21:53:06 +0100 Subject: [PATCH 02/11] codacy: could be replaced by a local variable --- .../com/nextcloud/talk/controllers/CallsListController.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) 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 5bc4322dd..ffb63d2d8 100644 --- a/app/src/main/java/com/nextcloud/talk/controllers/CallsListController.java +++ b/app/src/main/java/com/nextcloud/talk/controllers/CallsListController.java @@ -113,8 +113,6 @@ public class CallsListController extends BaseController implements SearchView.On @BindView(R.id.fast_scroller) FastScroller fastScroller; - private SmoothScrollLinearLayoutManager layoutManager; - private UserEntity userEntity; private Disposable roomsQueryDisposable; private FlexibleAdapter adapter; @@ -332,7 +330,8 @@ public class CallsListController extends BaseController implements SearchView.On } private void prepareViews() { - layoutManager = new SmoothScrollLinearLayoutManager(getActivity()); + SmoothScrollLinearLayoutManager layoutManager = + new SmoothScrollLinearLayoutManager(getActivity()); recyclerView.setLayoutManager(layoutManager); recyclerView.setHasFixedSize(true); From c6de6bdf28556b0b7ba6ea7d30533cf7dfd56758 Mon Sep 17 00:00:00 2001 From: AndyScherzinger Date: Wed, 21 Feb 2018 21:59:38 +0100 Subject: [PATCH 03/11] codacy: These nested if statements could be combined --- .../talk/controllers/CallsListController.java | 20 +++++++++---------- .../talk/controllers/ContactsController.java | 12 +++++------ .../talk/webrtc/MagicAudioManager.java | 15 +++++++------- .../talk/webrtc/MagicProximitySensor.java | 7 +++---- 4 files changed, 25 insertions(+), 29 deletions(-) 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 ffb63d2d8..b9e95630f 100644 --- a/app/src/main/java/com/nextcloud/talk/controllers/CallsListController.java +++ b/app/src/main/java/com/nextcloud/talk/controllers/CallsListController.java @@ -146,12 +146,11 @@ public class CallsListController extends BaseController implements SearchView.On userEntity = userUtils.getCurrentUser(); - if (userEntity == null) { - if (getParentController() != null && getParentController().getRouter() != null) { - getParentController().getRouter().setRoot((RouterTransaction.with(new ServerSelectionController()) - .pushChangeHandler(new HorizontalChangeHandler()) - .popChangeHandler(new HorizontalChangeHandler()))); - } + if (userEntity == null && + getParentController() != null && getParentController().getRouter() != null) { + getParentController().getRouter().setRoot((RouterTransaction.with(new ServerSelectionController()) + .pushChangeHandler(new HorizontalChangeHandler()) + .popChangeHandler(new HorizontalChangeHandler()))); } if (adapter == null) { @@ -359,12 +358,11 @@ public class CallsListController extends BaseController implements SearchView.On private void dispose(@Nullable Disposable disposable) { if (disposable != null && !disposable.isDisposed()) { disposable.dispose(); - } else if (disposable == null) { + } else if (disposable == null && + roomsQueryDisposable != null && !roomsQueryDisposable.isDisposed() { + roomsQueryDisposable.dispose(); + roomsQueryDisposable = null; - if (roomsQueryDisposable != null && !roomsQueryDisposable.isDisposed()) { - roomsQueryDisposable.dispose(); - roomsQueryDisposable = null; - } } } diff --git a/app/src/main/java/com/nextcloud/talk/controllers/ContactsController.java b/app/src/main/java/com/nextcloud/talk/controllers/ContactsController.java index 94aac8c50..85a51a19a 100644 --- a/app/src/main/java/com/nextcloud/talk/controllers/ContactsController.java +++ b/app/src/main/java/com/nextcloud/talk/controllers/ContactsController.java @@ -184,12 +184,11 @@ public class ContactsController extends BaseController implements SearchView.OnQ userEntity = userUtils.getCurrentUser(); - if (userEntity == null) { - if (getParentController().getRouter() != null) { - getParentController().getRouter().setRoot((RouterTransaction.with(new ServerSelectionController()) - .pushChangeHandler(new HorizontalChangeHandler()) - .popChangeHandler(new HorizontalChangeHandler()))); - } + if (userEntity == null && + getParentController() != null && getParentController().getRouter() != null) { + getParentController().getRouter().setRoot((RouterTransaction.with(new ServerSelectionController()) + .pushChangeHandler(new HorizontalChangeHandler()) + .popChangeHandler(new HorizontalChangeHandler()))); } if (adapter == null) { @@ -197,7 +196,6 @@ public class ContactsController extends BaseController implements SearchView.OnQ adapter.setNotifyChangeOfUnfilteredItems(true) .setMode(SelectableAdapter.Mode.MULTI); - if (userEntity != null) { fetchData(); } 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 c9da88bc8..ca42a7616 100644 --- a/app/src/main/java/com/nextcloud/talk/webrtc/MagicAudioManager.java +++ b/app/src/main/java/com/nextcloud/talk/webrtc/MagicAudioManager.java @@ -545,14 +545,15 @@ public class MagicAudioManager { bluetoothManager.updateDevice(); } - if (needBluetoothAudioStart && !needBluetoothAudioStop) { - // Attempt to start Bluetooth SCO audio (takes a few second to start). - if (!bluetoothManager.startScoAudio()) { - // Remove BLUETOOTH from list of available devices since SCO failed. - audioDevices.remove(AudioDevice.BLUETOOTH); - audioDeviceSetUpdated = true; - } + // Attempt to start Bluetooth SCO audio (takes a few second to start). + if (needBluetoothAudioStart && + !needBluetoothAudioStop && + !bluetoothManager.startScoAudio()) { + // Remove BLUETOOTH from list of available devices since SCO failed. + audioDevices.remove(AudioDevice.BLUETOOTH); + audioDeviceSetUpdated = true; } + } // Update selected audio device. AudioDevice newAudioDevice = selectedAudioDevice; diff --git a/app/src/main/java/com/nextcloud/talk/webrtc/MagicProximitySensor.java b/app/src/main/java/com/nextcloud/talk/webrtc/MagicProximitySensor.java index f325e1bb1..b9f00ad65 100644 --- a/app/src/main/java/com/nextcloud/talk/webrtc/MagicProximitySensor.java +++ b/app/src/main/java/com/nextcloud/talk/webrtc/MagicProximitySensor.java @@ -111,10 +111,9 @@ public class MagicProximitySensor implements SensorEventListener { @Override public final void onAccuracyChanged(Sensor sensor, int accuracy) { threadChecker.checkIsOnValidThread(); - if (sensor.getType() == Sensor.TYPE_PROXIMITY) { - if (accuracy == SensorManager.SENSOR_STATUS_UNRELIABLE) { - Log.e(TAG, "The values returned by this sensor cannot be trusted"); - } + if (sensor.getType() == Sensor.TYPE_PROXIMITY && + accuracy == SensorManager.SENSOR_STATUS_UNRELIABLE) { + Log.e(TAG, "The values returned by this sensor cannot be trusted"); } } From 534d6c19bb3159fd7341e0e52d7331b7e25e67ff Mon Sep 17 00:00:00 2001 From: AndyScherzinger Date: Wed, 21 Feb 2018 22:16:33 +0100 Subject: [PATCH 04/11] codacy: An empty statement (semicolon) not part of a loop --- app/src/main/java/com/nextcloud/talk/utils/PushUtils.java | 1 - 1 file changed, 1 deletion(-) diff --git a/app/src/main/java/com/nextcloud/talk/utils/PushUtils.java b/app/src/main/java/com/nextcloud/talk/utils/PushUtils.java index ec4e9c420..1d053b9ea 100644 --- a/app/src/main/java/com/nextcloud/talk/utils/PushUtils.java +++ b/app/src/main/java/com/nextcloud/talk/utils/PushUtils.java @@ -347,7 +347,6 @@ public class PushUtils { if (readPublicKey) { keyString = keyString.replaceAll("\\n", "").replace("-----BEGIN PUBLIC KEY-----", "").replace("-----END PUBLIC KEY-----", ""); - ; } else { keyString = keyString.replaceAll("\\n", "").replace("-----BEGIN PRIVATE KEY-----", "").replace("-----END PRIVATE KEY-----", ""); From 13c6898e27a17773d30fa827c7122443aa0c9d6a Mon Sep 17 00:00:00 2001 From: AndyScherzinger Date: Wed, 21 Feb 2018 22:17:14 +0100 Subject: [PATCH 05/11] codacy: commented out unused variables (might be used in the future?) --- .../java/com/nextcloud/talk/webrtc/MagicAudioManager.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 ca42a7616..24adc23fc 100644 --- a/app/src/main/java/com/nextcloud/talk/webrtc/MagicAudioManager.java +++ b/app/src/main/java/com/nextcloud/talk/webrtc/MagicAudioManager.java @@ -624,8 +624,8 @@ public class MagicAudioManager { @Override public void onReceive(Context context, Intent intent) { int state = intent.getIntExtra("state", STATE_UNPLUGGED); - int microphone = intent.getIntExtra("microphone", HAS_NO_MIC); - String name = intent.getStringExtra("name"); + // int microphone = intent.getIntExtra("microphone", HAS_NO_MIC); + // String name = intent.getStringExtra("name"); hasWiredHeadset = (state == STATE_PLUGGED); updateAudioDeviceState(); } From 7055c4b29aa9d845b62af4e1110116e82a960950 Mon Sep 17 00:00:00 2001 From: AndyScherzinger Date: Wed, 21 Feb 2018 22:22:32 +0100 Subject: [PATCH 06/11] codacy: remove unused import --- .../talk/controllers/bottomsheet/CallMenuController.java | 1 - 1 file changed, 1 deletion(-) 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 f14985449..b86fb9714 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 @@ -41,7 +41,6 @@ import com.nextcloud.talk.application.NextcloudTalkApplication; import com.nextcloud.talk.controllers.ContactsController; import com.nextcloud.talk.controllers.base.BaseController; import com.nextcloud.talk.events.BottomSheetLockEvent; -import com.nextcloud.talk.models.database.UserEntity; import com.nextcloud.talk.models.json.rooms.Room; import com.nextcloud.talk.utils.ShareUtils; import com.nextcloud.talk.utils.bundle.BundleKeys; From 7dc50e45ad5be18927c50a17363fe7a2a5ff4d0a Mon Sep 17 00:00:00 2001 From: AndyScherzinger Date: Wed, 21 Feb 2018 22:33:25 +0100 Subject: [PATCH 07/11] codacy: EmptyCatchBlock --- .../java/com/nextcloud/talk/utils/ssl/SSLSocketFactoryCompat.kt | 1 + 1 file changed, 1 insertion(+) diff --git a/app/src/main/java/com/nextcloud/talk/utils/ssl/SSLSocketFactoryCompat.kt b/app/src/main/java/com/nextcloud/talk/utils/ssl/SSLSocketFactoryCompat.kt index 4e91374ae..cf7463e93 100644 --- a/app/src/main/java/com/nextcloud/talk/utils/ssl/SSLSocketFactoryCompat.kt +++ b/app/src/main/java/com/nextcloud/talk/utils/ssl/SSLSocketFactoryCompat.kt @@ -89,6 +89,7 @@ class SSLSocketFactoryCompat(trustManager: X509TrustManager) : SSLSocketFactory( cipherSuites = _cipherSuites.toTypedArray() } } catch (e: IOException) { + // Exception is to be ignored } finally { socket?.close() // doesn't implement Closeable on all supported Android versions } From 45a145ac50d1d858512768bb3004dce73363c465 Mon Sep 17 00:00:00 2001 From: AndyScherzinger Date: Wed, 21 Feb 2018 22:53:21 +0100 Subject: [PATCH 08/11] codacy: Method names should not contain underscores --- app/src/test/java/com/nextcloud/talk/ExampleUnitTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/test/java/com/nextcloud/talk/ExampleUnitTest.java b/app/src/test/java/com/nextcloud/talk/ExampleUnitTest.java index 25624bb44..e6d1e1fb8 100644 --- a/app/src/test/java/com/nextcloud/talk/ExampleUnitTest.java +++ b/app/src/test/java/com/nextcloud/talk/ExampleUnitTest.java @@ -11,7 +11,7 @@ import static org.junit.Assert.*; */ public class ExampleUnitTest { @Test - public void addition_isCorrect() throws Exception { + public void additionIsCorrect() throws Exception { assertEquals(4, 2 + 2); } } \ No newline at end of file From ab65fe3ecc38141a52f354601da2f9c959d5d391 Mon Sep 17 00:00:00 2001 From: AndyScherzinger Date: Wed, 21 Feb 2018 22:55:05 +0100 Subject: [PATCH 09/11] codacy: Method names should not start with capital letters --- .../java/com/nextcloud/talk/utils/ClosedInterfaceImpl.java | 2 +- .../nextcloud/talk/application/NextcloudTalkApplication.java | 2 +- .../java/com/nextcloud/talk/interfaces/ClosedInterface.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/src/GPlay/java/com/nextcloud/talk/utils/ClosedInterfaceImpl.java b/app/src/GPlay/java/com/nextcloud/talk/utils/ClosedInterfaceImpl.java index 38eb31f0c..b77f90029 100644 --- a/app/src/GPlay/java/com/nextcloud/talk/utils/ClosedInterfaceImpl.java +++ b/app/src/GPlay/java/com/nextcloud/talk/utils/ClosedInterfaceImpl.java @@ -30,7 +30,7 @@ import com.nextcloud.talk.interfaces.ClosedInterface; public class ClosedInterfaceImpl implements ClosedInterface, ProviderInstallListener { @Override - public void ProviderInstallerInstallIfNeededAsync() { + public void providerInstallerInstallIfNeededAsync() { ProviderInstaller.installIfNeededAsync(NextcloudTalkApplication.getSharedApplication().getApplicationContext(), this); } diff --git a/app/src/main/java/com/nextcloud/talk/application/NextcloudTalkApplication.java b/app/src/main/java/com/nextcloud/talk/application/NextcloudTalkApplication.java index 3eb0e55ab..24fdd61a5 100644 --- a/app/src/main/java/com/nextcloud/talk/application/NextcloudTalkApplication.java +++ b/app/src/main/java/com/nextcloud/talk/application/NextcloudTalkApplication.java @@ -131,7 +131,7 @@ public class NextcloudTalkApplication extends MultiDexApplication { componentApplication.inject(this); refWatcher = LeakCanary.install(this); - new ClosedInterfaceImpl().ProviderInstallerInstallIfNeededAsync(); + new ClosedInterfaceImpl().providerInstallerInstallIfNeededAsync(); DeviceUtils.ignoreSpecialBatteryFeatures(); new JobRequest.Builder(PushRegistrationJob.TAG).setUpdateCurrent(true).startNow().build().schedule(); diff --git a/app/src/main/java/com/nextcloud/talk/interfaces/ClosedInterface.java b/app/src/main/java/com/nextcloud/talk/interfaces/ClosedInterface.java index 0883dfcba..436c2e589 100644 --- a/app/src/main/java/com/nextcloud/talk/interfaces/ClosedInterface.java +++ b/app/src/main/java/com/nextcloud/talk/interfaces/ClosedInterface.java @@ -21,5 +21,5 @@ package com.nextcloud.talk.interfaces; public interface ClosedInterface { - void ProviderInstallerInstallIfNeededAsync(); + void providerInstallerInstallIfNeededAsync(); } From 853516b300e438bb9dc78129b847ede6e70d2aca Mon Sep 17 00:00:00 2001 From: AndyScherzinger Date: Wed, 21 Feb 2018 22:57:03 +0100 Subject: [PATCH 10/11] odacy: Position literals first in String comparisons --- .../main/java/com/nextcloud/talk/activities/CallActivity.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/com/nextcloud/talk/activities/CallActivity.java b/app/src/main/java/com/nextcloud/talk/activities/CallActivity.java index e705196c0..98d124e32 100644 --- a/app/src/main/java/com/nextcloud/talk/activities/CallActivity.java +++ b/app/src/main/java/com/nextcloud/talk/activities/CallActivity.java @@ -761,7 +761,7 @@ public class CallActivity extends AppCompatActivity { } private void joinRoomAndCall() { - if (callSession.equals("0")) { + if ("0".equals(callSession)) { ncApi.joinRoom(credentials, ApiUtils.getUrlForRoomParticipants(baseUrl, roomToken), null) .subscribeOn(Schedulers.newThread()) .observeOn(AndroidSchedulers.mainThread()) From 9a07f28815735fc3c1dad6b7ec66cd0ef302d4bd Mon Sep 17 00:00:00 2001 From: AndyScherzinger Date: Thu, 22 Feb 2018 12:34:34 +0100 Subject: [PATCH 11/11] CR: new line --- app/src/test/java/com/nextcloud/talk/ExampleUnitTest.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/src/test/java/com/nextcloud/talk/ExampleUnitTest.java b/app/src/test/java/com/nextcloud/talk/ExampleUnitTest.java index e6d1e1fb8..0c6c9badd 100644 --- a/app/src/test/java/com/nextcloud/talk/ExampleUnitTest.java +++ b/app/src/test/java/com/nextcloud/talk/ExampleUnitTest.java @@ -14,4 +14,5 @@ public class ExampleUnitTest { public void additionIsCorrect() throws Exception { assertEquals(4, 2 + 2); } -} \ No newline at end of file +} +