Skip to content

Commit 146d373

Browse files
authored
Merge pull request #730 from Aga-C/prevent-adding-empty-contact
Prevented adding empty contact (#728)
2 parents fa50b99 + 7e7736a commit 146d373

File tree

33 files changed

+63
-6
lines changed

33 files changed

+63
-6
lines changed

app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/EditContactActivity.kt

Lines changed: 31 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -907,6 +907,31 @@ class EditContactActivity : ContactActivity() {
907907
return
908908
}
909909

910+
val filledPhoneNumbers = getFilledPhoneNumbers()
911+
val filledEmails = getFilledEmails()
912+
val filledAddresses = getFilledAddresses()
913+
val filledIMs = getFilledIMs()
914+
val filledEvents = getFilledEvents()
915+
val filledWebsites = getFilledWebsites()
916+
917+
val contactFields = arrayListOf(
918+
contact_prefix, contact_first_name, contact_middle_name, contact_surname, contact_suffix, contact_nickname,
919+
contact_notes, contact_organization_company, contact_organization_job_position
920+
)
921+
922+
if (contactFields.all { it.value.isEmpty() } &&
923+
currentContactPhotoPath.isEmpty() &&
924+
filledPhoneNumbers.isEmpty() &&
925+
filledEmails.isEmpty() &&
926+
filledAddresses.isEmpty() &&
927+
filledIMs.isEmpty() &&
928+
filledEvents.isEmpty() &&
929+
filledWebsites.isEmpty()
930+
) {
931+
toast(R.string.fields_empty)
932+
return
933+
}
934+
910935
contact?.apply {
911936
val oldPhotoUri = photoUri
912937

@@ -917,14 +942,14 @@ class EditContactActivity : ContactActivity() {
917942
suffix = contact_suffix.value
918943
nickname = contact_nickname.value
919944
photoUri = currentContactPhotoPath
920-
phoneNumbers = getFilledPhoneNumbers()
921-
emails = getFilledEmails()
922-
addresses = getFilledAddresses()
923-
IMs = getFilledIMs()
924-
events = getFilledEvents()
945+
phoneNumbers = filledPhoneNumbers
946+
emails = filledEmails
947+
addresses = filledAddresses
948+
IMs = filledIMs
949+
events = filledEvents
925950
starred = if (isContactStarred()) 1 else 0
926951
notes = contact_notes.value
927-
websites = getFilledWebsites()
952+
websites = filledWebsites
928953

929954
val company = contact_organization_company.value
930955
val jobPosition = contact_organization_job_position.value

app/src/main/res/values-ar/strings.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
<string name="send_email_to_group">ارسال بريد الكتروني الى مجموعة</string>
1515
<string name="create_new_contact">إنشاء جهة إتصال</string>
1616
<string name="add_to_existing_contact">إضافة إلى جهة موجودة</string>
17+
<string name="fields_empty">At least 1 field has to be filled out</string>
1718

1819
<!-- Placeholders -->
1920
<string name="no_contacts_with_emails">لا توجد جهات اتصال بهذا البريد الالكتروني</string>

app/src/main/res/values-az/strings.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
<string name="send_email_to_group">Grupa e-poçt göndər</string>
1515
<string name="create_new_contact">Create new contact</string>
1616
<string name="add_to_existing_contact">Add to an existing contact</string>
17+
<string name="fields_empty">At least 1 field has to be filled out</string>
1718

1819
<!-- Placeholders -->
1920
<string name="no_contacts_with_emails">No contacts with emails have been found</string>

app/src/main/res/values-cs/strings.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
<string name="send_email_to_group">Poslat skupině e-mail</string>
1515
<string name="create_new_contact">Vytvořit nový kontakt</string>
1616
<string name="add_to_existing_contact">Přidat k existujícímu kontaktu</string>
17+
<string name="fields_empty">At least 1 field has to be filled out</string>
1718

1819
<!-- Placeholders -->
1920
<string name="no_contacts_with_emails">Nenalezeny žádné kontakty s e-maily</string>

app/src/main/res/values-cy/strings.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
<string name="send_email_to_group">Anfon ebost at grŵp</string>
1515
<string name="create_new_contact">Creu cyswllt newydd</string>
1616
<string name="add_to_existing_contact">Ychwanegu at gyswllt sy\'n bodoli</string>
17+
<string name="fields_empty">At least 1 field has to be filled out</string>
1718

1819
<!-- Placeholders -->
1920
<string name="no_contacts_with_emails">Ni chanfuwyd unrhyw gysylltiadau gydag ebost</string>

app/src/main/res/values-da/strings.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
<string name="send_email_to_group">Send e-mail til gruppe</string>
1616
<string name="create_new_contact">Opret ny kontakt</string>
1717
<string name="add_to_existing_contact">Tilføj til en eksisterende kontakt</string>
18+
<string name="fields_empty">At least 1 field has to be filled out</string>
1819
<!-- Placeholders -->
1920
<string name="no_contacts_with_emails">Ingen kontakter med e-mails fundet</string>
2021
<string name="no_contacts_with_phone_numbers">Ingen kontakter med telefonnumre fundet</string>

app/src/main/res/values-de/strings.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
<string name="send_email_to_group">E-Mail an Gruppe senden</string>
1616
<string name="create_new_contact">Neuen Kontakt erstellen</string>
1717
<string name="add_to_existing_contact">Zu einem existierenden Kontakt hinzufügen</string>
18+
<string name="fields_empty">At least 1 field has to be filled out</string>
1819
<!-- Placeholders -->
1920
<string name="no_contacts_with_emails">Keine Kontakte mit E-Mailadressen gefunden</string>
2021
<string name="no_contacts_with_phone_numbers">Keine Kontakte mit Telefonnummern gefunden</string>

app/src/main/res/values-el/strings.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
<string name="send_email_to_group">Αποστολή email σε ομάδες</string>
1515
<string name="create_new_contact">Δημιουργία νέας Επαφής</string>
1616
<string name="add_to_existing_contact">Προσθήκη σε μια υπάρχουσα Επαφή</string>
17+
<string name="fields_empty">At least 1 field has to be filled out</string>
1718

1819
<!-- Placeholders -->
1920
<string name="no_contacts_with_emails">Δεν βρέθηκαν Επαφές με emails</string>

app/src/main/res/values-es/strings.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
<string name="send_email_to_group">Enviar correo electrónico a grupo</string>
1515
<string name="create_new_contact">Crear nuevo contacto</string>
1616
<string name="add_to_existing_contact">Añadir a un contacto existente</string>
17+
<string name="fields_empty">At least 1 field has to be filled out</string>
1718

1819
<!-- Placeholders -->
1920
<string name="no_contacts_with_emails">No se encontraron contactos con correo electrónico</string>

app/src/main/res/values-eu/strings.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
<string name="send_email_to_group">Bidali emaila taldeari</string>
1515
<string name="create_new_contact">Create new contact</string>
1616
<string name="add_to_existing_contact">Add to an existing contact</string>
17+
<string name="fields_empty">At least 1 field has to be filled out</string>
1718

1819
<!-- Placeholders -->
1920
<string name="no_contacts_with_emails">No contacts with emails have been found</string>

0 commit comments

Comments
 (0)