classic update for 2.0.1

.gitignore

@@ -5,3 +5,4 @@ build
 .gradle
 *.apk
 app/manifest-merger-release-report.txt
+*~*

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "app/otr4j"]
+	path = app/otr4j
+	url = https://github.com/otr4j/otr4j.git

LICENSE

@@ -1,62 +1,94 @@
-Copyright (c) 2013, Redsolution LTD.
+Copyright (c) 2015, Redsolution Inc.
 All rights reserved.
 
-Project is distributed under "GNU General Public License, Version 3" (see assets/LICENSE-GPLv3.txt).
+Project is distributed under GNU General Public License, Version 3 (see app/src/main/assets/LICENSE-GPLv3.txt).
 
-Note about restrictions:
+Following files as well as translations in app/src/main/res/values* are distributed under Creative Commons Attribution Non-Commercial Share Alike license:
 
-Following files are distributed under "Creative Commons Attribution Non-Commercial No Derivatives":
-res/drawable*/ic_connect.png
-res/drawable*/ic_disconnect.png
-res/drawable*/ic_information.png
-res/drawable*/ic_launcher.png
-res/drawable*/ic_stat_*.png
-res/drawable*/title_logo.9.png
+app/src/main/res/drawable/about_backdrop.jpg
+app/src/main/res/drawable*/chat_background.png
+app/src/main/res/drawable/contact_shadow.jpg
+app/src/main/res/drawable*/drawer_*.jpg
+app/src/main/res/drawable*/ic_avatar_*.png
+app/src/main/res/drawable*/ic_client_*.png
+app/src/main/res/drawable*/ic_offline_shadow_24dp.png
+app/src/main/res/drawable*/ic_scroll_indicator_circle_*.png
+app/src/main/res/drawable*/ic_stat_offline.png
+app/src/main/res/drawable*/ic_stat_cnline.png
+app/src/main/res/drawable*/ic_status_*.png
+app/src/main/res/drawable*/message_*.9.png
 
-Following files are part of The Android Open Source Project licensed under the Apache License, Version 2.0 (the "License") (see assets/LICENSE-Apache2.txt):
-res/drawable/notify_panel_notification_icon_bg_tile.xml
-res/layout/info_preference.xml
-res/layout/preference.xml
-res/layout/progress_preference.xml
-res/drawable*/emo_im_*.png
-res/drawable*/ic_menu_*.png
+Following files are part of official icon set from Google and distributed under Creative Common Attribution 4.0 International License (CC-BY 4.0):
 
-The rest of graphic in res/drawable* as well as translations in res/values* are distributed under "Creative Commons Attribution Non-Commercial Share Alike".
+app/src/main/res/drawable*/ic_add_white_24dp.png
+app/src/main/res/drawable*/ic_arrow_left_white_24dp.png
+app/src/main/res/drawable*/ic_button_send_*_24dp.png
+app/src/main/res/drawable*/ic_chat_white_24dp.png
+app/src/main/res/drawable*/ic_clear_all_white_24dp.png
+app/src/main/res/drawable*/ic_clear_white_24dp.png
+app/src/main/res/drawable*/ic_exit_grey600_24dp.png
+app/src/main/res/drawable*/ic_expander_indicator_down_black_24dp.png
+app/src/main/res/drawable*/ic_expander_indicator_right_black_24dp.png
+app/src/main/res/drawable*/ic_group_add_white_24dp.png
+app/src/main/res/drawable*/ic_hangouts_grey600_24dp.png
+app/src/main/res/drawable*/ic_help_circle_grey600_24dp.png
+app/src/main/res/drawable*/ic_list_white_24dp.png
+app/src/main/res/drawable*/ic_message_delivered_18dp.png
+app/src/main/res/drawable*/ic_message_has_error_18dp.png
+app/src/main/res/drawable*/ic_message_not_sent_18dp.png
+app/src/main/res/drawable*/ic_person_add_white_24dp.png
+app/src/main/res/drawable*/ic_search_white_24dp.png
+app/src/main/res/drawable*/ic_security_*_24dp.png
+app/src/main/res/drawable*/ic_settings_grey600_24dp.png
+app/src/main/res/drawable*/ic_show_offline_*.png
+app/src/main/res/drawable*/ic_stat_add_circle.png
+app/src/main/res/drawable*/ic_stat_chat.png
+app/src/main/res/drawable*/ic_stat_error.png
+app/src/main/res/drawable*/ic_stat_help.png
+app/src/main/res/drawable*/ic_stat_play_circle_fill.png
+app/src/main/res/drawable*/ic_vcard_address_24dp.png
+app/src/main/res/drawable*/ic_vcard_birthday_24dp.png
+app/src/main/res/drawable*/ic_vcard_contact_info_24dp.png
+app/src/main/res/drawable*/ic_vcard_email_24dp.png
+app/src/main/res/drawable*/ic_vcard_job_title_24dp.png
+app/src/main/res/drawable*/ic_vcard_notes_24dp.png
+app/src/main/res/drawable*/ic_vcard_phone_24dp.png
+app/src/main/res/drawable*/ic_vcard_web_24dp.png
 
-Also following components are in use (see the source code or official sites for license details):
+XMPP logo is licensed under a slightly modified MIT license (http://xmpp.org/about-xmpp/xsf/xsf-ipr-policy/#legal):
+app/src/main/res/drawable*/ic_vcard_xmpp_24dp.png
 
-ZXing
-src/com/google/zxing/*
-Apache License, Version 2.0 (the "License").
+The Jabber logo is licensed under the Creative Commons Attribution License
+app/src/main/res/drawable*/ic_vcard_jabber_24dp.png
+
+Xabber, Redsolution logo are trademarks of Redsolution Inc., and are licensed under  Creative Commons Attribution-NoDerivs license:
+app/src/main/res/drawable*/ic_connect.png
+app/src/main/res/drawable*/ic_disconnect.png
+app/src/main/res/drawable*/ic_launcher.png
+app/src/main/res/drawable*/redsolution_logo*.9.png
 
-JZLib
-src/com/jcraft/jzlib/*
-BSD license.
+Following file is part of The Android Open Source Project licensed under the Apache License, Version 2.0 (the "License") (see assets/LICENSE-Apache2.txt):
+app/src/main/res/layout/preference.xml
+
+Also source code of following components is included in repository (see the source code or official sites for license details):
 
 Novel sasl client
-src/com/novell/sasl/*
+app/src/main/java/com/novell/sasl/*
 The OpenLDAP Public License.
 
 Measite Smack SASL
-src/de/measite/smack/*
+app/src/main/java/de/measite/smack/*
 Apache License, Version 2.0 (the "License").
 
 Apache Harmony
-src/org/apache/harmony/*
+app/src/main/java/org/apache/harmony/*
 Apache License, Version 2.0 (the "License").
 
 Apache Qpid
-src/org/apache/qpid/*
+app/src/main/java/org/apache/qpid/*
 Apache License, Version 2.0 (the "License").
 
 Smack
-src/org/jivesoftware/*
+app/src/main/java/org/jivesoftware/*
 Apache License, Version 2.0 (the "License").
 
-DNS Java
-src/org/xbill/*
-BSD license.
-
-OTR4J
-libs/otr4j.jar
-GNU Lesser General Public License, Version 3.

README.rst

@@ -4,6 +4,19 @@ 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 is designed to be the best Jabber client for Android.
 
+Build instrustions
+==================
+
+Xabber uses Gradle build system. The only specific thing is git submodule for otr4j library. To make it work use following commands:
+
+ ::
+
+ git submodule init
+
+ git submodule update
+
+And otr4j would be cloned to your local repository. 
+
 Supported protocols
 ===================
 
@@ -27,12 +40,19 @@ Supported protocols
 * XEP-0059: Result Set Management
 * XEP-0136: Message Archiving
 * XEP-0224: Attention
+* XEP-0077: In-Band Registration
 
 Translations
 ============
 
-We use webtranslateit.com as our translation system.
-All related resources are automatically generated from files got with webtranslateit.com.
-If you want to update any translation please email us to info[at]xabber.com and specify all the translation languages you want to edit.
-Then we'll send an invitation to our project on webtranslateit.com.
-Please don't create pull requests with translation fixes as any changes will be overwritten with the next update from webtranslateit.com.
+
+
+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.
+
+Wiki
+====
+
+Visit our wiki pages for additional information: https://github.com/redsolution/xabber-android/wiki

app/build.gradle

@@ -1,23 +1,55 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 9
-    buildToolsVersion "21.1.2"
+    compileSdkVersion 22
+    buildToolsVersion "22.0.1"
 
     defaultConfig {
-        applicationId "com.xabber.androiddev"
-        minSdkVersion 3
-        targetSdkVersion 9
+        minSdkVersion 14
+        targetSdkVersion 22
+        versionCode 200
+        versionName '1.0.28'
     }
 
-    buildTypes {
-        release {
-            minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_7
+        targetCompatibility JavaVersion.VERSION_1_7
+    }
+
+    lintOptions {
+        // problems with generated "applicationId" string resource
+        disable 'MissingTranslation'
+    }
+
+    productFlavors {
+
+        dev {
+            applicationId "com.xabber.androiddev"
+            resValue 'string', 'application_package', applicationId
         }
+
+        beta {
+            applicationId "com.xabber.android.beta"
+            resValue 'string', 'application_package', applicationId
+        }
+
     }
 }
 
+repositories {
+    mavenCentral()
+}
+
 dependencies {
-    compile files('libs/otr4j.jar')
+    compile 'com.android.support:design:22.2.0'
+    compile 'com.android.support:appcompat-v7:22.2.0'
+    compile 'com.android.support:support-v13:22.2.0'
+    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.google.zxing:android-integration:3.1.0'
+    compile 'com.jcraft:jzlib:1.0.7'
+    compile project('otr4j')
 }

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

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?><!-- Copyright (c) 2013, Redsolution LTD. All rights reserved.
+
+     This file is part of Xabber project; you can redistribute it and/or
+     modify it under the terms of the GNU General Public License, Version 3.
+
+     Xabber is distributed in the hope that it will be useful, but
+     WITHOUT ANY WARRANTY; without even the implied warranty of
+     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+     See the GNU General Public License for more details.
+
+     You should have received a copy of the GNU General Public License,
+     along with this program. If not, see http://www.gnu.org/licenses/.
+-->
+<resources>
+    <string name="application_title_short">Xabber</string>
+    <string name="application_title_full">Xabber Beta</string>
+    <string name="client_name">Xabber</string>
+</resources>

app/src/dev/res/values/application_title.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?><!-- Copyright (c) 2013, Redsolution LTD. All rights reserved.
+
+     This file is part of Xabber project; you can redistribute it and/or
+     modify it under the terms of the GNU General Public License, Version 3.
+
+     Xabber is distributed in the hope that it will be useful, but
+     WITHOUT ANY WARRANTY; without even the implied warranty of
+     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+     See the GNU General Public License for more details.
+
+     You should have received a copy of the GNU General Public License,
+     along with this program. If not, see http://www.gnu.org/licenses/.
+-->
+<resources>
+    <string name="application_title_short">Xabber</string>
+    <string name="application_title_full">Xabber Dev</string>
+    <string name="client_name">Xabber</string>
+</resources>