mirror of
https://github.com/nextcloud/talk-android
synced 2025-07-10 22:34:15 +01:00
Merge pull request #4319 from nextcloud/repo-sync/android-config/master
🔄 synced file(s) with nextcloud/android-config
This commit is contained in:
commit
fb065a71d3
2
.github/workflows/analysis.yml
vendored
2
.github/workflows/analysis.yml
vendored
@ -55,7 +55,7 @@ jobs:
|
|||||||
java-version: 17
|
java-version: 17
|
||||||
- name: Install dependencies
|
- name: Install dependencies
|
||||||
run: |
|
run: |
|
||||||
python3 -m pip install defusedxml
|
sudo apt install python3-defusedxml
|
||||||
- name: Run analysis wrapper
|
- name: Run analysis wrapper
|
||||||
env:
|
env:
|
||||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||||
|
@ -58,7 +58,8 @@ data class Conversation(
|
|||||||
@JsonField(name = ["actorType"])
|
@JsonField(name = ["actorType"])
|
||||||
var actorType: String = "",
|
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"])
|
@JsonField(name = ["isFavorite"])
|
||||||
var favorite: Boolean = false,
|
var favorite: Boolean = false,
|
||||||
|
@ -238,7 +238,7 @@ class DateTimePickerFragment : DialogFragment() {
|
|||||||
month,
|
month,
|
||||||
day,
|
day,
|
||||||
timePicker.hour,
|
timePicker.hour,
|
||||||
timePicker.minute,
|
timePicker.minute
|
||||||
)
|
)
|
||||||
setTimeStamp(getTimeFromTimeStamp(timestamp))
|
setTimeStamp(getTimeFromTimeStamp(timestamp))
|
||||||
currentTimeStamp = timestamp / ONE_SEC
|
currentTimeStamp = timestamp / ONE_SEC
|
||||||
@ -264,7 +264,7 @@ class DateTimePickerFragment : DialogFragment() {
|
|||||||
val calendar: Calendar = Calendar.getInstance().apply {
|
val calendar: Calendar = Calendar.getInstance().apply {
|
||||||
set(Calendar.YEAR, year)
|
set(Calendar.YEAR, year)
|
||||||
set(Calendar.MONTH, month)
|
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 (weekDay > -1) set(Calendar.DAY_OF_WEEK, weekDay)
|
||||||
if (daysToAdd > 0) add(Calendar.DAY_OF_YEAR, daysToAdd)
|
if (daysToAdd > 0) add(Calendar.DAY_OF_YEAR, daysToAdd)
|
||||||
if (weekInYear != -1) set(Calendar.WEEK_OF_YEAR, weekInYear)
|
if (weekInYear != -1) set(Calendar.WEEK_OF_YEAR, weekInYear)
|
||||||
|
@ -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.ConversationEnums
|
||||||
import com.nextcloud.talk.models.json.conversations.RoomOverall
|
import com.nextcloud.talk.models.json.conversations.RoomOverall
|
||||||
import com.nextcloud.talk.models.json.participants.Participant
|
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.Test
|
||||||
import org.junit.runner.RunWith
|
import org.junit.runner.RunWith
|
||||||
import org.junit.runners.Parameterized
|
import org.junit.runners.Parameterized
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
# SPDX-FileCopyrightText: 2017-2024 Nextcloud GmbH and Nextcloud contributors
|
# SPDX-FileCopyrightText: 2017-2024 Nextcloud GmbH and Nextcloud contributors
|
||||||
# SPDX-License-Identifier: GPL-3.0-or-later
|
# SPDX-License-Identifier: GPL-3.0-or-later
|
||||||
build:
|
build:
|
||||||
maxIssues: 168
|
maxIssues: 178
|
||||||
weights:
|
weights:
|
||||||
# complexity: 2
|
# complexity: 2
|
||||||
# LongParameterList: 1
|
# LongParameterList: 1
|
||||||
|
@ -1,2 +1,2 @@
|
|||||||
DO NOT TOUCH; GENERATED BY DRONE
|
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>
|
||||||
|
Loading…
Reference in New Issue
Block a user