Merge pull request #4319 from nextcloud/repo-sync/android-config/master

🔄 synced file(s) with nextcloud/android-config
nextcloud · Oct 7, 2024 · fb065a7 · fb065a7
2 parents f9e41bb + a0356aa
commit fb065a7
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 7 deletions.
diff --git a/.github/workflows/analysis.yml b/.github/workflows/analysis.yml
@@ -55,7 +55,7 @@ jobs:
                     java-version: 17
             -   name: Install dependencies
                 run: |
-                    python3 -m pip install defusedxml
+                    sudo apt install python3-defusedxml
             -   name: Run analysis wrapper
                 env:
                     GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

diff --git a/app/src/main/java/com/nextcloud/talk/models/json/conversations/Conversation.kt b/app/src/main/java/com/nextcloud/talk/models/json/conversations/Conversation.kt
@@ -58,7 +58,8 @@ data class Conversation(
     @JsonField(name = ["actorType"])
     var actorType: String = "",
 
-    var password: String? = null, // check if this can be removed.Does not belong to api response but is used internally?
+    // check if this can be removed. Doesn't belong to api-response but is used internally?
+    var password: String? = null,
 
     @JsonField(name = ["isFavorite"])
     var favorite: Boolean = false,

diff --git a/app/src/main/java/com/nextcloud/talk/ui/dialog/DateTimePickerFragment.kt b/app/src/main/java/com/nextcloud/talk/ui/dialog/DateTimePickerFragment.kt
@@ -238,7 +238,7 @@ class DateTimePickerFragment : DialogFragment() {
                 month,
                 day,
                 timePicker.hour,
-                timePicker.minute,
+                timePicker.minute
             )
             setTimeStamp(getTimeFromTimeStamp(timestamp))
             currentTimeStamp = timestamp / ONE_SEC
@@ -264,7 +264,7 @@ class DateTimePickerFragment : DialogFragment() {
         val calendar: Calendar = Calendar.getInstance().apply {
             set(Calendar.YEAR, year)
             set(Calendar.MONTH, month)
-            set(Calendar.DAY_OF_YEAR,day)
+            set(Calendar.DAY_OF_YEAR, day)
             if (weekDay > -1) set(Calendar.DAY_OF_WEEK, weekDay)
             if (daysToAdd > 0) add(Calendar.DAY_OF_YEAR, daysToAdd)
             if (weekInYear != -1) set(Calendar.WEEK_OF_YEAR, weekInYear)

diff --git a/app/src/test/java/com/nextcloud/talk/json/ConversationConversionTest.kt b/app/src/test/java/com/nextcloud/talk/json/ConversationConversionTest.kt
@@ -14,7 +14,9 @@ import com.nextcloud.talk.data.database.model.ConversationEntity
 import com.nextcloud.talk.models.json.conversations.ConversationEnums
 import com.nextcloud.talk.models.json.conversations.RoomOverall
 import com.nextcloud.talk.models.json.participants.Participant
-import org.junit.Assert.*
+import org.junit.Assert.assertEquals
+import org.junit.Assert.assertNotNull
+import org.junit.Assert.assertTrue
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.junit.runners.Parameterized

diff --git a/detekt.yml b/detekt.yml
@@ -1,7 +1,7 @@
 # SPDX-FileCopyrightText: 2017-2024 Nextcloud GmbH and Nextcloud contributors
 # SPDX-License-Identifier: GPL-3.0-or-later
 build:
-  maxIssues: 168
+  maxIssues: 178
   weights:
     # complexity: 2
     # LongParameterList: 1

diff --git a/scripts/analysis/lint-results.txt b/scripts/analysis/lint-results.txt
@@ -1,2 +1,2 @@
 DO NOT TOUCH; GENERATED BY DRONE
-      <span class="mdl-layout-title">Lint Report: 131 errors and 86 warnings</span>
+      <span class="mdl-layout-title">Lint Report: 132 errors and 94 warnings</span>