Make selecting a help category mandatory.

2026-07-13 17:23:56 +01:00 · 2021-05-09 17:05:07 -04:00
parent fbf307bf01
commit d3431d227b
38 changed files with 49 additions and 3 deletions
@@ -9,6 +9,7 @@ import androidx.lifecycle.ViewModel;
 import org.thoughtcrime.securesms.logsubmit.LogLine;
 import org.thoughtcrime.securesms.logsubmit.SubmitDebugLogRepository;
 import org.thoughtcrime.securesms.util.livedata.LiveDataPair;
+import org.thoughtcrime.securesms.util.livedata.LiveDataUtil;
 import org.whispersystems.libsignal.util.Pair;
 import org.whispersystems.libsignal.util.guava.Optional;

@@ -20,8 +21,8 @@ public class HelpViewModel extends ViewModel {

  private MutableLiveData<Boolean> problemMeetsLengthRequirements = new MutableLiveData<>();
  private MutableLiveData<Boolean> hasLines                       = new MutableLiveData<>(false);
+  private MutableLiveData<Integer> categoryIndex                  = new MutableLiveData<>(0);
  private LiveData<Boolean>        isFormValid                    = Transformations.map(new LiveDataPair<>(problemMeetsLengthRequirements, hasLines), this::transformValidationData);
-  private int                      categoryIndex                  = 0;

  private final SubmitDebugLogRepository submitDebugLogRepository;

@@ -34,6 +35,14 @@ public class HelpViewModel extends ViewModel {
      logLines = lines;
      hasLines.postValue(true);
    });
+
+    LiveData<Boolean> firstValid = LiveDataUtil.combineLatest(problemMeetsLengthRequirements, hasLines, (validLength, validLines) -> {
+      return validLength == Boolean.TRUE && validLines == Boolean.TRUE;
+    });
+
+    isFormValid = LiveDataUtil.combineLatest(firstValid, categoryIndex, (valid, index) -> {
+      return  valid == Boolean.TRUE && index > 0;
+    });
  }

  LiveData<Boolean> isFormValid() {
@@ -45,11 +54,11 @@ public class HelpViewModel extends ViewModel {
  }

  void onCategorySelected(int index) {
-    this.categoryIndex = index;
+    this.categoryIndex.setValue(index);
  }

  int getCategoryIndex() {
-    return this.categoryIndex;
+    return Optional.fromNullable(this.categoryIndex.getValue()).or(0);
  }

  LiveData<SubmitResult> onSubmitClicked(boolean includeDebugLogs) {
@@ -1903,6 +1903,7 @@
  <string name="HelpFragment__could_not_upload_logs">Neuspješan prenos zapisa</string>
  <string name="HelpFragment__please_be_as_descriptive_as_possible">Molimo budite što detaljniji kako biste nam pomogli u razumijevanju problema.</string>
  <string-array name="HelpFragment__categories">
+    <item></item>
    <item>Nešto ne funkcioniše</item>
    <item>Zahtjev za novim funkcijama</item>
    <item>Pitanje</item>
@@ -1825,6 +1825,7 @@ S\'ha rebut un missatge d\'intercanvi de claus per a una versió del protocol no
  <string name="HelpFragment__could_not_upload_logs">No s\'han pogut carregar els registres.</string>
  <string name="HelpFragment__please_be_as_descriptive_as_possible">Si us plau, expliqueu-ho de la manera més descriptiva possible per ajudar-nos a entendre el problema.</string>
  <string-array name="HelpFragment__categories">
+    <item></item>
    <item>Alguna cosa no va bé</item>
    <item>Petició de funció</item>
    <item>Pregunta</item>
@@ -1974,6 +1974,7 @@ Obdržen požadavek na výměnu klíčů pro neplatnou verzi protokolu.
  <string name="HelpFragment__could_not_upload_logs">Nepodařilo se nahrát logy</string>
  <string name="HelpFragment__please_be_as_descriptive_as_possible">Popište detailně váš problém, aby to bylo pro nás srozumitelné.</string>
  <string-array name="HelpFragment__categories">
+    <item></item>
    <item>Něco nefunguje</item>
    <item>Požadavek na funkcionalitu</item>
    <item>Dotaz</item>
@@ -1969,6 +1969,7 @@ Send neges heb ei ddiogelu?</string>
  <string name="HelpFragment__could_not_upload_logs">Methu llwytho\'r cofnod</string>
  <string name="HelpFragment__please_be_as_descriptive_as_possible">Byddwch mor ddisgrifiadol â phosibl i\'n helpu i ddeall y mater yma.</string>
  <string-array name="HelpFragment__categories">
+    <item></item>
    <item>Mae Rhywbeth Wedi Torri</item>
    <item>Cais Nodwedd</item>
    <item>Cwestiwn</item>
@@ -1831,6 +1831,7 @@ Modtog en nøgle besked, for en ugyldig protokol-version
  <string name="HelpFragment__could_not_upload_logs">Fejl ved afsendelse af logs</string>
  <string name="HelpFragment__please_be_as_descriptive_as_possible">Beskriv venligst problemet så præcist som muligt, for at sikre vi bedst forstår det</string>
  <string-array name="HelpFragment__categories">
+    <item></item>
    <item>Noget virker ikke</item>
    <item>Funktionsanmodning</item>
    <item>Spørgsmål</item>
@@ -1820,6 +1820,7 @@ Schlüsselaustausch-Nachricht für eine ungültige Protokollversion empfangen</s
  <string name="HelpFragment__could_not_upload_logs">Protokoll konnte nicht hochgeladen werden</string>
  <string name="HelpFragment__please_be_as_descriptive_as_possible">Bitte beschreibe das Problem so genau wie möglich, damit wir es besser verstehen können.</string>
  <string-array name="HelpFragment__categories">
+    <item></item>
    <item>Etwas funktioniert nicht</item>
    <item>Erweiterungswunsch</item>
    <item>Frage</item>
@@ -1814,6 +1814,7 @@
  <string name="HelpFragment__could_not_upload_logs">Δεν μπόρεσαν να ανέβουν τα αρχεία καταγραφής</string>
  <string name="HelpFragment__please_be_as_descriptive_as_possible">Παρακαλούμε να είσαι όσο γίνεται πιο περιγραφικός/ή για να μας βοηθήσεις να καταλάβουμε το πρόβλημα.</string>
  <string-array name="HelpFragment__categories">
+    <item></item>
    <item>Κάτι δεν λειτουργεί</item>
    <item>Αίτημα λειτουργίας</item>
    <item>Ερώτηση</item>
@@ -1822,6 +1822,7 @@ Ricevis mesaĝon pri interŝanĝo de ŝlosiloj por nevalida protokola versio.
  <string name="HelpFragment__could_not_upload_logs">Protokolo ne alŝutiĝis</string>
  <string name="HelpFragment__please_be_as_descriptive_as_possible">Priskribu laŭeble precize por helpi al ni kompreni la problemon.</string>
  <string-array name="HelpFragment__categories">
+    <item></item>
    <item>Io ne funkcias</item>
    <item>Peto por nova funkcio</item>
    <item>Demando</item>
@@ -1823,6 +1823,7 @@ Se recibió un mensaje de intercambio de claves para una versión no válida del
  <string name="HelpFragment__could_not_upload_logs">Imposible transmitir logs</string>
  <string name="HelpFragment__please_be_as_descriptive_as_possible">Por favor, sé lo más descriptivo posible para ayudarnos a entender la incidencia.</string>
  <string-array name="HelpFragment__categories">
+    <item></item>
    <item>Algo no funciona</item>
    <item>Solicitar una nueva función</item>
    <item>Pregunta</item>
@@ -1818,6 +1818,7 @@
  <string name="HelpFragment__could_not_upload_logs">Logide üleslaadimine ei õnnestunud</string>
  <string name="HelpFragment__please_be_as_descriptive_as_possible">Palun ole võimalikult kirjeldav, et aidata meil probleemist aru saada.</string>
  <string-array name="HelpFragment__categories">
+    <item></item>
    <item>Miski ei tööta</item>
    <item>Funktsioonisoov</item>
    <item>Küsimus</item>
@@ -1829,6 +1829,7 @@
  <string name="HelpFragment__could_not_upload_logs">بارگذاری گزارش‌ها موفق نبود</string>
  <string name="HelpFragment__please_be_as_descriptive_as_possible">توضیح هر چه بهتر شما، به ما در فهم اشکال کمک خواهد کرد.</string>
  <string-array name="HelpFragment__categories">
+    <item></item>
    <item>چیزی خراب شده است</item>
    <item>درخواست قابلیت جدید</item>
    <item>سؤال</item>
@@ -1833,6 +1833,7 @@ Kulcs-csere üzenet érkezett érvénytelen protokoll verzióhoz.
  <string name="HelpFragment__could_not_upload_logs">Nem sikerült feltölteni a naplót</string>
  <string name="HelpFragment__please_be_as_descriptive_as_possible">Hogy megérthessük a problémát, fogalmazz olyan pontosan, amennyire csak lehetséges!</string>
  <string-array name="HelpFragment__categories">
+    <item></item>
    <item>Valami nem működik</item>
    <item>Funkció kérés</item>
    <item>Kérdés</item>
@@ -1824,6 +1824,7 @@ Eins geturðu skannað kóðann á símanum hins aðilans, eða beðið hann um
  <string name="HelpFragment__could_not_upload_logs">Gat ekki sent inn atvikaskrár</string>
  <string name="HelpFragment__please_be_as_descriptive_as_possible">Lýstu þessu eins nákvæmlega og þú getur til að auðvelda okkur að skilja vandamálið.</string>
  <string-array name="HelpFragment__categories">
+    <item></item>
    <item>Eitthvað er ekki að virka</item>
    <item>Beiðni um endurbætur</item>
    <item>Spurning</item>
@@ -1831,6 +1831,7 @@
  <string name="HelpFragment__could_not_upload_logs">Impossibile inviare i log</string>
  <string name="HelpFragment__please_be_as_descriptive_as_possible">Sii il più descrittivo possibile per aiutarci a capire il problema.</string>
  <string-array name="HelpFragment__categories">
+    <item></item>
    <item>Qualcosa non funziona</item>
    <item>Richiesta di funzionalità</item>
    <item>Domanda</item>
@@ -1975,6 +1975,7 @@
  <string name="HelpFragment__could_not_upload_logs">לא היה ניתן להעלות יומן</string>
  <string name="HelpFragment__please_be_as_descriptive_as_possible">אנא הייה מפורט ככל האפשר כדי לעזור לנו להבין את הסוגייה.</string>
  <string-array name="HelpFragment__categories">
+    <item></item>
    <item>משהו לא עובד</item>
    <item>בקשת מאפיין</item>
    <item>שאלה</item>
@@ -1748,6 +1748,7 @@
  <string name="HelpFragment__could_not_upload_logs">ログをアップロードできませんでした</string>
  <string name="HelpFragment__please_be_as_descriptive_as_possible">問題を理解するため、できるだけ詳細に記述してください。</string>
  <string-array name="HelpFragment__categories">
+    <item></item>
    <item>機能の不具合k</item>
    <item>機能のリクエスト</item>
    <item>質問</item>
@@ -1810,6 +1810,7 @@ i d-tefkiḍ (%s) ur yeɣti ara.</string>
  <string name="HelpFragment__could_not_upload_logs">Ur yezmir ara ad d-isali iɣmisen</string>
  <string name="HelpFragment__please_be_as_descriptive_as_possible">Ttxil-k·m ɛreḍ ayen yellan fell-ak·am amek ara ad d-tgelmeḍ ugur i wakken ad aɣ-talleḍ ad t-negzu.</string>
  <string-array name="HelpFragment__categories">
+    <item></item>
    <item>Yella wayen ur nteddu ara</item>
    <item>Asuter n tmahilt</item>
    <item>Asteqsi</item>
@@ -1970,6 +1970,7 @@
  <string name="HelpFragment__could_not_upload_logs">Nepavyko atnaujinti žurnalų</string>
  <string name="HelpFragment__please_be_as_descriptive_as_possible">Kaip įmanoma išsamiau aprašykite problemą, kad lengviau ją suprastume.</string>
  <string-array name="HelpFragment__categories">
+    <item></item>
    <item>Kažkas neveikia</item>
    <item>Prašymas pridėti naują ypatybę</item>
    <item>Klausimas</item>
@@ -1811,6 +1811,7 @@
  <string name="HelpFragment__could_not_upload_logs">Не успеав да ги качам записите</string>
  <string name="HelpFragment__please_be_as_descriptive_as_possible">Ве молиме бидете што е можно поописни за да ни помогнете да го разбереме проблемот.</string>
  <string-array name="HelpFragment__categories">
+    <item></item>
    <item>Нешто не работи</item>
    <item>Барање за опција</item>
    <item>Прашање</item>
@@ -1746,6 +1746,7 @@
  <string name="HelpFragment__could_not_upload_logs">မှတ်တမ်းများ မတင်သွင်းနိုင်ပါ</string>
  <string name="HelpFragment__please_be_as_descriptive_as_possible">ကျွနှ်ပ်တို့နားလည်နိုင်ရန် ကိစ္စအကြောင်းကို တတ်နိုင်သမျှ ဖေါ်ပြပေးပါ။</string>
  <string-array name="HelpFragment__categories">
+    <item></item>
    <item>အရာတစ်ခု အလုပ်မလုပ်ပါ</item>
    <item>အင်္ဂါရပ်တောင်းဆိုချက်</item>
    <item>မေးခွန်း</item>
@@ -1835,6 +1835,7 @@ Tot slot moet Signal de telefoonstatus kunnen lezen om te voorkomen dat Signal-o
  <string name="HelpFragment__could_not_upload_logs">Logs uploaden is mislukt</string>
  <string name="HelpFragment__please_be_as_descriptive_as_possible">Probeer zo beschrijvend mogelijk te zijn om ons te helpen het probleem te begrijpen.</string>
  <string-array name="HelpFragment__categories">
+    <item></item>
    <item>Er werkt iets niet</item>
    <item>Verzoek voor nieuwe functionaliteit</item>
    <item>Vraag</item>
@@ -1835,6 +1835,7 @@ Mottok nøkkelutvekslingsmelding for ugyldig protokollversjon.</string>
  <string name="HelpFragment__could_not_upload_logs">Klarte ikkje lasta opp loggar</string>
  <string name="HelpFragment__please_be_as_descriptive_as_possible">Beskriv problemet så utfyllande som mogleg slik at me kan forstå kva som skjer.</string>
  <string-array name="HelpFragment__categories">
+    <item></item>
    <item>Det fungerer ikkje</item>
    <item>Idé til ny funksjon</item>
    <item>Spørsmål</item>
@@ -1967,6 +1967,7 @@ Otrzymano wiadomość wymiany klucz dla niepoprawnej wersji protokołu.</string>
  <string name="HelpFragment__could_not_upload_logs">Wysyłanie logów nieudane</string>
  <string name="HelpFragment__please_be_as_descriptive_as_possible">Opisz problem najdokładniej jak potrafisz, aby pomóc nam go zrozumieć.</string>
  <string-array name="HelpFragment__categories">
+    <item></item>
    <item>Coś nie działa</item>
    <item>Prośba o dodanie funkcji</item>
    <item>Pytanie</item>
@@ -1830,6 +1830,7 @@
  <string name="HelpFragment__could_not_upload_logs">Não é possível fazer o upload de relatórios</string>
  <string name="HelpFragment__please_be_as_descriptive_as_possible">Por favor, seja tão descritivo quanto possível para nos ajudar a perceber o problema.</string>
  <string-array name="HelpFragment__categories">
+    <item></item>
    <item>Algo não está a funcionar</item>
    <item>Pedido de recurso</item>
    <item>Questão</item>
@@ -1885,6 +1885,7 @@ Am primit mesajul conform căruia schimbul de chei a avut loc pentru o versiune
  <string name="HelpFragment__could_not_upload_logs">Nu s-au putut încărca jurnalele</string>
  <string name="HelpFragment__please_be_as_descriptive_as_possible">Vă rugăm să fiți cât mai descriptivi pentru a ne ajuta să înțelegem problema.</string>
  <string-array name="HelpFragment__categories">
+    <item></item>
    <item>Ceva nu funcționează</item>
    <item>Solicitare funcționalitate nouă</item>
    <item>Întrebare</item>
@@ -1968,6 +1968,7 @@
  <string name="HelpFragment__could_not_upload_logs">Не удалось отправить журналы</string>
  <string name="HelpFragment__please_be_as_descriptive_as_possible">Пожалуйста, пишите как можно подробнее, чтобы помочь нам понять проблему.</string>
  <string-array name="HelpFragment__categories">
+    <item></item>
    <item>Что-то не работает</item>
    <item>Запросить новые функции</item>
    <item>Вопрос</item>
@@ -1974,6 +1974,7 @@ Bola prijatá správa výmeny kľúčov s neplatnou verziou protokolu.
  <string name="HelpFragment__could_not_upload_logs">Nepodarilo sa nahrať denníky</string>
  <string name="HelpFragment__please_be_as_descriptive_as_possible">Prosíme, čo najpodrobnejšie popíšte situáciu a pomôžte nám tak porozumieť vášmu problému.</string>
  <string-array name="HelpFragment__categories">
+    <item></item>
    <item>Niečo nefunguje</item>
    <item>Požiadať o novú funkciu</item>
    <item>Otázka</item>
@@ -1961,6 +1961,7 @@ Prejeto sporočilo za izmenjavo ključev za napačno različico protokola.</stri
  <string name="HelpFragment__could_not_upload_logs">Sistemska zabeležba ni bila prenešena</string>
  <string name="HelpFragment__please_be_as_descriptive_as_possible">Pri opisu napake bodite čim bolj natančni, da bomo lažje razumeli za kaj gre.</string>
  <string-array name="HelpFragment__categories">
+    <item></item>
    <item>Nekaj ne deluje</item>
    <item>Predlog za novo funkcijo</item>
    <item>Vprašanje</item>
@@ -1831,6 +1831,7 @@ të përditësojnë Signal-in, ose t’i hiqni para krijimit të grupit.</item>
  <string name="HelpFragment__could_not_upload_logs">S’u ngarkuan dot regjistra</string>
  <string name="HelpFragment__please_be_as_descriptive_as_possible">Ju lutemi, që të na ndihmoni të kuptojmë problemin, jini sa më përshkrues që të jetë e mundur.</string>
  <string-array name="HelpFragment__categories">
+    <item></item>
    <item>Diçka S’Funksionon</item>
    <item>Kërkesë Veçorie</item>
    <item>Pyetje</item>
@@ -1902,6 +1902,7 @@
  <string name="HelpFragment__could_not_upload_logs">Грешка при отпремању извештаја</string>
  <string name="HelpFragment__please_be_as_descriptive_as_possible">Будите што описнији како бисте нам помогли да разумемо проблем.</string>
  <string-array name="HelpFragment__categories">
+    <item></item>
    <item>Нешто не ради</item>
    <item>Захтев способности</item>
    <item>Питање</item>
@@ -1825,6 +1825,7 @@ Tog emot meddelande för nyckelutbyte för ogiltig protokollversion.</string>
  <string name="HelpFragment__could_not_upload_logs">Det gick inte att ladda upp loggar</string>
  <string name="HelpFragment__please_be_as_descriptive_as_possible">Vänligen var så beskrivande som möjligt för att hjälpa oss att förstå problemet.</string>
  <string-array name="HelpFragment__categories">
+    <item></item>
    <item>Något fungerar inte</item>
    <item>Funktionsbegäran</item>
    <item>Fråga</item>
@@ -1740,6 +1740,7 @@
  <string name="HelpFragment__could_not_upload_logs">ไม่สามารถอัปโหลดปูม</string>
  <string name="HelpFragment__please_be_as_descriptive_as_possible">กรุณาอธิบายละเอียดที่สุดเท่าที่จะทำได้ เพื่อช่วยให้เราเข้าใจปัญหา</string>
  <string-array name="HelpFragment__categories">
+    <item></item>
    <item>มีบางสิ่งไม่ทำงาน</item>
    <item>ขอความสามารถใหม่</item>
    <item>มีคำถาม</item>
@@ -1829,6 +1829,7 @@ Geçersiz protokol sürümünde anahtar değişim iletisi alındı.</string>
  <string name="HelpFragment__could_not_upload_logs">Günlükler karşıya yüklenemedi</string>
  <string name="HelpFragment__please_be_as_descriptive_as_possible">Lütfen sorunu anlamamıza yardımcı olabilecek şekilde açıklayın.</string>
  <string-array name="HelpFragment__categories">
+    <item></item>
    <item>Bir Şey Çalışmıyor</item>
    <item>Özellik İsteği</item>
    <item>Soru</item>
@@ -1830,6 +1830,7 @@
  <string name="HelpFragment__could_not_upload_logs">خاتىرىنى يۈكلىيەلمىدى</string>
  <string name="HelpFragment__please_be_as_descriptive_as_possible">ئامالنىڭ بارىچە ئەتراپلىق بايان قىلىپ ۋەقەنى چۈشىنىشىمىزگە ياردەم بېرىڭ.</string>
  <string-array name="HelpFragment__categories">
+    <item></item>
    <item>كاشىلا كۆرۈلدى</item>
    <item>ئىقتىدار ئىلتىماسى</item>
    <item>سوئال</item>
@@ -1750,6 +1750,7 @@
  <string name="HelpFragment__could_not_upload_logs">无法上传日志</string>
  <string name="HelpFragment__please_be_as_descriptive_as_possible">请尽可能描述一下，以帮助我们理解该问题。</string>
  <string-array name="HelpFragment__categories">
+    <item></item>
    <item>出现问题</item>
    <item>功能请求</item>
    <item>疑问</item>
@@ -1755,6 +1755,7 @@
  <string name="HelpFragment__could_not_upload_logs">無法上傳記錄檔</string>
  <string name="HelpFragment__please_be_as_descriptive_as_possible">請盡可能描述一下，以幫助我們理解該問題。</string>
  <string-array name="HelpFragment__categories">
+    <item></item>
    <item>某事無法使用</item>
    <item>功能要求</item>
    <item>問題</item>
@@ -2170,6 +2170,7 @@
    <string name="HelpFragment__could_not_upload_logs">Could not upload logs</string>
    <string name="HelpFragment__please_be_as_descriptive_as_possible">Please be as descriptive as possible to help us understand the issue.</string>
    <string-array name="HelpFragment__categories">
+        <item>-- Please select an option --</item>
        <item>Something\'s Not Working</item>
        <item>Feature Request</item>
        <item>Question</item>