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

7
briar-android/src/org/briarproject/android/sharing/InvitationsBlogActivity.java → briar-android/src/org/briarproject/android/sharing/BlogInvitationsActivity.java
View File

@@ -10,11 +10,11 @@ import javax.inject.Inject;
import static org.briarproject.android.sharing.InvitationAdapter.InvitationClickListener;
public class InvitationsBlogActivity
public class BlogInvitationsActivity
extends InvitationsActivity<SharingInvitationItem> {
@Inject
InvitationsBlogController controller;
BlogInvitationsController controller;
@Override
public void injectActivity(ActivityComponent component) {
@@ -28,7 +28,8 @@ public class InvitationsBlogActivity
@Override
protected InvitationAdapter<SharingInvitationItem, ?> getAdapter(
Context ctx, InvitationClickListener listener) {
Context ctx,
InvitationClickListener<SharingInvitationItem> listener) {
return new SharingInvitationAdapter(ctx, listener);
}

2
briar-android/src/org/briarproject/android/sharing/InvitationsBlogController.java → briar-android/src/org/briarproject/android/sharing/BlogInvitationsController.java
View File

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

6
briar-android/src/org/briarproject/android/sharing/InvitationsBlogControllerImpl.java → briar-android/src/org/briarproject/android/sharing/BlogInvitationsControllerImpl.java
View File

@@ -21,15 +21,15 @@ import javax.inject.Inject;
import static java.util.logging.Level.WARNING;
public class InvitationsBlogControllerImpl
public class BlogInvitationsControllerImpl
extends InvitationsControllerImpl<SharingInvitationItem>
implements InvitationsBlogController {
implements BlogInvitationsController {
private final BlogManager blogManager;
private final BlogSharingManager blogSharingManager;
@Inject
InvitationsBlogControllerImpl(@DatabaseExecutor Executor dbExecutor,
BlogInvitationsControllerImpl(@DatabaseExecutor Executor dbExecutor,
LifecycleManager lifecycleManager, EventBus eventBus,
BlogManager blogManager, BlogSharingManager blogSharingManager) {
super(dbExecutor, lifecycleManager, eventBus);

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

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

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

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

2
briar-android/src/org/briarproject/android/sharing/SharingStatusBlogActivity.java → briar-android/src/org/briarproject/android/sharing/BlogSharingStatusActivity.java
View File

@@ -9,7 +9,7 @@ import java.util.Collection;
import javax.inject.Inject;
public class SharingStatusBlogActivity extends SharingStatusActivity {
public class BlogSharingStatusActivity extends SharingStatusActivity {
// Fields that are accessed from background threads must be volatile
@Inject

7
briar-android/src/org/briarproject/android/sharing/InvitationsForumActivity.java → briar-android/src/org/briarproject/android/sharing/ForumInvitationsActivity.java
View File

@@ -10,11 +10,11 @@ import javax.inject.Inject;
import static org.briarproject.android.sharing.InvitationAdapter.InvitationClickListener;
public class InvitationsForumActivity
public class ForumInvitationsActivity
extends InvitationsActivity<SharingInvitationItem> {
@Inject
InvitationsForumController controller;
ForumInvitationsController controller;
@Override
public void injectActivity(ActivityComponent component) {
@@ -28,7 +28,8 @@ public class InvitationsForumActivity
@Override
protected InvitationAdapter<SharingInvitationItem, ?> getAdapter(
Context ctx, InvitationClickListener listener) {
Context ctx,
InvitationClickListener<SharingInvitationItem> listener) {
return new SharingInvitationAdapter(ctx, listener);
}

2
briar-android/src/org/briarproject/android/sharing/InvitationsForumController.java → briar-android/src/org/briarproject/android/sharing/ForumInvitationsController.java
View File

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

6
briar-android/src/org/briarproject/android/sharing/InvitationsForumControllerImpl.java → briar-android/src/org/briarproject/android/sharing/ForumInvitationsControllerImpl.java
View File

@@ -21,15 +21,15 @@ import javax.inject.Inject;
import static java.util.logging.Level.WARNING;
public class InvitationsForumControllerImpl
public class ForumInvitationsControllerImpl
extends InvitationsControllerImpl<SharingInvitationItem>
implements InvitationsForumController {
implements ForumInvitationsController {
private final ForumManager forumManager;
private final ForumSharingManager forumSharingManager;
@Inject
InvitationsForumControllerImpl(@DatabaseExecutor Executor dbExecutor,
ForumInvitationsControllerImpl(@DatabaseExecutor Executor dbExecutor,
LifecycleManager lifecycleManager, EventBus eventBus,
ForumManager forumManager,
ForumSharingManager forumSharingManager) {

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

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

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

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

2
briar-android/src/org/briarproject/android/sharing/SharingStatusForumActivity.java → briar-android/src/org/briarproject/android/sharing/ForumSharingStatusActivity.java
View File

@@ -9,7 +9,7 @@ import java.util.Collection;
import javax.inject.Inject;
public class SharingStatusForumActivity extends SharingStatusActivity {
public class ForumSharingStatusActivity extends SharingStatusActivity {
// Fields that are accessed from background threads must be volatile
@Inject

2
briar-android/src/org/briarproject/android/sharing/InvitationsActivity.java
View File

@@ -45,7 +45,7 @@ public abstract class InvitationsActivity<I extends InvitationItem>
}
abstract protected InvitationAdapter<I, ?> getAdapter(Context ctx,
InvitationClickListener listener);
InvitationClickListener<I> listener);
@Override
public void onStart() {