From da993b5b58425faf19b6296a4703cb5bd6f81882 Mon Sep 17 00:00:00 2001
From: David Langley <langley.dave@gmail.com>
Date: Mon, 19 Jul 2021 22:13:23 +0100
Subject: [PATCH] lint

---
 .../java/org/matrix/android/sdk/api/pushrules/rest/PushRule.kt | 3 ---
 .../sdk/internal/session/pushers/UpdatePushRuleActionsTask.kt  | 1 -
 .../java/im/vector/app/core/preference/PushRulePreference.kt   | 2 +-
 .../VectorSettingsAdvancedNotificationPreferenceFragment.kt    | 2 +-
 4 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/rest/PushRule.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/rest/PushRule.kt
index bc6cead405..b95d5217a4 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/rest/PushRule.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/rest/PushRule.kt
@@ -107,7 +107,6 @@ data class PushRule(
         return (getActions().firstOrNull { it is Action.Highlight } as? Action.Highlight)?.highlight ?: false
     }
 
-
     /**
      * Set the notification status.
      *
@@ -141,6 +140,4 @@ data class PushRule(
      * @return true if the rule should not play sound
      */
     fun shouldNotNotify() = actions.contains(Action.ACTION_DONT_NOTIFY)
-
-    companion object { }
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/UpdatePushRuleActionsTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/UpdatePushRuleActionsTask.kt
index 194e614957..b8dbabd09e 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/UpdatePushRuleActionsTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/UpdatePushRuleActionsTask.kt
@@ -47,6 +47,5 @@ internal class DefaultUpdatePushRuleActionsTask @Inject constructor(
                     pushRulesApi.updateRuleActions(params.kind.value, params.ruleId, body)
                 }
             }
-
     }
 }
diff --git a/vector/src/main/java/im/vector/app/core/preference/PushRulePreference.kt b/vector/src/main/java/im/vector/app/core/preference/PushRulePreference.kt
index c9969453b5..d49d7c3407 100755
--- a/vector/src/main/java/im/vector/app/core/preference/PushRulePreference.kt
+++ b/vector/src/main/java/im/vector/app/core/preference/PushRulePreference.kt
@@ -56,7 +56,7 @@ class PushRulePreference : VectorPreference {
      *
      * @param pushRule
      */
-    fun setIndex(notificationIndex: NotificationIndex? ) {
+    fun setIndex(notificationIndex: NotificationIndex?) {
         index = notificationIndex
         refreshSummary()
     }
diff --git a/vector/src/main/java/im/vector/app/features/settings/notifications/VectorSettingsAdvancedNotificationPreferenceFragment.kt b/vector/src/main/java/im/vector/app/features/settings/notifications/VectorSettingsAdvancedNotificationPreferenceFragment.kt
index 12b1e072cb..d6a3fea1bf 100644
--- a/vector/src/main/java/im/vector/app/features/settings/notifications/VectorSettingsAdvancedNotificationPreferenceFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/notifications/VectorSettingsAdvancedNotificationPreferenceFragment.kt
@@ -99,7 +99,7 @@ class VectorSettingsAdvancedNotificationPreferenceFragment @Inject constructor()
     }
 
     private fun ruleMatches(rule: PushRule, targetRule: PushRule): Boolean {
-        //Rules match if both are disabled, or if both are enabled and their highlight/sound/notify actions match up.
+        // Rules match if both are disabled, or if both are enabled and their highlight/sound/notify actions match up.
         return (!rule.enabled && !targetRule.enabled)
                 || (rule.enabled
                         && targetRule.enabled