mirror of
https://code.briarproject.org/briar/briar.git
synced 2026-02-13 03:09:04 +01:00
merge
This commit is contained in:
@@ -13,6 +13,7 @@ import android.widget.AdapterView.OnItemSelectedListener;
|
||||
import android.widget.Spinner;
|
||||
|
||||
import org.briarproject.R;
|
||||
import org.briarproject.android.ActivityComponent;
|
||||
import org.briarproject.android.AndroidComponent;
|
||||
import org.briarproject.android.fragment.BaseFragment;
|
||||
import org.briarproject.android.identity.CreateIdentityActivity;
|
||||
@@ -59,11 +60,9 @@ public class ChooseIdentityFragment extends BaseFragment
|
||||
@Inject
|
||||
protected volatile IdentityManager identityManager;
|
||||
|
||||
public static ChooseIdentityFragment newInstance() {
|
||||
Bundle args = new Bundle();
|
||||
ChooseIdentityFragment fragment = new ChooseIdentityFragment();
|
||||
fragment.setArguments(args);
|
||||
return fragment;
|
||||
@Inject
|
||||
public ChooseIdentityFragment() {
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -82,11 +81,6 @@ public class ChooseIdentityFragment extends BaseFragment
|
||||
return TAG;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void injectActivity(AndroidComponent component) {
|
||||
component.inject(this);
|
||||
}
|
||||
|
||||
@Nullable
|
||||
@Override
|
||||
public View onCreateView(LayoutInflater inflater, ViewGroup container,
|
||||
|
||||
Reference in New Issue
Block a user