Merge branch 'release/1.0.168'

.gitmodules

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

.travis.yml

@@ -0,0 +1,30 @@
+language: android
+android:
+  components:
+    - platform-tools
+    - tools
+    - build-tools-25.0.2
+    - build-tools-25.0.0
+    - android-25
+    - android-23
+    - extra-android-m2repository
+    - extra-google-m2repository
+
+  licenses:
+    - '.+'
+
+install:
+  # Check install section: http://docs.travis-ci.com/user/build-configuration/#install
+  # If you'd like to skip the install stage entirely, set it to true and nothing will be run.
+  - true
+
+script:
+  # By default Travis-ci executes './gradlew build connectedCheck' if no 'script:' section found.
+  - ./gradlew build
+
+
+env:
+- GRADLE_OPTS="-Xmx1024m -XX:MaxPermSize=1024m"
+
+jdk:
+  - oraclejdk8

README.md

@@ -0,0 +1,35 @@
+<a href="https://play.google.com/store/apps/details?id=com.xabber.android.beta"><img src="https://play.google.com/intl/en_us/badges/images/generic/en-play-badge.png" height="72"></a>
+<a href="https://f-droid.org/repository/browse/?fdfilter=xabber&fdid=com.xabber.androiddev"><img src="https://f-droid.org/badge/get-it-on.png" height="72"></a>
+## Xabber - XMPP client for Android
+
+Open source Jabber (XMPP) client with multi-account support, clean and simple interface.
+Being both free (as in freedom!) and ad-free, [Xabber](https://www.xabber.com/) is designed to be the best Jabber client for Android.
+
+## Build instructions [![Build Status](https://travis-ci.org/redsolution/xabber-android.svg?branch=develop)](https://travis-ci.org/redsolution/xabber-android)
+
+Xabber uses Gradle build system. The only specific thing is git submodule for ge0rg/MemorizingTrustManager library. To make it work use following commands:
+
+ ```
+ git submodule init
+ git submodule update
+ ```
+ And MemorizingTrustManager would be cloned to your local repository.
+
+## Translations [![Crowdin](https://d322cqt584bo4o.cloudfront.net/xabber/localized.svg)](https://crowdin.com/project/xabber)
+
+We use crowdin.com as our translation system.
+All related resources are automatically generated from files got with crowdin.com.
+If you want to update any translation go to Xabber page https://crowdin.com/project/xabber and request to join our translation team
+Please don't create pull requests with translation fixes as any changes will be overwritten with the next update from crowdin.com.
+
+## Donate
+
+If you want to support Xabber development you can buy [Xabber VIP](https://play.google.com/store/apps/details?id=com.xabber.androidvip) (it is the same as regular stable version of Xabber except for gold coin on logo) or send payment via Paypal or Bitcoin `1Dvexs9YQ2bab1ZNk2eSuvHxyZ2QUedzug`
+
+[![Donate with PayPal](https://www.paypalobjects.com/en_US/i/btn/btn_donate_LG.gif)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=G9AYTUSXCWRVL)
+
+## Feedback
+
+info [at] xabber.com
+
+<a href="https://twitter.com/xabber_xmpp">Twitter</a>

build.gradle

@@ -4,12 +4,18 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.5.0'
+        classpath 'com.android.tools.build:gradle:2.3.1'
+        classpath "io.realm:realm-gradle-plugin:3.0.0"
+        classpath 'com.neenbedankt.gradle.plugins:android-apt:1.8'
+        classpath 'com.frogermcs.androiddevmetrics:androiddevmetrics-plugin:0.4'
     }
 }
 
 allprojects {
     repositories {
         jcenter()
+        maven { url "https://jitpack.io" }
+        maven { url 'https://oss.sonatype.org/content/repositories/snapshots' }
+        maven { url 'https://igniterealtime.org/repo' }
     }
 }

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Wed Apr 10 15:27:10 PDT 2013
+#Wed Mar 15 19:08:23 YEKT 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.8-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip

settings.gradle

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

xabber/build.gradle

@@ -1,83 +1,116 @@
 apply plugin: 'com.android.application'
+apply plugin: 'com.neenbedankt.android-apt'
+apply plugin: 'realm-android'
+apply plugin: 'com.frogermcs.androiddevmetrics'
 
 android {
-    compileSdkVersion 23
-    buildToolsVersion "23.0.2"
+    compileSdkVersion 25
+    buildToolsVersion "25.0.2"
 
     defaultConfig {
-        minSdkVersion 14
-        targetSdkVersion 23
-        versionCode 247
-        versionName '1.0.74'
-    }
-
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_7
-        targetCompatibility JavaVersion.VERSION_1_7
+        minSdkVersion 15
+        targetSdkVersion 25
+        versionCode 340
+        versionName '1.0.168'
     }
 
     lintOptions {
         // problems with generated "applicationId" string resource
         disable 'MissingTranslation'
+        disable 'InvalidPackage'
+
+        abortOnError false
     }
 
-    dexOptions {
-        incremental true
+    subprojects {
+        afterEvaluate {
+            if (getPlugins().hasPlugin('android') ||
+                    getPlugins().hasPlugin('android-library')) {
+
+                configure(android.lintOptions) {
+                    abortOnError false
+
+                }
+            }
+        }
     }
 
     productFlavors {
 
         dev {
             applicationId "com.xabber.androiddev"
             resValue 'string', 'application_package', applicationId
+            multiDexEnabled true
         }
 
         beta {
             applicationId "com.xabber.android.beta"
             resValue 'string', 'application_package', applicationId
+            multiDexEnabled true
         }
 
         prod {
             applicationId "com.xabber.android"
             resValue 'string', 'application_package', applicationId
+            multiDexEnabled true
         }
 
         vip {
             applicationId "com.xabber.androidvip"
             resValue 'string', 'application_package', applicationId
+            multiDexEnabled true
         }
 
     }
 
     buildTypes {
         release {
-            minifyEnabled false
+            minifyEnabled true
+            shrinkResources true
             proguardFiles getDefaultProguardFile('proguard-android.txt'),
                     'proguard-rules.pro'
         }
     }
+
+    splits {
+        abi {
+            enable true
+            reset()
+            include 'armeabi', 'armeabi-v7a', 'arm64-v8a', 'mips', 'x86', 'x86_64'
+
+            universalApk true
+        }
+    }
 }
 
 ext {
-    smackVersion = '4.1.5'
+    smackVersion = '4.2.1-SNAPSHOT'
+    supportVersion = '25.3.1'
 }
 
 dependencies {
-    compile 'com.android.support:design:23.1.1'
-    compile 'com.android.support:appcompat-v7:23.1.1'
-    compile 'com.android.support:support-v13:23.1.1'
-    compile 'de.hdodenhof:circleimageview:1.2.2'
-    compile 'com.melnykov:floatingactionbutton:1.2.0'
-    compile 'com.github.bumptech.glide:glide:3.6.1'
-    compile 'com.google.zxing:android-integration:3.1.0'
-    compile 'com.loopj.android:android-async-http:1.4.9'
-    compile 'com.soundcloud.android:android-crop:1.0.1@aar'
-    compile 'io.realm:realm-android:0.85.0'
-
-    compile "org.igniterealtime.smack:smack-android-extensions:$smackVersion"
-    compile "org.igniterealtime.smack:smack-experimental:$smackVersion"
-    compile "org.igniterealtime.smack:smack-tcp:$smackVersion"
-    compile project('otr4j')
     compile project('MemorizingTrustManager')
     compile project('emojicon')
+
+    compile "org.igniterealtime.smack:smack-android-extensions:4.2.1-20170404.010458-5"
+    compile "org.igniterealtime.smack:smack-experimental:4.2.1-20170404.010520-5"
+    compile "org.igniterealtime.smack:smack-tcp:4.2.1-20170404.010559-5"
+
+    compile "com.android.support:design:$supportVersion"
+    compile "com.android.support:support-v13:$supportVersion"
+
+    compile 'org.jitsi:org.otr4j:0.22'
+    compile 'com.google.zxing:android-integration:3.3.0'
+
+    compile 'com.github.bumptech.glide:glide:3.7.0'
+    compile 'com.squareup.okhttp3:okhttp:3.5.0'
+    compile 'org.greenrobot:eventbus:3.0.0'
+
+    compile 'com.soundcloud.android:android-crop:1.0.1@aar'
+    compile 'de.hdodenhof:circleimageview:2.1.0'
+    compile 'com.melnykov:floatingactionbutton:1.3.0'
+}
+
+configurations {
+    all*.exclude group: 'xpp3', module: 'xpp3'
 }

xabber/emojicon/build.gradle

@@ -1,12 +1,12 @@
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 23
-    buildToolsVersion "23.0.2"
+    compileSdkVersion 25
+    buildToolsVersion "25.0.2"
 
     defaultConfig {
         minSdkVersion 14
-        targetSdkVersion 23
+        targetSdkVersion 25
     }
 
     buildTypes {
@@ -18,5 +18,5 @@ android {
 }
 
 dependencies {
-    compile 'com.android.support:support-v4:23.1.1'
+    compile "com.android.support:support-v13:25.3.0"
 }

xabber/proguard-rules.pro

@@ -1,9 +1,44 @@
 
-# realm
+# Xabber classes - many of them loaded via class loader
+-keep class com.xabber.** { *; }
+
+# Marshmallow removed Notification.setLatestEventInfo()
+-dontwarn android.app.Notification
 
+# realm
 -keep class io.realm.annotations.RealmModule
 -keep @io.realm.annotations.RealmModule class *
 -keep class io.realm.internal.Keep
--keep @io.realm.internal.Keep class *
+-keep @io.realm.internal.Keep class * { *; }
 -dontwarn javax.**
 -dontwarn io.realm.**
+
+# EbentBus
+-keepattributes *Annotation*
+-keepclassmembers class ** {
+    @org.greenrobot.eventbus.Subscribe <methods>;
+}
+-keep enum org.greenrobot.eventbus.ThreadMode { *; }
+# Only required if you use AsyncExecutor
+-keepclassmembers class * extends org.greenrobot.eventbus.util.ThrowableFailureEvent {
+    <init>(java.lang.Throwable);
+}
+
+# smack
+-keep class org.jivesoftware.smack.** { *; }
+-keep class org.jivesoftware.smackx.** { *; }
+
+# OkHttp
+-keepattributes Signature
+-keepattributes *Annotation*
+-keep class okhttp3.** { *; }
+-keep interface okhttp3.** { *; }
+-dontwarn okhttp3.**
+-dontwarn okio.**
+
+# Glide
+-keep public class * implements com.bumptech.glide.module.GlideModule
+-keep public enum com.bumptech.glide.load.resource.bitmap.ImageHeaderParser$** {
+  **[] $VALUES;
+  public *;
+}

xabber/src/beta/res/values/application_title.xml

@@ -14,5 +14,5 @@
 <resources>
     <string name="application_title_short">Xabber</string>
     <string name="application_title_full">Xabber Beta</string>
-    <string name="client_name">Xabber</string>
+    <string name="caps_entity_node">https://www.xabber.com/</string>
 </resources>