Fix #171: don't use ABP info for OTAA unless saved state is valid

mcci-catena · Jul 5, 2021 · 49f5e0f · 49f5e0f
1 parent e9b2e91
commit 49f5e0f
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/src/lib/arduino_lorawan_begin.cpp b/src/lib/arduino_lorawan_begin.cpp
@@ -49,7 +49,8 @@ bool Arduino_LoRaWAN::begin(
     LMIC_reset();
 
     // if we can get saved state, go on.
-    if (! this->RestoreSessionState())
+    auto const fHaveSavedState = this->RestoreSessionState();
+    if (! fHaveSavedState)
         {
         // Otherwise set data rate and transmit power, based on regional considerations.
         this->NetBeginRegionInit();
@@ -69,7 +70,8 @@ bool Arduino_LoRaWAN::begin(
     //
     AbpProvisioningInfo abpInfo;
 
-    if (this->GetAbpProvisioningInfo(&abpInfo))
+    if ((fHaveSavedState || this->GetProvisioningStyle() == ProvisioningStyle::kABP) &&
+         this->GetAbpProvisioningInfo(&abpInfo))
         {
         LMIC_setSession(
                 abpInfo.NetID,