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

add new or recover screen - displays fragment with buttons

Browse Source
This commit is contained in:
ameba23
2021-03-10 09:08:34 +01:00
parent ac9c71f7eb
commit 58f803a48a
8 changed files with 25 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -134,6 +134,15 @@
</intent-filter>
</activity>
<activity
android:name="org.briarproject.briar.android.account.NewOrRecoverActivity"
android:label="@string/activity_name_new_or_recover_account"
android:parentActivityName="org.briarproject.briar.android.login.StartupActivity">
<meta-data
android:name="android.support.PARENT_ACTIVITY"
android:value="org.briarproject.briar.android.login.StartupActivity" />
</activity>
<activity
android:name="org.briarproject.briar.android.socialbackup.DistributedBackupActivity"
android:label="@string/activity_name_distributed_backup"

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

@@ -5,8 +5,9 @@ import android.os.Bundle;
import org.briarproject.briar.R;
import org.briarproject.briar.android.activity.ActivityComponent;
import org.briarproject.briar.android.activity.BaseActivity;
import org.briarproject.briar.android.fragment.BaseFragment;
public class NewOrRecoverActivity extends BaseActivity {
public class NewOrRecoverActivity extends BaseActivity implements BaseFragment.BaseFragmentListener {
@Override
public void injectActivity(ActivityComponent component) {
@@ -18,5 +19,13 @@ public class NewOrRecoverActivity extends BaseActivity {
super.onCreate(state);
// fade-in after splash screen instead of default animation
overridePendingTransition(R.anim.fade_in, R.anim.fade_out);
setContentView(R.layout.activity_fragment_container);
NewOrRecoverFragment fragment = NewOrRecoverFragment.newInstance();
showInitialFragment(fragment);
}
@Override
public void runOnDbThread(Runnable runnable) {
}
}

1
briar-android/src/main/java/org/briarproject/briar/android/account/NewOrRecoverFragment.java
View File

@@ -46,5 +46,4 @@ public class NewOrRecoverFragment extends BaseFragment {
public void injectFragment(ActivityComponent component) {
component.inject(this);
}
}

3
briar-android/src/main/java/org/briarproject/briar/android/activity/ActivityComponent.java
View File

@@ -7,6 +7,7 @@ import org.briarproject.briar.android.AndroidComponent;
import org.briarproject.briar.android.StartupFailureActivity;
import org.briarproject.briar.android.account.AuthorNameFragment;
import org.briarproject.briar.android.account.DozeFragment;
import org.briarproject.briar.android.account.NewOrRecoverActivity;
import org.briarproject.briar.android.account.NewOrRecoverFragment;
import org.briarproject.briar.android.account.SetPasswordFragment;
import org.briarproject.briar.android.account.SetupActivity;
@@ -195,6 +196,8 @@ public interface ActivityComponent {
void inject(CrashReportActivity crashReportActivity);
void inject(NewOrRecoverActivity newOrRecoverActivity);
// Fragments
void inject(AuthorNameFragment fragment);

3
briar-android/src/main/java/org/briarproject/briar/android/login/StartupActivity.java
View File

@@ -7,6 +7,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.BriarService;
import org.briarproject.briar.android.account.NewOrRecoverActivity;
import org.briarproject.briar.android.account.SetupActivity;
import org.briarproject.briar.android.activity.ActivityComponent;
import org.briarproject.briar.android.activity.BaseActivity;
@@ -107,7 +108,7 @@ public class StartupActivity extends BaseActivity implements
private void onAccountDeleted() {
setResult(RESULT_CANCELED);
finish();
Intent i = new Intent(this, SetupActivity.class);
Intent i = new Intent(this, NewOrRecoverActivity.class);
i.addFlags(FLAG_ACTIVITY_NEW_TASK | FLAG_ACTIVITY_CLEAR_TOP |
FLAG_ACTIVITY_CLEAR_TASK | FLAG_ACTIVITY_TASK_ON_HOME);
startActivity(i);

3
briar-android/src/main/java/org/briarproject/briar/android/socialbackup/DistributedBackupActivity.java
View File

@@ -3,8 +3,6 @@ package org.briarproject.briar.android.socialbackup;
import android.os.Bundle;
import android.widget.Toast;
import androidx.fragment.app.FragmentTransaction;
import org.briarproject.bramble.api.contact.ContactId;
import org.briarproject.bramble.api.db.DatabaseComponent;
import org.briarproject.bramble.api.db.DbException;
@@ -14,7 +12,6 @@ import org.briarproject.briar.android.activity.BriarActivity;
import org.briarproject.briar.android.contactselection.ContactSelectorListener;
import org.briarproject.briar.android.fragment.BaseFragment;
import org.briarproject.briar.api.socialbackup.BackupMetadata;
import org.briarproject.briar.api.socialbackup.Shard;
import org.briarproject.briar.api.socialbackup.SocialBackupManager;
import java.util.Collection;

5
briar-android/src/main/java/org/briarproject/briar/android/socialbackup/ShardsSentFragment.java
View File

@@ -3,9 +3,6 @@ package org.briarproject.briar.android.socialbackup;
import android.content.Context;
import android.os.Bundle;
import android.view.LayoutInflater;
import android.view.Menu;
import android.view.MenuInflater;
import android.view.MenuItem;
import android.view.View;
import android.view.ViewGroup;
import android.widget.Button;
@@ -17,8 +14,6 @@ import org.briarproject.briar.android.fragment.BaseFragment;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import static java.util.Objects.requireNonNull;
public class ShardsSentFragment extends BaseFragment {
public static final String TAG = ShardsSentFragment.class.getName();

1
briar-android/src/main/res/values/strings.xml
View File

@@ -712,4 +712,5 @@
<string name="activity_name_distributed_backup">Social Backup</string>
<string name="activity_name_old_distributed_backup">Old Social Backup</string>
<string name="activity_name_new_or_recover_account">Create new account or recover existing account</string>
</resources>