Merge branch 'develop'0.9.4

1 files changed, 55 insertions, 46 deletions

diff --git a/app/build.gradle b/app/build.gradle
index 4441cafa..9acd5ab1 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,9 +1,8 @@
-apply plugin: 'android'
-//import org.ajoberstar.grgit.*
+apply plugin: 'com.android.application'
 
 android {
   compileSdkVersion 21
-  buildToolsVersion "21.1.2"
+  buildToolsVersion "22.0.1"
 
   signingConfigs {
     release {
@@ -14,6 +13,15 @@ android {
     }
   }
 
+    productFlavors {
+        production {
+
+        }
+        insecure {
+
+        }
+    }
+
   buildTypes {
     release {
       //runProguard true
@@ -22,9 +30,9 @@ android {
     }
   }
 
-  lintOptions {
-    abortOnError false
-  }
+    lintOptions {
+        abortOnError false
+    }
 
   sourceSets {
     main {
@@ -39,12 +47,14 @@ android {
 }
 
 dependencies {
-  androidTestCompile 'com.jayway.android.robotium:robotium-solo:5.3.1'
-  compile 'com.jakewharton:butterknife:6.0.0+'
-  provided 'com.squareup.dagger:dagger-compiler:1.2.2+'
-  compile 'com.github.pedrovgs:renderers:1.3+'
+  androidTestCompile 'com.jayway.android.robotium:robotium-solo:5.4.1'
+  compile 'com.jakewharton:butterknife:6.1.0'
+  provided 'com.squareup.dagger:dagger-compiler:1.2.2'
+  compile 'com.github.pedrovgs:renderers:1.5'
   compile 'com.intellij:annotations:12.0'
-  compile 'com.google.code.gson:gson:2+'
+  compile 'com.google.code.gson:gson:2.3.1'
+  compile 'org.thoughtcrime.ssl.pinning:AndroidPinning:1.0.0'
+  compile 'mbanje.kurt:fabbutton:1.1.4'
 }
 
 def processFileInplace(file, Closure processText) {
@@ -52,20 +62,25 @@ def processFileInplace(file, Closure processText) {
   file.write(processText(text))
 }
 
-
-task checkoutStrippedIcsOpenVPN ( type: Copy )  {
-  println "checkoutStrippedIcsOpenVPN"
-  //FIXME Checkout ics-openvpn-stripped from branch "ics-openvpn-upstream"
-  //grgit = Grgit.open(project.file('../'))
-  
-  from '../../bitmask_android_tmp/ics-openvpn-stripped'
-  into '../ics-openvpn-stripped'
-}
-
 task copyIcsOpenVPNClasses( type: Copy ) {
   println "copyIcsOpenVPNClasses"
-  from ('../ics-openvpn-stripped/main/') {
-    include '**/*.java'
+  from ('../ics-openvpn/main/') {
+    include '**/LaunchVPN.java'
+    include '**/OpenVPNSservice.java'
+    include '**/VpnProfile.java'
+    include '**/DisconnectVPN.java'
+    include '**/VpnProfile.java'
+    include '**/LogWindow.java'
+    include '**/LogFragment.java'
+    include '**/SeekBarTicks.java'
+    include '**/log_window.xml'
+    include '**/log_fragment.xml'
+    include '**/log_silders.xml'
+    include '**/vpnstatus.xml'
+    include '**/styles.xml'
+    include '**/dimens.xml'
+    include '**/logmenu.xml'
+    include '**/core/**.java'
 
     includeEmptyDirs = false
     
@@ -83,7 +98,7 @@ task copyIcsOpenVPNClasses( type: Copy ) {
 
 task copyIcsOpenVPNXml( type: Copy )  {
   println "copyIcsOpenVPNXml"
-  from ('../ics-openvpn-stripped/main/') {
+  from ('../ics-openvpn/main/') {
     include '**/strings.xml'
     include '**/log_*.xml'
     include '**/vpnstatus.xml'
@@ -104,7 +119,7 @@ task copyIcsOpenVPNXml( type: Copy )  {
 
 task copyIcsOpenVPNImages( type: Copy ) {
   println "copyIcsOpenVPNImages"
-  from ('../ics-openvpn-stripped/main/') {
+  from ('../ics-openvpn/main/') {
     include '**/ic_filter*.png'
     include '**/ic_delete*.png'
     include '**/ic_share*.png'
@@ -116,15 +131,8 @@ task copyIcsOpenVPNImages( type: Copy ) {
   } into '.'
 }
 
-task copyIcsOpenVPNFiles( type: Copy, dependsOn: 'checkoutStrippedIcsOpenVPN' ) {
-  println "copyIcsOpenVPNFiles"
-  copyIcsOpenVPNClasses.execute()
-  copyIcsOpenVPNXml.execute()
-  copyIcsOpenVPNImages.execute()
-}
-
 // thanks to http://pleac.sourceforge.net/pleac_groovy/fileaccess.html
-task removeDuplicatedStrings( dependsOn: 'copyIcsOpenVPNFiles' ) {
+task removeDuplicatedStrings() {
   println "removeDuplicatedStrings"
   new File('.').eachFileRecurse {
     if(it.name.equals('strings.xml')) {
@@ -143,9 +151,9 @@ task removeDuplicatedStrings( dependsOn: 'copyIcsOpenVPNFiles' ) {
   }
 }
 
-task mergeUntranslatable( type: Copy, dependsOn: 'removeDuplicatedStrings') {
+task mergeUntranslatable( type: Copy ) {
   println "mergeUntranslatable"
-  from ('../ics-openvpn-stripped/main/') {
+  from ('../ics-openvpn/main/') {
     include '**/untranslatable.xml'
     rename 'untranslatable.xml', 'untranslatable-icsopenvpn.xml'
   } into '.'
@@ -176,17 +184,18 @@ task mergeUntranslatable( type: Copy, dependsOn: 'removeDuplicatedStrings') {
   delete ics_openvpn_untranslatable
 }
 
-task updateIcsOpenVpn( type: Copy, dependsOn: 'mergeUntranslatable') {
-  from('../ics-openvpn-stripped/') {
-    include 'openvpn/**/*'
-    include 'openssl/**/*'    
-    include 'lzo/**/**'
-    include 'jni/**/*'
-    include 'misc/**/*'
-    include 'ovpn3/**/*'
-    include 'snappy/**/*'
-
-  } into './'
+task copyIcsOpenVPNFiles( type: Copy ) {
+  println "copyIcsOpenVPNFiles"
+  copyIcsOpenVPNClasses.execute()
+  copyIcsOpenVPNXml.execute()
+  copyIcsOpenVPNImages.execute()
+  //mergeUntranslatable.execute()
+  removeDuplicatedStrings.execute()
+}
+
+task updateIcsOpenVpn( type: Exec ) {
+  commandLine 'git', 'submodule', 'update', '--init', '--recursive'
+  copyIcsOpenVPNFiles.execute()
 }
 
 task buildNative ( type: Exec ) {