Merge pull request #81 from SUPLA/develop

v2.3.13
SUPLA · Jul 4, 2019 · 8ca6f5d · 8ca6f5d
2 parents 47e0d93 + 2e71e96
commit 8ca6f5d
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -9,8 +9,8 @@ android {
         applicationId "org.supla.android"
         minSdkVersion Integer.parseInt(project.ANDROID_BUILD_MIN_SDK_VERSION)
         targetSdkVersion Integer.parseInt(project.ANDROID_BUILD_TARGET_SDK_VERSION)
-        versionCode 66
-        versionName "2.3.12"
+        versionCode 67
+        versionName "2.3.13"
 
         sourceSets.main {
             jniLibs.srcDir 'src/main/libs'

diff --git a/app/src/main/java/org/supla/android/lib/SuplaClient.java b/app/src/main/java/org/supla/android/lib/SuplaClient.java
@@ -269,8 +269,11 @@ public boolean Registered() {
 
         boolean result;
 
-        synchronized (sc_lck) {
+        LockClientPtr();
+        try {
             result = _supla_client_ptr != 0 && scRegistered(_supla_client_ptr);
+        } finally {
+            UnlockClientPtr();
         }
 
         return result;
@@ -353,8 +356,11 @@ public int GetProtoVersion() {
 
         int result;
 
-        synchronized (sc_lck) {
+        LockClientPtr();
+        try {
             result = _supla_client_ptr != 0 ? scGetProtoVersion(_supla_client_ptr) : 0;
+        } finally {
+            UnlockClientPtr();
         }
 
         return result;