浏览代码

improve detekt score

Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
Andy Scherzinger 3 年之前
父节点
当前提交
4fb61ed046

+ 3 - 1
app/src/gplay/java/com/nextcloud/talk/services/firebase/MagicFirebaseMessagingService.kt

@@ -304,7 +304,9 @@ class MagicFirebaseMessagingService : FirebaseMessagingService() {
                     }
                 }
 
-                override fun onError(e: Throwable) {}
+                override fun onError(e: Throwable) {
+                    // unused atm
+                }
                 override fun onComplete() {
                     stopForeground(true)
                     handler.removeCallbacksAndMessages(null)

+ 18 - 6
app/src/main/java/com/nextcloud/talk/activities/MainActivity.kt

@@ -246,7 +246,9 @@ class MainActivity : BaseActivity(), ActionBarProvider {
             .subscribeOn(Schedulers.io())
             .observeOn(AndroidSchedulers.mainThread())
             .subscribe(object : Observer<RoomOverall> {
-                override fun onSubscribe(d: Disposable) {}
+                override fun onSubscribe(d: Disposable) {
+                    // unused atm
+                }
                 override fun onNext(roomOverall: RoomOverall) {
                     val bundle = Bundle()
                     bundle.putParcelable(KEY_USER_ENTITY, currentUser)
@@ -265,7 +267,9 @@ class MainActivity : BaseActivity(), ActionBarProvider {
                         .subscribeOn(Schedulers.io())
                         .observeOn(AndroidSchedulers.mainThread())
                         .subscribe(object : Observer<RoomOverall> {
-                            override fun onSubscribe(d: Disposable) {}
+                            override fun onSubscribe(d: Disposable) {
+                                // unused atm
+                            }
                             override fun onNext(roomOverall: RoomOverall) {
                                 bundle.putParcelable(
                                     KEY_ACTIVE_CONVERSATION,
@@ -277,13 +281,21 @@ class MainActivity : BaseActivity(), ActionBarProvider {
                                 )
                             }
 
-                            override fun onError(e: Throwable) {}
-                            override fun onComplete() {}
+                            override fun onError(e: Throwable) {
+                                // unused atm
+                            }
+                            override fun onComplete() {
+                                // unused atm
+                            }
                         })
                 }
 
-                override fun onError(e: Throwable) {}
-                override fun onComplete() {}
+                override fun onError(e: Throwable) {
+                    // unused atm
+                }
+                override fun onComplete() {
+                    // unused atm
+                }
             })
     }
 

+ 12 - 2
app/src/main/java/com/nextcloud/talk/controllers/ChatController.kt

@@ -346,6 +346,7 @@ class ChatController(args: Bundle) :
                     }
 
                     override fun onError(e: Throwable) {
+                        // unused atm
                     }
 
                     override fun onComplete() {
@@ -388,9 +389,11 @@ class ChatController(args: Bundle) :
                 }
 
                 override fun onError(e: Throwable) {
+                    // unused atm
                 }
 
                 override fun onComplete() {
+                    // unused atm
                 }
             })
     }
@@ -665,6 +668,7 @@ class ChatController(args: Bundle) :
             }
 
             override fun afterTextChanged(s: Editable) {
+                // unused atm
             }
         })
 
@@ -1261,7 +1265,9 @@ class ChatController(args: Bundle) :
                             UploadAndShareFilesWorker.requestStoragePermission(this)
                         }
                     }
-                    .setNegativeButton(R.string.nc_no) {}
+                    .setNegativeButton(R.string.nc_no) {
+                        // unused atm
+                    }
                     .show()
             } catch (e: IllegalStateException) {
                 Toast.makeText(context, context?.resources?.getString(R.string.nc_upload_failed), Toast.LENGTH_LONG)
@@ -1693,9 +1699,11 @@ class ChatController(args: Bundle) :
                     }
 
                     override fun onError(e: Throwable) {
+                        // unused atm
                     }
 
                     override fun onComplete() {
+                        // unused atm
                     }
                 })
         } else {
@@ -1759,7 +1767,9 @@ class ChatController(args: Bundle) :
                     }
                 }
 
-                override fun onError(e: Throwable) {}
+                override fun onError(e: Throwable) {
+                    // unused atm
+                }
 
                 override fun onComplete() {
                     dispose()

+ 20 - 0
app/src/main/java/com/nextcloud/talk/controllers/ConversationInfoController.kt

@@ -287,15 +287,19 @@ class ConversationInfoController(args: Bundle) :
             ?.observeOn(AndroidSchedulers.mainThread())
             ?.subscribe(object : Observer<GenericOverall> {
                 override fun onComplete() {
+                    // unused atm
                 }
 
                 override fun onSubscribe(d: Disposable) {
+                    // unused atm
                 }
 
                 override fun onNext(t: GenericOverall) {
+                    // unused atm
                 }
 
                 override fun onError(e: Throwable) {
+                    // unused atm
                 }
             })
     }
@@ -305,6 +309,7 @@ class ConversationInfoController(args: Bundle) :
             ID_DELETE_CONVERSATION_DIALOG -> showDeleteConversationDialog(savedInstanceState)
             ID_CLEAR_CHAT_DIALOG -> showClearHistoryDialog(savedInstanceState)
             else -> {
+                // unused atm
             }
         }
     }
@@ -444,6 +449,7 @@ class ConversationInfoController(args: Bundle) :
                 }
 
                 override fun onError(e: Throwable) {
+                    // unused atm
                 }
 
                 override fun onComplete() {
@@ -525,6 +531,7 @@ class ConversationInfoController(args: Bundle) :
             ?.observeOn(AndroidSchedulers.mainThread())
             ?.subscribe(object : Observer<GenericOverall> {
                 override fun onSubscribe(d: Disposable) {
+                    // unused atm
                 }
 
                 override fun onNext(genericOverall: GenericOverall) {
@@ -538,6 +545,7 @@ class ConversationInfoController(args: Bundle) :
                 }
 
                 override fun onComplete() {
+                    // unused atm
                 }
             })
     }
@@ -647,6 +655,7 @@ class ConversationInfoController(args: Bundle) :
                 }
 
                 override fun onError(e: Throwable) {
+                    // unused atm
                 }
 
                 override fun onComplete() {
@@ -731,6 +740,7 @@ class ConversationInfoController(args: Bundle) :
             }
 
             else -> {
+                // unused atm
             }
         }
     }
@@ -738,6 +748,7 @@ class ConversationInfoController(args: Bundle) :
     private fun toggleModeratorStatus(apiVersion: Int, participant: Participant) {
         val subscriber = object : Observer<GenericOverall> {
             override fun onSubscribe(d: Disposable) {
+                // unused atm
             }
 
             override fun onNext(genericOverall: GenericOverall) {
@@ -750,6 +761,7 @@ class ConversationInfoController(args: Bundle) :
             }
 
             override fun onComplete() {
+                // unused atm
             }
         }
 
@@ -789,6 +801,7 @@ class ConversationInfoController(args: Bundle) :
     private fun toggleModeratorStatusLegacy(apiVersion: Int, participant: Participant) {
         val subscriber = object : Observer<GenericOverall> {
             override fun onSubscribe(d: Disposable) {
+                // unused atm
             }
 
             override fun onNext(genericOverall: GenericOverall) {
@@ -801,6 +814,7 @@ class ConversationInfoController(args: Bundle) :
             }
 
             override fun onComplete() {
+                // unused atm
             }
         }
 
@@ -848,6 +862,7 @@ class ConversationInfoController(args: Bundle) :
                 ?.observeOn(AndroidSchedulers.mainThread())
                 ?.subscribe(object : Observer<GenericOverall> {
                     override fun onSubscribe(d: Disposable) {
+                        // unused atm
                     }
 
                     override fun onNext(genericOverall: GenericOverall) {
@@ -860,6 +875,7 @@ class ConversationInfoController(args: Bundle) :
                     }
 
                     override fun onComplete() {
+                        // unused atm
                     }
                 })
         } else {
@@ -879,6 +895,7 @@ class ConversationInfoController(args: Bundle) :
                     ?.observeOn(AndroidSchedulers.mainThread())
                     ?.subscribe(object : Observer<GenericOverall> {
                         override fun onSubscribe(d: Disposable) {
+                            // unused atm
                         }
 
                         override fun onNext(genericOverall: GenericOverall) {
@@ -891,6 +908,7 @@ class ConversationInfoController(args: Bundle) :
                         }
 
                         override fun onComplete() {
+                            // unused atm
                         }
                     })
             } else {
@@ -907,6 +925,7 @@ class ConversationInfoController(args: Bundle) :
                     ?.observeOn(AndroidSchedulers.mainThread())
                     ?.subscribe(object : Observer<GenericOverall> {
                         override fun onSubscribe(d: Disposable) {
+                            // unused atm
                         }
 
                         override fun onNext(genericOverall: GenericOverall) {
@@ -919,6 +938,7 @@ class ConversationInfoController(args: Bundle) :
                         }
 
                         override fun onComplete() {
+                            // unused atm
                         }
                     })
             }

+ 3 - 1
app/src/main/java/com/nextcloud/talk/controllers/base/ButterKnifeController.kt

@@ -46,7 +46,9 @@ abstract class ButterKnifeController : Controller {
         return view
     }
 
-    protected open fun onViewBound(view: View) {}
+    protected open fun onViewBound(view: View) {
+        // unused atm
+    }
 
     override fun onDestroyView(view: View) {
         super.onDestroyView(view)

+ 2 - 0
app/src/main/java/com/nextcloud/talk/ui/bottom/sheet/ProfileBottomSheet.kt

@@ -63,6 +63,7 @@ class ProfileBottomSheet(val ncApi: NcApi, val userEntity: UserEntity, val route
         ).subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread())
             .subscribe(object : io.reactivex.Observer<HoverCardOverall> {
                 override fun onSubscribe(d: Disposable) {
+                    // unused atm
                 }
 
                 override fun onNext(hoverCardOverall: HoverCardOverall) {
@@ -74,6 +75,7 @@ class ProfileBottomSheet(val ncApi: NcApi, val userEntity: UserEntity, val route
                 }
 
                 override fun onComplete() {
+                    // unused atm
                 }
             })
     }

+ 18 - 9
app/src/main/java/com/nextcloud/talk/ui/dialog/ConversationsListBottomDialog.kt

@@ -141,11 +141,11 @@ class ConversationsListBottomDialog(
 
     private fun initClickListeners() {
         binding.conversationOperationAddFavorite.setOnClickListener {
-            executeOperationsMenuController(98)
+            executeOperationsMenuController(OPS_CODE_ADD_FAVORITE)
         }
 
         binding.conversationOperationRemoveFavorite.setOnClickListener {
-            executeOperationsMenuController(97)
+            executeOperationsMenuController(OPS_CODE_REMOVE_FAVORITE)
         }
 
         binding.conversationOperationLeave.setOnClickListener {
@@ -179,27 +179,27 @@ class ConversationsListBottomDialog(
         }
 
         binding.conversationOperationMakePublic.setOnClickListener {
-            executeOperationsMenuController(3)
+            executeOperationsMenuController(OPS_CODE_MAKE_PUBLIC)
         }
 
         binding.conversationOperationMakePrivate.setOnClickListener {
-            executeOperationsMenuController(8)
+            executeOperationsMenuController(OPS_CODE_MAKE_PRIVATE)
         }
 
         binding.conversationOperationChangePassword.setOnClickListener {
-            executeEntryMenuController(4)
+            executeEntryMenuController(OPS_CODE_CHANGE_PASSWORD)
         }
 
         binding.conversationOperationClearPassword.setOnClickListener {
-            executeOperationsMenuController(5)
+            executeOperationsMenuController(OPS_CODE_CLEAR_PASSWORD)
         }
 
         binding.conversationOperationSetPassword.setOnClickListener {
-            executeEntryMenuController(6)
+            executeEntryMenuController(OPS_CODE_SET_PASSWORD)
         }
 
         binding.conversationOperationRename.setOnClickListener {
-            executeEntryMenuController(2)
+            executeEntryMenuController(OPS_CODE_RENAME)
         }
 
         binding.conversationOperationShareLink.setOnClickListener {
@@ -277,5 +277,14 @@ class ConversationsListBottomDialog(
 
     companion object {
         private const val TAG = "ConversationOperationDialog"
+
+        private const val OPS_CODE_RENAME = 2
+        private const val OPS_CODE_MAKE_PUBLIC = 3
+        private const val OPS_CODE_CHANGE_PASSWORD = 4
+        private const val OPS_CODE_CLEAR_PASSWORD = 5
+        private const val OPS_CODE_SET_PASSWORD = 6
+        private const val OPS_CODE_MAKE_PRIVATE = 8
+        private const val OPS_CODE_REMOVE_FAVORITE = 97
+        private const val OPS_CODE_ADD_FAVORITE = 98
     }
-}
+}