From 37d383c672cfb74449dbed2a94a8487ebb793f95 Mon Sep 17 00:00:00 2001
From: Samuel Githengi <samuel.githengi@gmail.com>
Date: Tue, 30 Oct 2018 18:49:13 +0300
Subject: [PATCH] Merge shared Preferences

---
 gradle.properties                                        | 2 +-
 opensrp-configurable-views/build.gradle                  | 2 +-
 .../configurableviews/helper/PreferenceHelper.java       | 9 ++++-----
 sample/build.gradle                                      | 2 +-
 .../sample/repository/SampleRepository.java              | 2 --
 5 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index f5d8fc4..3d4a35e 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,4 +1,4 @@
-VERSION_NAME=1.1.1-SNAPSHOT
+VERSION_NAME=1.1.2-SNAPSHOT
 VERSION_CODE=1
 GROUP=org.smartregister
 POM_SETTING_DESCRIPTION=OpenSRP Client Configurable Views Library
diff --git a/opensrp-configurable-views/build.gradle b/opensrp-configurable-views/build.gradle
index 38d7c2a..8255415 100644
--- a/opensrp-configurable-views/build.gradle
+++ b/opensrp-configurable-views/build.gradle
@@ -85,7 +85,7 @@ tasks.withType(Test) {
 }
 
 dependencies {
-    implementation('org.smartregister:opensrp-client-core:1.3.2-SNAPSHOT@aar') {
+    implementation('org.smartregister:opensrp-client-core:1.4.2-SNAPSHOT@aar') {
         transitive = true
         exclude group: 'com.github.bmelnychuk', module: 'atv'
     }
diff --git a/opensrp-configurable-views/src/main/java/org/smartregister/configurableviews/helper/PreferenceHelper.java b/opensrp-configurable-views/src/main/java/org/smartregister/configurableviews/helper/PreferenceHelper.java
index 0eb5b07..79dcee2 100644
--- a/opensrp-configurable-views/src/main/java/org/smartregister/configurableviews/helper/PreferenceHelper.java
+++ b/opensrp-configurable-views/src/main/java/org/smartregister/configurableviews/helper/PreferenceHelper.java
@@ -1,13 +1,12 @@
 package org.smartregister.configurableviews.helper;
 
 import android.content.Context;
+import android.preference.PreferenceManager;
 
 import org.smartregister.configurableviews.util.Constants;
-import org.smartregister.util.Utils;
 
 import static org.smartregister.configurableviews.util.Constants.LAST_VIEWS_SYNC_TIMESTAMP;
 import static org.smartregister.configurableviews.util.Constants.VIEW_CONFIGURATION_PREFIX;
-import static org.smartregister.util.Utils.getPreference;
 
 /**
  * Created by ndegwamartin on 21/02/2018.
@@ -31,16 +30,16 @@ private PreferenceHelper(Context context) {
     }
 
     public long getLastViewsSyncTimeStamp() {
-        return Long.parseLong(getPreference(context, LAST_VIEWS_SYNC_TIMESTAMP, "0"));
+        return PreferenceManager.getDefaultSharedPreferences(context).getLong(LAST_VIEWS_SYNC_TIMESTAMP, 0);
     }
 
     public void updateLastViewsSyncTimeStamp(long lastSyncTimeStamp) {
-        Utils.writePreference(context, LAST_VIEWS_SYNC_TIMESTAMP, lastSyncTimeStamp + "");
+        PreferenceManager.getDefaultSharedPreferences(context).edit().putLong(LAST_VIEWS_SYNC_TIMESTAMP, lastSyncTimeStamp).commit();
     }
 
 
     public void updateLoginConfigurableViewPreference(String loginJson) {
-        Utils.writePreference(context, VIEW_CONFIGURATION_PREFIX + Constants.CONFIGURATION.LOGIN, loginJson);
+        PreferenceManager.getDefaultSharedPreferences(context).edit().putString(VIEW_CONFIGURATION_PREFIX + Constants.CONFIGURATION.LOGIN, loginJson).commit();
     }
 
 
diff --git a/sample/build.gradle b/sample/build.gradle
index 96264da..87d18ec 100644
--- a/sample/build.gradle
+++ b/sample/build.gradle
@@ -66,7 +66,7 @@ android {
 
     dependencies {
 
-        implementation('org.smartregister:opensrp-client-core:1.3.2-SNAPSHOT@aar') {
+        implementation('org.smartregister:opensrp-client-core:1.4.2-SNAPSHOT@aar') {
             transitive = true
             exclude group: 'com.github.bmelnychuk', module: 'atv'
         }
diff --git a/sample/src/main/java/org/smartregister/configurableviews/sample/repository/SampleRepository.java b/sample/src/main/java/org/smartregister/configurableviews/sample/repository/SampleRepository.java
index e08220c..c8f6c14 100644
--- a/sample/src/main/java/org/smartregister/configurableviews/sample/repository/SampleRepository.java
+++ b/sample/src/main/java/org/smartregister/configurableviews/sample/repository/SampleRepository.java
@@ -32,9 +32,7 @@ public SampleRepository(Context context, org.smartregister.Context openSRPContex
     public void onCreate(SQLiteDatabase database) {
         super.onCreate(database);
         EventClientRepository.createTable(database, EventClientRepository.Table.client, EventClientRepository.client_column.values());
-        EventClientRepository.createTable(database, EventClientRepository.Table.address, EventClientRepository.address_column.values());
         EventClientRepository.createTable(database, EventClientRepository.Table.event, EventClientRepository.event_column.values());
-        EventClientRepository.createTable(database, EventClientRepository.Table.obs, EventClientRepository.obs_column.values());
 
         ConfigurableViewsRepository.createTable(database);