Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-16 04:39:54 +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

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

@@ -4,19 +4,19 @@ import android.content.Context;
import org.briarproject.R;
import org.briarproject.android.ActivityComponent;
import org.briarproject.android.sharing.InvitationActivity;
import org.briarproject.android.sharing.InvitationAdapter;
import org.briarproject.android.sharing.InvitationsActivity;
import org.briarproject.api.privategroup.invitation.GroupInvitationItem;
import javax.inject.Inject;
import static org.briarproject.android.sharing.InvitationAdapter.InvitationClickListener;
public class GroupInvitationsActivity
extends InvitationsActivity<GroupInvitationItem> {
public class GroupInvitationActivity
extends InvitationActivity<GroupInvitationItem> {
@Inject
protected GroupInvitationsController controller;
protected GroupInvitationController controller;
@Override
public void injectActivity(ActivityComponent component) {
@@ -24,7 +24,7 @@ public class GroupInvitationsActivity
}
@Override
protected GroupInvitationsController getController() {
protected GroupInvitationController getController() {
return controller;
}

8
briar-android/src/org/briarproject/android/privategroup/invitation/GroupInvitationController.java Normal file
View File

@@ -0,0 +1,8 @@
package org.briarproject.android.privategroup.invitation;
import org.briarproject.android.sharing.InvitationController;
import org.briarproject.api.privategroup.invitation.GroupInvitationItem;
public interface GroupInvitationController
extends InvitationController<GroupInvitationItem> {
}

14
briar-android/src/org/briarproject/android/privategroup/invitation/GroupInvitationsControllerImpl.java → briar-android/src/org/briarproject/android/privategroup/invitation/GroupInvitationControllerImpl.java
View File

@@ -1,7 +1,7 @@
package org.briarproject.android.privategroup.invitation;
import org.briarproject.android.controller.handler.ResultExceptionHandler;
import org.briarproject.android.sharing.InvitationsControllerImpl;
import org.briarproject.android.sharing.InvitationControllerImpl;
import org.briarproject.api.contact.Contact;
import org.briarproject.api.db.DatabaseExecutor;
import org.briarproject.api.db.DbException;
@@ -22,15 +22,15 @@ import javax.inject.Inject;
import static java.util.logging.Level.WARNING;
public class GroupInvitationsControllerImpl
extends InvitationsControllerImpl<GroupInvitationItem>
implements GroupInvitationsController {
public class GroupInvitationControllerImpl
extends InvitationControllerImpl<GroupInvitationItem>
implements GroupInvitationController {
private final PrivateGroupManager privateGroupManager;
private final GroupInvitationManager groupInvitationManager;
@Inject
GroupInvitationsControllerImpl(@DatabaseExecutor Executor dbExecutor,
GroupInvitationControllerImpl(@DatabaseExecutor Executor dbExecutor,
LifecycleManager lifecycleManager, EventBus eventBus,
PrivateGroupManager privateGroupManager,
GroupInvitationManager groupInvitationManager) {
@@ -50,7 +50,7 @@ public class GroupInvitationsControllerImpl
}
@Override
protected ClientId getClientId() {
protected ClientId getShareableClientId() {
return privateGroupManager.getClientId();
}
@@ -68,7 +68,7 @@ public class GroupInvitationsControllerImpl
@Override
public void run() {
try {
PrivateGroup g = (PrivateGroup) item.getShareable();
PrivateGroup g = item.getShareable();
Contact c = item.getCreator();
groupInvitationManager.respondToInvitation(g, c, accept);
} catch (DbException e) {

8
briar-android/src/org/briarproject/android/privategroup/invitation/GroupInvitationsController.java
View File

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

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.GroupInvitationsActivity;
import org.briarproject.android.privategroup.invitation.GroupInvitationActivity;
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(), GroupInvitationsActivity.class);
Intent i = new Intent(getContext(), GroupInvitationActivity.class);
ActivityOptionsCompat options =
makeCustomAnimation(getActivity(),
android.R.anim.slide_in_left,