Allow configure persistent store type in runtime.

Author: carmenlau

skygear/src/main/java/io/skygear/skygear/Configuration.java

@@ -52,18 +52,27 @@ public final class Configuration {
      */
     final boolean pubsubConnectAutomatically;
 
+
+    /**
+     * Boolean indicating whether encrypt current user data saved in SharedPreferences.
+     */
+    final boolean encryptCurrentUserData;
+
+
     private Configuration(
             String endpoint,
             String apiKey,
             String gcmSenderId,
             boolean pubsubHandlerExecutionInBackground,
-            boolean pubsubConnectAutomatically
+            boolean pubsubConnectAutomatically,
+            boolean encryptCurrentUserData
     ) {
         this.endpoint = endpoint;
         this.apiKey = apiKey;
         this.gcmSenderId = gcmSenderId;
         this.pubsubHandlerExecutionInBackground = pubsubHandlerExecutionInBackground;
         this.pubsubConnectAutomatically = pubsubConnectAutomatically;
+        this.encryptCurrentUserData = encryptCurrentUserData;
     }
 
     /**
@@ -111,6 +120,15 @@ public boolean isPubsubConnectAutomatically() {
         return pubsubConnectAutomatically;
     }
 
+    /**
+     * Encrypt current user data boolean.
+     *
+     * @return the boolean
+     */
+    public boolean encryptCurrentUserData() {
+        return encryptCurrentUserData;
+    }
+
     /**
      * Creates an instance of default configuration.
      *
@@ -148,6 +166,7 @@ public static final class Builder {
         private String gcmSenderId;
         private boolean pubsubHandlerExecutionInBackground;
         private boolean pubsubConnectAutomatically;
+        private boolean encryptCurrentUserData;
 
         /**
          * Creates an instance of Builder.
@@ -212,6 +231,18 @@ public Builder pubsubConnectAutomatically(boolean automatic) {
             return this;
         }
 
+        /**
+         * Sets whether encrypt current user data saved in SharedPreferences.
+         *
+         * @param enabled the boolean indicating whether encryption Enabled
+         * automatically.
+         * @return the builder
+         */
+        public Builder encryptCurrentUserData(boolean enabled) {
+            this.encryptCurrentUserData = enabled;
+            return this;
+        }
+
         /**
          * Build a configuration.
          *
@@ -231,7 +262,8 @@ public Configuration build() {
                     this.apiKey,
                     this.gcmSenderId,
                     this.pubsubHandlerExecutionInBackground,
-                    this.pubsubConnectAutomatically
+                    this.pubsubConnectAutomatically,
+                    this.encryptCurrentUserData
             );
         }
     }

skygear/src/main/java/io/skygear/skygear/Container.java

@@ -31,7 +31,7 @@ public final class Container {
     private static final String TAG = "Skygear SDK";
     private static Container sharedInstance;
 
-    final PersistentStore persistentStore;
+    PersistentStore persistentStore;
     final Context context;
     final RequestManager requestManager;
     Configuration config;
@@ -61,18 +61,13 @@ public Container(Context context, Configuration config) {
         this.context = context.getApplicationContext();
         this.config = config;
         this.requestManager = new RequestManager(this.context, this.config);
-        this.persistentStore = new SecurePersistentStore(this.context);
 
         this.auth = new AuthContainer(this);
         this.pubsub = new PubsubContainer(this);
         this.push = new PushContainer(this);
         this.publicDatabase = Database.Factory.publicDatabase(this);
         this.privateDatabase = Database.Factory.privateDatabase(this);
-        this.requestManager.accessToken = this.persistentStore.accessToken;
-
-        if (this.persistentStore.defaultAccessControl != null) {
-            AccessControl.defaultAccessControl = this.persistentStore.defaultAccessControl;
-        }
+        this.configPersistentStore(config);
     }
 
     /**
@@ -153,6 +148,7 @@ public void configure(Configuration config) {
         this.config = config;
         this.requestManager.configure(config);
         this.pubsub.configure(config);
+        this.configPersistentStore(config);
     }
 
     /**
@@ -263,4 +259,16 @@ public final void onFailure(Error error) {
             }
         });
     }
+
+    private void configPersistentStore(Configuration config) {
+        if (config != null && config.encryptCurrentUserData) {
+            this.persistentStore = new SecurePersistentStore(this.context);
+        } else {
+            this.persistentStore = new PersistentStore(this.context);
+        }
+        this.requestManager.accessToken = this.persistentStore.accessToken;
+        if (this.persistentStore.defaultAccessControl != null) {
+            AccessControl.defaultAccessControl = this.persistentStore.defaultAccessControl;
+        }
+    }
 }

skygear/src/main/java/io/skygear/skygear/SkygearApplication.java

@@ -55,6 +55,16 @@ public boolean isPubsubHandlerExecutionInBackground() {
         return false;
     }
 
+
+    /**
+     * Gets whether encrypt current user data saved in SharedPreferences.
+     *
+     * @return the boolean indicating whether encrypt current user data saved in SharedPreferences
+     */
+    public boolean encryptCurrentUserData() {
+        return false;
+    }
+
     @Override
     public void onCreate() {
         super.onCreate();
@@ -64,6 +74,7 @@ public void onCreate() {
                 .apiKey(this.getApiKey())
                 .gcmSenderId(this.getGcmSenderId())
                 .pubsubHandlerExecutionInBackground(this.isPubsubHandlerExecutionInBackground())
+                .encryptCurrentUserData(this.encryptCurrentUserData())
                 .build();
 
         Container.defaultContainer(this).configure(config);