diff --git a/briar-android/res/values/strings.xml b/briar-android/res/values/strings.xml index e1b0d405e7106d96369659754ea9773d7e3be169..f9893ae5912b1ed6751a8ab00c7841ca6acd0b48 100644 --- a/briar-android/res/values/strings.xml +++ b/briar-android/res/values/strings.xml @@ -277,6 +277,7 @@ <string name="blogs_delete_blog_dialog_message">Are you sure that you want to delete this Blog and all posts?\nNote that this will not delete the blog from other people\'s devices.</string> <string name="blogs_delete_blog_ok">Delete Blog</string> <string name="blogs_delete_blog_cancel">Keep</string> + <string name="blogs_blog_deleted">Blog Deleted</string> <string name="blogs_remove_blog">Remove Blog</string> <string name="blogs_blog_list">Blog List</string> diff --git a/briar-android/src/org/briarproject/android/blogs/BlogControllerImpl.java b/briar-android/src/org/briarproject/android/blogs/BlogControllerImpl.java index eca0bd340be3ce76bfd812c6029d196553adadc3..d2898602c68dd664a4709cd761667b7d4e01a1dd 100644 --- a/briar-android/src/org/briarproject/android/blogs/BlogControllerImpl.java +++ b/briar-android/src/org/briarproject/android/blogs/BlogControllerImpl.java @@ -181,6 +181,7 @@ public class BlogControllerImpl extends DbControllerImpl try { Blog b = blogManager.getBlog(data.getGroupId()); blogManager.removeBlog(b); + resultHandler.onResult(true); } catch (DbException e) { if (LOG.isLoggable(WARNING)) LOG.log(WARNING, e.toString(), e); diff --git a/briar-android/src/org/briarproject/android/blogs/BlogFragment.java b/briar-android/src/org/briarproject/android/blogs/BlogFragment.java index ba142cf4e253ef6fb4b569a7adbb99616fa34cb8..7ee529ca3c8ae9a35e36b8145b9a6552f0b75e3f 100644 --- a/briar-android/src/org/briarproject/android/blogs/BlogFragment.java +++ b/briar-android/src/org/briarproject/android/blogs/BlogFragment.java @@ -53,7 +53,7 @@ public class BlogFragment extends BaseFragment implements BlogPostListener { private BriarRecyclerView list; static BlogFragment newInstance(GroupId groupId, String name, - boolean myBlog, boolean isNew) { + boolean myBlog, boolean isNew) { BlogFragment f = new BlogFragment(); @@ -204,7 +204,8 @@ 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.setMessage(getString(R.string.blogs_delete_blog_dialog_message)); + 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); builder.show(); @@ -216,8 +217,9 @@ public class BlogFragment extends BaseFragment implements BlogPostListener { @Override public void onResultUi(Boolean result) { if (!result) return; - Toast.makeText(getActivity(), R.string.forum_left_toast, - LENGTH_SHORT).show(); + Toast.makeText(getActivity(), + R.string.blogs_blog_deleted, LENGTH_SHORT) + .show(); getActivity().supportFinishAfterTransition(); } }); diff --git a/briar-android/src/org/briarproject/android/blogs/BlogListAdapter.java b/briar-android/src/org/briarproject/android/blogs/BlogListAdapter.java index f4573a99fa808f2e742ef56ce7435e03ace689b9..92526387f18948365615c9aa3aacc1c1e273f589 100644 --- a/briar-android/src/org/briarproject/android/blogs/BlogListAdapter.java +++ b/briar-android/src/org/briarproject/android/blogs/BlogListAdapter.java @@ -124,6 +124,7 @@ class BlogListAdapter extends ui.date.setText( DateUtils.getRelativeTimeSpanString(ctx, timestamp)); ui.date.setVisibility(VISIBLE); + ui.avatar.setProblem(false); ui.status.setVisibility(GONE); } diff --git a/briar-android/src/org/briarproject/android/blogs/WriteBlogPostActivity.java b/briar-android/src/org/briarproject/android/blogs/WriteBlogPostActivity.java index 91873c9ff05c0bc23583c0fa2bcccf2b7e1f6845..493216669ecccfbf9592bd8686cf7d12baf1a884 100644 --- a/briar-android/src/org/briarproject/android/blogs/WriteBlogPostActivity.java +++ b/briar-android/src/org/briarproject/android/blogs/WriteBlogPostActivity.java @@ -100,7 +100,7 @@ public class WriteBlogPostActivity extends BriarActivity @Override public void afterTextChanged(Editable s) { - showOrHidePublishButton(); + enableOrDisablePublishButton(); } }); @@ -126,7 +126,7 @@ public class WriteBlogPostActivity extends BriarActivity return true; } - private void showOrHidePublishButton() { + private void enableOrDisablePublishButton() { int bodyLength = StringUtils.toUtf8(bodyInput.getText().toString()).length; if (bodyLength > 0 && bodyLength <= MAX_BLOG_POST_BODY_LENGTH && diff --git a/briar-android/src/org/briarproject/android/forum/ForumListAdapter.java b/briar-android/src/org/briarproject/android/forum/ForumListAdapter.java index 2051eadffdb8c7eb0f0b7e60e7f97a8b27510719..88759804aefa31203ede1b5047da0ab2becd6e48 100644 --- a/briar-android/src/org/briarproject/android/forum/ForumListAdapter.java +++ b/briar-android/src/org/briarproject/android/forum/ForumListAdapter.java @@ -104,6 +104,7 @@ class ForumListAdapter extends // Post Count int postCount = item.getPostCount(); if (postCount > 0) { + ui.avatar.setProblem(false); ui.postCount.setText(ctx.getResources() .getQuantityString(R.plurals.posts, postCount, postCount)); diff --git a/briar-android/src/org/briarproject/android/util/TrustIndicatorView.java b/briar-android/src/org/briarproject/android/util/TrustIndicatorView.java index 6525c0f9e1459f253267f94d6c7c34d668ce8de6..a9ea3c8fb24653f07cbfc09252813550abad1253 100644 --- a/briar-android/src/org/briarproject/android/util/TrustIndicatorView.java +++ b/briar-android/src/org/briarproject/android/util/TrustIndicatorView.java @@ -46,6 +46,7 @@ public class TrustIndicatorView extends ImageView { res = R.drawable.trust_indicator_unknown; } setImageDrawable(ContextCompat.getDrawable(getContext(), res)); + setVisibility(VISIBLE); } }