diff --git a/briar-android/src/main/AndroidManifest.xml b/briar-android/src/main/AndroidManifest.xml index b7f8eba96..d8353ebe9 100644 --- a/briar-android/src/main/AndroidManifest.xml +++ b/briar-android/src/main/AndroidManifest.xml @@ -165,6 +165,15 @@ android:value="org.briarproject.briar.android.account.NewOrRecoverActivity" /> + + + + viewModel.onContinueClicked()); - - return view; - } +// @Override +// public void onCreate(@Nullable Bundle savedInstanceState) { +// super.onCreate(savedInstanceState); +// requireActivity().setTitle(R.string.title_recovery_mode); +// } @Override public void injectFragment(ActivityComponent component) { @@ -53,7 +40,20 @@ public class OwnerRecoveryModeExplainerFragment extends BaseFragment { } @Override - public String getUniqueTag() { - return TAG; + public String getUniqueTag() { return TAG; } + + @Nullable + @Override + public View onCreateView(@NonNull LayoutInflater inflater, + @Nullable ViewGroup container, + @Nullable Bundle savedInstanceState) { + System.out.println("GOt here *************************************"); + View view = inflater.inflate(R.layout.fragment_recovery_owner_explainer, + container, false); + Button button = view.findViewById(R.id.beginButton); + button.setOnClickListener(e -> viewModel.onContinueClicked()); + + return view; } + } diff --git a/briar-android/src/main/java/org/briarproject/briar/android/socialbackup/recover/ReturnShardActivity.java b/briar-android/src/main/java/org/briarproject/briar/android/socialbackup/recover/ReturnShardActivity.java index d997c8e15..c246c84ea 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/socialbackup/recover/ReturnShardActivity.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/socialbackup/recover/ReturnShardActivity.java @@ -10,7 +10,7 @@ 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.activity.BriarActivity; +import org.briarproject.briar.android.activity.BaseActivity; import org.briarproject.briar.android.contact.add.nearby.AddNearbyContactErrorFragment; import org.briarproject.briar.android.contact.add.nearby.AddNearbyContactFragment; import org.briarproject.briar.android.contact.add.nearby.AddNearbyContactPermissionManager; @@ -24,25 +24,21 @@ import javax.inject.Inject; import androidx.activity.result.ActivityResultLauncher; import androidx.activity.result.contract.ActivityResultContracts; -import androidx.appcompat.widget.Toolbar; import androidx.fragment.app.FragmentManager; import androidx.lifecycle.ViewModelProvider; import static android.bluetooth.BluetoothAdapter.ACTION_REQUEST_DISCOVERABLE; import static android.content.Intent.FLAG_ACTIVITY_CLEAR_TOP; import static android.widget.Toast.LENGTH_LONG; -import static java.util.Objects.requireNonNull; import static java.util.logging.Logger.getLogger; @MethodsNotNullByDefault @ParametersNotNullByDefault -public class ReturnShardActivity extends BriarActivity +public class ReturnShardActivity extends BaseActivity implements BaseFragment.BaseFragmentListener { private static final Logger LOG = - getLogger( - org.briarproject.briar.android.contact.add.nearby.AddNearbyContactActivity.class - .getName()); + getLogger(ReturnShardActivity.class.getName()); @Inject ViewModelProvider.Factory viewModelFactory; @@ -72,10 +68,8 @@ public class ReturnShardActivity extends BriarActivity @Override public void onCreate(@Nullable Bundle state) { super.onCreate(state); - setContentView(R.layout.activity_fragment_container_toolbar); - Toolbar toolbar = findViewById(R.id.toolbar); - setSupportActionBar(toolbar); - requireNonNull(getSupportActionBar()).setDisplayHomeAsUpEnabled(true); + + setContentView(R.layout.activity_fragment_container); if (state == null) { showInitialFragment(getExplainerFragment()); } @@ -86,8 +80,6 @@ public class ReturnShardActivity extends BriarActivity viewModel.getShowQrCodeFragment().observeEvent(this, show -> { if (show) showQrCodeFragment(); }); - requireNonNull(getSupportActionBar()) - .setTitle(R.string.add_contact_title); viewModel.getState() .observe(this, this::onReturnShardStateChanged); } @@ -235,4 +227,9 @@ public class ReturnShardActivity extends BriarActivity showNextFragment(new AddNearbyContactErrorFragment()); } + @Override + @Deprecated + public void runOnDbThread(Runnable runnable) { + throw new RuntimeException("Don't use this deprecated method here."); + } } diff --git a/briar-android/src/main/java/org/briarproject/briar/android/socialbackup/recover/ReturnShardModule.java b/briar-android/src/main/java/org/briarproject/briar/android/socialbackup/recover/ReturnShardModule.java new file mode 100644 index 000000000..749e37a90 --- /dev/null +++ b/briar-android/src/main/java/org/briarproject/briar/android/socialbackup/recover/ReturnShardModule.java @@ -0,0 +1,20 @@ +package org.briarproject.briar.android.socialbackup.recover; + +import org.briarproject.briar.android.viewmodel.ViewModelKey; + +import androidx.lifecycle.ViewModel; +import dagger.Binds; +import dagger.Module; +import dagger.multibindings.IntoMap; + + +@Module +public abstract class ReturnShardModule { + + @Binds + @IntoMap + @ViewModelKey(ReturnShardViewModel.class) + abstract ViewModel bindContactExchangeViewModel( + ReturnShardViewModel returnShardViewModel); + +}