Skip to content
This repository was archived by the owner on Oct 27, 2025. It is now read-only.

Fix for ConductorNavigator getActivity() NPE crash. #601

Open
ambrose40 wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix for ConductorNavigator getActivity() NPE crash. #601

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
17e7bd9
MOPPAND-1603: Fix for ConductorNavigator getActivity() NPE crash.
ambrose40 Jun 30, 2025
ec0a8cf
MOPPAND-1603: Code review suggestions.
ambrose40 Jul 1, 2025
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
49 changes: 30 additions & 19 deletions app/src/main/java/ee/ria/DigiDoc/android/signature/update/nfc/NFCView.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ public class NFCView extends LinearLayout implements SignatureAddView<NFCRequest
private final TextInputLayout pinLayout;
private final MaterialTextView pinLabel;

private final NotificationDialog nfcCanNotificationDialog;
private NotificationDialog nfcCanNotificationDialog;

private AccessibilityManager.TouchExplorationStateChangeListener accessibilityTouchExplorationStateChangeListener;

Expand All @@ -82,20 +82,26 @@ public NFCView(Context context, @Nullable AttributeSet attrs, int defStyleAttr,
pinLayout = findViewById(R.id.signatureUpdateNFCPIN2Layout);
pinLabel = findViewById(R.id.signatureUpdateNFCPIN2Label);

nfcCanNotificationDialog = new NotificationDialog(navigator.activity(),
R.string.signature_update_nfc_can_info, R.id.nfcCanNotificationDialog);
post(() -> {
android.app.Activity activity = navigator.activity();
if (activity != null) {
nfcCanNotificationDialog = new NotificationDialog(activity,
R.string.signature_update_nfc_can_info, R.id.nfcCanNotificationDialog);

handleNFCSupportLayout();
}

if (AccessibilityUtils.isTalkBackEnabled()) {
AccessibilityUtils.setSingleCharactersContentDescription(canView, getResources().getString(R.string.signature_update_nfc_can));
AccessibilityUtils.setSingleCharactersContentDescription(pinView, getResources().getString(R.string.signature_update_nfc_pin2));
AccessibilityUtils.setEditTextCursorToEnd(canView);
AccessibilityUtils.setEditTextCursorToEnd(pinView);
AccessibilityUtils.setTextViewContentDescription(context, true, null, canLabel.getText().toString(), canView);
AccessibilityUtils.setTextViewContentDescription(context, true, null, pinLabel.getText().toString(), pinView);
}
checkInputsValidity();
handleNFCSupportLayout();

if (AccessibilityUtils.isTalkBackEnabled()) {
AccessibilityUtils.setSingleCharactersContentDescription(canView, getResources().getString(R.string.signature_update_nfc_can));
AccessibilityUtils.setSingleCharactersContentDescription(pinView, getResources().getString(R.string.signature_update_nfc_pin2));
AccessibilityUtils.setEditTextCursorToEnd(canView);
AccessibilityUtils.setEditTextCursorToEnd(pinView);
AccessibilityUtils.setTextViewContentDescription(context, true, null, canLabel.getText().toString(), canView);
AccessibilityUtils.setTextViewContentDescription(context, true, null, pinLabel.getText().toString(), pinView);
}
checkInputsValidity();
});
}

public NFCView(Context context, @Nullable AttributeSet attrs, int defStyleAttr) {
Expand Down Expand Up @@ -123,16 +129,18 @@ public boolean positiveButtonEnabled() {
@Override
protected void onVisibilityChanged(@NonNull View changedView, int visibility) {
super.onVisibilityChanged(changedView, visibility);

if (navigator.activity() instanceof Activity) {
boolean shouldShowCanMessage = ((Activity) navigator.activity())
android.app.Activity activity = navigator.activity();
if (activity instanceof Activity) {
boolean shouldShowCanMessage = ((Activity) activity)
.getSettingsDataStore()
.getShowCanMessage();

if (shouldShowCanMessage && visibility == VISIBLE && isNFCSupported()) {
postDelayed(nfcCanNotificationDialog::show, 1000);
} else {
nfcCanNotificationDialog.dismiss();
if (nfcCanNotificationDialog != null) {
nfcCanNotificationDialog.dismiss();
}
}
}

Expand All @@ -150,7 +158,9 @@ public void reset(SignatureUpdateViewModel viewModel) {
message.clearFocus();
canView.clearFocus();
pinView.clearFocus();
nfcCanNotificationDialog.dismiss();
if (nfcCanNotificationDialog != null) {
nfcCanNotificationDialog.dismiss();
}
}

@Override
Expand Down Expand Up @@ -251,7 +261,8 @@ protected void onDetachedFromWindow() {
}

private boolean isNFCSupported() {
NfcManager manager = (NfcManager) navigator.activity().getSystemService(Context.NFC_SERVICE);
android.app.Activity activity = navigator.activity();
NfcManager manager = (NfcManager) activity.getSystemService(Context.NFC_SERVICE);
NfcAdapter adapter = manager.getDefaultAdapter();
if (adapter == null || !adapter.isEnabled()) {
Timber.log(Log.ERROR, "NFC is not supported on this device");
Expand Down
3 changes: 3 additions & 0 deletions app/src/main/java/ee/ria/DigiDoc/android/utils/navigator/conductor/ConductorNavigator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,6 +163,9 @@ public void removeBackButtonClickListener(BackButtonClickListener listener) {

@Override
public Activity activity() {
if (router == null) {
throw new IllegalStateException("Router is null");
}
Activity activity = router.getActivity();
if (activity == null) {
throw new IllegalStateException("Activity is null");
Expand Down
Loading