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

Merge branch '579-unsubscribe-from-shared-blogs' into 'master'

Browse Source 
Allow unsubscribing from shared blogs

Only personal blogs from non-contacts can be removed.
This also adds integration tests that check the conditions under which blogs can actually be removed.

Closes #579

See merge request !268
This commit is contained in:
akwizgran
2016-08-05 17:36:36 +00:00
parent fce104487a 1ec56fa3ef
commit 44d13ef28e
15 changed files with 264 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
briar-android/src/org/briarproject/android/blogs/BlogController.java
View File

@@ -3,7 +3,9 @@ package org.briarproject.android.blogs;
import android.support.annotation.Nullable;
import org.briarproject.android.controller.ActivityLifecycleController;
import org.briarproject.android.controller.handler.ResultExceptionHandler;
import org.briarproject.android.controller.handler.ResultHandler;
import org.briarproject.api.db.DbException;
import org.briarproject.api.sync.GroupId;
import org.briarproject.api.sync.MessageId;
@@ -22,6 +24,9 @@ public interface BlogController extends ActivityLifecycleController {
@Nullable
MessageId getBlogPostId(int position);
void canDeleteBlog(GroupId groupId,
ResultExceptionHandler<Boolean, DbException> resultHandler);
void deleteBlog(ResultHandler<Boolean> resultHandler);
interface BlogPostListener {

22
briar-android/src/org/briarproject/android/blogs/BlogControllerImpl.java
View File

@@ -4,6 +4,7 @@ import android.app.Activity;
import android.support.annotation.Nullable;
import org.briarproject.android.controller.DbControllerImpl;
import org.briarproject.android.controller.handler.ResultExceptionHandler;
import org.briarproject.android.controller.handler.ResultHandler;
import org.briarproject.api.blogs.Blog;
import org.briarproject.api.blogs.BlogManager;
@@ -175,6 +176,27 @@ public class BlogControllerImpl extends DbControllerImpl
return null;
}
@Override
public void canDeleteBlog(final GroupId g,
final ResultExceptionHandler<Boolean, DbException> resultHandler) {
runOnDbThread(new Runnable() {
@Override
public void run() {
if (groupId == null) {
resultHandler.onResult(false);
return;
}
try {
resultHandler.onResult(blogManager.canBeRemoved(groupId));
} catch (DbException e) {
if (LOG.isLoggable(WARNING))
LOG.log(WARNING, e.toString(), e);
resultHandler.onException(e);
}
}
});
}
@Override
public void deleteBlog(final ResultHandler<Boolean> resultHandler) {
runOnDbThread(new Runnable() {

41
briar-android/src/org/briarproject/android/blogs/BlogFragment.java
View File

@@ -21,11 +21,13 @@ import org.briarproject.R;
import org.briarproject.android.ActivityComponent;
import org.briarproject.android.blogs.BlogController.BlogPostListener;
import org.briarproject.android.blogs.BlogPostAdapter.OnBlogPostClickListener;
import org.briarproject.android.controller.handler.UiResultExceptionHandler;
import org.briarproject.android.controller.handler.UiResultHandler;
import org.briarproject.android.fragment.BaseFragment;
import org.briarproject.android.sharing.ShareBlogActivity;
import org.briarproject.android.sharing.SharingStatusBlogActivity;
import org.briarproject.android.util.BriarRecyclerView;
import org.briarproject.api.db.DbException;
import org.briarproject.api.sync.GroupId;
import java.util.Collection;
@@ -57,6 +59,7 @@ public class BlogFragment extends BaseFragment implements BlogPostListener {
private boolean myBlog;
private BlogPostAdapter adapter;
private BriarRecyclerView list;
private MenuItem deleteButton = null;
static BlogFragment newInstance(GroupId groupId, String name,
boolean myBlog, boolean isNew) {
@@ -124,6 +127,7 @@ public class BlogFragment extends BaseFragment implements BlogPostListener {
public void onStart() {
super.onStart();
loadData(false);
if (!myBlog) checkIfBlogCanBeDeleted();
}
@Override
@@ -144,6 +148,8 @@ public class BlogFragment extends BaseFragment implements BlogPostListener {
inflater.inflate(R.menu.blogs_my_blog_actions, menu);
} else {
inflater.inflate(R.menu.blogs_blog_actions, menu);
deleteButton = menu.findItem(R.id.action_blog_delete);
deleteButton.setVisible(false);
}
super.onCreateOptionsMenu(menu, inflater);
}
@@ -179,6 +185,9 @@ public class BlogFragment extends BaseFragment implements BlogPostListener {
i3.putExtra(GROUP_ID, groupId.getBytes());
startActivity(i3, options.toBundle());
return true;
case R.id.action_blog_delete:
showDeleteDialog();
return true;
default:
return super.onOptionsItemSelected(item);
}
@@ -232,6 +241,28 @@ public class BlogFragment extends BaseFragment implements BlogPostListener {
loadData(true);
}
private void checkIfBlogCanBeDeleted() {
blogController.canDeleteBlog(groupId,
new UiResultExceptionHandler<Boolean, DbException>(
getActivity()) {
@Override
public void onResultUi(Boolean canBeDeleted) {
if (canBeDeleted) {
showDeleteButton();
}
}
@Override
public void onExceptionUi(DbException exception) {
// nothing to do here, delete button is already hidden
}
});
}
private void showDeleteButton() {
if (deleteButton != null)
deleteButton.setVisible(true);
}
private void displaySnackbar(int stringId) {
Snackbar snackbar =
Snackbar.make(list, stringId, Snackbar.LENGTH_SHORT);
@@ -249,11 +280,11 @@ public class BlogFragment extends BaseFragment implements BlogPostListener {
};
AlertDialog.Builder builder = new AlertDialog.Builder(getActivity(),
R.style.BriarDialogTheme);
builder.setTitle(getString(R.string.blogs_delete_blog));
builder.setTitle(getString(R.string.blogs_remove_blog));
builder.setMessage(
getString(R.string.blogs_delete_blog_dialog_message));
builder.setPositiveButton(R.string.blogs_delete_blog_cancel, null);
builder.setNegativeButton(R.string.blogs_delete_blog_ok, okListener);
getString(R.string.blogs_remove_blog_dialog_message));
builder.setPositiveButton(R.string.cancel_button, null);
builder.setNegativeButton(R.string.blogs_remove_blog_ok, okListener);
builder.show();
}
@@ -264,7 +295,7 @@ public class BlogFragment extends BaseFragment implements BlogPostListener {
public void onResultUi(Boolean result) {
if (!result) return;
Toast.makeText(getActivity(),
R.string.blogs_blog_deleted, LENGTH_SHORT)
R.string.blogs_blog_removed, LENGTH_SHORT)
.show();
getActivity().supportFinishAfterTransition();
}