New ContactEditor activity, extends ContactViewer. Contains edit groups and alias methods.

app/src/main/AndroidManifest.xml

@@ -236,6 +236,17 @@
             </intent-filter>
         </activity>
 
+        <activity
+            android:label="@string/contact_viewer"
+            android:name="com.xabber.android.ui.ContactEditor"
+            android:parentActivityName="com.xabber.android.ui.ChatViewer"
+            >
+            <!-- Parent activity meta-data to support 4.0 and lower -->
+            <meta-data
+                android:name="android.support.PARENT_ACTIVITY"
+                android:value="com.xabber.android.ui.ChatViewer" />
+        </activity>
+
         <activity
             android:name="com.xabber.android.ui.FingerprintViewer"
             android:label="@string/otr_verify_fingerprint"

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

@@ -294,7 +294,7 @@ public class ChatViewer extends ManagedActivity implements OnChatChangedListener
 
         switch (item.getItemId()) {
             case R.id.action_view_contact:
-                startActivity(ContactViewer.createIntent(this, account, user));
+                showContactInfo();
                 return true;
 
             case R.id.action_chat_list:
@@ -424,8 +424,7 @@ public class ChatViewer extends ManagedActivity implements OnChatChangedListener
         return ACTION_ATTENTION.equals(intent.getAction());
     }
 
-    public static Intent createIntent(Context context, String account,
-                                      String user) {
+    public static Intent createIntent(Context context, String account, String user) {
         return new EntityIntentBuilder(context, ChatViewer.class).setAccount(account).setUser(user).build();
     }
 
@@ -433,8 +432,7 @@ public class ChatViewer extends ManagedActivity implements OnChatChangedListener
         return new EntityIntentBuilder(context, ChatViewer.class).build();
     }
 
-    public static Intent createClearTopIntent(Context context, String account,
-                                              String user) {
+    public static Intent createClearTopIntent(Context context, String account, String user) {
         Intent intent = createIntent(context, account, user);
         intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
         return intent;
@@ -452,24 +450,21 @@ public class ChatViewer extends ManagedActivity implements OnChatChangedListener
      *                of messages. Else only one message can be send.
      * @return
      */
-    public static Intent createSendIntent(Context context, String account,
-                                          String user, String text) {
+    public static Intent createSendIntent(Context context, String account, String user, String text) {
         Intent intent = ChatViewer.createIntent(context, account, user);
         intent.setAction(Intent.ACTION_SEND);
         intent.putExtra(Intent.EXTRA_TEXT, text);
         return intent;
     }
 
-    public static Intent createAttentionRequestIntent(Context context,
-                                                      String account, String user) {
+    public static Intent createAttentionRequestIntent(Context context, String account, String user) {
         Intent intent = ChatViewer.createClearTopIntent(context, account, user);
         intent.setAction(ACTION_ATTENTION);
         return intent;
     }
 
     @Override
-    public void onChatChanged(final String account, final String user,
-                              final boolean incoming) {
+    public void onChatChanged(final String account, final String user, final boolean incoming) {
 
         String currentAccount = null;
         String currentUser = null;
@@ -716,7 +711,15 @@ public class ChatViewer extends ManagedActivity implements OnChatChangedListener
     @Override
     public void onClick(View v) {
         if (v.getId() == R.id.avatar) {
+            showContactInfo();
+        }
+    }
+
+    private void showContactInfo() {
+        if (MUCManager.getInstance().hasRoom(actionWithAccount, actionWithUser)) {
             startActivity(ContactViewer.createIntent(this, actionWithAccount, actionWithUser));
+        } else {
+            startActivity(ContactEditor.createIntent(this, actionWithAccount, actionWithUser));
         }
     }
 }

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

+package com.xabber.android.ui;
+
+import android.app.AlertDialog;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.text.InputType;
+import android.view.Menu;
+import android.view.MenuItem;
+import android.widget.EditText;
+
+import com.xabber.android.data.Application;
+import com.xabber.android.data.NetworkException;
+import com.xabber.android.data.intent.EntityIntentBuilder;
+import com.xabber.android.data.roster.RosterContact;
+import com.xabber.android.data.roster.RosterManager;
+import com.xabber.android.ui.dialog.ContactDeleteDialogFragment;
+import com.xabber.androiddev.R;
+
+public class ContactEditor extends ContactViewer {
+
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        getMenuInflater().inflate(R.menu.contact_viewer, menu);
+        return true;
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        switch (item.getItemId()) {
+            case R.id.action_edit_alias:
+                editAlias();
+                return true;
+
+            case R.id.action_edit_groups:
+                startActivity(GroupEditor.createIntent(this, getAccount(), getBareAddress()));
+                return true;
+
+            case R.id.action_remove_contact:
+                ContactDeleteDialogFragment.newInstance(getAccount(), getBareAddress())
+                        .show(getFragmentManager(), "CONTACT_DELETE");
+                return true;
+
+            default:
+                return super.onOptionsItemSelected(item);
+        }
+    }
+
+    private void editAlias() {
+        AlertDialog.Builder builder = new AlertDialog.Builder(this);
+        builder.setTitle(R.string.edit_alias);
+
+        final EditText input = new EditText(this);
+        input.setInputType(InputType.TYPE_TEXT_VARIATION_PERSON_NAME);
+
+        RosterContact rosterContact = RosterManager.getInstance().getRosterContact(getAccount(), getBareAddress());
+        input.setText(rosterContact.getName());
+        builder.setView(input);
+
+        builder.setPositiveButton(R.string.ok, new DialogInterface.OnClickListener() {
+            @Override
+            public void onClick(DialogInterface dialog, int which) {
+                try {
+                    RosterManager.getInstance().setName(getAccount(), getBareAddress(), input.getText().toString());
+                } catch (NetworkException e) {
+                    Application.getInstance().onError(e);
+                }
+            }
+        });
+        builder.setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() {
+            @Override
+            public void onClick(DialogInterface dialog, int which) {
+                dialog.cancel();
+            }
+        });
+
+        builder.show();
+    }
+
+    public static Intent createIntent(Context context, String account, String user) {
+        return new EntityIntentBuilder(context, ContactEditor.class)
+                .setAccount(account).setUser(user).build();
+    }
+}

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

@@ -14,27 +14,18 @@
  */
 package com.xabber.android.ui;
 
-import android.app.AlertDialog;
 import android.content.Context;
-import android.content.DialogInterface;
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
-import android.text.InputType;
-import android.view.Menu;
-import android.view.MenuInflater;
-import android.view.MenuItem;
 import android.view.View;
-import android.widget.EditText;
 import android.widget.TextView;
 
 import com.xabber.android.data.Application;
 import com.xabber.android.data.LogManager;
-import com.xabber.android.data.NetworkException;
 import com.xabber.android.data.account.AccountManager;
 import com.xabber.android.data.account.OnAccountChangedListener;
 import com.xabber.android.data.entity.BaseEntity;
-import com.xabber.android.data.extension.muc.MUCManager;
 import com.xabber.android.data.extension.vcard.OnVCardListener;
 import com.xabber.android.data.extension.vcard.VCardManager;
 import com.xabber.android.data.intent.AccountIntentBuilder;
@@ -44,7 +35,6 @@ import com.xabber.android.data.roster.GroupManager;
 import com.xabber.android.data.roster.OnContactChangedListener;
 import com.xabber.android.data.roster.RosterContact;
 import com.xabber.android.data.roster.RosterManager;
-import com.xabber.android.ui.dialog.ContactDeleteDialogFragment;
 import com.xabber.android.ui.helper.ContactTitleExpandableToolbarInflater;
 import com.xabber.android.ui.helper.ManagedActivity;
 import com.xabber.androiddev.R;
@@ -73,9 +63,6 @@ public class ContactViewer extends ManagedActivity implements
     private ContactTitleExpandableToolbarInflater contactTitleExpandableToolbarInflater;
     private TextView contactNameView;
 
-
-    private boolean isAccount = false;
-
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -109,7 +96,6 @@ public class ContactViewer extends ManagedActivity implements
         }
 
         if (bareAddress != null && bareAddress.equalsIgnoreCase(GroupManager.IS_ACCOUNT)) {
-            isAccount = true;
             bareAddress = Jid.getBareAddress(AccountManager.getInstance().getAccount(account).getRealJid());
         }
 
@@ -178,75 +164,6 @@ public class ContactViewer extends ManagedActivity implements
         contactViewerFragment.updateVCard(vCard);
     }
 
-    @Override
-    public boolean onCreateOptionsMenu(Menu menu) {
-        if (isAccount || MUCManager.getInstance().hasRoom(account, bareAddress)) {
-            return true;
-        }
-
-        MenuInflater inflater = getMenuInflater();
-        inflater.inflate(R.menu.contact_viewer, menu);
-
-        RosterContact rosterContact = RosterManager.getInstance().getRosterContact(account, bareAddress);
-        if (rosterContact == null) {
-            menu.findItem(R.id.action_edit_alias).setVisible(false);
-        }
-
-        return true;
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-        switch (item.getItemId()) {
-            case R.id.action_edit_alias:
-                editAlias();
-                return true;
-
-            case R.id.action_edit_groups:
-                startActivity(GroupEditor.createIntent(this, account, bareAddress));
-                return true;
-
-            case R.id.action_remove_contact:
-                ContactDeleteDialogFragment.newInstance(account, bareAddress)
-                        .show(getFragmentManager(), "CONTACT_DELETE");
-                return true;
-
-            default:
-                return super.onOptionsItemSelected(item);
-        }
-    }
-
-    private void editAlias() {
-        AlertDialog.Builder builder = new AlertDialog.Builder(this);
-        builder.setTitle(R.string.edit_alias);
-
-        final EditText input = new EditText(this);
-        input.setInputType(InputType.TYPE_TEXT_VARIATION_PERSON_NAME);
-
-        RosterContact rosterContact = RosterManager.getInstance().getRosterContact(account, bareAddress);
-        input.setText(rosterContact.getName());
-        builder.setView(input);
-
-        builder.setPositiveButton(R.string.ok, new DialogInterface.OnClickListener() {
-            @Override
-            public void onClick(DialogInterface dialog, int which) {
-                try {
-                    RosterManager.getInstance().setName(account, bareAddress, input.getText().toString());
-                } catch (NetworkException e) {
-                    Application.getInstance().onError(e);
-                }
-            }
-        });
-        builder.setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() {
-            @Override
-            public void onClick(DialogInterface dialog, int which) {
-                dialog.cancel();
-            }
-        });
-
-        builder.show();
-    }
-
     private ContactVcardViewerFragment getFragment() {
         return (ContactVcardViewerFragment) getFragmentManager().findFragmentById(R.id.scrollable_container);
     }
@@ -320,4 +237,12 @@ public class ContactViewer extends ManagedActivity implements
     private static String getUser(Intent intent) {
         return EntityIntentBuilder.getUser(intent);
     }
+
+    protected String getAccount() {
+        return account;
+    }
+
+    protected String getBareAddress() {
+        return bareAddress;
+    }
 }

app/src/main/java/com/xabber/android/ui/adapter/GroupedContactAdapter.java

@@ -25,7 +25,6 @@ import android.widget.BaseAdapter;
 import android.widget.ImageView;
 import android.widget.TextView;
 
-import com.xabber.android.data.Application;
 import com.xabber.android.data.SettingsManager;
 import com.xabber.android.data.account.AccountItem;
 import com.xabber.android.data.account.AccountManager;
@@ -33,11 +32,13 @@ import com.xabber.android.data.account.StatusMode;
 import com.xabber.android.data.entity.BaseEntity;
 import com.xabber.android.data.extension.avatar.AvatarManager;
 import com.xabber.android.data.extension.capability.ClientSoftware;
+import com.xabber.android.data.extension.muc.MUCManager;
 import com.xabber.android.data.message.MessageManager;
 import com.xabber.android.data.roster.AbstractContact;
 import com.xabber.android.data.roster.Group;
 import com.xabber.android.data.roster.GroupManager;
 import com.xabber.android.data.roster.ShowOfflineMode;
+import com.xabber.android.ui.ContactEditor;
 import com.xabber.android.ui.ContactViewer;
 import com.xabber.androiddev.R;
 
@@ -382,8 +383,13 @@ public abstract class GroupedContactAdapter extends BaseAdapter implements Updat
         viewHolder.avatar.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                activity.startActivity(ContactViewer.createIntent(activity,
-                        abstractContact.getAccount(), abstractContact.getUser()));
+                if (MUCManager.getInstance().hasRoom(abstractContact.getAccount(), abstractContact.getUser())) {
+                    activity.startActivity(ContactViewer.createIntent(activity,
+                            abstractContact.getAccount(), abstractContact.getUser()));
+                } else {
+                    activity.startActivity(ContactEditor.createIntent(activity,
+                            abstractContact.getAccount(), abstractContact.getUser()));
+                }
             }
         });
 
@@ -410,9 +416,9 @@ public abstract class GroupedContactAdapter extends BaseAdapter implements Updat
         viewHolder.statusMode.setImageLevel(abstractContact.getStatusMode().getStatusLevel());
 
         ClientSoftware clientSoftware = abstractContact.getClientSoftware();
-        if (clientSoftware == ClientSoftware.unknown)
+        if (clientSoftware == ClientSoftware.unknown) {
             viewHolder.clientSoftware.setVisibility(View.INVISIBLE);
-        else {
+        } else {
             viewHolder.clientSoftware.setVisibility(View.VISIBLE);
             viewHolder.clientSoftware.setImageLevel(clientSoftware.ordinal());
         }

app/src/main/java/com/xabber/android/ui/helper/ContextMenuHelper.java

@@ -38,6 +38,7 @@ import com.xabber.android.data.roster.PresenceManager;
 import com.xabber.android.data.roster.ShowOfflineMode;
 import com.xabber.android.ui.ChatViewer;
 import com.xabber.android.ui.ContactAdd;
+import com.xabber.android.ui.ContactEditor;
 import com.xabber.android.ui.ContactViewer;
 import com.xabber.android.ui.GroupEditor;
 import com.xabber.android.ui.MUCEditor;
@@ -91,7 +92,7 @@ public class ContextMenuHelper {
                             return true;
                         }
                     });
-            if (MUCManager.getInstance().isDisabled(account, user))
+            if (MUCManager.getInstance().isDisabled(account, user)) {
                 menu.add(R.string.muc_join).setOnMenuItemClickListener(
                         new MenuItem.OnMenuItemClickListener() {
                             @Override
@@ -101,7 +102,7 @@ public class ContextMenuHelper {
                                 return true;
                             }
                         });
-            else
+            } else {
                 menu.add(R.string.muc_leave).setOnMenuItemClickListener(
                         new MenuItem.OnMenuItemClickListener() {
 
@@ -119,9 +120,10 @@ public class ContextMenuHelper {
                             }
 
                         });
+            }
         } else {
             menu.add(R.string.contact_viewer).setIntent(
-                    ContactViewer.createIntent(activity, account, user));
+                    ContactEditor.createIntent(activity, account, user));
             menu.add(R.string.edit_contact_groups).setIntent(
                     GroupEditor.createIntent(activity, account, user));
 
@@ -137,7 +139,7 @@ public class ContextMenuHelper {
                         }
 
                     });
-            if (MessageManager.getInstance().hasActiveChat(account, user))
+            if (MessageManager.getInstance().hasActiveChat(account, user)) {
                 menu.add(R.string.close_chat).setOnMenuItemClickListener(
                         new MenuItem.OnMenuItemClickListener() {
 
@@ -153,7 +155,8 @@ public class ContextMenuHelper {
                             }
 
                         });
-            if (abstractContact.getStatusMode() == StatusMode.unsubscribed)
+            }
+            if (abstractContact.getStatusMode() == StatusMode.unsubscribed) {
                 menu.add(R.string.request_subscription)
                         .setOnMenuItemClickListener(
                                 new MenuItem.OnMenuItemClickListener() {
@@ -172,6 +175,7 @@ public class ContextMenuHelper {
                                     }
 
                                 });
+            }
         }
         if (PresenceManager.getInstance().hasSubscriptionRequest(account, user)) {
             menu.add(R.string.accept_subscription).setOnMenuItemClickListener(