Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-12 18:59:06 +01:00
Code Issues Projects Releases Wiki Activity

[core] address review comments for message deletion explanation

Browse Source
This commit is contained in:
Torsten Grote
2019-11-14 13:46:28 -03:00
parent ae0fa351b6
commit 5aeee9af8b
10 changed files with 101 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationActivity.java
View File

@@ -899,17 +899,15 @@ public class ConversationActivity extends BriarActivity
StringBuilder msg = new StringBuilder();
// get failures the user can not immediately prevent
StringBuilder fails = new StringBuilder();
if (result.hasSessionInProgress()) {
if (result.hasIntroduction()) {
String s = getString(
R.string.dialog_message_not_deleted_ongoing_introductions);
fails.append(s).append("\n");
}
if (result.hasInvitation()) {
String s = getString(
R.string.dialog_message_not_deleted_ongoing_invitations);
fails.append(s).append("\n");
}
if (result.hasIntroductionSessionInProgress()) {
String s = getString(
R.string.dialog_message_not_deleted_ongoing_introductions);
fails.append(s).append("\n");
}
if (result.hasInvitationSessionInProgress()) {
String s = getString(
R.string.dialog_message_not_deleted_ongoing_invitations);
fails.append(s).append("\n");
}
if (result.hasNotFullyDownloaded()) {
String s = getString(
@@ -923,7 +921,8 @@ public class ConversationActivity extends BriarActivity
msg.append(s);
}
// add problems the user can resolve
if (result.hasNotAllSelected()) {
if (result.hasNotAllIntroductionSelected() ||
result.hasNotAllInvitationSelected()) {
if (msg.length() > 0) msg.append("\n\n");
String s = getString(
R.string.dialog_message_not_deleted_not_all_selected);