Latest Release RM0107-1432-0.93.9-de4f61d on PATREON & GitHub - NFC P…

…ARSER FIXES
RogueMaster · Jan 7, 2024 · db0c7e4 · db0c7e4
2 parents 0d7f86c + c85e130
commit db0c7e4
Show file tree

Hide file tree

Showing 13 changed files with 18 additions and 43 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,36 +1,15 @@
-## Warning!!! Please read this before installing!!!
-**This release has some unresolved issues, if any of those affects your daily usage, stay at 065 release or wait for next releases:** <br>
-**Issues from this list will be fixed in next releases**
-### Known NFC app regressions and issues: 
+## New changes
+* NFC: Various NFC Mifare classic Read fixes (was caused by wrong logic in parsers) (mifare classic 4k, and others) (by @Leptopt1los)
+* Apps: Fixed Unitemp and ESP32 Camera suite
+* Apps: **Check out Apps updates by following** [this link](https://github.com/xMasterX/all-the-plugins/commits/dev)
+<br><br>
+#### Known NFC post-refactor regressions list: 
 - Mifare Mini clones reading is broken (original mini working fine) (OFW)
 - EMV simple data parser was removed with protocol with refactoring (OFW)
 - Option to unlock Slix-L (NFC V) with preset or custom password was removed with refactoring (OFW)
 - NFC CLI was removed with refactoring (OFW)
-### Some apps that was made for old nfc stack is now not compatible with the new API and require complete remake:
-**If you want to help with making this apps work again please send PR to the repo at link below**
 - Current list of affected apps: https://github.com/xMasterX/all-the-plugins/tree/dev/apps_broken_by_last_refactors
-- Also in app **Enhanced Sub-GHz Chat** - NFC part was temporarily removed to make app usable, NFC part of the app requires remaking it with new nfc stack <br>
-**API was updated to v50.x** 
-## New changes
-* NFC: Skip system dict bug fixed (by @Leptopt1los)
-* NFC: Set ATQA scene bit numbering changed (by @Leptopt1los)
-* NFC: Added plugin to read WashCity card balance (by @yaba | PR #683)
-* NFC: Add manually MF Classic with custom UID (by @Leptopt1los | PR #690)
-* NFC: Fix MyKey production date parsing by [@augustozanellato](https://github.com/flipperdevices/flipperzero-firmware/pull/3332/files)
-* Apps: Move hid and snake apps into main repo (will be included in `c` builds)
-* Docs: Remove weird newline in applications/ReadMe.md (by @Eczbek | PR #688)
-* SubGHz: Proper fix for subghz keyboard lock display issue (thanks @Willy-JL)
-* SubGHz: Use long press to exit transmitter (to avoid unwanted 2 buttons hold condition, holding arrow button and exit causes default button change, which is stays as hidden feature, but this change makes it harder to call it accidentally)
-* Apps: **Check out Apps updates by following** [this link](https://github.com/xMasterX/all-the-plugins/commits/dev)
-* OFW: Desktop: fix rpc unlock on pin input screen 
-* OFW: UI refactor
-* OFW: MFC emulation fixes
-* OFW: Scripts: fix incorrect handling of storage stress test count option
-* OFW: Add Samsung AC remotes DB93 and AR-EH04 
-* OFW: Update mf_classic_dict.nfc
-* OFW: Nfc: HID MFC Plugin
-* OFW: RPC: reverse input 
-* Update slideshow pictures by @Svaarich
+- Also in app **Enhanced Sub-GHz Chat** - NFC part was temporarily removed to make app usable, NFC part of the app requires remaking it with new nfc stack
 
 ### Thanks to the UNLEASHED sponsors for supporting UNLEASHED changes!
 

diff --git a/ReadMe.md b/ReadMe.md
@@ -130,6 +130,7 @@ This software is for experimental purposes only and is not meant for any illegal
 - [NFC: Skip system dict bug fixed (By Leptopt1los)](https://github.com/RogueMaster/flipperzero-firmware-wPlugins/commit/7de861bb4ccec9c016ef996db4753a550835fc90)
 - [NFC: Set ATQA scene bit numbering changed (By Leptopt1los)](https://github.com/RogueMaster/flipperzero-firmware-wPlugins/commit/4e068ba59316201bfaeea29eb708def7905b113f)
 - Updated: [NFC Playlist v1.1 (By acegoal07)](https://github.com/acegoal07/FlipperZero_NFC_Playlist/tree/main)
+- [NFC parsers false read() positive return fixed (By Leptopt1los)](https://github.com/DarkFlippers/unleashed-firmware/commit/46364444643fd8d29223284b872ff0220203547c)
 
 <a name="release">
 

diff --git a/applications/main/nfc/plugins/supported_cards/aime.c b/applications/main/nfc/plugins/supported_cards/aime.c
@@ -67,7 +67,7 @@ static bool aime_read(Nfc* nfc, NfcDevice* device) {
 
         nfc_device_set_data(device, NfcProtocolMfClassic, data);
 
-        is_read = true;
+        is_read = mf_classic_is_card_read(data);
     } while(false);
 
     mf_classic_free(data);

diff --git a/applications/main/nfc/plugins/supported_cards/hid.c b/applications/main/nfc/plugins/supported_cards/hid.c
@@ -67,7 +67,7 @@ static bool hid_read(Nfc* nfc, NfcDevice* device) {
 
         nfc_device_set_data(device, NfcProtocolMfClassic, data);
 
-        is_read = true;
+        is_read = mf_classic_is_card_read(data);
     } while(false);
 
     mf_classic_free(data);

diff --git a/applications/main/nfc/plugins/supported_cards/kazan.c b/applications/main/nfc/plugins/supported_cards/kazan.c
@@ -16,9 +16,6 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-#include "core/core_defines.h"
-#include "core/log.h"
-#include "core/string.h"
 #include "nfc_supported_card_plugin.h"
 
 #include "protocols/mf_classic/mf_classic.h"
@@ -189,7 +186,7 @@ static bool kazan_read(Nfc* nfc, NfcDevice* device) {
 
         nfc_device_set_data(device, NfcProtocolMfClassic, data);
 
-        is_read = true;
+        is_read = mf_classic_is_card_read(data);
     } while(false);
 
     mf_classic_free(data);

diff --git a/applications/main/nfc/plugins/supported_cards/metromoney.c b/applications/main/nfc/plugins/supported_cards/metromoney.c
@@ -114,7 +114,7 @@ static bool metromoney_read(Nfc* nfc, NfcDevice* device) {
 
         nfc_device_set_data(device, NfcProtocolMfClassic, data);
 
-        is_read = true;
+        is_read = mf_classic_is_card_read(data);
     } while(false);
 
     mf_classic_free(data);

diff --git a/applications/main/nfc/plugins/supported_cards/plantain.c b/applications/main/nfc/plugins/supported_cards/plantain.c
@@ -142,7 +142,7 @@ static bool plantain_read(Nfc* nfc, NfcDevice* device) {
 
         nfc_device_set_data(device, NfcProtocolMfClassic, data);
 
-        is_read = true;
+        is_read = mf_classic_is_card_read(data);
     } while(false);
 
     mf_classic_free(data);

diff --git a/applications/main/nfc/plugins/supported_cards/saflok.c b/applications/main/nfc/plugins/supported_cards/saflok.c
@@ -144,7 +144,7 @@ static bool saflok_read(Nfc* nfc, NfcDevice* device) {
 
         nfc_device_set_data(device, NfcProtocolMfClassic, data);
 
-        is_read = true;
+        is_read = mf_classic_is_card_read(data);
     } while(false);
 
     mf_classic_free(data);

diff --git a/applications/main/nfc/plugins/supported_cards/social_moscow.c b/applications/main/nfc/plugins/supported_cards/social_moscow.c
@@ -1541,7 +1541,7 @@ static bool social_moscow_read(Nfc* nfc, NfcDevice* device) {
 
         nfc_device_set_data(device, NfcProtocolMfClassic, data);
 
-        is_read = true;
+        is_read = mf_classic_is_card_read(data);
     } while(false);
 
     mf_classic_free(data);

diff --git a/applications/main/nfc/plugins/supported_cards/troika.c b/applications/main/nfc/plugins/supported_cards/troika.c
@@ -1566,7 +1566,7 @@ static bool troika_read(Nfc* nfc, NfcDevice* device) {
 
         nfc_device_set_data(device, NfcProtocolMfClassic, data);
 
-        is_read = true;
+        is_read = mf_classic_is_card_read(data);
     } while(false);
 
     mf_classic_free(data);

diff --git a/applications/main/nfc/plugins/supported_cards/two_cities.c b/applications/main/nfc/plugins/supported_cards/two_cities.c
@@ -92,7 +92,7 @@ static bool two_cities_read(Nfc* nfc, NfcDevice* device) {
 
         nfc_device_set_data(device, NfcProtocolMfClassic, data);
 
-        is_read = true;
+        is_read = mf_classic_is_card_read(data);
     } while(false);
 
     mf_classic_free(data);

diff --git a/applications/main/nfc/plugins/supported_cards/washcity.c b/applications/main/nfc/plugins/supported_cards/washcity.c
@@ -115,7 +115,7 @@ static bool washcity_read(Nfc* nfc, NfcDevice* device) {
 
         nfc_device_set_data(device, NfcProtocolMfClassic, data);
 
-        is_read = true;
+        is_read = mf_classic_is_card_read(data);
     } while(false);
 
     mf_classic_free(data);

diff --git a/applications/main/nfc/plugins/supported_cards/zolotaya_korona.c b/applications/main/nfc/plugins/supported_cards/zolotaya_korona.c
@@ -18,8 +18,6 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-#include "core/core_defines.h"
-#include "core/string.h"
 #include "furi_hal_rtc.h"
 #include "nfc_supported_card_plugin.h"