[nemo-systemsettings] Fix apgs pending agreement update. Fixes JB#48765

Setting location mode and then accepting the agreement wasn't removing it from the pending list.
sailfishos · Jan 31, 2020 · 6fa9714 · 6fa9714
1 parent 498d326
commit 6fa9714
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/src/locationsettings.cpp b/src/locationsettings.cpp
@@ -288,9 +288,14 @@ bool LocationSettingsPrivate::updateProvider(const QString &name, const Location
                 m_pendingAgreements.removeOne(name);
                 emit q->pendingAgreementsChanged();
             }
-        } else if (provider.hasAgreement && !provider.agreementAccepted && !m_pendingAgreements.contains(name)) {
-            m_pendingAgreements.append(name);
-            emit q->pendingAgreementsChanged();
+        } else if (provider.hasAgreement) {
+            if (!provider.agreementAccepted && !m_pendingAgreements.contains(name)) {
+                m_pendingAgreements.append(name);
+                emit q->pendingAgreementsChanged();
+            } else if (provider.agreementAccepted && m_pendingAgreements.contains(name)) {
+                m_pendingAgreements.removeOne(name);
+                emit q->pendingAgreementsChanged();
+            }
         }
     }