Ensuring SharedPrefs.context gets set during initialization

PeelTechnologies · Jul 29, 2018 · f6d85dc · f6d85dc
1 parent 0fa25e4
commit f6d85dc
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 4 deletions.
diff --git a/README.md b/README.md
@@ -24,7 +24,7 @@ repositories {
 }
 ```
 
-In your app build.gradle, add:  `compile "com.github.PeelTechnologies:android-typesafe-prefs:1.1.4"`
+In your app build.gradle, add:  `compile "com.github.PeelTechnologies:android-typesafe-prefs:1.1.5"`
 
 # User Guide
 TypedKey can take arbitrarily complex Java object that Gson can serialize/deserialize. For example, `TypedKey<Customer>` may represent a class with nested fields for `Address`, name, phone numbers, etc.

diff --git a/pom.xml b/pom.xml
@@ -11,7 +11,7 @@
 
 	<groupId>com.github.PeelTechnologies</groupId>
 	<artifactId>android-typesafe-prefs</artifactId>
-	<version>1.1.4</version>
+	<version>1.1.5</version>
 	<packaging>jar</packaging>
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

diff --git a/src/main/java/com/peel/prefs/SharedPrefs.java b/src/main/java/com/peel/prefs/SharedPrefs.java
@@ -59,6 +59,7 @@ public static void init(Context context, Gson gson, String prefsFileName, int ma
     public synchronized static void init(Prefs defaultPrefs, Prefs... prefsList) {
         Objects.requireNonNull(defaultPrefs);
         SharedPrefs.defaultPrefs = defaultPrefs;
+        SharedPrefs.context = defaultPrefs.context();
         if (prefsList != null) {
             String defaultPrefsFileName = defaultPrefs.getPrefsFileName(); // can be null
             for (Prefs prefs : prefsList) {

diff --git a/src/test/java/com/peel/prefs/SharedPrefsTest.java b/src/test/java/com/peel/prefs/SharedPrefsTest.java
@@ -16,6 +16,7 @@
 package com.peel.prefs;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.fail;
 
@@ -39,10 +40,10 @@
 @PrepareForTest({Context.class, SharedPreferences.class, PreferenceManager.class})
 public class SharedPrefsTest {
 
-    private static final Gson gson = new Gson();
+    private final Gson gson = new Gson();
 
     @Test
-    public void testInitWIthCustomDefaultProps() {
+    public void testInitWithCustomDefaultProps() {
         Context context = AndroidFixtures.createMockContext(null, "my_props");
         SharedPrefs.TestAccess.init(context, gson, "my_props", 3);
         SharedPrefs.put("userId",  String.class, "1999999");
@@ -61,6 +62,19 @@ public void getPutWithKeyNameAndClass() {
         assertNull(SharedPrefs.get("userId", String.class));
     }
 
+    @Test
+    public void testInitContext() {
+        Context context = AndroidFixtures.createMockContext(null, "my_props", "my_props1");
+        SharedPrefs.TestAccess.init(context, gson);
+        assertNotNull(SharedPrefs.context());
+
+        SharedPrefs.TestAccess.init(context, gson, "my_props", 3);
+        assertNotNull(SharedPrefs.context());
+
+        SharedPrefs.TestAccess.init(new Prefs(context, gson, "my_props", 2));
+        assertNotNull(SharedPrefs.context());
+    }
+
     @Test
     public void testInitWithNonNullDefaultPrefs() {
         Context context = AndroidFixtures.createMockContext(null, "my_props1", "my_props2");