From 38979ef504ffaa28510b29ae6c344a7d63f0ea26 Mon Sep 17 00:00:00 2001 From: akwizgran Date: Sun, 31 Jul 2016 15:21:15 +0100 Subject: [PATCH] Controllers should depend on ResultHandler not its impl. --- .../org/briarproject/android/blogs/BlogActivity.java | 4 ++-- .../org/briarproject/android/blogs/FeedController.java | 9 ++++----- .../briarproject/android/blogs/FeedControllerImpl.java | 8 +++++--- .../org/briarproject/android/blogs/FeedFragment.java | 4 ++-- .../android/controller/NavDrawerController.java | 4 ++-- .../android/controller/NavDrawerControllerImpl.java | 4 ++-- .../org/briarproject/android/forum/ForumActivity.java | 10 +++------- 7 files changed, 20 insertions(+), 23 deletions(-) diff --git a/briar-android/src/org/briarproject/android/blogs/BlogActivity.java b/briar-android/src/org/briarproject/android/blogs/BlogActivity.java index 7519b46ab..cf38dce1e 100644 --- a/briar-android/src/org/briarproject/android/blogs/BlogActivity.java +++ b/briar-android/src/org/briarproject/android/blogs/BlogActivity.java @@ -136,8 +136,8 @@ public class BlogActivity extends BriarActivity implements BlogPostListener, private void loadBlogPosts(final int position, final boolean setItem) { showLoadingScreen(); - blogController - .loadBlog(groupId, false, new UiResultHandler(this) { + blogController.loadBlog(groupId, false, + new UiResultHandler(this) { @Override public void onResultUi(Boolean result) { if (result) { diff --git a/briar-android/src/org/briarproject/android/blogs/FeedController.java b/briar-android/src/org/briarproject/android/blogs/FeedController.java index ad98adeef..d449eb60b 100644 --- a/briar-android/src/org/briarproject/android/blogs/FeedController.java +++ b/briar-android/src/org/briarproject/android/blogs/FeedController.java @@ -1,7 +1,6 @@ package org.briarproject.android.blogs; -import org.briarproject.android.controller.ActivityLifecycleController; -import org.briarproject.android.controller.handler.UiResultHandler; +import org.briarproject.android.controller.handler.ResultHandler; import org.briarproject.api.blogs.Blog; import java.util.Collection; @@ -9,12 +8,12 @@ import java.util.Collection; public interface FeedController { void onResume(); + void onPause(); - void loadPosts( - final UiResultHandler> resultHandler); + void loadPosts(ResultHandler> resultHandler); - void loadPersonalBlog(final UiResultHandler resultHandler); + void loadPersonalBlog(ResultHandler resultHandler); void setOnBlogPostAddedListener(OnBlogPostAddedListener listener); diff --git a/briar-android/src/org/briarproject/android/blogs/FeedControllerImpl.java b/briar-android/src/org/briarproject/android/blogs/FeedControllerImpl.java index 4e22757f6..1cc49a3e1 100644 --- a/briar-android/src/org/briarproject/android/blogs/FeedControllerImpl.java +++ b/briar-android/src/org/briarproject/android/blogs/FeedControllerImpl.java @@ -1,7 +1,7 @@ package org.briarproject.android.blogs; import org.briarproject.android.controller.DbControllerImpl; -import org.briarproject.android.controller.handler.UiResultHandler; +import org.briarproject.android.controller.handler.ResultHandler; import org.briarproject.api.blogs.Blog; import org.briarproject.api.blogs.BlogManager; import org.briarproject.api.blogs.BlogPostHeader; @@ -41,10 +41,12 @@ public class FeedControllerImpl extends DbControllerImpl FeedControllerImpl() { } + @Override public void onResume() { eventBus.addListener(this); } + @Override public void onPause() { eventBus.removeListener(this); } @@ -70,7 +72,7 @@ public class FeedControllerImpl extends DbControllerImpl @Override public void loadPosts( - final UiResultHandler> resultHandler) { + final ResultHandler> resultHandler) { LOG.info("Loading blog posts..."); runOnDbThread(new Runnable() { @@ -102,7 +104,7 @@ public class FeedControllerImpl extends DbControllerImpl } @Override - public void loadPersonalBlog(final UiResultHandler resultHandler) { + public void loadPersonalBlog(final ResultHandler resultHandler) { LOG.info("Loading personal blog..."); runOnDbThread(new Runnable() { @Override diff --git a/briar-android/src/org/briarproject/android/blogs/FeedFragment.java b/briar-android/src/org/briarproject/android/blogs/FeedFragment.java index bc7a1e457..f875dd5c2 100644 --- a/briar-android/src/org/briarproject/android/blogs/FeedFragment.java +++ b/briar-android/src/org/briarproject/android/blogs/FeedFragment.java @@ -94,8 +94,8 @@ public class FeedFragment extends BaseFragment implements @Override public void onStart() { super.onStart(); - feedController - .loadPersonalBlog(new UiResultHandler(getActivity()) { + feedController.loadPersonalBlog( + new UiResultHandler(getActivity()) { @Override public void onResultUi(Blog b) { personalBlog = b; diff --git a/briar-android/src/org/briarproject/android/controller/NavDrawerController.java b/briar-android/src/org/briarproject/android/controller/NavDrawerController.java index a2f339990..8cd8aa860 100644 --- a/briar-android/src/org/briarproject/android/controller/NavDrawerController.java +++ b/briar-android/src/org/briarproject/android/controller/NavDrawerController.java @@ -1,6 +1,6 @@ package org.briarproject.android.controller; -import org.briarproject.android.controller.handler.UiResultHandler; +import org.briarproject.android.controller.handler.ResultHandler; import org.briarproject.api.TransportId; import org.briarproject.api.identity.LocalAuthor; @@ -11,7 +11,7 @@ public interface NavDrawerController extends ActivityLifecycleController { boolean isTransportRunning(TransportId transportId); void storeLocalAuthor(LocalAuthor author, - UiResultHandler resultHandler); + ResultHandler resultHandler); LocalAuthor removeAuthorHandle(long handle); } diff --git a/briar-android/src/org/briarproject/android/controller/NavDrawerControllerImpl.java b/briar-android/src/org/briarproject/android/controller/NavDrawerControllerImpl.java index 7ca4fe475..23a680bd3 100644 --- a/briar-android/src/org/briarproject/android/controller/NavDrawerControllerImpl.java +++ b/briar-android/src/org/briarproject/android/controller/NavDrawerControllerImpl.java @@ -3,7 +3,7 @@ package org.briarproject.android.controller; import android.app.Activity; import org.briarproject.android.api.ReferenceManager; -import org.briarproject.android.controller.handler.UiResultHandler; +import org.briarproject.android.controller.handler.ResultHandler; import org.briarproject.api.TransportId; import org.briarproject.api.db.DbException; import org.briarproject.api.event.Event; @@ -111,7 +111,7 @@ public class NavDrawerControllerImpl extends DbControllerImpl @Override public void storeLocalAuthor(final LocalAuthor author, - final UiResultHandler resultHandler) { + final ResultHandler resultHandler) { runOnDbThread(new Runnable() { @Override public void run() { diff --git a/briar-android/src/org/briarproject/android/forum/ForumActivity.java b/briar-android/src/org/briarproject/android/forum/ForumActivity.java index f6a0c597f..dec9c6984 100644 --- a/briar-android/src/org/briarproject/android/forum/ForumActivity.java +++ b/briar-android/src/org/briarproject/android/forum/ForumActivity.java @@ -46,7 +46,6 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.logging.Logger; import javax.inject.Inject; @@ -63,9 +62,6 @@ import static android.widget.Toast.LENGTH_SHORT; public class ForumActivity extends BriarActivity implements ForumController.ForumPostListener { - private static final Logger LOG = - Logger.getLogger(ForumActivity.class.getName()); - static final String FORUM_NAME = "briar.FORUM_NAME"; private static final int REQUEST_FORUM_SHARED = 3; @@ -113,8 +109,8 @@ public class ForumActivity extends BriarActivity implements recyclerView.setEmptyText(getString(R.string.no_forum_posts)); recyclerView.showProgressBar(); - forumController - .loadForum(groupId, new UiResultHandler(this) { + forumController.loadForum(groupId, + new UiResultHandler(this) { @Override public void onResultUi(Boolean result) { if (result) { @@ -436,7 +432,7 @@ public class ForumActivity extends BriarActivity implements private boolean hasVisibleDescendants(ForumEntry forumEntry) { int visiblePos = getVisiblePos(forumEntry); int levelLimit = forumEntry.getLevel(); - // TODO This loop doesn't really loop. @ernir please review! + // FIXME This loop doesn't really loop. @ernir please review! for (int i = visiblePos + 1; i < getItemCount(); i++) { ForumEntry entry = getVisibleEntry(i); if (entry != null && entry.getLevel() <= levelLimit)