Merge pull request #849 from redsolution/develop

New auth interface and Xabber account

.travis.yml

@@ -3,10 +3,13 @@ android:
   components:
     - platform-tools
     - tools
+    - build-tools-28.0.3
+    - build-tools-28.0.2
     - build-tools-27.0.3
     - build-tools-26.0.2
     - build-tools-25.0.2
     - build-tools-25.0.0
+    - android-28
     - android-27
     - android-26
     - android-25

build.gradle

@@ -6,11 +6,11 @@ buildscript {
         maven { url 'https://maven.fabric.io/public' }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.0.1'
+        classpath 'com.android.tools.build:gradle:3.2.1'
         classpath "io.realm:realm-gradle-plugin:3.1.1"
         classpath 'com.neenbedankt.gradle.plugins:android-apt:1.8'
         classpath 'com.frogermcs.androiddevmetrics:androiddevmetrics-plugin:0.4'
-        classpath 'io.fabric.tools:gradle:1.+'
+        classpath 'io.fabric.tools:gradle:1.25.4'
         classpath 'com.google.gms:google-services:3.1.1'
     }
 }

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Thu Oct 26 14:17:31 YEKT 2017
+#Tue Sep 25 11:30:28 YEKT 2018
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip

xabber/build.gradle

@@ -4,14 +4,14 @@ apply plugin: 'com.frogermcs.androiddevmetrics'
 apply plugin: 'io.fabric'
 
 android {
-    compileSdkVersion 27
-    buildToolsVersion '27.0.3'
+    compileSdkVersion 28
+    buildToolsVersion '28.0.3'
 
     defaultConfig {
         minSdkVersion 15
-        targetSdkVersion 27
-        versionCode 501
-        versionName '2.4.1(501)'
+        targetSdkVersion 28
+        versionCode 533
+        versionName '2.5(533)'
     }
 
     lintOptions {
@@ -83,12 +83,10 @@ android {
                     'proguard-rules.pro'
             // enable crashlytics
             buildConfigField "boolean", "USE_CRASHLYTICS", "true"
-            ext.enableCrashlytics = true
         }
         debug {
             // disable crashlytics
             buildConfigField "boolean", "USE_CRASHLYTICS", "false"
-            ext.enableCrashlytics = false
         }
     }
 
@@ -139,7 +137,7 @@ if (build_param == "dev") {
 
 ext {
     smackVersion = '4.2.1-SNAPSHOT'
-    supportVersion = '27.0.2'
+    supportVersion = '28.0.0'
 }
 
 dependencies {
@@ -153,7 +151,11 @@ dependencies {
 
     implementation "com.android.support:design:$supportVersion"
     implementation "com.android.support:support-v13:$supportVersion"
-    implementation 'com.android.support:multidex:1.0.1'
+    implementation "com.android.support:customtabs:$supportVersion"
+    implementation 'com.android.support:multidex:1.0.3'
+
+    // firebase
+    compile 'com.google.firebase:firebase-messaging:11.4.0'
 
     implementation 'com.github.Str4tocaster:otr4j:custom-SNAPSHOT'
     implementation 'com.google.zxing:android-integration:3.3.0'
@@ -168,7 +170,8 @@ dependencies {
     implementation 'io.reactivex:rxandroid:1.1.0'
     implementation 'io.reactivex:rxjava:1.1.0'
 
-    //social
+    // social
+    implementation 'com.google.android.gms:play-services-safetynet:11.4.0'
     implementation 'com.facebook.android:facebook-android-sdk:4.31.0'
     implementation 'com.twitter.sdk.android:twitter:3.0.0'
     implementation 'com.google.android.gms:play-services-auth:11.4.0'
@@ -187,11 +190,11 @@ dependencies {
     implementation 'ru.egslava:MaskedEditText:1.0.5'
     implementation 'eu.davidea:flexible-adapter:5.0.0-rc4'
     implementation 'com.soundcloud.android:android-crop:1.0.1@aar'
-    implementation 'de.hdodenhof:circleimageview:2.1.0'
+    implementation 'de.hdodenhof:circleimageview:2.2.0'
     implementation 'com.melnykov:floatingactionbutton:1.3.0'
 
-    implementation('com.crashlytics.sdk.android:crashlytics:2.6.8@aar') {
-        transitive = true;
+    implementation('com.crashlytics.sdk.android:crashlytics:2.9.5@aar') {
+        transitive = true
     }
 
     implementation group: 'org.bouncycastle', name: 'bcpkix-jdk15on', version: '1.58'

xabber/emojicon/build.gradle

@@ -1,12 +1,12 @@
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 25
-    buildToolsVersion '26.0.2'
+    compileSdkVersion 28
+    buildToolsVersion '28.0.3'
 
     defaultConfig {
-        minSdkVersion 14
-        targetSdkVersion 25
+        minSdkVersion 15
+        targetSdkVersion 28
     }
 
     buildTypes {
@@ -18,5 +18,5 @@ android {
 }
 
 dependencies {
-    compile "com.android.support:support-v13:25.3.0"
+    implementation "com.android.support:support-v13:28.0.0"
 }

xabber/emojicon/src/main/AndroidManifest.xml

@@ -1,7 +1,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="github.ankushsachdeva.emojicon">
 
-    <uses-sdk android:minSdkVersion="8" android:targetSdkVersion="19"/>
+    <uses-sdk android:targetSdkVersion="19"/>
 
     <application android:allowBackup="true"
         android:label="@string/app_name"

xabber/emojicon/src/main/res/values/attrs.xml

@@ -26,15 +26,4 @@
     <dimen name="keyboard_height">250dp</dimen>
     <dimen name="less_than_keyboard_height">80dp</dimen>
 
-    <style name="emojiDialog" parent="@android:style/Theme.Dialog">
-        <item name="android:layout_width">fill_parent</item>
-        <item name="android:layout_height">fill_parent</item>
-
-        <!-- No backgrounds, titles or window float -->
-        <item name="android:windowFrame">@null</item>
-        <item name="android:windowBackground">@null</item>
-        <item name="android:windowNoTitle">true</item>
-        <item name="android:windowIsFloating">false</item>
-    </style>
-
 </resources>

xabber/proguard-rules.pro

@@ -7,6 +7,22 @@
 
 # RxJava
 -dontwarn rx.internal.util.**
+-dontwarn sun.misc.**
+
+-keepclassmembers class rx.internal.util.unsafe.*ArrayQueue*Field* {
+   long producerIndex;
+   long consumerIndex;
+}
+
+-keepclassmembers class rx.internal.util.unsafe.BaseLinkedQueueProducerNodeRef {
+    rx.internal.util.atomic.LinkedQueueNode producerNode;
+}
+
+-keepclassmembers class rx.internal.util.unsafe.BaseLinkedQueueConsumerNodeRef {
+    rx.internal.util.atomic.LinkedQueueNode consumerNode;
+}
+
+-dontnote rx.internal.util.PlatformDependent
 
 # google
 -keep class com.google.**

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

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

xabber/src/dev/res/values/social_keys.xml

@@ -12,4 +12,6 @@
 
     <string name="SOCIAL_AUTH_GITHUB_KEY">temp</string>
     <string name="SOCIAL_AUTH_GITHUB_SECRET">temp</string>
+
+    <string name="RECAPTCHA_KEY">temp</string>
 </resources>

xabber/src/main/AndroidManifest.xml

@@ -16,6 +16,8 @@
     xmlns:tools="http://schemas.android.com/tools"
     package="com.xabber.android">
 
+    <meta-data android:name="firebase_crashlytics_collection_enabled" android:value="false" />
+
     <uses-feature
         android:name="android.hardware.touchscreen"
         android:required="false" />
@@ -38,6 +40,7 @@
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS" />
     <uses-permission android:name="android.permission.CAMERA" />
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
 
     <application
         android:name=".data.Application"
@@ -422,6 +425,12 @@
         <service android:name=".service.XabberService" />
         <service android:name=".service.DownloadService" />
         <service android:name=".service.UploadService" />
+        <service
+            android:name=".service.PushService">
+            <intent-filter>
+                <action android:name="com.google.firebase.MESSAGING_EVENT"/>
+            </intent-filter>
+        </service>
 
         <receiver android:name=".receiver.BootReceiver">
             <intent-filter>
@@ -514,15 +523,23 @@
                 android:name="android.support.PARENT_ACTIVITY"
                 android:value="com.xabber.android.ui.activity.ChatActivity" />
         </activity>
-        <activity android:name=".ui.activity.IntroActivity"
-            android:theme="@style/ThemeDark"/>
         <activity android:name=".ui.activity.TutorialActivity"
             android:theme="@style/ThemeDark"/>
         <activity android:name=".ui.activity.XabberLoginActivity"
+            android:theme="@style/Theme.Design.Light"/>
+
+        <activity android:name=".ui.activity.XabberAccountActivity"
             android:theme="@style/ThemeDark"/>
-        <activity android:name=".ui.activity.XabberAccountInfoActivity"
+
+        <activity android:name=".ui.activity.XAChangePassActivity" />
+        <activity android:name=".ui.activity.PatreonAppealActivity"
             android:theme="@style/ThemeDark">
+            <meta-data
+                android:name="android.support.PARENT_ACTIVITY"
+                android:value="com.xabber.android.ui.activity.ContactListActivity" />
+        </activity>
 
+        <activity android:name=".ui.activity.DeepLinkActivity" >
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
                 <category android:name="android.intent.category.DEFAULT" />
@@ -531,14 +548,8 @@
                 <data android:host="www.xabber.com" />
                 <data android:pathPrefix="/account/emails/confirmation" />
             </intent-filter>
-
-        </activity>
-        <activity android:name=".ui.activity.PatreonAppealActivity"
-            android:theme="@style/ThemeDark">
-            <meta-data
-                android:name="android.support.PARENT_ACTIVITY"
-                android:value="com.xabber.android.ui.activity.ContactListActivity" />
         </activity>
+
         <meta-data android:name="com.facebook.sdk.ApplicationId"
             android:value="@string/SOCIAL_AUTH_FACEBOOK_KEY"/>
         <activity android:name="com.facebook.FacebookActivity"

xabber/src/main/assets/style.css

@@ -0,0 +1,18 @@
+li {
+    padding-left: 6px;
+    padding-right: 6px;
+    line-height: 1.5;
+    color: #616161;
+}
+
+ul {
+    margin-top: 0px;
+    margin-bottom: 0px;
+}
+
+p {
+    margin-top: 8px;
+    margin-bottom: 4px;
+    line-height: 1.5;
+    color: #616161;
+}