mirror of
https://code.briarproject.org/briar/briar.git
synced 2026-02-12 02:39:05 +01:00
Controllers should depend on ResultHandler not its impl.
This commit is contained in:
@@ -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<Boolean>(this) {
|
||||
blogController.loadBlog(groupId, false,
|
||||
new UiResultHandler<Boolean>(this) {
|
||||
@Override
|
||||
public void onResultUi(Boolean result) {
|
||||
if (result) {
|
||||
|
||||
@@ -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<Collection<BlogPostItem>> resultHandler);
|
||||
void loadPosts(ResultHandler<Collection<BlogPostItem>> resultHandler);
|
||||
|
||||
void loadPersonalBlog(final UiResultHandler<Blog> resultHandler);
|
||||
void loadPersonalBlog(ResultHandler<Blog> resultHandler);
|
||||
|
||||
void setOnBlogPostAddedListener(OnBlogPostAddedListener listener);
|
||||
|
||||
|
||||
@@ -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<Collection<BlogPostItem>> resultHandler) {
|
||||
final ResultHandler<Collection<BlogPostItem>> resultHandler) {
|
||||
|
||||
LOG.info("Loading blog posts...");
|
||||
runOnDbThread(new Runnable() {
|
||||
@@ -102,7 +104,7 @@ public class FeedControllerImpl extends DbControllerImpl
|
||||
}
|
||||
|
||||
@Override
|
||||
public void loadPersonalBlog(final UiResultHandler<Blog> resultHandler) {
|
||||
public void loadPersonalBlog(final ResultHandler<Blog> resultHandler) {
|
||||
LOG.info("Loading personal blog...");
|
||||
runOnDbThread(new Runnable() {
|
||||
@Override
|
||||
|
||||
@@ -94,8 +94,8 @@ public class FeedFragment extends BaseFragment implements
|
||||
@Override
|
||||
public void onStart() {
|
||||
super.onStart();
|
||||
feedController
|
||||
.loadPersonalBlog(new UiResultHandler<Blog>(getActivity()) {
|
||||
feedController.loadPersonalBlog(
|
||||
new UiResultHandler<Blog>(getActivity()) {
|
||||
@Override
|
||||
public void onResultUi(Blog b) {
|
||||
personalBlog = b;
|
||||
|
||||
@@ -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<Void> resultHandler);
|
||||
ResultHandler<Void> resultHandler);
|
||||
|
||||
LocalAuthor removeAuthorHandle(long handle);
|
||||
}
|
||||
|
||||
@@ -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<Void> resultHandler) {
|
||||
final ResultHandler<Void> resultHandler) {
|
||||
runOnDbThread(new Runnable() {
|
||||
@Override
|
||||
public void run() {
|
||||
|
||||
@@ -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<Boolean>(this) {
|
||||
forumController.loadForum(groupId,
|
||||
new UiResultHandler<Boolean>(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)
|
||||
|
||||
Reference in New Issue
Block a user