Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-18 05:39:53 +01:00
Code Issues Projects Releases Wiki Activity

Controllers should depend on ResultHandler not its impl.

Browse Source
This commit is contained in:
akwizgran
2016-07-31 15:21:15 +01:00
parent 5c186db4e4
commit 38979ef504
7 changed files with 20 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -136,8 +136,8 @@ public class BlogActivity extends BriarActivity implements BlogPostListener,
private void loadBlogPosts(final int position, final boolean setItem) { private void loadBlogPosts(final int position, final boolean setItem) {
showLoadingScreen(); showLoadingScreen();
blogController blogController.loadBlog(groupId, false,
.loadBlog(groupId, false, new UiResultHandler<Boolean>(this) { new UiResultHandler<Boolean>(this) {
@Override @Override
public void onResultUi(Boolean result) { public void onResultUi(Boolean result) {
if (result) { if (result) {

9
briar-android/src/org/briarproject/android/blogs/FeedController.java
View File

@@ -1,7 +1,6 @@
package org.briarproject.android.blogs; package org.briarproject.android.blogs;
import org.briarproject.android.controller.ActivityLifecycleController; import org.briarproject.android.controller.handler.ResultHandler;
import org.briarproject.android.controller.handler.UiResultHandler;
import org.briarproject.api.blogs.Blog; import org.briarproject.api.blogs.Blog;
import java.util.Collection; import java.util.Collection;
@@ -9,12 +8,12 @@ import java.util.Collection;
public interface FeedController { public interface FeedController {
void onResume(); void onResume();
void onPause(); void onPause();
void loadPosts( void loadPosts(ResultHandler<Collection<BlogPostItem>> resultHandler);
final UiResultHandler<Collection<BlogPostItem>> resultHandler);
void loadPersonalBlog(final UiResultHandler<Blog> resultHandler); void loadPersonalBlog(ResultHandler<Blog> resultHandler);
void setOnBlogPostAddedListener(OnBlogPostAddedListener listener); void setOnBlogPostAddedListener(OnBlogPostAddedListener listener);

8
briar-android/src/org/briarproject/android/blogs/FeedControllerImpl.java
View File

@@ -1,7 +1,7 @@
package org.briarproject.android.blogs; package org.briarproject.android.blogs;
import org.briarproject.android.controller.DbControllerImpl; 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.Blog;
import org.briarproject.api.blogs.BlogManager; import org.briarproject.api.blogs.BlogManager;
import org.briarproject.api.blogs.BlogPostHeader; import org.briarproject.api.blogs.BlogPostHeader;
@@ -41,10 +41,12 @@ public class FeedControllerImpl extends DbControllerImpl
FeedControllerImpl() { FeedControllerImpl() {
} }
@Override
public void onResume() { public void onResume() {
eventBus.addListener(this); eventBus.addListener(this);
} }
@Override
public void onPause() { public void onPause() {
eventBus.removeListener(this); eventBus.removeListener(this);
} }
@@ -70,7 +72,7 @@ public class FeedControllerImpl extends DbControllerImpl
@Override @Override
public void loadPosts( public void loadPosts(
final UiResultHandler<Collection<BlogPostItem>> resultHandler) { final ResultHandler<Collection<BlogPostItem>> resultHandler) {
LOG.info("Loading blog posts..."); LOG.info("Loading blog posts...");
runOnDbThread(new Runnable() { runOnDbThread(new Runnable() {
@@ -102,7 +104,7 @@ public class FeedControllerImpl extends DbControllerImpl
} }
@Override @Override
public void loadPersonalBlog(final UiResultHandler<Blog> resultHandler) { public void loadPersonalBlog(final ResultHandler<Blog> resultHandler) {
LOG.info("Loading personal blog..."); LOG.info("Loading personal blog...");
runOnDbThread(new Runnable() { runOnDbThread(new Runnable() {
@Override @Override

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

@@ -94,8 +94,8 @@ public class FeedFragment extends BaseFragment implements
@Override @Override
public void onStart() { public void onStart() {
super.onStart(); super.onStart();
feedController feedController.loadPersonalBlog(
.loadPersonalBlog(new UiResultHandler<Blog>(getActivity()) { new UiResultHandler<Blog>(getActivity()) {
@Override @Override
public void onResultUi(Blog b) { public void onResultUi(Blog b) {
personalBlog = b; personalBlog = b;

4
briar-android/src/org/briarproject/android/controller/NavDrawerController.java
View File

@@ -1,6 +1,6 @@
package org.briarproject.android.controller; 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.TransportId;
import org.briarproject.api.identity.LocalAuthor; import org.briarproject.api.identity.LocalAuthor;
@@ -11,7 +11,7 @@ public interface NavDrawerController extends ActivityLifecycleController {
boolean isTransportRunning(TransportId transportId); boolean isTransportRunning(TransportId transportId);
void storeLocalAuthor(LocalAuthor author, void storeLocalAuthor(LocalAuthor author,
UiResultHandler<Void> resultHandler); ResultHandler<Void> resultHandler);
LocalAuthor removeAuthorHandle(long handle); LocalAuthor removeAuthorHandle(long handle);
} }

4
briar-android/src/org/briarproject/android/controller/NavDrawerControllerImpl.java
View File

@@ -3,7 +3,7 @@ package org.briarproject.android.controller;
import android.app.Activity; import android.app.Activity;
import org.briarproject.android.api.ReferenceManager; 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.TransportId;
import org.briarproject.api.db.DbException; import org.briarproject.api.db.DbException;
import org.briarproject.api.event.Event; import org.briarproject.api.event.Event;
@@ -111,7 +111,7 @@ public class NavDrawerControllerImpl extends DbControllerImpl
@Override @Override
public void storeLocalAuthor(final LocalAuthor author, public void storeLocalAuthor(final LocalAuthor author,
final UiResultHandler<Void> resultHandler) { final ResultHandler<Void> resultHandler) {
runOnDbThread(new Runnable() { runOnDbThread(new Runnable() {
@Override @Override
public void run() { public void run() {

10
briar-android/src/org/briarproject/android/forum/ForumActivity.java
View File

@@ -46,7 +46,6 @@ import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.logging.Logger;
import javax.inject.Inject; import javax.inject.Inject;
@@ -63,9 +62,6 @@ import static android.widget.Toast.LENGTH_SHORT;
public class ForumActivity extends BriarActivity implements public class ForumActivity extends BriarActivity implements
ForumController.ForumPostListener { ForumController.ForumPostListener {
private static final Logger LOG =
Logger.getLogger(ForumActivity.class.getName());
static final String FORUM_NAME = "briar.FORUM_NAME"; static final String FORUM_NAME = "briar.FORUM_NAME";
private static final int REQUEST_FORUM_SHARED = 3; 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.setEmptyText(getString(R.string.no_forum_posts));
recyclerView.showProgressBar(); recyclerView.showProgressBar();
forumController forumController.loadForum(groupId,
.loadForum(groupId, new UiResultHandler<Boolean>(this) { new UiResultHandler<Boolean>(this) {
@Override @Override
public void onResultUi(Boolean result) { public void onResultUi(Boolean result) {
if (result) { if (result) {
@@ -436,7 +432,7 @@ public class ForumActivity extends BriarActivity implements
private boolean hasVisibleDescendants(ForumEntry forumEntry) { private boolean hasVisibleDescendants(ForumEntry forumEntry) {
int visiblePos = getVisiblePos(forumEntry); int visiblePos = getVisiblePos(forumEntry);
int levelLimit = forumEntry.getLevel(); 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++) { for (int i = visiblePos + 1; i < getItemCount(); i++) {
ForumEntry entry = getVisibleEntry(i); ForumEntry entry = getVisibleEntry(i);
if (entry != null && entry.getLevel() <= levelLimit) if (entry != null && entry.getLevel() <= levelLimit)