Merge branch 'release/1.0.39'

app/build.gradle

@@ -7,8 +7,8 @@ android {
     defaultConfig {
         minSdkVersion 14
         targetSdkVersion 22
-        versionCode 211
-        versionName '1.0.38'
+        versionCode 212
+        versionName '1.0.39'
     }
 
     compileOptions {

app/src/main/java/com/xabber/android/data/extension/vcard/VCardManager.java

@@ -25,6 +25,7 @@ import com.xabber.android.data.account.AccountManager;
 import com.xabber.android.data.account.OnAccountRemovedListener;
 import com.xabber.android.data.connection.ConnectionItem;
 import com.xabber.android.data.connection.ConnectionManager;
+import com.xabber.android.data.connection.ConnectionThread;
 import com.xabber.android.data.connection.OnPacketListener;
 import com.xabber.android.data.extension.avatar.AvatarManager;
 import com.xabber.android.data.roster.OnRosterChangedListener;
@@ -35,8 +36,8 @@ import com.xabber.android.data.roster.StructuredName;
 import com.xabber.xmpp.address.Jid;
 import com.xabber.xmpp.vcard.VCardProperty;
 
+import org.jivesoftware.smack.AbstractXMPPConnection;
 import org.jivesoftware.smack.SmackException;
-import org.jivesoftware.smack.XMPPConnection;
 import org.jivesoftware.smack.XMPPException;
 import org.jivesoftware.smack.packet.IQ.Type;
 import org.jivesoftware.smack.packet.Presence;
@@ -261,8 +262,14 @@ public class VCardManager implements OnLoadListener, OnPacketListener,
     private void requestVCard(final String account, final String srcUser) {
         final String user = Jid.getBareAddress(srcUser);
 
-        final XMPPConnection xmppConnection = AccountManager.getInstance().getAccount(account).getConnectionThread().getXMPPConnection();
-        final org.jivesoftware.smackx.vcardtemp.VCardManager vCardManager = org.jivesoftware.smackx.vcardtemp.VCardManager.getInstanceFor(xmppConnection);
+        ConnectionThread connectionThread = AccountManager.getInstance().getAccount(account).getConnectionThread();
+        if (connectionThread == null) {
+            onVCardFailed(account, user);
+            return;
+        }
+
+        final org.jivesoftware.smackx.vcardtemp.VCardManager vCardManager
+                = org.jivesoftware.smackx.vcardtemp.VCardManager.getInstanceFor(connectionThread.getXMPPConnection());
 
         final Thread thread = new Thread("Get vCard user " + user + " for account " + account) {
             @Override
@@ -305,7 +312,13 @@ public class VCardManager implements OnLoadListener, OnPacketListener,
     }
 
     public void saveVCard(final String account, final VCard vCard) {
-        final XMPPConnection xmppConnection = AccountManager.getInstance().getAccount(account).getConnectionThread().getXMPPConnection();
+        ConnectionThread connectionThread = AccountManager.getInstance().getAccount(account).getConnectionThread();
+        if (connectionThread == null) {
+            onVCardSaveFailed(account);
+            return;
+        }
+
+        final AbstractXMPPConnection xmppConnection = connectionThread.getXMPPConnection();
         final org.jivesoftware.smackx.vcardtemp.VCardManager vCardManager = org.jivesoftware.smackx.vcardtemp.VCardManager.getInstanceFor(xmppConnection);
 
         final Thread thread = new Thread("Save vCard for account " + account) {

app/src/main/java/com/xabber/android/ui/AccountInfoEditor.java

@@ -73,6 +73,7 @@ public class AccountInfoEditor extends ManagedActivity implements Toolbar.OnMenu
 
         toolbar.inflateMenu(SAVE_MENU);
         toolbar.setOnMenuItemClickListener(this);
+        toolbar.getMenu().findItem(R.id.action_save).setEnabled(false);
     }
 
     @Override
@@ -115,6 +116,10 @@ public class AccountInfoEditor extends ManagedActivity implements Toolbar.OnMenu
     @Override
     public void onVCardSavingFinished() {
         toolbar.setTitle(R.string.edit_account_user_info);
+    }
+
+    @Override
+    public void enableSave() {
         toolbar.getMenu().findItem(R.id.action_save).setEnabled(true);
     }
 }

app/src/main/java/com/xabber/android/ui/AccountViewer.java

@@ -9,7 +9,6 @@ import android.view.MenuItem;
 
 import com.xabber.android.R;
 import com.xabber.android.data.intent.EntityIntentBuilder;
-import com.xabber.android.data.roster.GroupManager;
 import com.xabber.xmpp.address.Jid;
 import com.xabber.xmpp.vcard.VCardProperty;
 
@@ -26,7 +25,7 @@ public class AccountViewer extends ContactViewer implements Toolbar.OnMenuItemCl
 
     public static Intent createIntent(Context context, String account) {
         return new EntityIntentBuilder(context, AccountViewer.class)
-                .setAccount(account).setUser(GroupManager.IS_ACCOUNT).build();
+                .setAccount(account).setUser(Jid.getBareAddress(account)).build();
     }
 
     @Override

app/src/main/res/values/contact_viewer.xml

@@ -52,7 +52,6 @@
     <string name="edit_account_user_info">Edit user info</string>
     <string name="account_user_info_save_success">Account user info saved successfully</string>
     <string name="account_user_info_save_fail">Could not save account user info</string>
-    <string name="account_user_info_save_started">Saving account user info…</string>
     <string name="saving">Saving…</string>
     <string name="choose_from_gallery">Choose from gallery</string>
     <string name="take_photo">Take photo</string>