mirror
/
Signal-Android
kopia lustrzana https://github.com/ryukoposting/Signal-Android
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

Fix crash when submitting debuglog via registration flow.

fork-5.53.8
Cody Henthorne 2022-08-12 15:17:58 -04:00
rodzic 64d3b36b28
commit cfe167b639
2 zmienionych plików z 18 dodań i 9 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

23
app/src/main/java/org/thoughtcrime/securesms/logsubmit/LogSectionStories.kt
Wyświetl plik

@ -3,6 +3,7 @@ package org.thoughtcrime.securesms.logsubmit
import android.content.Context
import org.thoughtcrime.securesms.database.SignalDatabase
import org.thoughtcrime.securesms.database.model.DistributionListId
import org.thoughtcrime.securesms.recipients.Recipient
import org.thoughtcrime.securesms.recipients.RecipientId
import org.whispersystems.signalservice.api.push.DistributionId
@ -14,19 +15,23 @@ class LogSectionStories : LogSection {
override fun getTitle(): String = "STORIES"
override fun getContent(context: Context): CharSequence {
val myStoryRecord = SignalDatabase.distributionLists.getList(DistributionListId.MY_STORY)
val myStoryRecipientId = SignalDatabase.distributionLists.getRecipientId(DistributionListId.MY_STORY)
val output = StringBuilder()
output.append("--- My Story\n\n")
if (myStoryRecord != null) {
output.append("Database ID : ${myStoryRecord.id}\n")
output.append("Distribution ID: ${myStoryRecord.distributionId} (Matches expected value? ${myStoryRecord.distributionId == DistributionId.MY_STORY})\n")
output.append("Recipient ID : ${presentRecipientId(myStoryRecipientId)}\n")
output.append("toString() Test: ${DistributionId.MY_STORY} | ${DistributionId.MY_STORY.asUuid()}")
if (Recipient.isSelfSet()) {
val myStoryRecord = SignalDatabase.distributionLists.getList(DistributionListId.MY_STORY)
val myStoryRecipientId = SignalDatabase.distributionLists.getRecipientId(DistributionListId.MY_STORY)
if (myStoryRecord != null) {
output.append("Database ID : ${myStoryRecord.id}\n")
output.append("Distribution ID: ${myStoryRecord.distributionId} (Matches expected value? ${myStoryRecord.distributionId == DistributionId.MY_STORY})\n")
output.append("Recipient ID : ${presentRecipientId(myStoryRecipientId)}\n")
output.append("toString() Test: ${DistributionId.MY_STORY} | ${DistributionId.MY_STORY.asUuid()}")
} else {
output.append("< My story does not exist >\n")
}
} else {
output.append("< My story does not exist >\n")
output.append("< Self is not set yet, my story does not exist >\n")
}
return output

4
app/src/main/java/org/thoughtcrime/securesms/recipients/Recipient.java
Wyświetl plik

@ -359,6 +359,10 @@ public class Recipient {
return ApplicationDependencies.getRecipientCache().getSelf();
}
public static boolean isSelfSet() {
return ApplicationDependencies.getRecipientCache().getSelfId() != null;
}
Recipient(@NonNull RecipientId id) {
this.id = id;
this.resolving = true;