From e96d7cda66e88a1d1320bdc12b50ededf7317065 Mon Sep 17 00:00:00 2001
From: Christian Guinard <28689358+christiangnrd@users.noreply.github.com>
Date: Thu, 19 Sep 2024 19:11:16 -0300
Subject: [PATCH] Detect Reader -> Extract MF Keys
---
.../Components/AttackConnectionError.swift | 2 +-
.../Components/ReaderDataNotFound.swift | 4 +--
.../Hub/ReaderAttack/DetectReaderCard.swift | 4 +--
.../FZDetectReaderContent.svg | 25 ++++++++++---------
4 files changed, 18 insertions(+), 17 deletions(-)
diff --git a/Flipper/Packages/UI/Sources/Hub/ReaderAttack/Components/AttackConnectionError.swift b/Flipper/Packages/UI/Sources/Hub/ReaderAttack/Components/AttackConnectionError.swift
index d20479fda..c253fbca5 100644
--- a/Flipper/Packages/UI/Sources/Hub/ReaderAttack/Components/AttackConnectionError.swift
+++ b/Flipper/Packages/UI/Sources/Hub/ReaderAttack/Components/AttackConnectionError.swift
@@ -10,7 +10,7 @@ struct AttackConnectionError: View {
"Make sure Flipper is Turned On",
"If Flipper doesn’t respond, reboot it and connect to " +
"the app via Bluetooth",
- "Restart **Mfkey32 (Detect Reader)**"
+ "Restart **Mfkey32 (Extract MF Keys)**"
]
.compactMap {
try? .init(
diff --git a/Flipper/Packages/UI/Sources/Hub/ReaderAttack/Components/ReaderDataNotFound.swift b/Flipper/Packages/UI/Sources/Hub/ReaderAttack/Components/ReaderDataNotFound.swift
index a2d3fd6d7..a126d2df3 100644
--- a/Flipper/Packages/UI/Sources/Hub/ReaderAttack/Components/ReaderDataNotFound.swift
+++ b/Flipper/Packages/UI/Sources/Hub/ReaderAttack/Components/ReaderDataNotFound.swift
@@ -6,12 +6,12 @@ struct ReaderDataNotFound: View {
var instructions: [AttributedString] = {
[
- "On your Flipper Zero, go to **NFC → Detect Reader**",
+ "On your Flipper Zero, go to **NFC → Extract MF Keys**",
"Hold Flipper Zero close to the reader",
"Wait until you collect enough nonсes",
"Сomplete nonce collection",
"In Flipper Mobile App, synchronize with your Flipper " +
- "Zero and run the **Mfkey32 (Detect Reader)**"
+ "Zero and run the **Mfkey32 (Extract MF Keys)**"
]
.compactMap {
try? .init(
diff --git a/Flipper/Packages/UI/Sources/Hub/ReaderAttack/DetectReaderCard.swift b/Flipper/Packages/UI/Sources/Hub/ReaderAttack/DetectReaderCard.swift
index 48e8617c1..3b724aaa6 100644
--- a/Flipper/Packages/UI/Sources/Hub/ReaderAttack/DetectReaderCard.swift
+++ b/Flipper/Packages/UI/Sources/Hub/ReaderAttack/DetectReaderCard.swift
@@ -8,8 +8,8 @@ struct DetectReaderCard: View {
icon: "nfc",
title: "MIFARE Classic",
image: "DetectReader",
- subtitle: "Mfkey32 (Detect Reader)",
- description: "Calculate keys from Detect Reader"
+ subtitle: "Mfkey32 (Extract MF Keys)",
+ description: "Calculate keys from Extract MF Keys"
) {
Badge()
.opacity(hasNotification ? 1 : 0)
diff --git a/Flipper/Shared/Assets.xcassets/FlipperDevice/Content/FZDetectReaderContent.imageset/FZDetectReaderContent.svg b/Flipper/Shared/Assets.xcassets/FlipperDevice/Content/FZDetectReaderContent.imageset/FZDetectReaderContent.svg
index 901143f80..e046e9413 100644
--- a/Flipper/Shared/Assets.xcassets/FlipperDevice/Content/FZDetectReaderContent.imageset/FZDetectReaderContent.svg
+++ b/Flipper/Shared/Assets.xcassets/FlipperDevice/Content/FZDetectReaderContent.imageset/FZDetectReaderContent.svg
@@ -19,18 +19,19 @@
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+