mirror of
https://code.briarproject.org/briar/briar.git
synced 2026-02-19 14:19:53 +01:00
fix problems so that the mockup fragments build
This commit is contained in:
@@ -77,6 +77,12 @@ import org.briarproject.briar.android.sharing.ShareBlogFragment;
|
|||||||
import org.briarproject.briar.android.sharing.ShareForumActivity;
|
import org.briarproject.briar.android.sharing.ShareForumActivity;
|
||||||
import org.briarproject.briar.android.sharing.ShareForumFragment;
|
import org.briarproject.briar.android.sharing.ShareForumFragment;
|
||||||
import org.briarproject.briar.android.sharing.SharingModule;
|
import org.briarproject.briar.android.sharing.SharingModule;
|
||||||
|
import org.briarproject.briar.android.socialbackup.CustodianDisplayFragment;
|
||||||
|
import org.briarproject.briar.android.socialbackup.CustodianSelectorFragment;
|
||||||
|
import org.briarproject.briar.android.socialbackup.DistributedBackupActivity;
|
||||||
|
import org.briarproject.briar.android.socialbackup.OldDistributedBackupActivity;
|
||||||
|
import org.briarproject.briar.android.socialbackup.ShardsSentFragment;
|
||||||
|
import org.briarproject.briar.android.socialbackup.ThresholdSelectorFragment;
|
||||||
import org.briarproject.briar.android.splash.SplashScreenActivity;
|
import org.briarproject.briar.android.splash.SplashScreenActivity;
|
||||||
import org.briarproject.briar.android.test.TestDataActivity;
|
import org.briarproject.briar.android.test.TestDataActivity;
|
||||||
|
|
||||||
@@ -238,4 +244,15 @@ public interface ActivityComponent {
|
|||||||
|
|
||||||
void inject(ConfirmAvatarDialogFragment fragment);
|
void inject(ConfirmAvatarDialogFragment fragment);
|
||||||
|
|
||||||
|
void inject(ThresholdSelectorFragment thresholdSelectorFragment);
|
||||||
|
|
||||||
|
void inject(DistributedBackupActivity distributedBackupActivity);
|
||||||
|
|
||||||
|
void inject(CustodianDisplayFragment custodianDisplayFragment);
|
||||||
|
|
||||||
|
void inject(CustodianSelectorFragment custodianSelectorFragment);
|
||||||
|
|
||||||
|
void inject(ShardsSentFragment shardsSentFragment);
|
||||||
|
|
||||||
|
void inject(OldDistributedBackupActivity oldDistributedBackupActivity);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -18,7 +18,7 @@ public abstract class ContactSelectorFragment extends
|
|||||||
|
|
||||||
public static final String TAG = ContactSelectorFragment.class.getName();
|
public static final String TAG = ContactSelectorFragment.class.getName();
|
||||||
|
|
||||||
private Menu menu;
|
protected Menu menu;
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected ContactSelectorAdapter getAdapter(Context context,
|
protected ContactSelectorAdapter getAdapter(Context context,
|
||||||
|
|||||||
@@ -1,88 +0,0 @@
|
|||||||
package org.briarproject.briar.android.socialbackup;
|
|
||||||
|
|
||||||
import android.content.Context;
|
|
||||||
import android.os.Bundle;
|
|
||||||
import android.view.LayoutInflater;
|
|
||||||
import android.view.View;
|
|
||||||
import android.view.ViewGroup;
|
|
||||||
import android.widget.TextView;
|
|
||||||
|
|
||||||
import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault;
|
|
||||||
import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault;
|
|
||||||
import org.briarproject.briar.R;
|
|
||||||
import org.briarproject.briar.android.activity.ActivityComponent;
|
|
||||||
import org.briarproject.briar.android.socialbackup.creation.CreateBackupController;
|
|
||||||
import org.briarproject.briar.android.contact.BaseContactListAdapter;
|
|
||||||
import org.briarproject.briar.android.contactselection.BaseContactSelectorFragment;
|
|
||||||
import org.briarproject.briar.android.contactselection.ContactDisplayAdapter;
|
|
||||||
import org.briarproject.briar.android.contactselection.ContactSelectorController;
|
|
||||||
import org.briarproject.briar.android.contactselection.SelectableContactItem;
|
|
||||||
|
|
||||||
import javax.inject.Inject;
|
|
||||||
|
|
||||||
import androidx.annotation.Nullable;
|
|
||||||
|
|
||||||
import static java.util.Objects.requireNonNull;
|
|
||||||
|
|
||||||
@MethodsNotNullByDefault
|
|
||||||
@ParametersNotNullByDefault
|
|
||||||
public class CustodianDisplayFragment extends BaseContactSelectorFragment<SelectableContactItem, ContactDisplayAdapter> {
|
|
||||||
|
|
||||||
public static final String TAG = CustodianDisplayFragment.class.getName();
|
|
||||||
|
|
||||||
@Inject
|
|
||||||
CreateBackupController controller;
|
|
||||||
|
|
||||||
public static CustodianDisplayFragment newInstance() {
|
|
||||||
Bundle args = new Bundle();
|
|
||||||
args.putInt(BaseContactSelectorFragment.ARG_LAYOUT, R.layout.list_with_headline);
|
|
||||||
CustodianDisplayFragment fragment = new CustodianDisplayFragment();
|
|
||||||
fragment.setArguments(args);
|
|
||||||
|
|
||||||
return fragment;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
protected ContactDisplayAdapter getAdapter(Context context,
|
|
||||||
BaseContactListAdapter.OnContactClickListener<SelectableContactItem> listener) {
|
|
||||||
return new ContactDisplayAdapter(context, listener);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
protected void onSelectionChanged() {
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
public View onCreateView(LayoutInflater inflater,
|
|
||||||
@javax.annotation.Nullable ViewGroup container,
|
|
||||||
@javax.annotation.Nullable Bundle savedInstanceState) {
|
|
||||||
|
|
||||||
View view = super.onCreateView(inflater, container, savedInstanceState);
|
|
||||||
TextView headline = view.findViewById(R.id.headline);
|
|
||||||
headline.setText(R.string.backup_created);
|
|
||||||
return view;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void injectFragment(ActivityComponent component) {
|
|
||||||
component.inject(this);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onCreate(@Nullable Bundle savedInstanceState) {
|
|
||||||
super.onCreate(savedInstanceState);
|
|
||||||
requireActivity().setTitle(R.string.activity_name_distributed_backup);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
protected ContactSelectorController<SelectableContactItem> getController() {
|
|
||||||
controller.setMax(5);
|
|
||||||
return controller;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public String getUniqueTag() {
|
|
||||||
return TAG;
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
@@ -15,6 +15,7 @@ import org.briarproject.bramble.api.sync.GroupId;
|
|||||||
import org.briarproject.bramble.api.system.Clock;
|
import org.briarproject.bramble.api.system.Clock;
|
||||||
import org.briarproject.briar.android.contactselection.ContactSelectorControllerImpl;
|
import org.briarproject.briar.android.contactselection.ContactSelectorControllerImpl;
|
||||||
import org.briarproject.briar.android.controller.handler.ResultExceptionHandler;
|
import org.briarproject.briar.android.controller.handler.ResultExceptionHandler;
|
||||||
|
import org.briarproject.briar.api.identity.AuthorManager;
|
||||||
import org.briarproject.briar.api.privategroup.GroupMessage;
|
import org.briarproject.briar.api.privategroup.GroupMessage;
|
||||||
import org.briarproject.briar.api.privategroup.GroupMessageFactory;
|
import org.briarproject.briar.api.privategroup.GroupMessageFactory;
|
||||||
import org.briarproject.briar.api.privategroup.PrivateGroup;
|
import org.briarproject.briar.api.privategroup.PrivateGroup;
|
||||||
@@ -67,8 +68,8 @@ class CreateBackupControllerImpl extends ContactSelectorControllerImpl
|
|||||||
GroupMessageFactory groupMessageFactory,
|
GroupMessageFactory groupMessageFactory,
|
||||||
PrivateGroupManager groupManager,
|
PrivateGroupManager groupManager,
|
||||||
GroupInvitationFactory groupInvitationFactory,
|
GroupInvitationFactory groupInvitationFactory,
|
||||||
GroupInvitationManager groupInvitationManager, Clock clock) {
|
GroupInvitationManager groupInvitationManager, Clock clock, AuthorManager authorManager) {
|
||||||
super(dbExecutor, lifecycleManager, contactManager);
|
super(dbExecutor, lifecycleManager, contactManager, authorManager);
|
||||||
this.cryptoExecutor = cryptoExecutor;
|
this.cryptoExecutor = cryptoExecutor;
|
||||||
this.contactManager = contactManager;
|
this.contactManager = contactManager;
|
||||||
this.identityManager = identityManager;
|
this.identityManager = identityManager;
|
||||||
|
|||||||
Reference in New Issue
Block a user