config fixes + version 1.4.6

MohGovIL · Jun 14, 2020 · 798052d · 798052d
1 parent c173ca9
commit 798052d
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 14 deletions.
diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -137,8 +137,8 @@ android {
         applicationId "com.hamagen"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 74
-        versionName '2.0.18'
+        versionCode 72
+        versionName '1.4.6'
     }
 
     dexOptions {

diff --git a/ios/codeAgainstCorona.xcodeproj/project.pbxproj b/ios/codeAgainstCorona.xcodeproj/project.pbxproj
@@ -554,12 +554,12 @@
 				CODE_SIGN_ENTITLEMENTS = "codeAgainstCorona/Code against corona.entitlements";
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 74;
+				CURRENT_PROJECT_VERSION = 72;
 				DEAD_CODE_STRIPPING = NO;
 				DEVELOPMENT_TEAM = "";
 				INFOPLIST_FILE = codeAgainstCorona/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				MARKETING_VERSION = 2.0.18;
+				MARKETING_VERSION = 1.4.6;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
@@ -585,11 +585,11 @@
 				CODE_SIGN_ENTITLEMENTS = "המגןRelease.entitlements";
 				CODE_SIGN_IDENTITY = "iPhone Distribution";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 74;
+				CURRENT_PROJECT_VERSION = 72;
 				DEVELOPMENT_TEAM = N3P977USJJ;
 				INFOPLIST_FILE = codeAgainstCorona/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				MARKETING_VERSION = 2.0.18;
+				MARKETING_VERSION = 1.4.6;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
@@ -713,7 +713,7 @@
 				CODE_SIGN_ENTITLEMENTS = "המגן QA.entitlements";
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 74;
+				CURRENT_PROJECT_VERSION = 72;
 				DEAD_CODE_STRIPPING = NO;
 				DEVELOPMENT_TEAM = N3P977USJJ;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -725,7 +725,7 @@
 				INFOPLIST_FILE = "codeAgainstCorona/Info-qa.plist";
 				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				MARKETING_VERSION = 2.0.18;
+				MARKETING_VERSION = 1.4.6;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
@@ -751,7 +751,7 @@
 				CODE_SIGN_ENTITLEMENTS = "המגן QA.entitlements";
 				CODE_SIGN_IDENTITY = "iPhone Distribution";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 74;
+				CURRENT_PROJECT_VERSION = 72;
 				DEVELOPMENT_TEAM = N3P977USJJ;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@@ -762,7 +762,7 @@
 				INFOPLIST_FILE = "codeAgainstCorona/Info-qa.plist";
 				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				MARKETING_VERSION = 2.0.18;
+				MARKETING_VERSION = 1.4.6;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",

diff --git a/src/config/default_config.json b/src/config/default_config.json
@@ -115,10 +115,12 @@
     "BleDataUrl_utc": "https://matrixdemos.blob.core.windows.net/mabar/BleUtc.json",
     "stringsUrl": "https://matrixdemos.blob.core.windows.net/mabar/texts.json",
     "versionsUrl": "https://matrixdemos.blob.core.windows.net/mabar/versions.json",
-    "dataShareUrl": "https://hamagenapitest.health.gov.il/api/data/UploadMobileData",
+    "dataShareUrl": "https://hamagenapitest.health.gov.il/api/data/UploadMobileData2",
     "sampleDistance": 50,
     "sampleInterval": 60000,
     "fetchMilliseconds": 900000,
+    "minimumBLEFetchIntervalMin": 15,
+    "minimumGeoFetchIntervalMin": 60,
     "meterRadius": 50,
     "clusterRadius": 20,
     "jitterValue": 2,
@@ -220,13 +222,15 @@
   "com.hamagen": {
     "dataUrl": "https://gisweb.azureedge.net/PointsUtc.json",
     "dataUrl_utc": "https://gisweb.azureedge.net/PointsUtc.json",
-    "BleDataUrl_utc": "https://matrixdemos.blob.core.windows.net/mabar/BleUtc.json",
+    "BleDataUrl_utc": "https://gisweb.azureedge.net/BleUtc.json",
     "stringsUrl": "https://gisweb.azureedge.net/texts.json",
     "versionsUrl": "https://gisweb.azureedge.net/versions.json",
-    "dataShareUrl": "https://hamagenapitest.health.gov.il/api/data/UploadMobileData",
+    "dataShareUrl": "https://hamagenapi.health.gov.il/api/data/UploadMobileData2",
     "sampleDistance": 50,
     "sampleInterval": 900000,
     "fetchMilliseconds": 3600000,
+    "minimumBLEFetchIntervalMin": 15,
+    "minimumGeoFetchIntervalMin": 60,
     "meterRadius": 50,
     "clusterRadius": 20,
     "jitterValue": 2,

diff --git a/src/constants/Constants.ts b/src/constants/Constants.ts
@@ -70,4 +70,4 @@ export const USAGE_PRIVACY = 'USAGE_PRIVACY';
 
 // BLE
 export const USER_AGREE_TO_BLE = 'USER_AGREE_TO_BLE';
-export const ENABLE_BLE = Platform.OS === 'android';
+export const ENABLE_BLE = false