Merge pull request #875 from redsolution/develop

Update 2.6.2 (591)

build.gradle

@@ -6,12 +6,12 @@ buildscript {
         maven { url 'https://maven.fabric.io/public' }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.1'
+        classpath 'com.android.tools.build:gradle:3.3.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.25.4'
-        classpath 'com.google.gms:google-services:3.1.1'
+        classpath 'com.google.gms:google-services:4.2.0'
     }
 }
 

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Tue Sep 25 11:30:28 YEKT 2018
+#Fri Feb 15 11:01:28 YEKT 2019
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip

xabber/build.gradle

@@ -10,8 +10,8 @@ android {
     defaultConfig {
         minSdkVersion 15
         targetSdkVersion 28
-        versionCode 568
-        versionName '2.6(568)'
+        versionCode 591
+        versionName '2.6.2(591)'
     }
 
     lintOptions {
@@ -128,7 +128,7 @@ dependencies {
     implementation 'com.android.support:multidex:1.0.3'
 
     // firebase
-    compile 'com.google.firebase:firebase-messaging:11.4.0'
+    implementation 'com.google.firebase:firebase-messaging:17.3.4'
 
     implementation 'com.github.Str4tocaster:otr4j:custom-SNAPSHOT'
     implementation 'com.google.zxing:android-integration:3.3.0'
@@ -144,10 +144,10 @@ dependencies {
     implementation 'io.reactivex:rxjava:1.1.0'
 
     // social
-    implementation 'com.google.android.gms:play-services-safetynet:11.4.0'
+    implementation 'com.google.android.gms:play-services-safetynet:16.0.0'
     implementation 'com.facebook.android:facebook-login:4.36.1'
     implementation 'com.twitter.sdk.android:twitter:3.0.0'
-    implementation 'com.google.android.gms:play-services-auth:11.4.0'
+    implementation 'com.google.android.gms:play-services-auth:15.0.0'
     implementation ('com.google.api-client:google-api-client-android:1.22.0') {
         exclude module: 'httpclient'
     }
@@ -178,7 +178,7 @@ dependencies {
 
     // block canary
     debugImplementation 'com.github.markzhai:blockcanary-android:1.5.0'
-    releaseCompile 'com.github.markzhai:blockcanary-no-op:1.5.0'
+    releaseImplementation 'com.github.markzhai:blockcanary-no-op:1.5.0'
 
 }
 apply plugin: 'com.google.gms.google-services'

xabber/emojicon/src/main/AndroidManifest.xml

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

xabber/src/main/AndroidManifest.xml

@@ -44,11 +44,11 @@
 
     <application
         android:name=".data.Application"
-        android:allowBackup="true"
+        android:allowBackup="false"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/application_title_full"
         android:theme="@style/Theme"
-        tools:replace="label, icon">
+        tools:replace="label, icon, allowBackup">
         <activity
             android:name=".ui.activity.ContactListActivity"
             android:label="@string/application_title_full"
@@ -207,16 +207,6 @@
                 android:name="android.support.PARENT_ACTIVITY"
                 android:value="com.xabber.android.ui.activity.ContactListActivity" />
         </activity>
-        <activity
-            android:name=".ui.preferences.ChatContactSettings"
-            android:label="@string/chat_settings"
-            android:parentActivityName=".ui.activity.ChatActivity">
-
-            <!-- Parent activity meta-data to support 4.0 and lower -->
-            <meta-data
-                android:name="android.support.PARENT_ACTIVITY"
-                android:value="com.xabber.android.ui.activity.ChatActivity" />
-        </activity>
         <activity
             android:name=".ui.activity.ContactActivity"
             android:label="@string/contact_viewer"
@@ -443,6 +433,7 @@
                 <action android:name="android.intent.action.QUICKBOOT_POWEROFF" />
             </intent-filter>
         </receiver>
+        <receiver android:name=".receiver.NotificationReceiver" />
 
         <activity android:name="de.duenndns.ssl.MemorizingActivity" />
         <activity android:name="com.soundcloud.android.crop.CropImageActivity" />
@@ -576,6 +567,13 @@
                 android:name="android.support.PARENT_ACTIVITY"
                 android:value="com.xabber.android.ui.activity.ChatActivity" />
         </activity>
+        <activity android:name=".ui.preferences.CustomNotifySettings"
+            android:label="@string/custom_notifications"
+            android:parentActivityName=".ui.activity.ChatActivity">
+            <meta-data
+                android:name="android.support.PARENT_ACTIVITY"
+                android:value="com.xabber.android.ui.activity.ChatActivity" />
+        </activity>
     </application>
 
 </manifest>

xabber/src/main/java/com/xabber/android/data/Application.java

@@ -56,6 +56,7 @@
 import com.xabber.android.data.message.chat.ChatManager;
 import com.xabber.android.data.message.phrase.PhraseManager;
 import com.xabber.android.data.notification.NotificationManager;
+import com.xabber.android.data.notification.custom_notification.CustomNotifyPrefsManager;
 import com.xabber.android.data.roster.GroupManager;
 import com.xabber.android.data.roster.PresenceManager;
 import com.xabber.android.data.roster.RosterManager;
@@ -368,6 +369,7 @@ private void addManagers() {
         addManager(GroupManager.getInstance());
         addManager(PhraseManager.getInstance());
         addManager(NotificationManager.getInstance());
+        addManager(CustomNotifyPrefsManager.getInstance());
         addManager(ActivityManager.getInstance());
         addManager(CapabilitiesManager.getInstance());
         addManager(ChatStateManager.getInstance());

xabber/src/main/java/com/xabber/android/data/SettingsManager.java

@@ -57,6 +57,8 @@
 public class SettingsManager implements OnInitializedListener,
         OnMigrationListener, OnSharedPreferenceChangeListener {
 
+    public static final String NOTIFICATION_PREFERENCES = "notification_preferences";
+
     private static SettingsManager instance;
 
     private SettingsManager() {
@@ -75,6 +77,11 @@ private static SharedPreferences getSharedPreferences() {
                 .getInstance());
     }
 
+    private static SharedPreferences getNotificationSharedPreferences() {
+        return Application.getInstance().getSharedPreferences(
+                NOTIFICATION_PREFERENCES, Context.MODE_PRIVATE);
+    }
+
     private static int getInt(int key, int def) {
         String value = getString(key, def);
         try {
@@ -110,6 +117,16 @@ private static void setBoolean(int key, boolean value) {
         editor.commit();
     }
 
+    private static boolean getNotifBoolean(int key, boolean def) {
+        return getNotificationSharedPreferences().getBoolean(
+                Application.getInstance().getString(key), def);
+    }
+
+    private static boolean getNotifBoolean(int key, int def) {
+        return getNotifBoolean(key, Application.getInstance().getResources()
+                .getBoolean(def));
+    }
+
     private static String getString(int key, String def) {
         return getSharedPreferences().getString(
                 Application.getInstance().getString(key), def);
@@ -125,6 +142,21 @@ private static void setString(int key, String value) {
         editor.commit();
     }
 
+    private static String getNotifString(int key, String def) {
+        return getNotificationSharedPreferences().getString(
+                Application.getInstance().getString(key), def);
+    }
+
+    private static String getNotifString(int key, int def) {
+        return getNotifString(key, Application.getInstance().getString(def));
+    }
+
+    private static void setNotifString(int key, String value) {
+        Editor editor = getNotificationSharedPreferences().edit();
+        editor.putString(Application.getInstance().getString(key), value);
+        editor.apply();
+    }
+
     /**
      * @param key
      * @param defaultUri
@@ -133,11 +165,11 @@ private static void setString(int key, String value) {
     private static Uri getSound(int key, Uri defaultUri, int defaultResource) {
         String defaultValue = Application.getInstance().getString(
                 defaultResource);
-        String value = getString(key, defaultValue);
+        String value = getNotifString(key, defaultValue);
         if (TextUtils.isEmpty(value))
             return null;
         if (defaultValue.equals(value)) {
-            setString(key, defaultUri.toString());
+            setNotifString(key, defaultUri.toString());
             return defaultUri;
         }
         return Uri.parse(value);
@@ -241,7 +273,7 @@ public static Uri eventsSoundMuc() {
     }
 
     public static VibroMode eventsVibroChat() {
-        String value = getString(R.string.events_vibro_chat_key, R.string.events_vibro_bydefault);
+        String value = getNotifString(R.string.events_vibro_chat_key, R.string.events_vibro_bydefault);
         if (Application.getInstance().getString(R.string.events_vibro_disable).equals(value)) {
             return VibroMode.disabled;
         } else if (Application.getInstance().getString(R.string.events_vibro_bydefault).equals(value)) {
@@ -258,7 +290,7 @@ public static VibroMode eventsVibroChat() {
     }
 
     public static VibroMode eventsVibroMuc() {
-        String value = getString(R.string.events_vibro_muc_key, R.string.events_vibro_bydefault);
+        String value = getNotifString(R.string.events_vibro_muc_key, R.string.events_vibro_bydefault);
         if (Application.getInstance().getString(R.string.events_vibro_disable).equals(value)) {
             return VibroMode.disabled;
         } else if (Application.getInstance().getString(R.string.events_vibro_bydefault).equals(value)) {
@@ -274,6 +306,7 @@ public static VibroMode eventsVibroMuc() {
         }
     }
 
+    @Deprecated
     public static boolean eventsSuppress100() {
         return getBoolean(R.string.chat_events_suppress_100_key,
                 R.bool.chat_events_suppress_100_default);
@@ -285,12 +318,12 @@ public static boolean eventsSuppress100() {
 //    }
 
     public static boolean eventsLightning() {
-        return getBoolean(R.string.events_lightning_key,
+        return getNotifBoolean(R.string.events_lightning_key,
                 R.bool.events_lightning_default);
     }
 
     public static boolean eventsLightningForMuc() {
-        return getBoolean(R.string.events_lightning_muc_key,
+        return getNotifBoolean(R.string.events_lightning_muc_key,
                 R.bool.events_lightning_default);
     }
 
@@ -300,50 +333,53 @@ public static boolean eventsPersistent() {
     }
 
     public static boolean eventsShowText() {
-        return getBoolean(R.string.events_show_text_key,
+        return getNotifBoolean(R.string.events_show_text_key,
                 R.bool.events_show_text_default);
     }
 
     public static boolean eventsShowTextOnMuc() {
-        return getBoolean(R.string.events_show_text_muc_key,
+        return getNotifBoolean(R.string.events_show_text_muc_key,
                 R.bool.events_show_text_default);
     }
 
     public static boolean eventsOnChat() {
-        return getBoolean(R.string.events_on_chat_key,
+        return getNotifBoolean(R.string.events_on_chat_key,
                 R.bool.events_on_chat_default);
     }
 
     public static boolean eventsOnMuc() {
-        return getBoolean(R.string.events_on_muc_key,
+        return getNotifBoolean(R.string.events_on_muc_key,
                 R.bool.events_on_muc_default);
     }
 
-    public static boolean eventsInAppSounds() {
-        return getBoolean(R.string.events_in_app_sounds_key,
-                R.bool.events_in_app_sounds_default);
-    }
-
-    public static boolean eventsInAppVibrate() {
-        return getBoolean(R.string.events_in_app_vibrate_key,
-                R.bool.events_in_app_vibrate_default);
-    }
-
-    public static boolean eventsInAppPreview() {
-        return getBoolean(R.string.events_in_app_preview_key,
-                R.bool.events_in_app_preview_default);
-    }
+//    public static boolean eventsInAppSounds() {
+//        return getBoolean(R.string.events_in_app_sounds_key,
+//                R.bool.events_in_app_sounds_default);
+//    }
+//
+//    public static boolean eventsInAppVibrate() {
+//        return getBoolean(R.string.events_in_app_vibrate_key,
+//                R.bool.events_in_app_vibrate_default);
+//    }
+//
+//    public static boolean eventsInAppPreview() {
+//        return getBoolean(R.string.events_in_app_preview_key,
+//                R.bool.events_in_app_preview_default);
+//    }
 
+    @Deprecated
     public static boolean eventsInChatSounds() {
         return getBoolean(R.string.events_in_chat_sounds_key,
                 R.bool.events_in_chat_sounds_default);
     }
 
+    @Deprecated
     public static boolean eventsVisibleChat() {
         return getBoolean(R.string.events_visible_chat_key,
                 R.bool.events_visible_chat_default);
     }
 
+    @Deprecated
     public static boolean eventsFirstOnly() {
         return getBoolean(R.string.events_first_only_key,
                 R.bool.events_first_only_default);
@@ -432,7 +468,7 @@ public static boolean chatsStateNotification() {
     }
 
     public static boolean chatsAttention() {
-        return getBoolean(R.string.chats_attention_key,
+        return getNotifBoolean(R.string.chats_attention_key,
                 R.bool.chats_attention_default);
     }
 
@@ -818,6 +854,10 @@ public static int getLastCrowdfundingPosition() {
         return getInteger(R.string.crowdfunding_last_position_key, 0);
     }
 
+    public static void resetPreferences(Context context, String preferencesName) {
+        context.getSharedPreferences(preferencesName, Context.MODE_PRIVATE).edit().clear().apply();
+    }
+
     @Override
     public void onInitialized() {
         incrementBootCount();