Compare commits

..
3 changed files with 12 additions and 4 deletions
+1 -1
View File
@@ -121,5 +121,5 @@ dependencies {
implementation 'androidx.security:security-crypto:1.1.0'
implementation 'androidx.lifecycle:lifecycle-viewmodel-compose:2.11.0'
implementation "androidx.datastore:datastore-preferences:1.2.1"
implementation "com.google.crypto.tink:tink-android:1.22.0"
implementation "com.google.crypto.tink:tink-android:1.23.0"
}
@@ -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,7 +165,15 @@ class NewProjectActivity : AppCompatActivity() {
null, false, DBProject.ACCESS_LEVEL_UNKNOWN,
""
)
createProject()
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 {