Updated on 2026-08-14
This commit is contained in:
parent
22930964c9
commit
aad9d9479b
6 changed files with 11 additions and 17 deletions
|
|
@ -4,6 +4,8 @@ import android.app.AlertDialog;
|
|||
import android.app.Dialog;
|
||||
import android.content.DialogInterface;
|
||||
import android.os.Bundle;
|
||||
|
||||
import androidx.annotation.NonNull;
|
||||
import androidx.fragment.app.DialogFragment;
|
||||
|
||||
import com.tangem.wallet.R;
|
||||
|
|
@ -29,9 +31,9 @@ public class PINSwapWarningDialog extends DialogFragment {
|
|||
message = getArguments().getString(EXTRA_MESSAGE);
|
||||
}
|
||||
|
||||
@NonNull
|
||||
@Override
|
||||
public Dialog onCreateDialog(Bundle savedInstanceState) {
|
||||
|
||||
return new AlertDialog.Builder(getActivity())
|
||||
.setIcon(R.drawable.tangem_logo_small_new)
|
||||
.setTitle(R.string.your_money_is_at_risk)
|
||||
|
|
|
|||
|
|
@ -10,10 +10,6 @@
|
|||
<string name="wrong_tag_err">Not ISO tag!</string>
|
||||
<string name="msgCardMustBeLoaded">Card must be loaded first!</string>
|
||||
<string name="tag_lost_err">Tag lost!</string>
|
||||
<string name="dialog_ok">OK</string>
|
||||
<string name="dialog_quit">Quit</string>
|
||||
<string name="nfc_disabled">Enable NFC?</string>
|
||||
<string name="enable_nfc">This app is useless when NFC is disabled. Reader mode depends on it. Hit OK to go to Settings, where you can enable NFC.</string>
|
||||
<string name="cmd_suffix">command</string>
|
||||
<string name="rsp_suffix">response</string>
|
||||
<string name="section_format">Hello World from section: %1$d</string>
|
||||
|
|
|
|||
|
|
@ -4,20 +4,18 @@ import android.app.Dialog
|
|||
import android.content.Intent
|
||||
import android.os.Bundle
|
||||
import android.provider.Settings
|
||||
import androidx.fragment.app.DialogFragment
|
||||
|
||||
import androidx.appcompat.app.AlertDialog
|
||||
import androidx.fragment.app.DialogFragment
|
||||
|
||||
import com.tangem.tangemcard.R
|
||||
|
||||
class NfcEnableDialog : androidx.fragment.app.DialogFragment() {
|
||||
|
||||
class NfcEnableDialog : DialogFragment() {
|
||||
companion object {
|
||||
val TAG: String = NfcEnableDialog::class.java.simpleName
|
||||
}
|
||||
|
||||
override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
|
||||
|
||||
val builder = context?.let { AlertDialog.Builder(it) }
|
||||
builder?.setCancelable(false)
|
||||
?.setIcon(R.drawable.ic_action_nfc_gray)
|
||||
|
|
@ -25,8 +23,7 @@ class NfcEnableDialog : androidx.fragment.app.DialogFragment() {
|
|||
?.setMessage(R.string.enable_nfc)
|
||||
?.setPositiveButton(R.string.dialog_ok
|
||||
) { _, _ ->
|
||||
// take user to wireless settings
|
||||
activity?.startActivity(Intent(Settings.ACTION_WIRELESS_SETTINGS))
|
||||
activity?.startActivity(Intent(Settings.ACTION_NFC_SETTINGS))
|
||||
}
|
||||
?.setNegativeButton(R.string.dialog_quit
|
||||
) { dialog, _ ->
|
||||
|
|
|
|||
|
|
@ -13,6 +13,7 @@ import android.nfc.Tag;
|
|||
import android.nfc.tech.IsoDep;
|
||||
import android.os.Build;
|
||||
import android.os.Bundle;
|
||||
|
||||
import androidx.core.app.ActivityCompat;
|
||||
import androidx.fragment.app.FragmentActivity;
|
||||
|
||||
|
|
@ -99,7 +100,6 @@ public class NfcManager {
|
|||
}
|
||||
|
||||
private final BroadcastReceiver mBroadcastReceiver = new BroadcastReceiver() {
|
||||
@SuppressWarnings("deprecation")
|
||||
@Override
|
||||
public void onReceive(Context context, Intent intent) {
|
||||
String action = intent.getAction();
|
||||
|
|
@ -156,11 +156,7 @@ public class NfcManager {
|
|||
|
||||
if (permission != PackageManager.PERMISSION_GRANTED) {
|
||||
// We don't have permission so prompt the user
|
||||
ActivityCompat.requestPermissions(
|
||||
activity,
|
||||
PERMISSIONS_NFC,
|
||||
REQUEST_NFC_PERMISSIONS
|
||||
);
|
||||
ActivityCompat.requestPermissions(activity, PERMISSIONS_NFC, REQUEST_NFC_PERMISSIONS);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
<resources>
|
||||
|
||||
<string name="app_name">tangemcard</string>
|
||||
<string name="dialog_ok">OK</string>
|
||||
<string name="dialog_quit">Quit</string>
|
||||
|
|
|
|||
|
|
@ -1,3 +1,5 @@
|
|||
<resources>
|
||||
|
||||
<string name="app_name">TangemServer</string>
|
||||
|
||||
</resources>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue