diff --git a/briar-android/src/main/java/org/briarproject/briar/android/settings/ConfirmAvatarDialogFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/settings/ConfirmAvatarDialogFragment.java index e56bbd5e6..0a3f7f7e0 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/settings/ConfirmAvatarDialogFragment.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/settings/ConfirmAvatarDialogFragment.java @@ -62,7 +62,6 @@ public class ConfirmAvatarDialogFragment extends DialogFragment { ViewModelProvider provider = new ViewModelProvider(activity, viewModelFactory); settingsViewModel = provider.get(SettingsViewModel.class); - settingsViewModel.onCreate(); AlertDialog.Builder builder = new AlertDialog.Builder(activity); diff --git a/briar-android/src/main/java/org/briarproject/briar/android/settings/SettingsActivity.java b/briar-android/src/main/java/org/briarproject/briar/android/settings/SettingsActivity.java index 978b23ccf..d76e2c048 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/settings/SettingsActivity.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/settings/SettingsActivity.java @@ -48,7 +48,6 @@ public class SettingsActivity extends BriarActivity { ViewModelProvider provider = new ViewModelProvider(this, viewModelFactory); settingsViewModel = provider.get(SettingsViewModel.class); - settingsViewModel.onCreate(); settingsViewModel.getOwnIdentityInfo().observe(this, us -> { TextView textViewUserName = findViewById(R.id.username); diff --git a/briar-android/src/main/java/org/briarproject/briar/android/settings/SettingsViewModel.java b/briar-android/src/main/java/org/briarproject/briar/android/settings/SettingsViewModel.java index 875feaa05..2213e32d8 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/settings/SettingsViewModel.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/settings/SettingsViewModel.java @@ -61,10 +61,8 @@ class SettingsViewModel extends AndroidViewModel { this.avatarManager = avatarManager; this.authorManager = authorManager; this.dbExecutor = dbExecutor; - } - void onCreate() { - if (ownIdentityInfo.getValue() == null) loadOwnIdentityInfo(); + loadOwnIdentityInfo(); } LiveData getOwnIdentityInfo() {