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

Call loadOwnIdentityInfo() in SettingsViewModel's constructor

Browse Source
This commit is contained in:
Sebastian Kürten
2020-12-03 19:02:21 +01:00
committed by Torsten Grote
parent 97040c6299
commit 1a5e789bec
3 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
briar-android/src/main/java/org/briarproject/briar/android/settings/ConfirmAvatarDialogFragment.java
View File

@@ -62,7 +62,6 @@ public class ConfirmAvatarDialogFragment extends DialogFragment {
ViewModelProvider provider = ViewModelProvider provider =
new ViewModelProvider(activity, viewModelFactory); new ViewModelProvider(activity, viewModelFactory);
settingsViewModel = provider.get(SettingsViewModel.class); settingsViewModel = provider.get(SettingsViewModel.class);
settingsViewModel.onCreate();
AlertDialog.Builder builder = new AlertDialog.Builder(activity); AlertDialog.Builder builder = new AlertDialog.Builder(activity);

1
briar-android/src/main/java/org/briarproject/briar/android/settings/SettingsActivity.java
View File

@@ -48,7 +48,6 @@ public class SettingsActivity extends BriarActivity {
ViewModelProvider provider = ViewModelProvider provider =
new ViewModelProvider(this, viewModelFactory); new ViewModelProvider(this, viewModelFactory);
settingsViewModel = provider.get(SettingsViewModel.class); settingsViewModel = provider.get(SettingsViewModel.class);
settingsViewModel.onCreate();
settingsViewModel.getOwnIdentityInfo().observe(this, us -> { settingsViewModel.getOwnIdentityInfo().observe(this, us -> {
TextView textViewUserName = findViewById(R.id.username); TextView textViewUserName = findViewById(R.id.username);

4
briar-android/src/main/java/org/briarproject/briar/android/settings/SettingsViewModel.java
View File

@@ -61,10 +61,8 @@ class SettingsViewModel extends AndroidViewModel {
this.avatarManager = avatarManager; this.avatarManager = avatarManager;
this.authorManager = authorManager; this.authorManager = authorManager;
this.dbExecutor = dbExecutor; this.dbExecutor = dbExecutor;
}
void onCreate() { loadOwnIdentityInfo();
if (ownIdentityInfo.getValue() == null) loadOwnIdentityInfo();
} }
LiveData<OwnIdentityInfo> getOwnIdentityInfo() { LiveData<OwnIdentityInfo> getOwnIdentityInfo() {