Rename CredentialStorage to PasscodeDataStorage. Implement RealmPassc…

…odeDataStorage in separate module.
omadahealth · Oct 25, 2017 · f928337 · f928337
1 parent 0fa0468
commit f928337
Show file tree

Hide file tree

Showing 17 changed files with 330 additions and 43 deletions.
diff --git a/app/src/main/java/com/github/orangegangsters/lollipin/CustomApplication.java b/app/src/main/java/com/github/orangegangsters/lollipin/CustomApplication.java
@@ -11,12 +11,11 @@
  */
 public class CustomApplication extends Application {
 
-    @SuppressWarnings("unchecked")
     @Override
     public void onCreate() {
         super.onCreate();
 
-        LockManager<CustomPinActivity> lockManager = LockManager.getInstance();
+        LockManager lockManager = LockManager.getInstance();
         lockManager.enableAppLock(this, CustomPinActivity.class);
         lockManager.getAppLock().setLogoId(R.drawable.security_lock);
     }

diff --git a/build.gradle b/build.gradle
@@ -7,6 +7,7 @@ buildscript {
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:2.3.1'
+        classpath "io.realm:realm-gradle-plugin:3.1.4"
     }
 }
 

diff --git a/...pin/lib/interfaces/CredentialStorage.java → ...n/lib/interfaces/PasscodeDataStorage.java b/...pin/lib/interfaces/CredentialStorage.java → ...n/lib/interfaces/PasscodeDataStorage.java
@@ -5,7 +5,7 @@
 
 import com.github.orangegangsters.lollipin.lib.enums.Algorithm;
 
-public interface CredentialStorage {
+public interface PasscodeDataStorage {
 
     int readAttemptsCount();
 

diff --git a/lib/src/main/java/com/github/orangegangsters/lollipin/lib/managers/AppLock.java b/lib/src/main/java/com/github/orangegangsters/lollipin/lib/managers/AppLock.java
@@ -6,7 +6,7 @@
 import android.support.annotation.Nullable;
 
 import com.github.orangegangsters.lollipin.lib.interfaces.ConfigurationStorage;
-import com.github.orangegangsters.lollipin.lib.interfaces.CredentialStorage;
+import com.github.orangegangsters.lollipin.lib.interfaces.PasscodeDataStorage;
 
 import java.util.HashSet;
 
@@ -235,7 +235,7 @@ public static class Builder {
         private final Class<? extends AppLockActivity> mActivityClass;
 
         private ConfigurationStorage mConfigurationStorage;
-        private CredentialStorage mCredentialStorage;
+        private PasscodeDataStorage mPasscodeDataStorage;
 
         public Builder(Context context, Class<? extends AppLockActivity> activityClass) {
             mContext = context;
@@ -263,12 +263,12 @@ public Builder setConfigurationStorage(@Nullable ConfigurationStorage configurat
         }
 
         @Nullable
-        CredentialStorage getCredentialStorage() {
-            return mCredentialStorage;
+        PasscodeDataStorage getPasscodeDataStorage() {
+            return mPasscodeDataStorage;
         }
 
-        public Builder setCredentialStorage(@Nullable CredentialStorage credentialStorage) {
-            mCredentialStorage = credentialStorage;
+        public Builder setPasscodeDataStorage(@Nullable PasscodeDataStorage passcodeDataStorage) {
+            mPasscodeDataStorage = passcodeDataStorage;
             return this;
         }
 

diff --git a/lib/src/main/java/com/github/orangegangsters/lollipin/lib/managers/AppLockImpl.java b/lib/src/main/java/com/github/orangegangsters/lollipin/lib/managers/AppLockImpl.java
@@ -12,16 +12,16 @@
 import com.github.orangegangsters.lollipin.lib.encryption.SaltGenerator;
 import com.github.orangegangsters.lollipin.lib.enums.Algorithm;
 import com.github.orangegangsters.lollipin.lib.interfaces.ConfigurationStorage;
-import com.github.orangegangsters.lollipin.lib.interfaces.CredentialStorage;
+import com.github.orangegangsters.lollipin.lib.interfaces.PasscodeDataStorage;
 import com.github.orangegangsters.lollipin.lib.interfaces.LifeCycleInterface;
 import com.github.orangegangsters.lollipin.lib.storage.DefaultPreferencesConfigurationStorage;
-import com.github.orangegangsters.lollipin.lib.storage.DefaultPreferencesCredentialStorage;
+import com.github.orangegangsters.lollipin.lib.storage.DefaultPreferencesPasscodeDataStorage;
 
 public class AppLockImpl extends AppLock implements LifeCycleInterface {
 
     public static final String TAG = "AppLockImpl";
 
-    private final CredentialStorage mCredentialStorage;
+    private final PasscodeDataStorage mPasscodeDataStorage;
     private final ConfigurationStorage mConfigurationStorage;
 
     /**
@@ -53,14 +53,14 @@ public static AppLockImpl getInstance(Context context, Class<? extends AppLockAc
 
     AppLockImpl(Context context, Class<? extends AppLockActivity> activityClass) {
         mActivityClass = activityClass;
-        mCredentialStorage = new DefaultPreferencesCredentialStorage(context);
+        mPasscodeDataStorage = new DefaultPreferencesPasscodeDataStorage(context);
         mConfigurationStorage = new DefaultPreferencesConfigurationStorage(context);
     }
 
     AppLockImpl(Builder builder) {
         mActivityClass = builder.getActivityClass();
         mConfigurationStorage = getConfigurationStorageOrDefault(builder);
-        mCredentialStorage = getCredentialStorageOrDefault(builder);
+        mPasscodeDataStorage = getPasscodeDataStorageOrDefault(builder);
     }
 
     private static ConfigurationStorage getConfigurationStorageOrDefault(Builder builder) {
@@ -72,10 +72,10 @@ private static ConfigurationStorage getConfigurationStorageOrDefault(Builder bui
         }
     }
 
-    private static CredentialStorage getCredentialStorageOrDefault(Builder builder) {
-        CredentialStorage storage = builder.getCredentialStorage();
+    private static PasscodeDataStorage getPasscodeDataStorageOrDefault(Builder builder) {
+        PasscodeDataStorage storage = builder.getPasscodeDataStorage();
         if (storage == null) {
-            return new DefaultPreferencesCredentialStorage(builder.getContext());
+            return new DefaultPreferencesPasscodeDataStorage(builder.getContext());
         } else {
             return storage;
         }
@@ -92,7 +92,7 @@ public void setTimeout(long timeout) {
     }
 
     public String getSalt() {
-        String salt = mCredentialStorage.readSalt();
+        String salt = mPasscodeDataStorage.readSalt();
         if (salt == null) {
             salt = SaltGenerator.generate();
             setSalt(salt);
@@ -101,7 +101,7 @@ public String getSalt() {
     }
 
     private void setSalt(String salt) {
-        mCredentialStorage.writeSalt(salt);
+        mPasscodeDataStorage.writeSalt(salt);
     }
 
     @Override
@@ -166,7 +166,7 @@ public void disableAndRemoveConfiguration() {
         PinCompatActivity.clearListeners();
         PinFragmentActivity.clearListeners();
         mConfigurationStorage.clear();
-        mCredentialStorage.clear();
+        mPasscodeDataStorage.clear();
     }
 
     @Override
@@ -191,32 +191,32 @@ public void setLastActiveMillis() {
 
     @Override
     public int getAttemptsCount() {
-        return mCredentialStorage.readAttemptsCount();
+        return mPasscodeDataStorage.readAttemptsCount();
     }
 
     @Override
     public int incrementAttemptsCountAndGet() {
-        int attempts = mCredentialStorage.readAttemptsCount() + 1;
-        mCredentialStorage.writeAttemptsCount(attempts);
+        int attempts = mPasscodeDataStorage.readAttemptsCount() + 1;
+        mPasscodeDataStorage.writeAttemptsCount(attempts);
         return attempts;
     }
 
     @Override
     public void resetAttemptsCount() {
-        mCredentialStorage.writeAttemptsCount(0);
+        mPasscodeDataStorage.writeAttemptsCount(0);
     }
 
     @Override
     public boolean checkPasscode(String passcode) {
-        Algorithm algorithm = mCredentialStorage.readCurrentAlgorithm();
+        Algorithm algorithm = mPasscodeDataStorage.readCurrentAlgorithm();
 
         String salt = getSalt();
         passcode = salt + passcode + salt;
         passcode = Encryptor.getSHA(passcode, algorithm);
         String storedPasscode = "";
 
         if (isPasscodeSet()) {
-            storedPasscode = mCredentialStorage.readPasscode();
+            storedPasscode = mPasscodeDataStorage.readPasscode();
         }
 
         return storedPasscode.equalsIgnoreCase(passcode);
@@ -226,12 +226,12 @@ public boolean checkPasscode(String passcode) {
     public boolean setPasscode(String passcode) {
         String salt = getSalt();
         if (passcode == null) {
-            mCredentialStorage.clearPasscode();
+            mPasscodeDataStorage.clearPasscode();
             this.disable();
         } else {
             setAlgorithm(Algorithm.SHA256);
             passcode = Encryptor.getSHA(salt + passcode + salt, Algorithm.SHA256);
-            mCredentialStorage.writePasscode(passcode);
+            mPasscodeDataStorage.writePasscode(passcode);
             this.enable();
         }
         return true;
@@ -241,12 +241,12 @@ public boolean setPasscode(String passcode) {
      * Set the algorithm used in {@link #setPasscode(String)}
      */
     private void setAlgorithm(Algorithm algorithm) {
-        mCredentialStorage.writeCurrentAlgorithm(algorithm);
+        mPasscodeDataStorage.writeCurrentAlgorithm(algorithm);
     }
 
     @Override
     public boolean isPasscodeSet() {
-        return mCredentialStorage.hasPasscode();
+        return mPasscodeDataStorage.hasPasscode();
     }
 
     @Override

diff --git a/lib/src/main/java/com/github/orangegangsters/lollipin/lib/managers/LockManager.java b/lib/src/main/java/com/github/orangegangsters/lollipin/lib/managers/LockManager.java
@@ -12,12 +12,12 @@
  * the actual app calling the library.
  * You must get this static instance by calling {@link #getInstance()}
  */
-public class LockManager<T extends AppLockActivity> {
+public class LockManager {
 
     /**
      * The static singleton instance
      */
-    private static LockManager mInstance;
+    private static final LockManager INSTANCE = new LockManager();
     /**
      * The static singleton instance of {@link com.github.orangegangsters.lollipin.lib.managers.AppLock}
      */
@@ -27,19 +27,14 @@ public class LockManager<T extends AppLockActivity> {
      * Used to retrieve the static instance
      */
     public static LockManager getInstance() {
-        synchronized (LockManager.class) {
-            if (mInstance == null) {
-                mInstance = new LockManager<>();
-            }
-        }
-        return mInstance;
+        return INSTANCE;
     }
 
     /**
      * You must call that into your custom {@link android.app.Application} to enable the
      * {@link com.github.orangegangsters.lollipin.lib.PinActivity}
      */
-    public void enableAppLock(Context context, Class<T> activityClass) {
+    public void enableAppLock(Context context, Class<? extends AppLockActivity> activityClass) {
         if (mAppLocker != null) {
             mAppLocker.disable();
         }

diff --git a/.../DefaultPreferencesCredentialStorage.java → ...efaultPreferencesPasscodeDataStorage.java b/.../DefaultPreferencesCredentialStorage.java → ...efaultPreferencesPasscodeDataStorage.java
@@ -7,9 +7,9 @@
 import android.support.annotation.Nullable;
 
 import com.github.orangegangsters.lollipin.lib.enums.Algorithm;
-import com.github.orangegangsters.lollipin.lib.interfaces.CredentialStorage;
+import com.github.orangegangsters.lollipin.lib.interfaces.PasscodeDataStorage;
 
-public class DefaultPreferencesCredentialStorage implements CredentialStorage {
+public class DefaultPreferencesPasscodeDataStorage implements PasscodeDataStorage {
 
     private static final String ATTEMPTS_COUNT_PREFERENCE_KEY = "ATTEMPTS_COUNT_PREFERENCE_KEY";
     /**
@@ -27,7 +27,7 @@ public class DefaultPreferencesCredentialStorage implements CredentialStorage {
 
     private final SharedPreferences mPreferences;
 
-    public DefaultPreferencesCredentialStorage(Context context) {
+    public DefaultPreferencesPasscodeDataStorage(Context context) {
         mPreferences = PreferenceManager.getDefaultSharedPreferences(context);
     }
 

diff --git a/realm-storage/.gitignore b/realm-storage/.gitignore
@@ -0,0 +1 @@
+/build
diff --git a/realm-storage/build.gradle b/realm-storage/build.gradle
@@ -0,0 +1,26 @@
+apply plugin: 'com.android.library'
+apply plugin: 'realm-android'
+
+android {
+    compileSdkVersion 26
+    buildToolsVersion "26.0.1"
+
+    defaultConfig {
+        minSdkVersion 14
+        targetSdkVersion 26
+        versionCode 1
+        versionName "1.0"
+    }
+
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+        }
+    }
+}
+
+dependencies {
+    compile fileTree(dir: 'libs', include: ['*.jar'])
+    compile project(":lib")
+}
diff --git a/realm-storage/proguard-rules.pro b/realm-storage/proguard-rules.pro
@@ -0,0 +1,25 @@
+# Add project specific ProGuard rules here.
+# By default, the flags in this file are appended to flags specified
+# in C:\Users\ahluh\AppData\Local\Android\Sdk/tools/proguard/proguard-android.txt
+# You can edit the include path and order by changing the proguardFiles
+# directive in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# Add any project specific keep options here:
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile
diff --git a/realm-storage/src/main/AndroidManifest.xml b/realm-storage/src/main/AndroidManifest.xml
@@ -0,0 +1 @@
+<manifest package="com.dewarder.realm_storage"/>
diff --git a/realm-storage/src/main/java/com/dewarder/realmstorage/PasscodeData.java b/realm-storage/src/main/java/com/dewarder/realmstorage/PasscodeData.java
@@ -0,0 +1,51 @@
+package com.dewarder.realmstorage;
+
+import io.realm.RealmObject;
+import io.realm.annotations.PrimaryKey;
+
+public class PasscodeData extends RealmObject {
+
+    /**
+     * Ensure that only one object of PasscodeData will be created in Realm
+     */
+    private static final long SINGLE_PRIMARY_KEY = 0L;
+
+    @PrimaryKey
+    private long id = SINGLE_PRIMARY_KEY;
+    private int attempts;
+    private String salt;
+    private String algorithm;
+    private String passcode;
+
+    public int getAttempts() {
+        return attempts;
+    }
+
+    public void setAttempts(int attempts) {
+        this.attempts = attempts;
+    }
+
+    public String getSalt() {
+        return salt;
+    }
+
+    public void setSalt(String salt) {
+        this.salt = salt;
+    }
+
+    public String getAlgorithm() {
+        return algorithm;
+    }
+
+    public void setAlgorithm(String algorithm) {
+        this.algorithm = algorithm;
+    }
+
+    public String getPasscode() {
+        return passcode;
+    }
+
+    public void setPasscode(String passcode) {
+        this.passcode = passcode;
+    }
+}
diff --git a/realm-storage/src/main/java/com/dewarder/realmstorage/PasscodeDataModule.java b/realm-storage/src/main/java/com/dewarder/realmstorage/PasscodeDataModule.java
@@ -0,0 +1,7 @@
+package com.dewarder.realmstorage;
+
+import io.realm.annotations.RealmModule;
+
+@RealmModule(library = true, classes = {PasscodeData.class})
+public class PasscodeDataModule {
+}