Skip to content

fix: account switcher dialog lifecycle #2912

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 7, 2025
+56 −30
Merged

fix: account switcher dialog lifecycle #2912

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
86 changes: 56 additions & 30 deletions app/src/main/java/it/niedermann/owncloud/notes/accountswitcher/AccountSwitcherDialog.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@


import android.app.Dialog;
import android.content.Context;
import android.content.Intent;
import android.graphics.drawable.LayerDrawable;
import android.net.Uri;
Expand All @@ -18,6 +17,7 @@
import android.view.View;

import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.fragment.app.DialogFragment;

import com.google.android.material.dialog.MaterialAlertDialogBuilder;
Expand Down Expand Up @@ -56,13 +56,15 @@ public class AccountSwitcherDialog extends BrandedDialogFragment {
private long currentAccountId;
private UserStatusRepository repository;
private Status currentStatus;
private final ExecutorService executor = Executors.newSingleThreadExecutor();
private ExecutorService executor;

@Override
public void onAttach(@NonNull Context context) {
super.onAttach(context);
if (context instanceof AccountSwitcherListener) {
this.accountSwitcherListener = (AccountSwitcherListener) context;
public void onCreate(@Nullable Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
executor = Executors.newSingleThreadExecutor();

if (requireContext() instanceof AccountSwitcherListener context) {
this.accountSwitcherListener = context;
} else {
throw new ClassCastException("Caller must implement " + AccountSwitcherListener.class.getSimpleName());
}
Expand All @@ -84,32 +86,57 @@ private void initRepositoryAndFetchCurrentStatus() {
if (account != null) {
repository = new UserStatusRepository(requireContext(), account);
} else {
DisplayUtils.showSnackMessage(requireView(), R.string.account_switch_dialog_status_fetching_error_message);
final var view = getView();
if (view != null) {
DisplayUtils.showSnackMessage(view, R.string.account_switch_dialog_status_fetching_error_message);
}
}

executor.execute(() -> {
currentStatus = repository.fetchUserStatus();
requireActivity().runOnUiThread(() -> {
final var message = currentStatus.getMessage();
if (!TextUtils.isEmpty(message)) {
binding.accountStatus.setVisibility(View.VISIBLE);
binding.accountStatus.setText(message);
}

final var emoji = currentStatus.getIcon();
if (!TextUtils.isEmpty(emoji)) {
binding.accountStatusEmoji.setVisibility(View.VISIBLE);
binding.accountStatusEmoji.setText(emoji);
} else {
final var status = currentStatus.getStatus();
binding.accountStatusIcon.setVisibility(View.VISIBLE);
binding.accountStatusIcon.setImageResource(StatusTypeExtensionsKt.getImageResource(status));
}
});
if (isAdded() && getActivity() != null && !requireActivity().isFinishing()) {
requireActivity().runOnUiThread(() -> {
if (binding == null) {
return;
}

final var message = currentStatus.getMessage();
if (!TextUtils.isEmpty(message)) {
binding.accountStatus.setVisibility(View.VISIBLE);
binding.accountStatus.setText(message);
}

final var emoji = currentStatus.getIcon();
if (!TextUtils.isEmpty(emoji)) {
binding.accountStatusEmoji.setVisibility(View.VISIBLE);
binding.accountStatusEmoji.setText(emoji);
} else {
final var status = currentStatus.getStatus();
binding.accountStatusIcon.setVisibility(View.VISIBLE);
binding.accountStatusIcon.setImageResource(StatusTypeExtensionsKt.getImageResource(status));
}
});
}
});
return Unit.INSTANCE;
});
}

@Override
public void onDestroyView() {
super.onDestroyView();
binding = null;
}

@Override
public void onDestroy() {
super.onDestroy();
if (executor != null && !executor.isShutdown()) {
executor.shutdownNow();
}
}

@NonNull
@Override
public Dialog onCreateDialog(Bundle savedInstanceState) {
Expand All @@ -124,13 +151,9 @@ public Dialog onCreateDialog(Bundle savedInstanceState) {
AvatarLoader.INSTANCE.load(requireContext(), binding.currentAccountItemAvatar, currentLocalAccount);
binding.accountLayout.setOnClickListener((v) -> dismiss());

binding.onlineStatus.setOnClickListener(v -> {
showBottomSheetDialog(AccountSwitcherBottomSheetTag.ONLINE_STATUS);
});
binding.onlineStatus.setOnClickListener(v -> showBottomSheetDialog(AccountSwitcherBottomSheetTag.ONLINE_STATUS));

binding.statusMessage.setOnClickListener(v -> {
showBottomSheetDialog(AccountSwitcherBottomSheetTag.MESSAGE_STATUS);
});
binding.statusMessage.setOnClickListener(v -> showBottomSheetDialog(AccountSwitcherBottomSheetTag.MESSAGE_STATUS));

final var adapter = new AccountSwitcherAdapter((localAccount -> {
accountSwitcherListener.onAccountChosen(localAccount);
Expand Down Expand Up @@ -170,7 +193,10 @@ public Dialog onCreateDialog(Bundle savedInstanceState) {

private void showBottomSheetDialog(@NonNull AccountSwitcherBottomSheetTag tag) {
if (repository == null || currentStatus == null) {
DisplayUtils.showSnackMessage(requireView(), R.string.account_switch_dialog_status_fetching_error_message);
final var view = getView();
if (view != null) {
DisplayUtils.showSnackMessage(view, R.string.account_switch_dialog_status_fetching_error_message);
}
return;
}

Expand Down
Loading