Merge pull request #1509 from opensrp/feature/ntd/fix-task-reset

update to client-core v4.3.21-SNAPSHOT
opensrp · Sep 6, 2021 · 06ff225 · 06ff225
2 parents bc9192c + cf22f66
commit 06ff225
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/opensrp-reveal/build.gradle b/opensrp-reveal/build.gradle
@@ -70,7 +70,7 @@ android {
         applicationId "org.smartregister.reveal"
         minSdkVersion 18
         targetSdkVersion 30
-        versionCode 34
+        versionCode 35
         versionName "5.3.30"
         multiDexEnabled true
         buildConfigField "long", "MAX_SERVER_TIME_DIFFERENCE", "1800000l"
@@ -145,13 +145,14 @@ android {
             minifyEnabled false
             zipAlignEnabled true
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
-            resValue "string", 'opensrp_base_url', '"https://reveal-zm.smartregister.org/opensrp/"'
+            resValue "string", 'opensrp_base_url', '"https://reveal-sz.smartregister.org/opensrp"'
+//            resValue "string", 'opensrp_base_url', '"https://reveal-stage.smartregister.org/opensrp/"'
             buildConfigField "Integer", "DATABASE_VERSION", '14'
             buildConfigField "int", "OPENMRS_UNIQUE_ID_INITIAL_BATCH_SIZE", '250'
             buildConfigField "int", "OPENMRS_UNIQUE_ID_BATCH_SIZE", '100'
             buildConfigField "int", "OPENMRS_UNIQUE_ID_SOURCE", '2'
             buildConfigField "long", "SYNC_INTERVAL_IN_MINUTES", '480'
-            buildConfigField "org.smartregister.reveal.util.Country", "BUILD_COUNTRY", "org.smartregister.reveal.util.Country.ZAMBIA"
+            buildConfigField "org.smartregister.reveal.util.Country", "BUILD_COUNTRY", "org.smartregister.reveal.util.Country.NTD_SCHOOL"
             buildConfigField "long", "PULL_UNIQUE_IDS_MINUTES", '15'
             buildConfigField "String", "ADMIN_PASSWORD_NOT_NEAR_STRUCTURES", '"AdminPass1"'
             buildConfigField "float", "MY_LOCATION_BUFFER", '25'
@@ -223,7 +224,7 @@ dependencies {
         exclude group: 'stax', module: 'stax-api'
     }
 
-    implementation('org.smartregister:opensrp-client-core:4.3.11-SNAPSHOT@aar') {
+    implementation('org.smartregister:opensrp-client-core:4.3.21-SNAPSHOT@aar') {
         transitive = true
         exclude group: 'com.google.guava', module: 'guava'
         exclude group: 'com.android.support', module: 'appcompat-v7'

diff --git a/opensrp-reveal/src/main/java/org/smartregister/reveal/util/RevealSyncConfiguration.java b/opensrp-reveal/src/main/java/org/smartregister/reveal/util/RevealSyncConfiguration.java
@@ -153,4 +153,9 @@ public boolean firebasePerformanceMonitoringEnabled() {
     public List<Pair<String, String>> getGlobalSettingsQueryParams() {
         return Collections.singletonList(Pair.create("identifier", "global_configs"));
     }
+
+    @Override
+    public boolean skipUnsyncedTasksOnFetchFromServer() {
+        return true;
+    }
 }