7.1.7

j-kaltes · Oct 30, 2023 · 8157144 · 8157144
1 parent a600d84
commit 8157144
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 9 deletions.
diff --git a/Common/build.gradle b/Common/build.gradle
@@ -77,8 +77,8 @@ android {
 
             //	targetSdk 26
 	//******  Zet op rollout op 100% ******
-		versionCode    425     //LIBRE2ONLY
-		versionName '7.1.6-no3'
+		versionCode     427       //LIBRE2ONLY
+		versionName '7.1.7-no3'
             	dimension 'libreVersion'
             buildConfigField 'int', 'libreVersion', '2'
 		}
@@ -88,9 +88,9 @@ android {
 	   minSdk 26
 //	   minSdk 23
             dimension 'libreVersion'
-		versionCode   425     //LIBRE3
+		versionCode    427       //LIBRE3
 	//******  Zet op rollout op 100% ******
-		versionName '7.1.6'
+		versionName '7.1.7'
 
            	buildConfigField 'int', 'libreVersion', '3'
 		    externalNativeBuild.cmake {
@@ -107,9 +107,9 @@ android {
             // targetSdk 30
             dimension 'wearos'
 		minSdk 26
-		versionCode   426     //WATCH
+		versionCode    428       //WATCH
 	//******  Zet op rollout op 100% ******
-		versionName '7.1.6-wear'
+		versionName '7.1.7-wear'
 		signingConfig signingConfigs.alg
 
 //            buildConfigField 'int', 'targetSDK', "$targetSdk"

diff --git a/Common/src/main/java/tk/glucodata/SuperGattCallback.java b/Common/src/main/java/tk/glucodata/SuperGattCallback.java
@@ -127,7 +127,7 @@ static void init(Application app) {
        if(glucosealarms==null) glucosealarms=new tk.glucodata.GlucoseAlarms(app);
 	if(!isWearable) {
 		Talker.getvalues();
-		if(Talker.istalking())
+		if(Talker.shouldtalk())
 			newtalker(null);
 		}
 	}

diff --git a/Common/src/mobile/java/tk/glucodata/Talker.java b/Common/src/mobile/java/tk/glucodata/Talker.java
@@ -228,8 +228,11 @@ public void onTextChanged(CharSequence s, int start, int before, int count) { }
 
 	return new View[] {speed,displayspeed};
 	}
-public static boolean istalking() {
-	return SuperGattCallback.dotalk||Natives.gettouchtalk()||Natives.speakmessages()||Natives.speakalarms();
+public static boolean shouldtalk() {
+	return  SuperGattCallback.dotalk||Natives.gettouchtalk()||Natives.speakmessages()||Natives.speakalarms();
+	}
+public  static boolean istalking() {
+	return SuperGattCallback.talker!=null;
 	}
 public static void config(MainActivity context) {
 	if(!istalking()) {