fix constant

Author: afiqiqmal

library/src/main/java/com/zeroone/conceal/CipherUtils.java

@@ -9,6 +9,8 @@
 import javax.crypto.spec.IvParameterSpec;
 import javax.crypto.spec.SecretKeySpec;
 
+import static com.zeroone.conceal.model.Constant.UTF8;
+
 /**
  * @author : hafiq on 29/03/2017.
  */
@@ -33,7 +35,7 @@ static byte[] deObscureSixFour(byte[] cipher){
 
     static String encode64WithIteration(String plaintext,int iteration){
         try {
-            byte[] dataDec = plaintext.getBytes("UTF-8");
+            byte[] dataDec = plaintext.getBytes(UTF8);
             for (int x=0;x<iteration;x++){
                 dataDec = obscureEncodeSixFourBytes(dataDec);
             }
@@ -48,7 +50,7 @@ static String encode64WithIteration(String plaintext,int iteration){
 
     static String decode64WithIteration(String plaintext,int iteration){
         try {
-            byte[] dataDec = plaintext.getBytes("UTF-8");
+            byte[] dataDec = plaintext.getBytes(UTF8);
             for (int x=0;x<iteration;x++){
                 dataDec = deObscureSixFour(dataDec);
             }
@@ -90,18 +92,18 @@ static String AesCrypt(String key, String iv, String data) {
             }
 
 
-            IvParameterSpec initVector = new IvParameterSpec(iv.getBytes("UTF-8"));
-            SecretKeySpec skeySpec = new SecretKeySpec(key.getBytes("UTF-8"), "AES");
+            IvParameterSpec initVector = new IvParameterSpec(iv.getBytes(UTF8));
+            SecretKeySpec skeySpec = new SecretKeySpec(key.getBytes(UTF8), "AES");
 
             Cipher cipher = Cipher.getInstance("AES/CBC/PKCS5PADDING");
             cipher.init(Cipher.ENCRYPT_MODE, skeySpec, initVector);
 
             byte[] encryptedData = cipher.doFinal((data.getBytes()));
 
             String base64_EncryptedData = Base64.encodeToString(encryptedData, Base64.DEFAULT);
-            String base64_IV = Base64.encodeToString(iv.getBytes("UTF-8"), Base64.DEFAULT);
+            String base64_IV = Base64.encodeToString(iv.getBytes(UTF8), Base64.DEFAULT);
 
-            return Base64.encodeToString((base64_EncryptedData + ":" + base64_IV).getBytes("UTF-8"), Base64.DEFAULT);
+            return Base64.encodeToString((base64_EncryptedData + ":" + base64_IV).getBytes(UTF8), Base64.DEFAULT);
 
         } catch (Exception ex) {
             ex.printStackTrace();
@@ -130,7 +132,7 @@ static String AesDecrypt(String key, String data) {
             String[] parts = new String(Base64.decode(data, Base64.DEFAULT)).split(":");
 
             IvParameterSpec iv = new IvParameterSpec(Base64.decode(parts[1], Base64.DEFAULT));
-            SecretKeySpec skeySpec = new SecretKeySpec(key.getBytes("UTF-8"), "AES");
+            SecretKeySpec skeySpec = new SecretKeySpec(key.getBytes(UTF8), "AES");
 
             Cipher cipher = Cipher.getInstance("AES/CBC/PKCS5PADDING");
             cipher.init(Cipher.DECRYPT_MODE, skeySpec, iv);

library/src/main/java/com/zeroone/conceal/ConcealPrefRepository.java

@@ -727,7 +727,6 @@ public void commit() {
 
     public static class UserPref<T>{
 
-
         private String PREFIX = "conceal";
         private String DEFAULT_VALUE = null;
         private String SEPARATOR = "_";

library/src/main/java/com/zeroone/conceal/ConverterListUtils.java

@@ -8,14 +8,16 @@
 import java.util.List;
 import java.util.Map;
 
+import static com.zeroone.conceal.model.Constant.UTF8;
+
 /**
  * @author : hafiq on 23/03/2017.
  */
 
 class ConverterListUtils {
 
     static List<Integer> toIntArray(String string) {
-        String[] strings = string.replace("[", "").replace("]", "").split(", ");
+        String[] strings = getArray(string);
         Integer result[] = new Integer[strings.length];
         try {
             for (int i = 0; i < result.length; i++) {
@@ -29,7 +31,7 @@ static List<Integer> toIntArray(String string) {
     }
 
     static List<Boolean> toBooleanArray(String string) {
-        String[] strings = string.replace("[", "").replace("]", "").split(", ");
+        String[] strings = getArray(string);
         Boolean result[] = new Boolean[strings.length];
         try {
             for (int i = 0; i < result.length; i++) {
@@ -43,7 +45,7 @@ static List<Boolean> toBooleanArray(String string) {
     }
 
     static List<Long> toLongArray(String string) {
-        String[] strings = string.replace("[", "").replace("]", "").split(", ");
+        String[] strings = getArray(string);
         Long result[] = new Long[strings.length];
         try {
             for (int i = 0; i < result.length; i++) {
@@ -58,7 +60,7 @@ static List<Long> toLongArray(String string) {
     }
 
     static List<Double> toDoubleArray(String string) {
-        String[] strings = string.replace("[", "").replace("]", "").split(", ");
+        String[] strings = getArray(string);
         Double result[] = new Double[strings.length];
         try {
             for (int i = 0; i < result.length; i++) {
@@ -73,7 +75,7 @@ static List<Double> toDoubleArray(String string) {
     }
 
     static List<Float> toFloatArray(String string) {
-        String[] strings = string.replace("[", "").replace("]", "").split(", ");
+        String[] strings = getArray(string);
         Float result[] = new Float[strings.length];
         try {
             for (int i = 0; i < result.length; i++) {
@@ -87,7 +89,11 @@ static List<Float> toFloatArray(String string) {
     }
 
     static List<String> toStringArray(String string) {
-        return Arrays.asList(string.replace("[", "").replace("]", "").split(", "));
+        return Arrays.asList(getArray(string));
+    }
+
+    static String[] getArray(String string) {
+        return string.replace("[", "").replace("]", "").split(", ");
     }
 
 
@@ -100,9 +106,9 @@ static String convertMapToString(Map<String,String> maps){
             }
             String value = maps.get(key);
             try {
-                stringBuilder.append((key != null ? URLEncoder.encode(key, "UTF-8") : ""));
+                stringBuilder.append((key != null ? URLEncoder.encode(key, UTF8) : ""));
                 stringBuilder.append("=");
-                stringBuilder.append(value != null ? URLEncoder.encode(value, "UTF-8") : "");
+                stringBuilder.append(value != null ? URLEncoder.encode(value, UTF8) : "");
             } catch (UnsupportedEncodingException e) {
                 throw new RuntimeException("This method requires UTF-8 encoding support", e);
             }
@@ -118,7 +124,7 @@ static LinkedHashMap<String,String> convertStringToMap(String input){
         for (String nameValuePair : nameValuePairs) {
             String[] nameValue = nameValuePair.split("=");
             try {
-                map.put(URLDecoder.decode(nameValue[0], "UTF-8"), nameValue.length > 1 ? URLDecoder.decode(nameValue[1], "UTF-8") : "");
+                map.put(URLDecoder.decode(nameValue[0], UTF8), nameValue.length > 1 ? URLDecoder.decode(nameValue[1], UTF8) : "");
             } catch (UnsupportedEncodingException e) {
                 throw new RuntimeException("This method requires UTF-8 encoding support", e);
             }

library/src/main/java/com/zeroone/conceal/FileUtils.java

@@ -57,7 +57,7 @@ static File moveFile(File file, File dir){
     static boolean saveBitmap(File imageFile, Bitmap bitmap) {
 
         boolean fileCreated = false;
-        boolean bitmapCompressed = false;
+        boolean bitmapCompressed;
         boolean streamClosed = false;
 
         if (imageFile.exists())

library/src/main/java/com/zeroone/conceal/model/Constant.java

@@ -8,6 +8,10 @@
 
 public class Constant {
 
+
+    public static final String UTF8 = "UTF-8";
+
+
     public static final String DEFAULT_DIRECTORY = Environment.getExternalStorageDirectory()+"/.";
     public static final String DEFAULT_FILES_FOLDER = "files";
     public static final String DEFAULT_IMAGE_FOLDER = "images";