From bbadfa1f2e0f57e7b26169b36e28af47f38d499c Mon Sep 17 00:00:00 2001 From: Agnieszka C <85929121+Aga-C@users.noreply.github.com> Date: Sun, 24 Oct 2021 12:30:54 +0200 Subject: [PATCH] Prevented adding empty contact (#728) --- .../pro/activities/EditContactActivity.kt | 16 ++++++++++++++++ app/src/main/res/values-ar/strings.xml | 1 + app/src/main/res/values-az/strings.xml | 1 + app/src/main/res/values-cs/strings.xml | 1 + app/src/main/res/values-cy/strings.xml | 1 + app/src/main/res/values-da/strings.xml | 1 + app/src/main/res/values-de/strings.xml | 1 + app/src/main/res/values-el/strings.xml | 1 + app/src/main/res/values-es/strings.xml | 1 + app/src/main/res/values-eu/strings.xml | 1 + app/src/main/res/values-fi/strings.xml | 1 + app/src/main/res/values-fr/strings.xml | 1 + app/src/main/res/values-hi-rIN/strings.xml | 1 + app/src/main/res/values-hr/strings.xml | 1 + app/src/main/res/values-hu/strings.xml | 1 + app/src/main/res/values-id/strings.xml | 1 + app/src/main/res/values-in/strings.xml | 1 + app/src/main/res/values-it/strings.xml | 1 + app/src/main/res/values-ja/strings.xml | 1 + app/src/main/res/values-ko-rKR/strings.xml | 1 + app/src/main/res/values-lt/strings.xml | 1 + app/src/main/res/values-ml/strings.xml | 1 + app/src/main/res/values-nl/strings.xml | 1 + app/src/main/res/values-pl/strings.xml | 1 + app/src/main/res/values-pt-rBR/strings.xml | 1 + app/src/main/res/values-pt/strings.xml | 1 + app/src/main/res/values-ru/strings.xml | 1 + app/src/main/res/values-sk/strings.xml | 1 + app/src/main/res/values-sv/strings.xml | 1 + app/src/main/res/values-tr/strings.xml | 1 + app/src/main/res/values-uk/strings.xml | 1 + app/src/main/res/values-zh-rCN/strings.xml | 1 + app/src/main/res/values-zh-rTW/strings.xml | 1 + app/src/main/res/values/strings.xml | 1 + 34 files changed, 49 insertions(+) diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/EditContactActivity.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/EditContactActivity.kt index 4eea015f..f999f5de 100644 --- a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/EditContactActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/EditContactActivity.kt @@ -25,6 +25,7 @@ import com.simplemobiletools.commons.dialogs.SelectAlarmSoundDialog import com.simplemobiletools.commons.extensions.* import com.simplemobiletools.commons.helpers.* import com.simplemobiletools.commons.models.RadioItem +import com.simplemobiletools.commons.views.MyEditText import com.simplemobiletools.contacts.pro.R import com.simplemobiletools.contacts.pro.dialogs.CustomLabelDialog import com.simplemobiletools.contacts.pro.dialogs.MyDatePickerDialog @@ -63,6 +64,10 @@ class EditContactActivity : ContactActivity() { private var emailViewToColor: EditText? = null private var originalContactSource = "" + private lateinit var contactFields: ArrayList + private val multipleFields = arrayListOf(::getFilledPhoneNumbers, ::getFilledEmails, ::getFilledAddresses, ::getFilledIMs, + ::getFilledEvents, ::getFilledWebsites) + override fun onCreate(savedInstanceState: Bundle?) { showTransparentTop = true super.onCreate(savedInstanceState) @@ -99,6 +104,12 @@ class EditContactActivity : ContactActivity() { } } + override fun onResume() { + super.onResume() + contactFields = arrayListOf(contact_prefix, contact_first_name, contact_middle_name, contact_suffix, contact_nickname, + contact_notes, contact_organization_company, contact_organization_job_position) + } + override fun onActivityResult(requestCode: Int, resultCode: Int, resultData: Intent?) { super.onActivityResult(requestCode, resultCode, resultData) if (resultCode == RESULT_OK) { @@ -901,6 +912,11 @@ class EditContactActivity : ContactActivity() { return } + if (contactFields.all { it.value.isEmpty() } && multipleFields.all { it().isEmpty() } && currentContactPhotoPath.isEmpty()) { + toast(R.string.fields_empty) + return + } + contact?.apply { val oldPhotoUri = photoUri diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index 69885a20..23498325 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -14,6 +14,7 @@ ارسال بريد الكتروني الى مجموعة إنشاء جهة إتصال إضافة إلى جهة موجودة + At least one field should be filled out لا توجد جهات اتصال بهذا البريد الالكتروني diff --git a/app/src/main/res/values-az/strings.xml b/app/src/main/res/values-az/strings.xml index 01aa0847..fa33a8fc 100644 --- a/app/src/main/res/values-az/strings.xml +++ b/app/src/main/res/values-az/strings.xml @@ -14,6 +14,7 @@ Grupa e-poçt göndər Create new contact Add to an existing contact + At least one field should be filled out No contacts with emails have been found diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index 1f0239a5..3fdddf16 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -14,6 +14,7 @@ Poslat skupině e-mail Vytvořit nový kontakt Přidat k existujícímu kontaktu + At least one field should be filled out Nenalezeny žádné kontakty s e-maily diff --git a/app/src/main/res/values-cy/strings.xml b/app/src/main/res/values-cy/strings.xml index 51be0175..df732282 100644 --- a/app/src/main/res/values-cy/strings.xml +++ b/app/src/main/res/values-cy/strings.xml @@ -14,6 +14,7 @@ Anfon ebost at grŵp Creu cyswllt newydd Ychwanegu at gyswllt sy\'n bodoli + At least one field should be filled out Ni chanfuwyd unrhyw gysylltiadau gydag ebost diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml index 46dffe95..6300e77b 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -14,6 +14,7 @@ Send email til gruppe Opret ny kontakt Tilføj til en eksisterende kontakt + At least one field should be filled out Ingen kontakter med emails fundet diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 6578677e..d35ef4b2 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -14,6 +14,7 @@ E-Mail an Gruppe senden Neuen Kontakt erstellen Zu einem existierenden Kontakt hinzufügen + At least one field should be filled out Keine Kontakte mit E-Mailadressen gefunden diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index 3f6c40ec..45580cfd 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -14,6 +14,7 @@ Αποστολή email σε ομάδες Δημιουργία νέας Επαφής Προσθήκη σε μια υπάρχουσα Επαφή + At least one field should be filled out Δεν βρέθηκαν Επαφές με emails diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 572e8379..c5570301 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -14,6 +14,7 @@ Enviar correo electrónico a grupo Crear nuevo contacto Añadir a un contacto existente + At least one field should be filled out No se encontraron contactos con correo electrónico diff --git a/app/src/main/res/values-eu/strings.xml b/app/src/main/res/values-eu/strings.xml index 0ee3ec8e..97a7def2 100644 --- a/app/src/main/res/values-eu/strings.xml +++ b/app/src/main/res/values-eu/strings.xml @@ -14,6 +14,7 @@ Bidali emaila taldeari Create new contact Add to an existing contact + At least one field should be filled out No contacts with emails have been found diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml index 22587a04..f79d45cf 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -14,6 +14,7 @@ Lähetä sähköposti ryhmälle Luo uusi yhteystieto Lisää olemassa olevaan yhteystietoon + At least one field should be filled out Sähköpostillisia yhteystietoja ei löytynyt diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 1a62d607..64b5e49c 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -14,6 +14,7 @@ Envoyer un courriel au groupe Créer un nouveau contact Ajouter à un contact existant + At least one field should be filled out Aucun contact avec des adresses courriel n\’a été trouvé diff --git a/app/src/main/res/values-hi-rIN/strings.xml b/app/src/main/res/values-hi-rIN/strings.xml index f120ff97..2a128f63 100644 --- a/app/src/main/res/values-hi-rIN/strings.xml +++ b/app/src/main/res/values-hi-rIN/strings.xml @@ -14,6 +14,7 @@ Send email to group Create new contact Add to an existing contact + At least one field should be filled out No contacts with emails have been found diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml index bb780071..364795d4 100644 --- a/app/src/main/res/values-hr/strings.xml +++ b/app/src/main/res/values-hr/strings.xml @@ -14,6 +14,7 @@ Pošalji e-poštu grupi Stvori novi kontakt Dodaj postojećem kontaktu + At least one field should be filled out Nije pronađen nijedan kontakt s e-poštom diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index 3a05f867..9feabe27 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -14,6 +14,7 @@ Email küldése csoportnak Új névjegy hozzáadása Hozzáadás meglévő névjegyhez + At least one field should be filled out Nincs emailt tartalmazó névjegy. diff --git a/app/src/main/res/values-id/strings.xml b/app/src/main/res/values-id/strings.xml index 4a41e73a..388e5a91 100644 --- a/app/src/main/res/values-id/strings.xml +++ b/app/src/main/res/values-id/strings.xml @@ -14,6 +14,7 @@ Kirim surel ke grup Buat kontak baru Tambah ke kontak yang ada + At least one field should be filled out Tidak ada kontak dengan alamat surel yang ditemukan diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml index 4a41e73a..388e5a91 100644 --- a/app/src/main/res/values-in/strings.xml +++ b/app/src/main/res/values-in/strings.xml @@ -14,6 +14,7 @@ Kirim surel ke grup Buat kontak baru Tambah ke kontak yang ada + At least one field should be filled out Tidak ada kontak dengan alamat surel yang ditemukan diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index b6a620bb..2cb45682 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -14,6 +14,7 @@ Invia un\'email al gruppo Crea un nuovo contatto Aggiungi a un contatto esistente + At least one field should be filled out Nessun contatto trovato con un\'email diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index 76650463..540998c6 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -14,6 +14,7 @@ グループにメールを送信 新しい連絡先を作成 既存の連絡先に追加 + At least one field should be filled out メールアドレスが登録された連絡先が見つかりません diff --git a/app/src/main/res/values-ko-rKR/strings.xml b/app/src/main/res/values-ko-rKR/strings.xml index 8892102a..642c75ad 100644 --- a/app/src/main/res/values-ko-rKR/strings.xml +++ b/app/src/main/res/values-ko-rKR/strings.xml @@ -14,6 +14,7 @@ Send email to group Create new contact Add to an existing contact + At least one field should be filled out No contacts with emails have been found diff --git a/app/src/main/res/values-lt/strings.xml b/app/src/main/res/values-lt/strings.xml index 26e1bed6..a0cfb72f 100644 --- a/app/src/main/res/values-lt/strings.xml +++ b/app/src/main/res/values-lt/strings.xml @@ -14,6 +14,7 @@ Send email to group Create new contact Add to an existing contact + At least one field should be filled out No contacts with emails have been found diff --git a/app/src/main/res/values-ml/strings.xml b/app/src/main/res/values-ml/strings.xml index e27e5451..b17fa6b0 100644 --- a/app/src/main/res/values-ml/strings.xml +++ b/app/src/main/res/values-ml/strings.xml @@ -14,6 +14,7 @@ ഗ്രൂപ്പിലേക്ക് ഇമെയിൽ അയയ്ക്കുക പുതിയ കോൺ‌ടാക്റ്റ് സൃഷ്‌ടിക്കുക നിലവിലുള്ള കോൺ‌ടാക്റ്റിലേക്ക് ചേർക്കുക + At least one field should be filled out ഇമെയിലുകളില്ലാത്ത കോൺടാക്റ്റുകൾ കണ്ടെത്തിയില്ല diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index 3edbc6ef..6df3dbd6 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -14,6 +14,7 @@ E-mail naar groep sturen Nieuw contact Aan bestaand contact toevoegen + At least one field should be filled out Geen contacten met e-mailadressen gevonden diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index 187439fa..050c63b7 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -14,6 +14,7 @@ Wyślij e-mail do grupy Utwórz nowy kontakt Dodaj do istniejącego kontaktu + Należy wypełnić co najmniej jedno pole Nie znaleziono kontaktów z adresami e-mail diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index 7d6243d7..62db91b9 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -14,6 +14,7 @@ Enviar e-mail ao grupo Criar novo contato Adicionar um contato existente + At least one field should be filled out Não foram encontrados contatos com e-mails diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index eba1607f..9dfb2df4 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -14,6 +14,7 @@ Enviar e-mail para o grupo Criar novo contacto Adicionar a um contacto existente + At least one field should be filled out Não existem contactos com endereço de e-mail diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index b5a3a7ac..4961c771 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -14,6 +14,7 @@ Отправить письмо группе Создать новый контакт Добавить к существующему контакту + At least one field should be filled out Контакты с адресами электронной почты не найдены diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml index 2fcb8b28..74410b44 100644 --- a/app/src/main/res/values-sk/strings.xml +++ b/app/src/main/res/values-sk/strings.xml @@ -14,6 +14,7 @@ Poslať skupine email Vytvoriť nový kontakt Pridať k existujúcemu kontaktu + At least one field should be filled out Nenašli sa žiadne kontakty s emailami diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index 2c075034..b411dec6 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -14,6 +14,7 @@ Skicka e-post till grupp Skapa ny kontakt Lägg till i en befintlig kontakt + At least one field should be filled out Inga kontakter med e-postadresser hittades diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index 8f6b8fc0..25453ec1 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -14,6 +14,7 @@ Gruba e-posta gönder Yeni kişi oluştur Mevcut bir kişiye ekle + At least one field should be filled out E-posta ile hiç bağlantı bulunamadı diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index bf2db768..a6afb04b 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -14,6 +14,7 @@ Надіслати електронний лист групі контактів Створити новий контакт Додати до існуючого контакту + At least one field should be filled out Не знайдено контактів з електронною поштою diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index c2530bc9..1697454c 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -14,6 +14,7 @@ 发送电子邮件给群组 建立新联系人 添加至已存在的联系人 + At least one field should be filled out 未发现含有电子邮箱的联系人 diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 73c0147d..1c569ecb 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -14,6 +14,7 @@ 發送電子郵件給群組 建立新聯絡人 添加至已存在的聯絡人 + At least one field should be filled out 未發現含有電子信箱的聯絡人 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index f120ff97..2a128f63 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -14,6 +14,7 @@ Send email to group Create new contact Add to an existing contact + At least one field should be filled out No contacts with emails have been found