Merge branch 'release/1.0.73'

Author: Grigory Fedorov

README.rst

@@ -41,6 +41,7 @@ Supported protocols
 * XEP-0136: Message Archiving
 * XEP-0224: Attention
 * XEP-0077: In-Band Registration
+* XEP-0352: Client State Indication
 
 Translations
 ============

xabber/MemorizingTrustManager

@@ -7,8 +7,8 @@ android {
     defaultConfig {
         minSdkVersion 14
         targetSdkVersion 23
-        versionCode 245
-        versionName '1.0.72'
+        versionCode 246
+        versionName '1.0.73'
     }
 
     compileOptions {

xabber/build.gradle

@@ -27,6 +27,7 @@
 import com.xabber.android.data.OnInitializedListener;
 import com.xabber.android.data.SettingsManager;
 import com.xabber.android.data.connection.ConnectionManager;
+import com.xabber.android.data.extension.csi.ClientStateManager;
 import com.xabber.android.receiver.GoAwayReceiver;
 import com.xabber.android.receiver.GoXaReceiver;
 import com.xabber.android.receiver.ScreenReceiver;
@@ -96,13 +97,19 @@ public void onScreen(Intent intent) {
             alarmManager.cancel(goAwayPendingIntent);
             alarmManager.cancel(goXaPendingIntent);
             AccountManager.getInstance().wakeUp();
+
+            // notify server(s) that client is now active
+            ClientStateManager.setActive();
         } else if (Intent.ACTION_SCREEN_OFF.equals(intent.getAction())) {
             if (goAway >= 0)
                 alarmManager.set(AlarmManager.RTC_WAKEUP, getTime(goAway),
                         goAwayPendingIntent);
             if (goXa >= 0)
                 alarmManager.set(AlarmManager.RTC_WAKEUP, getTime(goXa),
                         goXaPendingIntent);
+
+            // notify server(s) that client is now inactive
+            ClientStateManager.setInactive();
         }
     }
 

xabber/src/main/java/com/xabber/android/data/account/ScreenManager.java

@@ -37,8 +37,8 @@
 import org.jivesoftware.smack.filter.StanzaFilter;
 import org.jivesoftware.smack.packet.Stanza;
 import org.jivesoftware.smack.packet.StreamError;
+import org.jivesoftware.smack.parsing.ExceptionLoggingCallback;
 import org.jivesoftware.smack.roster.Roster;
-import org.jivesoftware.smack.roster.RosterLoadedListener;
 import org.jivesoftware.smack.sasl.provided.SASLPlainMechanism;
 import org.jivesoftware.smack.tcp.XMPPTCPConnection;
 import org.jivesoftware.smack.tcp.XMPPTCPConnectionConfiguration;
@@ -189,6 +189,7 @@ private void createConnection(String fqdn, int port, boolean useSRVLookup) {
     private void onReady(XMPPTCPConnectionConfiguration.Builder builder) {
         builder.setSecurityMode(tlsMode.getSecurityMode());
         builder.setCompressionEnabled(compression);
+        builder.setSendPresence(false);
 
         try {
             if (SettingsManager.securityCheckCertificate()) {
@@ -212,6 +213,8 @@ private void onReady(XMPPTCPConnectionConfiguration.Builder builder) {
         xmppConnection.addAsyncStanzaListener(this, ACCEPT_ALL);
         xmppConnection.addConnectionListener(this);
 
+        // by default Smack disconnects in case of parsing errors
+        xmppConnection.setParsingExceptionCallback(new ExceptionLoggingCallback());
 
         AccountRosterListener rosterListener = new AccountRosterListener(((AccountItem)connectionItem).getAccount());
         final Roster roster = Roster.getInstanceFor(xmppConnection);

xabber/src/main/java/com/xabber/android/data/connection/ConnectionThread.java

@@ -0,0 +1,50 @@
+package com.xabber.android.data.extension.csi;
+
+import com.xabber.android.data.account.AccountItem;
+import com.xabber.android.data.account.AccountManager;
+import com.xabber.android.data.connection.ConnectionThread;
+
+import org.jivesoftware.smack.SmackException;
+import org.jivesoftware.smack.XMPPConnection;
+import org.jivesoftware.smack.packet.PlainStreamElement;
+import org.jivesoftware.smackx.csi.packet.ClientStateIndication;
+
+/**
+ * Client State Indication (XEP-0352) manager
+ * @author Ricki Hirner (www.bitfire.at)
+ */
+public class ClientStateManager {
+
+    private ClientStateManager() {
+    }
+
+
+    public static void setInactive() {
+        sendClientState(ClientStateIndication.Inactive.INSTANCE);
+    }
+
+    public static void setActive() {
+        sendClientState(ClientStateIndication.Active.INSTANCE);
+    }
+
+    protected static void sendClientState(PlainStreamElement element) {
+        AccountManager accountManager = AccountManager.getInstance();
+        for (String accountName : accountManager.getAccounts()) {
+            AccountItem account = accountManager.getAccount(accountName);
+            if (account == null)
+                continue;
+            ConnectionThread connectionThread = account.getConnectionThread();
+            if (connectionThread == null)
+                continue;
+
+            XMPPConnection stream = connectionThread.getXMPPConnection();
+            if (stream.hasFeature("csi", ClientStateIndication.NAMESPACE))
+                try {
+                    stream.send(element);
+                } catch (SmackException.NotConnectedException e) {
+                    // not connected
+                }
+        }
+    }
+
+}

xabber/src/main/java/com/xabber/android/data/extension/csi/ClientStateManager.java

@@ -27,6 +27,7 @@
 import com.xabber.android.data.account.StatusMode;
 import com.xabber.android.data.connection.ConnectionItem;
 import com.xabber.android.data.connection.ConnectionManager;
+import com.xabber.android.data.connection.OnAuthorizedListener;
 import com.xabber.android.data.connection.OnDisconnectListener;
 import com.xabber.android.data.connection.OnPacketListener;
 import com.xabber.android.data.extension.archive.OnArchiveModificationsReceivedListener;
@@ -53,7 +54,7 @@
  * @author alexander.ivanov
  */
 public class PresenceManager implements OnArchiveModificationsReceivedListener,
-        OnLoadListener, OnAccountDisabledListener, OnDisconnectListener, OnPacketListener {
+        OnLoadListener, OnAccountDisabledListener, OnDisconnectListener, OnPacketListener, OnAuthorizedListener {
 
     private final static PresenceManager instance;
 
@@ -257,8 +258,6 @@ public void resendPresence(String account) throws NetworkException {
     }
 
     public void sendVCardUpdatePresence(String account, String hash) throws NetworkException {
-        if (!readyAccounts.contains(account))
-            throw new NetworkException(R.string.NOT_CONNECTED);
         final Presence presence = AccountManager.getInstance().getAccount(account).getPresence();
 
         final VCardUpdate vCardUpdate = new VCardUpdate();
@@ -295,4 +294,17 @@ public void onPacket(ConnectionItem connection, String bareAddress, Stanza stanz
             }
         }
     }
+
+    @Override
+    public void onAuthorized(ConnectionItem connection) {
+        if (!(connection instanceof AccountItem)) {
+            return;
+        }
+
+        try {
+            resendPresence(((AccountItem) connection).getAccount());
+        } catch (NetworkException e) {
+            e.printStackTrace();
+        }
+    }
 }

xabber/src/main/java/com/xabber/android/data/roster/PresenceManager.java

@@ -12,7 +12,7 @@
         >
 
 
-        <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        <LinearLayout
             android:orientation="horizontal"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -65,7 +65,7 @@
             </LinearLayout>
         </LinearLayout>
 
-        <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        <LinearLayout
             android:orientation="horizontal"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -117,7 +117,7 @@
             </LinearLayout>
         </LinearLayout>
 
-        <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        <LinearLayout
             android:orientation="horizontal"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -171,7 +171,7 @@
             </LinearLayout>
         </LinearLayout>
 
-        <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        <LinearLayout
             android:orientation="horizontal"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -225,7 +225,7 @@
             </LinearLayout>
         </LinearLayout>
 
-        <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        <LinearLayout
             android:orientation="horizontal"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"

xabber/src/main/res/layout/fragment_conference_info.xml

@@ -55,6 +55,7 @@
   <string name="show_offline_never">Nikdy nezobrazovat</string>
   <string name="show_offline_normal">Obecné nastavení</string>
   <string name="show_offline_settings">Zobrazovat odpojené kontakty</string>
+  <string name="start_at_boot">Spustit při startu</string>
   <string name="start_at_boot_suggest">Přejete si spustit při startu Xabber? \nLze změnit v \"Nastavení\" → \"Nastavení připojení\" → \"Start při spouštění Android\"</string>
   <string name="contact_search_hint">Prohledávat kontakty</string>
   <string name="sender_is_you">Vy</string>
@@ -69,4 +70,8 @@
   <string name="unblock_all_contacts_confirm">Opravdu chcete odblokovat všechny kontakty z účtu %1$s?</string>
   <string name="unblock_all">Odblokovat vše</string>
   <string name="unblock_selected">Odblokovat vybrané</string>
+  <string name="dark_theme_suggest_dialog_title">Vyber si svůj úděl</string>
+  <string name="dark_theme_suggest_dialog_message">Nové tmavé téma je nyní k dispozici pro Xabber. Dokážete odolat pokušení ji používat?</string>
+  <string name="dark_theme_suggest_dialog_join_dark_side">Připojte se k Temné straně</string>
+  <string name="dark_theme_suggest_dialog_stay_on_light_side">"Zůstat na Světlé straně"</string>
 </resources>

xabber/src/main/res/values-cs-rCZ/contact_list.xml

@@ -55,6 +55,7 @@
   <string name="show_offline_never">Niemals anzeigen</string>
   <string name="show_offline_normal">Globale Einstellungen benutzen</string>
   <string name="show_offline_settings">Offline Kontakte anzeigen</string>
+  <string name="start_at_boot">Beim Start ausführen</string>
   <string name="start_at_boot_suggest">Xabber beim Start von Android starten?\nDies kann unter \"Einstellungen\" → \"Verbindungseinstellungen\" → \"Mit Android starten\" geändert werden.</string>
   <string name="contact_search_hint">Kontakte suchen</string>
   <string name="sender_is_you">Ich</string>
@@ -69,4 +70,8 @@
   <string name="unblock_all_contacts_confirm">Wollen Sie wirklich alle Kontakte von %1$s Konto entsperren?</string>
   <string name="unblock_all">Alle entsperren</string>
   <string name="unblock_selected">Ausgewählte entsperren</string>
+  <string name="dark_theme_suggest_dialog_title">Wählen Sie Ihr Schicksal</string>
+  <string name="dark_theme_suggest_dialog_message">Das neue Dark-Theme ist jetzt verfügbar für Jabber. Können Sie der Versuchung widerstehen es zu benutzen?</string>
+  <string name="dark_theme_suggest_dialog_join_dark_side">Der dunklen Seite anschließen</string>
+  <string name="dark_theme_suggest_dialog_stay_on_light_side">"Auf der hellen Seite bleiben"</string>
 </resources>