diff --git a/docs/tinder_api.md b/docs/tinder_api.md index 5952f1c..fafc394 100755 --- a/docs/tinder_api.md +++ b/docs/tinder_api.md @@ -87,7 +87,7 @@ Parameter info: facebook_token - **string**: Facebook token from the OAuth dialog + __string__: Facebook token from the OAuth dialog @@ -115,24 +115,24 @@ Parameter info: discoverable - **true**:Other users can swipe on you
**false**: nobody can see you except for your matches + __true__:Other users can swipe on you
__false__: nobody can see you except for your matches gender - **0**: I'm a male
- **1**: I'm a female + __0__: I'm a male
+ __1__: I'm a female age_filter_min - **integer**: minimum age recommendations + __integer__: minimum age recommendations age_filter_max - **integer**: maximum age recommendations + __integer__: maximum age recommendations distance_filter - **integer**: search distance in miles (0 - 160 km) + __integer__: search distance in miles (0 - 160 km) @@ -188,12 +188,12 @@ Parameter info: id - **string**: Tinder user ID + __string__: Tinder user ID cause - **1**: Reason is SPAM
- **2**: Reason is inappropriate/offensive + __1__: Reason is SPAM
+ __2__: Reason is inappropriate/offensive @@ -265,7 +265,7 @@ Parameter info: date - **string**: Empty will return the whole account history, when an ISO string date is supplied only the updates from that date are returned + __string__: Empty will return the whole account history, when an ISO string date is supplied only the updates from that date are returned @@ -357,7 +357,7 @@ Parameter info: limit - **integer**: 10 seems to be the normal limit + __integer__: 10 seems to be the normal limit diff --git a/harbour-sailfinder.pro.user b/harbour-sailfinder.pro.user index 5c60153..ab22dec 100644 --- a/harbour-sailfinder.pro.user +++ b/harbour-sailfinder.pro.user @@ -1,6 +1,6 @@ - + EnvironmentId @@ -8,7 +8,7 @@ ProjectExplorer.Project.ActiveTarget - 1 + 0 ProjectExplorer.Project.EditorSettings @@ -62,8 +62,8 @@ MerSDK-SailfishOS-i486 MerSDK-SailfishOS-i486 {cb74bcd0-7fb5-4819-a1e0-d9d5bf1ecfcb} - 0 - 0 + 1 + 2 0 /home/dylan/Programmes/SailfishApps/build-harbour-sailfinder-MerSDK_SailfishOS_i486-Debug diff --git a/qml/backend/sailfinder/network.py b/qml/backend/sailfinder/network.py index 4bfd3f8..5c7f6db 100644 --- 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 index 524d956..81a46ed 100644 --- a/rpm/harbour-sailfinder.changes +++ b/rpm/harbour-sailfinder.changes @@ -1,4 +1,4 @@ -* Sun Apr 16 2017 Dylan Van Assche 3.1-9 +* Sun Apr 16 2017 Dylan Van Assche 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 index 7265c1d..0ab9f52 100644 --- 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 index 9884fc8..5f0c855 100644 --- 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