Compare commits

..
3 changed files with 12 additions and 4 deletions
+1 -1
View File
@@ -107,7 +107,7 @@ dependencies {
implementation 'androidx.camera:camera-camera2:1.6.1'
implementation 'androidx.camera:camera-lifecycle:1.6.1'
implementation 'androidx.camera:camera-view:1.6.1'
implementation 'com.github.nextcloud:Android-SingleSignOn:1.1.0'
implementation 'com.github.nextcloud:Android-SingleSignOn:1.3.4'
implementation 'com.opencsv:opencsv:5.12.0'
implementation platform('androidx.compose:compose-bom:2026.06.01')
@@ -241,7 +241,7 @@ class EditBillViewModel : ViewModel() {
}
fun isFormValid(): Boolean {
return what.isNotEmpty() &&
return what.isNotEmpty() && !what.contains(",") &&
timestamp != 0L &&
payerId != 0L &&
owersSelection.any { it.value }
@@ -255,7 +255,7 @@ class EditBillViewModel : ViewModel() {
errorInvalidForm: String
): String? {
return when {
what.isEmpty() -> errorWhat
what.isEmpty() || what.contains(",") -> errorWhat
timestamp == 0L -> errorDate
payerId == 0L -> errorPayer
owersSelection.none { it.value } -> errorOwers
@@ -165,8 +165,16 @@ class NewProjectActivity : AppCompatActivity() {
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()
}
}
private fun getFormattedUrl(): String {
var url = viewModel.projectUrl.trim()