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

Address review comments

Browse Source
This commit is contained in:
Torsten Grote
2016-10-28 15:15:36 -02:00
parent 7b627bb427
commit 2cc650d85f
39 changed files with 209 additions and 179 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
briar-android/src/org/briarproject/android/sharing/BlogInvitationsActivity.java → briar-android/src/org/briarproject/android/sharing/BlogInvitationActivity.java
View File

@@ -10,11 +10,11 @@ import javax.inject.Inject;
import static org.briarproject.android.sharing.InvitationAdapter.InvitationClickListener;
public class BlogInvitationsActivity
extends InvitationsActivity<SharingInvitationItem> {
public class BlogInvitationActivity
extends InvitationActivity<SharingInvitationItem> {
@Inject
BlogInvitationsController controller;
BlogInvitationController controller;
@Override
public void injectActivity(ActivityComponent component) {
@@ -22,7 +22,7 @@ public class BlogInvitationsActivity
}
@Override
protected InvitationsController<SharingInvitationItem> getController() {
protected InvitationController<SharingInvitationItem> getController() {
return controller;
}

4
briar-android/src/org/briarproject/android/sharing/BlogInvitationsController.java → briar-android/src/org/briarproject/android/sharing/BlogInvitationController.java
View File

@@ -2,6 +2,6 @@ package org.briarproject.android.sharing;
import org.briarproject.api.sharing.SharingInvitationItem;
public interface BlogInvitationsController
extends InvitationsController<SharingInvitationItem> {
public interface BlogInvitationController
extends InvitationController<SharingInvitationItem> {
}

10
briar-android/src/org/briarproject/android/sharing/BlogInvitationsControllerImpl.java → briar-android/src/org/briarproject/android/sharing/BlogInvitationControllerImpl.java
View File

@@ -21,15 +21,15 @@ import javax.inject.Inject;
import static java.util.logging.Level.WARNING;
public class BlogInvitationsControllerImpl
extends InvitationsControllerImpl<SharingInvitationItem>
implements BlogInvitationsController {
public class BlogInvitationControllerImpl
extends InvitationControllerImpl<SharingInvitationItem>
implements BlogInvitationController {
private final BlogManager blogManager;
private final BlogSharingManager blogSharingManager;
@Inject
BlogInvitationsControllerImpl(@DatabaseExecutor Executor dbExecutor,
BlogInvitationControllerImpl(@DatabaseExecutor Executor dbExecutor,
LifecycleManager lifecycleManager, EventBus eventBus,
BlogManager blogManager, BlogSharingManager blogSharingManager) {
super(dbExecutor, lifecycleManager, eventBus);
@@ -48,7 +48,7 @@ public class BlogInvitationsControllerImpl
}
@Override
protected ClientId getClientId() {
protected ClientId getShareableClientId() {
return blogManager.getClientId();
}

8
briar-android/src/org/briarproject/android/sharing/ForumInvitationsActivity.java → briar-android/src/org/briarproject/android/sharing/ForumInvitationActivity.java
View File

@@ -10,11 +10,11 @@ import javax.inject.Inject;
import static org.briarproject.android.sharing.InvitationAdapter.InvitationClickListener;
public class ForumInvitationsActivity
extends InvitationsActivity<SharingInvitationItem> {
public class ForumInvitationActivity
extends InvitationActivity<SharingInvitationItem> {
@Inject
ForumInvitationsController controller;
ForumInvitationController controller;
@Override
public void injectActivity(ActivityComponent component) {
@@ -22,7 +22,7 @@ public class ForumInvitationsActivity
}
@Override
protected InvitationsController<SharingInvitationItem> getController() {
protected InvitationController<SharingInvitationItem> getController() {
return controller;
}

4
briar-android/src/org/briarproject/android/sharing/ForumInvitationsController.java → briar-android/src/org/briarproject/android/sharing/ForumInvitationController.java
View File

@@ -2,6 +2,6 @@ package org.briarproject.android.sharing;
import org.briarproject.api.sharing.SharingInvitationItem;
public interface ForumInvitationsController
extends InvitationsController<SharingInvitationItem> {
public interface ForumInvitationController
extends InvitationController<SharingInvitationItem> {
}

10
briar-android/src/org/briarproject/android/sharing/ForumInvitationsControllerImpl.java → briar-android/src/org/briarproject/android/sharing/ForumInvitationControllerImpl.java
View File

@@ -21,15 +21,15 @@ import javax.inject.Inject;
import static java.util.logging.Level.WARNING;
public class ForumInvitationsControllerImpl
extends InvitationsControllerImpl<SharingInvitationItem>
implements ForumInvitationsController {
public class ForumInvitationControllerImpl
extends InvitationControllerImpl<SharingInvitationItem>
implements ForumInvitationController {
private final ForumManager forumManager;
private final ForumSharingManager forumSharingManager;
@Inject
ForumInvitationsControllerImpl(@DatabaseExecutor Executor dbExecutor,
ForumInvitationControllerImpl(@DatabaseExecutor Executor dbExecutor,
LifecycleManager lifecycleManager, EventBus eventBus,
ForumManager forumManager,
ForumSharingManager forumSharingManager) {
@@ -49,7 +49,7 @@ public class ForumInvitationsControllerImpl
}
@Override
protected ClientId getClientId() {
protected ClientId getShareableClientId() {
return forumManager.getClientId();
}

8
briar-android/src/org/briarproject/android/sharing/InvitationsActivity.java → briar-android/src/org/briarproject/android/sharing/InvitationActivity.java
View File

@@ -9,7 +9,7 @@ import android.widget.Toast;
import org.briarproject.R;
import org.briarproject.android.BriarActivity;
import org.briarproject.android.controller.handler.UiResultExceptionHandler;
import org.briarproject.android.sharing.InvitationsController.InvitationListener;
import org.briarproject.android.sharing.InvitationController.InvitationListener;
import org.briarproject.android.view.BriarRecyclerView;
import org.briarproject.api.db.DbException;
import org.briarproject.api.sharing.InvitationItem;
@@ -20,12 +20,12 @@ import java.util.logging.Logger;
import static android.widget.Toast.LENGTH_SHORT;
import static org.briarproject.android.sharing.InvitationAdapter.InvitationClickListener;
public abstract class InvitationsActivity<I extends InvitationItem>
public abstract class InvitationActivity<I extends InvitationItem>
extends BriarActivity
implements InvitationListener, InvitationClickListener<I> {
protected static final Logger LOG =
Logger.getLogger(InvitationsActivity.class.getName());
Logger.getLogger(InvitationActivity.class.getName());
private InvitationAdapter<I, ?> adapter;
private BriarRecyclerView list;
@@ -96,7 +96,7 @@ public abstract class InvitationsActivity<I extends InvitationItem>
});
}
abstract protected InvitationsController<I> getController();
abstract protected InvitationController<I> getController();
protected void respondToInvitation(final I item,
final boolean accept) {

2
briar-android/src/org/briarproject/android/sharing/InvitationsController.java → briar-android/src/org/briarproject/android/sharing/InvitationController.java
View File

@@ -7,7 +7,7 @@ import org.briarproject.api.sharing.InvitationItem;
import java.util.Collection;
public interface InvitationsController<I extends InvitationItem>
public interface InvitationController<I extends InvitationItem>
extends ActivityLifecycleController {
void loadInvitations(boolean clear,

16
briar-android/src/org/briarproject/android/sharing/InvitationsControllerImpl.java → briar-android/src/org/briarproject/android/sharing/InvitationControllerImpl.java
View File

@@ -25,17 +25,17 @@ import java.util.logging.Logger;
import static java.util.logging.Level.INFO;
import static java.util.logging.Level.WARNING;
public abstract class InvitationsControllerImpl<I extends InvitationItem>
public abstract class InvitationControllerImpl<I extends InvitationItem>
extends DbControllerImpl
implements InvitationsController<I>, EventListener {
implements InvitationController<I>, EventListener {
protected static final Logger LOG =
Logger.getLogger(InvitationsControllerImpl.class.getName());
Logger.getLogger(InvitationControllerImpl.class.getName());
private final EventBus eventBus;
protected InvitationListener listener;
public InvitationsControllerImpl(@DatabaseExecutor Executor dbExecutor,
public InvitationControllerImpl(@DatabaseExecutor Executor dbExecutor,
LifecycleManager lifecycleManager, EventBus eventBus) {
super(dbExecutor, lifecycleManager);
this.eventBus = eventBus;
@@ -70,21 +70,21 @@ public abstract class InvitationsControllerImpl<I extends InvitationItem>
} else if (e instanceof GroupAddedEvent) {
GroupAddedEvent g = (GroupAddedEvent) e;
ClientId cId = g.getGroup().getClientId();
if (cId.equals(getClientId())) {
if (cId.equals(getShareableClientId())) {
LOG.info("Group added, reloading");
listener.loadInvitations(false);
}
} else if (e instanceof GroupRemovedEvent) {
GroupRemovedEvent g = (GroupRemovedEvent) e;
ClientId cId = g.getGroup().getClientId();
if (cId.equals(getClientId())) {
if (cId.equals(getShareableClientId())) {
LOG.info("Group removed, reloading");
listener.loadInvitations(true);
listener.loadInvitations(false);
}
}
}
protected abstract ClientId getClientId();
protected abstract ClientId getShareableClientId();
@Override
public void loadInvitations(final boolean clear,

4
briar-android/src/org/briarproject/android/sharing/BlogShareActivity.java → briar-android/src/org/briarproject/android/sharing/ShareBlogActivity.java
View File

@@ -12,7 +12,7 @@ import javax.inject.Inject;
import static org.briarproject.api.sync.SyncConstants.MAX_MESSAGE_BODY_LENGTH;
public class BlogShareActivity extends ShareActivity {
public class ShareBlogActivity extends ShareActivity {
// Fields that are accessed from background threads must be volatile
@Inject
@@ -20,7 +20,7 @@ public class BlogShareActivity extends ShareActivity {
@Override
BaseMessageFragment getMessageFragment() {
return BlogShareMessageFragment.newInstance();
return ShareBlogMessageFragment.newInstance();
}
@Override

8
briar-android/src/org/briarproject/android/sharing/BlogShareMessageFragment.java → briar-android/src/org/briarproject/android/sharing/ShareBlogMessageFragment.java
View File

@@ -9,12 +9,12 @@ import android.view.ViewGroup;
import org.briarproject.R;
import org.briarproject.android.ActivityComponent;
public class BlogShareMessageFragment extends BaseMessageFragment {
public class ShareBlogMessageFragment extends BaseMessageFragment {
public final static String TAG = BlogShareMessageFragment.class.getName();
public final static String TAG = ShareBlogMessageFragment.class.getName();
public static BlogShareMessageFragment newInstance() {
return new BlogShareMessageFragment();
public static ShareBlogMessageFragment newInstance() {
return new ShareBlogMessageFragment();
}
@Override

4
briar-android/src/org/briarproject/android/sharing/ForumShareActivity.java → briar-android/src/org/briarproject/android/sharing/ShareForumActivity.java
View File

@@ -12,7 +12,7 @@ import javax.inject.Inject;
import static org.briarproject.api.sync.SyncConstants.MAX_MESSAGE_BODY_LENGTH;
public class ForumShareActivity extends ShareActivity {
public class ShareForumActivity extends ShareActivity {
// Fields that are accessed from background threads must be volatile
@Inject
@@ -20,7 +20,7 @@ public class ForumShareActivity extends ShareActivity {
@Override
BaseMessageFragment getMessageFragment() {
return ForumShareMessageFragment.newInstance();
return ShareForumMessageFragment.newInstance();
}
@Override

8
briar-android/src/org/briarproject/android/sharing/ForumShareMessageFragment.java → briar-android/src/org/briarproject/android/sharing/ShareForumMessageFragment.java
View File

@@ -9,12 +9,12 @@ import android.view.ViewGroup;
import org.briarproject.R;
import org.briarproject.android.ActivityComponent;
public class ForumShareMessageFragment extends BaseMessageFragment {
public class ShareForumMessageFragment extends BaseMessageFragment {
public final static String TAG = ForumShareMessageFragment.class.getName();
public final static String TAG = ShareForumMessageFragment.class.getName();
public static ForumShareMessageFragment newInstance() {
return new ForumShareMessageFragment();
public static ShareForumMessageFragment newInstance() {
return new ShareForumMessageFragment();
}
@Override