Merge branch 'fix_location_agreements' into 'master'

Fix location agreements See merge request mer-core/nemo-qml-plugin-systemsettings!131
sailfishos · Jan 31, 2020 · 3479317 · 3479317
2 parents 498d326 + f5f8eca
commit 3479317
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/rpm/nemo-qml-plugin-systemsettings.spec b/rpm/nemo-qml-plugin-systemsettings.spec
@@ -1,6 +1,6 @@
 Name:       nemo-qml-plugin-systemsettings
 Summary:    System settings plugin for Nemo Mobile
-Version:    0.5
+Version:    0.5.37
 Release:    1
 Group:      System/Libraries
 License:    BSD

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();
+            }
         }
     }