updated to 22.0.2
This commit is contained in:
parent
7fbf1db963
commit
df332bafd8
19 changed files with 75 additions and 175 deletions
|
|
@ -2,8 +2,6 @@
|
|||
~ SPDX-FileCopyrightText: 2017-2024 Nextcloud GmbH and Nextcloud contributors
|
||||
~ SPDX-License-Identifier: GPL-3.0-or-later
|
||||
-->
|
||||
# Only a copy of the Nextcloud Repository on GitHub
|
||||
|
||||
# [Nextcloud](https://nextcloud.com) Talk for Android :speech_balloon:
|
||||
|
||||
[](https://drone.nextcloud.com/nextcloud/talk-android) [](https://www.codacy.com/gh/nextcloud/talk-android/dashboard) [](https://github.com/nextcloud/talk-android/releases/latest) [](https://api.reuse.software/info/github.com/nextcloud/talk-android)
|
||||
|
|
@ -14,10 +12,6 @@
|
|||
[<img src="https://f-droid.org/badge/get-it-on.png"
|
||||
alt="Get it on F-Droid"
|
||||
height="80">](https://f-droid.org/packages/com.nextcloud.talk2/)
|
||||
[<img src="https://github.com/user-attachments/assets/713d71c5-3dec-4ec4-a3f2-8d28d025a9c6"
|
||||
alt="Get it with Obtainium"
|
||||
height="80">](https://apps.obtainium.imranr.dev/redirect?r=obtainium://app/%7B%22id%22%3A%22com.nextcloud.talk2%22%2C%22url%22%3A%22https%3A%2F%2Fgithub.com%2Fnextcloud%2Ftalk-android%22%2C%22author%22%3A%22nextcloud%22%2C%22name%22%3A%22Talk%22%2C%22preferredApkIndex%22%3A0%2C%22additionalSettings%22%3A%22%7B%5C%22includePrereleases%5C%22%3Afalse%2C%5C%22fallbackToOlderReleases%5C%22%3Atrue%2C%5C%22filterReleaseTitlesByRegEx%5C%22%3A%5C%22%5C%22%2C%5C%22filterReleaseNotesByRegEx%5C%22%3A%5C%22%5C%22%2C%5C%22verifyLatestTag%5C%22%3Atrue%2C%5C%22sortMethodChoice%5C%22%3A%5C%22date%5C%22%2C%5C%22useLatestAssetDateAsReleaseDate%5C%22%3Afalse%2C%5C%22releaseTitleAsVersion%5C%22%3Afalse%2C%5C%22trackOnly%5C%22%3Afalse%2C%5C%22versionExtractionRegEx%5C%22%3A%5C%22%5C%22%2C%5C%22matchGroupToUse%5C%22%3A%5C%22%5C%22%2C%5C%22versionDetection%5C%22%3Atrue%2C%5C%22releaseDateAsVersion%5C%22%3Afalse%2C%5C%22useVersionCodeAsOSVersion%5C%22%3Afalse%2C%5C%22apkFilterRegEx%5C%22%3A%5C%22%5Enextcloud.*%5C%22%2C%5C%22invertAPKFilter%5C%22%3Afalse%2C%5C%22autoApkFilterByArch%5C%22%3Atrue%2C%5C%22appName%5C%22%3A%5C%22Nextcloud%20Talk%5C%22%2C%5C%22appAuthor%5C%22%3A%5C%22%5C%22%2C%5C%22shizukuPretendToBeGooglePlay%5C%22%3Afalse%2C%5C%22allowInsecure%5C%22%3Afalse%2C%5C%22exemptFromBackgroundUpdates%5C%22%3Afalse%2C%5C%22skipUpdateNotifications%5C%22%3Afalse%2C%5C%22about%5C%22%3A%5C%22%5C%22%2C%5C%22refreshBeforeDownload%5C%22%3Atrue%7D%22%2C%22overrideSource%22%3Anull%7D)
|
||||
|
||||
|
||||
Please note that Notifications won't work with the F-Droid version due to missing Google Play Services.
|
||||
|
||||
|
|
@ -118,4 +112,4 @@ If you have problems to receive talk notifications on your android phone, please
|
|||
|
||||
## Remarks :scroll:
|
||||
|
||||
Google Play and the Google Play logo are trademarks of Google Inc.
|
||||
Google Play and the Google Play logo are trademarks of Google Inc.
|
||||
|
|
@ -13,9 +13,9 @@ import com.github.spotbugs.snom.Effort
|
|||
import com.github.spotbugs.snom.SpotBugsTask
|
||||
|
||||
plugins {
|
||||
id "org.jetbrains.kotlin.plugin.compose" version "2.2.20"
|
||||
id "org.jetbrains.kotlin.plugin.compose" version "2.2.10"
|
||||
id "org.jetbrains.kotlin.kapt"
|
||||
id 'com.google.devtools.ksp' version '2.2.20-2.0.3'
|
||||
id 'com.google.devtools.ksp' version '2.2.10-2.0.2'
|
||||
}
|
||||
|
||||
apply plugin: 'com.android.application'
|
||||
|
|
@ -39,8 +39,8 @@ android {
|
|||
|
||||
// mayor.minor.hotfix.increment (for increment: 01-50=Alpha / 51-89=RC / 90-99=stable)
|
||||
// xx .xxx .xx .xx
|
||||
versionCode 230000009
|
||||
versionName "23.0.0 Alpha 09"
|
||||
versionCode 220000290
|
||||
versionName "22.0.2"
|
||||
|
||||
flavorDimensions "default"
|
||||
renderscriptTargetApi = 19
|
||||
|
|
@ -156,20 +156,20 @@ kapt {
|
|||
}
|
||||
|
||||
ext {
|
||||
androidxCameraVersion = "1.5.0"
|
||||
androidxCameraVersion = "1.4.2"
|
||||
coilKtVersion = "2.7.0"
|
||||
daggerVersion = "2.57.2"
|
||||
emojiVersion = "1.6.0"
|
||||
daggerVersion = "2.57.1"
|
||||
emojiVersion = "1.5.0"
|
||||
fidoVersion = "4.1.0-patch2"
|
||||
lifecycleVersion = '2.9.4'
|
||||
lifecycleVersion = '2.9.3'
|
||||
okhttpVersion = "4.12.0"
|
||||
markwonVersion = "4.6.2"
|
||||
materialDialogsVersion = "3.3.0"
|
||||
parcelerVersion = "1.1.13"
|
||||
prismVersion = "2.0.0"
|
||||
retrofit2Version = "3.0.0"
|
||||
roomVersion = "2.8.0"
|
||||
workVersion = "2.10.5"
|
||||
roomVersion = "2.7.2"
|
||||
workVersion = "2.10.3"
|
||||
espressoVersion = "3.7.0"
|
||||
androidxTestVersion = "1.5.0"
|
||||
media3_version = "1.8.0"
|
||||
|
|
@ -186,12 +186,12 @@ configurations.configureEach {
|
|||
|
||||
dependencies {
|
||||
implementation "androidx.room:room-testing-android:${roomVersion}"
|
||||
implementation 'androidx.compose.foundation:foundation-layout:1.9.2'
|
||||
implementation 'androidx.compose.foundation:foundation-layout:1.9.0'
|
||||
spotbugsPlugins 'com.h3xstream.findsecbugs:findsecbugs-plugin:1.14.0'
|
||||
spotbugsPlugins 'com.mebigfatguy.fb-contrib:fb-contrib:7.6.14'
|
||||
detektPlugins("io.gitlab.arturbosch.detekt:detekt-formatting:1.23.8")
|
||||
|
||||
implementation("androidx.compose.runtime:runtime:1.9.2")
|
||||
implementation("androidx.compose.runtime:runtime:1.9.0")
|
||||
implementation 'androidx.preference:preference-ktx:1.2.1'
|
||||
implementation 'androidx.datastore:datastore-core:1.1.7'
|
||||
implementation 'androidx.datastore:datastore-preferences:1.1.7'
|
||||
|
|
@ -289,7 +289,7 @@ dependencies {
|
|||
implementation "com.afollestad.material-dialogs:bottomsheets:${materialDialogsVersion}"
|
||||
implementation "com.afollestad.material-dialogs:lifecycle:${materialDialogsVersion}"
|
||||
|
||||
implementation 'com.google.code.gson:gson:2.13.2'
|
||||
implementation 'com.google.code.gson:gson:2.13.1'
|
||||
|
||||
implementation "androidx.media3:media3-exoplayer:$media3_version"
|
||||
implementation "androidx.media3:media3-ui:$media3_version"
|
||||
|
|
@ -315,11 +315,11 @@ dependencies {
|
|||
implementation 'com.github.nextcloud.android-common:ui:0.28.0'
|
||||
implementation 'com.github.nextcloud-deps:android-talk-webrtc:132.6834.0'
|
||||
|
||||
gplayImplementation 'com.google.android.gms:play-services-base:18.8.0'
|
||||
gplayImplementation "com.google.firebase:firebase-messaging:25.0.1"
|
||||
gplayImplementation 'com.google.android.gms:play-services-base:18.6.0'
|
||||
gplayImplementation "com.google.firebase:firebase-messaging:24.1.2"
|
||||
|
||||
//compose
|
||||
implementation(platform("androidx.compose:compose-bom:2025.09.00"))
|
||||
implementation(platform("androidx.compose:compose-bom:2025.08.01"))
|
||||
implementation("androidx.compose.ui:ui")
|
||||
implementation 'androidx.compose.material3:material3:1.3.2'
|
||||
implementation("androidx.compose.ui:ui-tooling-preview")
|
||||
|
|
@ -328,18 +328,18 @@ dependencies {
|
|||
|
||||
//tests
|
||||
testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.13.4'
|
||||
androidTestImplementation("androidx.compose.ui:ui-test-junit4:1.9.2")
|
||||
androidTestImplementation("androidx.compose.ui:ui-test-junit4:1.9.0")
|
||||
debugImplementation("androidx.compose.ui:ui-test-manifest")
|
||||
|
||||
testImplementation 'junit:junit:4.13.2'
|
||||
testImplementation 'org.mockito:mockito-core:5.20.0'
|
||||
testImplementation 'org.mockito:mockito-core:5.19.0'
|
||||
testImplementation 'androidx.arch.core:core-testing:2.2.0'
|
||||
|
||||
androidTestImplementation "androidx.test:core:1.7.0"
|
||||
|
||||
androidTestImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-test:1.10.2"
|
||||
androidTestImplementation 'androidx.test:core-ktx:1.7.0'
|
||||
androidTestImplementation 'org.mockito:mockito-android:5.20.0'
|
||||
androidTestImplementation 'org.mockito:mockito-android:5.19.0'
|
||||
androidTestImplementation "androidx.work:work-testing:${workVersion}"
|
||||
// Espresso core
|
||||
androidTestImplementation ("androidx.test.espresso:espresso-core:$espressoVersion", {
|
||||
|
|
@ -353,14 +353,14 @@ dependencies {
|
|||
|
||||
androidTestImplementation('com.android.support.test.espresso:espresso-intents:3.0.2')
|
||||
|
||||
androidTestImplementation(platform("androidx.compose:compose-bom:2025.09.00"))
|
||||
androidTestImplementation(platform("androidx.compose:compose-bom:2025.08.01"))
|
||||
testImplementation "org.mockito.kotlin:mockito-kotlin:$mockitoKotlinVersion"
|
||||
testImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-test:$coroutines_version"
|
||||
|
||||
testImplementation 'org.junit.vintage:junit-vintage-engine:5.13.4' // DO NOT REMOVE
|
||||
testImplementation "androidx.room:room-testing:${roomVersion}"
|
||||
testImplementation("com.squareup.okhttp3:mockwebserver:$okhttpVersion")
|
||||
testImplementation("com.google.dagger:hilt-android-testing:2.57.2")
|
||||
testImplementation("com.google.dagger:hilt-android-testing:2.57.1")
|
||||
testImplementation("org.robolectric:robolectric:4.16")
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -532,12 +532,12 @@ class CallActivity : CallBaseActivity() {
|
|||
)
|
||||
}
|
||||
|
||||
when (CapabilitiesUtil.getRecordingConsentType(conversationUser!!.capabilities!!.spreedCapability!!)) {
|
||||
when (CapabilitiesUtil.getRecordingConsentType(conversationUser.capabilities!!.spreedCapability!!)) {
|
||||
CapabilitiesUtil.RECORDING_CONSENT_NOT_REQUIRED -> initiateCall()
|
||||
CapabilitiesUtil.RECORDING_CONSENT_REQUIRED -> askForRecordingConsent()
|
||||
CapabilitiesUtil.RECORDING_CONSENT_DEPEND_ON_CONVERSATION -> {
|
||||
val getRoomApiVersion = ApiUtils.getConversationApiVersion(
|
||||
conversationUser!!,
|
||||
conversationUser,
|
||||
intArrayOf(ApiUtils.API_V4, 1)
|
||||
)
|
||||
ncApi!!.getRoom(credentials, ApiUtils.getUrlForRoom(getRoomApiVersion, baseUrl, roomToken))
|
||||
|
|
|
|||
|
|
@ -3255,7 +3255,8 @@ class ChatActivity :
|
|||
}
|
||||
|
||||
val searchItem = menu.findItem(R.id.conversation_search)
|
||||
searchItem.isVisible = CapabilitiesUtil.isUnifiedSearchAvailable(spreedCapabilities) &&
|
||||
searchItem.isVisible =
|
||||
hasSpreedFeatureCapability(spreedCapabilities, SpreedFeatures.UNIFIED_SEARCH) &&
|
||||
currentConversation!!.remoteServer.isNullOrEmpty() &&
|
||||
!isChatThread()
|
||||
|
||||
|
|
|
|||
|
|
@ -60,7 +60,7 @@ class ContextChatViewModel @Inject constructor(private val chatNetworkDataSource
|
|||
token = token,
|
||||
messageId = messageId,
|
||||
limit = LIMIT,
|
||||
threadId = threadId?.toInt()
|
||||
threadId = threadId?.toIntOrNull()
|
||||
)
|
||||
|
||||
if (threadId.isNullOrEmpty()) {
|
||||
|
|
|
|||
|
|
@ -89,6 +89,8 @@ import com.nextcloud.talk.contacts.ContactsActivity
|
|||
import com.nextcloud.talk.contacts.ContactsUiState
|
||||
import com.nextcloud.talk.contacts.ContactsViewModel
|
||||
import com.nextcloud.talk.contacts.RoomUiState
|
||||
import com.nextcloud.talk.contextchat.ContextChatView
|
||||
import com.nextcloud.talk.contextchat.ContextChatViewModel
|
||||
import com.nextcloud.talk.conversationlist.viewmodels.ConversationsListViewModel
|
||||
import com.nextcloud.talk.data.network.NetworkMonitor
|
||||
import com.nextcloud.talk.data.user.model.User
|
||||
|
|
@ -113,8 +115,6 @@ import com.nextcloud.talk.threadsoverview.ThreadsOverviewActivity
|
|||
import com.nextcloud.talk.ui.BackgroundVoiceMessageCard
|
||||
import com.nextcloud.talk.ui.dialog.ChooseAccountDialogFragment
|
||||
import com.nextcloud.talk.ui.dialog.ChooseAccountShareToDialogFragment
|
||||
import com.nextcloud.talk.contextchat.ContextChatView
|
||||
import com.nextcloud.talk.contextchat.ContextChatViewModel
|
||||
import com.nextcloud.talk.ui.dialog.ConversationsListBottomDialog
|
||||
import com.nextcloud.talk.ui.dialog.FilterConversationFragment
|
||||
import com.nextcloud.talk.ui.dialog.FilterConversationFragment.Companion.ARCHIVE
|
||||
|
|
@ -125,7 +125,6 @@ import com.nextcloud.talk.utils.ApiUtils
|
|||
import com.nextcloud.talk.utils.BrandingUtils
|
||||
import com.nextcloud.talk.utils.CapabilitiesUtil.hasSpreedFeatureCapability
|
||||
import com.nextcloud.talk.utils.CapabilitiesUtil.isServerEOL
|
||||
import com.nextcloud.talk.utils.CapabilitiesUtil.isUnifiedSearchAvailable
|
||||
import com.nextcloud.talk.utils.ClosedInterfaceImpl
|
||||
import com.nextcloud.talk.utils.ConversationUtils
|
||||
import com.nextcloud.talk.utils.FileUtils
|
||||
|
|
@ -319,7 +318,7 @@ class ConversationsListActivity :
|
|||
return
|
||||
}
|
||||
currentUser?.capabilities?.spreedCapability?.let { spreedCapabilities ->
|
||||
if (isUnifiedSearchAvailable(spreedCapabilities)) {
|
||||
if (hasSpreedFeatureCapability(spreedCapabilities, SpreedFeatures.UNIFIED_SEARCH)) {
|
||||
searchHelper = MessageSearchHelper(unifiedSearchRepository)
|
||||
}
|
||||
}
|
||||
|
|
@ -1072,7 +1071,7 @@ class ConversationsListActivity :
|
|||
}
|
||||
|
||||
private fun fetchPendingInvitations() {
|
||||
if (hasSpreedFeatureCapability(currentUser!!.capabilities!!.spreedCapability!!, SpreedFeatures.FEDERATION_V1)) {
|
||||
if (hasSpreedFeatureCapability(currentUser?.capabilities?.spreedCapability, SpreedFeatures.FEDERATION_V1)) {
|
||||
binding.conversationListHintInclude.conversationListHintLayout.setOnClickListener {
|
||||
val intent = Intent(this, InvitationsActivity::class.java)
|
||||
startActivity(intent)
|
||||
|
|
@ -1203,7 +1202,7 @@ class ConversationsListActivity :
|
|||
searchableConversationItems.clear()
|
||||
searchableConversationItems.addAll(conversationItemsWithHeader)
|
||||
if (hasSpreedFeatureCapability(
|
||||
currentUser!!.capabilities!!.spreedCapability!!,
|
||||
currentUser?.capabilities?.spreedCapability,
|
||||
SpreedFeatures.LISTABLE_ROOMS
|
||||
)
|
||||
) {
|
||||
|
|
@ -1464,7 +1463,11 @@ class ConversationsListActivity :
|
|||
adapter?.filterItems()
|
||||
}
|
||||
|
||||
if (isUnifiedSearchAvailable(currentUser!!.capabilities!!.spreedCapability!!)) {
|
||||
if (hasSpreedFeatureCapability(
|
||||
currentUser?.capabilities?.spreedCapability,
|
||||
SpreedFeatures.UNIFIED_SEARCH
|
||||
)
|
||||
) {
|
||||
startMessageSearch(filter)
|
||||
}
|
||||
} else {
|
||||
|
|
@ -1584,7 +1587,7 @@ class ConversationsListActivity :
|
|||
selectedConversation = conversation
|
||||
if (selectedConversation != null) {
|
||||
val hasChatPermission = ParticipantPermissions(
|
||||
currentUser!!.capabilities!!.spreedCapability!!,
|
||||
currentUser?.capabilities?.spreedCapability,
|
||||
selectedConversation!!
|
||||
)
|
||||
.hasChatPermission()
|
||||
|
|
@ -1612,11 +1615,11 @@ class ConversationsListActivity :
|
|||
|
||||
private fun shouldShowLobby(conversation: ConversationModel): Boolean {
|
||||
val participantPermissions = ParticipantPermissions(
|
||||
currentUser!!.capabilities?.spreedCapability!!,
|
||||
currentUser?.capabilities?.spreedCapability,
|
||||
selectedConversation!!
|
||||
)
|
||||
return conversation.lobbyState == ConversationEnums.LobbyState.LOBBY_STATE_MODERATORS_ONLY &&
|
||||
!ConversationUtils.canModerate(conversation, currentUser!!.capabilities!!.spreedCapability!!) &&
|
||||
!ConversationUtils.canModerate(conversation, currentUser?.capabilities?.spreedCapability) &&
|
||||
!participantPermissions.canIgnoreLobby()
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -232,7 +232,7 @@ class NotificationWorker(context: Context, workerParams: WorkerParameters) : Wor
|
|||
bundle.putInt(BundleKeys.KEY_CALL_FLAG, conversation.callFlag)
|
||||
|
||||
val participantPermission = ParticipantPermissions(
|
||||
userBeingCalled!!.capabilities!!.spreedCapability!!,
|
||||
userBeingCalled?.capabilities?.spreedCapability,
|
||||
conversation
|
||||
)
|
||||
bundle.putBoolean(
|
||||
|
|
|
|||
|
|
@ -244,7 +244,7 @@ class ProfileActivity : BaseActivity() {
|
|||
binding.emptyList.root.visibility = View.GONE
|
||||
binding.userinfoList.visibility = View.VISIBLE
|
||||
if (CapabilitiesUtil.hasSpreedFeatureCapability(
|
||||
currentUser!!.capabilities!!.spreedCapability!!,
|
||||
currentUser?.capabilities?.spreedCapability,
|
||||
SpreedFeatures.TEMP_USER_AVATAR_API
|
||||
)
|
||||
) {
|
||||
|
|
|
|||
|
|
@ -945,7 +945,7 @@ class SettingsActivity :
|
|||
binding.settingsShowNotificationWarning.visibility = View.GONE
|
||||
}
|
||||
|
||||
if (CapabilitiesUtil.isReadStatusAvailable(currentUser!!.capabilities!!.spreedCapability!!)) {
|
||||
if (CapabilitiesUtil.isReadStatusAvailable(currentUser?.capabilities?.spreedCapability)) {
|
||||
binding.settingsReadPrivacySwitch.isChecked = !CapabilitiesUtil.isReadStatusPrivate(currentUser!!)
|
||||
} else {
|
||||
binding.settingsReadPrivacy.visibility = View.GONE
|
||||
|
|
|
|||
|
|
@ -100,11 +100,13 @@ object CapabilitiesUtil {
|
|||
//region SpreedCapabilities
|
||||
|
||||
@JvmStatic
|
||||
fun hasSpreedFeatureCapability(spreedCapabilities: SpreedCapability, spreedFeatures: SpreedFeatures): Boolean {
|
||||
if (spreedCapabilities.features != null) {
|
||||
return spreedCapabilities.features!!.contains(spreedFeatures.value)
|
||||
fun hasSpreedFeatureCapability(spreedCapabilities: SpreedCapability?, spreedFeatures: SpreedFeatures): Boolean {
|
||||
if (spreedCapabilities == null) {
|
||||
Log.e(TAG, "spreedCapabilities were null when checking capability ${spreedFeatures.value}")
|
||||
return false
|
||||
}
|
||||
return false
|
||||
|
||||
return spreedCapabilities.features?.contains(spreedFeatures.value) == true
|
||||
}
|
||||
|
||||
fun isSharedItemsAvailable(spreedCapabilities: SpreedCapability): Boolean =
|
||||
|
|
@ -136,12 +138,16 @@ object CapabilitiesUtil {
|
|||
return CONVERSATION_DESCRIPTION_LENGTH_FOR_OLD_SERVER
|
||||
}
|
||||
|
||||
fun isReadStatusAvailable(spreedCapabilities: SpreedCapability): Boolean {
|
||||
if (spreedCapabilities.config?.containsKey("chat") == true) {
|
||||
val map: Map<String, Any>? = spreedCapabilities.config!!["chat"]
|
||||
return map != null && map.containsKey("read-privacy")
|
||||
fun isReadStatusAvailable(spreedCapabilities: SpreedCapability?): Boolean {
|
||||
val chatConfig = spreedCapabilities?.config?.get("chat") as? Map<*, *>
|
||||
return if (chatConfig?.containsKey("read-privacy") == true) {
|
||||
true
|
||||
} else {
|
||||
if (spreedCapabilities == null) {
|
||||
Log.e(TAG, "spreedCapabilities were null when checking capability isReadStatusAvailable")
|
||||
}
|
||||
false
|
||||
}
|
||||
return false
|
||||
}
|
||||
|
||||
fun retentionOfEventRooms(spreedCapabilities: SpreedCapability): Int {
|
||||
|
|
@ -201,9 +207,6 @@ object CapabilitiesUtil {
|
|||
fun isConversationDescriptionEndpointAvailable(spreedCapabilities: SpreedCapability): Boolean =
|
||||
hasSpreedFeatureCapability(spreedCapabilities, SpreedFeatures.ROOM_DESCRIPTION)
|
||||
|
||||
fun isUnifiedSearchAvailable(spreedCapabilities: SpreedCapability): Boolean =
|
||||
hasSpreedFeatureCapability(spreedCapabilities, SpreedFeatures.UNIFIED_SEARCH)
|
||||
|
||||
fun isAbleToCall(spreedCapabilities: SpreedCapability): Boolean =
|
||||
if (
|
||||
spreedCapabilities.config?.containsKey("call") == true &&
|
||||
|
|
|
|||
|
|
@ -27,11 +27,11 @@ object ConversationUtils {
|
|||
Participant.ParticipantType.GUEST_MODERATOR == conversation.participantType ||
|
||||
Participant.ParticipantType.MODERATOR == conversation.participantType
|
||||
|
||||
fun isLockedOneToOne(conversation: ConversationModel, spreedCapabilities: SpreedCapability): Boolean =
|
||||
fun isLockedOneToOne(conversation: ConversationModel, spreedCapabilities: SpreedCapability?): Boolean =
|
||||
conversation.type == ConversationEnums.ConversationType.ROOM_TYPE_ONE_TO_ONE_CALL &&
|
||||
CapabilitiesUtil.hasSpreedFeatureCapability(spreedCapabilities, SpreedFeatures.LOCKED_ONE_TO_ONE)
|
||||
|
||||
fun canModerate(conversation: ConversationModel, spreedCapabilities: SpreedCapability): Boolean =
|
||||
fun canModerate(conversation: ConversationModel, spreedCapabilities: SpreedCapability?): Boolean =
|
||||
isParticipantOwnerOrModerator(conversation) &&
|
||||
!isLockedOneToOne(conversation, spreedCapabilities) &&
|
||||
conversation.type != ConversationEnums.ConversationType.FORMER_ONE_TO_ONE &&
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@ import com.nextcloud.talk.models.json.capabilities.SpreedCapability
|
|||
* see https://nextcloud-talk.readthedocs.io/en/latest/constants/#attendee-permissions
|
||||
*/
|
||||
class ParticipantPermissions(
|
||||
private val spreedCapabilities: SpreedCapability,
|
||||
private val spreedCapabilities: SpreedCapability?,
|
||||
private val conversation: ConversationModel
|
||||
) {
|
||||
val isDefault = (conversation.permissions and DEFAULT) == DEFAULT
|
||||
|
|
|
|||
|
|
@ -565,6 +565,7 @@
|
|||
<string name="shared_items_voice">音声番号</string>
|
||||
<string name="starred">お気に入り</string>
|
||||
<string name="startCallForbidden">通話を開始することが許可されていません</string>
|
||||
<string name="start_thread">スレッドを作成する</string>
|
||||
<string name="started_a_call">会話を開始</string>
|
||||
<string name="status_message">ステータスメッセージ</string>
|
||||
<string name="switch_to_breakout_room">ブレイクアウトルームに切り替える</string>
|
||||
|
|
|
|||
|
|
@ -83,7 +83,7 @@
|
|||
<string name="location_permission_denied_msg">Por favor, ative-a nas configurações do aplicativo</string>
|
||||
<string name="location_services_disabled">Serviços de localização desativados</string>
|
||||
<string name="location_services_disabled_msg">Ative os serviços de localização (GPS) para usar este recurso</string>
|
||||
<string name="lock_conversation">Bloquear conversa</string>
|
||||
<string name="lock_conversation">Trancar conversa</string>
|
||||
<string name="lock_symbol">Símbolo de cadeado</string>
|
||||
<string name="lower_hand">Baixar mão</string>
|
||||
<string name="marked_as_read">Conversa %1$s marcada como lida</string>
|
||||
|
|
@ -118,7 +118,7 @@
|
|||
<string name="nc_add_to_favorites">Adicionar aos favoritos</string>
|
||||
<string name="nc_all_ok_operation">OK, tudo pronto!</string>
|
||||
<string name="nc_attendee_pin">PIN: %1$s</string>
|
||||
<string name="nc_biometric_unlock">Desbloquear %1$s</string>
|
||||
<string name="nc_biometric_unlock">Destrancar %1$s</string>
|
||||
<string name="nc_bluetooth_permission_hint">Para ativar os alto-falantes bluetooth, conceda a permissão \"Dispositivos próximos\".</string>
|
||||
<string name="nc_call_button_content_description_answer_video_call">Atender como chamada de vídeo</string>
|
||||
<string name="nc_call_button_content_description_answer_voice_only">Atender apenas como chamada de voz</string>
|
||||
|
|
@ -316,8 +316,8 @@
|
|||
<string name="nc_location_current_position_description">Sua localização atual</string>
|
||||
<string name="nc_location_permission_required">permissão de localização é necessária</string>
|
||||
<string name="nc_location_unknown">Posição desconhecida</string>
|
||||
<string name="nc_locked">Bloqueado</string>
|
||||
<string name="nc_locked_tap_to_unlock">Toque para desbloquear</string>
|
||||
<string name="nc_locked">Trancado</string>
|
||||
<string name="nc_locked_tap_to_unlock">Toque para destrancar</string>
|
||||
<string name="nc_manual">Não definido</string>
|
||||
<string name="nc_mark_as_read">Marcar como lido</string>
|
||||
<string name="nc_mark_as_unread">Marcar como não lido</string>
|
||||
|
|
@ -484,9 +484,9 @@
|
|||
<string name="nc_settings_remove">Excluir</string>
|
||||
<string name="nc_settings_remove_account">Excluir conta</string>
|
||||
<string name="nc_settings_remove_confirmation">Confirme se quer realmente excluir a conta atual.</string>
|
||||
<string name="nc_settings_screen_lock_desc">Bloquear %1$s com o bloqueio de tela do Android ou um método biométrico suportado</string>
|
||||
<string name="nc_settings_screen_lock_desc">Trancar %1$s com o bloqueio de tela do Android ou um método biométrico suportado</string>
|
||||
<string name="nc_settings_screen_lock_timeout_title">Tempo limite para bloqueio de tela</string>
|
||||
<string name="nc_settings_screen_lock_title">Bloquear tela</string>
|
||||
<string name="nc_settings_screen_lock_title">Bloqueio de tela</string>
|
||||
<string name="nc_settings_screen_security_desc">Impede capturas de tela na lista recente e dentro do aplicativo</string>
|
||||
<string name="nc_settings_screen_security_title">Segurança da tela</string>
|
||||
<string name="nc_settings_server_almost_eol">A versão do servidor é muito antiga e não será suportada na próxima versão!</string>
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@ buildscript {
|
|||
classpath 'com.android.tools.build:gradle:8.13.0'
|
||||
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${kotlinVersion}"
|
||||
classpath "org.jetbrains.kotlin:kotlin-serialization:${kotlinVersion}"
|
||||
classpath 'com.github.spotbugs.snom:spotbugs-gradle-plugin:6.4.2'
|
||||
classpath 'com.github.spotbugs.snom:spotbugs-gradle-plugin:6.2.7'
|
||||
classpath "io.gitlab.arturbosch.detekt:detekt-gradle-plugin:1.23.8"
|
||||
classpath "org.jlleitschuh.gradle:ktlint-gradle:13.1.0"
|
||||
// NOTE: Do not place your application dependencies here; they belong
|
||||
|
|
|
|||
|
|
@ -15,8 +15,6 @@
|
|||
<trust file=".*-sources[.]jar" regex="true" reason="Android Studio downloads source jars but doesn't add checksums - fixes building in AS"/>
|
||||
</trusted-artifacts>
|
||||
<ignored-keys>
|
||||
<ignored-key id="07D3516820BCF6B1" reason="Key couldn't be downloaded from any key server"/>
|
||||
<ignored-key id="17A27CE7A60FF5F0" reason="Key couldn't be downloaded from any key server"/>
|
||||
<ignored-key id="A40E24B5B408DBD5" reason="Key couldn't be downloaded from any key server"/>
|
||||
</ignored-keys>
|
||||
<trusted-keys>
|
||||
|
|
@ -41,10 +39,8 @@
|
|||
<trusted-key id="0D5D634755737A19ABBE2930D4DA5EAB3CD7E958" group="com.google.devtools.ksp" name="symbol-processing-api" version="1.7.0-1.0.6"/>
|
||||
<trusted-key id="0F06FF86BEEAF4E71866EE5232EE5355A6BC6E42">
|
||||
<trusting group="androidx.activity"/>
|
||||
<trusting group="androidx.annotation" name="annotation-experimental" version="1.5.0"/>
|
||||
<trusting group="androidx.appcompat"/>
|
||||
<trusting group="androidx.camera"/>
|
||||
<trusting group="androidx.camera.featurecombinationquery" name="featurecombinationquery" version="1.5.0"/>
|
||||
<trusting group="androidx.collection"/>
|
||||
<trusting group="androidx.compose.runtime"/>
|
||||
<trusting group="androidx.constraintlayout"/>
|
||||
|
|
@ -52,7 +48,6 @@
|
|||
<trusting group="androidx.databinding"/>
|
||||
<trusting group="androidx.datastore"/>
|
||||
<trusting group="androidx.dynamicanimation" name="dynamicanimation" version="1.1.0"/>
|
||||
<trusting group="androidx.emoji2"/>
|
||||
<trusting group="androidx.exifinterface" name="exifinterface" version="1.4.0"/>
|
||||
<trusting group="androidx.exifinterface" name="exifinterface" version="1.4.1"/>
|
||||
<trusting group="androidx.lifecycle"/>
|
||||
|
|
@ -62,7 +57,6 @@
|
|||
<trusting group="androidx.test"/>
|
||||
<trusting group="androidx.work"/>
|
||||
<trusting group="com.google.android.gms"/>
|
||||
<trusting group="com.google.firebase"/>
|
||||
<trusting group="com.google.firebase" name="firebase-messaging" version="24.1.1"/>
|
||||
<trusting group="com.google.firebase" name="firebase-messaging" version="24.1.2"/>
|
||||
<trusting group="^androidx[.]compose($|([.].*))" regex="true"/>
|
||||
|
|
@ -620,11 +614,6 @@
|
|||
<sha256 value="2ac2f7106e12f263425b4a4dfc80989447fb895675fe902d86759aa74fd12b7d" origin="Generated by Gradle"/>
|
||||
</artifact>
|
||||
</component>
|
||||
<component group="androidx.annotation" name="annotation-experimental" version="1.5.0">
|
||||
<artifact name="annotation-experimental-1.5.0.aar">
|
||||
<sha256 value="02b0a4256618f85386c92e5cec166dc7f300820888a290227a3c0c65b82cbb36" origin="Generated by Gradle"/>
|
||||
</artifact>
|
||||
</component>
|
||||
<component group="androidx.annotation" name="annotation-jvm" version="1.8.1">
|
||||
<artifact name="annotation-jvm-1.8.1.module">
|
||||
<sha256 value="c959e3b0cdc75c15efe01605fa56aa79f033e39238e150638b8fabde6aa121a0" origin="Generated by Gradle"/>
|
||||
|
|
@ -1143,11 +1132,6 @@
|
|||
<sha256 value="025f1b052472cebddcf034516233b0829b12da5a3ca8aef0a12392729a6cc7d7" origin="Generated by Gradle" reason="Artifact is not signed"/>
|
||||
</artifact>
|
||||
</component>
|
||||
<component group="androidx.compose" name="compose-bom" version="2025.09.00">
|
||||
<artifact name="compose-bom-2025.09.00.pom">
|
||||
<sha256 value="499a4aa42578db44dd4e25ff35a4c2df9fd29f8003ca5ecddd1284412a347271" origin="Generated by Gradle" reason="Artifact is not signed"/>
|
||||
</artifact>
|
||||
</component>
|
||||
<component group="androidx.compose.animation" name="animation" version="1.7.7">
|
||||
<artifact name="animation-1.7.7.module">
|
||||
<sha256 value="3431b3d00a8e6e0d54aff825a0a66402d8e924c2b2e6a165669e4f41c7a63fc9" origin="Generated by Gradle"/>
|
||||
|
|
@ -2618,9 +2602,6 @@
|
|||
</artifact>
|
||||
</component>
|
||||
<component group="androidx.core" name="core" version="1.9.0">
|
||||
<artifact name="core-1.9.0.aar">
|
||||
<sha256 value="8bda3ee3a88887d54f6679fb6b6cd788629f73234ac91c8bbed924e721ec85b8" origin="Generated by Gradle" reason="Artifact is not signed"/>
|
||||
</artifact>
|
||||
<artifact name="core-1.9.0.module">
|
||||
<sha256 value="8674ade1d12962469dd2d1e6edc03b465f20d180b0840a129bc40b351e8651d1" origin="Generated by Gradle" reason="Artifact is not signed"/>
|
||||
</artifact>
|
||||
|
|
@ -3935,11 +3916,6 @@
|
|||
<sha256 value="7081d22a1417fa349d536c228ac393faf17cbec762ee90188408bacf6cdda90c" origin="Generated by Gradle"/>
|
||||
</artifact>
|
||||
</component>
|
||||
<component group="androidx.lifecycle" name="lifecycle-livedata" version="2.9.4">
|
||||
<artifact name="lifecycle-livedata-2.9.4.aar">
|
||||
<sha256 value="f240c2c94a96d4a5eae5d379c2a8589d426a33b989d83ae9f0e01f69502c0181" origin="Generated by Gradle"/>
|
||||
</artifact>
|
||||
</component>
|
||||
<component group="androidx.lifecycle" name="lifecycle-livedata-core" version="2.0.0">
|
||||
<artifact name="lifecycle-livedata-core-2.0.0.aar">
|
||||
<sha256 value="fde334ec7e22744c0f5bfe7caf1a84c9d717327044400577bdf9bd921ec4f7bc" origin="Generated by Gradle" reason="Artifact is not signed"/>
|
||||
|
|
@ -3948,11 +3924,6 @@
|
|||
<sha256 value="650fda1a232f5669742140571570ccad2f47a71225ab0f02179bc8d144b982c8" origin="Generated by Gradle" reason="Artifact is not signed"/>
|
||||
</artifact>
|
||||
</component>
|
||||
<component group="androidx.lifecycle" name="lifecycle-livedata-core" version="2.3.1">
|
||||
<artifact name="lifecycle-livedata-core-2.3.1.module">
|
||||
<sha256 value="b1e095d550d39a7d6c815761d6dbe3fd64eb31a39dc28146e78bbf2c01ba8f41" origin="Generated by Gradle" reason="Artifact is not signed"/>
|
||||
</artifact>
|
||||
</component>
|
||||
<component group="androidx.lifecycle" name="lifecycle-livedata-core" version="2.5.1">
|
||||
<artifact name="lifecycle-livedata-core-2.5.1.aar">
|
||||
<sha256 value="ee792103ca248bfaf150c45a93871e4cf7e8cebab990e0f62f7de5d4ff2f209f" origin="Generated by Gradle" reason="Artifact is not signed"/>
|
||||
|
|
@ -12795,14 +12766,6 @@
|
|||
<sha256 value="e20f1e6a4491eb6c4d86ba01638a6a88e7ead0687399d512db2f74fcfa20a4fa" origin="Generated by Gradle" reason="Artifact is not signed"/>
|
||||
</artifact>
|
||||
</component>
|
||||
<component group="com.github.ben-manes.caffeine" name="caffeine" version="2.9.3">
|
||||
<artifact name="caffeine-2.9.3.jar">
|
||||
<sha256 value="1e0a7bbef1dd791653143f3f05d0e489934bf5481e58a87c9e619cd46b68729b" origin="Generated by Gradle" reason="A key couldn't be downloaded"/>
|
||||
</artifact>
|
||||
<artifact name="caffeine-2.9.3.module">
|
||||
<sha256 value="27dfd34ad6656990d3c73176344b0991f2c82709fab30709b3ddea8fa3003070" origin="Generated by Gradle" reason="A key couldn't be downloaded"/>
|
||||
</artifact>
|
||||
</component>
|
||||
<component group="com.github.bitfireAT" name="dav4jvm" version="2.1.3">
|
||||
<artifact name="dav4jvm-2.1.3.jar">
|
||||
<sha256 value="7d0969dbd8efce7f4679e95153a9ee068c7c28666b7b1d3a75907682e7d9e757" origin="Generated by Gradle" reason="Artifact is not signed"/>
|
||||
|
|
@ -14815,14 +14778,6 @@
|
|||
<sha256 value="a6170ae3937d27040149944eecb241f04dafdd0177c9efe3c023af9a1c143a03" origin="Generated by Gradle" reason="Artifact is not signed"/>
|
||||
</artifact>
|
||||
</component>
|
||||
<component group="com.google.firebase" name="firebase-installations" version="18.0.0">
|
||||
<artifact name="firebase-installations-18.0.0.aar">
|
||||
<sha256 value="95063adfb17ffe492b12f68e73020873814d8177aa553069cad64e11d8c79292" origin="Generated by Gradle" reason="Artifact is not signed"/>
|
||||
</artifact>
|
||||
<artifact name="firebase-installations-18.0.0.pom">
|
||||
<sha256 value="13c64c03cc3c6c435b3d8521e3c85fcbcfeff22f3b7f0178a9ca626981ecda66" origin="Generated by Gradle" reason="Artifact is not signed"/>
|
||||
</artifact>
|
||||
</component>
|
||||
<component group="com.google.firebase" name="firebase-installations-interop" version="17.1.0">
|
||||
<artifact name="firebase-installations-interop-17.1.0.pom">
|
||||
<sha256 value="d136fc08269596e50858ada73ddd6a48095bbe8ad69a7718d62dd73899fb44ca" origin="Generated by Gradle" reason="Artifact is not signed"/>
|
||||
|
|
@ -17310,22 +17265,6 @@
|
|||
<sha256 value="b7087907920fc8a81534686b2f1a2b331127af97f015abbdb3786a51f3fa1e52" origin="Generated by Gradle" reason="A key couldn't be downloaded"/>
|
||||
</artifact>
|
||||
</component>
|
||||
<component group="io.opentelemetry" name="opentelemetry-api" version="1.41.0">
|
||||
<artifact name="opentelemetry-api-1.41.0.jar">
|
||||
<sha256 value="9336668f388de68a0a2c3e114154febd29db19a7644f27c4eba548f5de852258" origin="Generated by Gradle" reason="A key couldn't be downloaded"/>
|
||||
</artifact>
|
||||
<artifact name="opentelemetry-api-1.41.0.module">
|
||||
<sha256 value="261468589c993b88f7ccad9338ffd8166b9df4cc34de308066932b2a5c9de956" origin="Generated by Gradle" reason="A key couldn't be downloaded"/>
|
||||
</artifact>
|
||||
</component>
|
||||
<component group="io.opentelemetry" name="opentelemetry-context" version="1.41.0">
|
||||
<artifact name="opentelemetry-context-1.41.0.jar">
|
||||
<sha256 value="5e3432a4464a432abfdab73be7142e516d25a84aa8426fce1192ffb0532faa35" origin="Generated by Gradle" reason="A key couldn't be downloaded"/>
|
||||
</artifact>
|
||||
<artifact name="opentelemetry-context-1.41.0.module">
|
||||
<sha256 value="174dcda3e840226138adb8ce9043576ddc43c286b612d3dbf64531f67bd8d987" origin="Generated by Gradle" reason="A key couldn't be downloaded"/>
|
||||
</artifact>
|
||||
</component>
|
||||
<component group="io.perfmark" name="perfmark-api" version="0.23.0">
|
||||
<artifact name="perfmark-api-0.23.0.module">
|
||||
<sha256 value="84a12f34817d1f2f79df810bcbaacb29900678384d3dd0502df0bd963a4f3fdb" origin="Generated by Gradle"/>
|
||||
|
|
@ -20218,11 +20157,6 @@
|
|||
<sha256 value="a5b98fdcd9db017d542e197225dcee18d658a56de1db2cc41e13196d6b1769a4" origin="Generated by Gradle"/>
|
||||
</artifact>
|
||||
</component>
|
||||
<component group="org.jetbrains.kotlin" name="kotlin-stdlib" version="2.2.20">
|
||||
<artifact name="kotlin-stdlib-2.2.20.module">
|
||||
<sha256 value="c918f5214d021a72e3767f2756e97d103a526e04f1423da3663efdfb5847db95" origin="Generated by Gradle"/>
|
||||
</artifact>
|
||||
</component>
|
||||
<component group="org.jetbrains.kotlin" name="kotlin-stdlib-common" version="1.6.21">
|
||||
<artifact name="kotlin-stdlib-common-1.6.21.pom">
|
||||
<sha256 value="5bc156ee73fd3c2dac8a5ec548d581b633333547c2febed9cf6547fff1526ba2" origin="Generated by Gradle"/>
|
||||
|
|
@ -20401,11 +20335,6 @@
|
|||
<sha256 value="dcf3de1ba53393a449c789f1e515f9aa88c603a6d356a480ea42ff7d4a98b737" origin="Generated by Gradle"/>
|
||||
</artifact>
|
||||
</component>
|
||||
<component group="org.jetbrains.kotlin" name="kotlin-stdlib-jdk7" version="2.2.0">
|
||||
<artifact name="kotlin-stdlib-jdk7-2.2.0.pom">
|
||||
<sha256 value="95c2189c35ef7bfc48951c32ad70847b21f3809d26f5d0a76e23570879988c30" origin="Generated by Gradle"/>
|
||||
</artifact>
|
||||
</component>
|
||||
<component group="org.jetbrains.kotlin" name="kotlin-stdlib-jdk8" version="1.6.10">
|
||||
<artifact name="kotlin-stdlib-jdk8-1.6.10.pom">
|
||||
<sha256 value="43a649fa737bfb35fa4af4e6de33e2f08a5d19104d7582ea40dbcd2b63790acc" origin="Generated by Gradle"/>
|
||||
|
|
@ -20496,11 +20425,6 @@
|
|||
<sha256 value="e550c5208d37f00b5338c79f722bef930691da0584f2d3e07d83d33a4da406e9" origin="Generated by Gradle"/>
|
||||
</artifact>
|
||||
</component>
|
||||
<component group="org.jetbrains.kotlin" name="kotlin-stdlib-jdk8" version="2.2.0">
|
||||
<artifact name="kotlin-stdlib-jdk8-2.2.0.pom">
|
||||
<sha256 value="234d06fdbdc29dcbc07447e28c4a26abab9599d5c3daa3d92a34e6aedea236a6" origin="Generated by Gradle"/>
|
||||
</artifact>
|
||||
</component>
|
||||
<component group="org.jetbrains.kotlin" name="kotlin-tooling-core" version="2.1.0">
|
||||
<artifact name="kotlin-tooling-core-2.1.0.jar">
|
||||
<sha256 value="4176c612098cb92df38a485ff8b10aaa24abb400f610d48f5088aeb07c8002c8" origin="Generated by Gradle"/>
|
||||
|
|
@ -20711,11 +20635,6 @@
|
|||
<sha256 value="237a896398684a01b6fc5e79d17a7a80f3b3cfcfd521cc0c08c22c6cc50fd0b5" origin="Generated by Gradle" reason="Artifact is not signed"/>
|
||||
</artifact>
|
||||
</component>
|
||||
<component group="org.jetbrains.kotlin.plugin.compose" name="org.jetbrains.kotlin.plugin.compose.gradle.plugin" version="2.2.20">
|
||||
<artifact name="org.jetbrains.kotlin.plugin.compose.gradle.plugin-2.2.20.pom">
|
||||
<sha256 value="2ab88999ff3bbcdec0f214e55bdf0358e00bb30adb91c87d808ce6fa9f0c0755" origin="Generated by Gradle" reason="Artifact is not signed"/>
|
||||
</artifact>
|
||||
</component>
|
||||
<component group="org.jetbrains.kotlinx" name="atomicfu" version="0.17.0">
|
||||
<artifact name="atomicfu-0.17.0.module">
|
||||
<sha256 value="12e828b1269614b2e50adfaf0d834c98ba5bba782b93fd157ce1e0a35e60cc0b" origin="Generated by Gradle"/>
|
||||
|
|
@ -21841,11 +21760,6 @@
|
|||
<sha256 value="7229b03b30a73ee91008072d9e4569a51d8547fae8c50f527841aef4c1b0baa8" origin="Generated by Gradle"/>
|
||||
</artifact>
|
||||
</component>
|
||||
<component group="org.ow2.asm" name="asm" version="9.8">
|
||||
<artifact name="asm-9.8.pom">
|
||||
<sha256 value="c1367c3bb383d7619e7f797e38df7513885f2eef04ae7b5908f68222657b5baa" origin="Generated by Gradle"/>
|
||||
</artifact>
|
||||
</component>
|
||||
<component group="org.ow2.asm" name="asm-analysis" version="9.2">
|
||||
<artifact name="asm-analysis-9.2.pom">
|
||||
<sha256 value="773cc1a2bfc14c6c4a979c51a075c0234a0bf694fc3abe4facf454f37a145f1b" origin="Generated by Gradle"/>
|
||||
|
|
@ -21872,11 +21786,6 @@
|
|||
<sha256 value="25c2379f2bfc2a1e64e62c39e2b93cfb0e489707852b08d6fc470b1c6a52b9ee" origin="Generated by Gradle"/>
|
||||
</artifact>
|
||||
</component>
|
||||
<component group="org.ow2.asm" name="asm-analysis" version="9.8">
|
||||
<artifact name="asm-analysis-9.8.pom">
|
||||
<sha256 value="c5747e25c72e1b07d5263c75c78ad61a626dd2458fafcafc23f81d3253ee42ed" origin="Generated by Gradle"/>
|
||||
</artifact>
|
||||
</component>
|
||||
<component group="org.ow2.asm" name="asm-commons" version="9.6">
|
||||
<artifact name="asm-commons-9.6.pom">
|
||||
<sha256 value="a98ae4895334baf8ff86bd66516210dbd9a03f1a6e15e47dda82afcf6b53d77c" origin="Generated by Gradle"/>
|
||||
|
|
@ -21898,11 +21807,6 @@
|
|||
<sha256 value="0bf1d31da0c9f9d8edc2f27dbbfdbbf73f1a715b72cd2fa28f3f195994d74ad1" origin="Generated by Gradle"/>
|
||||
</artifact>
|
||||
</component>
|
||||
<component group="org.ow2.asm" name="asm-commons" version="9.8">
|
||||
<artifact name="asm-commons-9.8.pom">
|
||||
<sha256 value="f793e78f01f703717d09472e56cdf212fe298970c882e2116e8e549fb6d140c2" origin="Generated by Gradle"/>
|
||||
</artifact>
|
||||
</component>
|
||||
<component group="org.ow2.asm" name="asm-tree" version="9.2">
|
||||
<artifact name="asm-tree-9.2.pom">
|
||||
<sha256 value="f61f3ebea5520ddf19f452b03c426c7231bdd8a81d7ac28765cb5271225ac378" origin="Generated by Gradle"/>
|
||||
|
|
@ -21929,11 +21833,6 @@
|
|||
<sha256 value="13b905f65e7fd43ca7674f40cdaa37679ba4858c6c9d9fb8f17a7afd9baabc9e" origin="Generated by Gradle"/>
|
||||
</artifact>
|
||||
</component>
|
||||
<component group="org.ow2.asm" name="asm-tree" version="9.8">
|
||||
<artifact name="asm-tree-9.8.pom">
|
||||
<sha256 value="7149e7faa0e191296f879aeed9209c8942d398f0698d2cca1a9c628f2e2a8f77" origin="Generated by Gradle"/>
|
||||
</artifact>
|
||||
</component>
|
||||
<component group="org.ow2.asm" name="asm-util" version="9.6">
|
||||
<artifact name="asm-util-9.6.pom">
|
||||
<sha256 value="52c5c1d357404779d1a99b49a85bf9d3a085025b8516cb73dbef77c8ae34005e" origin="Generated by Gradle"/>
|
||||
|
|
@ -21955,11 +21854,6 @@
|
|||
<sha256 value="7fb5e63362b2d52d77dca3b754aebad635751d3fc520191e9500ece9e2345b71" origin="Generated by Gradle"/>
|
||||
</artifact>
|
||||
</component>
|
||||
<component group="org.ow2.asm" name="asm-util" version="9.8">
|
||||
<artifact name="asm-util-9.8.pom">
|
||||
<sha256 value="24d0970e171e2917b83a8f0f05d50a1cdb5c82e508555b52dbcc9d3361c4f0ec" origin="Generated by Gradle"/>
|
||||
</artifact>
|
||||
</component>
|
||||
<component group="org.parceler" name="parceler-api" version="1.1.13">
|
||||
<artifact name="parceler-api-1.1.13.jar">
|
||||
<sha256 value="31af89b4af6e853be4fd3f38a86dcf351e465660486a77c2fb10685ced34b38b" origin="Generated by Gradle"/>
|
||||
|
|
|
|||
2
gradle/wrapper/gradle-wrapper.properties
vendored
2
gradle/wrapper/gradle-wrapper.properties
vendored
|
|
@ -1,6 +1,6 @@
|
|||
distributionBase=GRADLE_USER_HOME
|
||||
distributionPath=wrapper/dists
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-bin.zip
|
||||
networkTimeout=10000
|
||||
validateDistributionUrl=true
|
||||
zipStoreBase=GRADLE_USER_HOME
|
||||
|
|
|
|||
3
gradlew
vendored
3
gradlew
vendored
|
|
@ -114,6 +114,7 @@ case "$( uname )" in #(
|
|||
NONSTOP* ) nonstop=true ;;
|
||||
esac
|
||||
|
||||
CLASSPATH="\\\"\\\""
|
||||
|
||||
|
||||
# Determine the Java command to use to start the JVM.
|
||||
|
|
@ -171,6 +172,7 @@ fi
|
|||
# For Cygwin or MSYS, switch paths to Windows format before running java
|
||||
if "$cygwin" || "$msys" ; then
|
||||
APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
|
||||
CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
|
||||
|
||||
JAVACMD=$( cygpath --unix "$JAVACMD" )
|
||||
|
||||
|
|
@ -210,6 +212,7 @@ DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
|
|||
|
||||
set -- \
|
||||
"-Dorg.gradle.appname=$APP_BASE_NAME" \
|
||||
-classpath "$CLASSPATH" \
|
||||
-jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
|
||||
"$@"
|
||||
|
||||
|
|
|
|||
3
gradlew.bat
vendored
3
gradlew.bat
vendored
|
|
@ -70,10 +70,11 @@ goto fail
|
|||
:execute
|
||||
@rem Setup the command line
|
||||
|
||||
set CLASSPATH=
|
||||
|
||||
|
||||
@rem Execute Gradle
|
||||
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
|
||||
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
|
||||
|
||||
:end
|
||||
@rem End local scope for the variables with windows NT shell
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue