Merge branch 'release/1.0.51'

Conflicts:
	xabber/MemorizingTrustManager
	xabber/otr4j

.gitmodules

@@ -1,6 +1,6 @@
-[submodule "app/otr4j"]
-	path = app/otr4j
+[submodule "xabber/otr4j"]
+	path = xabber/otr4j
 	url = https://github.com/otr4j/otr4j.git
-[submodule "app/MemorizingTrustManager"]
-	path = app/MemorizingTrustManager
+[submodule "xabber/MemorizingTrustManager"]
+	path = xabber/MemorizingTrustManager
 	url = https://github.com/redsolution/MemorizingTrustManager.git

build.gradle

@@ -4,7 +4,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.2.3'
+        classpath 'com.android.tools.build:gradle:1.3.0'
     }
 }
 

scripts/crowdin.bash

@@ -1,5 +1,5 @@
-unzip -o xabber.zip -d ../app/src/main/res
-perl -p -i.bak -w -e 's/&([l|g]t;)/&$1/g' $(find ../app/src/main/res/ -path ../app/src/main/res/values*.xml)
-perl -p -i.bak -w -e "s/\\\\\\\\'/\\\\'/g" $(find ../app/src/main/res/ -path ../app/src/main/res/values*.xml)
-perl -p -i.bak -w -e 's/  (<resources)/$1/g' $(find ../app/src/main/res/ -path ../app/src/main/res/values*.xml)
-find ../app/src/main/res/ -type f -name "*.bak" -exec rm -f {} \;
+unzip -o xabber.zip -d ../xabber/src/main/res
+perl -p -i.bak -w -e 's/&amp;([l|g]t;)/&$1/g' $(find ../xabber/src/main/res/ -path ../xabber/src/main/res/values*.xml)
+perl -p -i.bak -w -e "s/\\\\\\\\'/\\\\'/g" $(find ../xabber/src/main/res/ -path ../xabber/src/main/res/values*.xml)
+perl -p -i.bak -w -e 's/  (<resources)/$1/g' $(find ../xabber/src/main/res/ -path ../xabber/src/main/res/values*.xml)
+find ../xabber/src/main/res/ -type f -name "*.bak" -exec rm -f {} \;

settings.gradle

@@ -1,4 +1,4 @@
-include ':app'
-include ':app:otr4j'
-include ':app:MemorizingTrustManager'
-include ':app:emojicon'
+include ':xabber'
+include ':xabber:otr4j'
+include ':xabber:MemorizingTrustManager'
+include ':xabber:emojicon'

app/build.gradle → xabber/build.gradle

@@ -2,13 +2,13 @@ apply plugin: 'com.android.application'
 
 android {
     compileSdkVersion 23
-    buildToolsVersion "23"
+    buildToolsVersion "23.0.1"
 
     defaultConfig {
         minSdkVersion 14
         targetSdkVersion 23
-        versionCode 218
-        versionName '1.0.45'
+        versionCode 224
+        versionName '1.0.51'
     }
 
     compileOptions {
@@ -51,20 +51,21 @@ repositories {
 }
 
 ext {
-    smackVersion = '4.1.3'
+    smackVersion = '4.1.4'
 }
 
 dependencies {
-    compile 'com.android.support:design:23.0.0'
-    compile 'com.android.support:appcompat-v7:23.0'
-    compile 'com.android.support:support-v13:23.0.0'
+    compile 'com.android.support:design:23.0.1'
+    compile 'com.android.support:appcompat-v7:23.0.1'
+    compile 'com.android.support:support-v13:23.0.1'
     compile 'com.github.ksoichiro:android-observablescrollview:1.5.0'
     compile 'de.hdodenhof:circleimageview:1.2.2'
     compile 'com.melnykov:floatingactionbutton:1.2.0'
     compile 'dnsjava:dnsjava:2.1.7'
-    compile 'com.github.bumptech.glide:glide:3.6.0'
+    compile 'com.github.bumptech.glide:glide:3.6.1'
     compile 'com.google.zxing:android-integration:3.1.0'
     compile 'com.jcraft:jzlib:1.0.7'
+    compile 'com.loopj.android:android-async-http:1.4.9'
 
     compile "org.igniterealtime.smack:smack-android-extensions:$smackVersion"
     compile "org.igniterealtime.smack:smack-experimental:$smackVersion"

app/emojicon/build.gradle → xabber/emojicon/build.gradle

@@ -2,7 +2,7 @@ apply plugin: 'com.android.library'
 
 android {
     compileSdkVersion 23
-    buildToolsVersion "23"
+    buildToolsVersion "23.0.1"
 
     defaultConfig {
         minSdkVersion 14
@@ -18,5 +18,5 @@ android {
 }
 
 dependencies {
-    compile 'com.android.support:support-v4:23.0.0'
+    compile 'com.android.support:support-v4:23.0.1'
 }