Merge pull request #19 from AliMehrpour/dev

LGTM

MaterialDialogs/MaterialDialogs.iml

@@ -84,12 +84,12 @@
       <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
       <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
     </content>
-    <orderEntry type="jdk" jdkName="Android API 21 Platform" jdkType="Android SDK" />
+    <orderEntry type="jdk" jdkName="Android API 22 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" exported="" name="appcompat-v7-21.0.3" level="project" />
-    <orderEntry type="library" exported="" name="support-annotations-21.0.3" level="project" />
-    <orderEntry type="library" exported="" name="support-v4-21.0.3" level="project" />
-    <orderEntry type="library" exported="" name="recyclerview-v7-21.0.3" level="project" />
+    <orderEntry type="library" exported="" name="support-v4-22.0.0" level="project" />
+    <orderEntry type="library" exported="" name="support-annotations-22.0.0" level="project" />
+    <orderEntry type="library" exported="" name="appcompat-v7-22.0.0" level="project" />
+    <orderEntry type="library" exported="" name="recyclerview-v7-22.0.0" level="project" />
   </component>
 </module>
 

MaterialDialogs/build.gradle

@@ -1,12 +1,12 @@
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 21
-    buildToolsVersion "21.1.2"
+    compileSdkVersion 22
+    buildToolsVersion "22.0.0"
 
     defaultConfig {
         minSdkVersion 8
-        targetSdkVersion 21
+        targetSdkVersion 22
         versionCode 1
         versionName "0.6.3.1"
     }
@@ -17,7 +17,8 @@ android {
 
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
-    compile 'com.android.support:appcompat-v7:21.0.3'
-    compile 'com.android.support:support-annotations:21.0.3'
-    compile 'com.android.support:recyclerview-v7:21.0.3'
+
+    compile 'com.android.support:appcompat-v7:22.0.0'
+    compile 'com.android.support:support-annotations:22.0.0'
+    compile 'com.android.support:recyclerview-v7:22.0.0'
 }

eSecureBox/build.gradle

@@ -1,27 +1,27 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 21
-    buildToolsVersion "21.1.2"
+    compileSdkVersion 22
+    buildToolsVersion "22.0.0"
 
     defaultConfig {
         applicationId "com.volcano.esecurebox"
-        minSdkVersion 16
-        targetSdkVersion 21
+        minSdkVersion 14
+        targetSdkVersion 22
     }
     buildTypes {
         release {
-            minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+            minifyEnabled true
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
     }
 }
 
 dependencies {
-     compile project(':MaterialDialogs')
+    compile project(':MaterialDialogs')
 
-    compile 'com.android.support:appcompat-v7:21.0.3'
-    compile 'com.android.support:recyclerview-v7:21.0.3'
+    compile 'com.android.support:appcompat-v7:22.0.0'
+    compile 'com.android.support:recyclerview-v7:22.0.0'
 
     compile 'com.parse.bolts:bolts-android:1.1.4'
     compile fileTree(dir: 'libs', include: 'Parse-*.jar')

eSecureBox/eSecureBox.iml

@@ -83,16 +83,16 @@
       <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
       <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
     </content>
-    <orderEntry type="jdk" jdkName="Android API 21 Platform" jdkType="Android SDK" />
+    <orderEntry type="jdk" jdkName="Android API 22 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" exported="" name="appcompat-v7-21.0.3" level="project" />
+    <orderEntry type="library" exported="" name="support-v4-22.0.0" level="project" />
     <orderEntry type="library" exported="" name="ParseCrashReporting-1.8.0" level="project" />
-    <orderEntry type="library" exported="" name="support-annotations-21.0.3" level="project" />
+    <orderEntry type="library" exported="" name="support-annotations-22.0.0" level="project" />
     <orderEntry type="library" exported="" name="mixpanel-android-4.5.3" level="project" />
-    <orderEntry type="library" exported="" name="support-v4-21.0.3" level="project" />
     <orderEntry type="library" exported="" name="Parse-1.8.0" level="project" />
+    <orderEntry type="library" exported="" name="appcompat-v7-22.0.0" level="project" />
     <orderEntry type="library" exported="" name="bolts-android-1.1.4" level="project" />
-    <orderEntry type="library" exported="" name="recyclerview-v7-21.0.3" level="project" />
+    <orderEntry type="library" exported="" name="recyclerview-v7-22.0.0" level="project" />
     <orderEntry type="module" module-name="MaterialDialogs" exported="" />
   </component>
 </module>

eSecureBox/manifest-merger-release-report.txt

@@ -1,150 +1,151 @@
 -- Merging decision tree log ---
 manifest
 ADDED from AndroidManifest.xml:4:1
-	xmlns:tools
-		ADDED from AndroidManifest.xml:5:5
 	xmlns:android
 		ADDED from AndroidManifest.xml:4:11
 	package
-		ADDED from AndroidManifest.xml:6:5
+		ADDED from AndroidManifest.xml:5:5
 		INJECTED from AndroidManifest.xml:0:0
 		INJECTED from AndroidManifest.xml:0:0
 	android:versionName
-		ADDED from AndroidManifest.xml:8:5
-	android:versionCode
 		ADDED from AndroidManifest.xml:7:5
+	android:versionCode
+		ADDED from AndroidManifest.xml:6:5
 		INJECTED from AndroidManifest.xml:0:0
 		INJECTED from AndroidManifest.xml:0:0
-uses-sdk
-ADDED from AndroidManifest.xml:10:5
-MERGED from Assistant:MaterialDialogs:unspecified:8:5
-MERGED from com.android.support:appcompat-v7:21.0.3:15:5
-MERGED from com.android.support:support-v4:21.0.3:15:5
-MERGED from com.android.support:recyclerview-v7:21.0.3:15:5
-MERGED from com.android.support:support-v4:21.0.3:15:5
-MERGED from com.android.support:appcompat-v7:21.0.3:15:5
-MERGED from com.android.support:support-v4:21.0.3:15:5
-MERGED from com.android.support:recyclerview-v7:21.0.3:15:5
-MERGED from com.android.support:support-v4:21.0.3:15:5
-	android:targetSdkVersion
-		ADDED from AndroidManifest.xml:12:9
-		INJECTED from AndroidManifest.xml:0:0
-		INJECTED from AndroidManifest.xml:0:0
-	android:minSdkVersion
-		ADDED from AndroidManifest.xml:11:9
-		INJECTED from AndroidManifest.xml:0:0
-		INJECTED from AndroidManifest.xml:0:0
-	tools:ignore
-		ADDED from AndroidManifest.xml:13:9
 uses-permission#android.permission.ACCESS_NETWORK_STATE
-ADDED from AndroidManifest.xml:15:5
+ADDED from AndroidManifest.xml:9:5
 	android:name
-		ADDED from AndroidManifest.xml:15:22
+		ADDED from AndroidManifest.xml:9:22
 uses-permission#android.permission.INTERNET
-ADDED from AndroidManifest.xml:16:5
+ADDED from AndroidManifest.xml:10:5
+MERGED from com.mixpanel.android:mixpanel-android:4.5.3:17:5
 	android:name
-		ADDED from AndroidManifest.xml:16:22
+		ADDED from AndroidManifest.xml:10:22
 application
-ADDED from AndroidManifest.xml:18:5
+ADDED from AndroidManifest.xml:12:5
 MERGED from Assistant:MaterialDialogs:unspecified:12:5
-MERGED from com.android.support:appcompat-v7:21.0.3:16:5
-MERGED from com.android.support:support-v4:21.0.3:16:5
-MERGED from com.android.support:recyclerview-v7:21.0.3:17:5
-MERGED from com.android.support:support-v4:21.0.3:16:5
-MERGED from com.android.support:appcompat-v7:21.0.3:16:5
-MERGED from com.android.support:support-v4:21.0.3:16:5
-MERGED from com.android.support:recyclerview-v7:21.0.3:17:5
-MERGED from com.android.support:support-v4:21.0.3:16:5
+MERGED from com.android.support:appcompat-v7:22.0.0:22:5
+MERGED from com.android.support:support-v4:22.0.0:22:5
+MERGED from com.android.support:recyclerview-v7:22.0.0:22:5
+MERGED from com.android.support:support-v4:22.0.0:22:5
+MERGED from com.android.support:appcompat-v7:22.0.0:22:5
+MERGED from com.android.support:support-v4:22.0.0:22:5
+MERGED from com.android.support:recyclerview-v7:22.0.0:22:5
+MERGED from com.android.support:support-v4:22.0.0:22:5
+MERGED from com.mixpanel.android:mixpanel-android:4.5.3:44:5
 	android:label
-		ADDED from AndroidManifest.xml:21:9
+		ADDED from AndroidManifest.xml:15:9
 	android:allowBackup
-		ADDED from AndroidManifest.xml:23:9
+		ADDED from AndroidManifest.xml:17:9
 	android:icon
-		ADDED from AndroidManifest.xml:20:9
+		ADDED from AndroidManifest.xml:14:9
 	android:theme
-		ADDED from AndroidManifest.xml:22:9
+		ADDED from AndroidManifest.xml:16:9
 	android:name
-		ADDED from AndroidManifest.xml:19:9
+		ADDED from AndroidManifest.xml:13:9
+	tools:ignore
+		ADDED from com.mixpanel.android:mixpanel-android:4.5.3:44:18
 activity#com.volcano.esecurebox.activity.MainActivity
-ADDED from AndroidManifest.xml:25:9
+ADDED from AndroidManifest.xml:19:9
 	android:label
-		ADDED from AndroidManifest.xml:28:13
+		ADDED from AndroidManifest.xml:22:13
 	android:name
-		ADDED from AndroidManifest.xml:26:13
+		ADDED from AndroidManifest.xml:20:13
 	android:launchMode
-		ADDED from AndroidManifest.xml:27:13
+		ADDED from AndroidManifest.xml:21:13
 intent-filter#android.intent.action.MAIN+android.intent.category.LAUNCHER
-ADDED from AndroidManifest.xml:29:13
+ADDED from AndroidManifest.xml:23:13
 action#android.intent.action.MAIN
-ADDED from AndroidManifest.xml:30:17
+ADDED from AndroidManifest.xml:24:17
 	android:name
-		ADDED from AndroidManifest.xml:30:25
+		ADDED from AndroidManifest.xml:24:25
 category#android.intent.category.LAUNCHER
-ADDED from AndroidManifest.xml:31:17
+ADDED from AndroidManifest.xml:25:17
 	android:name
-		ADDED from AndroidManifest.xml:31:27
+		ADDED from AndroidManifest.xml:25:27
 activity#com.volcano.esecurebox.activity.CreateAccountActivity
-ADDED from AndroidManifest.xml:35:9
+ADDED from AndroidManifest.xml:29:9
 	android:windowSoftInputMode
-		ADDED from AndroidManifest.xml:36:15
+		ADDED from AndroidManifest.xml:30:15
 	android:screenOrientation
-		ADDED from AndroidManifest.xml:37:15
+		ADDED from AndroidManifest.xml:31:15
 	android:name
-		ADDED from AndroidManifest.xml:35:19
+		ADDED from AndroidManifest.xml:29:19
 activity#com.volcano.esecurebox.activity.DisplayAccountActivity
-ADDED from AndroidManifest.xml:39:9
+ADDED from AndroidManifest.xml:33:9
 	android:screenOrientation
-		ADDED from AndroidManifest.xml:40:15
+		ADDED from AndroidManifest.xml:34:15
 	android:name
-		ADDED from AndroidManifest.xml:39:19
+		ADDED from AndroidManifest.xml:33:19
 activity#com.volcano.esecurebox.activity.SigninActivity
-ADDED from AndroidManifest.xml:42:9
+ADDED from AndroidManifest.xml:36:9
 	android:windowSoftInputMode
-		ADDED from AndroidManifest.xml:44:13
+		ADDED from AndroidManifest.xml:38:13
 	android:screenOrientation
-		ADDED from AndroidManifest.xml:43:13
+		ADDED from AndroidManifest.xml:37:13
 	android:name
-		ADDED from AndroidManifest.xml:42:19
+		ADDED from AndroidManifest.xml:36:19
 activity#com.volcano.esecurebox.activity.SignupActivity
-ADDED from AndroidManifest.xml:46:9
+ADDED from AndroidManifest.xml:40:9
 	android:windowSoftInputMode
-		ADDED from AndroidManifest.xml:48:13
+		ADDED from AndroidManifest.xml:42:13
 	android:screenOrientation
-		ADDED from AndroidManifest.xml:47:13
+		ADDED from AndroidManifest.xml:41:13
 	android:name
-		ADDED from AndroidManifest.xml:46:19
+		ADDED from AndroidManifest.xml:40:19
 activity#com.volcano.esecurebox.activity.PasscodeActivity
-ADDED from AndroidManifest.xml:50:9
+ADDED from AndroidManifest.xml:44:9
 	android:windowSoftInputMode
-		ADDED from AndroidManifest.xml:53:13
+		ADDED from AndroidManifest.xml:47:13
 	android:screenOrientation
-		ADDED from AndroidManifest.xml:52:13
+		ADDED from AndroidManifest.xml:46:13
 	android:name
-		ADDED from AndroidManifest.xml:51:13
+		ADDED from AndroidManifest.xml:45:13
 activity#com.volcano.esecurebox.activity.SettingsActivity
-ADDED from AndroidManifest.xml:55:9
+ADDED from AndroidManifest.xml:49:9
 	android:screenOrientation
-		ADDED from AndroidManifest.xml:57:13
+		ADDED from AndroidManifest.xml:51:13
 	android:label
-		ADDED from AndroidManifest.xml:58:13
+		ADDED from AndroidManifest.xml:52:13
 	android:name
-		ADDED from AndroidManifest.xml:56:13
+		ADDED from AndroidManifest.xml:50:13
 provider#com.volcano.esecurebox.provider.AssistantProvider
-ADDED from AndroidManifest.xml:60:9
+ADDED from AndroidManifest.xml:54:9
 	android:label
-		ADDED from AndroidManifest.xml:64:13
+		ADDED from AndroidManifest.xml:58:13
 	android:syncable
-		ADDED from AndroidManifest.xml:65:13
+		ADDED from AndroidManifest.xml:59:13
 	android:authorities
-		ADDED from AndroidManifest.xml:61:13
+		ADDED from AndroidManifest.xml:55:13
 	android:name
-		ADDED from AndroidManifest.xml:62:13
+		ADDED from AndroidManifest.xml:56:13
 	android:writePermission
-		ADDED from AndroidManifest.xml:63:13
+		ADDED from AndroidManifest.xml:57:13
+uses-sdk
+INJECTED from AndroidManifest.xml:0:0 reason: use-sdk injection requested
+MERGED from Assistant:MaterialDialogs:unspecified:8:5
+MERGED from com.android.support:appcompat-v7:22.0.0:20:5
+MERGED from com.android.support:support-v4:22.0.0:20:5
+MERGED from com.android.support:recyclerview-v7:22.0.0:20:5
+MERGED from com.android.support:support-v4:22.0.0:20:5
+MERGED from com.android.support:appcompat-v7:22.0.0:20:5
+MERGED from com.android.support:support-v4:22.0.0:20:5
+MERGED from com.android.support:recyclerview-v7:22.0.0:20:5
+MERGED from com.android.support:support-v4:22.0.0:20:5
+MERGED from com.mixpanel.android:mixpanel-android:4.5.3:11:5
+	android:targetSdkVersion
+		INJECTED from AndroidManifest.xml:0:0
+		INJECTED from AndroidManifest.xml:0:0
+	android:minSdkVersion
+		INJECTED from AndroidManifest.xml:0:0
+		INJECTED from AndroidManifest.xml:0:0
+	tools:ignore
+		ADDED from com.mixpanel.android:mixpanel-android:4.5.3:14:9
 activity#android.support.v7.widget.TestActivity
-ADDED from com.android.support:recyclerview-v7:21.0.3:18:9
-MERGED from com.android.support:recyclerview-v7:21.0.3:18:9
+ADDED from com.android.support:recyclerview-v7:22.0.0:23:9
+MERGED from com.android.support:recyclerview-v7:22.0.0:23:9
 	android:label
-		ADDED from com.android.support:recyclerview-v7:21.0.3:18:19
+		ADDED from com.android.support:recyclerview-v7:22.0.0:25:13
 	android:name
-		ADDED from com.android.support:recyclerview-v7:21.0.3:18:60
+		ADDED from com.android.support:recyclerview-v7:22.0.0:24:13

eSecureBox/proguard-rules.pro

@@ -15,3 +15,14 @@
 #-keepclassmembers class fqcn.of.javascript.interface.for.webview {
 #   public *;
 #}
+-keepattributes SourceFile,LineNumberTable
+
+-keep class com.mixpanel.android.* { *; }
+-dontwarn com.mixpanel.android.**
+
+-keep class com.parse.* { *; }
+-dontwarn com.parse.**
+
+-keepclasseswithmembernames class * {
+    native <methods>;
+}

eSecureBox/src/main/AndroidManifest.xml

@@ -2,15 +2,9 @@
 <!-- Copyright (c) 2015 Volcano. All rights reserved. -->
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
     package="com.volcano.esecurebox"
     android:versionCode="1"
-    android:versionName="0.0.1">
-
-    <uses-sdk
-        android:minSdkVersion="16"
-        android:targetSdkVersion="21"
-        tools:ignore="GradleOverrides"/>
+    android:versionName="1.0.0">
 
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.INTERNET" />