Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-13 11:19:04 +01:00
Code Issues Projects Releases Wiki Activity

Better explain why messages could not be deleted

Browse Source 
This also fixes a bug in the IntroductionManager that would allow to
delete only part of a session's visible messages.
This commit is contained in:
Torsten Grote
2019-11-08 14:14:20 -03:00
parent 11c43dc7f4
commit ae0fa351b6
13 changed files with 516 additions and 281 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -67,6 +67,7 @@ import org.briarproject.briar.api.conversation.ConversationManager;
import org.briarproject.briar.api.conversation.ConversationMessageHeader;
import org.briarproject.briar.api.conversation.ConversationRequest;
import org.briarproject.briar.api.conversation.ConversationResponse;
import org.briarproject.briar.api.conversation.DeletionResult;
import org.briarproject.briar.api.conversation.event.ConversationMessageReceivedEvent;
import org.briarproject.briar.api.forum.ForumSharingManager;
import org.briarproject.briar.api.introduction.IntroductionManager;
@@ -857,9 +858,9 @@ public class ConversationActivity extends BriarActivity
list.showProgressBar();
runOnDbThread(() -> {
try {
boolean allDeleted =
DeletionResult result =
conversationManager.deleteAllMessages(contactId);
reloadConversationAfterDeletingMessages(allDeleted);
reloadConversationAfterDeletingMessages(result);
} catch (DbException e) {
logException(LOG, WARNING, e);
runOnUiThreadUnlessDestroyed(() -> list.showData());
@@ -874,9 +875,9 @@ public class ConversationActivity extends BriarActivity
if (actionMode != null) actionMode.finish();
runOnDbThread(() -> {
try {
boolean allDeleted =
DeletionResult result =
conversationManager.deleteMessages(contactId, selected);
reloadConversationAfterDeletingMessages(allDeleted);
reloadConversationAfterDeletingMessages(result);
} catch (DbException e) {
logException(LOG, WARNING, e);
runOnUiThreadUnlessDestroyed(() -> list.showData());
@@ -885,22 +886,55 @@ public class ConversationActivity extends BriarActivity
}
private void reloadConversationAfterDeletingMessages(
boolean allDeleted) {
DeletionResult result) {
runOnUiThreadUnlessDestroyed(() -> {
adapter.clear();
list.showProgressBar(); // otherwise clearing shows empty state
loadMessages();
if (!allDeleted) showNotAllDeletedDialog();
if (!result.allDeleted()) showNotAllDeletedDialog(result);
});
}
private void showNotAllDeletedDialog() {
private void showNotAllDeletedDialog(DeletionResult result) {
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.hasNotFullyDownloaded()) {
String s = getString(
R.string.dialog_message_not_deleted_partly_downloaded);
fails.append(s).append("\n");
}
// add failures to message if there are any
if (fails.length() > 0) {
String s = getString(R.string.dialog_message_not_deleted,
fails.toString());
msg.append(s);
}
// add problems the user can resolve
if (result.hasNotAllSelected()) {
if (msg.length() > 0) msg.append("\n\n");
String s = getString(
R.string.dialog_message_not_deleted_not_all_selected);
msg.append(s);
}
// show dialog
AlertDialog.Builder builder =
new AlertDialog.Builder(this, R.style.BriarDialogTheme);
builder.setTitle(
getString(R.string.dialog_title_not_all_messages_deleted));
builder.setMessage(
getString(R.string.dialog_message_not_all_messages_deleted));
builder.setMessage(msg.toString());
builder.setPositiveButton(R.string.ok, null);
builder.show();
}
@@ -912,7 +946,8 @@ public class ConversationActivity extends BriarActivity
new AlertDialog.Builder(ConversationActivity.this,
R.style.BriarDialogTheme);
builder.setTitle(getString(R.string.dialog_title_delete_contact));
builder.setMessage(getString(R.string.dialog_message_delete_contact));
builder.setMessage(
getString(R.string.dialog_message_delete_contact));
builder.setNegativeButton(R.string.delete, okListener);
builder.setPositiveButton(R.string.cancel, null);
builder.show();
@@ -953,7 +988,8 @@ public class ConversationActivity extends BriarActivity
private void showImageOnboarding() {
// TODO: remove cast when removing feature flag
((TextAttachmentController) sendController).showImageOnboarding(this);
((TextAttachmentController) sendController)
.showImageOnboarding(this);
}
private void showIntroductionOnboarding(@Nullable Boolean show) {
@@ -973,7 +1009,8 @@ public class ConversationActivity extends BriarActivity
View target = null;
for (int i = 0; i < toolbar.getChildCount(); i++) {
if (toolbar.getChildAt(i) instanceof ActionMenuView) {
ActionMenuView menu = (ActionMenuView) toolbar.getChildAt(i);
ActionMenuView menu =
(ActionMenuView) toolbar.getChildAt(i);
// The overflow icon should be the last child of the menu
target = menu.getChildAt(menu.getChildCount() - 1);
// If the menu hasn't been populated yet, use the menu itself
@@ -999,7 +1036,8 @@ public class ConversationActivity extends BriarActivity
@UiThread
@Override
public void respondToRequest(ConversationRequestItem item, boolean accept) {
public void respondToRequest(ConversationRequestItem item,
boolean accept) {
item.setAnswered();
int position = adapter.findItemPosition(item);
if (position != INVALID_POSITION) {