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

🔄 synced file(s) with nextcloud/android-config
This commit is contained in:
Andy Scherzinger 2024-10-07 18:01:43 +02:00 committed by GitHub
commit fb065a71d3
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 10 additions and 7 deletions

View File

@ -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 }}

View File

@ -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,

View File

@ -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)

View File

@ -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

View File

@ -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

View File

@ -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>