Compare commits

..
Author SHA1 Message Date
soraefir 726c4a73dc Fix project creation nextcloud 2026-08-03 19:51:26 +02:00
soraefir 191f221faa Allow comma in title 2026-08-03 19:51:26 +02:00
3 changed files with 4 additions and 12 deletions
+1 -1
View File
@@ -107,7 +107,7 @@ dependencies {
implementation 'androidx.camera:camera-camera2:1.6.1' implementation 'androidx.camera:camera-camera2:1.6.1'
implementation 'androidx.camera:camera-lifecycle:1.6.1' implementation 'androidx.camera:camera-lifecycle:1.6.1'
implementation 'androidx.camera:camera-view:1.6.1' implementation 'androidx.camera:camera-view:1.6.1'
implementation 'com.github.nextcloud:Android-SingleSignOn:1.3.4' implementation 'com.github.nextcloud:Android-SingleSignOn:1.1.0'
implementation 'com.opencsv:opencsv:5.12.0' implementation 'com.opencsv:opencsv:5.12.0'
implementation platform('androidx.compose:compose-bom:2026.06.01') implementation platform('androidx.compose:compose-bom:2026.06.01')
@@ -241,7 +241,7 @@ class EditBillViewModel : ViewModel() {
} }
fun isFormValid(): Boolean { fun isFormValid(): Boolean {
return what.isNotEmpty() && !what.contains(",") && return what.isNotEmpty() &&
timestamp != 0L && timestamp != 0L &&
payerId != 0L && payerId != 0L &&
owersSelection.any { it.value } owersSelection.any { it.value }
@@ -255,7 +255,7 @@ class EditBillViewModel : ViewModel() {
errorInvalidForm: String errorInvalidForm: String
): String? { ): String? {
return when { return when {
what.isEmpty() || what.contains(",") -> errorWhat what.isEmpty() -> errorWhat
timestamp == 0L -> errorDate timestamp == 0L -> errorDate
payerId == 0L -> errorPayer payerId == 0L -> errorPayer
owersSelection.none { it.value } -> errorOwers owersSelection.none { it.value } -> errorOwers
@@ -165,16 +165,8 @@ class NewProjectActivity : AppCompatActivity() {
null, false, DBProject.ACCESS_LEVEL_UNKNOWN, null, false, DBProject.ACCESS_LEVEL_UNKNOWN,
"" ""
) )
if (isValidUrl(url) && todoCreate && ProjectType.COSPEND == type &&
db.cowspentServerSyncHelper.canCreateAuthenticatedProject(fakeProj) &&
!viewModel.showAuthWarningDialog // Avoid infinite loop
) {
viewModel.showAuthWarningDialog = true
} else {
createProject() createProject()
} }
}
private fun getFormattedUrl(): String { private fun getFormattedUrl(): String {
var url = viewModel.projectUrl.trim() var url = viewModel.projectUrl.trim()