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

Cleanup after review

Browse Source
This commit is contained in:
str4d
2016-07-13 03:08:37 +00:00
parent d8b5710a42
commit dd1eed5aa7
7 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
briar-android/res/values/strings.xml
View File

@@ -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_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_ok">Delete Blog</string>
<string name="blogs_delete_blog_cancel">Keep</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_remove_blog">Remove Blog</string>
<string name="blogs_blog_list">Blog List</string> <string name="blogs_blog_list">Blog List</string>

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

@@ -181,6 +181,7 @@ public class BlogControllerImpl extends DbControllerImpl
try { try {
Blog b = blogManager.getBlog(data.getGroupId()); Blog b = blogManager.getBlog(data.getGroupId());
blogManager.removeBlog(b); blogManager.removeBlog(b);
resultHandler.onResult(true);
} catch (DbException e) { } catch (DbException e) {
if (LOG.isLoggable(WARNING)) if (LOG.isLoggable(WARNING))
LOG.log(WARNING, e.toString(), e); LOG.log(WARNING, e.toString(), e);

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

@@ -53,7 +53,7 @@ public class BlogFragment extends BaseFragment implements BlogPostListener {
private BriarRecyclerView list; private BriarRecyclerView list;
static BlogFragment newInstance(GroupId groupId, String name, static BlogFragment newInstance(GroupId groupId, String name,
boolean myBlog, boolean isNew) { boolean myBlog, boolean isNew) {
BlogFragment f = new BlogFragment(); BlogFragment f = new BlogFragment();
@@ -204,7 +204,8 @@ public class BlogFragment extends BaseFragment implements BlogPostListener {
AlertDialog.Builder builder = new AlertDialog.Builder(getActivity(), AlertDialog.Builder builder = new AlertDialog.Builder(getActivity(),
R.style.BriarDialogTheme); R.style.BriarDialogTheme);
builder.setTitle(getString(R.string.blogs_delete_blog)); 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.setPositiveButton(R.string.blogs_delete_blog_cancel, null);
builder.setNegativeButton(R.string.blogs_delete_blog_ok, okListener); builder.setNegativeButton(R.string.blogs_delete_blog_ok, okListener);
builder.show(); builder.show();
@@ -216,8 +217,9 @@ public class BlogFragment extends BaseFragment implements BlogPostListener {
@Override @Override
public void onResultUi(Boolean result) { public void onResultUi(Boolean result) {
if (!result) return; if (!result) return;
Toast.makeText(getActivity(), R.string.forum_left_toast, Toast.makeText(getActivity(),
LENGTH_SHORT).show(); R.string.blogs_blog_deleted, LENGTH_SHORT)
.show();
getActivity().supportFinishAfterTransition(); getActivity().supportFinishAfterTransition();
} }
}); });

1
briar-android/src/org/briarproject/android/blogs/BlogListAdapter.java
View File

@@ -124,6 +124,7 @@ class BlogListAdapter extends
ui.date.setText( ui.date.setText(
DateUtils.getRelativeTimeSpanString(ctx, timestamp)); DateUtils.getRelativeTimeSpanString(ctx, timestamp));
ui.date.setVisibility(VISIBLE); ui.date.setVisibility(VISIBLE);
ui.avatar.setProblem(false);
ui.status.setVisibility(GONE); ui.status.setVisibility(GONE);
} }

4
briar-android/src/org/briarproject/android/blogs/WriteBlogPostActivity.java
View File

@@ -100,7 +100,7 @@ public class WriteBlogPostActivity extends BriarActivity
@Override @Override
public void afterTextChanged(Editable s) { public void afterTextChanged(Editable s) {
showOrHidePublishButton(); enableOrDisablePublishButton();
} }
}); });
@@ -126,7 +126,7 @@ public class WriteBlogPostActivity extends BriarActivity
return true; return true;
} }
private void showOrHidePublishButton() { private void enableOrDisablePublishButton() {
int bodyLength = int bodyLength =
StringUtils.toUtf8(bodyInput.getText().toString()).length; StringUtils.toUtf8(bodyInput.getText().toString()).length;
if (bodyLength > 0 && bodyLength <= MAX_BLOG_POST_BODY_LENGTH && if (bodyLength > 0 && bodyLength <= MAX_BLOG_POST_BODY_LENGTH &&

1
briar-android/src/org/briarproject/android/forum/ForumListAdapter.java
View File

@@ -104,6 +104,7 @@ class ForumListAdapter extends
// Post Count // Post Count
int postCount = item.getPostCount(); int postCount = item.getPostCount();
if (postCount > 0) { if (postCount > 0) {
ui.avatar.setProblem(false);
ui.postCount.setText(ctx.getResources() ui.postCount.setText(ctx.getResources()
.getQuantityString(R.plurals.posts, postCount, .getQuantityString(R.plurals.posts, postCount,
postCount)); postCount));

1
briar-android/src/org/briarproject/android/util/TrustIndicatorView.java
View File

@@ -46,6 +46,7 @@ public class TrustIndicatorView extends ImageView {
res = R.drawable.trust_indicator_unknown; res = R.drawable.trust_indicator_unknown;
} }
setImageDrawable(ContextCompat.getDrawable(getContext(), res)); setImageDrawable(ContextCompat.getDrawable(getContext(), res));
setVisibility(VISIBLE);
} }
} }