Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-21 23:29:52 +01:00
Code Issues Projects Releases Wiki Activity

use the new OwnerReturnShardActivity

Browse Source
This commit is contained in:
ameba23
2021-04-12 15:57:15 +02:00
parent b55ae1ce18
commit c0827eda77
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
briar-android/src/main/AndroidManifest.xml
View File

@@ -166,7 +166,7 @@
</activity> </activity>
<activity <activity
android:name="org.briarproject.briar.android.socialbackup.recover.ReturnShardActivity" android:name="org.briarproject.briar.android.socialbackup.recover.OwnerReturnShardActivity"
android:label="@string/activity_name_recovery" android:label="@string/activity_name_recovery"
android:parentActivityName="org.briarproject.briar.android.account.NewOrRecoverActivity"> android:parentActivityName="org.briarproject.briar.android.account.NewOrRecoverActivity">
<meta-data <meta-data

3
briar-android/src/main/java/org/briarproject/briar/android/account/NewOrRecoverActivity.java
View File

@@ -7,6 +7,7 @@ import org.briarproject.briar.R;
import org.briarproject.briar.android.activity.ActivityComponent; import org.briarproject.briar.android.activity.ActivityComponent;
import org.briarproject.briar.android.activity.BaseActivity; import org.briarproject.briar.android.activity.BaseActivity;
import org.briarproject.briar.android.fragment.BaseFragment; import org.briarproject.briar.android.fragment.BaseFragment;
import org.briarproject.briar.android.socialbackup.recover.OwnerReturnShardActivity;
import org.briarproject.briar.android.socialbackup.recover.RecoverActivity; import org.briarproject.briar.android.socialbackup.recover.RecoverActivity;
import org.briarproject.briar.android.socialbackup.recover.ReturnShardActivity; import org.briarproject.briar.android.socialbackup.recover.ReturnShardActivity;
@@ -47,7 +48,7 @@ public class NewOrRecoverActivity extends BaseActivity implements
@Override @Override
public void recoverAccountChosen() { public void recoverAccountChosen() {
finish(); finish();
Intent i = new Intent(this, ReturnShardActivity.class); Intent i = new Intent(this, OwnerReturnShardActivity.class);
i.addFlags(FLAG_ACTIVITY_NEW_TASK | FLAG_ACTIVITY_CLEAR_TOP | i.addFlags(FLAG_ACTIVITY_NEW_TASK | FLAG_ACTIVITY_CLEAR_TOP |
FLAG_ACTIVITY_CLEAR_TASK | FLAG_ACTIVITY_TASK_ON_HOME); FLAG_ACTIVITY_CLEAR_TASK | FLAG_ACTIVITY_TASK_ON_HOME);
startActivity(i); startActivity(i);