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

Address review issues

Browse Source
This commit is contained in:
Torsten Grote
2016-10-25 15:52:43 -02:00
parent 42175dca7a
commit f027b832d4
29 changed files with 139 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
briar-android/src/org/briarproject/android/privategroup/invitation/InvitationGroupAdapter.java → briar-android/src/org/briarproject/android/privategroup/invitation/GroupInvitationAdapter.java
View File

@@ -6,10 +6,10 @@ import android.view.ViewGroup;
import org.briarproject.android.sharing.InvitationAdapter;
import org.briarproject.api.privategroup.invitation.GroupInvitationItem;
class InvitationGroupAdapter extends
class GroupInvitationAdapter extends
InvitationAdapter<GroupInvitationItem, GroupInvitationViewHolder> {
InvitationGroupAdapter(Context ctx,
GroupInvitationAdapter(Context ctx,
InvitationClickListener<GroupInvitationItem> listener) {
super(ctx, GroupInvitationItem.class, listener);
}

10
briar-android/src/org/briarproject/android/privategroup/invitation/InvitationsGroupActivity.java → briar-android/src/org/briarproject/android/privategroup/invitation/GroupInvitationsActivity.java
View File

@@ -12,11 +12,11 @@ import javax.inject.Inject;
import static org.briarproject.android.sharing.InvitationAdapter.InvitationClickListener;
public class InvitationsGroupActivity
public class GroupInvitationsActivity
extends InvitationsActivity<GroupInvitationItem> {
@Inject
protected InvitationsGroupController controller;
protected GroupInvitationsController controller;
@Override
public void injectActivity(ActivityComponent component) {
@@ -24,14 +24,14 @@ public class InvitationsGroupActivity
}
@Override
protected InvitationsGroupController getController() {
protected GroupInvitationsController getController() {
return controller;
}
@Override
protected InvitationAdapter<GroupInvitationItem, ?> getAdapter(Context ctx,
InvitationClickListener listener) {
return new InvitationGroupAdapter(ctx, listener);
InvitationClickListener<GroupInvitationItem> listener) {
return new GroupInvitationAdapter(ctx, listener);
}
@Override

2
briar-android/src/org/briarproject/android/privategroup/invitation/InvitationsGroupController.java → briar-android/src/org/briarproject/android/privategroup/invitation/GroupInvitationsController.java
View File

@@ -3,6 +3,6 @@ package org.briarproject.android.privategroup.invitation;
import org.briarproject.android.sharing.InvitationsController;
import org.briarproject.api.privategroup.invitation.GroupInvitationItem;
public interface InvitationsGroupController
public interface GroupInvitationsController
extends InvitationsController<GroupInvitationItem> {
}

6
briar-android/src/org/briarproject/android/privategroup/invitation/InvitationsGroupControllerImpl.java → briar-android/src/org/briarproject/android/privategroup/invitation/GroupInvitationsControllerImpl.java
View File

@@ -22,15 +22,15 @@ import javax.inject.Inject;
import static java.util.logging.Level.WARNING;
public class InvitationsGroupControllerImpl
public class GroupInvitationsControllerImpl
extends InvitationsControllerImpl<GroupInvitationItem>
implements InvitationsGroupController {
implements GroupInvitationsController {
private final PrivateGroupManager privateGroupManager;
private final GroupInvitationManager groupInvitationManager;
@Inject
InvitationsGroupControllerImpl(@DatabaseExecutor Executor dbExecutor,
GroupInvitationsControllerImpl(@DatabaseExecutor Executor dbExecutor,
LifecycleManager lifecycleManager, EventBus eventBus,
PrivateGroupManager privateGroupManager,
GroupInvitationManager groupInvitationManager) {

4
briar-android/src/org/briarproject/android/privategroup/list/GroupListFragment.java
View File

@@ -21,7 +21,7 @@ import org.briarproject.android.ActivityComponent;
import org.briarproject.android.controller.handler.UiResultExceptionHandler;
import org.briarproject.android.fragment.BaseFragment;
import org.briarproject.android.privategroup.creation.CreateGroupActivity;
import org.briarproject.android.privategroup.invitation.InvitationsGroupActivity;
import org.briarproject.android.privategroup.invitation.GroupInvitationsActivity;
import org.briarproject.android.privategroup.list.GroupListController.GroupListListener;
import org.briarproject.android.privategroup.list.GroupViewHolder.OnGroupRemoveClickListener;
import org.briarproject.android.view.BriarRecyclerView;
@@ -221,7 +221,7 @@ public class GroupListFragment extends BaseFragment implements
*/
@Override
public void onClick(View v) {
Intent i = new Intent(getContext(), InvitationsGroupActivity.class);
Intent i = new Intent(getContext(), GroupInvitationsActivity.class);
ActivityOptionsCompat options =
makeCustomAnimation(getActivity(),
android.R.anim.slide_in_left,