Merge branch 'release/1.0.171'

redsolution · Apr 7, 2017 · fe744e1 · fe744e1
2 parents 58fe9a5 + 91000a3
commit fe744e1
Show file tree

Hide file tree

Showing 46 changed files with 216 additions and 59 deletions.
diff --git a/build.gradle b/build.gradle
@@ -5,7 +5,7 @@ buildscript {
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:2.3.1'
-        classpath "io.realm:realm-gradle-plugin:3.0.0"
+        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'
     }

diff --git a/xabber/build.gradle b/xabber/build.gradle
@@ -10,8 +10,8 @@ android {
     defaultConfig {
         minSdkVersion 15
         targetSdkVersion 25
-        versionCode 342
-        versionName '1.0.170'
+        versionCode 343
+        versionName '1.0.171'
     }
 
     lintOptions {

diff --git a/xabber/src/main/java/com/xabber/android/data/account/AccountManager.java b/xabber/src/main/java/com/xabber/android/data/account/AccountManager.java
@@ -170,6 +170,13 @@ public void onLoad() {
                 LogManager.exception(this, e);
             }
 
+            if (serverName == null || userName == null || resource == null) {
+                LogManager.e(LOG_TAG, "could not create account. username " + userName
+                        + ", server name " + serverName
+                        + ", resource " + resource);
+                continue;
+            }
+
             AccountItem accountItem = new AccountItem(
                     accountRealm.isCustom(),
                     accountRealm.getHost(),

diff --git a/xabber/src/main/java/com/xabber/android/data/connection/ConnectionBuilder.java b/xabber/src/main/java/com/xabber/android/data/connection/ConnectionBuilder.java
@@ -10,7 +10,7 @@
 
 import org.jivesoftware.smack.SASLAuthentication;
 import org.jivesoftware.smack.proxy.ProxyInfo;
-import org.jivesoftware.smack.sasl.provided.SASLPlainMechanism;
+import org.jivesoftware.smack.sasl.provided.SASLDigestMD5Mechanism;
 import org.jivesoftware.smack.tcp.XMPPTCPConnection;
 import org.jivesoftware.smack.tcp.XMPPTCPConnectionConfiguration;
 import org.jivesoftware.smack.util.TLSUtils;
@@ -19,7 +19,6 @@
 import java.net.UnknownHostException;
 import java.security.KeyManagementException;
 import java.security.NoSuchAlgorithmException;
-import java.util.Map;
 
 import javax.net.ssl.SSLContext;
 import javax.net.ssl.X509TrustManager;
@@ -66,7 +65,6 @@ class ConnectionBuilder {
 
         setUpSasl();
 
-
         LogManager.i(LOG_TAG, "new XMPPTCPConnection " + connectionSettings.getServerName());
         return new XMPPTCPConnection(builder.build());
     }
@@ -143,20 +141,9 @@ private static ProxyInfo getProxyInfo(ConnectionSettings connectionSettings) {
         return proxyInfo;
     }
 
-    private static void setUpSasl() {
-        if (SettingsManager.connectionUsePlainTextAuth()) {
-            final Map<String, String> registeredSASLMechanisms = SASLAuthentication.getRegisterdSASLMechanisms();
-            for (String mechanism : registeredSASLMechanisms.values()) {
-                SASLAuthentication.blacklistSASLMechanism(mechanism);
-            }
-
-            SASLAuthentication.unBlacklistSASLMechanism(SASLPlainMechanism.NAME);
-
-        } else {
-            final Map<String, String> registeredSASLMechanisms = SASLAuthentication.getRegisterdSASLMechanisms();
-            for (String mechanism : registeredSASLMechanisms.values()) {
-                SASLAuthentication.unBlacklistSASLMechanism(mechanism);
-            }
-        }
+    private synchronized static void setUpSasl() {
+        // TODO: DIGEST-MD5 mechanism disabled due to implementation problems
+        // should be enabled back when fixed in Smack
+        SASLAuthentication.blacklistSASLMechanism(SASLDigestMD5Mechanism.NAME);
     }
 }
diff --git a/xabber/src/main/java/com/xabber/android/data/extension/muc/RoomChat.java b/xabber/src/main/java/com/xabber/android/data/extension/muc/RoomChat.java
@@ -332,7 +332,7 @@ private boolean showStatusChange() {
      * @param resource
      */
     private boolean isSelf(Resourcepart resource) {
-        return nickname.equals(resource);
+        return nickname != null && resource != null && nickname.equals(resource);
     }
 
     /**

diff --git a/xabber/src/main/java/com/xabber/android/data/intent/BaseAccountIntentBuilder.java b/xabber/src/main/java/com/xabber/android/data/intent/BaseAccountIntentBuilder.java
@@ -42,10 +42,12 @@ public T setAccount(AccountJid account) {
     @Override
     void preBuild() {
         super.preBuild();
-        if (account == null)
+        if (account == null) {
             return;
-        if (getSegmentCount() != 0)
-            throw new IllegalStateException();
+        }
+        if (getSegmentCount() != 0) {
+            throw new IllegalStateException("Wrong segment count: " + getSegmentCount());
+        }
         addSegment(account.toString());
     }
 

diff --git a/xabber/src/main/java/com/xabber/android/data/intent/EntityIntentBuilder.java b/xabber/src/main/java/com/xabber/android/data/intent/EntityIntentBuilder.java
@@ -45,10 +45,12 @@ public EntityIntentBuilder setUser(UserJid user) {
     @Override
     void preBuild() {
         super.preBuild();
-        if (user == null)
+        if (user == null) {
             return;
-        if (getSegmentCount() == 0)
-            throw new IllegalStateException();
+        }
+        if (getSegmentCount() == 0) {
+            throw new IllegalStateException("Wrong segment count: " + getSegmentCount());
+        }
         addSegment(user.toString());
     }
 

diff --git a/xabber/src/main/java/com/xabber/android/ui/adapter/accountoptions/AccountOptionsAdapter.java b/xabber/src/main/java/com/xabber/android/ui/adapter/accountoptions/AccountOptionsAdapter.java
@@ -53,6 +53,8 @@ public int getItemCount() {
 
     @Override
     public void onAccountOptionClick(int adapterPosition) {
-        listener.onAccountOptionClick(options[adapterPosition]);
+        if (adapterPosition >= 0 && adapterPosition < options.length) {
+            listener.onAccountOptionClick(options[adapterPosition]);
+        }
     }
 }
diff --git a/xabber/src/main/java/com/xabber/android/ui/adapter/contactlist/ContactListAdapter.java b/xabber/src/main/java/com/xabber/android/ui/adapter/contactlist/ContactListAdapter.java
@@ -717,7 +717,9 @@ private void bindGroup(GroupViewHolder viewHolder, GroupConfiguration configurat
 
     @Override
     public void onContactClick(int adapterPosition) {
-        listener.onContactClick((AbstractContact) baseEntities.get(adapterPosition));
+        if (adapterPosition >= 0 && adapterPosition < baseEntities.size()) {
+            listener.onContactClick((AbstractContact) baseEntities.get(adapterPosition));
+        }
     }
 
     @Override

diff --git a/xabber/src/main/java/com/xabber/android/ui/dialog/ChatHistoryClearDialog.java b/xabber/src/main/java/com/xabber/android/ui/dialog/ChatHistoryClearDialog.java
@@ -0,0 +1,56 @@
+package com.xabber.android.ui.dialog;
+
+
+import android.app.AlertDialog;
+import android.app.Dialog;
+import android.app.DialogFragment;
+import android.content.DialogInterface;
+import android.os.Bundle;
+
+import com.xabber.android.R;
+import com.xabber.android.data.entity.AccountJid;
+import com.xabber.android.data.entity.UserJid;
+import com.xabber.android.data.message.MessageManager;
+import com.xabber.android.data.roster.RosterManager;
+
+public class ChatHistoryClearDialog extends DialogFragment implements DialogInterface.OnClickListener {
+
+    public static final String ARGUMENT_ACCOUNT = ChatHistoryClearDialog.class.getName() + "ARGUMENT_ACCOUNT";
+    public static final String ARGUMENT_USER = ChatHistoryClearDialog.class.getName() + "ARGUMENT_USER";
+
+    AccountJid account;
+    UserJid user;
+
+    public static ChatHistoryClearDialog newInstance(AccountJid account, UserJid user) {
+        ChatHistoryClearDialog fragment = new ChatHistoryClearDialog();
+
+        Bundle arguments = new Bundle();
+        arguments.putParcelable(ARGUMENT_ACCOUNT, account);
+        arguments.putParcelable(ARGUMENT_USER, user);
+        fragment.setArguments(arguments);
+        return fragment;
+    }
+
+    @Override
+    public Dialog onCreateDialog(Bundle savedInstanceState) {
+        Bundle args = getArguments();
+        account = args.getParcelable(ARGUMENT_ACCOUNT);
+        user = args.getParcelable(ARGUMENT_USER);
+
+        String name = RosterManager.getInstance().getBestContact(account, user).getName();
+
+        return new AlertDialog.Builder(getActivity())
+                .setTitle(R.string.clear_history)
+                .setMessage(getString(R.string.clear_chat_history_dialog_message, name))
+                .setPositiveButton(R.string.clear_chat_history_dialog_button, this)
+                .setNegativeButton(android.R.string.cancel, this).create();
+    }
+
+    @Override
+    public void onClick(DialogInterface dialog, int which) {
+        if (which == Dialog.BUTTON_POSITIVE) {
+            MessageManager.getInstance().clearHistory(account, user);
+        }
+    }
+
+}
diff --git a/xabber/src/main/java/com/xabber/android/ui/fragment/ChatFragment.java b/xabber/src/main/java/com/xabber/android/ui/fragment/ChatFragment.java
@@ -81,6 +81,7 @@
 import com.xabber.android.ui.color.ColorManager;
 import com.xabber.android.ui.dialog.BlockContactDialog;
 import com.xabber.android.ui.dialog.ChatExportDialogFragment;
+import com.xabber.android.ui.dialog.ChatHistoryClearDialog;
 import com.xabber.android.ui.helper.ContactTitleInflater;
 import com.xabber.android.ui.helper.PermissionsRequester;
 import com.xabber.android.ui.preferences.ChatContactSettings;
@@ -1086,7 +1087,7 @@ private void closeChat(AccountJid account, UserJid user) {
     }
 
     private void clearHistory(AccountJid account, UserJid user) {
-        MessageManager.getInstance().clearHistory(account, user);
+        ChatHistoryClearDialog.newInstance(account, user).show(getFragmentManager(), ChatHistoryClearDialog.class.getSimpleName());
     }
 
     private void leaveConference(AccountJid account, UserJid user) {

diff --git a/xabber/src/main/java/com/xabber/android/ui/fragment/ConferenceSelectFragment.java b/xabber/src/main/java/com/xabber/android/ui/fragment/ConferenceSelectFragment.java
@@ -42,6 +42,7 @@
 public class ConferenceSelectFragment extends ListFragment implements AdapterView.OnItemSelectedListener,
         View.OnClickListener, MUCManager.HostedRoomsListener, AdapterView.OnItemClickListener {
 
+    private static final String LOG_TAG = ConferenceSelectFragment.class.getSimpleName();
     private Spinner accountView;
     private EditText serverView;
     private EditText roomView;
@@ -148,6 +149,11 @@ public void onSaveInstanceState(Bundle outState) {
 
     @Override
     public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
+        if (account == null) {
+            LogManager.w(LOG_TAG, "onItemClick: Account is null!");
+            return;
+        }
+
         try {
             startActivity(ConferenceAddActivity.createIntent(getActivity(), account,
                     UserJid.from(hostedConferencesAdapter.getItem(position).getJid())));

diff --git a/xabber/src/main/res/values-de/account_editor.xml b/xabber/src/main/res/values-de/account_editor.xml
@@ -13,6 +13,7 @@
   <string name="account_type">Kontotyp</string>
   <string name="account_type_hints_gtalk">Benutzername für Google Talk</string>
   <string name="account_type_helps_gtalk">Wenn du über kein Google-Konto verfügst, kannst du unter http://mail.google.com\n eins erstellen. Verwende bitte your_user_name@your_google_domain</string>
+  <string name="account_xmpp_register_warning">Du musst zunächst <a href="http://www.google.de/#q=XMPP+Account+erstellen">einen XMPP Account erstellen</a> um Xabber zu nutzen!</string>
   <string name="account_type_helps_xmpp">Wenn du mehr über XMPP (Jabber) erfahren möchtest, besuche https://xmpp.org</string>
   <string name="account_user_name">Benutzername</string>
   <string name="EMPTY_SERVER_NAME">Servername nicht angegeben</string>
@@ -55,7 +56,7 @@
   <string name="account_tls_mode">TLS/SSL-Verschlüsselung</string>
   <string name="account_tls_require">TLS benötigt</string>
   <string name="account_tls_require_summary">TLS-Verschlüsselung für Verbindung zum Server verlangen</string>
-  <string name="account_use_orbot">Chatten über das anonyme Netzwerk TOR und erzwingen einer TLS Verschlüsselung\nFür Google Talk nicht empfohlen</string>
+  <string name="account_use_orbot">Anonymer Chat über TOR und Erzwingen einer TLS Verschlüsselung wird für Google Talk nicht empfohlen</string>
   <string name="confirm_cancellation">Wollen Sie wirklich alle Änderungen verwerfen?</string>
   <string name="INCORRECT_USER_NAME">Überprüfen Sie den Benutzernamen. Details finden Sie unten im Hilfetext.</string>
   <string name="orbot_required_message">Für die Nutzung von TOR muss Orbot installiert sein und die Proxy-Verbindung darüber laufen. Möchten Sie die App von Google Play herunterladen?</string>
@@ -74,8 +75,8 @@
   <string name="account_color_name_cyan">Türkis</string>
   <string name="account_connection_settings">Verbindungseinstellungen</string>
   <string name="blocked_contacts">Blockierte Kontakte</string>
-  <string name="blocked_contacts_unknown">Unterstützung für Sperrung noch nicht beschlossen.</string>
-  <string name="blocked_contacts_not_supported">Sperrung wird vom Server nicht unterstützt.</string>
+  <string name="blocked_contacts_unknown">Serverseitige Unterstützung für Kontaktsperrung noch nicht ermittelt.</string>
+  <string name="blocked_contacts_not_supported">Keine serverseitige Unterstützung für Kontaktsperrung.</string>
   <string name="blocked_contacts_empty">Nicht blockierte Kontakte.</string>
   <plurals name="blocked_contacts_number">
     <item quantity="one">%d Kontakt blockiert.</item>

diff --git a/xabber/src/main/res/values-de/account_list.xml b/xabber/src/main/res/values-de/account_list.xml
@@ -8,7 +8,7 @@
   <string name="account_editor">Konto bearbeiten</string>
   <string name="account_state_registration">Registrierung</string>
   <string name="account_state_authentication">Autorisierung</string>
-  <string name="account_state_connected">Online</string>
+  <string name="account_state_connected">Verfügbar</string>
   <string name="account_state_connecting">Verbinden</string>
   <string name="account_state_disconnecting">Verbindung wird getrennt</string>
   <string name="account_state_offline">Abgemeldet</string>

diff --git a/xabber/src/main/res/values-de/contact_editor.xml b/xabber/src/main/res/values-de/contact_editor.xml
@@ -6,7 +6,7 @@
   <string name="contact_name">Alias (optional)</string>
   <string name="contact_subscribe_confirm">Wollen Sie Ihren Kontostatus %1$s mit dem Kontakt teilen?</string>
   <string name="contact_user">Benutzername des Kontakts</string>
-  <string name="ENTRY_IS_NOT_FOUND">Kontakt wurde nicht gefunden</string>
+  <string name="ENTRY_IS_NOT_FOUND">Kontakt nicht gefunden</string>
   <string name="group_is_empty">Gruppenname setzen</string>
   <string name="group_name">Gruppenname</string>
   <string name="choose_account">Konto auswählen</string>

diff --git a/xabber/src/main/res/values-de/contact_list.xml b/xabber/src/main/res/values-de/contact_list.xml
@@ -6,7 +6,7 @@
   <string name="application_action_disabled">Konten verwalten</string>
   <string name="application_action_empty">Konto hinzufügen</string>
   <string name="application_action_no_contacts">Kontakt hinzufügen</string>
-  <string name="application_action_no_online">Offline Kontakte zeigen</string>
+  <string name="application_action_no_online">Offline Kontakte anzeigen</string>
   <string name="application_action_offline">Verbinden</string>
   <string name="application_action_waiting">Wiederverbinden</string>
   <string name="application_state_connecting">Verbinde...</string>

diff --git a/xabber/src/main/res/values-de/contact_viewer.xml b/xabber/src/main/res/values-de/contact_viewer.xml
@@ -4,7 +4,7 @@
   <string name="contact_viewer">Kontaktinformationen</string>
   <string name="contact_viewer_client">Client</string>
   <string name="contact_viewer_this_device">Dieses Gerät</string>
-  <string name="vcard_nick_name">Nickname</string>
+  <string name="vcard_nick_name">Spitzname</string>
   <string name="vcard_formatted_name">Formatierter Name</string>
   <string name="vcard_prefix_name">Präfix</string>
   <string name="vcard_given_name">Vorname</string>

diff --git a/xabber/src/main/res/values-de/muc_editor.xml b/xabber/src/main/res/values-de/muc_editor.xml
@@ -4,10 +4,10 @@
   <string name="EMPTY_NICK_NAME">Nickname nicht angegeben</string>
   <string name="EMPTY_ROOM_NAME">Konferenz nicht angegeben</string>
   <string name="muc_join">Konferenz beitreten</string>
-  <string name="muc_nick">Nick</string>
-  <string name="muc_nick_hint">Ihr Nickname in der Konferenz</string>
+  <string name="muc_nick">Spitzname</string>
+  <string name="muc_nick_hint">Ihr Spitzname in der Konferenz</string>
   <string name="muc_password">Passwort</string>
-  <string name="muc_password_hint">Kein Passwort benötigt</string>
+  <string name="muc_password_hint">Passwort wird nicht benötigt</string>
   <string name="muc_room">Konferenz</string>
   <string name="muc_server">Mehrbenutzer Chat</string>
   <string name="NICK_ALREADY_USED">Der Nickname wird bereits verwendet</string>

diff --git a/xabber/src/main/res/values-de/phrase_editor.xml b/xabber/src/main/res/values-de/phrase_editor.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--Generated by crowdin.com-->
 <resources>
-  <string name="phrase_add">Satz hinzufügen</string>
-  <string name="phrase_delete">Satz löschen</string>
-  <string name="phrase_delete_confirm">Wollen Sie folgenden Begriff wirklich löschen: %s?</string>
+  <string name="phrase_add">Ausdruck hinzufügen</string>
+  <string name="phrase_delete">Ausdruck löschen</string>
+  <string name="phrase_delete_confirm">Wollen Sie folgenden Ausdruck wirklich löschen: %s?</string>
   <string name="phrase_empty">&lt; beliebiger Text &gt;</string>
   <string name="phrase_group">Teil der Kontaktgruppe</string>
   <string name="phrase_regexp">Regulärer Ausdruck</string>

diff --git a/xabber/src/main/res/values-de/preference_editor.xml b/xabber/src/main/res/values-de/preference_editor.xml
@@ -2,7 +2,7 @@
 <!--Generated by crowdin.com-->
 <resources>
   <string name="cache_clear">Cache löschen\nAlle lokalen Daten löschen. Dadurch kann etwas Speicherplatz frei werden.</string>
-  <string name="cache_clear_warning">Wollen Sie wirklich den Chatverlauf und andere lokale Daten entfernen? \nAccount und Listendaten sind davon nicht betroffen. Die Anwendung wird geschlossen.</string>
+  <string name="cache_clear_warning">Wollen Sie wirklich den Chatverlauf und andere lokale Daten entfernen? \nKonto und Kontaktliste sind davon nicht betroffen. Die Anwendung wird geschlossen.</string>
   <string name="chats_send_by_enter">Senden mit Enter\nDurch Drücken der Enter-Taste kann die Nachricht gesendet werden</string>
   <string name="connection_go_away">Status autom. auf \"Abwesend\" ändern\nStatus automatisch auf \"Abwesend\" setzen, wenn der Bildschirm gesperrt wird</string>
   <string name="contacts_order">Kontakteliste sortieren \nFestlegen der Reihenfolge, in welcher die Kontakte angezeigt werden</string>

diff --git a/xabber/src/main/res/values-fr/account_editor.xml b/xabber/src/main/res/values-fr/account_editor.xml
@@ -13,6 +13,7 @@
   <string name="account_type">Type de compte</string>
   <string name="account_type_hints_gtalk">Identifiant gmail.com ou domaine Google Apps</string>
   <string name="account_type_helps_gtalk">Pas de compte Google ? Vous pouvez en créer un sur http://mail.google.com\nVous pouvez aussi utiliser identifiant@votredomainegoogle</string>
+  <string name="account_xmpp_register_warning">Vous devez <a href="http://www.google.com/#q=register XMPP account">enregistrer un compte XMPP</a> avant de l\'ajouter à Xabber!</string>
   <string name="account_type_helps_xmpp">Vous pouvez en apprendre plus sur XMPP (Jabber) ici : https://xmpp.org</string>
   <string name="account_user_name">Identifiant</string>
   <string name="EMPTY_SERVER_NAME">Le nom du serveur est manquant</string>

diff --git a/xabber/src/main/res/values-hu/account_editor.xml b/xabber/src/main/res/values-hu/account_editor.xml
@@ -13,6 +13,7 @@
   <string name="account_type">Fióktípus</string>
   <string name="account_type_hints_gtalk">gmail.com felhasználónév vagy Google Apps tartomány</string>
   <string name="account_type_helps_gtalk">Ha nincs Google fiókod, létrehozhatsz egyet itt: http://mail.google.com \n Vagy használhatod a felhasznaloneved@google_tartomanyod is</string>
+  <string name="account_xmpp_register_warning"><a href="http://www.google.com/#q=register XMPP account">Regisztrálj XMPP fiókot</a>, azután tudod hozzáadni a Xabberhez!</string>
   <string name="account_type_helps_xmpp">Tudj meg többet az XMPP-ről (Jabberről) itt: https://xmpp.org</string>
   <string name="account_user_name">Felhasználónév</string>
   <string name="EMPTY_SERVER_NAME">A szervernév nincs megadva</string>

diff --git a/xabber/src/main/res/values-in/account_editor.xml b/xabber/src/main/res/values-in/account_editor.xml
@@ -13,6 +13,7 @@
   <string name="account_type">Jenis akun</string>
   <string name="account_type_hints_gtalk">nama pengguna untuk gmail.com atau domain Aplikasi Google</string>
   <string name="account_type_helps_gtalk">Jika anda belum memiliki akun Google, anda dapat membuatnya di http://mail.google.com\n Anda juga dapat menggunakan nama_pengguna_anda@domain_google_anda</string>
+  <string name="account_xmpp_register_warning">Anda harus <a href="http://www.google.com/#q=register XMPP account">mendaftar akun XMPP</a> sebelum menambahkannya dalam Xabber!</string>
   <string name="account_type_helps_xmpp">Jika anda ingin mempelajari XMPP (Jabber) lebih lanjut, kunjungi: https://xmpp.org</string>
   <string name="account_user_name">Nama pengguna</string>
   <string name="EMPTY_SERVER_NAME">Nama server belum ditentukan</string>

diff --git a/xabber/src/main/res/values-it/account_editor.xml b/xabber/src/main/res/values-it/account_editor.xml
@@ -13,6 +13,7 @@
   <string name="account_type">Tipo account</string>
   <string name="account_type_hints_gtalk">username per gmail.com o per Google Apps</string>
   <string name="account_type_helps_gtalk">Se non possiedi un account Google puoi crearne uno visitando http://mail.google.com\nÈ anche possibile utilizzare  nome_utente@dominio_personale_google</string>
+  <string name="account_xmpp_register_warning">È necessario <a href="http://www.google.com/#q=register XMPP account">registrare un account XMPP</a> prima di aggiungerlo a Xabber!</string>
   <string name="account_type_helps_xmpp">Se vuoi saperne di più su XMPP (Jabber) visita https://xmpp.org</string>
   <string name="account_user_name">Nome utente</string>
   <string name="EMPTY_SERVER_NAME">Il nome del server non è stato specificato</string>