From c1613de4267d80c7cdaa2eb901d6c5648ef25a2a Mon Sep 17 00:00:00 2001
From: Mike Kinney <mike.kinney@gmail.com>
Date: Thu, 3 Mar 2022 04:27:49 +0000
Subject: [PATCH 1/2] merge the 1.2 hang bugfix to 1.3

---
 src/mesh/PhoneAPI.h | 2 +-
 src/mesh/Router.cpp | 2 +-
 suppressions.txt    | 4 ++++
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/mesh/PhoneAPI.h b/src/mesh/PhoneAPI.h
index 684f683f8..ca926b096 100644
--- a/src/mesh/PhoneAPI.h
+++ b/src/mesh/PhoneAPI.h
@@ -59,7 +59,7 @@ class PhoneAPI
 
     // Call this when the client drops the connection, resets the state to STATE_SEND_NOTHING
     // Unregisters our observer.  A closed connection **can** be reopened by calling init again.
-    void close();
+    virtual void close();
 
     /**
      * Handle a ToRadio protobuf
diff --git a/src/mesh/Router.cpp b/src/mesh/Router.cpp
index 7f0dbd51f..f3210f1ec 100644
--- a/src/mesh/Router.cpp
+++ b/src/mesh/Router.cpp
@@ -276,7 +276,7 @@ bool perhapsDecode(MeshPacket *p)
     if (p->which_payloadVariant == MeshPacket_decoded_tag)
         return true; // If packet was already decoded just return
 
-    assert(p->which_payloadVariant == MeshPacket_encrypted_tag);
+    //assert(p->which_payloadVariant == MeshPacket_encrypted_tag);
 
     // Try to find a channel that works with this hash
     for (ChannelIndex chIndex = 0; chIndex < channels.getNumChannels(); chIndex++) {
diff --git a/suppressions.txt b/suppressions.txt
index cdf858753..42dd40c33 100644
--- a/suppressions.txt
+++ b/suppressions.txt
@@ -36,3 +36,7 @@ cstyleCast
 // ignore stuff that is not ours
 *:.pio/*
 *:*/libdeps/*
+
+// these two caused issues
+missingOverride
+virtualCallInConstructor

From 0f862edc4762fc1d521ec90e849a4e107fec0e4c Mon Sep 17 00:00:00 2001
From: Mike Kinney <mike.kinney@gmail.com>
Date: Thu, 3 Mar 2022 04:29:34 +0000
Subject: [PATCH 2/2] remove the --user

---
 bin/platformio-custom.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/platformio-custom.py b/bin/platformio-custom.py
index d4117b4b8..4672dbc96 100644
--- a/bin/platformio-custom.py
+++ b/bin/platformio-custom.py
@@ -11,7 +11,7 @@ env.Replace( MKSPIFFSTOOL=env.get("PROJECT_DIR") + '/bin/mklittlefs.py' )
 try:
     import littlefs
 except ImportError:
-    env.Execute("$PYTHONEXE -m pip install --user littlefs-python")
+    env.Execute("$PYTHONEXE -m pip install littlefs-python")
 
 Import("projenv")