Merge pull request #17 from ahnilica/uids-file-fix-up-arrow-issue14

Fixed prev navigation for AttackTypeLoadFileCustomUids

Author: xMasterX

lib/worker/fake_worker.c

@@ -141,15 +141,11 @@ static bool fuzzer_worker_load_key(FuzzerWorker* instance, bool next) {
         break;
 
     case FuzzerWorkerAttackTypeLoadFileCustomUids: {
-        if(next) {
-            instance->index++;
-        }
         uint8_t str_len = protocol->data_size * 2 + 1;
         FuriString* data_str = furi_string_alloc();
         while(true) {
             furi_string_reset(data_str);
             if(!stream_read_line(instance->uids_stream, data_str)) {
-                stream_rewind(instance->uids_stream);
                 // TODO Check empty file & close stream and storage
                 break;
             } else if(furi_string_get_char(data_str, 0) == '#') {
@@ -172,6 +168,9 @@ static bool fuzzer_worker_load_key(FuzzerWorker* instance, bool next) {
                     }
                 }
                 res = parse_ok;
+                if(res && next) {
+                    instance->index++;
+                }
             }
             break;
         }
@@ -219,6 +218,22 @@ static bool fuzzer_worker_load_previous_key(FuzzerWorker* instance) {
         }
         break;
 
+    case FuzzerWorkerAttackTypeLoadFileCustomUids:
+        if(instance->index == 0 || instance->uids_stream == NULL) {
+            break;
+        }
+        instance->index--;
+        stream_rewind(instance->uids_stream);
+
+        bool ok = false;
+        uint16_t steps = (uint16_t)(instance->index + 1);
+        for(uint16_t i = 0; i < steps; i++) {
+            ok = fuzzer_worker_load_key(instance, false);
+            if(!ok) break;
+        }
+        res = ok;
+        break;
+
     case FuzzerWorkerAttackTypeLoadFile:
         if(instance->payload[instance->index] != 0x00) {
             instance->payload[instance->index]--;