Update 3.1-10

DylanVanAssche · Apr 16, 2017 · 7abfe9b · 7abfe9b
1 parent 12d1d91
commit 7abfe9b
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 26 deletions.
diff --git a/docs/tinder_api.md b/docs/tinder_api.md
@@ -87,7 +87,7 @@ Parameter info:
   <tbody>
   <tr>
     <td>facebook_token</td>
-    <td>**string**: Facebook token from the OAuth dialog</td>
+    <td>__string__: Facebook token from the OAuth dialog</td>
   </tr>
   </tbody>
 </table>
@@ -115,24 +115,24 @@ Parameter info:
   <tbody>
   <tr>
     <td>discoverable</td>
-    <td>**true**:Other users can swipe on you<br>**false**: nobody can see you except for your matches</td>
+    <td>__true__:Other users can swipe on you<br>__false__: nobody can see you except for your matches</td>
   </tr>
     <tr>
       <td>gender</td>
-      <td>**0**: I'm a male<br>
-      **1**: I'm a female</td>
+      <td>__0__: I'm a male<br>
+      __1__: I'm a female</td>
     </tr>
     <tr>
       <td>age_filter_min</td>
-      <td>**integer**: minimum age recommendations</td>
+      <td>__integer__: minimum age recommendations</td>
     </tr>
     <tr>
       <td>age_filter_max</td>
-      <td>**integer**: maximum age recommendations</td>
+      <td>__integer__: maximum age recommendations</td>
     </tr>
     <tr>
     	<td>distance_filter</td>
-    	<td>**integer**: search distance in miles (0 - 160 km)</td>
+    	<td>__integer__: search distance in miles (0 - 160 km)</td>
     </tr>
   </tbody>
 </table>
@@ -188,12 +188,12 @@ Parameter info:
   <tbody>
   <tr>
     <td>id</td>
-    <td>**string**: Tinder user ID</td>
+    <td>__string__: Tinder user ID</td>
   </tr>
   <tr>
     <td>cause</td>
-    <td>**1**: Reason is SPAM<br>
-    **2**: Reason is inappropriate/offensive</td></td>
+    <td>__1__: Reason is SPAM<br>
+    __2__: Reason is inappropriate/offensive</td></td>
   </tr>
   </tbody>
 </table>
@@ -265,7 +265,7 @@ Parameter info:
   <tbody>
   <tr>
     <td>date</td>
-    <td>**string**: Empty will return the whole account history, when an ISO string date is supplied only the updates from that date are returned</td>
+    <td>__string__: Empty will return the whole account history, when an ISO string date is supplied only the updates from that date are returned</td>
   </tr>
   </tbody>
 </table>
@@ -357,7 +357,7 @@ Parameter info:
   <tbody>
   <tr>
     <td>limit</td>
-    <td>**integer**: 10 seems to be the normal limit</td>
+    <td>__integer__: 10 seems to be the normal limit</td>
   </tr>
   </tbody>
 </table>

diff --git a/harbour-sailfinder.pro.user b/harbour-sailfinder.pro.user
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 4.0.1, 2017-04-15T10:14:22. -->
+<!-- Written by QtCreator 4.0.1, 2017-04-16T18:50:43. -->
 <qtcreator>
  <data>
   <variable>EnvironmentId</variable>
   <value type="QByteArray">{f3ecafd1-b01f-4e43-9e3b-2de7d2f262d2}</value>
  </data>
  <data>
   <variable>ProjectExplorer.Project.ActiveTarget</variable>
-  <value type="int">1</value>
+  <value type="int">0</value>
  </data>
  <data>
   <variable>ProjectExplorer.Project.EditorSettings</variable>
@@ -62,8 +62,8 @@
    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">MerSDK-SailfishOS-i486</value>
    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">MerSDK-SailfishOS-i486</value>
    <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">{cb74bcd0-7fb5-4819-a1e0-d9d5bf1ecfcb}</value>
-   <value type="int" key="ProjectExplorer.Target.ActiveBuildConfiguration">0</value>
-   <value type="int" key="ProjectExplorer.Target.ActiveDeployConfiguration">0</value>
+   <value type="int" key="ProjectExplorer.Target.ActiveBuildConfiguration">1</value>
+   <value type="int" key="ProjectExplorer.Target.ActiveDeployConfiguration">2</value>
    <value type="int" key="ProjectExplorer.Target.ActiveRunConfiguration">0</value>
    <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.0">
     <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">/home/dylan/Programmes/SailfishApps/build-harbour-sailfinder-MerSDK_SailfishOS_i486-Debug</value>

diff --git a/qml/backend/sailfinder/network.py b/qml/backend/sailfinder/network.py
@@ -91,16 +91,19 @@ def send(self, url, payload=None, http_type=constants.http.TYPE["POST"], session
         limit_execution = 50
         wait_since = time.clock()
 
-        if not wait and not self.status(False): #Don't force the user to enable a netwerk connection when checking notifications
-            logger.log_to_file.debug("No connection + waiting is disabled = abort request")
-            return False
+        if not self.status(False): #Don't force the user to enable a netwerk connection when checking notifications
+            if not wait:
+                logger.log_to_file.debug("No connection + waiting is disabled = abort request")
+                return False
+            else:
+                sfos.connection_manager.notify_connection_state(False)
+                sfos.connection_manager.launch_connection_dialog()
 
-        while(not self.status()): #Wait until network is available
-            time.sleep(0.5)
+        while(not self.status(False)): #Wait until network is available
+            time.sleep(1.0)
             limit_execution += 1
-            if limit_execution > 150: #Limit calls to SFOS Connection Manager and logging
+            if limit_execution > 90: #Limit calls to SFOS Connection Manager and logging
                 logger.log_to_file.debug("Network unavailable: WiFi and cellular connection deactivated, already waited: " + str(round(time.clock() - wait_since,6)) + "s for a connection")
-                sfos.connection_manager.notify_connection_state(False)
         else:
             logger.log_to_file.debug("Network available, processing request after waiting: " + str(round(time.clock() - wait_since, 6)) + "s for a connection")
             sfos.connection_manager.notify_connection_state(True)

diff --git a/rpm/harbour-sailfinder.changes b/rpm/harbour-sailfinder.changes
@@ -1,4 +1,4 @@
-* Sun Apr 16 2017 Dylan Van Assche <[email protected]> 3.1-9
+* Sun Apr 16 2017 Dylan Van Assche <[email protected]> 3.1-10
 - [MINOR BUGFIX] Matches popup visible when turning the device (Github issue #101)
 - [MINOR BUGFIX] Profile cache fixed on update
 - [MINOR BUGFIX] ConnMan status read crash fixed
@@ -11,6 +11,8 @@
 - [IMPROVEMENT] Rewritten ImageGrid with a proper GridLayout (Github issue #84)
 - [IMPROVEMENT] Changed the like, dislike and superlike button to a new design
 - [IMPROVEMENT] All types of notifications can now be disabled
+- [IMPROVEMENT] Lower CPU usage while waiting for network
+- [IMPROVEMENT] Lower API calls to the Sailfish OS network dialog
 - [NEW] Dynamic updates which download automatically new matches, messages, ... (Github issues #99, #94, #89, #88, #93-2)
 - [NEW] Notifications are showed when the app is running (Github issue #35)
 - [NEW] User will be notified when GIF has been blocked by Tinder, not all content is allowed

diff --git a/rpm/harbour-sailfinder.spec b/rpm/harbour-sailfinder.spec
@@ -14,7 +14,7 @@ Name:       harbour-sailfinder
 %{?qtc_builddir:%define _builddir %qtc_builddir}
 Summary:    Sailfinder
 Version:    3.1
-Release:    9
+Release:    10
 Group:      Qt/Qt
 License:    GPLv3
 URL:        http://example.org/

diff --git a/rpm/harbour-sailfinder.yaml b/rpm/harbour-sailfinder.yaml
@@ -1,7 +1,7 @@
 Name: harbour-sailfinder
 Summary: Sailfinder
 Version: 3.1
-Release: 9
+Release: 10
 # The contents of the Group field should be one of the groups listed here:
 # http://gitorious.org/meego-developer-tools/spectacle/blobs/master/data/GROUPS
 Group: Qt/Qt