From 983c37d77cfe9daf800b9e44012b24061183f363 Mon Sep 17 00:00:00 2001
From: Valery Miller <valera_miller94@mail.ru>
Date: Fri, 3 Aug 2018 12:03:18 +0500
Subject: [PATCH 001/251] Start work on new auth

---
 .../android/ui/activity/IntroActivity.java    |  8 ++++----
 .../android/ui/activity/TutorialActivity.java | 16 +++++++--------
 .../main/res/layout-land/activity_intro.xml   |  8 ++++----
 xabber/src/main/res/layout/activity_intro.xml |  8 ++++----
 .../src/main/res/layout/activity_tutorial.xml | 20 +++++++++----------
 xabber/src/main/res/values/contact_list.xml   |  2 ++
 6 files changed, 32 insertions(+), 30 deletions(-)

diff --git a/xabber/src/main/java/com/xabber/android/ui/activity/IntroActivity.java b/xabber/src/main/java/com/xabber/android/ui/activity/IntroActivity.java
index 0ba2112214..3d56ceb7d1 100644
--- a/xabber/src/main/java/com/xabber/android/ui/activity/IntroActivity.java
+++ b/xabber/src/main/java/com/xabber/android/ui/activity/IntroActivity.java
@@ -35,17 +35,17 @@ protected void onCreate(Bundle savedInstanceState) {
 //        ((TextView) findViewById(R.id.intro_faq_text))
 //                .setMovementMethod(LinkMovementMethod.getInstance());
 
-        Button btnBasicXmpp = (Button) findViewById(R.id.btnBasicXmpp);
-        Button btnLoginXabber = (Button) findViewById(R.id.btnLoginXabber);
+        Button btnSignIn = (Button) findViewById(R.id.btnSignIn);
+        Button btnSignUp = (Button) findViewById(R.id.btnSignUp);
 
-        btnLoginXabber.setOnClickListener(new View.OnClickListener() {
+        btnSignUp.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
                 startActivity(TutorialActivity.createIntent(IntroActivity.this));
             }
         });
 
-        btnBasicXmpp.setOnClickListener(new View.OnClickListener() {
+        btnSignIn.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
                 startActivity(AccountAddActivity.createIntent(IntroActivity.this));
diff --git a/xabber/src/main/java/com/xabber/android/ui/activity/TutorialActivity.java b/xabber/src/main/java/com/xabber/android/ui/activity/TutorialActivity.java
index dc0c0a8d68..69ed30798f 100644
--- a/xabber/src/main/java/com/xabber/android/ui/activity/TutorialActivity.java
+++ b/xabber/src/main/java/com/xabber/android/ui/activity/TutorialActivity.java
@@ -21,7 +21,7 @@
 
 public class TutorialActivity extends AppCompatActivity {
 
-    private Button btnLogin;
+    //private Button btnLogin;
     private Button btnRegister;
 
     public static Intent createIntent(Context context) {
@@ -44,13 +44,13 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
         CircleIndicator indicator = (CircleIndicator) findViewById(R.id.indicator);
         indicator.setViewPager(viewPager);
 
-        btnLogin = (Button) findViewById(R.id.btnLogin);
-        btnLogin.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                startActivity(XabberLoginActivity.createIntent(TutorialActivity.this));
-            }
-        });
+//        btnLogin = (Button) findViewById(R.id.btnLogin);
+//        btnLogin.setOnClickListener(new View.OnClickListener() {
+//            @Override
+//            public void onClick(View v) {
+//                startActivity(XabberLoginActivity.createIntent(TutorialActivity.this));
+//            }
+//        });
 
         btnRegister = (Button) findViewById(R.id.btnRegister);
         btnRegister.setOnClickListener(new View.OnClickListener() {
diff --git a/xabber/src/main/res/layout-land/activity_intro.xml b/xabber/src/main/res/layout-land/activity_intro.xml
index 2fe60de1e1..f38b04edbb 100644
--- a/xabber/src/main/res/layout-land/activity_intro.xml
+++ b/xabber/src/main/res/layout-land/activity_intro.xml
@@ -53,11 +53,11 @@
                 />
 
             <Button
-                android:id="@+id/btnLoginXabber"
+                android:id="@+id/btnSignIn"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
 
-                android:text="@string/intro_create_xabber_account"
+                android:text="@string/intro_signin"
                 android:textColor="@color/white"
                 style="@style/Widget.AppCompat.Button.Colored"
                 android:theme="@style/BlueButton"
@@ -65,13 +65,13 @@
                 />
 
             <Button
-                android:id="@+id/btnBasicXmpp"
+                android:id="@+id/btnSignUp"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 style="@style/Widget.AppCompat.Button.Borderless"
                 android:theme="@style/BlueButton"
                 android:textColor="@color/account_register_blue"
-                android:text="@string/login_without_xabber_account"
+                android:text="@string/intro_signup"
                 android:layout_gravity="center_horizontal"
                 />
 
diff --git a/xabber/src/main/res/layout/activity_intro.xml b/xabber/src/main/res/layout/activity_intro.xml
index 857a39775b..11072c9000 100644
--- a/xabber/src/main/res/layout/activity_intro.xml
+++ b/xabber/src/main/res/layout/activity_intro.xml
@@ -69,23 +69,23 @@
             />
 
         <Button
-            android:id="@+id/btnLoginXabber"
+            android:id="@+id/btnSignIn"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:text="@string/intro_create_xabber_account"
+            android:text="@string/intro_signin"
             android:textColor="@color/white"
             style="@style/Widget.AppCompat.Button.Colored"
             android:theme="@style/BlueButton"
             />
 
         <Button
-            android:id="@+id/btnBasicXmpp"
+            android:id="@+id/btnSignUp"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             style="@style/Widget.AppCompat.Button.Borderless"
             android:theme="@style/BlueButton"
             android:textColor="@color/account_register_blue"
-            android:text="@string/login_without_xabber_account"
+            android:text="@string/intro_signup"
             />
 
     </LinearLayout>
diff --git a/xabber/src/main/res/layout/activity_tutorial.xml b/xabber/src/main/res/layout/activity_tutorial.xml
index 5ae6061e2f..8bece288b3 100644
--- a/xabber/src/main/res/layout/activity_tutorial.xml
+++ b/xabber/src/main/res/layout/activity_tutorial.xml
@@ -29,16 +29,16 @@
         android:layout_alignParentBottom="true"
         >
 
-        <Button
-            android:id="@+id/btnLogin"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            style="@style/Widget.AppCompat.Button.Borderless"
-            android:theme="@style/BlueButton"
-            android:textColor="@color/account_register_blue"
-            android:text="@string/button_login"
-            android:layout_weight="1"
-            />
+        <!--<Button-->
+            <!--android:id="@+id/btnLogin"-->
+            <!--android:layout_width="match_parent"-->
+            <!--android:layout_height="wrap_content"-->
+            <!--style="@style/Widget.AppCompat.Button.Borderless"-->
+            <!--android:theme="@style/BlueButton"-->
+            <!--android:textColor="@color/account_register_blue"-->
+            <!--android:text="@string/button_login"-->
+            <!--android:layout_weight="1"-->
+            <!--/>-->
 
         <Button
             android:id="@+id/btnRegister"
diff --git a/xabber/src/main/res/values/contact_list.xml b/xabber/src/main/res/values/contact_list.xml
index 9c1d01ada0..29f3327909 100644
--- a/xabber/src/main/res/values/contact_list.xml
+++ b/xabber/src/main/res/values/contact_list.xml
@@ -91,6 +91,8 @@
 
     <string name="intro_welcome">Welcome to Xabber</string>
     <string name="intro_xabber_description">Open source XMPP client for Android</string>
+    <string name="intro_signin">Sign In</string>
+    <string name="intro_signup">Sign Up</string>
     <string name="intro_have_account">XMPP login</string>
     <string name="intro_register_account">Register XMPP account</string>
     <string name="intro_create_xabber_account">Use Xabber Account</string>

From 80d868730f620724e14f3a8cba01d83aaffcc3d6 Mon Sep 17 00:00:00 2001
From: Valery Miller <valera_miller94@mail.ru>
Date: Fri, 3 Aug 2018 14:38:06 +0500
Subject: [PATCH 002/251] Added new sign up screen

---
 .../activity/XabberAccountInfoActivity.java   |   3 +-
 .../ui/fragment/XAccountSignUpFragment.java   | 112 ++++++++++++++++++
 .../res/layout/fragment_xaccount_signup.xml   |  89 ++++++++++++++
 3 files changed, 203 insertions(+), 1 deletion(-)
 create mode 100644 xabber/src/main/java/com/xabber/android/ui/fragment/XAccountSignUpFragment.java
 create mode 100644 xabber/src/main/res/layout/fragment_xaccount_signup.xml

diff --git a/xabber/src/main/java/com/xabber/android/ui/activity/XabberAccountInfoActivity.java b/xabber/src/main/java/com/xabber/android/ui/activity/XabberAccountInfoActivity.java
index 40a0b7a452..4a0cf8c5ab 100644
--- a/xabber/src/main/java/com/xabber/android/ui/activity/XabberAccountInfoActivity.java
+++ b/xabber/src/main/java/com/xabber/android/ui/activity/XabberAccountInfoActivity.java
@@ -29,6 +29,7 @@
 import com.xabber.android.data.xaccount.XabberAccount;
 import com.xabber.android.data.xaccount.XabberAccountManager;
 import com.xabber.android.ui.color.BarPainter;
+import com.xabber.android.ui.fragment.XAccountSignUpFragment;
 import com.xabber.android.ui.fragment.XabberAccountCompleteRegsiterFrament;
 import com.xabber.android.ui.fragment.XabberAccountConfirmPhoneFragment;
 import com.xabber.android.ui.fragment.XabberAccountConfirmationFragment;
@@ -244,7 +245,7 @@ private void updateLastSyncTime() {
 
     public void showLoginFragment() {
         if (fragmentLogin == null)
-            fragmentLogin = new XabberAccountLoginFragment();
+            fragmentLogin = new XAccountSignUpFragment();
 
         fTrans = getFragmentManager().beginTransaction();
         fTrans.replace(R.id.container, fragmentLogin, FRAGMENT_LOGIN);
diff --git a/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountSignUpFragment.java b/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountSignUpFragment.java
new file mode 100644
index 0000000000..cd77a5c3e4
--- /dev/null
+++ b/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountSignUpFragment.java
@@ -0,0 +1,112 @@
+package com.xabber.android.ui.fragment;
+
+import android.app.Fragment;
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ArrayAdapter;
+import android.widget.Button;
+import android.widget.EditText;
+import android.widget.Spinner;
+
+import com.xabber.android.R;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class XAccountSignUpFragment extends Fragment implements View.OnClickListener {
+
+    private EditText edtUsername;
+    private EditText edtPass;
+    private Spinner spinnerDomain;
+    private Button btnSignUp;
+
+    @Nullable
+    @Override
+    public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, Bundle savedInstanceState) {
+        return inflater.inflate(R.layout.fragment_xaccount_signup, container, false);
+    }
+
+    @Override
+    public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+
+        edtUsername = view.findViewById(R.id.edtUsername);
+        edtPass = view.findViewById(R.id.edtPass);
+        spinnerDomain = view.findViewById(R.id.spinnerDomain);
+        btnSignUp = view.findViewById(R.id.btnSignUp);
+
+        btnSignUp.setOnClickListener(this);
+
+        List<String> domains = new ArrayList<>();
+        domains.add("@xabber.org");
+        domains.add("@xabber.com");
+        domains.add("@xabber.ru");
+        setupSpinner(domains);
+    }
+
+    @Override
+    public void onClick(View v) {
+        switch (v.getId()) {
+            case R.id.btnSignUp:
+                onSignUpClick();
+                break;
+        }
+    }
+
+    private void onSignUpClick() {
+        if (verifyFields()) {
+            // TODO: 03.08.18 call API
+        }
+    }
+
+    private boolean verifyFields() {
+        String username = edtUsername.getText().toString().trim();
+        String pass = edtPass.getText().toString().trim();
+
+        if (username.isEmpty()) {
+            edtUsername.setError(getString(R.string.empty_field));
+            return false;
+        }
+
+        // Username can contain only latin letters, numbers and dots
+        if (!username.matches("[a-z0-9.]+")) {
+            edtUsername.setError(getString(R.string.username_rules));
+            return false;
+        }
+
+        // Username must start with letter
+        if (!username.substring(0, 1).matches("[a-z]")) {
+            edtUsername.setError(getString(R.string.username_rules_first_symbol));
+            return false;
+        }
+
+        // Username cannot have two dots in a row
+        if (username.contains("..")) {
+            edtUsername.setError(getString(R.string.username_rules_dots));
+            return false;
+        }
+
+        if (pass.isEmpty()) {
+            edtPass.setError(getString(R.string.empty_field));
+            return false;
+        }
+
+        if (pass.length() < 4) {
+            edtPass.setError(getString(R.string.pass_too_short));
+            return false;
+        }
+
+        return true;
+    }
+
+    private void setupSpinner(List<String> domains) {
+        if (spinnerDomain == null) return;
+        ArrayAdapter<String> adapter = new ArrayAdapter<>(getActivity(),
+                android.R.layout.simple_spinner_item, domains);
+        adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
+        spinnerDomain.setAdapter(adapter);
+    }
+}
diff --git a/xabber/src/main/res/layout/fragment_xaccount_signup.xml b/xabber/src/main/res/layout/fragment_xaccount_signup.xml
new file mode 100644
index 0000000000..f47aa974a3
--- /dev/null
+++ b/xabber/src/main/res/layout/fragment_xaccount_signup.xml
@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        android:layout_centerInParent="true"
+        android:layout_marginLeft="32dp"
+        android:layout_marginRight="32dp"
+        >
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="16dp"
+            android:paddingLeft="4dp"
+            android:textColor="@color/black_text_secondary"
+            android:text="@string/label_username"
+            />
+
+        <LinearLayout
+            android:orientation="horizontal"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            >
+
+            <EditText
+                android:id="@+id/edtUsername"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:imeOptions="actionNext"
+                android:nextFocusForward="@+id/edtPass"
+                android:singleLine="true"
+                android:hint="@string/hint_username"
+                android:textSize="16sp"
+                android:theme="@style/Theme"
+                android:layout_weight="1"
+
+                />
+
+            <Spinner
+                android:id="@+id/spinnerDomain"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                />
+
+        </LinearLayout>
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:paddingLeft="4dp"
+            android:layout_marginTop="16dp"
+            android:textColor="@color/black_text_secondary"
+            android:text="@string/label_pass"
+            />
+
+        <EditText
+            android:id="@+id/edtPass"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:imeOptions="actionNext"
+            android:singleLine="true"
+            android:textSize="16sp"
+            android:theme="@style/Theme"
+            android:hint="@string/hint_pass"
+            android:inputType="textPassword"
+            />
+
+        <Button
+            android:id="@+id/btnSignUp"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="8dp"
+            style="@style/Widget.AppCompat.Button.Colored"
+            android:theme="@style/BlueButton"
+            android:paddingRight="18dp"
+            android:paddingLeft="18dp"
+            android:textColor="@color/white"
+            android:text="@string/button_complete_registration"
+            />
+
+    </LinearLayout>
+
+
+</RelativeLayout>
\ No newline at end of file

From d2b7642c50651e3484df081e6d4808acf711005f Mon Sep 17 00:00:00 2001
From: Valery Miller <valera_miller94@mail.ru>
Date: Fri, 3 Aug 2018 16:42:10 +0500
Subject: [PATCH 003/251] Added XAccountXMPPAuthFragment

---
 .../activity/XabberAccountInfoActivity.java   | 36 ++++++++--
 .../ui/adapter/XMPPAccountAuthAdapter.java    | 71 +++++++++++++++++++
 .../ui/fragment/XAccountXMPPAuthFragment.java | 46 ++++++++++++
 .../layout/fragment_xaccount_xmpp_auth.xml    | 37 ++++++++++
 .../res/layout/item_xmpp_account_choose.xml   | 41 +++++++++++
 5 files changed, 227 insertions(+), 4 deletions(-)
 create mode 100644 xabber/src/main/java/com/xabber/android/ui/adapter/XMPPAccountAuthAdapter.java
 create mode 100644 xabber/src/main/java/com/xabber/android/ui/fragment/XAccountXMPPAuthFragment.java
 create mode 100644 xabber/src/main/res/layout/fragment_xaccount_xmpp_auth.xml
 create mode 100644 xabber/src/main/res/layout/item_xmpp_account_choose.xml

diff --git a/xabber/src/main/java/com/xabber/android/ui/activity/XabberAccountInfoActivity.java b/xabber/src/main/java/com/xabber/android/ui/activity/XabberAccountInfoActivity.java
index 4a0cf8c5ab..6ebf91518a 100644
--- a/xabber/src/main/java/com/xabber/android/ui/activity/XabberAccountInfoActivity.java
+++ b/xabber/src/main/java/com/xabber/android/ui/activity/XabberAccountInfoActivity.java
@@ -30,12 +30,12 @@
 import com.xabber.android.data.xaccount.XabberAccountManager;
 import com.xabber.android.ui.color.BarPainter;
 import com.xabber.android.ui.fragment.XAccountSignUpFragment;
+import com.xabber.android.ui.fragment.XAccountXMPPAuthFragment;
 import com.xabber.android.ui.fragment.XabberAccountCompleteRegsiterFrament;
 import com.xabber.android.ui.fragment.XabberAccountConfirmPhoneFragment;
 import com.xabber.android.ui.fragment.XabberAccountConfirmationFragment;
 import com.xabber.android.ui.fragment.XabberAccountInfoFragment;
 import com.xabber.android.ui.fragment.XabberAccountLastFragment;
-import com.xabber.android.ui.fragment.XabberAccountLoginFragment;
 import com.xabber.android.utils.RetrofitErrorConverter;
 
 import java.util.List;
@@ -57,6 +57,8 @@ public class XabberAccountInfoActivity extends BaseLoginActivity implements Tool
     private final static String EMAIL_CONFIRMATION_URI = "https://www.xabber.com/account/emails/confirmation/";
 
     private final static String FRAGMENT_LOGIN = "fragment_login";
+    private final static String FRAGMENT_XMPP_AUTH = "fragment_xmpp_auth";
+    private final static String FRAGMENT_SIGNUP = "fragment_signup";
     private final static String FRAGMENT_INFO = "fragment_info";
     private final static String FRAGMENT_CONFIRM = "fragment_confirm";
     private final static String FRAGMENT_PHONE_CONFIRM = "fragment_phone_confirm";
@@ -74,6 +76,8 @@ public class XabberAccountInfoActivity extends BaseLoginActivity implements Tool
     private ProgressDialog progressDialog;
 
     private Fragment fragmentLogin;
+    private Fragment fragmentXMPPAuth;
+    private Fragment fragmentSignUp;
     private Fragment fragmentInfo;
     private Fragment fragmentConfirmation;
     private Fragment fragmentPhoneConfirmation;
@@ -133,9 +137,9 @@ protected void onResume() {
                 showInfoFragment();
                 needShowSyncDialog = false;
             }
-        } else {
-            showLoginFragment();
-        }
+        } else if (AccountManager.getInstance().hasAccounts()) {
+            showXMPPAuthFragment();
+        } else showSignUpFragment();
 
         handleIntent(getIntent());
     }
@@ -255,6 +259,30 @@ public void showLoginFragment() {
         barPainter.setBlue(this);
     }
 
+    public void showXMPPAuthFragment() {
+        if (fragmentXMPPAuth == null)
+            fragmentXMPPAuth = new XAccountXMPPAuthFragment();
+
+        fTrans = getFragmentManager().beginTransaction();
+        fTrans.replace(R.id.container, fragmentXMPPAuth, FRAGMENT_XMPP_AUTH);
+        fTrans.commit();
+
+        toolbar.setTitle(R.string.title_register_xabber_account);
+        barPainter.setBlue(this);
+    }
+
+    public void showSignUpFragment() {
+        if (fragmentSignUp == null)
+            fragmentSignUp = new XAccountSignUpFragment();
+
+        fTrans = getFragmentManager().beginTransaction();
+        fTrans.replace(R.id.container, fragmentSignUp, FRAGMENT_SIGNUP);
+        fTrans.commit();
+
+        toolbar.setTitle(R.string.title_register_xabber_account);
+        barPainter.setBlue(this);
+    }
+
     public void showInfoFragment() {
         if (fragmentInfo == null) {
             fragmentInfo = new XabberAccountInfoFragment();
diff --git a/xabber/src/main/java/com/xabber/android/ui/adapter/XMPPAccountAuthAdapter.java b/xabber/src/main/java/com/xabber/android/ui/adapter/XMPPAccountAuthAdapter.java
new file mode 100644
index 0000000000..af2ff68922
--- /dev/null
+++ b/xabber/src/main/java/com/xabber/android/ui/adapter/XMPPAccountAuthAdapter.java
@@ -0,0 +1,71 @@
+package com.xabber.android.ui.adapter;
+
+import android.support.v7.widget.RecyclerView;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import com.xabber.android.R;
+import com.xabber.android.data.account.AccountItem;
+import com.xabber.android.data.extension.avatar.AvatarManager;
+import com.xabber.android.ui.color.ColorManager;
+
+import java.util.List;
+
+/**
+ * Created by valery.miller on 20.07.17.
+ */
+
+public class XMPPAccountAuthAdapter extends RecyclerView.Adapter {
+
+    private List<AccountItem> items;
+
+    public void setItems(List<AccountItem> items) {
+        this.items = items;
+        notifyDataSetChanged();
+    }
+
+    @Override
+    public RecyclerView.ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
+        return new XMPPAccountVH(LayoutInflater.from(parent.getContext())
+                .inflate(R.layout.item_xmpp_account_choose, parent, false));
+    }
+
+    @Override
+    public void onBindViewHolder(RecyclerView.ViewHolder holder, int position) {
+        final AccountItem account = items.get(position);
+        XMPPAccountVH viewHolder = (XMPPAccountVH) holder;
+
+        // set color
+        viewHolder.jid.setTextColor(ColorManager.getInstance().getAccountPainter().
+                getAccountMainColor(account.getAccount()));
+
+        // set avatar
+        viewHolder.avatar.setImageDrawable(
+                AvatarManager.getInstance().getAccountAvatar(account.getAccount()));
+
+        // set jid
+        viewHolder.jid.setText(account.getAccount().getFullJid().asBareJid().toString());
+    }
+
+    @Override
+    public int getItemCount() {
+        return items.size();
+    }
+
+    private class XMPPAccountVH extends RecyclerView.ViewHolder {
+
+        ImageView avatar;
+        TextView jid;
+        TextView action;
+
+        XMPPAccountVH(View itemView) {
+            super(itemView);
+            avatar = (ImageView) itemView.findViewById(R.id.avatar);
+            jid = (TextView) itemView.findViewById(R.id.tvAccountJid);
+            action = (TextView) itemView.findViewById(R.id.tvAction);
+        }
+    }
+}
diff --git a/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountXMPPAuthFragment.java b/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountXMPPAuthFragment.java
new file mode 100644
index 0000000000..b8b865f8a0
--- /dev/null
+++ b/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountXMPPAuthFragment.java
@@ -0,0 +1,46 @@
+package com.xabber.android.ui.fragment;
+
+import android.app.Fragment;
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.support.v7.widget.LinearLayoutManager;
+import android.support.v7.widget.RecyclerView;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import com.xabber.android.R;
+import com.xabber.android.data.account.AccountItem;
+import com.xabber.android.data.account.AccountManager;
+import com.xabber.android.ui.adapter.XMPPAccountAuthAdapter;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class XAccountXMPPAuthFragment extends Fragment {
+
+    private List<AccountItem> xmppAccounts = new ArrayList<>();
+
+    @Nullable
+    @Override
+    public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, Bundle savedInstanceState) {
+        return inflater.inflate(R.layout.fragment_xaccount_xmpp_auth, container, false);
+    }
+
+    @Override
+    public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+
+        xmppAccounts.clear();
+        xmppAccounts.addAll(AccountManager.getInstance().getAllAccountItems());
+
+        XMPPAccountAuthAdapter adapter = new XMPPAccountAuthAdapter();
+        adapter.setItems(xmppAccounts);
+
+        RecyclerView recyclerView = view.findViewById(R.id.rlAccounts);
+        recyclerView.setLayoutManager(new LinearLayoutManager(getActivity()));
+        recyclerView.setAdapter(adapter);
+    }
+
+
+}
diff --git a/xabber/src/main/res/layout/fragment_xaccount_xmpp_auth.xml b/xabber/src/main/res/layout/fragment_xaccount_xmpp_auth.xml
new file mode 100644
index 0000000000..0219ffb182
--- /dev/null
+++ b/xabber/src/main/res/layout/fragment_xaccount_xmpp_auth.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<RelativeLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/cardview_light_background"
+    >
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        android:layout_centerInParent="true"
+        android:layout_marginLeft="32dp"
+        android:layout_marginRight="32dp"
+        >
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_margin="8dp"
+            android:text="Choose account that will be used for registration Xabber Account:"
+            android:textSize="18sp"
+            android:gravity="center"
+            />
+
+        <android.support.v7.widget.RecyclerView
+            android:id="@+id/rlAccounts"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            tools:listitem="@layout/item_xmpp_account_choose"
+            />
+
+    </LinearLayout>
+</RelativeLayout>
\ No newline at end of file
diff --git a/xabber/src/main/res/layout/item_xmpp_account_choose.xml b/xabber/src/main/res/layout/item_xmpp_account_choose.xml
new file mode 100644
index 0000000000..21a445589b
--- /dev/null
+++ b/xabber/src/main/res/layout/item_xmpp_account_choose.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="horizontal"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:paddingTop="8dp"
+    android:paddingBottom="8dp"
+    android:paddingLeft="8dp"
+    android:background="?android:attr/selectableItemBackground"
+    android:clickable="true">
+
+    <include layout="@layout/avatar_view_without_status" />
+
+    <LinearLayout
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_vertical"
+        android:layout_weight="1"
+        android:orientation="vertical"
+        android:paddingLeft="8dp"
+        >
+
+        <TextView
+            android:id="@+id/tvAccountJid"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:singleLine="true"
+            android:text="Username"
+            android:textColor="@color/black_text"
+            android:textSize="18sp" />
+
+        <TextView
+            android:id="@+id/tvAction"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="will be created new Xabber Account"
+            android:textColor="@color/grey_500"
+            android:textSize="14sp" />
+    </LinearLayout>
+
+</LinearLayout>
\ No newline at end of file

From c4fd65b8c45407044f7c73fcc04dc513e402d5e7 Mon Sep 17 00:00:00 2001
From: Valery Miller <valera_miller94@mail.ru>
Date: Fri, 3 Aug 2018 18:26:36 +0500
Subject: [PATCH 004/251] Work on xmpp-auth in Xabber Account

---
 .../android/data/xaccount/AuthManager.java    | 24 +++++++++++
 .../android/data/xaccount/IXabberApi.java     |  4 ++
 .../activity/XabberAccountInfoActivity.java   | 41 +++++++++++++++++++
 .../ui/adapter/XMPPAccountAuthAdapter.java    | 25 ++++++++++-
 .../ui/fragment/XAccountXMPPAuthFragment.java | 11 +++--
 .../res/layout/item_xmpp_account_choose.xml   |  2 -
 6 files changed, 101 insertions(+), 6 deletions(-)

diff --git a/xabber/src/main/java/com/xabber/android/data/xaccount/AuthManager.java b/xabber/src/main/java/com/xabber/android/data/xaccount/AuthManager.java
index fd49d3c639..f7ac765d1c 100644
--- a/xabber/src/main/java/com/xabber/android/data/xaccount/AuthManager.java
+++ b/xabber/src/main/java/com/xabber/android/data/xaccount/AuthManager.java
@@ -262,6 +262,12 @@ public static Single<ResponseBody> confirmPhoneNumber(String code) {
         return HttpApiManager.getXabberApi().confirmPhoneNumber(getXabberTokenHeader(), new ConfirmPhoneNumber("verify", code));
     }
 
+    // API v2
+
+    public static Single<XMPPCode> requestXMPPCode(String jid) {
+        return HttpApiManager.getXabberApi().requestXMPPCode(new Jid(jid));
+    }
+
     // support
 
     private static String getXabberTokenHeader() {
@@ -281,6 +287,24 @@ private static String getSource() {
 
     // models
 
+    public static class XMPPCode {
+        final String request_id;
+        final String api_jid;
+
+        public XMPPCode(String request_id, String api_jid) {
+            this.request_id = request_id;
+            this.api_jid = api_jid;
+        }
+
+        public String getRequestId() {
+            return request_id;
+        }
+
+        public String getApiJid() {
+            return api_jid;
+        }
+    }
+
     public static class CompleteRegister {
         final String username;
         final String password;
diff --git a/xabber/src/main/java/com/xabber/android/data/xaccount/IXabberApi.java b/xabber/src/main/java/com/xabber/android/data/xaccount/IXabberApi.java
index 46bd84cf01..436a79c2da 100644
--- a/xabber/src/main/java/com/xabber/android/data/xaccount/IXabberApi.java
+++ b/xabber/src/main/java/com/xabber/android/data/xaccount/IXabberApi.java
@@ -63,5 +63,9 @@ public interface IXabberApi {
     @POST("accounts/current/email_list/")
     Single<ResponseBody> addEmail(@Header("Authorization") String token, @Body AuthManager.Email email);
 
+    /* Xabber API v2 */
+
+    @POST("accounts/xmpp_code_request/")
+    Single<AuthManager.XMPPCode> requestXMPPCode(@Body AuthManager.Jid jid);
 }
 
diff --git a/xabber/src/main/java/com/xabber/android/ui/activity/XabberAccountInfoActivity.java b/xabber/src/main/java/com/xabber/android/ui/activity/XabberAccountInfoActivity.java
index 6ebf91518a..88fa307299 100644
--- a/xabber/src/main/java/com/xabber/android/ui/activity/XabberAccountInfoActivity.java
+++ b/xabber/src/main/java/com/xabber/android/ui/activity/XabberAccountInfoActivity.java
@@ -427,6 +427,13 @@ public void call(Throwable throwable) {
         compositeSubscription.add(deleteSubscription);
     }
 
+    public void onRequestXMPPAuthCodeClick(String jid) {
+        if (NetworkManager.isNetworkAvailable()) {
+            requestXMPPCode(jid);
+        } else
+            Toast.makeText(this, R.string.toast_no_internet, Toast.LENGTH_LONG).show();
+    }
+
     private void handleSuccessDelete(List<XMPPAccountSettings> settings) {
         showInfoFragment();
         hideProgress();
@@ -834,5 +841,39 @@ private void handleErrorResendEmail(Throwable throwable) {
             Toast.makeText(this, "Error while send verification email: " + throwable.toString(), Toast.LENGTH_LONG).show();
         }
     }
+
+    private void requestXMPPCode(String jid) {
+        showProgress("Request XMPP auth-code..");
+        Subscription requestXMPPCodeSubscription = AuthManager.requestXMPPCode(jid)
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(new Action1<AuthManager.XMPPCode>() {
+                    @Override
+                    public void call(AuthManager.XMPPCode code) {
+                        handleSuccessRequestXMPPCode(code);
+                    }
+                }, new Action1<Throwable>() {
+                    @Override
+                    public void call(Throwable throwable) {
+                        handleErrorRequestXMPPCode(throwable);
+                    }
+                });
+        compositeSubscription.add(requestXMPPCodeSubscription);
+    }
+
+    private void handleSuccessRequestXMPPCode(AuthManager.XMPPCode code) {
+        hideProgress();
+        Toast.makeText(this, code.getRequestId() + " " + code.getApiJid(), Toast.LENGTH_SHORT).show();
+    }
+
+    private void handleErrorRequestXMPPCode(Throwable throwable) {
+        hideProgress();
+
+        // TODO: 03.08.18 implement error parsing
+
+        String error = "Error while request XMPP auth-code: " + throwable.toString();
+        Log.d(LOG_TAG, error);
+        Toast.makeText(this, error, Toast.LENGTH_LONG).show();
+    }
 }
 
diff --git a/xabber/src/main/java/com/xabber/android/ui/adapter/XMPPAccountAuthAdapter.java b/xabber/src/main/java/com/xabber/android/ui/adapter/XMPPAccountAuthAdapter.java
index af2ff68922..b7c63e9949 100644
--- a/xabber/src/main/java/com/xabber/android/ui/adapter/XMPPAccountAuthAdapter.java
+++ b/xabber/src/main/java/com/xabber/android/ui/adapter/XMPPAccountAuthAdapter.java
@@ -10,6 +10,7 @@
 import com.xabber.android.R;
 import com.xabber.android.data.account.AccountItem;
 import com.xabber.android.data.extension.avatar.AvatarManager;
+import com.xabber.android.data.extension.bookmarks.BookmarksManager;
 import com.xabber.android.ui.color.ColorManager;
 
 import java.util.List;
@@ -21,6 +22,15 @@
 public class XMPPAccountAuthAdapter extends RecyclerView.Adapter {
 
     private List<AccountItem> items;
+    private Listener listener;
+
+    public XMPPAccountAuthAdapter(Listener listener) {
+        this.listener = listener;
+    }
+
+    public interface Listener {
+        void onAccountClick(String accountJid);
+    }
 
     public void setItems(List<AccountItem> items) {
         this.items = items;
@@ -47,7 +57,20 @@ public void onBindViewHolder(RecyclerView.ViewHolder holder, int position) {
                 AvatarManager.getInstance().getAccountAvatar(account.getAccount()));
 
         // set jid
-        viewHolder.jid.setText(account.getAccount().getFullJid().asBareJid().toString());
+        final String accountJid = account.getAccount().getFullJid().asBareJid().toString();
+        viewHolder.jid.setText(accountJid);
+
+        // set action
+        boolean haveBind = BookmarksManager.getInstance().isBookmarkHaveXabberAccountBinding(account.getAccount());
+        viewHolder.action.setText(haveBind ? "also binded for Xabber Account" : "will be created new Xabber Account");
+
+        // set listener
+        viewHolder.itemView.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                listener.onAccountClick(accountJid);
+            }
+        });
     }
 
     @Override
diff --git a/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountXMPPAuthFragment.java b/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountXMPPAuthFragment.java
index b8b865f8a0..56bc0d4e75 100644
--- a/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountXMPPAuthFragment.java
+++ b/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountXMPPAuthFragment.java
@@ -8,16 +8,18 @@
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.Toast;
 
 import com.xabber.android.R;
 import com.xabber.android.data.account.AccountItem;
 import com.xabber.android.data.account.AccountManager;
+import com.xabber.android.ui.activity.XabberAccountInfoActivity;
 import com.xabber.android.ui.adapter.XMPPAccountAuthAdapter;
 
 import java.util.ArrayList;
 import java.util.List;
 
-public class XAccountXMPPAuthFragment extends Fragment {
+public class XAccountXMPPAuthFragment extends Fragment implements XMPPAccountAuthAdapter.Listener {
 
     private List<AccountItem> xmppAccounts = new ArrayList<>();
 
@@ -34,7 +36,7 @@ public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
         xmppAccounts.clear();
         xmppAccounts.addAll(AccountManager.getInstance().getAllAccountItems());
 
-        XMPPAccountAuthAdapter adapter = new XMPPAccountAuthAdapter();
+        XMPPAccountAuthAdapter adapter = new XMPPAccountAuthAdapter(this);
         adapter.setItems(xmppAccounts);
 
         RecyclerView recyclerView = view.findViewById(R.id.rlAccounts);
@@ -42,5 +44,8 @@ public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
         recyclerView.setAdapter(adapter);
     }
 
-
+    @Override
+    public void onAccountClick(String accountJid) {
+        ((XabberAccountInfoActivity)getActivity()).onRequestXMPPAuthCodeClick(accountJid);
+    }
 }
diff --git a/xabber/src/main/res/layout/item_xmpp_account_choose.xml b/xabber/src/main/res/layout/item_xmpp_account_choose.xml
index 21a445589b..ed3d04d828 100644
--- a/xabber/src/main/res/layout/item_xmpp_account_choose.xml
+++ b/xabber/src/main/res/layout/item_xmpp_account_choose.xml
@@ -25,7 +25,6 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:singleLine="true"
-            android:text="Username"
             android:textColor="@color/black_text"
             android:textSize="18sp" />
 
@@ -33,7 +32,6 @@
             android:id="@+id/tvAction"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:text="will be created new Xabber Account"
             android:textColor="@color/grey_500"
             android:textSize="14sp" />
     </LinearLayout>

From 7808178fcdd71c7cafa544f12929e7b8a1a9b4da Mon Sep 17 00:00:00 2001
From: Valery Miller <valera_miller94@mail.ru>
Date: Mon, 6 Aug 2018 11:48:57 +0500
Subject: [PATCH 005/251] Added getHosts API method

---
 .../android/data/xaccount/AuthManager.java    | 16 +++++++
 .../android/data/xaccount/IXabberApi.java     |  5 +++
 .../activity/XabberAccountInfoActivity.java   | 42 +++++++++++++++++++
 .../ui/fragment/XAccountSignUpFragment.java   | 14 +++----
 4 files changed, 70 insertions(+), 7 deletions(-)

diff --git a/xabber/src/main/java/com/xabber/android/data/xaccount/AuthManager.java b/xabber/src/main/java/com/xabber/android/data/xaccount/AuthManager.java
index f7ac765d1c..562d84acae 100644
--- a/xabber/src/main/java/com/xabber/android/data/xaccount/AuthManager.java
+++ b/xabber/src/main/java/com/xabber/android/data/xaccount/AuthManager.java
@@ -268,6 +268,10 @@ public static Single<XMPPCode> requestXMPPCode(String jid) {
         return HttpApiManager.getXabberApi().requestXMPPCode(new Jid(jid));
     }
 
+    public static Single<List<Domain>> getHosts() {
+        return HttpApiManager.getXabberApi().getHosts();
+    }
+
     // support
 
     private static String getXabberTokenHeader() {
@@ -287,6 +291,18 @@ private static String getSource() {
 
     // models
 
+    public static class Domain {
+        final String domain;
+
+        public Domain(String domain) {
+            this.domain = domain;
+        }
+
+        public String getDomain() {
+            return domain;
+        }
+    }
+
     public static class XMPPCode {
         final String request_id;
         final String api_jid;
diff --git a/xabber/src/main/java/com/xabber/android/data/xaccount/IXabberApi.java b/xabber/src/main/java/com/xabber/android/data/xaccount/IXabberApi.java
index 436a79c2da..1ab3f0ec27 100644
--- a/xabber/src/main/java/com/xabber/android/data/xaccount/IXabberApi.java
+++ b/xabber/src/main/java/com/xabber/android/data/xaccount/IXabberApi.java
@@ -1,5 +1,7 @@
 package com.xabber.android.data.xaccount;
 
+import java.util.List;
+
 import okhttp3.ResponseBody;
 import retrofit2.http.Body;
 import retrofit2.http.GET;
@@ -67,5 +69,8 @@ public interface IXabberApi {
 
     @POST("accounts/xmpp_code_request/")
     Single<AuthManager.XMPPCode> requestXMPPCode(@Body AuthManager.Jid jid);
+
+    @GET("accounts/xmpp/hosts/")
+    Single<List<AuthManager.Domain>> getHosts();
 }
 
diff --git a/xabber/src/main/java/com/xabber/android/ui/activity/XabberAccountInfoActivity.java b/xabber/src/main/java/com/xabber/android/ui/activity/XabberAccountInfoActivity.java
index 88fa307299..9cc4d7b902 100644
--- a/xabber/src/main/java/com/xabber/android/ui/activity/XabberAccountInfoActivity.java
+++ b/xabber/src/main/java/com/xabber/android/ui/activity/XabberAccountInfoActivity.java
@@ -38,6 +38,7 @@
 import com.xabber.android.ui.fragment.XabberAccountLastFragment;
 import com.xabber.android.utils.RetrofitErrorConverter;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Locale;
 
@@ -875,5 +876,46 @@ private void handleErrorRequestXMPPCode(Throwable throwable) {
         Log.d(LOG_TAG, error);
         Toast.makeText(this, error, Toast.LENGTH_LONG).show();
     }
+
+    public void getHosts() {
+        showProgress("Request hosts..");
+        Subscription requestHosts = AuthManager.getHosts()
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(new Action1<List<AuthManager.Domain>>() {
+                    @Override
+                    public void call(List<AuthManager.Domain> domains) {
+                        handleSuccessGetHosts(domains);
+                    }
+                }, new Action1<Throwable>() {
+                    @Override
+                    public void call(Throwable throwable) {
+                        handleErrorGetHosts(throwable);
+                    }
+                });
+        compositeSubscription.add(requestHosts);
+    }
+
+    private void handleSuccessGetHosts(List<AuthManager.Domain> domains) {
+        hideProgress();
+
+        List<String> hosts = new ArrayList<>();
+        for (AuthManager.Domain domain : domains) {
+            hosts.add(domain.getDomain());
+        }
+
+        if (fragmentSignUp != null)
+            ((XAccountSignUpFragment)fragmentSignUp).setupSpinner(hosts);
+    }
+
+    private void handleErrorGetHosts(Throwable throwable) {
+        hideProgress();
+
+        // TODO: 03.08.18 implement error parsing
+
+        String error = "Error while request hosts: " + throwable.toString();
+        Log.d(LOG_TAG, error);
+        Toast.makeText(this, error, Toast.LENGTH_LONG).show();
+    }
 }
 
diff --git a/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountSignUpFragment.java b/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountSignUpFragment.java
index cd77a5c3e4..2f2d30e3b9 100644
--- a/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountSignUpFragment.java
+++ b/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountSignUpFragment.java
@@ -12,8 +12,8 @@
 import android.widget.Spinner;
 
 import com.xabber.android.R;
+import com.xabber.android.ui.activity.XabberAccountInfoActivity;
 
-import java.util.ArrayList;
 import java.util.List;
 
 public class XAccountSignUpFragment extends Fragment implements View.OnClickListener {
@@ -39,12 +39,12 @@ public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
         btnSignUp = view.findViewById(R.id.btnSignUp);
 
         btnSignUp.setOnClickListener(this);
+    }
 
-        List<String> domains = new ArrayList<>();
-        domains.add("@xabber.org");
-        domains.add("@xabber.com");
-        domains.add("@xabber.ru");
-        setupSpinner(domains);
+    @Override
+    public void onResume() {
+        super.onResume();
+        ((XabberAccountInfoActivity)getActivity()).getHosts();
     }
 
     @Override
@@ -102,7 +102,7 @@ private boolean verifyFields() {
         return true;
     }
 
-    private void setupSpinner(List<String> domains) {
+    public void setupSpinner(List<String> domains) {
         if (spinnerDomain == null) return;
         ArrayAdapter<String> adapter = new ArrayAdapter<>(getActivity(),
                 android.R.layout.simple_spinner_item, domains);

From 7d8593dd8c4cad219e8959423fa78f5fec456ede Mon Sep 17 00:00:00 2001
From: Valery Miller <valera_miller94@mail.ru>
Date: Mon, 6 Aug 2018 17:37:07 +0500
Subject: [PATCH 006/251] Added authorization in Xabber Account via XMPP

---
 .../android/data/xaccount/AuthManager.java    | 21 ++++++
 .../android/data/xaccount/IXabberApi.java     |  3 +
 .../data/xaccount/XabberAccountDTO.java       |  7 +-
 .../activity/XabberAccountInfoActivity.java   | 71 +++++++++++++++++--
 .../fragment/XAccountXMPPConfirmFragment.java | 66 +++++++++++++++++
 .../layout/fragment_xaccount_xmpp_confirm.xml | 67 +++++++++++++++++
 6 files changed, 230 insertions(+), 5 deletions(-)
 create mode 100644 xabber/src/main/java/com/xabber/android/ui/fragment/XAccountXMPPConfirmFragment.java
 create mode 100644 xabber/src/main/res/layout/fragment_xaccount_xmpp_confirm.xml

diff --git a/xabber/src/main/java/com/xabber/android/data/xaccount/AuthManager.java b/xabber/src/main/java/com/xabber/android/data/xaccount/AuthManager.java
index 562d84acae..28f615c8b2 100644
--- a/xabber/src/main/java/com/xabber/android/data/xaccount/AuthManager.java
+++ b/xabber/src/main/java/com/xabber/android/data/xaccount/AuthManager.java
@@ -268,6 +268,17 @@ public static Single<XMPPCode> requestXMPPCode(String jid) {
         return HttpApiManager.getXabberApi().requestXMPPCode(new Jid(jid));
     }
 
+    public static Single<XabberAccount> confirmXMPP(String jid, String code) {
+        return HttpApiManager.getXabberApi().confirmXMPP(new CodeConfirm(code, jid))
+                .flatMap(new Func1<XabberAccountDTO, Single<? extends XabberAccount>>() {
+                    @Override
+                    public Single<? extends XabberAccount> call(XabberAccountDTO xabberAccountDTO) {
+                        return XabberAccountManager.getInstance().saveOrUpdateXabberAccountToRealm(xabberAccountDTO,
+                                xabberAccountDTO.getToken());
+                    }
+                });
+    }
+
     public static Single<List<Domain>> getHosts() {
         return HttpApiManager.getXabberApi().getHosts();
     }
@@ -291,6 +302,16 @@ private static String getSource() {
 
     // models
 
+    public static class CodeConfirm {
+        final String code;
+        final String jid;
+
+        public CodeConfirm(String code, String jid) {
+            this.code = code;
+            this.jid = jid;
+        }
+    }
+
     public static class Domain {
         final String domain;
 
diff --git a/xabber/src/main/java/com/xabber/android/data/xaccount/IXabberApi.java b/xabber/src/main/java/com/xabber/android/data/xaccount/IXabberApi.java
index 1ab3f0ec27..54c59634b7 100644
--- a/xabber/src/main/java/com/xabber/android/data/xaccount/IXabberApi.java
+++ b/xabber/src/main/java/com/xabber/android/data/xaccount/IXabberApi.java
@@ -70,6 +70,9 @@ public interface IXabberApi {
     @POST("accounts/xmpp_code_request/")
     Single<AuthManager.XMPPCode> requestXMPPCode(@Body AuthManager.Jid jid);
 
+    @POST("accounts/xmpp_auth/")
+    Single<XabberAccountDTO> confirmXMPP(@Body AuthManager.CodeConfirm codeConfirm);
+
     @GET("accounts/xmpp/hosts/")
     Single<List<AuthManager.Domain>> getHosts();
 }
diff --git a/xabber/src/main/java/com/xabber/android/data/xaccount/XabberAccountDTO.java b/xabber/src/main/java/com/xabber/android/data/xaccount/XabberAccountDTO.java
index 0bb6e94078..e3b2ed4f4e 100644
--- a/xabber/src/main/java/com/xabber/android/data/xaccount/XabberAccountDTO.java
+++ b/xabber/src/main/java/com/xabber/android/data/xaccount/XabberAccountDTO.java
@@ -17,13 +17,14 @@ public class XabberAccountDTO {
     private String language;
     private String phone;
     private boolean need_to_verify_phone;
+    private String token;
     private List<XMPPUserDTO> xmpp_users;
     private List<EmailDTO> email_list;
     private List<SocialBindingDTO> social_bindings;
 
     public XabberAccountDTO(int id, String account_status, String username, String first_name,
                             String last_name, String registration_date, String language, String phone,
-                            boolean need_to_verify_phone, List<XMPPUserDTO> xmpp_users,
+                            boolean need_to_verify_phone, String token, List<XMPPUserDTO> xmpp_users,
                             List<EmailDTO> email_list, List<SocialBindingDTO> social_bindings) {
         this.id = id;
         this.account_status = account_status;
@@ -86,5 +87,9 @@ public boolean isNeedToVerifyPhone() {
     public String getPhone() {
         return phone;
     }
+
+    public String getToken() {
+        return token;
+    }
 }
 
diff --git a/xabber/src/main/java/com/xabber/android/ui/activity/XabberAccountInfoActivity.java b/xabber/src/main/java/com/xabber/android/ui/activity/XabberAccountInfoActivity.java
index 9cc4d7b902..45f5da3a4e 100644
--- a/xabber/src/main/java/com/xabber/android/ui/activity/XabberAccountInfoActivity.java
+++ b/xabber/src/main/java/com/xabber/android/ui/activity/XabberAccountInfoActivity.java
@@ -31,6 +31,7 @@
 import com.xabber.android.ui.color.BarPainter;
 import com.xabber.android.ui.fragment.XAccountSignUpFragment;
 import com.xabber.android.ui.fragment.XAccountXMPPAuthFragment;
+import com.xabber.android.ui.fragment.XAccountXMPPConfirmFragment;
 import com.xabber.android.ui.fragment.XabberAccountCompleteRegsiterFrament;
 import com.xabber.android.ui.fragment.XabberAccountConfirmPhoneFragment;
 import com.xabber.android.ui.fragment.XabberAccountConfirmationFragment;
@@ -59,6 +60,7 @@ public class XabberAccountInfoActivity extends BaseLoginActivity implements Tool
 
     private final static String FRAGMENT_LOGIN = "fragment_login";
     private final static String FRAGMENT_XMPP_AUTH = "fragment_xmpp_auth";
+    private final static String FRAGMENT_XMPP_CONFIRM = "fragment_xmpp_confirm";
     private final static String FRAGMENT_SIGNUP = "fragment_signup";
     private final static String FRAGMENT_INFO = "fragment_info";
     private final static String FRAGMENT_CONFIRM = "fragment_confirm";
@@ -78,6 +80,7 @@ public class XabberAccountInfoActivity extends BaseLoginActivity implements Tool
 
     private Fragment fragmentLogin;
     private Fragment fragmentXMPPAuth;
+    private Fragment fragmentXMPPConfirm;
     private Fragment fragmentSignUp;
     private Fragment fragmentInfo;
     private Fragment fragmentConfirmation;
@@ -272,6 +275,20 @@ public void showXMPPAuthFragment() {
         barPainter.setBlue(this);
     }
 
+    public void showXMPPConfirmFragment(String jid) {
+        if (fragmentXMPPConfirm == null)
+            fragmentXMPPConfirm = new XAccountXMPPConfirmFragment();
+
+        ((XAccountXMPPConfirmFragment)fragmentXMPPConfirm).setJid(jid);
+
+        fTrans = getFragmentManager().beginTransaction();
+        fTrans.replace(R.id.container, fragmentXMPPConfirm, FRAGMENT_XMPP_CONFIRM);
+        fTrans.commit();
+
+        toolbar.setTitle(R.string.title_register_xabber_account);
+        barPainter.setBlue(this);
+    }
+
     public void showSignUpFragment() {
         if (fragmentSignUp == null)
             fragmentSignUp = new XAccountSignUpFragment();
@@ -435,6 +452,13 @@ public void onRequestXMPPAuthCodeClick(String jid) {
             Toast.makeText(this, R.string.toast_no_internet, Toast.LENGTH_LONG).show();
     }
 
+    public void onConfirmXMPPClick(String jid, String code) {
+        if (NetworkManager.isNetworkAvailable()) {
+            confirmXMPP(code, jid);
+        } else
+            Toast.makeText(this, R.string.toast_no_internet, Toast.LENGTH_LONG).show();
+    }
+
     private void handleSuccessDelete(List<XMPPAccountSettings> settings) {
         showInfoFragment();
         hideProgress();
@@ -843,7 +867,7 @@ private void handleErrorResendEmail(Throwable throwable) {
         }
     }
 
-    private void requestXMPPCode(String jid) {
+    private void requestXMPPCode(final String jid) {
         showProgress("Request XMPP auth-code..");
         Subscription requestXMPPCodeSubscription = AuthManager.requestXMPPCode(jid)
                 .subscribeOn(Schedulers.io())
@@ -851,7 +875,7 @@ private void requestXMPPCode(String jid) {
                 .subscribe(new Action1<AuthManager.XMPPCode>() {
                     @Override
                     public void call(AuthManager.XMPPCode code) {
-                        handleSuccessRequestXMPPCode(code);
+                        handleSuccessRequestXMPPCode(code, jid);
                     }
                 }, new Action1<Throwable>() {
                     @Override
@@ -862,9 +886,9 @@ public void call(Throwable throwable) {
         compositeSubscription.add(requestXMPPCodeSubscription);
     }
 
-    private void handleSuccessRequestXMPPCode(AuthManager.XMPPCode code) {
+    private void handleSuccessRequestXMPPCode(AuthManager.XMPPCode code, String jid) {
         hideProgress();
-        Toast.makeText(this, code.getRequestId() + " " + code.getApiJid(), Toast.LENGTH_SHORT).show();
+        showXMPPConfirmFragment(jid);
     }
 
     private void handleErrorRequestXMPPCode(Throwable throwable) {
@@ -877,6 +901,45 @@ private void handleErrorRequestXMPPCode(Throwable throwable) {
         Toast.makeText(this, error, Toast.LENGTH_LONG).show();
     }
 
+    private void confirmXMPP(String code, String jid) {
+        showProgress("Confirm XMPP-account with code..");
+        Subscription confirmXMPPSubscription = AuthManager.confirmXMPP(jid, code)
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(new Action1<XabberAccount>() {
+                    @Override
+                    public void call(XabberAccount account) {
+                        handleSuccessConfirmXMPP(account);
+                    }
+                }, new Action1<Throwable>() {
+                    @Override
+                    public void call(Throwable throwable) {
+                        handleErrorConfirmXMPP(throwable);
+                    }
+                });
+        compositeSubscription.add(confirmXMPPSubscription);
+    }
+
+    private void handleSuccessConfirmXMPP(XabberAccount account) {
+        hideProgress();
+
+        Intent intent = XabberAccountInfoActivity.createIntent(this);
+        intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK);
+        intent.putExtra(XabberAccountInfoActivity.CALL_FROM, XabberAccountInfoActivity.CALL_FROM_LOGIN);
+        finish();
+        startActivity(intent);
+    }
+
+    private void handleErrorConfirmXMPP(Throwable throwable) {
+        hideProgress();
+
+        // TODO: 03.08.18 implement error parsing
+
+        String error = "Error while confirm XMPP-account: " + throwable.toString();
+        Log.d(LOG_TAG, error);
+        Toast.makeText(this, error, Toast.LENGTH_LONG).show();
+    }
+
     public void getHosts() {
         showProgress("Request hosts..");
         Subscription requestHosts = AuthManager.getHosts()
diff --git a/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountXMPPConfirmFragment.java b/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountXMPPConfirmFragment.java
new file mode 100644
index 0000000000..21a3e6345d
--- /dev/null
+++ b/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountXMPPConfirmFragment.java
@@ -0,0 +1,66 @@
+package com.xabber.android.ui.fragment;
+
+import android.app.Fragment;
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Button;
+import android.widget.EditText;
+
+import com.xabber.android.R;
+import com.xabber.android.ui.activity.XabberAccountInfoActivity;
+
+public class XAccountXMPPConfirmFragment extends Fragment implements View.OnClickListener {
+
+    private String jid;
+
+    private EditText edtCode;
+    private Button btnConfirm;
+    private Button btnResend;
+
+    @Nullable
+    @Override
+    public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, Bundle savedInstanceState) {
+        return inflater.inflate(R.layout.fragment_xaccount_xmpp_confirm, container, false);
+    }
+
+    @Override
+    public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+
+        edtCode = view.findViewById(R.id.edtCode);
+        btnConfirm = view.findViewById(R.id.btnConfirm);
+        btnResend = view.findViewById(R.id.btnResend);
+
+        btnConfirm.setOnClickListener(this);
+        btnResend.setOnClickListener(this);
+    }
+
+    @Override
+    public void onClick(View v) {
+        switch (v.getId()) {
+            case R.id.btnConfirm:
+                onConfirmClick();
+                break;
+            case R.id.btnResend:
+                onResendClick();
+                break;
+        }
+    }
+
+    public void setJid(String jid) {
+        this.jid = jid;
+    }
+
+    private void onConfirmClick() {
+        // TODO: 06.08.18 verify fields
+        String code = edtCode.getText().toString();
+        ((XabberAccountInfoActivity)getActivity()).onConfirmXMPPClick(jid, code);
+    }
+
+    private void onResendClick() {
+        // TODO: 06.08.18 implement
+    }
+}
diff --git a/xabber/src/main/res/layout/fragment_xaccount_xmpp_confirm.xml b/xabber/src/main/res/layout/fragment_xaccount_xmpp_confirm.xml
new file mode 100644
index 0000000000..97f2565cad
--- /dev/null
+++ b/xabber/src/main/res/layout/fragment_xaccount_xmpp_confirm.xml
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        android:layout_centerInParent="true"
+        android:layout_marginLeft="32dp"
+        android:layout_marginRight="32dp"
+        >
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_margin="8dp"
+            android:text="Enter confirmation code that was send to example@jabber.com"
+            android:textSize="18sp"
+            android:gravity="center"
+            />
+
+        <EditText
+            android:id="@+id/edtCode"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="8dp"
+            android:layout_marginRight="12dp"
+            android:layout_marginLeft="12dp"
+            android:theme="@style/Theme"
+            android:inputType="number"
+            android:hint="@string/hint_code"
+            />
+
+        <LinearLayout
+            android:layout_marginTop="12dp"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            >
+
+            <Button
+                android:id="@+id/btnResend"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                style="@style/Widget.AppCompat.Button.Borderless"
+                android:theme="@style/BlueButton"
+                android:textColor="@color/account_register_blue"
+                android:text="@string/button_resend_link"
+                android:layout_weight="1"
+                />
+
+            <Button
+                android:id="@+id/btnConfirm"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                style="@style/Widget.AppCompat.Button.Colored"
+                android:theme="@style/BlueButton"
+                android:textColor="@color/white"
+                android:text="@string/button_confirm"
+                android:layout_weight="1"
+                />
+
+        </LinearLayout>
+    </LinearLayout>
+</RelativeLayout>
\ No newline at end of file

From 8a5863770c44c52bea8b10b30aa2689a408031d2 Mon Sep 17 00:00:00 2001
From: Valery Miller <valera_miller94@mail.ru>
Date: Mon, 6 Aug 2018 18:10:36 +0500
Subject: [PATCH 007/251] Now call xmpp_code_request with full jid Show this
 jid in confirm fragment

---
 .../android/ui/adapter/XMPPAccountAuthAdapter.java       | 3 ++-
 .../android/ui/fragment/XAccountXMPPConfirmFragment.java | 9 +++++++++
 .../main/res/layout/fragment_xaccount_xmpp_confirm.xml   | 3 ++-
 xabber/src/main/res/values/xabber_account.xml            | 2 ++
 4 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/xabber/src/main/java/com/xabber/android/ui/adapter/XMPPAccountAuthAdapter.java b/xabber/src/main/java/com/xabber/android/ui/adapter/XMPPAccountAuthAdapter.java
index b7c63e9949..fda6c958e7 100644
--- a/xabber/src/main/java/com/xabber/android/ui/adapter/XMPPAccountAuthAdapter.java
+++ b/xabber/src/main/java/com/xabber/android/ui/adapter/XMPPAccountAuthAdapter.java
@@ -58,6 +58,7 @@ public void onBindViewHolder(RecyclerView.ViewHolder holder, int position) {
 
         // set jid
         final String accountJid = account.getAccount().getFullJid().asBareJid().toString();
+        final String fullJid = account.getAccount().getFullJid().toString();
         viewHolder.jid.setText(accountJid);
 
         // set action
@@ -68,7 +69,7 @@ public void onBindViewHolder(RecyclerView.ViewHolder holder, int position) {
         viewHolder.itemView.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                listener.onAccountClick(accountJid);
+                listener.onAccountClick(fullJid);
             }
         });
     }
diff --git a/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountXMPPConfirmFragment.java b/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountXMPPConfirmFragment.java
index 21a3e6345d..21452cc5e3 100644
--- a/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountXMPPConfirmFragment.java
+++ b/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountXMPPConfirmFragment.java
@@ -8,6 +8,7 @@
 import android.view.ViewGroup;
 import android.widget.Button;
 import android.widget.EditText;
+import android.widget.TextView;
 
 import com.xabber.android.R;
 import com.xabber.android.ui.activity.XabberAccountInfoActivity;
@@ -19,6 +20,7 @@ public class XAccountXMPPConfirmFragment extends Fragment implements View.OnClic
     private EditText edtCode;
     private Button btnConfirm;
     private Button btnResend;
+    private TextView tvTitle;
 
     @Nullable
     @Override
@@ -33,11 +35,18 @@ public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
         edtCode = view.findViewById(R.id.edtCode);
         btnConfirm = view.findViewById(R.id.btnConfirm);
         btnResend = view.findViewById(R.id.btnResend);
+        tvTitle = view.findViewById(R.id.tvTitle);
 
         btnConfirm.setOnClickListener(this);
         btnResend.setOnClickListener(this);
     }
 
+    @Override
+    public void onResume() {
+        super.onResume();
+        tvTitle.setText(getString(R.string.xmpp_confirm_title, jid));
+    }
+
     @Override
     public void onClick(View v) {
         switch (v.getId()) {
diff --git a/xabber/src/main/res/layout/fragment_xaccount_xmpp_confirm.xml b/xabber/src/main/res/layout/fragment_xaccount_xmpp_confirm.xml
index 97f2565cad..48c7f49abc 100644
--- a/xabber/src/main/res/layout/fragment_xaccount_xmpp_confirm.xml
+++ b/xabber/src/main/res/layout/fragment_xaccount_xmpp_confirm.xml
@@ -13,10 +13,11 @@
         >
 
         <TextView
+            android:id="@+id/tvTitle"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_margin="8dp"
-            android:text="Enter confirmation code that was send to example@jabber.com"
+            android:text="@string/xmpp_confirm_title"
             android:textSize="18sp"
             android:gravity="center"
             />
diff --git a/xabber/src/main/res/values/xabber_account.xml b/xabber/src/main/res/values/xabber_account.xml
index 1d204844b2..f9e5b6e313 100644
--- a/xabber/src/main/res/values/xabber_account.xml
+++ b/xabber/src/main/res/values/xabber_account.xml
@@ -161,4 +161,6 @@
     <string name="patreon_pledged" translatable="false">$%1$d of $%2$d pledged per month.</string>
     <string name="patreon_current_goal" translatable="false">Goal: %1$s</string>
     <string name="patreon_appeal_url" translatable="false">https://www.xabber.com/appeal/</string>
+
+    <string name="xmpp_confirm_title">Enter confirmation code that was send to %1$s</string>
 </resources>
\ No newline at end of file

From e8539ff183192e03f1273e8b6adffcc73c09633b Mon Sep 17 00:00:00 2001
From: Valery Miller <valera_miller94@mail.ru>
Date: Tue, 7 Aug 2018 10:39:10 +0500
Subject: [PATCH 008/251] Update gradle

---
 build.gradle                             | 2 +-
 gradle/wrapper/gradle-wrapper.properties | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/build.gradle b/build.gradle
index 68b6820911..5120442f18 100644
--- a/build.gradle
+++ b/build.gradle
@@ -6,7 +6,7 @@ buildscript {
         maven { url 'https://maven.fabric.io/public' }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.0.1'
+        classpath 'com.android.tools.build:gradle:3.1.4'
         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/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index fa8d4bdd8f..7349c222f7 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Thu Oct 26 14:17:31 YEKT 2017
+#Tue Aug 07 09:41:05 YEKT 2018
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip

From 4b9811aeeb9536db825d52226a032223b33bd163 Mon Sep 17 00:00:00 2001
From: Valery Miller <valera_miller94@mail.ru>
Date: Tue, 7 Aug 2018 14:20:21 +0500
Subject: [PATCH 009/251] Authorization xmpp code auto-set to field

---
 .../com/xabber/android/data/Application.java  |  2 +
 .../data/xaccount/XMPPAuthManager.java        | 56 +++++++++++++++++++
 .../activity/XabberAccountInfoActivity.java   |  2 +
 .../fragment/XAccountXMPPConfirmFragment.java | 26 +++++++++
 4 files changed, 86 insertions(+)
 create mode 100644 xabber/src/main/java/com/xabber/android/data/xaccount/XMPPAuthManager.java

diff --git a/xabber/src/main/java/com/xabber/android/data/Application.java b/xabber/src/main/java/com/xabber/android/data/Application.java
index 83a9cf37e7..bae49e42a6 100644
--- a/xabber/src/main/java/com/xabber/android/data/Application.java
+++ b/xabber/src/main/java/com/xabber/android/data/Application.java
@@ -58,6 +58,7 @@
 import com.xabber.android.data.roster.GroupManager;
 import com.xabber.android.data.roster.PresenceManager;
 import com.xabber.android.data.roster.RosterManager;
+import com.xabber.android.data.xaccount.XMPPAuthManager;
 import com.xabber.android.data.xaccount.XabberAccountManager;
 import com.xabber.android.service.XabberService;
 import com.xabber.android.utils.AppBlockCanaryContext;
@@ -386,6 +387,7 @@ private void addManagers() {
         addManager(BlockingManager.getInstance());
         addManager(MamManager.getInstance());
         addManager(CertificateManager.getInstance());
+        addManager(XMPPAuthManager.getInstance());
     }
 
     /**
diff --git a/xabber/src/main/java/com/xabber/android/data/xaccount/XMPPAuthManager.java b/xabber/src/main/java/com/xabber/android/data/xaccount/XMPPAuthManager.java
new file mode 100644
index 0000000000..24741f28ba
--- /dev/null
+++ b/xabber/src/main/java/com/xabber/android/data/xaccount/XMPPAuthManager.java
@@ -0,0 +1,56 @@
+package com.xabber.android.data.xaccount;
+
+import com.xabber.android.data.connection.ConnectionItem;
+import com.xabber.android.data.connection.listeners.OnPacketListener;
+
+import org.jivesoftware.smack.packet.Message;
+import org.jivesoftware.smack.packet.StandardExtensionElement;
+import org.jivesoftware.smack.packet.Stanza;
+
+import rx.subjects.PublishSubject;
+
+public class XMPPAuthManager implements OnPacketListener {
+
+    private static final String EXTENSION_NAMESPACE = "http://jabber.org/protocol/http-auth";
+    private static final String ATTRIBUTE_ID = "id";
+
+    private static XMPPAuthManager instance;
+    private PublishSubject<String> authCodeSubscribe = PublishSubject.create();
+
+    private String lastRequestId = null;
+    private String apiJid = null;
+    private String authCode;
+
+    public static XMPPAuthManager getInstance() {
+        if (instance == null) instance = new XMPPAuthManager();
+        return instance;
+    }
+
+    public PublishSubject<String> subscribeForAuthCode() {
+        return authCodeSubscribe;
+    }
+
+    public void updateRequestId(String requestId, String apiJid) {
+        this.lastRequestId = requestId;
+        this.apiJid = apiJid;
+    }
+
+    @Override
+    public void onStanza(ConnectionItem connection, Stanza packet) {
+
+        if (apiJid == null || lastRequestId == null) return;
+
+        if (packet instanceof Message) {
+            Message message = (Message) packet;
+            if (apiJid.equals(message.getFrom().toString())) {
+                if (lastRequestId.equals(message.getStanzaId())) {
+
+                    StandardExtensionElement extensionElement = (StandardExtensionElement)
+                            message.getExtension(EXTENSION_NAMESPACE);
+                    this.authCode = extensionElement.getAttributeValue(ATTRIBUTE_ID);
+                    authCodeSubscribe.onNext(this.authCode);
+                }
+            }
+        }
+    }
+}
diff --git a/xabber/src/main/java/com/xabber/android/ui/activity/XabberAccountInfoActivity.java b/xabber/src/main/java/com/xabber/android/ui/activity/XabberAccountInfoActivity.java
index 45f5da3a4e..8ed51fdcb0 100644
--- a/xabber/src/main/java/com/xabber/android/ui/activity/XabberAccountInfoActivity.java
+++ b/xabber/src/main/java/com/xabber/android/ui/activity/XabberAccountInfoActivity.java
@@ -26,6 +26,7 @@
 import com.xabber.android.data.connection.NetworkManager;
 import com.xabber.android.data.xaccount.AuthManager;
 import com.xabber.android.data.xaccount.XMPPAccountSettings;
+import com.xabber.android.data.xaccount.XMPPAuthManager;
 import com.xabber.android.data.xaccount.XabberAccount;
 import com.xabber.android.data.xaccount.XabberAccountManager;
 import com.xabber.android.ui.color.BarPainter;
@@ -888,6 +889,7 @@ public void call(Throwable throwable) {
 
     private void handleSuccessRequestXMPPCode(AuthManager.XMPPCode code, String jid) {
         hideProgress();
+        XMPPAuthManager.getInstance().updateRequestId(code.getRequestId(), code.getApiJid());
         showXMPPConfirmFragment(jid);
     }
 
diff --git a/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountXMPPConfirmFragment.java b/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountXMPPConfirmFragment.java
index 21452cc5e3..5661aaef31 100644
--- a/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountXMPPConfirmFragment.java
+++ b/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountXMPPConfirmFragment.java
@@ -11,11 +11,16 @@
 import android.widget.TextView;
 
 import com.xabber.android.R;
+import com.xabber.android.data.xaccount.XMPPAuthManager;
 import com.xabber.android.ui.activity.XabberAccountInfoActivity;
 
+import rx.functions.Action1;
+import rx.subscriptions.CompositeSubscription;
+
 public class XAccountXMPPConfirmFragment extends Fragment implements View.OnClickListener {
 
     private String jid;
+    private CompositeSubscription subscriptions = new CompositeSubscription();
 
     private EditText edtCode;
     private Button btnConfirm;
@@ -44,9 +49,16 @@ public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
     @Override
     public void onResume() {
         super.onResume();
+        subscribeForAuthCode();
         tvTitle.setText(getString(R.string.xmpp_confirm_title, jid));
     }
 
+    @Override
+    public void onPause() {
+        super.onPause();
+        unsubscribeAll();
+    }
+
     @Override
     public void onClick(View v) {
         switch (v.getId()) {
@@ -72,4 +84,18 @@ private void onConfirmClick() {
     private void onResendClick() {
         // TODO: 06.08.18 implement
     }
+
+    private void subscribeForAuthCode() {
+        subscriptions.add(XMPPAuthManager.getInstance().subscribeForAuthCode()
+            .doOnNext(new Action1<String>() {
+                @Override
+                public void call(String authCode) {
+                    if (edtCode != null) edtCode.setText(authCode);
+                }
+            }).subscribe());
+    }
+
+    private void unsubscribeAll() {
+        subscriptions.clear();
+    }
 }

From fed26c5c2816e9d0aa9345c7064197cef64bafe0 Mon Sep 17 00:00:00 2001
From: Valery Miller <valera_miller94@mail.ru>
Date: Tue, 7 Aug 2018 15:19:53 +0500
Subject: [PATCH 010/251] Added private storage manager

---
 .../privatestorage/PrivateStorageManager.java | 75 +++++++++++++++++++
 .../ui/adapter/XMPPAccountAuthAdapter.java    |  4 +-
 2 files changed, 77 insertions(+), 2 deletions(-)
 create mode 100644 xabber/src/main/java/com/xabber/android/data/extension/privatestorage/PrivateStorageManager.java

diff --git a/xabber/src/main/java/com/xabber/android/data/extension/privatestorage/PrivateStorageManager.java b/xabber/src/main/java/com/xabber/android/data/extension/privatestorage/PrivateStorageManager.java
new file mode 100644
index 0000000000..5b92663992
--- /dev/null
+++ b/xabber/src/main/java/com/xabber/android/data/extension/privatestorage/PrivateStorageManager.java
@@ -0,0 +1,75 @@
+package com.xabber.android.data.extension.privatestorage;
+
+import android.support.annotation.Nullable;
+
+import com.xabber.android.data.account.AccountItem;
+import com.xabber.android.data.account.AccountManager;
+import com.xabber.android.data.entity.AccountJid;
+
+import org.jivesoftware.smack.SmackException;
+import org.jivesoftware.smack.XMPPException;
+import org.jivesoftware.smack.tcp.XMPPTCPConnection;
+import org.jivesoftware.smackx.iqprivate.PrivateDataManager;
+import org.jivesoftware.smackx.iqprivate.packet.DefaultPrivateData;
+import org.jivesoftware.smackx.iqprivate.packet.PrivateData;
+
+public class PrivateStorageManager {
+
+    private static final String NAMESPACE = "xabber:options";
+    private static final String ELEMENT_NAME = "storage";
+    private static final String VALUE_BIND = "bind";
+    private static final String BIND_TRUE = "1";
+    private static final String BIND_FALSE = "0";
+
+    private static PrivateStorageManager instance;
+
+    public static PrivateStorageManager getInstance() {
+        if (instance == null) instance = new PrivateStorageManager();
+        return instance;
+    }
+
+    public boolean haveXabberAccountBinding(AccountJid accountJid) {
+        DefaultPrivateData privateData = (DefaultPrivateData) getPrivateData(accountJid, NAMESPACE, ELEMENT_NAME);
+        if (privateData == null) return false;
+        return BIND_TRUE.equals(privateData.getValue(VALUE_BIND));
+    }
+
+    public void setXabberAccountBinding(AccountJid accountJid, boolean bind) {
+        DefaultPrivateData privateData = new DefaultPrivateData(ELEMENT_NAME, NAMESPACE);
+        privateData.setValue(VALUE_BIND, bind ? BIND_TRUE : BIND_FALSE);
+        setPrivateData(accountJid, privateData);
+    }
+
+    @Nullable private PrivateData getPrivateData(AccountJid accountJid, String namespace, String elementName) {
+        AccountItem accountItem = AccountManager.getInstance().getAccount(accountJid);
+        if (accountItem == null || !accountItem.isEnabled()) return null;
+
+        XMPPTCPConnection connection = accountItem.getConnection();
+        PrivateDataManager privateDataManager = PrivateDataManager.getInstanceFor(connection);
+        try {
+            if (!privateDataManager.isSupported()) return null;
+            return privateDataManager.getPrivateData(elementName, namespace);
+        } catch (SmackException.NoResponseException | XMPPException.XMPPErrorException
+                | SmackException.NotConnectedException | InterruptedException e) {
+            e.printStackTrace();
+            return null;
+        }
+    }
+
+    private void setPrivateData(AccountJid accountJid, PrivateData privateData) {
+        AccountItem accountItem = AccountManager.getInstance().getAccount(accountJid);
+        if (accountItem == null || !accountItem.isEnabled()) return;
+
+        XMPPTCPConnection connection = accountItem.getConnection();
+        PrivateDataManager privateDataManager = PrivateDataManager.getInstanceFor(connection);
+
+        try {
+            if (!privateDataManager.isSupported()) return;
+            privateDataManager.setPrivateData(privateData);
+        } catch (SmackException.NoResponseException | XMPPException.XMPPErrorException
+                | SmackException.NotConnectedException | InterruptedException e) {
+            e.printStackTrace();
+        }
+    }
+
+}
diff --git a/xabber/src/main/java/com/xabber/android/ui/adapter/XMPPAccountAuthAdapter.java b/xabber/src/main/java/com/xabber/android/ui/adapter/XMPPAccountAuthAdapter.java
index fda6c958e7..15eba8de96 100644
--- a/xabber/src/main/java/com/xabber/android/ui/adapter/XMPPAccountAuthAdapter.java
+++ b/xabber/src/main/java/com/xabber/android/ui/adapter/XMPPAccountAuthAdapter.java
@@ -10,7 +10,7 @@
 import com.xabber.android.R;
 import com.xabber.android.data.account.AccountItem;
 import com.xabber.android.data.extension.avatar.AvatarManager;
-import com.xabber.android.data.extension.bookmarks.BookmarksManager;
+import com.xabber.android.data.extension.privatestorage.PrivateStorageManager;
 import com.xabber.android.ui.color.ColorManager;
 
 import java.util.List;
@@ -62,7 +62,7 @@ public void onBindViewHolder(RecyclerView.ViewHolder holder, int position) {
         viewHolder.jid.setText(accountJid);
 
         // set action
-        boolean haveBind = BookmarksManager.getInstance().isBookmarkHaveXabberAccountBinding(account.getAccount());
+        boolean haveBind = PrivateStorageManager.getInstance().haveXabberAccountBinding(account.getAccount());
         viewHolder.action.setText(haveBind ? "also binded for Xabber Account" : "will be created new Xabber Account");
 
         // set listener

From 7202bc7eb495c8f143ced7af99abc1968990f346 Mon Sep 17 00:00:00 2001
From: Valery Miller <valera_miller94@mail.ru>
Date: Tue, 7 Aug 2018 17:51:40 +0500
Subject: [PATCH 011/251] Added auto-authorization in Xabber Account via XMPP

---
 .../android/data/account/AccountManager.java  |  4 +
 .../privatestorage/PrivateStorageManager.java |  6 +-
 .../data/xaccount/XMPPAuthManager.java        | 83 ++++++++++++++++++-
 3 files changed, 90 insertions(+), 3 deletions(-)

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
index 709ccc9cdd..1efd9461ba 100644
--- a/xabber/src/main/java/com/xabber/android/data/account/AccountManager.java
+++ b/xabber/src/main/java/com/xabber/android/data/account/AccountManager.java
@@ -53,6 +53,7 @@
 import com.xabber.android.data.notification.NotificationManager;
 import com.xabber.android.data.roster.PresenceManager;
 import com.xabber.android.data.roster.RosterManager;
+import com.xabber.android.data.xaccount.XMPPAuthManager;
 import com.xabber.android.data.xaccount.XabberAccountManager;
 
 import org.jivesoftware.smack.util.StringUtils;
@@ -435,6 +436,9 @@ storePassword, password, token, resource, getNextColorIndex(), getNextOrder(), f
                 .addAccountSyncState(accountItem.getAccount().getFullJid().asBareJid().toString(), true);
         else SettingsManager.setSyncAllAccounts(false);
 
+        // add account to check-list for Xabber Account auth
+        XMPPAuthManager.getInstance().addAccountForCheck(accountItem.getAccount());
+
         return accountItem.getAccount();
     }
 
diff --git a/xabber/src/main/java/com/xabber/android/data/extension/privatestorage/PrivateStorageManager.java b/xabber/src/main/java/com/xabber/android/data/extension/privatestorage/PrivateStorageManager.java
index 5b92663992..bb9157c495 100644
--- a/xabber/src/main/java/com/xabber/android/data/extension/privatestorage/PrivateStorageManager.java
+++ b/xabber/src/main/java/com/xabber/android/data/extension/privatestorage/PrivateStorageManager.java
@@ -50,7 +50,8 @@ public void setXabberAccountBinding(AccountJid accountJid, boolean bind) {
             if (!privateDataManager.isSupported()) return null;
             return privateDataManager.getPrivateData(elementName, namespace);
         } catch (SmackException.NoResponseException | XMPPException.XMPPErrorException
-                | SmackException.NotConnectedException | InterruptedException e) {
+                | SmackException.NotConnectedException | InterruptedException
+                | IllegalArgumentException e) {
             e.printStackTrace();
             return null;
         }
@@ -67,7 +68,8 @@ private void setPrivateData(AccountJid accountJid, PrivateData privateData) {
             if (!privateDataManager.isSupported()) return;
             privateDataManager.setPrivateData(privateData);
         } catch (SmackException.NoResponseException | XMPPException.XMPPErrorException
-                | SmackException.NotConnectedException | InterruptedException e) {
+                | SmackException.NotConnectedException | InterruptedException
+                | IllegalArgumentException e) {
             e.printStackTrace();
         }
     }
diff --git a/xabber/src/main/java/com/xabber/android/data/xaccount/XMPPAuthManager.java b/xabber/src/main/java/com/xabber/android/data/xaccount/XMPPAuthManager.java
index 24741f28ba..ea5bdeb274 100644
--- a/xabber/src/main/java/com/xabber/android/data/xaccount/XMPPAuthManager.java
+++ b/xabber/src/main/java/com/xabber/android/data/xaccount/XMPPAuthManager.java
@@ -1,25 +1,39 @@
 package com.xabber.android.data.xaccount;
 
+import android.util.Log;
+
+import com.xabber.android.data.Application;
 import com.xabber.android.data.connection.ConnectionItem;
+import com.xabber.android.data.connection.listeners.OnConnectedListener;
 import com.xabber.android.data.connection.listeners.OnPacketListener;
+import com.xabber.android.data.entity.AccountJid;
+import com.xabber.android.data.extension.privatestorage.PrivateStorageManager;
 
 import org.jivesoftware.smack.packet.Message;
 import org.jivesoftware.smack.packet.StandardExtensionElement;
 import org.jivesoftware.smack.packet.Stanza;
 
+import java.util.ArrayList;
+import java.util.List;
+
+import rx.android.schedulers.AndroidSchedulers;
+import rx.functions.Action1;
+import rx.schedulers.Schedulers;
 import rx.subjects.PublishSubject;
 
-public class XMPPAuthManager implements OnPacketListener {
+public class XMPPAuthManager implements OnPacketListener, OnConnectedListener {
 
     private static final String EXTENSION_NAMESPACE = "http://jabber.org/protocol/http-auth";
     private static final String ATTRIBUTE_ID = "id";
 
     private static XMPPAuthManager instance;
     private PublishSubject<String> authCodeSubscribe = PublishSubject.create();
+    private List<AccountJid> accountsForCheck = new ArrayList<>();
 
     private String lastRequestId = null;
     private String apiJid = null;
     private String authCode;
+    private AccountJid authJid;
 
     public static XMPPAuthManager getInstance() {
         if (instance == null) instance = new XMPPAuthManager();
@@ -35,6 +49,10 @@ public void updateRequestId(String requestId, String apiJid) {
         this.apiJid = apiJid;
     }
 
+    public void addAccountForCheck(AccountJid accountJid) {
+        accountsForCheck.add(accountJid);
+    }
+
     @Override
     public void onStanza(ConnectionItem connection, Stanza packet) {
 
@@ -49,8 +67,71 @@ public void onStanza(ConnectionItem connection, Stanza packet) {
                             message.getExtension(EXTENSION_NAMESPACE);
                     this.authCode = extensionElement.getAttributeValue(ATTRIBUTE_ID);
                     authCodeSubscribe.onNext(this.authCode);
+                    // TODO: 07.08.18 if (need auto login)
+                    confirmXMPP(authJid, authCode);
                 }
             }
         }
     }
+
+    @Override
+    public void onConnected(final ConnectionItem connection) {
+        Application.getInstance().runInBackground(new Runnable() {
+            @Override
+            public void run() {
+                if (XabberAccountManager.getInstance().getAccount() == null) {
+                    AccountJid accountJid = connection.getAccount();
+                    if (accountsForCheck.contains(accountJid)) {
+                        try {
+                            Thread.sleep(500);
+                        } catch (InterruptedException e) {
+                            e.printStackTrace();
+                        }
+                        if (PrivateStorageManager.getInstance().haveXabberAccountBinding(accountJid))
+                            requestXMPPAuthCode(accountJid);
+                        // TODO: 07.08.18 включить удаление аккаунта из очереди после попытки авториазации?
+                        //accountsForCheck.remove(accountJid);
+                    }
+                }
+            }
+        });
+    }
+
+    private void requestXMPPAuthCode(final AccountJid accountJid) {
+        Log.d(XMPPAuthManager.class.toString(), "request XMPP code for account: "
+                + accountJid.getFullJid().toString());
+        AuthManager.requestXMPPCode(accountJid.getFullJid().toString())
+            .subscribe(new Action1<AuthManager.XMPPCode>() {
+                @Override
+                public void call(AuthManager.XMPPCode code) {
+                    Log.d(XMPPAuthManager.class.toString(), "xmpp auth code requested successfully");
+                    updateRequestId(code.getRequestId(), code.getApiJid());
+                    authJid = accountJid;
+                }
+            }, new Action1<Throwable>() {
+                @Override
+                public void call(Throwable throwable) {
+                    Log.d(XMPPAuthManager.class.toString(), "request XMPP code failed: " + throwable.toString());
+                }
+            });
+    }
+
+    private void confirmXMPP(AccountJid accountJid, String code) {
+        Log.d(XMPPAuthManager.class.toString(), "confirm account: "
+                + accountJid.getFullJid().toString());
+        AuthManager.confirmXMPP(accountJid.getFullJid().toString(), code)
+            .subscribeOn(Schedulers.io())
+            .observeOn(AndroidSchedulers.mainThread())
+            .subscribe(new Action1<XabberAccount>() {
+                @Override
+                public void call(XabberAccount account) {
+                    Log.d(XMPPAuthManager.class.toString(), "xabber account authorized successfully");
+                }
+            }, new Action1<Throwable>() {
+                @Override
+                public void call(Throwable throwable) {
+                    Log.d(XMPPAuthManager.class.toString(), "XMPP authorization failed: " + throwable.toString());
+                }
+            });
+    }
 }

From c66238a359078aa56136d7b0ff6aa06b685357b3 Mon Sep 17 00:00:00 2001
From: Valery Miller <valera_miller94@mail.ru>
Date: Wed, 8 Aug 2018 11:19:52 +0500
Subject: [PATCH 012/251] Write Xabber-bind in private storage after successful
 XMPP-login

---
 .../xabber/android/data/xaccount/AuthManager.java    | 12 +++++++++++-
 .../android/data/xaccount/XMPPAuthManager.java       |  5 +++--
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/xabber/src/main/java/com/xabber/android/data/xaccount/AuthManager.java b/xabber/src/main/java/com/xabber/android/data/xaccount/AuthManager.java
index 28f615c8b2..0c3fee052d 100644
--- a/xabber/src/main/java/com/xabber/android/data/xaccount/AuthManager.java
+++ b/xabber/src/main/java/com/xabber/android/data/xaccount/AuthManager.java
@@ -5,6 +5,10 @@
 import com.google.gson.Gson;
 import com.xabber.android.BuildConfig;
 import com.xabber.android.data.SettingsManager;
+import com.xabber.android.data.entity.AccountJid;
+import com.xabber.android.data.extension.privatestorage.PrivateStorageManager;
+
+import org.jxmpp.stringprep.XmppStringprepException;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -268,11 +272,17 @@ public static Single<XMPPCode> requestXMPPCode(String jid) {
         return HttpApiManager.getXabberApi().requestXMPPCode(new Jid(jid));
     }
 
-    public static Single<XabberAccount> confirmXMPP(String jid, String code) {
+    public static Single<XabberAccount> confirmXMPP(final String jid, String code) {
         return HttpApiManager.getXabberApi().confirmXMPP(new CodeConfirm(code, jid))
                 .flatMap(new Func1<XabberAccountDTO, Single<? extends XabberAccount>>() {
                     @Override
                     public Single<? extends XabberAccount> call(XabberAccountDTO xabberAccountDTO) {
+                        try {
+                            PrivateStorageManager.getInstance().setXabberAccountBinding(AccountJid.from(jid), true);
+                        } catch (XmppStringprepException e) {
+                            e.printStackTrace();
+                        }
+
                         return XabberAccountManager.getInstance().saveOrUpdateXabberAccountToRealm(xabberAccountDTO,
                                 xabberAccountDTO.getToken());
                     }
diff --git a/xabber/src/main/java/com/xabber/android/data/xaccount/XMPPAuthManager.java b/xabber/src/main/java/com/xabber/android/data/xaccount/XMPPAuthManager.java
index ea5bdeb274..da149f1d12 100644
--- a/xabber/src/main/java/com/xabber/android/data/xaccount/XMPPAuthManager.java
+++ b/xabber/src/main/java/com/xabber/android/data/xaccount/XMPPAuthManager.java
@@ -67,8 +67,9 @@ public void onStanza(ConnectionItem connection, Stanza packet) {
                             message.getExtension(EXTENSION_NAMESPACE);
                     this.authCode = extensionElement.getAttributeValue(ATTRIBUTE_ID);
                     authCodeSubscribe.onNext(this.authCode);
-                    // TODO: 07.08.18 if (need auto login)
-                    confirmXMPP(authJid, authCode);
+
+                    // if login running in background
+                    if (authJid != null && authCode != null) confirmXMPP(authJid, authCode);
                 }
             }
         }

From 1531c48bff2f39473f0898d3779b6fd1d2862171 Mon Sep 17 00:00:00 2001
From: Valery Miller <valera_miller94@mail.ru>
Date: Wed, 8 Aug 2018 16:25:33 +0500
Subject: [PATCH 013/251] Start work on new signup with recaptcha

---
 xabber/build.gradle                           |  3 +-
 .../android/data/xaccount/AuthManager.java    | 62 +++++++++++++++++++
 .../android/data/xaccount/IXabberApi.java     |  3 +
 .../activity/XabberAccountInfoActivity.java   | 34 ++++++++++
 .../ui/fragment/XAccountSignUpFragment.java   | 60 ++++++++++++++++--
 5 files changed, 156 insertions(+), 6 deletions(-)

diff --git a/xabber/build.gradle b/xabber/build.gradle
index 753ae70da8..6f8e51a4b7 100644
--- a/xabber/build.gradle
+++ b/xabber/build.gradle
@@ -168,7 +168,8 @@ dependencies {
     implementation 'io.reactivex:rxandroid:1.1.0'
     implementation 'io.reactivex:rxjava:1.1.0'
 
-    //social
+    // social
+    implementation 'com.google.android.gms:play-services-safetynet:11.4.0'
     implementation 'com.facebook.android:facebook-android-sdk:4.31.0'
     implementation 'com.twitter.sdk.android:twitter:3.0.0'
     implementation 'com.google.android.gms:play-services-auth:11.4.0'
diff --git a/xabber/src/main/java/com/xabber/android/data/xaccount/AuthManager.java b/xabber/src/main/java/com/xabber/android/data/xaccount/AuthManager.java
index 0c3fee052d..6dce6c2866 100644
--- a/xabber/src/main/java/com/xabber/android/data/xaccount/AuthManager.java
+++ b/xabber/src/main/java/com/xabber/android/data/xaccount/AuthManager.java
@@ -293,6 +293,32 @@ public static Single<List<Domain>> getHosts() {
         return HttpApiManager.getXabberApi().getHosts();
     }
 
+    public static Single<XabberAccount> signupv2(String username, String host, String password,
+                                                 String captchaToken) {
+        return HttpApiManager.getXabberApi().signupv2(new SignUpFields(username, host,
+            password, captchaToken))
+            .flatMap(new Func1<XabberAccountDTO, Single<? extends XabberAccount>>() {
+                @Override
+                public Single<? extends XabberAccount> call(XabberAccountDTO xabberAccountDTO) {
+                    return XabberAccountManager.getInstance().saveOrUpdateXabberAccountToRealm(xabberAccountDTO,
+                            xabberAccountDTO.getToken());
+                }
+            });
+    }
+
+    public static Single<XabberAccount> signupv2(String username, String host, String password,
+                                                 String provider, String credentials) {
+        return HttpApiManager.getXabberApi().signupv2(new SignUpFields(username, host,
+                password, provider, credentials))
+                .flatMap(new Func1<XabberAccountDTO, Single<? extends XabberAccount>>() {
+                    @Override
+                    public Single<? extends XabberAccount> call(XabberAccountDTO xabberAccountDTO) {
+                        return XabberAccountManager.getInstance().saveOrUpdateXabberAccountToRealm(xabberAccountDTO,
+                                xabberAccountDTO.getToken());
+                    }
+                });
+    }
+
     // support
 
     private static String getXabberTokenHeader() {
@@ -312,6 +338,42 @@ private static String getSource() {
 
     // models
 
+    public static class SignUpFields {
+        final String username;
+        final String host;
+        final String password;
+        String captcha_token;
+        String provider;
+        String credentials;
+        final boolean create_token;
+        String first_name;
+        String last_name;
+        String language;
+        final String source;
+        String source_ip;
+
+        public SignUpFields(String username, String host, String password,
+                            String captcha_token) {
+            this.username = username;
+            this.host = host;
+            this.password = password;
+            this.captcha_token = captcha_token;
+            this.create_token = true;
+            this.source = getSource();
+        }
+
+        public SignUpFields(String username, String host, String password, String provider,
+                            String credentials) {
+            this.username = username;
+            this.host = host;
+            this.password = password;
+            this.provider = provider;
+            this.credentials = credentials;
+            this.create_token = true;
+            this.source = getSource();
+        }
+    }
+
     public static class CodeConfirm {
         final String code;
         final String jid;
diff --git a/xabber/src/main/java/com/xabber/android/data/xaccount/IXabberApi.java b/xabber/src/main/java/com/xabber/android/data/xaccount/IXabberApi.java
index 54c59634b7..945d59a6ae 100644
--- a/xabber/src/main/java/com/xabber/android/data/xaccount/IXabberApi.java
+++ b/xabber/src/main/java/com/xabber/android/data/xaccount/IXabberApi.java
@@ -75,5 +75,8 @@ public interface IXabberApi {
 
     @GET("accounts/xmpp/hosts/")
     Single<List<AuthManager.Domain>> getHosts();
+
+    @POST("accounts/signup/")
+    Single<XabberAccountDTO> signupv2(@Body AuthManager.SignUpFields fields);
 }
 
diff --git a/xabber/src/main/java/com/xabber/android/ui/activity/XabberAccountInfoActivity.java b/xabber/src/main/java/com/xabber/android/ui/activity/XabberAccountInfoActivity.java
index 8ed51fdcb0..e3d73cbf84 100644
--- a/xabber/src/main/java/com/xabber/android/ui/activity/XabberAccountInfoActivity.java
+++ b/xabber/src/main/java/com/xabber/android/ui/activity/XabberAccountInfoActivity.java
@@ -982,5 +982,39 @@ private void handleErrorGetHosts(Throwable throwable) {
         Log.d(LOG_TAG, error);
         Toast.makeText(this, error, Toast.LENGTH_LONG).show();
     }
+
+    public void signUp(String username, String host, String pass, String captchaToken) {
+        showProgress("Sign Up..");
+        Subscription signUpSubscription = AuthManager.signupv2(username, host, pass, captchaToken)
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(new Action1<XabberAccount>() {
+                    @Override
+                    public void call(XabberAccount account) {
+                        handleSuccessSignUp(account);
+                    }
+                }, new Action1<Throwable>() {
+                    @Override
+                    public void call(Throwable throwable) {
+                        handleErrorSignUp(throwable);
+                    }
+                });
+        compositeSubscription.add(signUpSubscription);
+    }
+
+    private void handleSuccessSignUp(XabberAccount account) {
+        hideProgress();
+        Toast.makeText(this, account.getUsername(), Toast.LENGTH_LONG).show();
+    }
+
+    private void handleErrorSignUp(Throwable throwable) {
+        hideProgress();
+
+        // TODO: 03.08.18 implement error parsing
+
+        String error = "Error while signup: " + throwable.toString();
+        Log.d(LOG_TAG, error);
+        Toast.makeText(this, error, Toast.LENGTH_LONG).show();
+    }
 }
 
diff --git a/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountSignUpFragment.java b/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountSignUpFragment.java
index 2f2d30e3b9..61bc62bb14 100644
--- a/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountSignUpFragment.java
+++ b/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountSignUpFragment.java
@@ -2,7 +2,9 @@
 
 import android.app.Fragment;
 import android.os.Bundle;
+import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
+import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -11,6 +13,12 @@
 import android.widget.EditText;
 import android.widget.Spinner;
 
+import com.google.android.gms.common.api.ApiException;
+import com.google.android.gms.common.api.CommonStatusCodes;
+import com.google.android.gms.safetynet.SafetyNet;
+import com.google.android.gms.safetynet.SafetyNetApi;
+import com.google.android.gms.tasks.OnFailureListener;
+import com.google.android.gms.tasks.OnSuccessListener;
 import com.xabber.android.R;
 import com.xabber.android.ui.activity.XabberAccountInfoActivity;
 
@@ -18,6 +26,8 @@
 
 public class XAccountSignUpFragment extends Fragment implements View.OnClickListener {
 
+    private static final String CAPTCHA_TOKEN = "RECAPTCHA";
+
     private EditText edtUsername;
     private EditText edtPass;
     private Spinner spinnerDomain;
@@ -44,6 +54,7 @@ public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
     @Override
     public void onResume() {
         super.onResume();
+        // TODO: 08.08.18 после закрытия окна с каптчей, снова делается запрос доменов?
         ((XabberAccountInfoActivity)getActivity()).getHosts();
     }
 
@@ -57,14 +68,15 @@ public void onClick(View v) {
     }
 
     private void onSignUpClick() {
-        if (verifyFields()) {
-            // TODO: 03.08.18 call API
+        String username = edtUsername.getText().toString().trim();
+        String pass = edtPass.getText().toString().trim();
+
+        if (verifyFields(username, pass)) {
+            getCaptchaToken(username, pass, spinnerDomain.getSelectedItem().toString());
         }
     }
 
-    private boolean verifyFields() {
-        String username = edtUsername.getText().toString().trim();
-        String pass = edtPass.getText().toString().trim();
+    private boolean verifyFields(String username, String pass) {
 
         if (username.isEmpty()) {
             edtUsername.setError(getString(R.string.empty_field));
@@ -102,6 +114,44 @@ private boolean verifyFields() {
         return true;
     }
 
+    private void getCaptchaToken(final String username, final String pass, final String domain) {
+        SafetyNet.getClient(getActivity()).verifyWithRecaptcha(getActivity().getString(R.string.RECAPTCHA_KEY))
+            .addOnSuccessListener(getActivity(),
+                new OnSuccessListener<SafetyNetApi.RecaptchaTokenResponse>() {
+                    @Override
+                    public void onSuccess(SafetyNetApi.RecaptchaTokenResponse response) {
+                        // Indicates communication with reCAPTCHA service was
+                        // successful.
+                        String userResponseToken = response.getTokenResult();
+                        if (!userResponseToken.isEmpty()) {
+                            // Validate the user response token using the
+                            // reCAPTCHA siteverify API.
+                            Log.d(CAPTCHA_TOKEN, "Success: " + userResponseToken);
+                            ((XabberAccountInfoActivity)getActivity()).signUp(username, domain,
+                                    pass, userResponseToken);
+                        }
+                    }
+                })
+            .addOnFailureListener(getActivity(),
+                new OnFailureListener() {
+                    @Override
+                    public void onFailure(@NonNull Exception e) {
+                        if (e instanceof ApiException) {
+                            // An error occurred when communicating with the
+                            // reCAPTCHA service. Refer to the status code to
+                            // handle the error appropriately.
+                            ApiException apiException = (ApiException) e;
+                            int statusCode = apiException.getStatusCode();
+                            Log.d(CAPTCHA_TOKEN, "Error: "
+                                    + CommonStatusCodes.getStatusCodeString(statusCode));
+                        } else {
+                            // A different, unknown type of error occurred.
+                            Log.d(CAPTCHA_TOKEN, "Error: " + e.getMessage());
+                        }
+                    }
+                });
+    }
+
     public void setupSpinner(List<String> domains) {
         if (spinnerDomain == null) return;
         ArrayAdapter<String> adapter = new ArrayAdapter<>(getActivity(),

From 50c99a022c147c1039a1b7b351c6e4e02bc82eff Mon Sep 17 00:00:00 2001
From: Valery Miller <valera_miller94@mail.ru>
Date: Thu, 9 Aug 2018 12:40:32 +0500
Subject: [PATCH 014/251] Added social auth buttons

---
 xabber/src/dev/res/values/social_keys.xml     |   2 +
 .../android/ui/activity/IntroActivity.java    | 114 ++++++++----------
 .../main/res/layout-land/activity_intro.xml   |  38 +++++-
 xabber/src/main/res/layout/activity_intro.xml |  38 ++++++
 .../main/res/values-w760dp-land/dimens.xml    |   2 +-
 5 files changed, 128 insertions(+), 66 deletions(-)

diff --git a/xabber/src/dev/res/values/social_keys.xml b/xabber/src/dev/res/values/social_keys.xml
index ed203d29e9..107a8169d6 100644
--- a/xabber/src/dev/res/values/social_keys.xml
+++ b/xabber/src/dev/res/values/social_keys.xml
@@ -12,4 +12,6 @@
 
     <string name="SOCIAL_AUTH_GITHUB_KEY">temp</string>
     <string name="SOCIAL_AUTH_GITHUB_SECRET">temp</string>
+
+    <string name="RECAPTCHA_KEY">temp</string>
 </resources>
\ No newline at end of file
diff --git a/xabber/src/main/java/com/xabber/android/ui/activity/IntroActivity.java b/xabber/src/main/java/com/xabber/android/ui/activity/IntroActivity.java
index 3d56ceb7d1..76a3f01eec 100644
--- a/xabber/src/main/java/com/xabber/android/ui/activity/IntroActivity.java
+++ b/xabber/src/main/java/com/xabber/android/ui/activity/IntroActivity.java
@@ -1,22 +1,20 @@
 package com.xabber.android.ui.activity;
 
-import android.app.SearchManager;
-import android.content.ActivityNotFoundException;
+import android.app.ProgressDialog;
 import android.content.Context;
 import android.content.Intent;
-import android.net.Uri;
 import android.os.Bundle;
 import android.view.View;
 import android.widget.Button;
+import android.widget.ImageView;
 
 import com.xabber.android.R;
 import com.xabber.android.data.account.AccountManager;
-import com.xabber.android.data.log.LogManager;
 import com.xabber.android.data.xaccount.XabberAccountManager;
 
-public class IntroActivity extends ManagedActivity {
+public class IntroActivity extends BaseLoginActivity implements View.OnClickListener {
 
-    private static final String LOG_TAG = IntroActivity.class.getSimpleName();
+    private ProgressDialog progressDialog;
 
     public static Intent createIntent(Context context) {
         return new Intent(context, IntroActivity.class);
@@ -32,79 +30,67 @@ protected void onCreate(Bundle savedInstanceState) {
 
         setContentView(R.layout.activity_intro);
 
-//        ((TextView) findViewById(R.id.intro_faq_text))
-//                .setMovementMethod(LinkMovementMethod.getInstance());
-
         Button btnSignIn = (Button) findViewById(R.id.btnSignIn);
         Button btnSignUp = (Button) findViewById(R.id.btnSignUp);
-
-        btnSignUp.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                startActivity(TutorialActivity.createIntent(IntroActivity.this));
-            }
-        });
-
-        btnSignIn.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                startActivity(AccountAddActivity.createIntent(IntroActivity.this));
-            }
-        });
-
-//        registerAccountButton.setOnClickListener(new View.OnClickListener() {
-//            @Override
-//            public void onClick(View v) {
-//                searchHowToRegister();
-//            }
-//        });
+        ImageView ivFacebook = (ImageView) findViewById(R.id.ivFacebook);
+        ImageView ivGoogle = (ImageView) findViewById(R.id.ivGoogle);
+        ImageView ivTwitter = (ImageView) findViewById(R.id.ivTwitter);
+
+        btnSignIn.setOnClickListener(this);
+        btnSignUp.setOnClickListener(this);
+        ivFacebook.setOnClickListener(this);
+        ivGoogle.setOnClickListener(this);
+        ivTwitter.setOnClickListener(this);
     }
 
-    private void searchHowToRegister() {
-        String searchQuery = getString(R.string.intro_web_search_register_xmpp);
+    @Override
+    protected void onResume() {
+        super.onResume();
 
-        if (!startWebSearchActivity(searchQuery)) {
-            if (!startSearchGoogleActivity(searchQuery)) {
-                LogManager.w(LOG_TAG, "Could not find web search or browser activity");
-            }
+        if (AccountManager.getInstance().hasAccounts() || XabberAccountManager.getInstance().getAccount() != null) {
+            Intent intent = ContactListActivity.createIntent(this);
+            intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK);
+            finish();
+            startActivity(intent);
         }
     }
 
-    private boolean startSearchGoogleActivity(String searchQuery) {
-        Uri uri = Uri.parse("http://www.google.com/#q=" + searchQuery);
-        Intent intent = new Intent(Intent.ACTION_VIEW, uri);
-        try {
-            startActivity(intent);
-            return true;
-        } catch (ActivityNotFoundException e) {
-            LogManager.exception(LOG_TAG, e);
-            return false;
+    @Override
+    public void onClick(View v) {
+        switch (v.getId()) {
+            case R.id.btnSignUp:
+                startActivity(TutorialActivity.createIntent(IntroActivity.this));
+                break;
+            case R.id.btnSignIn:
+                startActivity(AccountAddActivity.createIntent(IntroActivity.this));
+                break;
+            case R.id.ivFacebook:
+                loginFacebook();
+                break;
+            case R.id.ivGoogle:
+                loginGoogle();
+                break;
+            case R.id.ivTwitter:
+                loginTwitter();
+                break;
         }
-
     }
 
-    private boolean startWebSearchActivity(String searchQuery) {
-        Intent intent = new Intent(Intent.ACTION_WEB_SEARCH );
-        intent.putExtra(SearchManager.QUERY, searchQuery);
-        try {
-            startActivity(intent);
-            return true;
-        } catch (ActivityNotFoundException e) {
-            LogManager.exception(LOG_TAG, e);
-            return false;
+    @Override
+    protected void showProgress(String title) {
+        if (!isFinishing()) {
+            progressDialog = new ProgressDialog(this);
+            progressDialog.setTitle(title);
+            progressDialog.setMessage(getResources().getString(R.string.progress_message));
+            progressDialog.show();
         }
     }
 
     @Override
-    protected void onResume() {
-        super.onResume();
-
-        if (AccountManager.getInstance().hasAccounts() || XabberAccountManager.getInstance().getAccount() != null) {
-            Intent intent = ContactListActivity.createIntent(this);
-            intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK);
-            finish();
-            startActivity(intent);
+    protected void hideProgress() {
+        if (progressDialog != null) {
+            progressDialog.dismiss();
+            progressDialog = null;
         }
     }
-
 }
diff --git a/xabber/src/main/res/layout-land/activity_intro.xml b/xabber/src/main/res/layout-land/activity_intro.xml
index f38b04edbb..4669c312f4 100644
--- a/xabber/src/main/res/layout-land/activity_intro.xml
+++ b/xabber/src/main/res/layout-land/activity_intro.xml
@@ -56,12 +56,13 @@
                 android:id="@+id/btnSignIn"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-
                 android:text="@string/intro_signin"
                 android:textColor="@color/white"
                 style="@style/Widget.AppCompat.Button.Colored"
                 android:theme="@style/BlueButton"
                 android:layout_gravity="center_horizontal"
+                android:layout_marginRight="16dp"
+                android:layout_marginLeft="16dp"
                 />
 
             <Button
@@ -73,6 +74,41 @@
                 android:textColor="@color/account_register_blue"
                 android:text="@string/intro_signup"
                 android:layout_gravity="center_horizontal"
+                android:layout_marginRight="16dp"
+                android:layout_marginLeft="16dp"
+                />
+
+        </LinearLayout>
+
+        <LinearLayout
+            android:id="@+id/llSocialLogos"
+            android:orientation="horizontal"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal"
+            >
+
+            <ImageView
+                android:id="@+id/ivGoogle"
+                android:layout_width="48dp"
+                android:layout_height="48dp"
+                android:src="@drawable/ic_google_plus"
+                />
+
+            <ImageView
+                android:id="@+id/ivFacebook"
+                android:layout_width="48dp"
+                android:layout_height="48dp"
+                android:layout_marginLeft="32dp"
+                android:src="@drawable/ic_facebook"
+                />
+
+            <ImageView
+                android:id="@+id/ivTwitter"
+                android:layout_width="48dp"
+                android:layout_height="48dp"
+                android:layout_marginLeft="32dp"
+                android:src="@drawable/ic_twitter"
                 />
 
         </LinearLayout>
diff --git a/xabber/src/main/res/layout/activity_intro.xml b/xabber/src/main/res/layout/activity_intro.xml
index 11072c9000..70a7a24b56 100644
--- a/xabber/src/main/res/layout/activity_intro.xml
+++ b/xabber/src/main/res/layout/activity_intro.xml
@@ -76,6 +76,8 @@
             android:textColor="@color/white"
             style="@style/Widget.AppCompat.Button.Colored"
             android:theme="@style/BlueButton"
+            android:layout_marginRight="16dp"
+            android:layout_marginLeft="16dp"
             />
 
         <Button
@@ -86,8 +88,44 @@
             android:theme="@style/BlueButton"
             android:textColor="@color/account_register_blue"
             android:text="@string/intro_signup"
+            android:layout_marginRight="16dp"
+            android:layout_marginLeft="16dp"
             />
 
+        <LinearLayout
+            android:id="@+id/llSocialLogos"
+            android:orientation="horizontal"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal"
+            android:layout_marginTop="18dp"
+            >
+
+            <ImageView
+                android:id="@+id/ivGoogle"
+                android:layout_width="48dp"
+                android:layout_height="48dp"
+                android:src="@drawable/ic_google_plus"
+                />
+
+            <ImageView
+                android:id="@+id/ivFacebook"
+                android:layout_width="48dp"
+                android:layout_height="48dp"
+                android:layout_marginLeft="32dp"
+                android:src="@drawable/ic_facebook"
+                />
+
+            <ImageView
+                android:id="@+id/ivTwitter"
+                android:layout_width="48dp"
+                android:layout_height="48dp"
+                android:layout_marginLeft="32dp"
+                android:src="@drawable/ic_twitter"
+                />
+
+        </LinearLayout>
+
     </LinearLayout>
 
 </RelativeLayout>
\ No newline at end of file
diff --git a/xabber/src/main/res/values-w760dp-land/dimens.xml b/xabber/src/main/res/values-w760dp-land/dimens.xml
index b5e041a233..092cb54d2d 100644
--- a/xabber/src/main/res/values-w760dp-land/dimens.xml
+++ b/xabber/src/main/res/values-w760dp-land/dimens.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <dimen name="intro_horizontal_margin">130dp</dimen>
-    <dimen name="intro_vertical_margin">80dp</dimen>
+    <dimen name="intro_vertical_margin">65dp</dimen>
 </resources>
\ No newline at end of file

From bffad608923dc650f4ffba8ccbf7b5bf69efa726 Mon Sep 17 00:00:00 2001
From: Valery Miller <valera_miller94@mail.ru>
Date: Thu, 9 Aug 2018 16:20:07 +0500
Subject: [PATCH 015/251] Changes in social auth

---
 .../android/data/xaccount/AuthManager.java    |  6 +++-
 .../ui/activity/BaseLoginActivity.java        | 31 ++++++++++++++-----
 .../android/ui/activity/IntroActivity.java    |  2 +-
 .../activity/XabberAccountInfoActivity.java   | 29 +++++++++++------
 .../ui/fragment/XAccountSignUpFragment.java   | 31 ++++++++++++++++++-
 .../android/utils/RetrofitErrorConverter.java | 10 +++++-
 .../res/layout/fragment_xaccount_signup.xml   |  8 +++++
 7 files changed, 96 insertions(+), 21 deletions(-)

diff --git a/xabber/src/main/java/com/xabber/android/data/xaccount/AuthManager.java b/xabber/src/main/java/com/xabber/android/data/xaccount/AuthManager.java
index 6dce6c2866..6f7e23ec92 100644
--- a/xabber/src/main/java/com/xabber/android/data/xaccount/AuthManager.java
+++ b/xabber/src/main/java/com/xabber/android/data/xaccount/AuthManager.java
@@ -307,7 +307,11 @@ public Single<? extends XabberAccount> call(XabberAccountDTO xabberAccountDTO) {
     }
 
     public static Single<XabberAccount> signupv2(String username, String host, String password,
-                                                 String provider, String credentials) {
+                                                 String provider, String socialToken) {
+
+        Gson gson = new Gson();
+        String credentials = gson.toJson(new AccessToken(socialToken));
+
         return HttpApiManager.getXabberApi().signupv2(new SignUpFields(username, host,
                 password, provider, credentials))
                 .flatMap(new Func1<XabberAccountDTO, Single<? extends XabberAccount>>() {
diff --git a/xabber/src/main/java/com/xabber/android/ui/activity/BaseLoginActivity.java b/xabber/src/main/java/com/xabber/android/ui/activity/BaseLoginActivity.java
index e6d1b09c4a..474072faf8 100644
--- a/xabber/src/main/java/com/xabber/android/ui/activity/BaseLoginActivity.java
+++ b/xabber/src/main/java/com/xabber/android/ui/activity/BaseLoginActivity.java
@@ -221,7 +221,7 @@ public void failure(TwitterException exception) {
         };
     }
 
-    private void loginSocial(String provider, String token) {
+    private void loginSocial(final String provider, final String token) {
         showProgress(getString(R.string.progress_title_login));
         Subscription loginSocialSubscription = AuthManager.loginSocial(provider, token)
                 .subscribeOn(Schedulers.io())
@@ -234,13 +234,14 @@ public void call(XAccountTokenDTO s) {
                 }, new Action1<Throwable>() {
                     @Override
                     public void call(Throwable throwable) {
-                        handleErrorSocialLogin(throwable);
+                        handleErrorSocialLogin(throwable, token, provider);
                     }
                 });
         compositeSubscription.add(loginSocialSubscription);
     }
 
-    private void loginSocialTwitter(String token, String twitterTokenSecret, String secret, String key) {
+    // TODO: 08.08.18 что передавать в twitter ?
+    private void loginSocialTwitter(final String token, String twitterTokenSecret, String secret, String key) {
         showProgress(getString(R.string.progress_title_login));
         Subscription loginSocialSubscription = AuthManager.loginSocialTwitter(token, twitterTokenSecret, secret, key)
                 .subscribeOn(Schedulers.io())
@@ -253,7 +254,7 @@ public void call(XAccountTokenDTO s) {
                 }, new Action1<Throwable>() {
                     @Override
                     public void call(Throwable throwable) {
-                        handleErrorSocialLogin(throwable);
+                        handleErrorSocialLogin(throwable, token, "twitter");
                     }
                 });
         compositeSubscription.add(loginSocialSubscription);
@@ -295,9 +296,23 @@ private void handleErrorLogin(Throwable throwable) {
         }
     }
 
-    private void handleErrorSocialLogin(Throwable throwable) {
-        Log.d(TAG, "Error while social login request: " + throwable.toString());
-        Toast.makeText(this, R.string.social_auth_fail, Toast.LENGTH_LONG).show();
+    private void handleErrorSocialLogin(Throwable throwable, String socialToken, String provider) {
+        String message = RetrofitErrorConverter.throwableToHttpError(throwable);
+        if (message != null) {
+            if (message.contains("is not attached to any Xabber account")) {
+                // go to sign up
+                Intent intent = XabberAccountInfoActivity.createIntent(BaseLoginActivity.this);
+                intent.putExtra(XabberAccountInfoActivity.SOCIAL_TOKEN, socialToken);
+                intent.putExtra(XabberAccountInfoActivity.SOCIAL_PROVIDER, provider);
+                startActivity(intent);
+            } else {
+                Log.d(TAG, "Error while social login request: " + message);
+                Toast.makeText(this, R.string.social_auth_fail, Toast.LENGTH_LONG).show();
+            }
+        } else {
+            Log.d(TAG, "Error while social login request: " + throwable.toString());
+            Toast.makeText(this, R.string.social_auth_fail, Toast.LENGTH_LONG).show();
+        }
         hideProgress();
     }
 
@@ -385,7 +400,7 @@ public void call(Throwable throwable) {
         compositeSubscription.add(getAccountSubscription);
     }
 
-    private void handleSuccessGetAccountAfterSignUp(XabberAccount account) {
+    public void handleSuccessGetAccountAfterSignUp(XabberAccount account) {
         hideProgress();
 
         Intent intent = XabberAccountInfoActivity.createIntent(this);
diff --git a/xabber/src/main/java/com/xabber/android/ui/activity/IntroActivity.java b/xabber/src/main/java/com/xabber/android/ui/activity/IntroActivity.java
index 76a3f01eec..ff74d48625 100644
--- a/xabber/src/main/java/com/xabber/android/ui/activity/IntroActivity.java
+++ b/xabber/src/main/java/com/xabber/android/ui/activity/IntroActivity.java
@@ -71,7 +71,7 @@ public void onClick(View v) {
                 loginGoogle();
                 break;
             case R.id.ivTwitter:
-                loginTwitter();
+                //loginTwitter();
                 break;
         }
     }
diff --git a/xabber/src/main/java/com/xabber/android/ui/activity/XabberAccountInfoActivity.java b/xabber/src/main/java/com/xabber/android/ui/activity/XabberAccountInfoActivity.java
index e3d73cbf84..6873dab791 100644
--- a/xabber/src/main/java/com/xabber/android/ui/activity/XabberAccountInfoActivity.java
+++ b/xabber/src/main/java/com/xabber/android/ui/activity/XabberAccountInfoActivity.java
@@ -45,6 +45,7 @@
 import java.util.Locale;
 
 import okhttp3.ResponseBody;
+import rx.Single;
 import rx.Subscription;
 import rx.android.schedulers.AndroidSchedulers;
 import rx.functions.Action1;
@@ -73,6 +74,9 @@ public class XabberAccountInfoActivity extends BaseLoginActivity implements Tool
     public final static String CALL_FROM_LOGIN = "call_from_login";
     private final static String CALL_FROM_SETTINGS = "call_from_settings";
 
+    public final static String SOCIAL_TOKEN = "social_token";
+    public final static String SOCIAL_PROVIDER = "social_provider";
+
     private FragmentTransaction fTrans;
 
     private Toolbar toolbar;
@@ -89,6 +93,8 @@ public class XabberAccountInfoActivity extends BaseLoginActivity implements Tool
     private Fragment fragmentCompleteRegsiter;
     private Fragment fragmentLastStep;
 
+    private String socialToken = null;
+    private String socialProvider = null;
     private String callFrom = CALL_FROM_SETTINGS;
     private boolean needShowSyncDialog = false;
 
@@ -103,7 +109,11 @@ protected void onCreate(Bundle savedInstanceState) {
 
         // handle call from
         Bundle extras = getIntent().getExtras();
-        if (extras != null) callFrom = extras.getString(CALL_FROM);
+        if (extras != null) {
+            callFrom = extras.getString(CALL_FROM);
+            socialToken = extras.getString(SOCIAL_TOKEN);
+            socialProvider = extras.getString(SOCIAL_PROVIDER);
+        }
 
         setContentView(R.layout.activity_xabber_account_info);
 
@@ -292,7 +302,7 @@ public void showXMPPConfirmFragment(String jid) {
 
     public void showSignUpFragment() {
         if (fragmentSignUp == null)
-            fragmentSignUp = new XAccountSignUpFragment();
+            fragmentSignUp = XAccountSignUpFragment.newInstance(socialToken, socialProvider);
 
         fTrans = getFragmentManager().beginTransaction();
         fTrans.replace(R.id.container, fragmentSignUp, FRAGMENT_SIGNUP);
@@ -985,13 +995,19 @@ private void handleErrorGetHosts(Throwable throwable) {
 
     public void signUp(String username, String host, String pass, String captchaToken) {
         showProgress("Sign Up..");
-        Subscription signUpSubscription = AuthManager.signupv2(username, host, pass, captchaToken)
+
+        Single<XabberAccount> signUpSingle;
+        if (socialToken != null && socialProvider != null)
+            signUpSingle = AuthManager.signupv2(username, host, pass, socialProvider, socialToken);
+        else signUpSingle = AuthManager.signupv2(username, host, pass, captchaToken);
+
+        Subscription signUpSubscription = signUpSingle
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribe(new Action1<XabberAccount>() {
                     @Override
                     public void call(XabberAccount account) {
-                        handleSuccessSignUp(account);
+                        handleSuccessGetAccountAfterSignUp(account);
                     }
                 }, new Action1<Throwable>() {
                     @Override
@@ -1002,11 +1018,6 @@ public void call(Throwable throwable) {
         compositeSubscription.add(signUpSubscription);
     }
 
-    private void handleSuccessSignUp(XabberAccount account) {
-        hideProgress();
-        Toast.makeText(this, account.getUsername(), Toast.LENGTH_LONG).show();
-    }
-
     private void handleErrorSignUp(Throwable throwable) {
         hideProgress();
 
diff --git a/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountSignUpFragment.java b/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountSignUpFragment.java
index 61bc62bb14..4e39517e35 100644
--- a/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountSignUpFragment.java
+++ b/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountSignUpFragment.java
@@ -12,6 +12,7 @@
 import android.widget.Button;
 import android.widget.EditText;
 import android.widget.Spinner;
+import android.widget.TextView;
 
 import com.google.android.gms.common.api.ApiException;
 import com.google.android.gms.common.api.CommonStatusCodes;
@@ -27,12 +28,33 @@
 public class XAccountSignUpFragment extends Fragment implements View.OnClickListener {
 
     private static final String CAPTCHA_TOKEN = "RECAPTCHA";
+    private static final String SOCIAL_TOKEN = "SOCIAL_TOKEN";
+    private static final String SOCIAL_PROVIDER = "SOCIAL_PROVIDER";
 
     private EditText edtUsername;
     private EditText edtPass;
     private Spinner spinnerDomain;
     private Button btnSignUp;
 
+    private String socialToken;
+    private String socialProvider;
+
+    public static XAccountSignUpFragment newInstance(String socialToken, String socialProvider) {
+        XAccountSignUpFragment fragment = new XAccountSignUpFragment();
+        Bundle args = new Bundle();
+        args.putString(SOCIAL_TOKEN, socialToken);
+        args.putString(SOCIAL_PROVIDER, socialProvider);
+        fragment.setArguments(args);
+        return fragment;
+    }
+
+    @Override
+    public void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        this.socialToken = getArguments().getString(SOCIAL_TOKEN);
+        this.socialProvider = getArguments().getString(SOCIAL_PROVIDER);
+    }
+
     @Nullable
     @Override
     public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, Bundle savedInstanceState) {
@@ -49,6 +71,9 @@ public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
         btnSignUp = view.findViewById(R.id.btnSignUp);
 
         btnSignUp.setOnClickListener(this);
+
+        TextView tvSocialProvider = view.findViewById(R.id.tvSocialProvider);
+        tvSocialProvider.setText(socialProvider);
     }
 
     @Override
@@ -72,7 +97,11 @@ private void onSignUpClick() {
         String pass = edtPass.getText().toString().trim();
 
         if (verifyFields(username, pass)) {
-            getCaptchaToken(username, pass, spinnerDomain.getSelectedItem().toString());
+            // todo оставить только одно место для хранения socialToken. infoActivity или этот фрагмент
+            if (socialToken != null)
+                ((XabberAccountInfoActivity)getActivity()).signUp(username,
+                        spinnerDomain.getSelectedItem().toString(), pass, null);
+            else getCaptchaToken(username, pass, spinnerDomain.getSelectedItem().toString());
         }
     }
 
diff --git a/xabber/src/main/java/com/xabber/android/utils/RetrofitErrorConverter.java b/xabber/src/main/java/com/xabber/android/utils/RetrofitErrorConverter.java
index d228ac9c8c..97a7db4cfa 100644
--- a/xabber/src/main/java/com/xabber/android/utils/RetrofitErrorConverter.java
+++ b/xabber/src/main/java/com/xabber/android/utils/RetrofitErrorConverter.java
@@ -42,6 +42,8 @@ public static String throwableToHttpError(Throwable throwable) {
             if (error != null) {
                 if (error.getDetail() != null)
                     errorMessage = error.getDetail();
+                else if (error.getDetails() != null)
+                    errorMessage = error.getDetails();
                 else if (error.getEmail() != null && error.getEmail().size() > 0)
                     errorMessage = error.getEmail().get(0);
                 else if (error.getCredentials() != null && error.getCredentials().size() > 0)
@@ -60,15 +62,17 @@ else if (error.getPhone() != null && error.getPhone().size() > 0)
 
     class APIError {
         private String detail;
+        private String details;
         private ArrayList<String> email;
         private ArrayList<String> credentials;
         private ArrayList<String> code;
         private ArrayList<String> username;
         private ArrayList<String> phone;
 
-        public APIError(String detail, ArrayList<String> email, ArrayList<String> credentials,
+        public APIError(String detail, String details, ArrayList<String> email, ArrayList<String> credentials,
                         ArrayList<String> code, ArrayList<String> username, ArrayList<String> phone) {
             this.detail = detail;
+            this.details = details;
             this.email = email;
             this.credentials = credentials;
             this.code = code;
@@ -80,6 +84,10 @@ public String getDetail() {
             return detail;
         }
 
+        public String getDetails() {
+            return details;
+        }
+
         public ArrayList<String> getEmail() {
             return email;
         }
diff --git a/xabber/src/main/res/layout/fragment_xaccount_signup.xml b/xabber/src/main/res/layout/fragment_xaccount_signup.xml
index f47aa974a3..1ed53da695 100644
--- a/xabber/src/main/res/layout/fragment_xaccount_signup.xml
+++ b/xabber/src/main/res/layout/fragment_xaccount_signup.xml
@@ -83,6 +83,14 @@
             android:text="@string/button_complete_registration"
             />
 
+        <TextView
+            android:id="@+id/tvSocialProvider"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:paddingLeft="4dp"
+            android:textColor="@color/black_text_secondary"
+            />
+
     </LinearLayout>
 
 

From ff07932836c3c4dffbabe68ae988310f6f33f7d2 Mon Sep 17 00:00:00 2001
From: Valery Miller <valera_miller94@mail.ru>
Date: Fri, 10 Aug 2018 12:00:57 +0500
Subject: [PATCH 016/251] Changes in xmpp-auth flow: requests store in map. On
 request xmpp-code - add API-jid to roster

---
 .../data/xaccount/XMPPAuthManager.java        | 123 ++++++++++++++----
 .../activity/XabberAccountInfoActivity.java   |   2 +-
 2 files changed, 97 insertions(+), 28 deletions(-)

diff --git a/xabber/src/main/java/com/xabber/android/data/xaccount/XMPPAuthManager.java b/xabber/src/main/java/com/xabber/android/data/xaccount/XMPPAuthManager.java
index da149f1d12..4c451b0b49 100644
--- a/xabber/src/main/java/com/xabber/android/data/xaccount/XMPPAuthManager.java
+++ b/xabber/src/main/java/com/xabber/android/data/xaccount/XMPPAuthManager.java
@@ -3,19 +3,31 @@
 import android.util.Log;
 
 import com.xabber.android.data.Application;
+import com.xabber.android.data.NetworkException;
 import com.xabber.android.data.connection.ConnectionItem;
 import com.xabber.android.data.connection.listeners.OnConnectedListener;
 import com.xabber.android.data.connection.listeners.OnPacketListener;
 import com.xabber.android.data.entity.AccountJid;
+import com.xabber.android.data.entity.UserJid;
 import com.xabber.android.data.extension.privatestorage.PrivateStorageManager;
+import com.xabber.android.data.log.LogManager;
+import com.xabber.android.data.roster.PresenceManager;
+import com.xabber.android.data.roster.RosterManager;
 
+import org.jivesoftware.smack.SmackException;
+import org.jivesoftware.smack.XMPPException;
 import org.jivesoftware.smack.packet.Message;
 import org.jivesoftware.smack.packet.StandardExtensionElement;
 import org.jivesoftware.smack.packet.Stanza;
+import org.jxmpp.stringprep.XmppStringprepException;
 
 import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
+import io.realm.internal.Collection;
 import rx.android.schedulers.AndroidSchedulers;
 import rx.functions.Action1;
 import rx.schedulers.Schedulers;
@@ -29,11 +41,7 @@ public class XMPPAuthManager implements OnPacketListener, OnConnectedListener {
     private static XMPPAuthManager instance;
     private PublishSubject<String> authCodeSubscribe = PublishSubject.create();
     private List<AccountJid> accountsForCheck = new ArrayList<>();
-
-    private String lastRequestId = null;
-    private String apiJid = null;
-    private String authCode;
-    private AccountJid authJid;
+    private Map<String, Request> requests = new HashMap<>();
 
     public static XMPPAuthManager getInstance() {
         if (instance == null) instance = new XMPPAuthManager();
@@ -44,9 +52,9 @@ public PublishSubject<String> subscribeForAuthCode() {
         return authCodeSubscribe;
     }
 
-    public void updateRequestId(String requestId, String apiJid) {
-        this.lastRequestId = requestId;
-        this.apiJid = apiJid;
+    public void addRequest(String requestId, String apiJid, String clientJid) {
+        onRequestReceived(new Request(requestId, clientJid, apiJid));
+        addContactToRoster(apiJid, clientJid);
     }
 
     public void addAccountForCheck(AccountJid accountJid) {
@@ -55,23 +63,21 @@ public void addAccountForCheck(AccountJid accountJid) {
 
     @Override
     public void onStanza(ConnectionItem connection, Stanza packet) {
-
-        if (apiJid == null || lastRequestId == null) return;
-
         if (packet instanceof Message) {
             Message message = (Message) packet;
-            if (apiJid.equals(message.getFrom().toString())) {
-                if (lastRequestId.equals(message.getStanzaId())) {
 
-                    StandardExtensionElement extensionElement = (StandardExtensionElement)
-                            message.getExtension(EXTENSION_NAMESPACE);
-                    this.authCode = extensionElement.getAttributeValue(ATTRIBUTE_ID);
-                    authCodeSubscribe.onNext(this.authCode);
+            String apiJid = message.getFrom().toString();
+            String clientJid = message.getTo().toString();
+            String requestId = message.getStanzaId();
+            String code = null;
 
-                    // if login running in background
-                    if (authJid != null && authCode != null) confirmXMPP(authJid, authCode);
-                }
-            }
+            StandardExtensionElement extensionElement = (StandardExtensionElement)
+                    message.getExtension(EXTENSION_NAMESPACE);
+            if (extensionElement != null) code = extensionElement.getAttributeValue(ATTRIBUTE_ID);
+
+            if (requestId != null && code != null)
+                onRequestReceived(new Request(requestId, clientJid, apiJid, code));
+            //authCodeSubscribe.onNext(this.authCode);
         }
     }
 
@@ -106,8 +112,7 @@ private void requestXMPPAuthCode(final AccountJid accountJid) {
                 @Override
                 public void call(AuthManager.XMPPCode code) {
                     Log.d(XMPPAuthManager.class.toString(), "xmpp auth code requested successfully");
-                    updateRequestId(code.getRequestId(), code.getApiJid());
-                    authJid = accountJid;
+                    addRequest(code.getRequestId(), code.getApiJid(), accountJid.getFullJid().toString());
                 }
             }, new Action1<Throwable>() {
                 @Override
@@ -117,10 +122,9 @@ public void call(Throwable throwable) {
             });
     }
 
-    private void confirmXMPP(AccountJid accountJid, String code) {
-        Log.d(XMPPAuthManager.class.toString(), "confirm account: "
-                + accountJid.getFullJid().toString());
-        AuthManager.confirmXMPP(accountJid.getFullJid().toString(), code)
+    private void confirmXMPP(Request request) {
+        Log.d(XMPPAuthManager.class.toString(), "confirm account: " + request.clientJid);
+        AuthManager.confirmXMPP(request.clientJid, request.code)
             .subscribeOn(Schedulers.io())
             .observeOn(AndroidSchedulers.mainThread())
             .subscribe(new Action1<XabberAccount>() {
@@ -135,4 +139,69 @@ public void call(Throwable throwable) {
                 }
             });
     }
+
+    private void onRequestReceived(Request request) {
+        if (requests.containsKey(request.id)) {
+            if (request.code == null) request.code = requests.get(request.id).code;
+            confirmXMPP(request);
+        } else requests.put(request.id, request);
+    }
+
+    private void addContactToRoster(String apiJid, String clientJid) {
+        UserJid user;
+        AccountJid account;
+        try {
+            user = UserJid.from(apiJid);
+            account = AccountJid.from(clientJid);
+
+            RosterManager.getInstance().createContact(account, user,
+                    "xabber", Collections.EMPTY_LIST);
+            PresenceManager.getInstance().requestSubscription(account, user);
+
+        } catch (UserJid.UserJidCreateException | XmppStringprepException | InterruptedException |
+                SmackException | NetworkException | XMPPException.XMPPErrorException e) {
+            LogManager.exception(this, e);
+            return;
+        }
+    }
+
+    class Request {
+        private String id;
+        private String clientJid;
+        private String apiJid;
+        private String code;
+
+        public Request(String id, String clientJid, String apiJid) {
+            this.id = id;
+            this.clientJid = clientJid;
+            this.apiJid = apiJid;
+        }
+
+        public Request(String id, String clientJid, String apiJid, String code) {
+            this.id = id;
+            this.clientJid = clientJid;
+            this.apiJid = apiJid;
+            this.code = code;
+        }
+
+        public void setCode(String code) {
+            this.code = code;
+        }
+
+        public String getId() {
+            return id;
+        }
+
+        public String getClientJid() {
+            return clientJid;
+        }
+
+        public String getApiJid() {
+            return apiJid;
+        }
+
+        public String getCode() {
+            return code;
+        }
+    }
 }
diff --git a/xabber/src/main/java/com/xabber/android/ui/activity/XabberAccountInfoActivity.java b/xabber/src/main/java/com/xabber/android/ui/activity/XabberAccountInfoActivity.java
index 6873dab791..32a08da7fa 100644
--- a/xabber/src/main/java/com/xabber/android/ui/activity/XabberAccountInfoActivity.java
+++ b/xabber/src/main/java/com/xabber/android/ui/activity/XabberAccountInfoActivity.java
@@ -899,7 +899,7 @@ public void call(Throwable throwable) {
 
     private void handleSuccessRequestXMPPCode(AuthManager.XMPPCode code, String jid) {
         hideProgress();
-        XMPPAuthManager.getInstance().updateRequestId(code.getRequestId(), code.getApiJid());
+        XMPPAuthManager.getInstance().addRequest(code.getRequestId(), code.getApiJid(), jid);
         showXMPPConfirmFragment(jid);
     }
 

From 9d6e419ddd7a1015d7c3119e3fd528d814425c5c Mon Sep 17 00:00:00 2001
From: Valery Miller <valera_miller94@mail.ru>
Date: Fri, 10 Aug 2018 14:57:24 +0500
Subject: [PATCH 017/251] Start work on social bindings

---
 .../android/data/xaccount/AuthManager.java    |  28 ++++
 .../android/data/xaccount/IXabberApi.java     |   6 +
 .../fragment/XabberAccountInfoFragment.java   |  60 +++++++
 .../layout/fragment_xabber_account_info.xml   | 153 ++++++++++++++++++
 4 files changed, 247 insertions(+)

diff --git a/xabber/src/main/java/com/xabber/android/data/xaccount/AuthManager.java b/xabber/src/main/java/com/xabber/android/data/xaccount/AuthManager.java
index 6f7e23ec92..37802e599e 100644
--- a/xabber/src/main/java/com/xabber/android/data/xaccount/AuthManager.java
+++ b/xabber/src/main/java/com/xabber/android/data/xaccount/AuthManager.java
@@ -323,6 +323,26 @@ public Single<? extends XabberAccount> call(XabberAccountDTO xabberAccountDTO) {
                 });
     }
 
+    public static Single<ResponseBody> bindSocial(String provider, String socialToken) {
+        Gson gson = new Gson();
+        String credentials = gson.toJson(new AccessToken(socialToken));
+        return HttpApiManager.getXabberApi().bindSocial(getXabberTokenHeader(),
+                new SocialAuthRequest(provider, credentials, getSource()));
+    }
+
+    public static Single<ResponseBody> bindSocial(String socialToken, String twitterTokenSecret,
+                                                  String secret, String key) {
+        Gson gson = new Gson();
+        String credentials = gson.toJson(new TwitterAccessToken(
+                new TwitterTokens(twitterTokenSecret, socialToken), secret, key));
+        return HttpApiManager.getXabberApi().bindSocial(getXabberTokenHeader(),
+                new SocialAuthRequest(PROVIDER_TWITTER, credentials, getSource()));
+    }
+
+    public static Single<ResponseBody> unbindSocial(String provider) {
+        return HttpApiManager.getXabberApi().unbindSocial(getXabberTokenHeader(), new Provider(provider));
+    }
+
     // support
 
     private static String getXabberTokenHeader() {
@@ -518,6 +538,14 @@ public Email(String email, String source) {
         }
     }
 
+    public static class Provider {
+        final String provider;
+
+        public Provider(String provider) {
+            this.provider = provider;
+        }
+    }
+
     public static class SocialAuthRequest {
         final String provider;
         final String credentials;
diff --git a/xabber/src/main/java/com/xabber/android/data/xaccount/IXabberApi.java b/xabber/src/main/java/com/xabber/android/data/xaccount/IXabberApi.java
index 945d59a6ae..df2687da5b 100644
--- a/xabber/src/main/java/com/xabber/android/data/xaccount/IXabberApi.java
+++ b/xabber/src/main/java/com/xabber/android/data/xaccount/IXabberApi.java
@@ -78,5 +78,11 @@ public interface IXabberApi {
 
     @POST("accounts/signup/")
     Single<XabberAccountDTO> signupv2(@Body AuthManager.SignUpFields fields);
+
+    @POST("accounts/current/social_bind")
+    Single<ResponseBody> bindSocial(@Header("Authorization") String token, @Body AuthManager.SocialAuthRequest body);
+
+    @POST("accounts/current/social_unbind")
+    Single<ResponseBody> unbindSocial(@Header("Authorization") String token, @Body AuthManager.Provider provider);
 }
 
diff --git a/xabber/src/main/java/com/xabber/android/ui/fragment/XabberAccountInfoFragment.java b/xabber/src/main/java/com/xabber/android/ui/fragment/XabberAccountInfoFragment.java
index a5351c28d4..6a87e240b4 100644
--- a/xabber/src/main/java/com/xabber/android/ui/fragment/XabberAccountInfoFragment.java
+++ b/xabber/src/main/java/com/xabber/android/ui/fragment/XabberAccountInfoFragment.java
@@ -12,6 +12,7 @@
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.CheckBox;
+import android.widget.LinearLayout;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 import android.widget.Toast;
@@ -20,6 +21,7 @@
 import com.xabber.android.R;
 import com.xabber.android.data.SettingsManager;
 import com.xabber.android.data.xaccount.AuthManager;
+import com.xabber.android.data.xaccount.SocialBindingDTO;
 import com.xabber.android.data.xaccount.XMPPAccountSettings;
 import com.xabber.android.data.xaccount.XabberAccount;
 import com.xabber.android.data.xaccount.XabberAccountManager;
@@ -50,6 +52,17 @@ public class XabberAccountInfoFragment extends Fragment {
     private TextView tvLastSyncDate;
     private RelativeLayout rlLogout;
     private RelativeLayout rlSync;
+
+    private TextView tvStatusGoogle;
+    private TextView tvActionGoogle;
+    private LinearLayout itemGoogle;
+    private TextView tvStatusFacebook;
+    private TextView tvActionFacebook;
+    private LinearLayout itemFacebook;
+    private TextView tvStatusTwitter;
+    private TextView tvActionTwitter;
+    private LinearLayout itemTwitter;
+
     private boolean dialogShowed;
 
     private CompositeSubscription compositeSubscription = new CompositeSubscription();
@@ -92,6 +105,36 @@ public void onClick(View v) {
             }
         });
 
+        tvStatusGoogle = view.findViewById(R.id.tvStatusGoogle);
+        tvActionGoogle = view.findViewById(R.id.tvActionGoogle);
+        itemGoogle = view.findViewById(R.id.itemGoogle);
+        itemGoogle.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+
+            }
+        });
+
+        tvStatusFacebook = view.findViewById(R.id.tvStatusFacebook);
+        tvActionFacebook = view.findViewById(R.id.tvActionFacebook);
+        itemFacebook = view.findViewById(R.id.itemFacebook);
+        itemFacebook.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+
+            }
+        });
+
+        tvStatusTwitter = view.findViewById(R.id.tvStatusTwitter);
+        tvActionTwitter = view.findViewById(R.id.tvActionTwitter);
+        itemTwitter = view.findViewById(R.id.itemTwitter);
+        itemTwitter.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+
+            }
+        });
+
         if (getArguments().getBoolean("SHOW_SYNC", false))
             showSyncDialog(true);
     }
@@ -131,6 +174,8 @@ public void updateData(@NonNull XabberAccount account) {
             String phone = account.getPhone();
             tvPhone.setText(phone != null ? phone : getString(R.string.no_phone));
         } else tvPhone.setVisibility(View.GONE);
+
+        setupSocial(account.getSocialBindings());
     }
 
     public void updateLastSyncTime() {
@@ -201,4 +246,19 @@ public void onClick(DialogInterface dialog, int which) {
         dialog.show();
         dialogShowed = false;
     }
+
+    private void setupSocial(List<SocialBindingDTO> socialBindings) {
+        for (SocialBindingDTO socialBinding : socialBindings) {
+            if ("google".equals(socialBinding.getProvider())) {
+                tvStatusGoogle.setText(socialBinding.getFirstName() + " " + socialBinding.getLastName());
+                tvActionGoogle.setText("DISCONNECT");
+            } else if ("facebook".equals(socialBinding.getProvider())) {
+                tvStatusFacebook.setText(socialBinding.getFirstName() + " " + socialBinding.getLastName());
+                tvActionFacebook.setText("DISCONNECT");
+            } else if ("twitter".equals(socialBinding.getProvider())) {
+                tvStatusTwitter.setText(socialBinding.getFirstName() + " " + socialBinding.getLastName());
+                tvActionTwitter.setText("DISCONNECT");
+            }
+        }
+    }
 }
diff --git a/xabber/src/main/res/layout/fragment_xabber_account_info.xml b/xabber/src/main/res/layout/fragment_xabber_account_info.xml
index 1ace4f038d..0c068c59cb 100644
--- a/xabber/src/main/res/layout/fragment_xabber_account_info.xml
+++ b/xabber/src/main/res/layout/fragment_xabber_account_info.xml
@@ -224,4 +224,157 @@
         </RelativeLayout>
     </android.support.v7.widget.CardView>
 
+    <android.support.v7.widget.CardView
+        android:id="@+id/cardSocial"
+        android:layout_marginTop="12dp"
+        android:layout_below="@id/cardInfo"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        >
+
+        <LinearLayout
+            android:orientation="vertical"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            >
+
+            <LinearLayout
+                android:id="@+id/itemGoogle"
+                android:layout_width="match_parent"
+                android:layout_height="48dp"
+                android:paddingLeft="24dp"
+                android:paddingRight="16dp"
+                android:paddingTop="8dp"
+                android:paddingBottom="8dp"
+                android:clickable="true"
+                android:background="?android:attr/selectableItemBackground"
+                >
+
+                <ImageView
+                    android:layout_width="24dp"
+                    android:layout_height="24dp"
+                    android:src="@drawable/ic_google_plus"
+                    android:layout_gravity="center_vertical"
+                    />
+
+                <TextView
+                    android:id="@+id/tvStatusGoogle"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
+                    android:layout_marginLeft="24dp"
+                    android:textColor="?android:attr/textColorPrimary"
+                    android:text="Not connected"
+                    />
+
+                <TextView
+                    android:id="@+id/tvActionGoogle"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="24dp"
+                    android:gravity="right"
+                    android:layout_gravity="center_vertical"
+                    android:textColor="?android:attr/textColorPrimary"
+                    android:text="CONNECT"
+                    />
+
+            </LinearLayout>
+
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="1dp"
+                android:background="?attr/settings_separator_background_color"
+                />
+
+            <LinearLayout
+                android:id="@+id/itemFacebook"
+                android:layout_width="match_parent"
+                android:layout_height="48dp"
+                android:paddingLeft="24dp"
+                android:paddingRight="16dp"
+                android:paddingTop="8dp"
+                android:paddingBottom="8dp"
+                android:clickable="true"
+                android:background="?android:attr/selectableItemBackground"
+                >
+
+                <ImageView
+                    android:layout_width="24dp"
+                    android:layout_height="24dp"
+                    android:src="@drawable/ic_facebook"
+                    android:layout_gravity="center_vertical"
+                    />
+
+                <TextView
+                    android:id="@+id/tvStatusFacebook"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
+                    android:layout_marginLeft="24dp"
+                    android:textColor="?android:attr/textColorPrimary"
+                    android:text="Not connected"
+                    />
+
+                <TextView
+                    android:id="@+id/tvActionFacebook"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="24dp"
+                    android:layout_gravity="center_vertical"
+                    android:gravity="right"
+                    android:textColor="?android:attr/textColorPrimary"
+                    android:text="CONNECT"
+                    />
+
+            </LinearLayout>
+
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="1dp"
+                android:background="?attr/settings_separator_background_color"
+                />
+
+            <LinearLayout
+                android:id="@+id/itemTwitter"
+                android:layout_width="match_parent"
+                android:layout_height="48dp"
+                android:paddingLeft="24dp"
+                android:paddingRight="16dp"
+                android:paddingTop="8dp"
+                android:paddingBottom="8dp"
+                android:clickable="true"
+                android:background="?android:attr/selectableItemBackground"
+                >
+
+                <ImageView
+                    android:layout_width="24dp"
+                    android:layout_height="24dp"
+                    android:src="@drawable/ic_twitter"
+                    android:layout_gravity="center_vertical"
+                    />
+
+                <TextView
+                    android:id="@+id/tvStatusTwitter"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
+                    android:layout_marginLeft="24dp"
+                    android:textColor="?android:attr/textColorPrimary"
+                    android:text="Not connected"
+                    />
+
+                <TextView
+                    android:id="@+id/tvActionTwitter"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
+                    android:gravity="right"
+                    android:layout_marginLeft="24dp"
+                    android:textColor="?android:attr/textColorPrimary"
+                    android:text="CONNECT"
+                    />
+
+            </LinearLayout>
+        </LinearLayout>
+    </android.support.v7.widget.CardView>
 </RelativeLayout>
\ No newline at end of file

From c0195ac2f24b1168c5f9cb6f416ea54562f7851b Mon Sep 17 00:00:00 2001
From: Valery Miller <valera_miller94@mail.ru>
Date: Mon, 13 Aug 2018 12:17:42 +0500
Subject: [PATCH 018/251] Added list of emails in Xabber Account info

---
 .../android/ui/adapter/EmailAdapter.java      | 51 +++++++++++++++++++
 .../fragment/XabberAccountInfoFragment.java   | 19 +++++++
 xabber/src/main/res/drawable/ic_email.xml     |  8 +++
 .../layout/fragment_xabber_account_info.xml   | 34 +++++++++++++
 xabber/src/main/res/layout/item_email.xml     | 31 +++++++++++
 5 files changed, 143 insertions(+)
 create mode 100644 xabber/src/main/java/com/xabber/android/ui/adapter/EmailAdapter.java
 create mode 100644 xabber/src/main/res/drawable/ic_email.xml
 create mode 100644 xabber/src/main/res/layout/item_email.xml

diff --git a/xabber/src/main/java/com/xabber/android/ui/adapter/EmailAdapter.java b/xabber/src/main/java/com/xabber/android/ui/adapter/EmailAdapter.java
new file mode 100644
index 0000000000..9661b68fb4
--- /dev/null
+++ b/xabber/src/main/java/com/xabber/android/ui/adapter/EmailAdapter.java
@@ -0,0 +1,51 @@
+package com.xabber.android.ui.adapter;
+
+import android.support.v7.widget.RecyclerView;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.TextView;
+
+import com.xabber.android.R;
+import com.xabber.android.data.xaccount.EmailDTO;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class EmailAdapter extends RecyclerView.Adapter<EmailAdapter.EmailViewHolder> {
+
+    private List<EmailDTO> emails = new ArrayList();
+
+    public void setItems(List<EmailDTO> emails) {
+        this.emails.clear();
+        this.emails.addAll(emails);
+    }
+
+    @Override
+    public EmailViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
+        View view = LayoutInflater.from(parent.getContext()).inflate(R.layout.item_email, parent, false);
+        return new EmailViewHolder(view);
+    }
+
+    @Override
+    public void onBindViewHolder(EmailViewHolder holder, int position) {
+        EmailDTO emailDTO = emails.get(position);
+        holder.tvEmail.setText(emailDTO.getEmail());
+    }
+
+    @Override
+    public int getItemCount() {
+        return emails.size();
+    }
+
+    class EmailViewHolder extends RecyclerView.ViewHolder {
+
+        final TextView tvEmail;
+
+        public EmailViewHolder(View itemView) {
+            super(itemView);
+            this.tvEmail = itemView.findViewById(R.id.tvEmail);
+        }
+    }
+
+}
diff --git a/xabber/src/main/java/com/xabber/android/ui/fragment/XabberAccountInfoFragment.java b/xabber/src/main/java/com/xabber/android/ui/fragment/XabberAccountInfoFragment.java
index 6a87e240b4..3048f2a51f 100644
--- a/xabber/src/main/java/com/xabber/android/ui/fragment/XabberAccountInfoFragment.java
+++ b/xabber/src/main/java/com/xabber/android/ui/fragment/XabberAccountInfoFragment.java
@@ -7,6 +7,8 @@
 import android.os.Bundle;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
+import android.support.v7.widget.LinearLayoutManager;
+import android.support.v7.widget.RecyclerView;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -21,11 +23,13 @@
 import com.xabber.android.R;
 import com.xabber.android.data.SettingsManager;
 import com.xabber.android.data.xaccount.AuthManager;
+import com.xabber.android.data.xaccount.EmailDTO;
 import com.xabber.android.data.xaccount.SocialBindingDTO;
 import com.xabber.android.data.xaccount.XMPPAccountSettings;
 import com.xabber.android.data.xaccount.XabberAccount;
 import com.xabber.android.data.xaccount.XabberAccountManager;
 import com.xabber.android.ui.activity.XabberAccountInfoActivity;
+import com.xabber.android.ui.adapter.EmailAdapter;
 import com.xabber.android.ui.dialog.AccountSyncDialogFragment;
 import com.xabber.android.utils.RetrofitErrorConverter;
 
@@ -63,6 +67,9 @@ public class XabberAccountInfoFragment extends Fragment {
     private TextView tvActionTwitter;
     private LinearLayout itemTwitter;
 
+    private RecyclerView rvEmails;
+    private EmailAdapter emailAdapter;
+
     private boolean dialogShowed;
 
     private CompositeSubscription compositeSubscription = new CompositeSubscription();
@@ -135,6 +142,11 @@ public void onClick(View v) {
             }
         });
 
+        rvEmails = view.findViewById(R.id.rvEmails);
+        rvEmails.setLayoutManager(new LinearLayoutManager(getActivity()));
+        emailAdapter = new EmailAdapter();
+        rvEmails.setAdapter(emailAdapter);
+
         if (getArguments().getBoolean("SHOW_SYNC", false))
             showSyncDialog(true);
     }
@@ -176,6 +188,7 @@ public void updateData(@NonNull XabberAccount account) {
         } else tvPhone.setVisibility(View.GONE);
 
         setupSocial(account.getSocialBindings());
+        setupEmailList(account.getEmails());
     }
 
     public void updateLastSyncTime() {
@@ -261,4 +274,10 @@ private void setupSocial(List<SocialBindingDTO> socialBindings) {
             }
         }
     }
+
+
+    private void setupEmailList(List<EmailDTO> emails) {
+        emailAdapter.setItems(emails);
+        emailAdapter.notifyDataSetChanged();
+    }
 }
diff --git a/xabber/src/main/res/drawable/ic_email.xml b/xabber/src/main/res/drawable/ic_email.xml
new file mode 100644
index 0000000000..48e3553e76
--- /dev/null
+++ b/xabber/src/main/res/drawable/ic_email.xml
@@ -0,0 +1,8 @@
+<!-- drawable/at.xml -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path android:fillColor="#000" android:pathData="M12,15C12.81,15 13.5,14.7 14.11,14.11C14.7,13.5 15,12.81 15,12C15,11.19 14.7,10.5 14.11,9.89C13.5,9.3 12.81,9 12,9C11.19,9 10.5,9.3 9.89,9.89C9.3,10.5 9,11.19 9,12C9,12.81 9.3,13.5 9.89,14.11C10.5,14.7 11.19,15 12,15M12,2C14.75,2 17.1,3 19.05,4.95C21,6.9 22,9.25 22,12V13.45C22,14.45 21.65,15.3 21,16C20.3,16.67 19.5,17 18.5,17C17.3,17 16.31,16.5 15.56,15.5C14.56,16.5 13.38,17 12,17C10.63,17 9.45,16.5 8.46,15.54C7.5,14.55 7,13.38 7,12C7,10.63 7.5,9.45 8.46,8.46C9.45,7.5 10.63,7 12,7C13.38,7 14.55,7.5 15.54,8.46C16.5,9.45 17,10.63 17,12V13.45C17,13.86 17.16,14.22 17.46,14.53C17.76,14.84 18.11,15 18.5,15C18.92,15 19.27,14.84 19.57,14.53C19.87,14.22 20,13.86 20,13.45V12C20,9.81 19.23,7.93 17.65,6.35C16.07,4.77 14.19,4 12,4C9.81,4 7.93,4.77 6.35,6.35C4.77,7.93 4,9.81 4,12C4,14.19 4.77,16.07 6.35,17.65C7.93,19.23 9.81,20 12,20H17V22H12C9.25,22 6.9,21 4.95,19.05C3,17.1 2,14.75 2,12C2,9.25 3,6.9 4.95,4.95C6.9,3 9.25,2 12,2Z" />
+</vector>
\ No newline at end of file
diff --git a/xabber/src/main/res/layout/fragment_xabber_account_info.xml b/xabber/src/main/res/layout/fragment_xabber_account_info.xml
index 0c068c59cb..7c72621a20 100644
--- a/xabber/src/main/res/layout/fragment_xabber_account_info.xml
+++ b/xabber/src/main/res/layout/fragment_xabber_account_info.xml
@@ -377,4 +377,38 @@
             </LinearLayout>
         </LinearLayout>
     </android.support.v7.widget.CardView>
+
+    <android.support.v7.widget.CardView
+        android:id="@+id/cardEmail"
+        android:layout_marginTop="12dp"
+        android:layout_below="@id/cardSocial"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        >
+
+        <LinearLayout
+            android:orientation="vertical"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent">
+
+            <android.support.v7.widget.RecyclerView
+                android:id="@+id/rvEmails"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:nestedScrollingEnabled="false"
+                tools:listitem="@layout/item_email"
+                />
+
+            <Button
+                android:id="@+id/btnAddEmail"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="bind email"
+                android:textColor="@color/teal_500"
+                style="@style/Widget.AppCompat.Button.Borderless"
+                />
+
+        </LinearLayout>
+
+    </android.support.v7.widget.CardView>
 </RelativeLayout>
\ No newline at end of file
diff --git a/xabber/src/main/res/layout/item_email.xml b/xabber/src/main/res/layout/item_email.xml
new file mode 100644
index 0000000000..04a15c86ae
--- /dev/null
+++ b/xabber/src/main/res/layout/item_email.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="horizontal"
+    android:layout_width="match_parent"
+    android:layout_height="48dp"
+    android:paddingLeft="24dp"
+    android:paddingRight="16dp"
+    android:paddingTop="8dp"
+    android:paddingBottom="8dp"
+    android:clickable="true"
+    android:background="?android:attr/selectableItemBackground"
+    >
+
+    <ImageView
+        android:layout_width="24dp"
+        android:layout_height="24dp"
+        android:src="@drawable/ic_email"
+        android:layout_gravity="center_vertical"
+        />
+
+    <TextView
+        android:id="@+id/tvEmail"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_vertical"
+        android:layout_marginLeft="24dp"
+        android:textColor="?android:attr/textColorPrimary"
+        android:text="example@example.com"
+        />
+
+</LinearLayout>
\ No newline at end of file

From ae442d07b0bf364ebcbae937840be54e23522acb Mon Sep 17 00:00:00 2001
From: Valery Miller <valera_miller94@mail.ru>
Date: Mon, 13 Aug 2018 17:14:31 +0500
Subject: [PATCH 019/251] Added dialog for adding email to Xabber Account

---
 .../activity/XabberAccountInfoActivity.java   |  2 +-
 .../ui/dialog/AddEmailDialogFragment.java     | 58 +++++++++++++++++++
 .../fragment/XabberAccountInfoFragment.java   | 18 +++++-
 .../src/main/res/layout/dialog_add_email.xml  | 23 ++++++++
 4 files changed, 99 insertions(+), 2 deletions(-)
 create mode 100644 xabber/src/main/java/com/xabber/android/ui/dialog/AddEmailDialogFragment.java
 create mode 100644 xabber/src/main/res/layout/dialog_add_email.xml

diff --git a/xabber/src/main/java/com/xabber/android/ui/activity/XabberAccountInfoActivity.java b/xabber/src/main/java/com/xabber/android/ui/activity/XabberAccountInfoActivity.java
index 32a08da7fa..6618cd675d 100644
--- a/xabber/src/main/java/com/xabber/android/ui/activity/XabberAccountInfoActivity.java
+++ b/xabber/src/main/java/com/xabber/android/ui/activity/XabberAccountInfoActivity.java
@@ -841,7 +841,7 @@ private void handleErrorSetPhoneNumber(Throwable throwable) {
         }
     }
 
-    private void resendConfirmEmail(String email) {
+    public void resendConfirmEmail(String email) {
         showProgress(getResources().getString(R.string.progress_title_resend));
         Subscription resendEmailSubscription = AuthManager.addEmail(email)
                 .subscribeOn(Schedulers.io())
diff --git a/xabber/src/main/java/com/xabber/android/ui/dialog/AddEmailDialogFragment.java b/xabber/src/main/java/com/xabber/android/ui/dialog/AddEmailDialogFragment.java
new file mode 100644
index 0000000000..2741992e59
--- /dev/null
+++ b/xabber/src/main/java/com/xabber/android/ui/dialog/AddEmailDialogFragment.java
@@ -0,0 +1,58 @@
+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 android.view.LayoutInflater;
+import android.view.View;
+import android.widget.EditText;
+
+import com.xabber.android.R;
+
+public class AddEmailDialogFragment extends DialogFragment {
+
+    private Listener listener;
+    private EditText edtEmail;
+
+    public interface Listener {
+        void onAddEmailClick(String email);
+    }
+
+    public static AddEmailDialogFragment newInstance(Listener listener) {
+        AddEmailDialogFragment fragment = new AddEmailDialogFragment();
+        fragment.listener = listener;
+        return fragment;
+    }
+
+    @Override
+    public Dialog onCreateDialog(Bundle savedInstanceState) {
+        AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
+        builder.setView(setupView())
+                .setTitle("Add email")
+                .setNegativeButton("Cancel", new DialogInterface.OnClickListener() {
+                    @Override
+                    public void onClick(DialogInterface dialog, int which) {
+
+                    }
+                })
+                .setPositiveButton("Add", new DialogInterface.OnClickListener() {
+                    @Override
+                    public void onClick(DialogInterface dialog, int which) {
+                        listener.onAddEmailClick(edtEmail.getText().toString());
+                    }
+                });
+
+        return builder.create();
+    }
+
+    public View setupView() {
+        LayoutInflater inflater = getActivity().getLayoutInflater();
+        View view = inflater.inflate(R.layout.dialog_add_email, null);
+
+        edtEmail = view.findViewById(R.id.edtEmail);
+
+        return view;
+    }
+}
diff --git a/xabber/src/main/java/com/xabber/android/ui/fragment/XabberAccountInfoFragment.java b/xabber/src/main/java/com/xabber/android/ui/fragment/XabberAccountInfoFragment.java
index 3048f2a51f..72f16dd729 100644
--- a/xabber/src/main/java/com/xabber/android/ui/fragment/XabberAccountInfoFragment.java
+++ b/xabber/src/main/java/com/xabber/android/ui/fragment/XabberAccountInfoFragment.java
@@ -13,6 +13,7 @@
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.Button;
 import android.widget.CheckBox;
 import android.widget.LinearLayout;
 import android.widget.RelativeLayout;
@@ -31,6 +32,7 @@
 import com.xabber.android.ui.activity.XabberAccountInfoActivity;
 import com.xabber.android.ui.adapter.EmailAdapter;
 import com.xabber.android.ui.dialog.AccountSyncDialogFragment;
+import com.xabber.android.ui.dialog.AddEmailDialogFragment;
 import com.xabber.android.utils.RetrofitErrorConverter;
 
 import java.util.List;
@@ -45,7 +47,7 @@
  * Created by valery.miller on 27.07.17.
  */
 
-public class XabberAccountInfoFragment extends Fragment {
+public class XabberAccountInfoFragment extends Fragment implements AddEmailDialogFragment.Listener {
 
     private static final String LOG_TAG = XabberAccountInfoFragment.class.getSimpleName();
 
@@ -69,6 +71,7 @@ public class XabberAccountInfoFragment extends Fragment {
 
     private RecyclerView rvEmails;
     private EmailAdapter emailAdapter;
+    private Button btnAddEmail;
 
     private boolean dialogShowed;
 
@@ -146,6 +149,14 @@ public void onClick(View v) {
         rvEmails.setLayoutManager(new LinearLayoutManager(getActivity()));
         emailAdapter = new EmailAdapter();
         rvEmails.setAdapter(emailAdapter);
+        btnAddEmail = view.findViewById(R.id.btnAddEmail);
+        btnAddEmail.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                AddEmailDialogFragment.newInstance(XabberAccountInfoFragment.this)
+                        .show(getFragmentManager(), AccountSyncDialogFragment.class.getSimpleName());
+            }
+        });
 
         if (getArguments().getBoolean("SHOW_SYNC", false))
             showSyncDialog(true);
@@ -167,6 +178,11 @@ public void onDestroy() {
         compositeSubscription.clear();
     }
 
+    @Override
+    public void onAddEmailClick(String email) {
+        ((XabberAccountInfoActivity)getActivity()).resendConfirmEmail(email);
+    }
+
     public void updateData(@NonNull XabberAccount account) {
         String accountName = account.getFirstName() + " " + account.getLastName();
         if (accountName.trim().isEmpty())
diff --git a/xabber/src/main/res/layout/dialog_add_email.xml b/xabber/src/main/res/layout/dialog_add_email.xml
new file mode 100644
index 0000000000..a0f9fdc01f
--- /dev/null
+++ b/xabber/src/main/res/layout/dialog_add_email.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:padding="16dp"
+    >
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="Please, enter email that you want to attach:"
+        android:layout_marginLeft="4dp"
+        />
+
+    <EditText
+        android:id="@+id/edtEmail"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:hint="email"
+        />
+
+</LinearLayout>
\ No newline at end of file

From e092e995c823ee1b414fc445b592eb2360a45e72 Mon Sep 17 00:00:00 2001
From: Valery Miller <valera_miller94@mail.ru>
Date: Mon, 13 Aug 2018 18:46:57 +0500
Subject: [PATCH 020/251] Added confirm email dialog

---
 .../android/ui/adapter/EmailAdapter.java      | 21 ++++++-
 .../ui/dialog/ConfirmEmailDialogFragment.java | 55 +++++++++++++++++++
 .../fragment/XabberAccountInfoFragment.java   | 11 +++-
 xabber/src/main/res/drawable/ic_email.xml     |  4 +-
 .../main/res/layout/dialog_confirm_email.xml  | 23 ++++++++
 xabber/src/main/res/layout/item_email.xml     | 23 +++++---
 6 files changed, 123 insertions(+), 14 deletions(-)
 create mode 100644 xabber/src/main/java/com/xabber/android/ui/dialog/ConfirmEmailDialogFragment.java
 create mode 100644 xabber/src/main/res/layout/dialog_confirm_email.xml

diff --git a/xabber/src/main/java/com/xabber/android/ui/adapter/EmailAdapter.java b/xabber/src/main/java/com/xabber/android/ui/adapter/EmailAdapter.java
index 9661b68fb4..a28423a587 100644
--- a/xabber/src/main/java/com/xabber/android/ui/adapter/EmailAdapter.java
+++ b/xabber/src/main/java/com/xabber/android/ui/adapter/EmailAdapter.java
@@ -15,6 +15,15 @@
 public class EmailAdapter extends RecyclerView.Adapter<EmailAdapter.EmailViewHolder> {
 
     private List<EmailDTO> emails = new ArrayList();
+    private Listener listener;
+
+    public interface Listener {
+        void onEmailClick(String email);
+    }
+
+    public EmailAdapter(Listener listener) {
+        this.listener = listener;
+    }
 
     public void setItems(List<EmailDTO> emails) {
         this.emails.clear();
@@ -28,9 +37,17 @@ public EmailViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
     }
 
     @Override
-    public void onBindViewHolder(EmailViewHolder holder, int position) {
-        EmailDTO emailDTO = emails.get(position);
+    public void onBindViewHolder(EmailViewHolder holder, final int position) {
+        final EmailDTO emailDTO = emails.get(position);
+
         holder.tvEmail.setText(emailDTO.getEmail());
+
+        holder.itemView.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                listener.onEmailClick(emailDTO.getEmail());
+            }
+        });
     }
 
     @Override
diff --git a/xabber/src/main/java/com/xabber/android/ui/dialog/ConfirmEmailDialogFragment.java b/xabber/src/main/java/com/xabber/android/ui/dialog/ConfirmEmailDialogFragment.java
new file mode 100644
index 0000000000..c9c46aa3cc
--- /dev/null
+++ b/xabber/src/main/java/com/xabber/android/ui/dialog/ConfirmEmailDialogFragment.java
@@ -0,0 +1,55 @@
+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 android.view.LayoutInflater;
+import android.view.View;
+import android.widget.TextView;
+
+import com.xabber.android.R;
+
+public class ConfirmEmailDialogFragment extends DialogFragment {
+
+    private String email;
+
+    public static ConfirmEmailDialogFragment newInstance(String email) {
+        ConfirmEmailDialogFragment fragment = new ConfirmEmailDialogFragment();
+        fragment.email = email;
+        return fragment;
+    }
+
+    @Override
+    public Dialog onCreateDialog(Bundle savedInstanceState) {
+
+        AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
+        builder.setView(setupView())
+                .setTitle("Confirm email")
+                .setNeutralButton("Resend code", new DialogInterface.OnClickListener() {
+                    @Override
+                    public void onClick(DialogInterface dialog, int which) {
+                        //listener.onResendCodeClick();
+                    }
+                })
+                .setPositiveButton("Confirm", new DialogInterface.OnClickListener() {
+                    @Override
+                    public void onClick(DialogInterface dialog, int which) {
+                        //listener.onConfirmEmailClick();
+                    }
+                });
+
+        return builder.create();
+    }
+
+    public View setupView() {
+        LayoutInflater inflater = getActivity().getLayoutInflater();
+        View view = inflater.inflate(R.layout.dialog_confirm_email, null);
+
+        TextView tvDescription = view.findViewById(R.id.tvDescription);
+        tvDescription.setText(getString(R.string.xmpp_confirm_title, email));
+
+        return view;
+    }
+}
diff --git a/xabber/src/main/java/com/xabber/android/ui/fragment/XabberAccountInfoFragment.java b/xabber/src/main/java/com/xabber/android/ui/fragment/XabberAccountInfoFragment.java
index 72f16dd729..f3a5983853 100644
--- a/xabber/src/main/java/com/xabber/android/ui/fragment/XabberAccountInfoFragment.java
+++ b/xabber/src/main/java/com/xabber/android/ui/fragment/XabberAccountInfoFragment.java
@@ -33,6 +33,7 @@
 import com.xabber.android.ui.adapter.EmailAdapter;
 import com.xabber.android.ui.dialog.AccountSyncDialogFragment;
 import com.xabber.android.ui.dialog.AddEmailDialogFragment;
+import com.xabber.android.ui.dialog.ConfirmEmailDialogFragment;
 import com.xabber.android.utils.RetrofitErrorConverter;
 
 import java.util.List;
@@ -47,7 +48,7 @@
  * Created by valery.miller on 27.07.17.
  */
 
-public class XabberAccountInfoFragment extends Fragment implements AddEmailDialogFragment.Listener {
+public class XabberAccountInfoFragment extends Fragment implements AddEmailDialogFragment.Listener, EmailAdapter.Listener {
 
     private static final String LOG_TAG = XabberAccountInfoFragment.class.getSimpleName();
 
@@ -147,7 +148,7 @@ public void onClick(View v) {
 
         rvEmails = view.findViewById(R.id.rvEmails);
         rvEmails.setLayoutManager(new LinearLayoutManager(getActivity()));
-        emailAdapter = new EmailAdapter();
+        emailAdapter = new EmailAdapter(this);
         rvEmails.setAdapter(emailAdapter);
         btnAddEmail = view.findViewById(R.id.btnAddEmail);
         btnAddEmail.setOnClickListener(new View.OnClickListener() {
@@ -183,6 +184,12 @@ public void onAddEmailClick(String email) {
         ((XabberAccountInfoActivity)getActivity()).resendConfirmEmail(email);
     }
 
+    @Override
+    public void onEmailClick(String email) {
+        ConfirmEmailDialogFragment.newInstance(email)
+                .show(getFragmentManager(), AccountSyncDialogFragment.class.getSimpleName());
+    }
+
     public void updateData(@NonNull XabberAccount account) {
         String accountName = account.getFirstName() + " " + account.getLastName();
         if (accountName.trim().isEmpty())
diff --git a/xabber/src/main/res/drawable/ic_email.xml b/xabber/src/main/res/drawable/ic_email.xml
index 48e3553e76..3a4c427737 100644
--- a/xabber/src/main/res/drawable/ic_email.xml
+++ b/xabber/src/main/res/drawable/ic_email.xml
@@ -1,8 +1,8 @@
-<!-- drawable/at.xml -->
+<!-- drawable/email.xml -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:height="24dp"
     android:width="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path android:fillColor="#000" android:pathData="M12,15C12.81,15 13.5,14.7 14.11,14.11C14.7,13.5 15,12.81 15,12C15,11.19 14.7,10.5 14.11,9.89C13.5,9.3 12.81,9 12,9C11.19,9 10.5,9.3 9.89,9.89C9.3,10.5 9,11.19 9,12C9,12.81 9.3,13.5 9.89,14.11C10.5,14.7 11.19,15 12,15M12,2C14.75,2 17.1,3 19.05,4.95C21,6.9 22,9.25 22,12V13.45C22,14.45 21.65,15.3 21,16C20.3,16.67 19.5,17 18.5,17C17.3,17 16.31,16.5 15.56,15.5C14.56,16.5 13.38,17 12,17C10.63,17 9.45,16.5 8.46,15.54C7.5,14.55 7,13.38 7,12C7,10.63 7.5,9.45 8.46,8.46C9.45,7.5 10.63,7 12,7C13.38,7 14.55,7.5 15.54,8.46C16.5,9.45 17,10.63 17,12V13.45C17,13.86 17.16,14.22 17.46,14.53C17.76,14.84 18.11,15 18.5,15C18.92,15 19.27,14.84 19.57,14.53C19.87,14.22 20,13.86 20,13.45V12C20,9.81 19.23,7.93 17.65,6.35C16.07,4.77 14.19,4 12,4C9.81,4 7.93,4.77 6.35,6.35C4.77,7.93 4,9.81 4,12C4,14.19 4.77,16.07 6.35,17.65C7.93,19.23 9.81,20 12,20H17V22H12C9.25,22 6.9,21 4.95,19.05C3,17.1 2,14.75 2,12C2,9.25 3,6.9 4.95,4.95C6.9,3 9.25,2 12,2Z" />
+    <path android:fillColor="#757575" android:pathData="M20,8L12,13L4,8V6L12,11L20,6M20,4H4C2.89,4 2,4.89 2,6V18A2,2 0 0,0 4,20H20A2,2 0 0,0 22,18V6C22,4.89 21.1,4 20,4Z" />
 </vector>
\ No newline at end of file
diff --git a/xabber/src/main/res/layout/dialog_confirm_email.xml b/xabber/src/main/res/layout/dialog_confirm_email.xml
new file mode 100644
index 0000000000..0e49dfb2f6
--- /dev/null
+++ b/xabber/src/main/res/layout/dialog_confirm_email.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:padding="16dp"
+    >
+
+    <TextView
+        android:id="@+id/tvDescription"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="4dp"
+        />
+
+    <EditText
+        android:id="@+id/edtCode"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:hint="code"
+        />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/xabber/src/main/res/layout/item_email.xml b/xabber/src/main/res/layout/item_email.xml
index 04a15c86ae..b834cf16e6 100644
--- a/xabber/src/main/res/layout/item_email.xml
+++ b/xabber/src/main/res/layout/item_email.xml
@@ -1,31 +1,38 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:orientation="horizontal"
     android:layout_width="match_parent"
     android:layout_height="48dp"
-    android:paddingLeft="24dp"
-    android:paddingRight="16dp"
-    android:paddingTop="8dp"
-    android:paddingBottom="8dp"
     android:clickable="true"
     android:background="?android:attr/selectableItemBackground"
     >
 
     <ImageView
+        android:id="@+id/ivEmail"
         android:layout_width="24dp"
         android:layout_height="24dp"
+        android:layout_marginLeft="24dp"
         android:src="@drawable/ic_email"
-        android:layout_gravity="center_vertical"
+        android:layout_centerVertical="true"
         />
 
     <TextView
         android:id="@+id/tvEmail"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_gravity="center_vertical"
+        android:layout_centerVertical="true"
         android:layout_marginLeft="24dp"
+        android:layout_marginRight="16dp"
+        android:layout_toRightOf="@id/ivEmail"
         android:textColor="?android:attr/textColorPrimary"
         android:text="example@example.com"
         />
 
-</LinearLayout>
\ No newline at end of file
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="1dp"
+        android:layout_alignParentBottom="true"
+        android:background="?attr/settings_separator_background_color"
+        />
+
+</RelativeLayout>
\ No newline at end of file

From c28e6d70d87c1c9727c6503a064d203961fe212f Mon Sep 17 00:00:00 2001
From: Valery Miller <valera_miller94@mail.ru>
Date: Tue, 14 Aug 2018 12:33:32 +0500
Subject: [PATCH 021/251] Added showing confirmed email Added confirming emails
 via code

---
 .../ui/activity/XabberAccountInfoActivity.java  |  8 ++++----
 .../xabber/android/ui/adapter/EmailAdapter.java |  5 +++++
 .../ui/dialog/ConfirmEmailDialogFragment.java   | 17 ++++++++++++++---
 .../ui/fragment/XabberAccountInfoFragment.java  | 15 +++++++++++++--
 .../main/res/drawable/ic_email_confirmed.xml    |  8 ++++++++
 5 files changed, 44 insertions(+), 9 deletions(-)
 create mode 100644 xabber/src/main/res/drawable/ic_email_confirmed.xml

diff --git a/xabber/src/main/java/com/xabber/android/ui/activity/XabberAccountInfoActivity.java b/xabber/src/main/java/com/xabber/android/ui/activity/XabberAccountInfoActivity.java
index 6618cd675d..6af6311a66 100644
--- a/xabber/src/main/java/com/xabber/android/ui/activity/XabberAccountInfoActivity.java
+++ b/xabber/src/main/java/com/xabber/android/ui/activity/XabberAccountInfoActivity.java
@@ -662,7 +662,7 @@ private void handleErrorLogout(Throwable throwable) {
         hideProgress();
     }
 
-    private void confirm(String code) {
+    public void confirm(String code) {
         showProgress(getResources().getString(R.string.progress_title_confirm));
         Subscription confirmSubscription = AuthManager.confirmEmail(code)
                 .subscribeOn(Schedulers.io())
@@ -701,9 +701,9 @@ public void call(Throwable throwable) {
     }
 
     private void handleSuccessConfirm(XabberAccount response) {
-        if (BuildConfig.FLAVOR.equals("ru") && response.isNeedToVerifyPhone())
-            showPhoneConfirmFragment();
-        else showCompleteFragment();
+//        if (BuildConfig.FLAVOR.equals("ru") && response.isNeedToVerifyPhone())
+//            showPhoneConfirmFragment();
+//        else showCompleteFragment();
         hideProgress();
         Toast.makeText(this, R.string.confirm_success, Toast.LENGTH_SHORT).show();
     }
diff --git a/xabber/src/main/java/com/xabber/android/ui/adapter/EmailAdapter.java b/xabber/src/main/java/com/xabber/android/ui/adapter/EmailAdapter.java
index a28423a587..1fb4b2f3c5 100644
--- a/xabber/src/main/java/com/xabber/android/ui/adapter/EmailAdapter.java
+++ b/xabber/src/main/java/com/xabber/android/ui/adapter/EmailAdapter.java
@@ -4,6 +4,7 @@
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.ImageView;
 import android.widget.TextView;
 
 import com.xabber.android.R;
@@ -41,6 +42,8 @@ public void onBindViewHolder(EmailViewHolder holder, final int position) {
         final EmailDTO emailDTO = emails.get(position);
 
         holder.tvEmail.setText(emailDTO.getEmail());
+        holder.ivEmail.setImageResource(emailDTO.isVerified() ? R.drawable.ic_email_confirmed :
+                R.drawable.ic_email);
 
         holder.itemView.setOnClickListener(new View.OnClickListener() {
             @Override
@@ -58,10 +61,12 @@ public int getItemCount() {
     class EmailViewHolder extends RecyclerView.ViewHolder {
 
         final TextView tvEmail;
+        final ImageView ivEmail;
 
         public EmailViewHolder(View itemView) {
             super(itemView);
             this.tvEmail = itemView.findViewById(R.id.tvEmail);
+            this.ivEmail = itemView.findViewById(R.id.ivEmail);
         }
     }
 
diff --git a/xabber/src/main/java/com/xabber/android/ui/dialog/ConfirmEmailDialogFragment.java b/xabber/src/main/java/com/xabber/android/ui/dialog/ConfirmEmailDialogFragment.java
index c9c46aa3cc..15848821b5 100644
--- a/xabber/src/main/java/com/xabber/android/ui/dialog/ConfirmEmailDialogFragment.java
+++ b/xabber/src/main/java/com/xabber/android/ui/dialog/ConfirmEmailDialogFragment.java
@@ -7,6 +7,7 @@
 import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.View;
+import android.widget.EditText;
 import android.widget.TextView;
 
 import com.xabber.android.R;
@@ -14,10 +15,19 @@
 public class ConfirmEmailDialogFragment extends DialogFragment {
 
     private String email;
+    private Listener listener;
 
-    public static ConfirmEmailDialogFragment newInstance(String email) {
+    private EditText edtCode;
+
+    public interface Listener {
+        void onResendCodeClick(String email);
+        void onConfirmClick(String email, String code);
+    }
+
+    public static ConfirmEmailDialogFragment newInstance(Listener listener, String email) {
         ConfirmEmailDialogFragment fragment = new ConfirmEmailDialogFragment();
         fragment.email = email;
+        fragment.listener = listener;
         return fragment;
     }
 
@@ -30,13 +40,13 @@ public Dialog onCreateDialog(Bundle savedInstanceState) {
                 .setNeutralButton("Resend code", new DialogInterface.OnClickListener() {
                     @Override
                     public void onClick(DialogInterface dialog, int which) {
-                        //listener.onResendCodeClick();
+                        listener.onResendCodeClick(email);
                     }
                 })
                 .setPositiveButton("Confirm", new DialogInterface.OnClickListener() {
                     @Override
                     public void onClick(DialogInterface dialog, int which) {
-                        //listener.onConfirmEmailClick();
+                        listener.onConfirmClick(email, edtCode.getText().toString());
                     }
                 });
 
@@ -49,6 +59,7 @@ public View setupView() {
 
         TextView tvDescription = view.findViewById(R.id.tvDescription);
         tvDescription.setText(getString(R.string.xmpp_confirm_title, email));
+        edtCode = view.findViewById(R.id.edtCode);
 
         return view;
     }
diff --git a/xabber/src/main/java/com/xabber/android/ui/fragment/XabberAccountInfoFragment.java b/xabber/src/main/java/com/xabber/android/ui/fragment/XabberAccountInfoFragment.java
index f3a5983853..2cd9dadf64 100644
--- a/xabber/src/main/java/com/xabber/android/ui/fragment/XabberAccountInfoFragment.java
+++ b/xabber/src/main/java/com/xabber/android/ui/fragment/XabberAccountInfoFragment.java
@@ -48,7 +48,8 @@
  * Created by valery.miller on 27.07.17.
  */
 
-public class XabberAccountInfoFragment extends Fragment implements AddEmailDialogFragment.Listener, EmailAdapter.Listener {
+public class XabberAccountInfoFragment extends Fragment implements AddEmailDialogFragment.Listener,
+        EmailAdapter.Listener, ConfirmEmailDialogFragment.Listener {
 
     private static final String LOG_TAG = XabberAccountInfoFragment.class.getSimpleName();
 
@@ -186,10 +187,20 @@ public void onAddEmailClick(String email) {
 
     @Override
     public void onEmailClick(String email) {
-        ConfirmEmailDialogFragment.newInstance(email)
+        ConfirmEmailDialogFragment.newInstance(this, email)
                 .show(getFragmentManager(), AccountSyncDialogFragment.class.getSimpleName());
     }
 
+    @Override
+    public void onResendCodeClick(String email) {
+        ((XabberAccountInfoActivity)getActivity()).resendConfirmEmail(email);
+    }
+
+    @Override
+    public void onConfirmClick(String email, String code) {
+        ((XabberAccountInfoActivity)getActivity()).confirm(code);
+    }
+
     public void updateData(@NonNull XabberAccount account) {
         String accountName = account.getFirstName() + " " + account.getLastName();
         if (accountName.trim().isEmpty())
diff --git a/xabber/src/main/res/drawable/ic_email_confirmed.xml b/xabber/src/main/res/drawable/ic_email_confirmed.xml
new file mode 100644
index 0000000000..de96fe52bd
--- /dev/null
+++ b/xabber/src/main/res/drawable/ic_email_confirmed.xml
@@ -0,0 +1,8 @@
+<!-- drawable/email_secure.xml -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path android:fillColor="#757575" android:pathData="M20.5,0A2.5,2.5 0 0,1 23,2.5V3A1,1 0 0,1 24,4V8A1,1 0 0,1 23,9H18A1,1 0 0,1 17,8V4A1,1 0 0,1 18,3V2.5A2.5,2.5 0 0,1 20.5,0M12,11L4,6V8L12,13L16.18,10.39C16.69,10.77 17.32,11 18,11H22V18A2,2 0 0,1 20,20H4A2,2 0 0,1 2,18V6A2,2 0 0,1 4,4H15V8C15,8.36 15.06,8.7 15.18,9L12,11M20.5,1A1.5,1.5 0 0,0 19,2.5V3H22V2.5A1.5,1.5 0 0,0 20.5,1Z" />
+</vector>
\ No newline at end of file

From f94edc9612c310236b6c878eee7dda9f1e2b0e77 Mon Sep 17 00:00:00 2001
From: Valery Miller <valera_miller94@mail.ru>
Date: Tue, 14 Aug 2018 14:54:54 +0500
Subject: [PATCH 022/251] Work on bind social

---
 .../ui/activity/BaseLoginActivity.java        | 27 +++++++++++++++++--
 .../fragment/XabberAccountInfoFragment.java   |  6 ++---
 2 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/xabber/src/main/java/com/xabber/android/ui/activity/BaseLoginActivity.java b/xabber/src/main/java/com/xabber/android/ui/activity/BaseLoginActivity.java
index 474072faf8..f6b32e52dd 100644
--- a/xabber/src/main/java/com/xabber/android/ui/activity/BaseLoginActivity.java
+++ b/xabber/src/main/java/com/xabber/android/ui/activity/BaseLoginActivity.java
@@ -41,6 +41,7 @@
 import java.io.IOException;
 import java.util.Collections;
 
+import okhttp3.ResponseBody;
 import rx.Subscription;
 import rx.android.schedulers.AndroidSchedulers;
 import rx.functions.Action1;
@@ -159,7 +160,8 @@ public void run() {
                             Application.getInstance().runOnUiThread(new Runnable() {
                                 @Override
                                 public void run() {
-                                    loginSocial(AuthManager.PROVIDER_GOOGLE, token);
+                                    // TODO: 14.08.18 определять bind или login
+                                    bindSocial(AuthManager.PROVIDER_GOOGLE, token);
                                 }
                             });
                         } catch (IOException e) {
@@ -178,7 +180,8 @@ private void initFacebookAuth() {
             public void onSuccess(LoginResult loginResult) {
                 String token = loginResult.getAccessToken().getToken();
                 if (token != null)
-                    loginSocial(AuthManager.PROVIDER_FACEBOOK, token);
+                    // TODO: 14.08.18 определять bind или login
+                    bindSocial(AuthManager.PROVIDER_FACEBOOK, token);
             }
 
             @Override
@@ -221,6 +224,26 @@ public void failure(TwitterException exception) {
         };
     }
 
+    private void bindSocial(final String provider, final String token) {
+        showProgress("Bind social");
+        Subscription loginSocialSubscription = AuthManager.bindSocial(provider, token)
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(new Action1<ResponseBody>() {
+                    @Override
+                    public void call(ResponseBody s) {
+                        Toast.makeText(BaseLoginActivity.this,
+                                "Social bind successfull", Toast.LENGTH_SHORT).show();
+                    }
+                }, new Action1<Throwable>() {
+                    @Override
+                    public void call(Throwable throwable) {
+                        handleErrorSocialLogin(throwable, token, provider);
+                    }
+                });
+        compositeSubscription.add(loginSocialSubscription);
+    }
+
     private void loginSocial(final String provider, final String token) {
         showProgress(getString(R.string.progress_title_login));
         Subscription loginSocialSubscription = AuthManager.loginSocial(provider, token)
diff --git a/xabber/src/main/java/com/xabber/android/ui/fragment/XabberAccountInfoFragment.java b/xabber/src/main/java/com/xabber/android/ui/fragment/XabberAccountInfoFragment.java
index 2cd9dadf64..ddef5ec7ca 100644
--- a/xabber/src/main/java/com/xabber/android/ui/fragment/XabberAccountInfoFragment.java
+++ b/xabber/src/main/java/com/xabber/android/ui/fragment/XabberAccountInfoFragment.java
@@ -123,7 +123,7 @@ public void onClick(View v) {
         itemGoogle.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-
+                ((XabberAccountInfoActivity)getActivity()).loginGoogle();
             }
         });
 
@@ -133,7 +133,7 @@ public void onClick(View v) {
         itemFacebook.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-
+                ((XabberAccountInfoActivity)getActivity()).loginFacebook();
             }
         });
 
@@ -143,7 +143,7 @@ public void onClick(View v) {
         itemTwitter.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-
+                Toast.makeText(getActivity(), "twitter not implemented yet", Toast.LENGTH_SHORT).show();
             }
         });
 

From 79f5fc25f3f23de71725e9f0c0cdbcf02ea2c9d6 Mon Sep 17 00:00:00 2001
From: Valery Miller <valera_miller94@mail.ru>
Date: Tue, 14 Aug 2018 15:53:00 +0500
Subject: [PATCH 023/251] Changes in login screen order

---
 .../ui/activity/ContactListActivity.java      |  2 +-
 .../android/ui/activity/TutorialActivity.java | 34 ++++++++++++++-----
 .../src/main/res/layout/activity_tutorial.xml | 20 +++++------
 3 files changed, 37 insertions(+), 19 deletions(-)

diff --git a/xabber/src/main/java/com/xabber/android/ui/activity/ContactListActivity.java b/xabber/src/main/java/com/xabber/android/ui/activity/ContactListActivity.java
index 8f2e17bac3..aef297f18b 100644
--- a/xabber/src/main/java/com/xabber/android/ui/activity/ContactListActivity.java
+++ b/xabber/src/main/java/com/xabber/android/ui/activity/ContactListActivity.java
@@ -307,7 +307,7 @@ protected void onResume() {
         super.onResume();
 
         if (!AccountManager.getInstance().hasAccounts() && XabberAccountManager.getInstance().getAccount() == null) {
-            startActivity(IntroActivity.createIntent(this));
+            startActivity(TutorialActivity.createIntent(this));
             finish();
             return;
         }
diff --git a/xabber/src/main/java/com/xabber/android/ui/activity/TutorialActivity.java b/xabber/src/main/java/com/xabber/android/ui/activity/TutorialActivity.java
index 69ed30798f..c4f3bc5959 100644
--- a/xabber/src/main/java/com/xabber/android/ui/activity/TutorialActivity.java
+++ b/xabber/src/main/java/com/xabber/android/ui/activity/TutorialActivity.java
@@ -11,6 +11,8 @@
 import android.widget.Button;
 
 import com.xabber.android.R;
+import com.xabber.android.data.account.AccountManager;
+import com.xabber.android.data.xaccount.XabberAccountManager;
 import com.xabber.android.ui.adapter.TutorialAdapter;
 
 import me.relex.circleindicator.CircleIndicator;
@@ -21,7 +23,7 @@
 
 public class TutorialActivity extends AppCompatActivity {
 
-    //private Button btnLogin;
+    private Button btnLogin;
     private Button btnRegister;
 
     public static Intent createIntent(Context context) {
@@ -32,6 +34,10 @@ public static Intent createIntent(Context context) {
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
+        if (isFinishing()) {
+            return;
+        }
+
         setContentView(R.layout.activity_tutorial);
 
         overridePendingTransition(R.anim.fade_in, R.anim.fade_out);
@@ -44,13 +50,13 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
         CircleIndicator indicator = (CircleIndicator) findViewById(R.id.indicator);
         indicator.setViewPager(viewPager);
 
-//        btnLogin = (Button) findViewById(R.id.btnLogin);
-//        btnLogin.setOnClickListener(new View.OnClickListener() {
-//            @Override
-//            public void onClick(View v) {
-//                startActivity(XabberLoginActivity.createIntent(TutorialActivity.this));
-//            }
-//        });
+        btnLogin = (Button) findViewById(R.id.btnLogin);
+        btnLogin.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                startActivity(AccountAddActivity.createIntent(TutorialActivity.this));
+            }
+        });
 
         btnRegister = (Button) findViewById(R.id.btnRegister);
         btnRegister.setOnClickListener(new View.OnClickListener() {
@@ -63,6 +69,18 @@ public void onClick(View v) {
         });
     }
 
+    @Override
+    protected void onResume() {
+        super.onResume();
+
+        if (AccountManager.getInstance().hasAccounts() || XabberAccountManager.getInstance().getAccount() != null) {
+            Intent intent = ContactListActivity.createIntent(this);
+            intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK);
+            finish();
+            startActivity(intent);
+        }
+    }
+
     @Override
     public void onBackPressed() {
         super.onBackPressed();
diff --git a/xabber/src/main/res/layout/activity_tutorial.xml b/xabber/src/main/res/layout/activity_tutorial.xml
index 8bece288b3..5ae6061e2f 100644
--- a/xabber/src/main/res/layout/activity_tutorial.xml
+++ b/xabber/src/main/res/layout/activity_tutorial.xml
@@ -29,16 +29,16 @@
         android:layout_alignParentBottom="true"
         >
 
-        <!--<Button-->
-            <!--android:id="@+id/btnLogin"-->
-            <!--android:layout_width="match_parent"-->
-            <!--android:layout_height="wrap_content"-->
-            <!--style="@style/Widget.AppCompat.Button.Borderless"-->
-            <!--android:theme="@style/BlueButton"-->
-            <!--android:textColor="@color/account_register_blue"-->
-            <!--android:text="@string/button_login"-->
-            <!--android:layout_weight="1"-->
-            <!--/>-->
+        <Button
+            android:id="@+id/btnLogin"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            style="@style/Widget.AppCompat.Button.Borderless"
+            android:theme="@style/BlueButton"
+            android:textColor="@color/account_register_blue"
+            android:text="@string/button_login"
+            android:layout_weight="1"
+            />
 
         <Button
             android:id="@+id/btnRegister"

From 2e55a565c5023098aa7f470bd8a567c4bded798e Mon Sep 17 00:00:00 2001
From: Valery Miller <valera_miller94@mail.ru>
Date: Tue, 14 Aug 2018 16:24:53 +0500
Subject: [PATCH 024/251] Added social buttons to signup screen

---
 .../ui/fragment/XAccountSignUpFragment.java   | 18 ++++++++++
 .../res/layout/fragment_xaccount_signup.xml   | 34 +++++++++++++++++++
 2 files changed, 52 insertions(+)

diff --git a/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountSignUpFragment.java b/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountSignUpFragment.java
index 4e39517e35..bd2b34f4fb 100644
--- a/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountSignUpFragment.java
+++ b/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountSignUpFragment.java
@@ -11,6 +11,7 @@
 import android.widget.ArrayAdapter;
 import android.widget.Button;
 import android.widget.EditText;
+import android.widget.ImageView;
 import android.widget.Spinner;
 import android.widget.TextView;
 
@@ -74,6 +75,14 @@ public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
 
         TextView tvSocialProvider = view.findViewById(R.id.tvSocialProvider);
         tvSocialProvider.setText(socialProvider);
+
+        ImageView ivFacebook = view.findViewById(R.id.ivFacebook);
+        ImageView ivGoogle = view.findViewById(R.id.ivGoogle);
+        ImageView ivTwitter = view.findViewById(R.id.ivTwitter);
+
+        ivFacebook.setOnClickListener(this);
+        ivGoogle.setOnClickListener(this);
+        ivTwitter.setOnClickListener(this);
     }
 
     @Override
@@ -89,6 +98,15 @@ public void onClick(View v) {
             case R.id.btnSignUp:
                 onSignUpClick();
                 break;
+            case R.id.ivFacebook:
+                ((XabberAccountInfoActivity)getActivity()).loginFacebook();
+                break;
+            case R.id.ivGoogle:
+                ((XabberAccountInfoActivity)getActivity()).loginGoogle();
+                break;
+            case R.id.ivTwitter:
+                //((XabberAccountInfoActivity)getActivity()).loginTwitter();
+                break;
         }
     }
 
diff --git a/xabber/src/main/res/layout/fragment_xaccount_signup.xml b/xabber/src/main/res/layout/fragment_xaccount_signup.xml
index 1ed53da695..da4c157acd 100644
--- a/xabber/src/main/res/layout/fragment_xaccount_signup.xml
+++ b/xabber/src/main/res/layout/fragment_xaccount_signup.xml
@@ -91,6 +91,40 @@
             android:textColor="@color/black_text_secondary"
             />
 
+        <LinearLayout
+            android:id="@+id/llSocialLogos"
+            android:orientation="horizontal"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal"
+            android:layout_marginTop="18dp"
+            >
+
+            <ImageView
+                android:id="@+id/ivGoogle"
+                android:layout_width="48dp"
+                android:layout_height="48dp"
+                android:src="@drawable/ic_google_plus"
+                />
+
+            <ImageView
+                android:id="@+id/ivFacebook"
+                android:layout_width="48dp"
+                android:layout_height="48dp"
+                android:layout_marginLeft="32dp"
+                android:src="@drawable/ic_facebook"
+                />
+
+            <ImageView
+                android:id="@+id/ivTwitter"
+                android:layout_width="48dp"
+                android:layout_height="48dp"
+                android:layout_marginLeft="32dp"
+                android:src="@drawable/ic_twitter"
+                />
+
+        </LinearLayout>
+
     </LinearLayout>
 
 

From 3fd36e7a9ab0f5038cfd3452913f05125ed9f92c Mon Sep 17 00:00:00 2001
From: Valery Miller <valera_miller94@mail.ru>
Date: Wed, 15 Aug 2018 15:30:31 +0500
Subject: [PATCH 025/251] Changes in auth fragments

---
 .../ui/dialog/AccountSyncDialogFragment.java      |  6 +++---
 .../ui/fragment/XAccountSignUpFragment.java       | 15 ++++++++-------
 .../ui/fragment/XAccountXMPPAuthFragment.java     |  5 ++---
 .../ui/fragment/XAccountXMPPConfirmFragment.java  |  4 ++--
 4 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/xabber/src/main/java/com/xabber/android/ui/dialog/AccountSyncDialogFragment.java b/xabber/src/main/java/com/xabber/android/ui/dialog/AccountSyncDialogFragment.java
index 170725eb8a..ffa0b9b68d 100644
--- a/xabber/src/main/java/com/xabber/android/ui/dialog/AccountSyncDialogFragment.java
+++ b/xabber/src/main/java/com/xabber/android/ui/dialog/AccountSyncDialogFragment.java
@@ -18,7 +18,7 @@
 import com.xabber.android.data.entity.AccountJid;
 import com.xabber.android.data.xaccount.XMPPAccountSettings;
 import com.xabber.android.data.xaccount.XabberAccountManager;
-import com.xabber.android.ui.activity.XabberAccountInfoActivity;
+import com.xabber.android.ui.activity.XabberAccountActivity;
 import com.xabber.android.ui.adapter.XMPPAccountAdapter;
 
 import java.util.ArrayList;
@@ -137,7 +137,7 @@ public void setXmppAccounts(List<XMPPAccountSettings> items) {
     @Override
     public void onCancel(DialogInterface dialog) {
         super.onCancel(dialog);
-        if (noCancel) ((XabberAccountInfoActivity)getActivity()).onSyncClick(true);
+        if (noCancel) ((XabberAccountActivity)getActivity()).onSyncClick(true);
     }
 
     private void onPositiveClick(boolean needGoToMainActivity) {
@@ -166,6 +166,6 @@ private void onPositiveClick(boolean needGoToMainActivity) {
         SettingsManager.setSyncAllAccounts(switchSyncAll.isChecked());
 
         // callback to sync-request
-        ((XabberAccountInfoActivity)getActivity()).onSyncClick(needGoToMainActivity);
+        ((XabberAccountActivity)getActivity()).onSyncClick(needGoToMainActivity);
     }
 }
diff --git a/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountSignUpFragment.java b/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountSignUpFragment.java
index bd2b34f4fb..b492eb24d7 100644
--- a/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountSignUpFragment.java
+++ b/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountSignUpFragment.java
@@ -22,7 +22,8 @@
 import com.google.android.gms.tasks.OnFailureListener;
 import com.google.android.gms.tasks.OnSuccessListener;
 import com.xabber.android.R;
-import com.xabber.android.ui.activity.XabberAccountInfoActivity;
+import com.xabber.android.ui.activity.BaseLoginActivity;
+import com.xabber.android.ui.activity.XabberLoginActivity;
 
 import java.util.List;
 
@@ -89,7 +90,7 @@ public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
     public void onResume() {
         super.onResume();
         // TODO: 08.08.18 после закрытия окна с каптчей, снова делается запрос доменов?
-        ((XabberAccountInfoActivity)getActivity()).getHosts();
+        ((XabberLoginActivity)getActivity()).getHosts();
     }
 
     @Override
@@ -99,13 +100,13 @@ public void onClick(View v) {
                 onSignUpClick();
                 break;
             case R.id.ivFacebook:
-                ((XabberAccountInfoActivity)getActivity()).loginFacebook();
+                ((BaseLoginActivity)getActivity()).loginFacebook();
                 break;
             case R.id.ivGoogle:
-                ((XabberAccountInfoActivity)getActivity()).loginGoogle();
+                ((BaseLoginActivity)getActivity()).loginGoogle();
                 break;
             case R.id.ivTwitter:
-                //((XabberAccountInfoActivity)getActivity()).loginTwitter();
+                ((BaseLoginActivity)getActivity()).loginTwitter();
                 break;
         }
     }
@@ -117,7 +118,7 @@ private void onSignUpClick() {
         if (verifyFields(username, pass)) {
             // todo оставить только одно место для хранения socialToken. infoActivity или этот фрагмент
             if (socialToken != null)
-                ((XabberAccountInfoActivity)getActivity()).signUp(username,
+                ((XabberLoginActivity)getActivity()).signUp(username,
                         spinnerDomain.getSelectedItem().toString(), pass, null);
             else getCaptchaToken(username, pass, spinnerDomain.getSelectedItem().toString());
         }
@@ -174,7 +175,7 @@ public void onSuccess(SafetyNetApi.RecaptchaTokenResponse response) {
                             // Validate the user response token using the
                             // reCAPTCHA siteverify API.
                             Log.d(CAPTCHA_TOKEN, "Success: " + userResponseToken);
-                            ((XabberAccountInfoActivity)getActivity()).signUp(username, domain,
+                            ((XabberLoginActivity)getActivity()).signUp(username, domain,
                                     pass, userResponseToken);
                         }
                     }
diff --git a/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountXMPPAuthFragment.java b/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountXMPPAuthFragment.java
index 56bc0d4e75..0da68571d8 100644
--- a/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountXMPPAuthFragment.java
+++ b/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountXMPPAuthFragment.java
@@ -8,12 +8,11 @@
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.Toast;
 
 import com.xabber.android.R;
 import com.xabber.android.data.account.AccountItem;
 import com.xabber.android.data.account.AccountManager;
-import com.xabber.android.ui.activity.XabberAccountInfoActivity;
+import com.xabber.android.ui.activity.XabberAccountActivity;
 import com.xabber.android.ui.adapter.XMPPAccountAuthAdapter;
 
 import java.util.ArrayList;
@@ -46,6 +45,6 @@ public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
 
     @Override
     public void onAccountClick(String accountJid) {
-        ((XabberAccountInfoActivity)getActivity()).onRequestXMPPAuthCodeClick(accountJid);
+        ((XabberAccountActivity)getActivity()).onRequestXMPPAuthCodeClick(accountJid);
     }
 }
diff --git a/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountXMPPConfirmFragment.java b/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountXMPPConfirmFragment.java
index 5661aaef31..94d9c3658c 100644
--- a/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountXMPPConfirmFragment.java
+++ b/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountXMPPConfirmFragment.java
@@ -12,7 +12,7 @@
 
 import com.xabber.android.R;
 import com.xabber.android.data.xaccount.XMPPAuthManager;
-import com.xabber.android.ui.activity.XabberAccountInfoActivity;
+import com.xabber.android.ui.activity.XabberAccountActivity;
 
 import rx.functions.Action1;
 import rx.subscriptions.CompositeSubscription;
@@ -78,7 +78,7 @@ public void setJid(String jid) {
     private void onConfirmClick() {
         // TODO: 06.08.18 verify fields
         String code = edtCode.getText().toString();
-        ((XabberAccountInfoActivity)getActivity()).onConfirmXMPPClick(jid, code);
+        ((XabberAccountActivity)getActivity()).onConfirmXMPPClick(jid, code);
     }
 
     private void onResendClick() {

From f2d72a58e8dbc48c2650fd16c7916840c41a94d0 Mon Sep 17 00:00:00 2001
From: Valery Miller <valera_miller94@mail.ru>
Date: Wed, 15 Aug 2018 15:55:46 +0500
Subject: [PATCH 026/251] Changes in program-interface

---
 .../ui/fragment/XAccountSignUpFragment.java   | 28 +++++++++++--------
 1 file changed, 17 insertions(+), 11 deletions(-)

diff --git a/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountSignUpFragment.java b/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountSignUpFragment.java
index b492eb24d7..608a7a805f 100644
--- a/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountSignUpFragment.java
+++ b/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountSignUpFragment.java
@@ -22,8 +22,6 @@
 import com.google.android.gms.tasks.OnFailureListener;
 import com.google.android.gms.tasks.OnSuccessListener;
 import com.xabber.android.R;
-import com.xabber.android.ui.activity.BaseLoginActivity;
-import com.xabber.android.ui.activity.XabberLoginActivity;
 
 import java.util.List;
 
@@ -38,15 +36,25 @@ public class XAccountSignUpFragment extends Fragment implements View.OnClickList
     private Spinner spinnerDomain;
     private Button btnSignUp;
 
+    private Listener listener;
     private String socialToken;
     private String socialProvider;
 
-    public static XAccountSignUpFragment newInstance(String socialToken, String socialProvider) {
+    public interface Listener {
+        void onGetHosts();
+        void onSignupClick(String username, String host, String pass, String captchaToken);
+        void onGoogleClick();
+        void onFacebookClick();
+        void onTwitterClick();
+    }
+
+    public static XAccountSignUpFragment newInstance(Listener listener, String socialToken, String socialProvider) {
         XAccountSignUpFragment fragment = new XAccountSignUpFragment();
         Bundle args = new Bundle();
         args.putString(SOCIAL_TOKEN, socialToken);
         args.putString(SOCIAL_PROVIDER, socialProvider);
         fragment.setArguments(args);
+        fragment.listener = listener;
         return fragment;
     }
 
@@ -90,7 +98,7 @@ public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
     public void onResume() {
         super.onResume();
         // TODO: 08.08.18 после закрытия окна с каптчей, снова делается запрос доменов?
-        ((XabberLoginActivity)getActivity()).getHosts();
+        listener.onGetHosts();
     }
 
     @Override
@@ -100,13 +108,13 @@ public void onClick(View v) {
                 onSignUpClick();
                 break;
             case R.id.ivFacebook:
-                ((BaseLoginActivity)getActivity()).loginFacebook();
+                listener.onFacebookClick();
                 break;
             case R.id.ivGoogle:
-                ((BaseLoginActivity)getActivity()).loginGoogle();
+                listener.onGoogleClick();
                 break;
             case R.id.ivTwitter:
-                ((BaseLoginActivity)getActivity()).loginTwitter();
+                listener.onTwitterClick();
                 break;
         }
     }
@@ -118,8 +126,7 @@ private void onSignUpClick() {
         if (verifyFields(username, pass)) {
             // todo оставить только одно место для хранения socialToken. infoActivity или этот фрагмент
             if (socialToken != null)
-                ((XabberLoginActivity)getActivity()).signUp(username,
-                        spinnerDomain.getSelectedItem().toString(), pass, null);
+                listener.onSignupClick(username, spinnerDomain.getSelectedItem().toString(), pass, null);
             else getCaptchaToken(username, pass, spinnerDomain.getSelectedItem().toString());
         }
     }
@@ -175,8 +182,7 @@ public void onSuccess(SafetyNetApi.RecaptchaTokenResponse response) {
                             // Validate the user response token using the
                             // reCAPTCHA siteverify API.
                             Log.d(CAPTCHA_TOKEN, "Success: " + userResponseToken);
-                            ((XabberLoginActivity)getActivity()).signUp(username, domain,
-                                    pass, userResponseToken);
+                            listener.onSignupClick(username, domain, pass, userResponseToken);
                         }
                     }
                 })

From cccefed3e982fb28d9a5fd45021f4a04c30683ad Mon Sep 17 00:00:00 2001
From: Valery Miller <valera_miller94@mail.ru>
Date: Wed, 15 Aug 2018 16:31:11 +0500
Subject: [PATCH 027/251] Changes in program-interfaces

---
 .../ui/fragment/XAccountXMPPAuthFragment.java | 14 ++++++--
 .../fragment/XAccountXMPPConfirmFragment.java | 15 ++++++--
 .../fragment/XabberAccountInfoFragment.java   | 36 +++++++++++++------
 3 files changed, 51 insertions(+), 14 deletions(-)

diff --git a/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountXMPPAuthFragment.java b/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountXMPPAuthFragment.java
index 0da68571d8..8b4faea1ff 100644
--- a/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountXMPPAuthFragment.java
+++ b/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountXMPPAuthFragment.java
@@ -12,7 +12,6 @@
 import com.xabber.android.R;
 import com.xabber.android.data.account.AccountItem;
 import com.xabber.android.data.account.AccountManager;
-import com.xabber.android.ui.activity.XabberAccountActivity;
 import com.xabber.android.ui.adapter.XMPPAccountAuthAdapter;
 
 import java.util.ArrayList;
@@ -21,6 +20,17 @@
 public class XAccountXMPPAuthFragment extends Fragment implements XMPPAccountAuthAdapter.Listener {
 
     private List<AccountItem> xmppAccounts = new ArrayList<>();
+    private Listener listener;
+
+    public interface Listener {
+        void onAccountClick(String accountJid);
+    }
+
+    public static XAccountXMPPAuthFragment newInstance(Listener listener) {
+        XAccountXMPPAuthFragment fragment = new XAccountXMPPAuthFragment();
+        fragment.listener = listener;
+        return fragment;
+    }
 
     @Nullable
     @Override
@@ -45,6 +55,6 @@ public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
 
     @Override
     public void onAccountClick(String accountJid) {
-        ((XabberAccountActivity)getActivity()).onRequestXMPPAuthCodeClick(accountJid);
+        listener.onAccountClick(accountJid);
     }
 }
diff --git a/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountXMPPConfirmFragment.java b/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountXMPPConfirmFragment.java
index 94d9c3658c..fc633f9bc7 100644
--- a/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountXMPPConfirmFragment.java
+++ b/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountXMPPConfirmFragment.java
@@ -12,7 +12,6 @@
 
 import com.xabber.android.R;
 import com.xabber.android.data.xaccount.XMPPAuthManager;
-import com.xabber.android.ui.activity.XabberAccountActivity;
 
 import rx.functions.Action1;
 import rx.subscriptions.CompositeSubscription;
@@ -27,6 +26,18 @@ public class XAccountXMPPConfirmFragment extends Fragment implements View.OnClic
     private Button btnResend;
     private TextView tvTitle;
 
+    private Listener listener;
+
+    public interface Listener {
+        void onConfirmClick(String jid, String code);
+    }
+
+    public static XAccountXMPPConfirmFragment newInstance(Listener listener) {
+        XAccountXMPPConfirmFragment fragment = new XAccountXMPPConfirmFragment();
+        fragment.listener = listener;
+        return fragment;
+    }
+
     @Nullable
     @Override
     public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, Bundle savedInstanceState) {
@@ -78,7 +89,7 @@ public void setJid(String jid) {
     private void onConfirmClick() {
         // TODO: 06.08.18 verify fields
         String code = edtCode.getText().toString();
-        ((XabberAccountActivity)getActivity()).onConfirmXMPPClick(jid, code);
+        listener.onConfirmClick(jid, code);
     }
 
     private void onResendClick() {
diff --git a/xabber/src/main/java/com/xabber/android/ui/fragment/XabberAccountInfoFragment.java b/xabber/src/main/java/com/xabber/android/ui/fragment/XabberAccountInfoFragment.java
index ddef5ec7ca..af6aa33e0b 100644
--- a/xabber/src/main/java/com/xabber/android/ui/fragment/XabberAccountInfoFragment.java
+++ b/xabber/src/main/java/com/xabber/android/ui/fragment/XabberAccountInfoFragment.java
@@ -29,7 +29,6 @@
 import com.xabber.android.data.xaccount.XMPPAccountSettings;
 import com.xabber.android.data.xaccount.XabberAccount;
 import com.xabber.android.data.xaccount.XabberAccountManager;
-import com.xabber.android.ui.activity.XabberAccountInfoActivity;
 import com.xabber.android.ui.adapter.EmailAdapter;
 import com.xabber.android.ui.dialog.AccountSyncDialogFragment;
 import com.xabber.android.ui.dialog.AddEmailDialogFragment;
@@ -78,6 +77,23 @@ public class XabberAccountInfoFragment extends Fragment implements AddEmailDialo
     private boolean dialogShowed;
 
     private CompositeSubscription compositeSubscription = new CompositeSubscription();
+    private Listener listener;
+
+    public interface Listener {
+        void onGoogleClick();
+        void onFacebookClick();
+        void onTwitterClick();
+        void onAddEmailClick(String email);
+        void onConfirmClick(String email, String code);
+        void onLogoutClick(boolean deleteAccounts);
+        void needXMPPAuthFragment();
+    }
+
+    public static XabberAccountInfoFragment newInstance(Listener listener) {
+        XabberAccountInfoFragment fragment = new XabberAccountInfoFragment();
+        fragment.listener = listener;
+        return fragment;
+    }
 
     @Nullable
     @Override
@@ -123,7 +139,7 @@ public void onClick(View v) {
         itemGoogle.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                ((XabberAccountInfoActivity)getActivity()).loginGoogle();
+                listener.onGoogleClick();
             }
         });
 
@@ -133,7 +149,7 @@ public void onClick(View v) {
         itemFacebook.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                ((XabberAccountInfoActivity)getActivity()).loginFacebook();
+                listener.onFacebookClick();
             }
         });
 
@@ -143,7 +159,7 @@ public void onClick(View v) {
         itemTwitter.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                Toast.makeText(getActivity(), "twitter not implemented yet", Toast.LENGTH_SHORT).show();
+                listener.onTwitterClick();
             }
         });
 
@@ -170,7 +186,7 @@ public void onResume() {
 
         XabberAccount account = XabberAccountManager.getInstance().getAccount();
         if (account != null) updateData(account);
-        else ((XabberAccountInfoActivity)getActivity()).showLoginFragment();
+        else listener.needXMPPAuthFragment();
         updateLastSyncTime();
     }
 
@@ -182,7 +198,7 @@ public void onDestroy() {
 
     @Override
     public void onAddEmailClick(String email) {
-        ((XabberAccountInfoActivity)getActivity()).resendConfirmEmail(email);
+        listener.onAddEmailClick(email);
     }
 
     @Override
@@ -193,12 +209,12 @@ public void onEmailClick(String email) {
 
     @Override
     public void onResendCodeClick(String email) {
-        ((XabberAccountInfoActivity)getActivity()).resendConfirmEmail(email);
+        listener.onAddEmailClick(email);
     }
 
     @Override
     public void onConfirmClick(String email, String code) {
-        ((XabberAccountInfoActivity)getActivity()).confirm(code);
+        listener.onConfirmClick(email, code);
     }
 
     public void updateData(@NonNull XabberAccount account) {
@@ -261,7 +277,7 @@ private void handleErrorGetSettings(Throwable throwable) {
         if (message != null) {
             if (message.equals("Invalid token")) {
                 XabberAccountManager.getInstance().onInvalidToken();
-                ((XabberAccountInfoActivity)getActivity()).showLoginFragment();
+                listener.needXMPPAuthFragment();
                 Toast.makeText(getActivity(), "Аккаунт был удален", Toast.LENGTH_LONG).show();
             } else {
                 Log.d(LOG_TAG, "Error while synchronization: " + message);
@@ -285,7 +301,7 @@ private void showLogoutDialog() {
                 .setPositiveButton(R.string.button_quit, new DialogInterface.OnClickListener() {
                     @Override
                     public void onClick(DialogInterface dialog, int which) {
-                        ((XabberAccountInfoActivity)getActivity()).onLogoutClick(chbDeleteAccounts.isChecked());
+                        listener.onLogoutClick(chbDeleteAccounts.isChecked());
                     }
                 })
                 .setNegativeButton(R.string.cancel, null);

From 069b3ce7f17344a90383125ad0ac888d1f20c789 Mon Sep 17 00:00:00 2001
From: Valery Miller <valera_miller94@mail.ru>
Date: Wed, 15 Aug 2018 16:37:37 +0500
Subject: [PATCH 028/251] Changes in authorization flow

---
 xabber/src/main/AndroidManifest.xml           |    4 +-
 .../xabber/android/data/ActivityManager.java  |    4 +-
 .../ui/activity/ContactListActivity.java      |    5 +-
 .../android/ui/activity/IntroActivity.java    |   96 --
 .../android/ui/activity/TutorialActivity.java |    4 +-
 .../activity/XabberAccountInfoActivity.java   | 1031 -----------------
 .../XabberAccountCompleteRegsiterFrament.java |  167 ---
 .../XabberAccountConfirmPhoneFragment.java    |   82 --
 .../XabberAccountConfirmationFragment.java    |   97 --
 .../fragment/XabberAccountLastFragment.java   |  128 --
 .../fragment/XabberAccountLoginFragment.java  |  102 --
 .../ui/fragment/XabberLoginFragment.java      |   95 --
 .../main/res/layout/activity_xabber_login.xml |    2 -
 13 files changed, 5 insertions(+), 1812 deletions(-)
 delete mode 100644 xabber/src/main/java/com/xabber/android/ui/activity/IntroActivity.java
 delete mode 100644 xabber/src/main/java/com/xabber/android/ui/activity/XabberAccountInfoActivity.java
 delete mode 100644 xabber/src/main/java/com/xabber/android/ui/fragment/XabberAccountCompleteRegsiterFrament.java
 delete mode 100644 xabber/src/main/java/com/xabber/android/ui/fragment/XabberAccountConfirmPhoneFragment.java
 delete mode 100644 xabber/src/main/java/com/xabber/android/ui/fragment/XabberAccountConfirmationFragment.java
 delete mode 100644 xabber/src/main/java/com/xabber/android/ui/fragment/XabberAccountLastFragment.java
 delete mode 100644 xabber/src/main/java/com/xabber/android/ui/fragment/XabberAccountLoginFragment.java
 delete mode 100644 xabber/src/main/java/com/xabber/android/ui/fragment/XabberLoginFragment.java

diff --git a/xabber/src/main/AndroidManifest.xml b/xabber/src/main/AndroidManifest.xml
index 247bc428a8..7e2c03f460 100644
--- a/xabber/src/main/AndroidManifest.xml
+++ b/xabber/src/main/AndroidManifest.xml
@@ -514,13 +514,11 @@
                 android:name="android.support.PARENT_ACTIVITY"
                 android:value="com.xabber.android.ui.activity.ChatActivity" />
         </activity>
-        <activity android:name=".ui.activity.IntroActivity"
-            android:theme="@style/ThemeDark"/>
         <activity android:name=".ui.activity.TutorialActivity"
             android:theme="@style/ThemeDark"/>
         <activity android:name=".ui.activity.XabberLoginActivity"
             android:theme="@style/ThemeDark"/>
-        <activity android:name=".ui.activity.XabberAccountInfoActivity"
+        <activity android:name=".ui.activity.XabberAccountActivity"
             android:theme="@style/ThemeDark">
 
             <intent-filter>
diff --git a/xabber/src/main/java/com/xabber/android/data/ActivityManager.java b/xabber/src/main/java/com/xabber/android/data/ActivityManager.java
index d8aaf89bb8..57a99b395b 100644
--- a/xabber/src/main/java/com/xabber/android/data/ActivityManager.java
+++ b/xabber/src/main/java/com/xabber/android/data/ActivityManager.java
@@ -25,8 +25,8 @@
 import com.xabber.android.data.log.LogManager;
 import com.xabber.android.ui.activity.AboutActivity;
 import com.xabber.android.ui.activity.ContactListActivity;
-import com.xabber.android.ui.activity.IntroActivity;
 import com.xabber.android.ui.activity.LoadActivity;
+import com.xabber.android.ui.activity.TutorialActivity;
 
 import java.util.ArrayList;
 import java.util.Iterator;
@@ -145,7 +145,7 @@ public void onCreate(Activity activity) {
         if (LOG) {
             LogManager.i(activity, "onCreate: " + activity.getIntent());
         }
-        if (!(activity instanceof AboutActivity) && !(activity instanceof IntroActivity)) {
+        if (!(activity instanceof AboutActivity) && !(activity instanceof TutorialActivity)) {
             applyTheme(activity);
         }
         if (application.isClosing() && !(activity instanceof LoadActivity)) {
diff --git a/xabber/src/main/java/com/xabber/android/ui/activity/ContactListActivity.java b/xabber/src/main/java/com/xabber/android/ui/activity/ContactListActivity.java
index aef297f18b..63379b553f 100644
--- a/xabber/src/main/java/com/xabber/android/ui/activity/ContactListActivity.java
+++ b/xabber/src/main/java/com/xabber/android/ui/activity/ContactListActivity.java
@@ -701,10 +701,7 @@ public void onContactListDrawerListener(int viewId) {
                 startActivity(PreferenceEditor.createIntent(this));
                 break;
             case R.id.drawer_header_action_xabber_account:
-                XabberAccount account = XabberAccountManager.getInstance().getAccount();
-                if (account != null)
-                    startActivity(XabberAccountInfoActivity.createIntent(this));
-                else startActivity(TutorialActivity.createIntent(this));
+                startActivity(XabberAccountActivity.createIntent(this));
                 break;
             case R.id.drawer_action_patreon:
                 startActivity(PatreonAppealActivity.createIntent(this));
diff --git a/xabber/src/main/java/com/xabber/android/ui/activity/IntroActivity.java b/xabber/src/main/java/com/xabber/android/ui/activity/IntroActivity.java
deleted file mode 100644
index ff74d48625..0000000000
--- a/xabber/src/main/java/com/xabber/android/ui/activity/IntroActivity.java
+++ /dev/null
@@ -1,96 +0,0 @@
-package com.xabber.android.ui.activity;
-
-import android.app.ProgressDialog;
-import android.content.Context;
-import android.content.Intent;
-import android.os.Bundle;
-import android.view.View;
-import android.widget.Button;
-import android.widget.ImageView;
-
-import com.xabber.android.R;
-import com.xabber.android.data.account.AccountManager;
-import com.xabber.android.data.xaccount.XabberAccountManager;
-
-public class IntroActivity extends BaseLoginActivity implements View.OnClickListener {
-
-    private ProgressDialog progressDialog;
-
-    public static Intent createIntent(Context context) {
-        return new Intent(context, IntroActivity.class);
-    }
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-
-        if (isFinishing()) {
-            return;
-        }
-
-        setContentView(R.layout.activity_intro);
-
-        Button btnSignIn = (Button) findViewById(R.id.btnSignIn);
-        Button btnSignUp = (Button) findViewById(R.id.btnSignUp);
-        ImageView ivFacebook = (ImageView) findViewById(R.id.ivFacebook);
-        ImageView ivGoogle = (ImageView) findViewById(R.id.ivGoogle);
-        ImageView ivTwitter = (ImageView) findViewById(R.id.ivTwitter);
-
-        btnSignIn.setOnClickListener(this);
-        btnSignUp.setOnClickListener(this);
-        ivFacebook.setOnClickListener(this);
-        ivGoogle.setOnClickListener(this);
-        ivTwitter.setOnClickListener(this);
-    }
-
-    @Override
-    protected void onResume() {
-        super.onResume();
-
-        if (AccountManager.getInstance().hasAccounts() || XabberAccountManager.getInstance().getAccount() != null) {
-            Intent intent = ContactListActivity.createIntent(this);
-            intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK);
-            finish();
-            startActivity(intent);
-        }
-    }
-
-    @Override
-    public void onClick(View v) {
-        switch (v.getId()) {
-            case R.id.btnSignUp:
-                startActivity(TutorialActivity.createIntent(IntroActivity.this));
-                break;
-            case R.id.btnSignIn:
-                startActivity(AccountAddActivity.createIntent(IntroActivity.this));
-                break;
-            case R.id.ivFacebook:
-                loginFacebook();
-                break;
-            case R.id.ivGoogle:
-                loginGoogle();
-                break;
-            case R.id.ivTwitter:
-                //loginTwitter();
-                break;
-        }
-    }
-
-    @Override
-    protected void showProgress(String title) {
-        if (!isFinishing()) {
-            progressDialog = new ProgressDialog(this);
-            progressDialog.setTitle(title);
-            progressDialog.setMessage(getResources().getString(R.string.progress_message));
-            progressDialog.show();
-        }
-    }
-
-    @Override
-    protected void hideProgress() {
-        if (progressDialog != null) {
-            progressDialog.dismiss();
-            progressDialog = null;
-        }
-    }
-}
diff --git a/xabber/src/main/java/com/xabber/android/ui/activity/TutorialActivity.java b/xabber/src/main/java/com/xabber/android/ui/activity/TutorialActivity.java
index c4f3bc5959..ee44e979c4 100644
--- a/xabber/src/main/java/com/xabber/android/ui/activity/TutorialActivity.java
+++ b/xabber/src/main/java/com/xabber/android/ui/activity/TutorialActivity.java
@@ -62,9 +62,7 @@ public void onClick(View v) {
         btnRegister.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                Intent intent = XabberAccountInfoActivity.createIntent(TutorialActivity.this);
-                intent.putExtra(XabberAccountInfoActivity.CALL_FROM, XabberAccountInfoActivity.CALL_FROM_LOGIN);
-                startActivity(intent);
+                startActivity(XabberLoginActivity.createIntent(TutorialActivity.this, XabberLoginActivity.FRAGMENT_SIGNUP));
             }
         });
     }
diff --git a/xabber/src/main/java/com/xabber/android/ui/activity/XabberAccountInfoActivity.java b/xabber/src/main/java/com/xabber/android/ui/activity/XabberAccountInfoActivity.java
deleted file mode 100644
index 6af6311a66..0000000000
--- a/xabber/src/main/java/com/xabber/android/ui/activity/XabberAccountInfoActivity.java
+++ /dev/null
@@ -1,1031 +0,0 @@
-package com.xabber.android.ui.activity;
-
-import android.app.AlertDialog;
-import android.app.Dialog;
-import android.app.Fragment;
-import android.app.FragmentTransaction;
-import android.app.ProgressDialog;
-import android.content.Context;
-import android.content.DialogInterface;
-import android.content.Intent;
-import android.net.Uri;
-import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v7.widget.Toolbar;
-import android.util.Log;
-import android.view.Menu;
-import android.view.MenuItem;
-import android.view.View;
-import android.widget.Toast;
-
-import com.xabber.android.BuildConfig;
-import com.xabber.android.R;
-import com.xabber.android.data.Application;
-import com.xabber.android.data.SettingsManager;
-import com.xabber.android.data.account.AccountManager;
-import com.xabber.android.data.connection.NetworkManager;
-import com.xabber.android.data.xaccount.AuthManager;
-import com.xabber.android.data.xaccount.XMPPAccountSettings;
-import com.xabber.android.data.xaccount.XMPPAuthManager;
-import com.xabber.android.data.xaccount.XabberAccount;
-import com.xabber.android.data.xaccount.XabberAccountManager;
-import com.xabber.android.ui.color.BarPainter;
-import com.xabber.android.ui.fragment.XAccountSignUpFragment;
-import com.xabber.android.ui.fragment.XAccountXMPPAuthFragment;
-import com.xabber.android.ui.fragment.XAccountXMPPConfirmFragment;
-import com.xabber.android.ui.fragment.XabberAccountCompleteRegsiterFrament;
-import com.xabber.android.ui.fragment.XabberAccountConfirmPhoneFragment;
-import com.xabber.android.ui.fragment.XabberAccountConfirmationFragment;
-import com.xabber.android.ui.fragment.XabberAccountInfoFragment;
-import com.xabber.android.ui.fragment.XabberAccountLastFragment;
-import com.xabber.android.utils.RetrofitErrorConverter;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Locale;
-
-import okhttp3.ResponseBody;
-import rx.Single;
-import rx.Subscription;
-import rx.android.schedulers.AndroidSchedulers;
-import rx.functions.Action1;
-import rx.schedulers.Schedulers;
-
-/**
- * Created by valery.miller on 19.07.17.
- */
-
-public class XabberAccountInfoActivity extends BaseLoginActivity implements Toolbar.OnMenuItemClickListener {
-
-    private final static String LOG_TAG = XabberAccountInfoActivity.class.getSimpleName();
-    private final static String EMAIL_CONFIRMATION_URI = "https://www.xabber.com/account/emails/confirmation/";
-
-    private final static String FRAGMENT_LOGIN = "fragment_login";
-    private final static String FRAGMENT_XMPP_AUTH = "fragment_xmpp_auth";
-    private final static String FRAGMENT_XMPP_CONFIRM = "fragment_xmpp_confirm";
-    private final static String FRAGMENT_SIGNUP = "fragment_signup";
-    private final static String FRAGMENT_INFO = "fragment_info";
-    private final static String FRAGMENT_CONFIRM = "fragment_confirm";
-    private final static String FRAGMENT_PHONE_CONFIRM = "fragment_phone_confirm";
-    private final static String FRAGMENT_COMPLETE = "fragment_complete";
-    private final static String FRAGMENT_LAST = "fragment_last";
-
-    public final static String CALL_FROM = "call_from";
-    public final static String CALL_FROM_LOGIN = "call_from_login";
-    private final static String CALL_FROM_SETTINGS = "call_from_settings";
-
-    public final static String SOCIAL_TOKEN = "social_token";
-    public final static String SOCIAL_PROVIDER = "social_provider";
-
-    private FragmentTransaction fTrans;
-
-    private Toolbar toolbar;
-    private BarPainter barPainter;
-    private ProgressDialog progressDialog;
-
-    private Fragment fragmentLogin;
-    private Fragment fragmentXMPPAuth;
-    private Fragment fragmentXMPPConfirm;
-    private Fragment fragmentSignUp;
-    private Fragment fragmentInfo;
-    private Fragment fragmentConfirmation;
-    private Fragment fragmentPhoneConfirmation;
-    private Fragment fragmentCompleteRegsiter;
-    private Fragment fragmentLastStep;
-
-    private String socialToken = null;
-    private String socialProvider = null;
-    private String callFrom = CALL_FROM_SETTINGS;
-    private boolean needShowSyncDialog = false;
-
-    @NonNull
-    public static Intent createIntent(Context context) {
-        return new Intent(context, XabberAccountInfoActivity.class);
-    }
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-
-        // handle call from
-        Bundle extras = getIntent().getExtras();
-        if (extras != null) {
-            callFrom = extras.getString(CALL_FROM);
-            socialToken = extras.getString(SOCIAL_TOKEN);
-            socialProvider = extras.getString(SOCIAL_PROVIDER);
-        }
-
-        setContentView(R.layout.activity_xabber_account_info);
-
-        toolbar = (Toolbar) findViewById(R.id.toolbar_default);
-        toolbar.setNavigationIcon(R.drawable.ic_arrow_left_white_24dp);
-        toolbar.setNavigationOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                finish();
-            }
-        });
-        toolbar.inflateMenu(R.menu.toolbar_xabber_account_info);
-        toolbar.setOnMenuItemClickListener(this);
-        barPainter = new BarPainter(this, toolbar);
-    }
-
-    @Override
-    protected void onResume() {
-        super.onResume();
-        onPrepareOptionsMenu(toolbar.getMenu());
-
-        XabberAccount account = XabberAccountManager.getInstance().getAccount();
-        if (account != null) {
-            handleCallFrom(account);
-
-            if (XabberAccount.STATUS_NOT_CONFIRMED.equals(account.getAccountStatus())) {
-                showConfirmFragment();
-            }
-            if (XabberAccount.STATUS_CONFIRMED.equals(account.getAccountStatus()) && BuildConfig.FLAVOR.equals("ru")) {
-                showPhoneConfirmFragment();
-            }
-            if (XabberAccount.STATUS_CONFIRMED.equals(account.getAccountStatus()) && !account.isNeedToVerifyPhone()) {
-                showCompleteFragment();
-            }
-            if (XabberAccount.STATUS_REGISTERED.equals(account.getAccountStatus())) {
-                showInfoFragment();
-                needShowSyncDialog = false;
-            }
-        } else if (AccountManager.getInstance().hasAccounts()) {
-            showXMPPAuthFragment();
-        } else showSignUpFragment();
-
-        handleIntent(getIntent());
-    }
-
-    @Override
-    protected void onDestroy() {
-        super.onDestroy();
-        compositeSubscription.clear();
-    }
-
-    @Override
-    public boolean onPrepareOptionsMenu(Menu menu) {
-        if (menu == null) return true;
-        MenuItem menuItem = menu.findItem(R.id.action_cancel_register);
-        if (menuItem == null) return true;
-
-        XabberAccount account = XabberAccountManager.getInstance().getAccount();
-        if (account != null) {
-            menuItem.setVisible(!XabberAccount.STATUS_REGISTERED.equals(account.getAccountStatus()));
-        } else menuItem.setVisible(false);
-        return true;
-    }
-
-    @Override
-    public boolean onMenuItemClick(MenuItem item) {
-        if (item.getItemId() == R.id.action_cancel_register) {
-            showCancelRegisterDialog();
-            return true;
-        }
-        return false;
-    }
-
-    private void showCancelRegisterDialog() {
-        AlertDialog.Builder builder = new AlertDialog.Builder(this);
-        builder.setTitle(R.string.cancel_registration_progress)
-                .setMessage(R.string.cancel_registration_dialog_message)
-                .setPositiveButton(R.string.cancel_registration_dialog_resume, null)
-                .setNegativeButton(R.string.cancel_registration_dialog_cancel, new DialogInterface.OnClickListener() {
-                    @Override
-                    public void onClick(DialogInterface dialog, int which) {
-                        cancelRegistration();
-                    }
-                });
-        Dialog dialog = builder.create();
-        dialog.show();
-    }
-
-    private void cancelRegistration() {
-        showProgress(getString(R.string.cancel_registration_progress));
-        Application.getInstance().runInBackground(new Runnable() {
-            @Override
-            public void run() {
-                XabberAccountManager.getInstance().deleteXabberAccountFromRealm();
-                XabberAccountManager.getInstance().deleteSyncStatesFromRealm();
-                Application.getInstance().runOnUiThread(new Runnable() {
-                    @Override
-                    public void run() {
-                        XabberAccountManager.getInstance().removeAccount();
-                        showLoginFragment();
-                        onPrepareOptionsMenu(toolbar.getMenu());
-                        goToMainActivity();
-                        hideProgress();
-                    }
-                });
-            }
-        });
-    }
-
-    private void handleCallFrom(XabberAccount account) {
-
-        if (account != null && CALL_FROM_LOGIN.equals(callFrom))
-            needShowSyncDialog = true;
-
-    }
-
-    @Override
-    protected void showProgress(String title) {
-        if (!isFinishing()) {
-            progressDialog = new ProgressDialog(this);
-            progressDialog.setTitle(title);
-            progressDialog.setMessage(getResources().getString(R.string.progress_message));
-            progressDialog.show();
-        }
-    }
-
-    @Override
-    protected void hideProgress() {
-        if (progressDialog != null) {
-            progressDialog.dismiss();
-            progressDialog = null;
-        }
-    }
-
-    private void updateAccountInfo(XabberAccount account) {
-        if (account != null) {
-            XabberAccountInfoFragment fragment = (XabberAccountInfoFragment) getFragmentManager().findFragmentByTag(FRAGMENT_INFO);
-            if (fragment != null && fragment.isVisible())
-                ((XabberAccountInfoFragment) fragmentInfo).updateData(account);
-        }
-    }
-
-    private void updateLastSyncTime() {
-        XabberAccountInfoFragment fragment = (XabberAccountInfoFragment) getFragmentManager().findFragmentByTag(FRAGMENT_INFO);
-        if (fragment != null && fragment.isVisible())
-            ((XabberAccountInfoFragment) fragmentInfo).updateLastSyncTime();
-    }
-
-    public void showLoginFragment() {
-        if (fragmentLogin == null)
-            fragmentLogin = new XAccountSignUpFragment();
-
-        fTrans = getFragmentManager().beginTransaction();
-        fTrans.replace(R.id.container, fragmentLogin, FRAGMENT_LOGIN);
-        fTrans.commit();
-
-        toolbar.setTitle(R.string.title_register_xabber_account);
-        barPainter.setBlue(this);
-    }
-
-    public void showXMPPAuthFragment() {
-        if (fragmentXMPPAuth == null)
-            fragmentXMPPAuth = new XAccountXMPPAuthFragment();
-
-        fTrans = getFragmentManager().beginTransaction();
-        fTrans.replace(R.id.container, fragmentXMPPAuth, FRAGMENT_XMPP_AUTH);
-        fTrans.commit();
-
-        toolbar.setTitle(R.string.title_register_xabber_account);
-        barPainter.setBlue(this);
-    }
-
-    public void showXMPPConfirmFragment(String jid) {
-        if (fragmentXMPPConfirm == null)
-            fragmentXMPPConfirm = new XAccountXMPPConfirmFragment();
-
-        ((XAccountXMPPConfirmFragment)fragmentXMPPConfirm).setJid(jid);
-
-        fTrans = getFragmentManager().beginTransaction();
-        fTrans.replace(R.id.container, fragmentXMPPConfirm, FRAGMENT_XMPP_CONFIRM);
-        fTrans.commit();
-
-        toolbar.setTitle(R.string.title_register_xabber_account);
-        barPainter.setBlue(this);
-    }
-
-    public void showSignUpFragment() {
-        if (fragmentSignUp == null)
-            fragmentSignUp = XAccountSignUpFragment.newInstance(socialToken, socialProvider);
-
-        fTrans = getFragmentManager().beginTransaction();
-        fTrans.replace(R.id.container, fragmentSignUp, FRAGMENT_SIGNUP);
-        fTrans.commit();
-
-        toolbar.setTitle(R.string.title_register_xabber_account);
-        barPainter.setBlue(this);
-    }
-
-    public void showInfoFragment() {
-        if (fragmentInfo == null) {
-            fragmentInfo = new XabberAccountInfoFragment();
-            Bundle bundle = new Bundle();
-            bundle.putBoolean("SHOW_SYNC", needShowSyncDialog);
-            fragmentInfo.setArguments(bundle);
-        }
-
-        fTrans = getFragmentManager().beginTransaction();
-        fTrans.replace(R.id.container, fragmentInfo, FRAGMENT_INFO);
-        fTrans.commit();
-
-        toolbar.setTitle(R.string.title_xabber_account);
-        barPainter.setDefaultColor();
-    }
-
-    private void showConfirmFragment() {
-        if (fragmentConfirmation == null)
-            fragmentConfirmation = new XabberAccountConfirmationFragment();
-
-        fTrans = getFragmentManager().beginTransaction();
-        fTrans.replace(R.id.container, fragmentConfirmation, FRAGMENT_CONFIRM);
-        fTrans.commit();
-
-        toolbar.setTitle(R.string.title_register_xabber_account);
-        barPainter.setBlue(this);
-    }
-
-    private void showPhoneConfirmFragment() {
-        if (fragmentPhoneConfirmation == null)
-            fragmentPhoneConfirmation = new XabberAccountConfirmPhoneFragment();
-
-        fTrans = getFragmentManager().beginTransaction();
-        fTrans.replace(R.id.container, fragmentPhoneConfirmation, FRAGMENT_PHONE_CONFIRM);
-        fTrans.commit();
-
-        toolbar.setTitle(R.string.title_register_xabber_account);
-        barPainter.setBlue(this);
-    }
-
-    private void showCompleteFragment() {
-        if (fragmentCompleteRegsiter == null)
-            fragmentCompleteRegsiter = new XabberAccountCompleteRegsiterFrament();
-
-        fTrans = getFragmentManager().beginTransaction();
-        fTrans.replace(R.id.container, fragmentCompleteRegsiter, FRAGMENT_COMPLETE);
-        fTrans.commit();
-
-        toolbar.setTitle(R.string.title_register_xabber_account);
-        barPainter.setBlue(this);
-    }
-
-    public void showLastFragment() {
-        if (fragmentLastStep == null)
-            fragmentLastStep = new XabberAccountLastFragment();
-
-        fTrans = getFragmentManager().beginTransaction();
-        fTrans.replace(R.id.container, fragmentLastStep, FRAGMENT_LAST);
-        fTrans.commit();
-
-        toolbar.setTitle(R.string.title_register_xabber_account);
-        barPainter.setBlue(this);
-    }
-
-    public void onLoginClick() {
-        Intent intent = TutorialActivity.createIntent(XabberAccountInfoActivity.this);
-        startActivity(intent);
-    }
-
-    public void onLogoutClick(boolean deleteAccounts) {
-        if (NetworkManager.isNetworkAvailable()) {
-            logout(deleteAccounts);
-        } else
-            Toast.makeText(this, R.string.toast_no_internet, Toast.LENGTH_LONG).show();
-    }
-
-    public void onSyncClick(boolean needGoToMainActivity) {
-        if (NetworkManager.isNetworkAvailable()) {
-            synchronize(needGoToMainActivity);
-        } else
-            Toast.makeText(this, R.string.toast_no_internet, Toast.LENGTH_LONG).show();
-    }
-
-    public void onSetPhoneClick(String phoneNumber) {
-        if (NetworkManager.isNetworkAvailable()) {
-            setPhoneNumber(phoneNumber);
-        } else
-            Toast.makeText(this, R.string.toast_no_internet, Toast.LENGTH_LONG).show();
-    }
-
-    public void onConfirmCodeClick(String code) {
-        if (NetworkManager.isNetworkAvailable()) {
-            confirmPhone(code);
-        } else
-            Toast.makeText(this, R.string.toast_no_internet, Toast.LENGTH_LONG).show();
-    }
-
-    public void onResendClick() {
-        XabberAccount account = XabberAccountManager.getInstance().getAccount();
-        String email;
-        if (account != null && account.getEmails() != null && account.getEmails().size() > 0) {
-            email = account.getEmails().get(0).getEmail();
-        } else return;
-
-        if (NetworkManager.isNetworkAvailable()) {
-            resendConfirmEmail(email);
-        } else
-            Toast.makeText(this, R.string.toast_no_internet, Toast.LENGTH_LONG).show();
-    }
-
-    public void onConfirmClick(String code) {
-        if (NetworkManager.isNetworkAvailable()) {
-            confirm(code);
-        } else
-            Toast.makeText(this, R.string.toast_no_internet, Toast.LENGTH_LONG).show();
-    }
-
-    public void onCompleteClick(String username, String pass, String pass2, String firstName,
-                                String lastName, boolean createToken) {
-        if (NetworkManager.isNetworkAvailable()) {
-            completeRegister(username, pass, pass2, firstName, lastName, createToken);
-        } else
-            Toast.makeText(this, R.string.toast_no_internet, Toast.LENGTH_LONG).show();
-    }
-
-    public void onDeleteXabberOrgClick(String jid) {
-        showProgress(getString(R.string.progress_title_complete));
-        Subscription deleteSubscription = AuthManager.deleteClientSettings(jid)
-                .subscribeOn(Schedulers.io())
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(new Action1<List<XMPPAccountSettings>>() {
-                    @Override
-                    public void call(List<XMPPAccountSettings> settings) {
-                        handleSuccessDelete(settings);
-                    }
-                }, new Action1<Throwable>() {
-                    @Override
-                    public void call(Throwable throwable) {
-                        handleErrorDelete(throwable);
-                    }
-                });
-        compositeSubscription.add(deleteSubscription);
-    }
-
-    public void onRequestXMPPAuthCodeClick(String jid) {
-        if (NetworkManager.isNetworkAvailable()) {
-            requestXMPPCode(jid);
-        } else
-            Toast.makeText(this, R.string.toast_no_internet, Toast.LENGTH_LONG).show();
-    }
-
-    public void onConfirmXMPPClick(String jid, String code) {
-        if (NetworkManager.isNetworkAvailable()) {
-            confirmXMPP(code, jid);
-        } else
-            Toast.makeText(this, R.string.toast_no_internet, Toast.LENGTH_LONG).show();
-    }
-
-    private void handleSuccessDelete(List<XMPPAccountSettings> settings) {
-        showInfoFragment();
-        hideProgress();
-        Toast.makeText(this, R.string.complete_success, Toast.LENGTH_SHORT).show();
-    }
-
-    private void handleErrorDelete(Throwable throwable) {
-        String message = RetrofitErrorConverter.throwableToHttpError(throwable);
-        if (message != null) {
-            if (message.equals("Invalid token")) {
-                XabberAccountManager.getInstance().onInvalidToken();
-            } else {
-                Log.d(LOG_TAG, "Error while deleting settings: " + message);
-                Toast.makeText(this, message, Toast.LENGTH_SHORT).show();
-            }
-        } else {
-            Log.d(LOG_TAG, "Error while deleting settings: " + throwable.toString());
-            Toast.makeText(this, "Error while deleting settings: " + throwable.toString(), Toast.LENGTH_LONG).show();
-        }
-        showInfoFragment();
-        hideProgress();
-    }
-
-    private void handleIntent(Intent intent) {
-        String appLinkAction = intent.getAction();
-        Uri appLinkData = intent.getData();
-        if (Intent.ACTION_VIEW.equals(appLinkAction) && appLinkData != null) {
-            String uri = appLinkData.toString();
-            String key = uri.replace(EMAIL_CONFIRMATION_URI, "");
-            key = key.replace("/", "");
-            handlerEmailConfirmIntent(key);
-        }
-    }
-
-    private void handlerEmailConfirmIntent(String key) {
-        XabberAccount account = XabberAccountManager.getInstance().getAccount();
-        if (account != null) {
-            if (XabberAccount.STATUS_NOT_CONFIRMED.equals(account.getAccountStatus())) {
-                confirmWithKey(key);
-            } else {
-                Toast.makeText(this, R.string.toast_email_already_confirm, Toast.LENGTH_SHORT).show();
-            }
-        } else
-            Toast.makeText(this, R.string.toast_not_authorized, Toast.LENGTH_SHORT).show();
-    }
-
-    private void synchronize(boolean needGoToMainActivity) {
-        XabberAccount account = XabberAccountManager.getInstance().getAccount();
-        if (account != null && account.getToken() != null) {
-            showProgress(getResources().getString(R.string.progress_title_sync));
-            getAccountWithUpdate(account.getToken(), needGoToMainActivity);
-        } else {
-            Toast.makeText(XabberAccountInfoActivity.this, R.string.sync_fail, Toast.LENGTH_SHORT).show();
-        }
-    }
-
-    private void goToMainActivity() {
-        Intent intent = ContactListActivity.createIntent(XabberAccountInfoActivity.this);
-        intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK);
-        finish();
-        startActivity(intent);
-    }
-
-    private void updateSettings(final boolean needGoToMainActivity) {
-        Subscription getSettingsSubscription = AuthManager.patchClientSettings(XabberAccountManager.getInstance().createSettingsList())
-                .subscribeOn(Schedulers.io())
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(new Action1<List<XMPPAccountSettings>>() {
-                    @Override
-                    public void call(List<XMPPAccountSettings> s) {
-                        Log.d(LOG_TAG, "XMPP accounts loading from net: successfully");
-                        hideProgress();
-                        updateLastSyncTime();
-                        Toast.makeText(XabberAccountInfoActivity.this, R.string.sync_success, Toast.LENGTH_SHORT).show();
-                        if (needGoToMainActivity) goToMainActivity();
-                    }
-                }, new Action1<Throwable>() {
-                    @Override
-                    public void call(Throwable throwable) {
-                        Log.d(LOG_TAG, "XMPP accounts loading from net: error: " + throwable.toString());
-                        hideProgress();
-                        Toast.makeText(XabberAccountInfoActivity.this, R.string.sync_fail, Toast.LENGTH_SHORT).show();
-                    }
-                });
-        compositeSubscription.add(getSettingsSubscription);
-    }
-
-    private void getSettings() {
-        Subscription getSettingsSubscription = AuthManager.getClientSettings()
-                .subscribeOn(Schedulers.io())
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(new Action1<List<XMPPAccountSettings>>() {
-                    @Override
-                    public void call(List<XMPPAccountSettings> settings) {
-                        Log.d(LOG_TAG, "XMPP accounts loading from net: successfully");
-                        XabberAccountManager.getInstance().setXmppAccountsForCreate(settings);
-                        hideProgress();
-                        // update last synchronization time
-                        SettingsManager.setLastSyncDate(XabberAccountManager.getCurrentTimeString());
-                        Toast.makeText(XabberAccountInfoActivity.this, R.string.sync_success, Toast.LENGTH_SHORT).show();
-                        goToMainActivity();
-                    }
-                }, new Action1<Throwable>() {
-                    @Override
-                    public void call(Throwable throwable) {
-                        Log.d(LOG_TAG, "XMPP accounts loading from net: error: " + throwable.toString());
-                        hideProgress();
-                    }
-                });
-        compositeSubscription.add(getSettingsSubscription);
-    }
-
-    private void getAccountWithUpdate(String token, final boolean needGoToMainActivity) {
-        Subscription loadAccountsSubscription = AuthManager.getAccount(token)
-                .subscribeOn(Schedulers.io())
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(new Action1<XabberAccount>() {
-                    @Override
-                    public void call(XabberAccount s) {
-                        Log.d(LOG_TAG, "Xabber account loading from net: successfully");
-                        updateAccountInfo(s);
-
-                        // if exist local accounts
-                        if (AccountManager.getInstance().getAllAccountItems().size() > 0)
-                            updateSettings(needGoToMainActivity);
-                        else getSettings();
-
-                    }
-                }, new Action1<Throwable>() {
-                    @Override
-                    public void call(Throwable throwable) {
-                        Log.d(LOG_TAG, "Xabber account loading from net: error: " + throwable.toString());
-                        String message = RetrofitErrorConverter.throwableToHttpError(throwable);
-                        if (message != null && message.equals("Invalid token")) {
-                            XabberAccountManager.getInstance().onInvalidToken();
-                            showLoginFragment();
-                        }
-
-                        hideProgress();
-                        Toast.makeText(XabberAccountInfoActivity.this, R.string.sync_fail, Toast.LENGTH_SHORT).show();
-                    }
-                });
-        compositeSubscription.add(loadAccountsSubscription);
-    }
-
-    private void logout(final boolean deleteAccounts) {
-        showProgress(getResources().getString(R.string.progress_title_quit));
-        Subscription logoutSubscription = AuthManager.logout(deleteAccounts)
-                .subscribeOn(Schedulers.io())
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(new Action1<ResponseBody>() {
-                    @Override
-                    public void call(ResponseBody s) {
-                        handleSuccessLogout(s, deleteAccounts);
-                    }
-                }, new Action1<Throwable>() {
-                    @Override
-                    public void call(Throwable throwable) {
-                        handleErrorLogout(throwable);
-                    }
-                });
-        compositeSubscription.add(logoutSubscription);
-    }
-
-    private void handleSuccessLogout(ResponseBody s, boolean deleteAccounts) {
-        if (deleteAccounts) XabberAccountManager.getInstance().deleteSyncedLocalAccounts();
-        XabberAccountManager.getInstance().removeAccount();
-        showLoginFragment();
-        hideProgress();
-        Toast.makeText(this, R.string.quit_success, Toast.LENGTH_SHORT).show();
-        Intent intent = ContactListActivity.createIntent(XabberAccountInfoActivity.this);
-        intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK);
-        startActivity(intent);
-    }
-
-    private void handleErrorLogout(Throwable throwable) {
-        String message = RetrofitErrorConverter.throwableToHttpError(throwable);
-        if (message != null) {
-            if (message.equals("Invalid token")) {
-                XabberAccountManager.getInstance().onInvalidToken();
-                showLoginFragment();
-            } else {
-                Log.d(LOG_TAG, "Error while logout: " + message);
-                Toast.makeText(this, message, Toast.LENGTH_SHORT).show();
-            }
-        } else {
-            Log.d(LOG_TAG, "Error while logout: " + throwable.toString());
-            Toast.makeText(this, "Error while logout: " + throwable.toString(), Toast.LENGTH_LONG).show();
-        }
-        hideProgress();
-    }
-
-    public void confirm(String code) {
-        showProgress(getResources().getString(R.string.progress_title_confirm));
-        Subscription confirmSubscription = AuthManager.confirmEmail(code)
-                .subscribeOn(Schedulers.io())
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(new Action1<XabberAccount>() {
-                    @Override
-                    public void call(XabberAccount s) {
-                        handleSuccessConfirm(s);
-                    }
-                }, new Action1<Throwable>() {
-                    @Override
-                    public void call(Throwable throwable) {
-                        handleErrorConfirm(throwable);
-                    }
-                });
-        compositeSubscription.add(confirmSubscription);
-    }
-
-    private void confirmWithKey(String key) {
-        showProgress(getResources().getString(R.string.progress_title_confirm));
-        Subscription confirmWithKeySubscription = AuthManager.confirmEmailWithKey(key)
-                .subscribeOn(Schedulers.io())
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(new Action1<XabberAccount>() {
-                    @Override
-                    public void call(XabberAccount s) {
-                        handleSuccessConfirm(s);
-                    }
-                }, new Action1<Throwable>() {
-                    @Override
-                    public void call(Throwable throwable) {
-                        handleErrorConfirm(throwable);
-                    }
-                });
-        compositeSubscription.add(confirmWithKeySubscription);
-    }
-
-    private void handleSuccessConfirm(XabberAccount response) {
-//        if (BuildConfig.FLAVOR.equals("ru") && response.isNeedToVerifyPhone())
-//            showPhoneConfirmFragment();
-//        else showCompleteFragment();
-        hideProgress();
-        Toast.makeText(this, R.string.confirm_success, Toast.LENGTH_SHORT).show();
-    }
-
-    private void handleErrorConfirm(Throwable throwable) {
-        hideProgress();
-
-        String message = RetrofitErrorConverter.throwableToHttpError(throwable);
-        if (message != null) {
-            Log.d(LOG_TAG, "Error while confirming email: " + message);
-            Toast.makeText(this, message, Toast.LENGTH_SHORT).show();
-        } else {
-            Log.d(LOG_TAG, "Error while confirming email: " + throwable.toString());
-            Toast.makeText(this, "Error while confirming email: " + throwable.toString(), Toast.LENGTH_LONG).show();
-        }
-    }
-
-    private void completeRegister(String username, String pass, String pass2, String firstName, String lastName, boolean createToken) {
-        showProgress(getResources().getString(R.string.progress_title_complete));
-        Subscription completeSubscription = AuthManager.completeRegister(username, pass, pass2,
-                firstName, lastName, getString(R.string.xabber_xmpp_host), Locale.getDefault().getLanguage(), createToken)
-                .subscribeOn(Schedulers.io())
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(new Action1<XabberAccount>() {
-                    @Override
-                    public void call(XabberAccount s) {
-                        handleSuccessComplete(s);
-                    }
-                }, new Action1<Throwable>() {
-                    @Override
-                    public void call(Throwable throwable) {
-                        handleErrorComplete(throwable);
-                    }
-                });
-        compositeSubscription.add(completeSubscription);
-    }
-
-    private void handleSuccessComplete(XabberAccount response) {
-        hideProgress();
-        Toast.makeText(this, R.string.complete_success, Toast.LENGTH_SHORT).show();
-
-        if (AccountManager.getInstance().getAllAccountItems().size() > 0) {
-            needShowSyncDialog = true;
-            showLastFragment();
-        } else getSettings();
-    }
-
-    private void handleErrorComplete(Throwable throwable) {
-        hideProgress();
-
-        String message = RetrofitErrorConverter.throwableToHttpError(throwable);
-        if (message != null) {
-            Log.d(LOG_TAG, "Error while completing register: " + message);
-            Toast.makeText(this, message, Toast.LENGTH_SHORT).show();
-        } else {
-            Log.d(LOG_TAG, "Error while completing register: " + throwable.toString());
-            Toast.makeText(this, "Error while completing register: " + throwable.toString(), Toast.LENGTH_LONG).show();
-        }
-    }
-
-    private void confirmPhone(String code) {
-        showProgress(getResources().getString(R.string.progress_title_confirm_phone));
-        Subscription subscription = AuthManager.confirmPhoneNumber(code)
-                .subscribeOn(Schedulers.io())
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(new Action1<ResponseBody>() {
-                    @Override
-                    public void call(ResponseBody s) {
-                        handleSuccessConfirmPhone(s);
-                    }
-                }, new Action1<Throwable>() {
-                    @Override
-                    public void call(Throwable throwable) {
-                        handleErrorConfirmPhone(throwable);
-                    }
-                });
-        compositeSubscription.add(subscription);
-    }
-
-    private void handleSuccessConfirmPhone(ResponseBody response) {
-        showCompleteFragment();
-        hideProgress();
-        Toast.makeText(this, R.string.confirm_phone_success, Toast.LENGTH_SHORT).show();
-    }
-
-    private void handleErrorConfirmPhone(Throwable throwable) {
-        hideProgress();
-
-        String message = RetrofitErrorConverter.throwableToHttpError(throwable);
-        if (message != null) {
-            Log.d(LOG_TAG, "Error while confirm phone number: " + message);
-            Toast.makeText(this, message, Toast.LENGTH_SHORT).show();
-        } else {
-            Log.d(LOG_TAG, "Error while confirm phone number: " + throwable.toString());
-            Toast.makeText(this, "Error while confirm phone number: " + throwable.toString(), Toast.LENGTH_LONG).show();
-        }
-    }
-
-    private void setPhoneNumber(String phoneNumber) {
-        showProgress(getResources().getString(R.string.progress_title_set_phone));
-        Subscription subscription = AuthManager.setPhoneNumber(phoneNumber)
-                .subscribeOn(Schedulers.io())
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(new Action1<ResponseBody>() {
-                    @Override
-                    public void call(ResponseBody s) {
-                        handleSuccessSetPhoneNumber(s);
-                    }
-                }, new Action1<Throwable>() {
-                    @Override
-                    public void call(Throwable throwable) {
-                        handleErrorSetPhoneNumber(throwable);
-                    }
-                });
-        compositeSubscription.add(subscription);
-    }
-
-    private void handleSuccessSetPhoneNumber(ResponseBody response) {
-        // enable code field and button
-
-        hideProgress();
-        Toast.makeText(this, R.string.set_phone_success, Toast.LENGTH_SHORT).show();
-    }
-
-    private void handleErrorSetPhoneNumber(Throwable throwable) {
-        hideProgress();
-
-        String message = RetrofitErrorConverter.throwableToHttpError(throwable);
-        if (message != null) {
-            Log.d(LOG_TAG, "Error while send verification code: " + message);
-            Toast.makeText(this, message, Toast.LENGTH_SHORT).show();
-        } else {
-            Log.d(LOG_TAG, "Error while send verification code: " + throwable.toString());
-            Toast.makeText(this, "Error while send verification code: " + throwable.toString(), Toast.LENGTH_LONG).show();
-        }
-    }
-
-    public void resendConfirmEmail(String email) {
-        showProgress(getResources().getString(R.string.progress_title_resend));
-        Subscription resendEmailSubscription = AuthManager.addEmail(email)
-                .subscribeOn(Schedulers.io())
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(new Action1<ResponseBody>() {
-                    @Override
-                    public void call(ResponseBody s) {
-                        handleSuccessResendEmail(s);
-                    }
-                }, new Action1<Throwable>() {
-                    @Override
-                    public void call(Throwable throwable) {
-                        handleErrorResendEmail(throwable);
-                    }
-                });
-        compositeSubscription.add(resendEmailSubscription);
-    }
-
-    private void handleSuccessResendEmail(ResponseBody response) {
-        hideProgress();
-        Toast.makeText(this, R.string.resend_success, Toast.LENGTH_SHORT).show();
-    }
-
-    private void handleErrorResendEmail(Throwable throwable) {
-        hideProgress();
-
-        String message = RetrofitErrorConverter.throwableToHttpError(throwable);
-        if (message != null) {
-            Log.d(LOG_TAG, "Error while send verification email: " + message);
-            Toast.makeText(this, message, Toast.LENGTH_SHORT).show();
-        } else {
-            Log.d(LOG_TAG, "Error while send verification email: " + throwable.toString());
-            Toast.makeText(this, "Error while send verification email: " + throwable.toString(), Toast.LENGTH_LONG).show();
-        }
-    }
-
-    private void requestXMPPCode(final String jid) {
-        showProgress("Request XMPP auth-code..");
-        Subscription requestXMPPCodeSubscription = AuthManager.requestXMPPCode(jid)
-                .subscribeOn(Schedulers.io())
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(new Action1<AuthManager.XMPPCode>() {
-                    @Override
-                    public void call(AuthManager.XMPPCode code) {
-                        handleSuccessRequestXMPPCode(code, jid);
-                    }
-                }, new Action1<Throwable>() {
-                    @Override
-                    public void call(Throwable throwable) {
-                        handleErrorRequestXMPPCode(throwable);
-                    }
-                });
-        compositeSubscription.add(requestXMPPCodeSubscription);
-    }
-
-    private void handleSuccessRequestXMPPCode(AuthManager.XMPPCode code, String jid) {
-        hideProgress();
-        XMPPAuthManager.getInstance().addRequest(code.getRequestId(), code.getApiJid(), jid);
-        showXMPPConfirmFragment(jid);
-    }
-
-    private void handleErrorRequestXMPPCode(Throwable throwable) {
-        hideProgress();
-
-        // TODO: 03.08.18 implement error parsing
-
-        String error = "Error while request XMPP auth-code: " + throwable.toString();
-        Log.d(LOG_TAG, error);
-        Toast.makeText(this, error, Toast.LENGTH_LONG).show();
-    }
-
-    private void confirmXMPP(String code, String jid) {
-        showProgress("Confirm XMPP-account with code..");
-        Subscription confirmXMPPSubscription = AuthManager.confirmXMPP(jid, code)
-                .subscribeOn(Schedulers.io())
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(new Action1<XabberAccount>() {
-                    @Override
-                    public void call(XabberAccount account) {
-                        handleSuccessConfirmXMPP(account);
-                    }
-                }, new Action1<Throwable>() {
-                    @Override
-                    public void call(Throwable throwable) {
-                        handleErrorConfirmXMPP(throwable);
-                    }
-                });
-        compositeSubscription.add(confirmXMPPSubscription);
-    }
-
-    private void handleSuccessConfirmXMPP(XabberAccount account) {
-        hideProgress();
-
-        Intent intent = XabberAccountInfoActivity.createIntent(this);
-        intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK);
-        intent.putExtra(XabberAccountInfoActivity.CALL_FROM, XabberAccountInfoActivity.CALL_FROM_LOGIN);
-        finish();
-        startActivity(intent);
-    }
-
-    private void handleErrorConfirmXMPP(Throwable throwable) {
-        hideProgress();
-
-        // TODO: 03.08.18 implement error parsing
-
-        String error = "Error while confirm XMPP-account: " + throwable.toString();
-        Log.d(LOG_TAG, error);
-        Toast.makeText(this, error, Toast.LENGTH_LONG).show();
-    }
-
-    public void getHosts() {
-        showProgress("Request hosts..");
-        Subscription requestHosts = AuthManager.getHosts()
-                .subscribeOn(Schedulers.io())
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(new Action1<List<AuthManager.Domain>>() {
-                    @Override
-                    public void call(List<AuthManager.Domain> domains) {
-                        handleSuccessGetHosts(domains);
-                    }
-                }, new Action1<Throwable>() {
-                    @Override
-                    public void call(Throwable throwable) {
-                        handleErrorGetHosts(throwable);
-                    }
-                });
-        compositeSubscription.add(requestHosts);
-    }
-
-    private void handleSuccessGetHosts(List<AuthManager.Domain> domains) {
-        hideProgress();
-
-        List<String> hosts = new ArrayList<>();
-        for (AuthManager.Domain domain : domains) {
-            hosts.add(domain.getDomain());
-        }
-
-        if (fragmentSignUp != null)
-            ((XAccountSignUpFragment)fragmentSignUp).setupSpinner(hosts);
-    }
-
-    private void handleErrorGetHosts(Throwable throwable) {
-        hideProgress();
-
-        // TODO: 03.08.18 implement error parsing
-
-        String error = "Error while request hosts: " + throwable.toString();
-        Log.d(LOG_TAG, error);
-        Toast.makeText(this, error, Toast.LENGTH_LONG).show();
-    }
-
-    public void signUp(String username, String host, String pass, String captchaToken) {
-        showProgress("Sign Up..");
-
-        Single<XabberAccount> signUpSingle;
-        if (socialToken != null && socialProvider != null)
-            signUpSingle = AuthManager.signupv2(username, host, pass, socialProvider, socialToken);
-        else signUpSingle = AuthManager.signupv2(username, host, pass, captchaToken);
-
-        Subscription signUpSubscription = signUpSingle
-                .subscribeOn(Schedulers.io())
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(new Action1<XabberAccount>() {
-                    @Override
-                    public void call(XabberAccount account) {
-                        handleSuccessGetAccountAfterSignUp(account);
-                    }
-                }, new Action1<Throwable>() {
-                    @Override
-                    public void call(Throwable throwable) {
-                        handleErrorSignUp(throwable);
-                    }
-                });
-        compositeSubscription.add(signUpSubscription);
-    }
-
-    private void handleErrorSignUp(Throwable throwable) {
-        hideProgress();
-
-        // TODO: 03.08.18 implement error parsing
-
-        String error = "Error while signup: " + throwable.toString();
-        Log.d(LOG_TAG, error);
-        Toast.makeText(this, error, Toast.LENGTH_LONG).show();
-    }
-}
-
diff --git a/xabber/src/main/java/com/xabber/android/ui/fragment/XabberAccountCompleteRegsiterFrament.java b/xabber/src/main/java/com/xabber/android/ui/fragment/XabberAccountCompleteRegsiterFrament.java
deleted file mode 100644
index a3f9ea04a8..0000000000
--- a/xabber/src/main/java/com/xabber/android/ui/fragment/XabberAccountCompleteRegsiterFrament.java
+++ /dev/null
@@ -1,167 +0,0 @@
-package com.xabber.android.ui.fragment;
-
-import android.app.Fragment;
-import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v7.widget.AppCompatCheckBox;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.Button;
-import android.widget.EditText;
-import android.widget.TextView;
-
-import com.xabber.android.R;
-import com.xabber.android.data.account.AccountManager;
-import com.xabber.android.data.xaccount.XabberAccount;
-import com.xabber.android.data.xaccount.XabberAccountManager;
-import com.xabber.android.ui.activity.XabberAccountInfoActivity;
-
-/**
- * Created by valery.miller on 27.07.17.
- */
-
-public class XabberAccountCompleteRegsiterFrament extends Fragment {
-
-    private TextView tvAccountName;
-    private TextView tvSignType;
-
-    private EditText edtUsername;
-    private EditText edtPass;
-    private EditText edtPass2;
-    private EditText edtFirstName;
-    private EditText edtLastName;
-    private Button btnRegister;
-
-    @Nullable
-    @Override
-    public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
-        return inflater.inflate(R.layout.fragment_xabber_account_complete_register, container, false);
-    }
-
-    @Override
-    public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
-        super.onViewCreated(view, savedInstanceState);
-
-        tvAccountName = (TextView) view.findViewById(R.id.tvAccountName);
-        tvSignType = (TextView) view.findViewById(R.id.tvSignType);
-
-        edtUsername = (EditText) view.findViewById(R.id.edtUsername);
-        edtPass = (EditText) view.findViewById(R.id.edtPass);
-        edtPass2 = (EditText) view.findViewById(R.id.edtPass2);
-        edtFirstName = (EditText) view.findViewById(R.id.edtFirstName);
-        edtLastName = (EditText) view.findViewById(R.id.edtLastName);
-
-        btnRegister = (Button) view.findViewById(R.id.btnRegister);
-        btnRegister.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                verifyFields();
-            }
-        });
-    }
-
-    @Override
-    public void onResume() {
-        super.onResume();
-
-        XabberAccount account = XabberAccountManager.getInstance().getAccount();
-        if (account != null) updateData(account);
-        else ((XabberAccountInfoActivity)getActivity()).showLoginFragment();
-    }
-
-    public void updateData(@NonNull XabberAccount account) {
-        if (account.getEmails().size() > 0) {
-            // if registered via email
-            tvAccountName.setText(account.getEmails().get(0).getEmail());
-            tvSignType.setText(R.string.signed_up_email);
-        } else {
-            // if registered via social binding
-            String firstName = account.getFirstName();
-            String lastName = account.getLastName();
-            String name = "";
-            if (firstName != null) {
-                name = name + firstName;
-                edtFirstName.setText(firstName);
-            }
-            if (lastName != null) {
-                name = name + " " + lastName;
-                edtLastName.setText(lastName);
-            }
-            if (!name.isEmpty()) tvAccountName.setText(name);
-
-            if (account.getSocialBindings().size() > 0) {
-                switch (account.getSocialBindings().get(0).getProvider()) {
-                    case "google":
-                        tvSignType.setText(R.string.signed_up_google);
-                        break;
-                    case "facebook":
-                        tvSignType.setText(R.string.signed_up_facebook);
-                        break;
-                    case "twitter":
-                        tvSignType.setText(R.string.signed_up_twitter);
-                        break;
-                    case "github":
-                        tvSignType.setText(R.string.signed_up_github);
-                        break;
-                }
-            }
-        }
-
-    }
-
-    private void verifyFields() {
-        String username = edtUsername.getText().toString().trim();
-        String pass = edtPass.getText().toString().trim();
-        String pass2 = edtPass2.getText().toString().trim();
-        String firstName = edtFirstName.getText().toString().trim();
-        String lastName = edtLastName.getText().toString().trim();
-
-        if (username.isEmpty()) {
-            edtUsername.setError(getString(R.string.empty_field));
-            return;
-        }
-
-        // Username can contain only latin letters, numbers and dots
-        if (!username.matches("[a-z0-9.]+")) {
-            edtUsername.setError(getString(R.string.username_rules));
-            return;
-        }
-
-        // Username must start with letter
-        if (!username.substring(0, 1).matches("[a-z]")) {
-            edtUsername.setError(getString(R.string.username_rules_first_symbol));
-            return;
-        }
-
-        // Username cannot have two dots in a row
-        if (username.contains("..")) {
-            edtUsername.setError(getString(R.string.username_rules_dots));
-            return;
-        }
-
-        if (pass.isEmpty()) {
-            edtPass.setError(getString(R.string.empty_field));
-            return;
-        }
-
-        if (pass2.isEmpty()) {
-            edtPass2.setError(getString(R.string.empty_field));
-            return;
-        }
-
-        if (pass.length() < 4) {
-            edtPass.setError(getString(R.string.pass_too_short));
-            return;
-        }
-
-        if (!pass.equals(pass2)) {
-            edtPass2.setError(getString(R.string.passwords_not_match));
-            return;
-        }
-
-        ((XabberAccountInfoActivity)getActivity()).onCompleteClick(username, pass, pass2, firstName, lastName, true);
-    }
-
-}
diff --git a/xabber/src/main/java/com/xabber/android/ui/fragment/XabberAccountConfirmPhoneFragment.java b/xabber/src/main/java/com/xabber/android/ui/fragment/XabberAccountConfirmPhoneFragment.java
deleted file mode 100644
index 51476c9400..0000000000
--- a/xabber/src/main/java/com/xabber/android/ui/fragment/XabberAccountConfirmPhoneFragment.java
+++ /dev/null
@@ -1,82 +0,0 @@
-package com.xabber.android.ui.fragment;
-
-import android.app.Fragment;
-import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.Button;
-import android.widget.EditText;
-
-import com.xabber.android.R;
-import com.xabber.android.ui.activity.XabberAccountInfoActivity;
-
-/**
- * Created by valery.miller on 11.01.18.
- */
-
-public class XabberAccountConfirmPhoneFragment extends Fragment {
-
-    private Button btnSetPhone;
-    private Button btnConfirm;
-    private EditText edtPhone;
-    private EditText edtCode;
-
-    @Nullable
-    @Override
-    public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
-        return inflater.inflate(R.layout.fragment_xabber_account_phone_number_confirm, container, false);
-    }
-
-    @Override
-    public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
-        super.onViewCreated(view, savedInstanceState);
-
-        btnSetPhone = (Button) view.findViewById(R.id.btnSetPhone);
-        btnSetPhone.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                checkPhoneNumber();
-            }
-        });
-
-        btnConfirm = (Button) view.findViewById(R.id.btnConfirm);
-        btnConfirm.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                checkCode();
-            }
-        });
-
-        edtPhone = (EditText) view.findViewById(R.id.edtPhone);
-        edtCode = (EditText) view.findViewById(R.id.edtCode);
-    }
-
-    private void checkPhoneNumber() {
-        String phone = edtPhone.getText().toString().replaceAll(" ", "");
-
-        if (phone.isEmpty() || phone.length() < 12) {
-            edtPhone.setError(getString(R.string.empty_field));
-            return;
-        }
-
-        ((XabberAccountInfoActivity)getActivity()).onSetPhoneClick(phone);
-    }
-
-    private void checkCode() {
-        String code = edtCode.getText().toString().replaceAll(" ", "");
-
-        if (code.isEmpty()) {
-            edtCode.setError(getString(R.string.empty_field));
-            return;
-        }
-
-        if (code.length() != 6) {
-            edtCode.setError(getString(R.string.code_length_wrong));
-            return;
-        }
-
-        ((XabberAccountInfoActivity)getActivity()).onConfirmCodeClick(code);
-    }
-}
diff --git a/xabber/src/main/java/com/xabber/android/ui/fragment/XabberAccountConfirmationFragment.java b/xabber/src/main/java/com/xabber/android/ui/fragment/XabberAccountConfirmationFragment.java
deleted file mode 100644
index 02a6dd512b..0000000000
--- a/xabber/src/main/java/com/xabber/android/ui/fragment/XabberAccountConfirmationFragment.java
+++ /dev/null
@@ -1,97 +0,0 @@
-package com.xabber.android.ui.fragment;
-
-import android.app.Fragment;
-import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.Button;
-import android.widget.EditText;
-import android.widget.RelativeLayout;
-import android.widget.TextView;
-
-import com.xabber.android.R;
-import com.xabber.android.data.xaccount.XabberAccount;
-import com.xabber.android.data.xaccount.XabberAccountManager;
-import com.xabber.android.ui.activity.XabberAccountInfoActivity;
-
-/**
- * Created by valery.miller on 27.07.17.
- */
-
-public class XabberAccountConfirmationFragment extends Fragment {
-
-    private TextView tvSignType;
-    private TextView tvAccountName;
-    //private RelativeLayout rlLogout;
-
-    private EditText edtCode;
-    private Button btnConfirm;
-    private Button btnResend;
-
-    @Nullable
-    @Override
-    public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
-        return inflater.inflate(R.layout.fragment_xabber_account_confirmation, container, false);
-    }
-
-    @Override
-    public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
-        super.onViewCreated(view, savedInstanceState);
-
-        tvSignType = (TextView) view.findViewById(R.id.tvSignType);
-        tvAccountName = (TextView) view.findViewById(R.id.tvAccountName);
-
-//        rlLogout = (RelativeLayout) view.findViewById(R.id.rlLogout);
-//        rlLogout.setOnClickListener(new View.OnClickListener() {
-//            @Override
-//            public void onClick(View v) {
-//                ((XabberAccountInfoActivity)getActivity()).onLogoutClick();
-//            }
-//        });
-
-        edtCode = (EditText) view.findViewById(R.id.edtCode);
-        btnConfirm = (Button) view.findViewById(R.id.btnConfirm);
-        btnConfirm.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                verifyFields();
-            }
-        });
-        btnResend = (Button) view.findViewById(R.id.btnResend);
-        btnResend.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                ((XabberAccountInfoActivity)getActivity()).onResendClick();
-            }
-        });
-    }
-
-    @Override
-    public void onResume() {
-        super.onResume();
-
-        XabberAccount account = XabberAccountManager.getInstance().getAccount();
-        if (account != null) updateData(account);
-        else ((XabberAccountInfoActivity)getActivity()).showLoginFragment();
-    }
-
-    private void verifyFields() {
-        String code = edtCode.getText().toString().trim();
-
-        if (code.isEmpty()) {
-            edtCode.setError(getString(R.string.empty_field));
-            return;
-        }
-
-        ((XabberAccountInfoActivity)getActivity()).onConfirmClick(code);
-    }
-
-    public void updateData(@NonNull XabberAccount account) {
-        if (account.getEmails().size() > 0)
-            tvAccountName.setText(account.getEmails().get(0).getEmail());
-    }
-
-}
diff --git a/xabber/src/main/java/com/xabber/android/ui/fragment/XabberAccountLastFragment.java b/xabber/src/main/java/com/xabber/android/ui/fragment/XabberAccountLastFragment.java
deleted file mode 100644
index d1ebe06c9a..0000000000
--- a/xabber/src/main/java/com/xabber/android/ui/fragment/XabberAccountLastFragment.java
+++ /dev/null
@@ -1,128 +0,0 @@
-package com.xabber.android.ui.fragment;
-
-import android.app.Fragment;
-import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.Button;
-import android.widget.TextView;
-
-import com.xabber.android.R;
-import com.xabber.android.data.xaccount.XMPPUser;
-import com.xabber.android.data.xaccount.XabberAccount;
-import com.xabber.android.data.xaccount.XabberAccountManager;
-import com.xabber.android.ui.activity.XabberAccountInfoActivity;
-
-import rx.subscriptions.CompositeSubscription;
-
-/**
- * Created by valery.miller on 20.09.17.
- */
-
-public class XabberAccountLastFragment extends Fragment {
-
-    private static final String LOG_TAG = XabberAccountLastFragment.class.getSimpleName();
-
-    private TextView tvAccountName;
-    private TextView tvSignType;
-
-    private Button btnYes;
-    private Button btnNo;
-    private TextView tvDescription;
-
-    private String jid;
-
-    private CompositeSubscription compositeSubscription = new CompositeSubscription();
-
-    @Nullable
-    @Override
-    public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, Bundle savedInstanceState) {
-        return inflater.inflate(R.layout.fragment_xabber_account_register_last, container, false);
-    }
-
-    @Override
-    public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
-        super.onViewCreated(view, savedInstanceState);
-
-        tvAccountName = (TextView) view.findViewById(R.id.tvAccountName);
-        tvSignType = (TextView) view.findViewById(R.id.tvSignType);
-
-        tvDescription = (TextView) view.findViewById(R.id.tvDescription);
-        btnYes = (Button) view.findViewById(R.id.btnYes);
-        btnYes.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                ((XabberAccountInfoActivity)getActivity()).showInfoFragment();
-            }
-        });
-
-        btnNo = (Button) view.findViewById(R.id.btnNo);
-        btnNo.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                if (jid != null && !jid.isEmpty())
-                    ((XabberAccountInfoActivity)getActivity()).onDeleteXabberOrgClick(jid);
-                else ((XabberAccountInfoActivity)getActivity()).showLastFragment();
-            }
-        });
-    }
-
-    @Override
-    public void onResume() {
-        super.onResume();
-        XabberAccount account = XabberAccountManager.getInstance().getAccount();
-        if (account != null) {
-            XMPPUser user = account.getXmppUsers().get(0);
-            if (user != null) jid = user.getUsername() + "@" + user.getHost();
-            tvDescription.setText(getString(R.string.complete_register_summary, jid));
-            updateData(account);
-        }
-    }
-
-    @Override
-    public void onDestroy() {
-        super.onDestroy();
-        compositeSubscription.clear();
-    }
-
-    public void updateData(@NonNull XabberAccount account) {
-        if (account.getEmails().size() > 0) {
-            // if registered via email
-            tvAccountName.setText(account.getEmails().get(0).getEmail());
-            tvSignType.setText(R.string.signed_up_email);
-        } else {
-            // if registered via social binding
-            String firstName = account.getFirstName();
-            String lastName = account.getLastName();
-            String name = "";
-            if (firstName != null) {
-                name = name + firstName;
-            }
-            if (lastName != null) {
-                name = name + " " + lastName;
-            }
-            if (!name.isEmpty()) tvAccountName.setText(name);
-
-            if (account.getSocialBindings().size() > 0) {
-                switch (account.getSocialBindings().get(0).getProvider()) {
-                    case "google":
-                        tvSignType.setText(R.string.signed_up_google);
-                        break;
-                    case "facebook":
-                        tvSignType.setText(R.string.signed_up_facebook);
-                        break;
-                    case "twitter":
-                        tvSignType.setText(R.string.signed_up_twitter);
-                        break;
-                    case "github":
-                        tvSignType.setText(R.string.signed_up_github);
-                        break;
-                }
-            }
-        }
-
-    }
-}
diff --git a/xabber/src/main/java/com/xabber/android/ui/fragment/XabberAccountLoginFragment.java b/xabber/src/main/java/com/xabber/android/ui/fragment/XabberAccountLoginFragment.java
deleted file mode 100644
index e108d78398..0000000000
--- a/xabber/src/main/java/com/xabber/android/ui/fragment/XabberAccountLoginFragment.java
+++ /dev/null
@@ -1,102 +0,0 @@
-package com.xabber.android.ui.fragment;
-
-import android.app.Fragment;
-import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v7.widget.AppCompatCheckBox;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.Button;
-import android.widget.CompoundButton;
-import android.widget.EditText;
-import android.widget.ImageView;
-import android.widget.Toast;
-
-import com.xabber.android.R;
-import com.xabber.android.data.connection.NetworkManager;
-import com.xabber.android.ui.activity.XabberAccountInfoActivity;
-
-/**
- * Created by valery.miller on 27.07.17.
- */
-
-public class XabberAccountLoginFragment extends Fragment implements View.OnClickListener {
-
-    private ImageView ivGoogle;
-    private ImageView ivFacebook;
-    private ImageView ivTwitter;
-    private ImageView ivGithub;
-
-    private EditText edtEmail;
-    private AppCompatCheckBox checkBox;
-    private Button btnContinue;
-
-    @Nullable
-    @Override
-    public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
-        return inflater.inflate(R.layout.fragment_xabber_account_login, container, false);
-    }
-
-    @Override
-    public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
-        super.onViewCreated(view, savedInstanceState);
-
-        btnContinue = (Button) view.findViewById(R.id.btnContinue);
-        edtEmail = (EditText) view.findViewById(R.id.edtEmail);
-
-        checkBox = (AppCompatCheckBox) view.findViewById(R.id.chbAgrees);
-        checkBox.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
-            @Override
-            public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
-                btnContinue.setEnabled(isChecked);
-            }
-        });
-
-        ivFacebook = (ImageView) view.findViewById(R.id.ivFacebook);
-        ivGoogle = (ImageView) view.findViewById(R.id.ivGoogle);
-        ivTwitter = (ImageView) view.findViewById(R.id.ivTwitter);
-        ivGithub = (ImageView) view.findViewById(R.id.ivGithub);
-
-        btnContinue.setOnClickListener(this);
-        ivFacebook.setOnClickListener(this);
-        ivGoogle.setOnClickListener(this);
-        ivTwitter.setOnClickListener(this);
-        ivGithub.setOnClickListener(this);
-    }
-
-    @Override
-    public void onClick(View v) {
-        switch (v.getId()) {
-            case R.id.btnContinue:
-                onContinueClick();
-                break;
-            case R.id.ivFacebook:
-                ((XabberAccountInfoActivity)getActivity()).loginFacebook();
-                break;
-            case R.id.ivGoogle:
-                ((XabberAccountInfoActivity)getActivity()).loginGoogle();
-                break;
-            case R.id.ivGithub:
-                ((XabberAccountInfoActivity)getActivity()).loginGithub();
-                break;
-            case R.id.ivTwitter:
-                ((XabberAccountInfoActivity)getActivity()).loginTwitter();
-                break;
-        }
-    }
-
-    private void onContinueClick() {
-        String email = edtEmail.getText().toString().trim();
-
-        if (email.isEmpty()) {
-            edtEmail.setError(getString(R.string.empty_field));
-            return;
-        }
-
-        if (NetworkManager.isNetworkAvailable()) {
-            ((XabberAccountInfoActivity)getActivity()).signup(email);
-        } else
-            Toast.makeText(getActivity(), R.string.toast_no_internet, Toast.LENGTH_LONG).show();
-    }
-}
diff --git a/xabber/src/main/java/com/xabber/android/ui/fragment/XabberLoginFragment.java b/xabber/src/main/java/com/xabber/android/ui/fragment/XabberLoginFragment.java
deleted file mode 100644
index dd00641735..0000000000
--- a/xabber/src/main/java/com/xabber/android/ui/fragment/XabberLoginFragment.java
+++ /dev/null
@@ -1,95 +0,0 @@
-package com.xabber.android.ui.fragment;
-
-import android.app.Fragment;
-import android.content.Context;
-import android.content.Intent;
-import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.view.inputmethod.InputMethodManager;
-import android.widget.Button;
-import android.widget.EditText;
-import android.widget.RelativeLayout;
-import android.widget.Toast;
-
-import com.xabber.android.R;
-import com.xabber.android.data.connection.NetworkManager;
-import com.xabber.android.ui.activity.XabberAccountInfoActivity;
-import com.xabber.android.ui.activity.XabberLoginActivity;
-
-/**
- * Created by valery.miller on 25.07.17.
- */
-
-public class XabberLoginFragment extends Fragment implements View.OnClickListener {
-
-    private EditText edtLogin;
-    private EditText edtPass;
-    private Button btnLogin;
-    private RelativeLayout rlForgotPass;
-    private RelativeLayout rlSignUp;
-
-    @Nullable
-    @Override
-    public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, Bundle savedInstanceState) {
-        return inflater.inflate(R.layout.include_login_fields, container, false);
-    }
-
-    @Override
-    public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
-        super.onViewCreated(view, savedInstanceState);
-
-        edtLogin = (EditText) view.findViewById(R.id.edtLogin);
-        edtPass = (EditText) view.findViewById(R.id.edtPass);
-        btnLogin = (Button) view.findViewById(R.id.btnLogin);
-        rlForgotPass = (RelativeLayout) view.findViewById(R.id.rlForgotPass);
-        //rlSignUp = (RelativeLayout) view.findViewById(R.id.rlSignUp);
-
-        btnLogin.setOnClickListener(this);
-        rlForgotPass.setOnClickListener(this);
-        //rlSignUp.setOnClickListener(this);
-    }
-
-    @Override
-    public void onClick(View v) {
-        switch (v.getId()) {
-            case R.id.btnLogin:
-                onLoginClick();
-                break;
-            case R.id.rlForgotPass:
-                ((XabberLoginActivity)getActivity()).onForgotPassClick();
-                break;
-//            case R.id.rlSignUp:
-//                Intent intent = XabberAccountInfoActivity.createIntent(getActivity());
-//                intent.putExtra(XabberAccountInfoActivity.CALL_FROM, XabberAccountInfoActivity.CALL_FROM_LOGIN);
-//                startActivity(intent);
-//                break;
-        }
-    }
-
-    private void onLoginClick() {
-        // hide keyboard
-        InputMethodManager imm = (InputMethodManager)getActivity().getSystemService(Context.INPUT_METHOD_SERVICE);
-        imm.hideSoftInputFromWindow(edtPass.getWindowToken(), 0);
-
-        String login = edtLogin.getText().toString().trim();
-        String pass = edtPass.getText().toString().trim();
-
-        if (login.isEmpty()) {
-            edtLogin.setError("empty field");
-            return;
-        }
-
-        if (pass.isEmpty()) {
-            edtPass.setError("empty field");
-            return;
-        }
-
-        if (NetworkManager.isNetworkAvailable()) {
-            ((XabberLoginActivity)getActivity()).login(login, pass);
-        } else
-            Toast.makeText(getActivity(), "No internet connection", Toast.LENGTH_LONG).show();
-    }
-}
diff --git a/xabber/src/main/res/layout/activity_xabber_login.xml b/xabber/src/main/res/layout/activity_xabber_login.xml
index f33f19e8f7..99e9c23d14 100644
--- a/xabber/src/main/res/layout/activity_xabber_login.xml
+++ b/xabber/src/main/res/layout/activity_xabber_login.xml
@@ -15,6 +15,4 @@
         android:layout_marginLeft="16dp"
         android:layout_marginRight="16dp"/>
 
-    <include layout="@layout/include_login_social" />
-
 </RelativeLayout>
\ No newline at end of file

From 469ba3ffacb9997444f1771ff8e0bf17a1b8fe77 Mon Sep 17 00:00:00 2001
From: Valery Miller <valera_miller94@mail.ru>
Date: Wed, 15 Aug 2018 18:24:53 +0500
Subject: [PATCH 029/251] Refactoring of authorization flow

---
 .../ui/activity/BaseLoginActivity.java        | 234 +------
 .../ui/activity/XabberAccountActivity.java    | 569 ++++++++++++++++++
 .../ui/activity/XabberLoginActivity.java      | 328 ++++++++--
 .../ui/dialog/AccountSyncDialogFragment.java  |  15 +-
 .../ui/fragment/XAccountSignUpFragment.java   |   8 +-
 .../fragment/XAccountXMPPConfirmFragment.java |   4 +-
 .../fragment/XabberAccountInfoFragment.java   |  14 +-
 7 files changed, 877 insertions(+), 295 deletions(-)
 create mode 100644 xabber/src/main/java/com/xabber/android/ui/activity/XabberAccountActivity.java

diff --git a/xabber/src/main/java/com/xabber/android/ui/activity/BaseLoginActivity.java b/xabber/src/main/java/com/xabber/android/ui/activity/BaseLoginActivity.java
index f6b32e52dd..8afe4a703b 100644
--- a/xabber/src/main/java/com/xabber/android/ui/activity/BaseLoginActivity.java
+++ b/xabber/src/main/java/com/xabber/android/ui/activity/BaseLoginActivity.java
@@ -1,6 +1,5 @@
 package com.xabber.android.ui.activity;
 
-import android.app.AlertDialog;
 import android.content.Intent;
 import android.os.Bundle;
 import android.support.annotation.NonNull;
@@ -34,18 +33,10 @@
 import com.xabber.android.R;
 import com.xabber.android.data.Application;
 import com.xabber.android.data.xaccount.AuthManager;
-import com.xabber.android.data.xaccount.XAccountTokenDTO;
-import com.xabber.android.data.xaccount.XabberAccount;
-import com.xabber.android.utils.RetrofitErrorConverter;
 
 import java.io.IOException;
 import java.util.Collections;
 
-import okhttp3.ResponseBody;
-import rx.Subscription;
-import rx.android.schedulers.AndroidSchedulers;
-import rx.functions.Action1;
-import rx.schedulers.Schedulers;
 import rx.subscriptions.CompositeSubscription;
 
 /**
@@ -115,15 +106,6 @@ public void loginTwitter() {
         twitterAuthClient.authorize(this, twitterSessionCallback);
     }
 
-    public void loginGithub() {
-        AlertDialog.Builder builder = new AlertDialog.Builder(this);
-        builder.setMessage(R.string.github_alert)
-                .setTitle("GitHub")
-                .setPositiveButton(R.string.ok, null);
-        AlertDialog dialog = builder.create();
-        dialog.show();
-    }
-
     private void initGoogleAuth() {
         GoogleSignInOptions gso = new GoogleSignInOptions.Builder(GoogleSignInOptions.DEFAULT_SIGN_IN)
                 .requestServerAuthCode(getString(R.string.SOCIAL_AUTH_GOOGLE_KEY), false)
@@ -160,8 +142,7 @@ public void run() {
                             Application.getInstance().runOnUiThread(new Runnable() {
                                 @Override
                                 public void run() {
-                                    // TODO: 14.08.18 определять bind или login
-                                    bindSocial(AuthManager.PROVIDER_GOOGLE, token);
+                                    onSocialAuthSuccess(AuthManager.PROVIDER_GOOGLE, token);
                                 }
                             });
                         } catch (IOException e) {
@@ -180,8 +161,7 @@ private void initFacebookAuth() {
             public void onSuccess(LoginResult loginResult) {
                 String token = loginResult.getAccessToken().getToken();
                 if (token != null)
-                    // TODO: 14.08.18 определять bind или login
-                    bindSocial(AuthManager.PROVIDER_FACEBOOK, token);
+                    onSocialAuthSuccess(AuthManager.PROVIDER_FACEBOOK, token);
             }
 
             @Override
@@ -212,7 +192,7 @@ public void success(Result<TwitterSession> result) {
                 String token = result.data.getAuthToken().token;
                 String secret = result.data.getAuthToken().secret;
                 if (token != null && secret != null)
-                    loginSocialTwitter(token, secret,
+                    onTwitterAuthSuccess(token, secret,
                             getResources().getString(R.string.SOCIAL_AUTH_TWITTER_SECRET),
                             getResources().getString(R.string.SOCIAL_AUTH_TWITTER_KEY));
             }
@@ -224,213 +204,9 @@ public void failure(TwitterException exception) {
         };
     }
 
-    private void bindSocial(final String provider, final String token) {
-        showProgress("Bind social");
-        Subscription loginSocialSubscription = AuthManager.bindSocial(provider, token)
-                .subscribeOn(Schedulers.io())
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(new Action1<ResponseBody>() {
-                    @Override
-                    public void call(ResponseBody s) {
-                        Toast.makeText(BaseLoginActivity.this,
-                                "Social bind successfull", Toast.LENGTH_SHORT).show();
-                    }
-                }, new Action1<Throwable>() {
-                    @Override
-                    public void call(Throwable throwable) {
-                        handleErrorSocialLogin(throwable, token, provider);
-                    }
-                });
-        compositeSubscription.add(loginSocialSubscription);
-    }
-
-    private void loginSocial(final String provider, final String token) {
-        showProgress(getString(R.string.progress_title_login));
-        Subscription loginSocialSubscription = AuthManager.loginSocial(provider, token)
-                .subscribeOn(Schedulers.io())
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(new Action1<XAccountTokenDTO>() {
-                    @Override
-                    public void call(XAccountTokenDTO s) {
-                        handleSuccessLogin(s);
-                    }
-                }, new Action1<Throwable>() {
-                    @Override
-                    public void call(Throwable throwable) {
-                        handleErrorSocialLogin(throwable, token, provider);
-                    }
-                });
-        compositeSubscription.add(loginSocialSubscription);
-    }
-
-    // TODO: 08.08.18 что передавать в twitter ?
-    private void loginSocialTwitter(final String token, String twitterTokenSecret, String secret, String key) {
-        showProgress(getString(R.string.progress_title_login));
-        Subscription loginSocialSubscription = AuthManager.loginSocialTwitter(token, twitterTokenSecret, secret, key)
-                .subscribeOn(Schedulers.io())
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(new Action1<XAccountTokenDTO>() {
-                    @Override
-                    public void call(XAccountTokenDTO s) {
-                        handleSuccessLogin(s);
-                    }
-                }, new Action1<Throwable>() {
-                    @Override
-                    public void call(Throwable throwable) {
-                        handleErrorSocialLogin(throwable, token, "twitter");
-                    }
-                });
-        compositeSubscription.add(loginSocialSubscription);
-    }
-
-    public void login(String login, String pass) {
-        showProgress(getString(R.string.progress_title_login));
-        Subscription loginSubscription = AuthManager.login(login, pass)
-                .subscribeOn(Schedulers.io())
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(new Action1<XAccountTokenDTO>() {
-                    @Override
-                    public void call(XAccountTokenDTO s) {
-                        handleSuccessLogin(s);
-                    }
-                }, new Action1<Throwable>() {
-                    @Override
-                    public void call(Throwable throwable) {
-                        handleErrorLogin(throwable);
-                    }
-                });
-        compositeSubscription.add(loginSubscription);
-    }
-
-    private void handleSuccessLogin(@NonNull XAccountTokenDTO response) {
-        getAccount(response.getToken());
-    }
-
-    private void handleErrorLogin(Throwable throwable) {
-        hideProgress();
+    protected abstract void onSocialAuthSuccess(final String provider, final String token);
 
-        String message = RetrofitErrorConverter.throwableToHttpError(throwable);
-        if (message != null) {
-            Log.d(TAG, "Error while login: " + message);
-            Toast.makeText(this, message, Toast.LENGTH_SHORT).show();
-        } else {
-            Log.d(TAG, "Error while login: " + throwable.toString());
-            Toast.makeText(this, "Error while login: " + throwable.toString(), Toast.LENGTH_LONG).show();
-        }
-    }
-
-    private void handleErrorSocialLogin(Throwable throwable, String socialToken, String provider) {
-        String message = RetrofitErrorConverter.throwableToHttpError(throwable);
-        if (message != null) {
-            if (message.contains("is not attached to any Xabber account")) {
-                // go to sign up
-                Intent intent = XabberAccountInfoActivity.createIntent(BaseLoginActivity.this);
-                intent.putExtra(XabberAccountInfoActivity.SOCIAL_TOKEN, socialToken);
-                intent.putExtra(XabberAccountInfoActivity.SOCIAL_PROVIDER, provider);
-                startActivity(intent);
-            } else {
-                Log.d(TAG, "Error while social login request: " + message);
-                Toast.makeText(this, R.string.social_auth_fail, Toast.LENGTH_LONG).show();
-            }
-        } else {
-            Log.d(TAG, "Error while social login request: " + throwable.toString());
-            Toast.makeText(this, R.string.social_auth_fail, Toast.LENGTH_LONG).show();
-        }
-        hideProgress();
-    }
-
-    private void getAccount(String token) {
-        Subscription getAccountSubscription = AuthManager.getAccount(token)
-                .subscribeOn(Schedulers.io())
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(new Action1<XabberAccount>() {
-                    @Override
-                    public void call(XabberAccount xabberAccount) {
-                        handleSuccessGetAccount(xabberAccount);
-                    }
-                }, new Action1<Throwable>() {
-                    @Override
-                    public void call(Throwable throwable) {
-                        handleErrorLogin(throwable);
-                    }
-                });
-        compositeSubscription.add(getAccountSubscription);
-    }
-
-    private void handleSuccessGetAccount(@NonNull XabberAccount xabberAccount) {
-        if (!XabberAccount.STATUS_REGISTERED.equals(xabberAccount.getAccountStatus()))
-            handleSuccessGetAccountAfterSignUp(xabberAccount);
-        else {
-            Intent intent = XabberAccountInfoActivity.createIntent(this);
-            intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK);
-            intent.putExtra(XabberAccountInfoActivity.CALL_FROM, XabberAccountInfoActivity.CALL_FROM_LOGIN);
-            finish();
-            startActivity(intent);
-        }
-    }
-
-    public void signup(String email) {
-        showProgress(getString(R.string.progress_title_signup));
-        Subscription signupSubscription = AuthManager.signup(email)
-                .subscribeOn(Schedulers.io())
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(new Action1<XAccountTokenDTO>() {
-                    @Override
-                    public void call(XAccountTokenDTO s) {
-                        handleSuccessSignUp(s);
-                    }
-                }, new Action1<Throwable>() {
-                    @Override
-                    public void call(Throwable throwable) {
-                        handleErrorSignUp(throwable);
-                    }
-                });
-        compositeSubscription.add(signupSubscription);
-    }
-
-    private void handleSuccessSignUp(XAccountTokenDTO s) {
-        getAccountAfterSignUp(s.getToken());
-    }
-
-    private void handleErrorSignUp(Throwable throwable) {
-        hideProgress();
-
-        String message = RetrofitErrorConverter.throwableToHttpError(throwable);
-        if (message != null) {
-            Log.d(TAG, "Error while registration: " + message);
-            Toast.makeText(this, message, Toast.LENGTH_SHORT).show();
-        } else {
-            Log.d(TAG, "Error while registration: " + throwable.toString());
-            Toast.makeText(this, "Error while registration: " + throwable.toString(), Toast.LENGTH_LONG).show();
-        }
-    }
-
-    private void getAccountAfterSignUp(String token) {
-        Subscription getAccountSubscription = AuthManager.getAccount(token)
-                .subscribeOn(Schedulers.io())
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(new Action1<XabberAccount>() {
-                    @Override
-                    public void call(XabberAccount xabberAccount) {
-                        handleSuccessGetAccountAfterSignUp(xabberAccount);
-                    }
-                }, new Action1<Throwable>() {
-                    @Override
-                    public void call(Throwable throwable) {
-                        handleErrorSignUp(throwable);
-                    }
-                });
-        compositeSubscription.add(getAccountSubscription);
-    }
-
-    public void handleSuccessGetAccountAfterSignUp(XabberAccount account) {
-        hideProgress();
-
-        Intent intent = XabberAccountInfoActivity.createIntent(this);
-        intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK);
-        finish();
-        startActivity(intent);
-    }
+    protected abstract void onTwitterAuthSuccess(final String token, String twitterTokenSecret, String secret, String key);
 
     protected abstract void showProgress(String title);
 
diff --git a/xabber/src/main/java/com/xabber/android/ui/activity/XabberAccountActivity.java b/xabber/src/main/java/com/xabber/android/ui/activity/XabberAccountActivity.java
new file mode 100644
index 0000000000..0e800370af
--- /dev/null
+++ b/xabber/src/main/java/com/xabber/android/ui/activity/XabberAccountActivity.java
@@ -0,0 +1,569 @@
+package com.xabber.android.ui.activity;
+
+import android.app.Fragment;
+import android.app.FragmentTransaction;
+import android.app.ProgressDialog;
+import android.content.Context;
+import android.content.Intent;
+import android.os.Bundle;
+import android.support.annotation.NonNull;
+import android.support.v7.widget.Toolbar;
+import android.util.Log;
+import android.view.View;
+import android.widget.Toast;
+
+import com.xabber.android.R;
+import com.xabber.android.data.SettingsManager;
+import com.xabber.android.data.account.AccountManager;
+import com.xabber.android.data.connection.NetworkManager;
+import com.xabber.android.data.xaccount.AuthManager;
+import com.xabber.android.data.xaccount.XMPPAccountSettings;
+import com.xabber.android.data.xaccount.XMPPAuthManager;
+import com.xabber.android.data.xaccount.XabberAccount;
+import com.xabber.android.data.xaccount.XabberAccountManager;
+import com.xabber.android.ui.color.BarPainter;
+import com.xabber.android.ui.fragment.XAccountXMPPAuthFragment;
+import com.xabber.android.ui.fragment.XAccountXMPPConfirmFragment;
+import com.xabber.android.ui.fragment.XabberAccountInfoFragment;
+import com.xabber.android.utils.RetrofitErrorConverter;
+
+import java.util.List;
+
+import okhttp3.ResponseBody;
+import rx.Subscription;
+import rx.android.schedulers.AndroidSchedulers;
+import rx.functions.Action1;
+import rx.schedulers.Schedulers;
+
+public class XabberAccountActivity extends BaseLoginActivity
+        implements XAccountXMPPAuthFragment.Listener, XAccountXMPPConfirmFragment.Listener,
+                    XabberAccountInfoFragment.Listener {
+
+    private final static String LOG_TAG = XabberAccountActivity.class.getSimpleName();
+    private final static String FRAGMENT_INFO = "fragment_info";
+    private final static String FRAGMENT_XMPP_AUTH = "fragment_xmpp_auth";
+    private final static String FRAGMENT_XMPP_CONFIRM = "fragment_xmpp_confirm";
+
+    private FragmentTransaction fTrans;
+    private Fragment fragmentInfo;
+    private Fragment fragmentXMPPAuth;
+    private Fragment fragmentXMPPConfirm;
+
+    private Toolbar toolbar;
+    private BarPainter barPainter;
+    private ProgressDialog progressDialog;
+    private boolean needShowSyncDialog = false;
+
+    @NonNull
+    public static Intent createIntent(Context context) {
+        return new Intent(context, XabberAccountActivity.class);
+    }
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        setContentView(R.layout.activity_xabber_account_info);
+
+        toolbar = (Toolbar) findViewById(R.id.toolbar_default);
+        toolbar.setNavigationIcon(R.drawable.ic_arrow_left_white_24dp);
+        toolbar.setNavigationOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                finish();
+            }
+        });
+        toolbar.inflateMenu(R.menu.toolbar_xabber_account_info);
+        barPainter = new BarPainter(this, toolbar);
+    }
+
+    @Override
+    protected void onResume() {
+        super.onResume();
+        onPrepareOptionsMenu(toolbar.getMenu());
+
+        XabberAccount account = XabberAccountManager.getInstance().getAccount();
+        if (account != null) showInfoFragment();
+        else showXMPPAuthFragment();
+    }
+
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+        compositeSubscription.clear();
+    }
+
+    @Override
+    protected void showProgress(String title) {
+        if (!isFinishing()) {
+            progressDialog = new ProgressDialog(this);
+            progressDialog.setTitle(title);
+            progressDialog.setMessage(getResources().getString(R.string.progress_message));
+            progressDialog.show();
+        }
+    }
+
+    @Override
+    protected void hideProgress() {
+        if (progressDialog != null) {
+            progressDialog.dismiss();
+            progressDialog = null;
+        }
+    }
+
+    /** XMPP Auth */
+
+    @Override
+    public void onAccountClick(String accountJid) {
+        if (NetworkManager.isNetworkAvailable()) {
+            requestXMPPCode(accountJid);
+        } else
+            Toast.makeText(this, R.string.toast_no_internet, Toast.LENGTH_LONG).show();
+    }
+
+    @Override
+    public void onConfirmXMPPClick(String jid, String code) {
+        if (NetworkManager.isNetworkAvailable()) {
+            confirmXMPP(code, jid);
+        } else
+            Toast.makeText(this, R.string.toast_no_internet, Toast.LENGTH_LONG).show();
+    }
+
+    /** Social Auth */
+
+    @Override
+    public void onGoogleClick() {
+        loginGoogle();
+    }
+
+    @Override
+    public void onFacebookClick() {
+        loginFacebook();
+    }
+
+    @Override
+    public void onTwitterClick() {
+        loginTwitter();
+    }
+
+    /** Xabber Account Info */
+
+    @Override
+    public void needXMPPAuthFragment() {
+        showXMPPAuthFragment();
+    }
+
+    @Override
+    public void onLogoutClick(boolean deleteAccounts) {
+        if (NetworkManager.isNetworkAvailable()) {
+            logout(deleteAccounts);
+        } else
+            Toast.makeText(this, R.string.toast_no_internet, Toast.LENGTH_LONG).show();
+    }
+
+    @Override
+    public void onSyncClick(boolean needGoToMainActivity) {
+        if (NetworkManager.isNetworkAvailable()) {
+            synchronize(needGoToMainActivity);
+        } else
+            Toast.makeText(this, R.string.toast_no_internet, Toast.LENGTH_LONG).show();
+    }
+
+    /** Email */
+
+    @Override
+    public void onAddEmailClick(String email) {
+        resendConfirmEmail(email);
+    }
+
+    @Override
+    public void onConfirmEmailClick(String email, String code) {
+        confirmEmail(code);
+    }
+
+    private void showInfoFragment() {
+        if (fragmentInfo == null) {
+            fragmentInfo = XabberAccountInfoFragment.newInstance(this);
+            Bundle bundle = new Bundle();
+            bundle.putBoolean("SHOW_SYNC", needShowSyncDialog);
+            fragmentInfo.setArguments(bundle);
+        }
+
+        fTrans = getFragmentManager().beginTransaction();
+        fTrans.replace(R.id.container, fragmentInfo, FRAGMENT_INFO);
+        fTrans.commit();
+
+        toolbar.setTitle(R.string.title_xabber_account);
+        barPainter.setDefaultColor();
+    }
+
+    private void showXMPPAuthFragment() {
+        if (fragmentXMPPAuth == null)
+            fragmentXMPPAuth = XAccountXMPPAuthFragment.newInstance(this);
+
+        fTrans = getFragmentManager().beginTransaction();
+        fTrans.replace(R.id.container, fragmentXMPPAuth, FRAGMENT_XMPP_AUTH);
+        fTrans.commit();
+
+        toolbar.setTitle(R.string.title_register_xabber_account);
+        barPainter.setBlue(this);
+    }
+
+    private void showXMPPConfirmFragment(String jid) {
+        if (fragmentXMPPConfirm == null)
+            fragmentXMPPConfirm = XAccountXMPPConfirmFragment.newInstance(this);
+
+        ((XAccountXMPPConfirmFragment)fragmentXMPPConfirm).setJid(jid);
+
+        fTrans = getFragmentManager().beginTransaction();
+        fTrans.replace(R.id.container, fragmentXMPPConfirm, FRAGMENT_XMPP_CONFIRM);
+        fTrans.commit();
+
+        toolbar.setTitle(R.string.title_register_xabber_account);
+        barPainter.setBlue(this);
+    }
+
+    private void updateAccountInfo(XabberAccount account) {
+        if (account != null) {
+            XabberAccountInfoFragment fragment = (XabberAccountInfoFragment) getFragmentManager().findFragmentByTag(FRAGMENT_INFO);
+            if (fragment != null && fragment.isVisible())
+                ((XabberAccountInfoFragment) fragmentInfo).updateData(account);
+        }
+    }
+
+    private void updateLastSyncTime() {
+        XabberAccountInfoFragment fragment = (XabberAccountInfoFragment) getFragmentManager().findFragmentByTag(FRAGMENT_INFO);
+        if (fragment != null && fragment.isVisible())
+            ((XabberAccountInfoFragment) fragmentInfo).updateLastSyncTime();
+    }
+
+    /** LOGOUT */
+
+    private void logout(final boolean deleteAccounts) {
+        showProgress(getResources().getString(R.string.progress_title_quit));
+        Subscription logoutSubscription = AuthManager.logout(deleteAccounts)
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(new Action1<ResponseBody>() {
+                    @Override
+                    public void call(ResponseBody s) {
+                        handleSuccessLogout(s, deleteAccounts);
+                    }
+                }, new Action1<Throwable>() {
+                    @Override
+                    public void call(Throwable throwable) {
+                        handleErrorLogout(throwable);
+                    }
+                });
+        compositeSubscription.add(logoutSubscription);
+    }
+
+    private void handleSuccessLogout(ResponseBody s, boolean deleteAccounts) {
+        if (deleteAccounts) XabberAccountManager.getInstance().deleteSyncedLocalAccounts();
+        XabberAccountManager.getInstance().removeAccount();
+        //showLoginFragment();
+        hideProgress();
+        Toast.makeText(this, R.string.quit_success, Toast.LENGTH_SHORT).show();
+        Intent intent = ContactListActivity.createIntent(XabberAccountActivity.this);
+        intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK);
+        startActivity(intent);
+    }
+
+    private void handleErrorLogout(Throwable throwable) {
+        String message = RetrofitErrorConverter.throwableToHttpError(throwable);
+        if (message != null) {
+            if (message.equals("Invalid token")) {
+                XabberAccountManager.getInstance().onInvalidToken();
+                //showLoginFragment();
+            } else {
+                Log.d(LOG_TAG, "Error while logout: " + message);
+                Toast.makeText(this, message, Toast.LENGTH_SHORT).show();
+            }
+        } else {
+            Log.d(LOG_TAG, "Error while logout: " + throwable.toString());
+            Toast.makeText(this, "Error while logout: " + throwable.toString(), Toast.LENGTH_LONG).show();
+        }
+        hideProgress();
+    }
+
+    /** SYNCHRONIZATION */
+
+    private void synchronize(boolean needGoToMainActivity) {
+        XabberAccount account = XabberAccountManager.getInstance().getAccount();
+        if (account != null && account.getToken() != null) {
+            showProgress(getResources().getString(R.string.progress_title_sync));
+            getAccountWithUpdate(account.getToken(), needGoToMainActivity);
+        } else {
+            Toast.makeText(XabberAccountActivity.this, R.string.sync_fail, Toast.LENGTH_SHORT).show();
+        }
+    }
+
+    private void getAccountWithUpdate(String token, final boolean needGoToMainActivity) {
+        Subscription loadAccountsSubscription = AuthManager.getAccount(token)
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(new Action1<XabberAccount>() {
+                    @Override
+                    public void call(XabberAccount s) {
+                        Log.d(LOG_TAG, "Xabber account loading from net: successfully");
+                        updateAccountInfo(s);
+
+                        // if exist local accounts
+                        if (AccountManager.getInstance().getAllAccountItems().size() > 0)
+                            updateSettings(needGoToMainActivity);
+                        else getSettings();
+
+                    }
+                }, new Action1<Throwable>() {
+                    @Override
+                    public void call(Throwable throwable) {
+                        Log.d(LOG_TAG, "Xabber account loading from net: error: " + throwable.toString());
+                        String message = RetrofitErrorConverter.throwableToHttpError(throwable);
+                        if (message != null && message.equals("Invalid token")) {
+                            XabberAccountManager.getInstance().onInvalidToken();
+                            //showLoginFragment();
+                        }
+
+                        hideProgress();
+                        Toast.makeText(XabberAccountActivity.this, R.string.sync_fail, Toast.LENGTH_SHORT).show();
+                    }
+                });
+        compositeSubscription.add(loadAccountsSubscription);
+    }
+
+    private void updateSettings(final boolean needGoToMainActivity) {
+        Subscription getSettingsSubscription = AuthManager.patchClientSettings(XabberAccountManager.getInstance().createSettingsList())
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(new Action1<List<XMPPAccountSettings>>() {
+                    @Override
+                    public void call(List<XMPPAccountSettings> s) {
+                        Log.d(LOG_TAG, "XMPP accounts loading from net: successfully");
+                        hideProgress();
+                        updateLastSyncTime();
+                        Toast.makeText(XabberAccountActivity.this, R.string.sync_success, Toast.LENGTH_SHORT).show();
+                        if (needGoToMainActivity) goToMainActivity();
+                    }
+                }, new Action1<Throwable>() {
+                    @Override
+                    public void call(Throwable throwable) {
+                        Log.d(LOG_TAG, "XMPP accounts loading from net: error: " + throwable.toString());
+                        hideProgress();
+                        Toast.makeText(XabberAccountActivity.this, R.string.sync_fail, Toast.LENGTH_SHORT).show();
+                    }
+                });
+        compositeSubscription.add(getSettingsSubscription);
+    }
+
+    private void getSettings() {
+        Subscription getSettingsSubscription = AuthManager.getClientSettings()
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(new Action1<List<XMPPAccountSettings>>() {
+                    @Override
+                    public void call(List<XMPPAccountSettings> settings) {
+                        Log.d(LOG_TAG, "XMPP accounts loading from net: successfully");
+                        XabberAccountManager.getInstance().setXmppAccountsForCreate(settings);
+                        hideProgress();
+                        // update last synchronization time
+                        SettingsManager.setLastSyncDate(XabberAccountManager.getCurrentTimeString());
+                        Toast.makeText(XabberAccountActivity.this, R.string.sync_success, Toast.LENGTH_SHORT).show();
+                        goToMainActivity();
+                    }
+                }, new Action1<Throwable>() {
+                    @Override
+                    public void call(Throwable throwable) {
+                        Log.d(LOG_TAG, "XMPP accounts loading from net: error: " + throwable.toString());
+                        hideProgress();
+                    }
+                });
+        compositeSubscription.add(getSettingsSubscription);
+    }
+
+    /** REQUEST XMPP CODE */
+
+    private void requestXMPPCode(final String jid) {
+        showProgress("Request XMPP auth-code..");
+        Subscription requestXMPPCodeSubscription = AuthManager.requestXMPPCode(jid)
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(new Action1<AuthManager.XMPPCode>() {
+                    @Override
+                    public void call(AuthManager.XMPPCode code) {
+                        handleSuccessRequestXMPPCode(code, jid);
+                    }
+                }, new Action1<Throwable>() {
+                    @Override
+                    public void call(Throwable throwable) {
+                        handleErrorRequestXMPPCode(throwable);
+                    }
+                });
+        compositeSubscription.add(requestXMPPCodeSubscription);
+    }
+
+    private void handleSuccessRequestXMPPCode(AuthManager.XMPPCode code, String jid) {
+        hideProgress();
+        XMPPAuthManager.getInstance().addRequest(code.getRequestId(), code.getApiJid(), jid);
+        showXMPPConfirmFragment(jid);
+    }
+
+    private void handleErrorRequestXMPPCode(Throwable throwable) {
+        hideProgress();
+
+        // TODO: 03.08.18 implement error parsing
+
+        String error = "Error while request XMPP auth-code: " + throwable.toString();
+        Log.d(LOG_TAG, error);
+        Toast.makeText(this, error, Toast.LENGTH_LONG).show();
+    }
+
+    /** CONFIRM XMPP */
+
+    private void confirmXMPP(String code, String jid) {
+        showProgress("Confirm XMPP-account with code..");
+        Subscription confirmXMPPSubscription = AuthManager.confirmXMPP(jid, code)
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(new Action1<XabberAccount>() {
+                    @Override
+                    public void call(XabberAccount account) {
+                        handleSuccessConfirmXMPP(account);
+                    }
+                }, new Action1<Throwable>() {
+                    @Override
+                    public void call(Throwable throwable) {
+                        handleErrorConfirmXMPP(throwable);
+                    }
+                });
+        compositeSubscription.add(confirmXMPPSubscription);
+    }
+
+    private void handleSuccessConfirmXMPP(XabberAccount account) {
+        hideProgress();
+        showInfoFragment();
+    }
+
+    private void handleErrorConfirmXMPP(Throwable throwable) {
+        hideProgress();
+
+        // TODO: 03.08.18 implement error parsing
+
+        String error = "Error while confirmEmail XMPP-account: " + throwable.toString();
+        Log.d(LOG_TAG, error);
+        Toast.makeText(this, error, Toast.LENGTH_LONG).show();
+    }
+
+    /** ADD EMAIL */
+
+    private void resendConfirmEmail(String email) {
+        showProgress(getResources().getString(R.string.progress_title_resend));
+        Subscription resendEmailSubscription = AuthManager.addEmail(email)
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(new Action1<ResponseBody>() {
+                    @Override
+                    public void call(ResponseBody s) {
+                        handleSuccessResendEmail(s);
+                    }
+                }, new Action1<Throwable>() {
+                    @Override
+                    public void call(Throwable throwable) {
+                        handleErrorResendEmail(throwable);
+                    }
+                });
+        compositeSubscription.add(resendEmailSubscription);
+    }
+
+    private void handleSuccessResendEmail(ResponseBody response) {
+        hideProgress();
+        Toast.makeText(this, R.string.resend_success, Toast.LENGTH_SHORT).show();
+    }
+
+    private void handleErrorResendEmail(Throwable throwable) {
+        hideProgress();
+
+        String message = RetrofitErrorConverter.throwableToHttpError(throwable);
+        if (message != null) {
+            Log.d(LOG_TAG, "Error while send verification email: " + message);
+            Toast.makeText(this, message, Toast.LENGTH_SHORT).show();
+        } else {
+            Log.d(LOG_TAG, "Error while send verification email: " + throwable.toString());
+            Toast.makeText(this, "Error while send verification email: " + throwable.toString(), Toast.LENGTH_LONG).show();
+        }
+    }
+
+    /** CONFIRM EMAIL */
+
+    private void confirmEmail(String code) {
+        showProgress(getResources().getString(R.string.progress_title_confirm));
+        Subscription confirmSubscription = AuthManager.confirmEmail(code)
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(new Action1<XabberAccount>() {
+                    @Override
+                    public void call(XabberAccount s) {
+                        handleSuccessConfirm(s);
+                    }
+                }, new Action1<Throwable>() {
+                    @Override
+                    public void call(Throwable throwable) {
+                        handleErrorConfirm(throwable);
+                    }
+                });
+        compositeSubscription.add(confirmSubscription);
+    }
+
+    private void handleSuccessConfirm(XabberAccount response) {
+        hideProgress();
+        Toast.makeText(this, R.string.confirm_success, Toast.LENGTH_SHORT).show();
+    }
+
+    private void handleErrorConfirm(Throwable throwable) {
+        hideProgress();
+
+        String message = RetrofitErrorConverter.throwableToHttpError(throwable);
+        if (message != null) {
+            Log.d(LOG_TAG, "Error while confirming email: " + message);
+            Toast.makeText(this, message, Toast.LENGTH_SHORT).show();
+        } else {
+            Log.d(LOG_TAG, "Error while confirming email: " + throwable.toString());
+            Toast.makeText(this, "Error while confirming email: " + throwable.toString(), Toast.LENGTH_LONG).show();
+        }
+    }
+
+    /** SOCIAL AUTH */
+
+    @Override
+    protected void onSocialAuthSuccess(String provider, String token) {
+        showProgress("Bind social");
+        Subscription loginSocialSubscription = AuthManager.bindSocial(provider, token)
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(new Action1<ResponseBody>() {
+                    @Override
+                    public void call(ResponseBody s) {
+                        Toast.makeText(XabberAccountActivity.this,
+                                "Social bind successfull", Toast.LENGTH_SHORT).show();
+                    }
+                }, new Action1<Throwable>() {
+                    @Override
+                    public void call(Throwable throwable) {
+                        Toast.makeText(XabberAccountActivity.this,
+                                "Social bind failure", Toast.LENGTH_SHORT).show();
+                    }
+                });
+        compositeSubscription.add(loginSocialSubscription);
+    }
+
+    @Override
+    protected void onTwitterAuthSuccess(String token, String twitterTokenSecret, String secret, String key) {
+        // TODO: 15.08.18 need implementation
+    }
+
+    private void goToMainActivity() {
+        Intent intent = ContactListActivity.createIntent(XabberAccountActivity.this);
+        intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK);
+        finish();
+        startActivity(intent);
+    }
+}
diff --git a/xabber/src/main/java/com/xabber/android/ui/activity/XabberLoginActivity.java b/xabber/src/main/java/com/xabber/android/ui/activity/XabberLoginActivity.java
index eba86a8a8a..351718325a 100644
--- a/xabber/src/main/java/com/xabber/android/ui/activity/XabberLoginActivity.java
+++ b/xabber/src/main/java/com/xabber/android/ui/activity/XabberLoginActivity.java
@@ -7,45 +7,55 @@
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
 import android.support.v7.widget.Toolbar;
+import android.util.Log;
 import android.view.View;
-import android.widget.ImageView;
 import android.widget.Toast;
 
-import com.google.android.gms.common.api.GoogleApiClient;
 import com.xabber.android.R;
-import com.xabber.android.data.connection.NetworkManager;
+import com.xabber.android.data.xaccount.AuthManager;
 import com.xabber.android.data.xaccount.HttpApiManager;
+import com.xabber.android.data.xaccount.XAccountTokenDTO;
+import com.xabber.android.data.xaccount.XabberAccount;
 import com.xabber.android.ui.color.BarPainter;
-import com.xabber.android.ui.fragment.XabberLoginFragment;
+import com.xabber.android.ui.fragment.XAccountSignUpFragment;
+import com.xabber.android.utils.RetrofitErrorConverter;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import rx.Single;
+import rx.Subscription;
+import rx.android.schedulers.AndroidSchedulers;
+import rx.functions.Action1;
+import rx.schedulers.Schedulers;
 
 
 /**
  * Created by valery.miller on 14.07.17.
  */
 
-public class XabberLoginActivity extends BaseLoginActivity implements View.OnClickListener, GoogleApiClient.OnConnectionFailedListener {
+public class XabberLoginActivity extends BaseLoginActivity implements XAccountSignUpFragment.Listener {
 
-    private final static String TAG = XabberLoginActivity.class.getSimpleName();
+    private final static String LOG_TAG = XabberLoginActivity.class.getSimpleName();
     public final static String CURRENT_FRAGMENT = "current_fragment";
     public final static String FRAGMENT_LOGIN = "fragment_login";
     public final static String FRAGMENT_SIGNUP = "fragment_signup";
 
-    private Fragment fragmentLogin;
     private FragmentTransaction fTrans;
+    private Fragment fragmentLogin;
+    private Fragment fragmentSignUp;
     private String currentFragment = FRAGMENT_LOGIN;
 
     private ProgressDialog progressDialog;
-
-    private ImageView ivFacebook;
-    private ImageView ivGoogle;
-    private ImageView ivTwitter;
-    private ImageView ivGithub;
-
     private BarPainter barPainter;
 
-    public static Intent createIntent(Context context) {
-        return new Intent(context, XabberLoginActivity.class);
+    public static Intent createIntent(Context context, @Nullable String currentFragment) {
+        Intent intent = new Intent(context, XabberLoginActivity.class);
+        intent.putExtra(CURRENT_FRAGMENT, currentFragment);
+        return intent;
     }
 
     @Override
@@ -71,33 +81,42 @@ public void onClick(View v) {
             }
         });
         barPainter = new BarPainter(this, toolbar);
-
-        ivFacebook = (ImageView) findViewById(R.id.ivFacebook);
-        ivGoogle = (ImageView) findViewById(R.id.ivGoogle);
-        ivTwitter = (ImageView) findViewById(R.id.ivTwitter);
-        ivGithub = (ImageView) findViewById(R.id.ivGithub);
-
-        ivFacebook.setOnClickListener(this);
-        ivGoogle.setOnClickListener(this);
-        ivTwitter.setOnClickListener(this);
-        ivGithub.setOnClickListener(this);
     }
 
     public void showLoginFragment() {
-        if (fragmentLogin == null)
-            fragmentLogin = new XabberLoginFragment();
+//        if (fragmentLogin == null)
+//            fragmentLogin = new XabberLoginFragment();
+//
+//        fTrans = getFragmentManager().beginTransaction();
+//        fTrans.replace(R.id.container, fragmentLogin);
+//        fTrans.commit();
+//        currentFragment = FRAGMENT_LOGIN;
+    }
+
+    public void showSignUpFragment(String socialToken, String socialProvider) {
+        if (fragmentSignUp == null)
+            fragmentSignUp = XAccountSignUpFragment.newInstance(this, socialToken, socialProvider);
 
         fTrans = getFragmentManager().beginTransaction();
-        fTrans.replace(R.id.container, fragmentLogin);
+        fTrans.replace(R.id.container, fragmentSignUp, FRAGMENT_SIGNUP);
         fTrans.commit();
-        currentFragment = FRAGMENT_LOGIN;
+
+        //toolbar.setTitle(R.string.title_register_xabber_account);
+        barPainter.setBlue(this);
     }
 
     @Override
     protected void onResume() {
         super.onResume();
-        showLoginFragment();
-        barPainter.setBlue(this);
+        if (currentFragment != null) {
+            switch (currentFragment) {
+                case FRAGMENT_SIGNUP:
+                    showSignUpFragment(null, null);
+                    break;
+                default:
+                    showLoginFragment();
+            }
+        } else showLoginFragment();
     }
 
     @Override
@@ -106,27 +125,6 @@ protected void onSaveInstanceState(Bundle outState) {
         outState.putString(CURRENT_FRAGMENT, currentFragment);
     }
 
-    @Override
-    public void onClick(View v) {
-        if (NetworkManager.isNetworkAvailable()) {
-            switch (v.getId()) {
-                case R.id.ivFacebook:
-                    loginFacebook();
-                    break;
-                case R.id.ivGoogle:
-                    loginGoogle();
-                    break;
-                case R.id.ivGithub:
-                    loginGithub();
-                    break;
-                case R.id.ivTwitter:
-                    loginTwitter();
-                    break;
-            }
-        } else
-            Toast.makeText(this, "No internet connection", Toast.LENGTH_LONG).show();
-    }
-
     public void onForgotPassClick() {
         String url = HttpApiManager.XABBER_FORGOT_PASS_URL;
         Intent intent = new Intent(Intent.ACTION_VIEW);
@@ -156,4 +154,230 @@ protected void hideProgress() {
     public void onBackPressed() {
         super.onBackPressed();
     }
+
+    @Override
+    protected void onSocialAuthSuccess(String provider, String token) {
+        socialLogin(provider, token);
+    }
+
+    @Override
+    protected void onTwitterAuthSuccess(String token, String twitterTokenSecret, String secret, String key) {
+        socialLogin(token, twitterTokenSecret, secret, key);
+    }
+
+    @Override
+    public void onGetHosts() {
+        getHosts();
+    }
+
+    @Override
+    public void onSignupClick(String username, String host, String pass, String captchaToken) {
+        signUp(username, host, pass, captchaToken,null, null);
+    }
+
+    @Override
+    public void onSignupClick(String username, String host, String pass, String socialToken, String socialProvider) {
+        signUp(username, host, pass, null, socialToken, socialProvider);
+    }
+
+    @Override
+    public void onGoogleClick() {
+        loginGoogle();
+    }
+
+    @Override
+    public void onFacebookClick() {
+        loginFacebook();
+    }
+
+    @Override
+    public void onTwitterClick() {
+        loginTwitter();
+    }
+
+    /** GET HOSTS */
+
+    private void getHosts() {
+        showProgress("Request hosts..");
+        Subscription requestHosts = AuthManager.getHosts()
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(new Action1<List<AuthManager.Domain>>() {
+                    @Override
+                    public void call(List<AuthManager.Domain> domains) {
+                        handleSuccessGetHosts(domains);
+                    }
+                }, new Action1<Throwable>() {
+                    @Override
+                    public void call(Throwable throwable) {
+                        handleErrorGetHosts(throwable);
+                    }
+                });
+        compositeSubscription.add(requestHosts);
+    }
+
+    private void handleSuccessGetHosts(List<AuthManager.Domain> domains) {
+        hideProgress();
+
+        List<String> hosts = new ArrayList<>();
+        for (AuthManager.Domain domain : domains) {
+            hosts.add(domain.getDomain());
+        }
+
+        if (fragmentSignUp != null)
+            ((XAccountSignUpFragment)fragmentSignUp).setupSpinner(hosts);
+    }
+
+    private void handleErrorGetHosts(Throwable throwable) {
+        hideProgress();
+
+        // TODO: 03.08.18 implement error parsing
+
+        String error = "Error while request hosts: " + throwable.toString();
+        Log.d(LOG_TAG, error);
+        Toast.makeText(this, error, Toast.LENGTH_LONG).show();
+    }
+
+    /** SIGN UP */
+
+    private void signUp(String username, String host, String pass, String captchaToken,
+                        String socialToken, String socialProvider) {
+        showProgress("Sign Up..");
+
+        Single<XabberAccount> signUpSingle;
+        if (socialToken != null && socialProvider != null)
+            signUpSingle = AuthManager.signupv2(username, host, pass, socialProvider, socialToken);
+        else signUpSingle = AuthManager.signupv2(username, host, pass, captchaToken);
+
+        Subscription signUpSubscription = signUpSingle
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(new Action1<XabberAccount>() {
+                    @Override
+                    public void call(XabberAccount account) {
+                        handleSuccessSignUp();
+                    }
+                }, new Action1<Throwable>() {
+                    @Override
+                    public void call(Throwable throwable) {
+                        handleErrorSignUp(throwable);
+                    }
+                });
+        compositeSubscription.add(signUpSubscription);
+    }
+
+    private void handleSuccessSignUp() {
+        // TODO: 15.08.18 go to xabber account
+    }
+
+    private void handleErrorSignUp(Throwable throwable) {
+        hideProgress();
+
+        // TODO: 03.08.18 implement error parsing
+
+        String error = "Error while signup: " + throwable.toString();
+        Log.d(LOG_TAG, error);
+        Toast.makeText(this, error, Toast.LENGTH_LONG).show();
+    }
+
+    /** SOCIAL LOGIN */
+
+    private void socialLogin(final String provider, final String token) {
+        showProgress(getString(R.string.progress_title_login));
+        Subscription loginSocialSubscription = AuthManager.loginSocial(provider, token)
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(new Action1<XAccountTokenDTO>() {
+                    @Override
+                    public void call(XAccountTokenDTO s) {
+                        handleSuccessSocialLogin(s);
+                    }
+                }, new Action1<Throwable>() {
+                    @Override
+                    public void call(Throwable throwable) {
+                        handleErrorSocialLogin(throwable, token, provider);
+                    }
+                });
+        compositeSubscription.add(loginSocialSubscription);
+    }
+
+    private void socialLogin(String socialToken, String twitterTokenSecret, String secret, String key) {
+        showProgress(getString(R.string.progress_title_login));
+        Subscription loginSocialSubscription = AuthManager.loginSocialTwitter(socialToken,
+                twitterTokenSecret, secret, key)
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(new Action1<XAccountTokenDTO>() {
+                    @Override
+                    public void call(XAccountTokenDTO s) {
+                        handleSuccessSocialLogin(s);
+                    }
+                }, new Action1<Throwable>() {
+                    @Override
+                    public void call(Throwable throwable) {
+                        //handleErrorSocialLogin(throwable, token, provider);
+                    }
+                });
+        compositeSubscription.add(loginSocialSubscription);
+    }
+
+    private void handleSuccessSocialLogin(@NonNull XAccountTokenDTO response) {
+        getAccount(response.getToken());
+    }
+
+    private void handleErrorSocialLogin(Throwable throwable, String token, String provider) {
+        String message = RetrofitErrorConverter.throwableToHttpError(throwable);
+        if (message != null) {
+            if (message.contains("is not attached to any Xabber account")) {
+                // go to sign up
+                showSignUpFragment(token, provider);
+            } else {
+                Log.d(LOG_TAG, "Error while social login request: " + message);
+                Toast.makeText(this, R.string.social_auth_fail, Toast.LENGTH_LONG).show();
+            }
+        } else {
+            Log.d(LOG_TAG, "Error while social login request: " + throwable.toString());
+            Toast.makeText(this, R.string.social_auth_fail, Toast.LENGTH_LONG).show();
+        }
+        hideProgress();
+    }
+
+    /** GET ACCOUNT */
+
+    private void getAccount(String token) {
+        Subscription getAccountSubscription = AuthManager.getAccount(token)
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(new Action1<XabberAccount>() {
+                    @Override
+                    public void call(XabberAccount xabberAccount) {
+                        handleSuccessGetAccount(xabberAccount);
+                    }
+                }, new Action1<Throwable>() {
+                    @Override
+                    public void call(Throwable throwable) {
+                        handleErrorGetAccount(throwable);
+                    }
+                });
+        compositeSubscription.add(getAccountSubscription);
+    }
+
+    private void handleSuccessGetAccount(@NonNull XabberAccount xabberAccount) {
+        hideProgress();
+        // show account info
+    }
+
+    private void handleErrorGetAccount(Throwable throwable) {
+        hideProgress();
+
+        String message = RetrofitErrorConverter.throwableToHttpError(throwable);
+        if (message != null) {
+            Log.d(LOG_TAG, "Error while login: " + message);
+            Toast.makeText(this, message, Toast.LENGTH_SHORT).show();
+        } else {
+            Log.d(LOG_TAG, "Error while login: " + throwable.toString());
+            Toast.makeText(this, "Error while login: " + throwable.toString(), Toast.LENGTH_LONG).show();
+        }
+    }
+
 }
diff --git a/xabber/src/main/java/com/xabber/android/ui/dialog/AccountSyncDialogFragment.java b/xabber/src/main/java/com/xabber/android/ui/dialog/AccountSyncDialogFragment.java
index ffa0b9b68d..7a1834f4d8 100644
--- a/xabber/src/main/java/com/xabber/android/ui/dialog/AccountSyncDialogFragment.java
+++ b/xabber/src/main/java/com/xabber/android/ui/dialog/AccountSyncDialogFragment.java
@@ -18,7 +18,6 @@
 import com.xabber.android.data.entity.AccountJid;
 import com.xabber.android.data.xaccount.XMPPAccountSettings;
 import com.xabber.android.data.xaccount.XabberAccountManager;
-import com.xabber.android.ui.activity.XabberAccountActivity;
 import com.xabber.android.ui.adapter.XMPPAccountAdapter;
 
 import java.util.ArrayList;
@@ -34,18 +33,24 @@
 
 public class AccountSyncDialogFragment extends DialogFragment {
 
+    private static final String NO_CANCEL = "NO_CANCEL";
+
     private List<XMPPAccountSettings> xmppAccounts;
     private Switch switchSyncAll;
     private XMPPAccountAdapter adapter;
     private boolean noCancel = false;
+    private Listener listener;
 
-    private static final String NO_CANCEL = "NO_CANCEL";
+    public interface Listener {
+        void onSyncClick(boolean needGoToMainActivity);
+    }
 
-    public static AccountSyncDialogFragment newInstance(boolean noCancel) {
+    public static AccountSyncDialogFragment newInstance(Listener listener, boolean noCancel) {
         AccountSyncDialogFragment fragment = new AccountSyncDialogFragment();
         Bundle args = new Bundle();
         args.putBoolean(NO_CANCEL, noCancel);
         fragment.setArguments(args);
+        fragment.listener = listener;
         return fragment;
     }
 
@@ -137,7 +142,7 @@ public void setXmppAccounts(List<XMPPAccountSettings> items) {
     @Override
     public void onCancel(DialogInterface dialog) {
         super.onCancel(dialog);
-        if (noCancel) ((XabberAccountActivity)getActivity()).onSyncClick(true);
+        if (noCancel) listener.onSyncClick(true);
     }
 
     private void onPositiveClick(boolean needGoToMainActivity) {
@@ -166,6 +171,6 @@ private void onPositiveClick(boolean needGoToMainActivity) {
         SettingsManager.setSyncAllAccounts(switchSyncAll.isChecked());
 
         // callback to sync-request
-        ((XabberAccountActivity)getActivity()).onSyncClick(needGoToMainActivity);
+        listener.onSyncClick(needGoToMainActivity);
     }
 }
diff --git a/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountSignUpFragment.java b/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountSignUpFragment.java
index 608a7a805f..24b12594aa 100644
--- a/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountSignUpFragment.java
+++ b/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountSignUpFragment.java
@@ -43,6 +43,8 @@ public class XAccountSignUpFragment extends Fragment implements View.OnClickList
     public interface Listener {
         void onGetHosts();
         void onSignupClick(String username, String host, String pass, String captchaToken);
+        void onSignupClick(String username, String host, String pass,
+                           String socialToken, String socialProvider);
         void onGoogleClick();
         void onFacebookClick();
         void onTwitterClick();
@@ -124,9 +126,9 @@ private void onSignUpClick() {
         String pass = edtPass.getText().toString().trim();
 
         if (verifyFields(username, pass)) {
-            // todo оставить только одно место для хранения socialToken. infoActivity или этот фрагмент
-            if (socialToken != null)
-                listener.onSignupClick(username, spinnerDomain.getSelectedItem().toString(), pass, null);
+            if (socialToken != null && socialProvider != null)
+                listener.onSignupClick(username, spinnerDomain.getSelectedItem().toString(), pass,
+                        socialToken, socialProvider);
             else getCaptchaToken(username, pass, spinnerDomain.getSelectedItem().toString());
         }
     }
diff --git a/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountXMPPConfirmFragment.java b/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountXMPPConfirmFragment.java
index fc633f9bc7..348857e4b9 100644
--- a/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountXMPPConfirmFragment.java
+++ b/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountXMPPConfirmFragment.java
@@ -29,7 +29,7 @@ public class XAccountXMPPConfirmFragment extends Fragment implements View.OnClic
     private Listener listener;
 
     public interface Listener {
-        void onConfirmClick(String jid, String code);
+        void onConfirmXMPPClick(String jid, String code);
     }
 
     public static XAccountXMPPConfirmFragment newInstance(Listener listener) {
@@ -89,7 +89,7 @@ public void setJid(String jid) {
     private void onConfirmClick() {
         // TODO: 06.08.18 verify fields
         String code = edtCode.getText().toString();
-        listener.onConfirmClick(jid, code);
+        listener.onConfirmXMPPClick(jid, code);
     }
 
     private void onResendClick() {
diff --git a/xabber/src/main/java/com/xabber/android/ui/fragment/XabberAccountInfoFragment.java b/xabber/src/main/java/com/xabber/android/ui/fragment/XabberAccountInfoFragment.java
index af6aa33e0b..f69b7faf57 100644
--- a/xabber/src/main/java/com/xabber/android/ui/fragment/XabberAccountInfoFragment.java
+++ b/xabber/src/main/java/com/xabber/android/ui/fragment/XabberAccountInfoFragment.java
@@ -48,7 +48,7 @@
  */
 
 public class XabberAccountInfoFragment extends Fragment implements AddEmailDialogFragment.Listener,
-        EmailAdapter.Listener, ConfirmEmailDialogFragment.Listener {
+        EmailAdapter.Listener, ConfirmEmailDialogFragment.Listener, AccountSyncDialogFragment.Listener {
 
     private static final String LOG_TAG = XabberAccountInfoFragment.class.getSimpleName();
 
@@ -84,8 +84,9 @@ public interface Listener {
         void onFacebookClick();
         void onTwitterClick();
         void onAddEmailClick(String email);
-        void onConfirmClick(String email, String code);
+        void onConfirmEmailClick(String email, String code);
         void onLogoutClick(boolean deleteAccounts);
+        void onSyncClick(boolean needGoToMainActivity);
         void needXMPPAuthFragment();
     }
 
@@ -214,7 +215,12 @@ public void onResendCodeClick(String email) {
 
     @Override
     public void onConfirmClick(String email, String code) {
-        listener.onConfirmClick(email, code);
+        listener.onConfirmEmailClick(email, code);
+    }
+
+    @Override
+    public void onSyncClick(boolean needGoToMainActivity) {
+        listener.onSyncClick(needGoToMainActivity);
     }
 
     public void updateData(@NonNull XabberAccount account) {
@@ -258,7 +264,7 @@ public void call(List<XMPPAccountSettings> list) {
                             // save full list to list for sync
                             XabberAccountManager.getInstance().setXmppAccountsForSync(items);
                             // show dialog
-                            AccountSyncDialogFragment.newInstance(noCancel)
+                            AccountSyncDialogFragment.newInstance(XabberAccountInfoFragment.this, noCancel)
                                     .show(getFragmentManager(), AccountSyncDialogFragment.class.getSimpleName());
                             dialogShowed = false;
                         } else Toast.makeText(getActivity(), "Не удалось начать синхронизацию", Toast.LENGTH_SHORT).show();

From 3fa8994e10352e83e840fa29b26344e62dbc2f18 Mon Sep 17 00:00:00 2001
From: Valery Miller <valera_miller94@mail.ru>
Date: Thu, 16 Aug 2018 11:42:17 +0500
Subject: [PATCH 030/251] Changes in social login flow

---
 .../android/ui/activity/ContactListActivity.java    |  2 +-
 .../android/ui/activity/TutorialActivity.java       |  2 +-
 .../android/ui/activity/XabberAccountActivity.java  | 13 +++++++++++--
 .../android/ui/activity/XabberLoginActivity.java    |  4 +++-
 4 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/xabber/src/main/java/com/xabber/android/ui/activity/ContactListActivity.java b/xabber/src/main/java/com/xabber/android/ui/activity/ContactListActivity.java
index 63379b553f..1163d74705 100644
--- a/xabber/src/main/java/com/xabber/android/ui/activity/ContactListActivity.java
+++ b/xabber/src/main/java/com/xabber/android/ui/activity/ContactListActivity.java
@@ -701,7 +701,7 @@ public void onContactListDrawerListener(int viewId) {
                 startActivity(PreferenceEditor.createIntent(this));
                 break;
             case R.id.drawer_header_action_xabber_account:
-                startActivity(XabberAccountActivity.createIntent(this));
+                startActivity(XabberAccountActivity.createIntent(this, false));
                 break;
             case R.id.drawer_action_patreon:
                 startActivity(PatreonAppealActivity.createIntent(this));
diff --git a/xabber/src/main/java/com/xabber/android/ui/activity/TutorialActivity.java b/xabber/src/main/java/com/xabber/android/ui/activity/TutorialActivity.java
index ee44e979c4..a0b4872d9c 100644
--- a/xabber/src/main/java/com/xabber/android/ui/activity/TutorialActivity.java
+++ b/xabber/src/main/java/com/xabber/android/ui/activity/TutorialActivity.java
@@ -21,7 +21,7 @@
  * Created by valery.miller on 14.09.17.
  */
 
-public class TutorialActivity extends AppCompatActivity {
+public class TutorialActivity extends ManagedActivity {
 
     private Button btnLogin;
     private Button btnRegister;
diff --git a/xabber/src/main/java/com/xabber/android/ui/activity/XabberAccountActivity.java b/xabber/src/main/java/com/xabber/android/ui/activity/XabberAccountActivity.java
index 0e800370af..c8f54c8143 100644
--- a/xabber/src/main/java/com/xabber/android/ui/activity/XabberAccountActivity.java
+++ b/xabber/src/main/java/com/xabber/android/ui/activity/XabberAccountActivity.java
@@ -43,6 +43,7 @@ public class XabberAccountActivity extends BaseLoginActivity
     private final static String FRAGMENT_INFO = "fragment_info";
     private final static String FRAGMENT_XMPP_AUTH = "fragment_xmpp_auth";
     private final static String FRAGMENT_XMPP_CONFIRM = "fragment_xmpp_confirm";
+    private final static String SHOW_SYNC = "show_sync";
 
     private FragmentTransaction fTrans;
     private Fragment fragmentInfo;
@@ -55,8 +56,10 @@ public class XabberAccountActivity extends BaseLoginActivity
     private boolean needShowSyncDialog = false;
 
     @NonNull
-    public static Intent createIntent(Context context) {
-        return new Intent(context, XabberAccountActivity.class);
+    public static Intent createIntent(Context context, boolean showSync) {
+        Intent intent = new Intent(context, XabberAccountActivity.class);
+        intent.putExtra(SHOW_SYNC, showSync);
+        return intent;
     }
 
     @Override
@@ -82,6 +85,12 @@ protected void onResume() {
         super.onResume();
         onPrepareOptionsMenu(toolbar.getMenu());
 
+        Bundle extras = getIntent().getExtras();
+        if (extras != null) {
+            needShowSyncDialog = extras.getBoolean(SHOW_SYNC);
+            extras.clear();
+        }
+
         XabberAccount account = XabberAccountManager.getInstance().getAccount();
         if (account != null) showInfoFragment();
         else showXMPPAuthFragment();
diff --git a/xabber/src/main/java/com/xabber/android/ui/activity/XabberLoginActivity.java b/xabber/src/main/java/com/xabber/android/ui/activity/XabberLoginActivity.java
index 351718325a..ba4e1505bd 100644
--- a/xabber/src/main/java/com/xabber/android/ui/activity/XabberLoginActivity.java
+++ b/xabber/src/main/java/com/xabber/android/ui/activity/XabberLoginActivity.java
@@ -364,7 +364,9 @@ public void call(Throwable throwable) {
 
     private void handleSuccessGetAccount(@NonNull XabberAccount xabberAccount) {
         hideProgress();
-        // show account info
+        Intent intent = XabberAccountActivity.createIntent(this, true);
+        finish();
+        startActivity(intent);
     }
 
     private void handleErrorGetAccount(Throwable throwable) {

From 9ca61d46257366885cf035ff6a7ca0a92d6efefc Mon Sep 17 00:00:00 2001
From: Valery Miller <valera_miller94@mail.ru>
Date: Thu, 16 Aug 2018 12:30:50 +0500
Subject: [PATCH 031/251] Changes in social auth flow

---
 .../ui/activity/XabberLoginActivity.java      | 43 +++++++++++--------
 .../ui/fragment/XAccountSignUpFragment.java   | 34 +++++++++++----
 2 files changed, 52 insertions(+), 25 deletions(-)

diff --git a/xabber/src/main/java/com/xabber/android/ui/activity/XabberLoginActivity.java b/xabber/src/main/java/com/xabber/android/ui/activity/XabberLoginActivity.java
index ba4e1505bd..9a035ef616 100644
--- a/xabber/src/main/java/com/xabber/android/ui/activity/XabberLoginActivity.java
+++ b/xabber/src/main/java/com/xabber/android/ui/activity/XabberLoginActivity.java
@@ -52,6 +52,8 @@ public class XabberLoginActivity extends BaseLoginActivity implements XAccountSi
     private ProgressDialog progressDialog;
     private BarPainter barPainter;
 
+    private List<String> hosts = new ArrayList<>();
+
     public static Intent createIntent(Context context, @Nullable String currentFragment) {
         Intent intent = new Intent(context, XabberLoginActivity.class);
         intent.putExtra(CURRENT_FRAGMENT, currentFragment);
@@ -198,28 +200,32 @@ public void onTwitterClick() {
     /** GET HOSTS */
 
     private void getHosts() {
-        showProgress("Request hosts..");
-        Subscription requestHosts = AuthManager.getHosts()
-                .subscribeOn(Schedulers.io())
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(new Action1<List<AuthManager.Domain>>() {
-                    @Override
-                    public void call(List<AuthManager.Domain> domains) {
-                        handleSuccessGetHosts(domains);
-                    }
-                }, new Action1<Throwable>() {
-                    @Override
-                    public void call(Throwable throwable) {
-                        handleErrorGetHosts(throwable);
-                    }
-                });
-        compositeSubscription.add(requestHosts);
+        if (hosts != null && !hosts.isEmpty()) {
+            if (fragmentSignUp != null) ((XAccountSignUpFragment)fragmentSignUp).setupSpinner(hosts);
+        } else {
+            showProgress("Request hosts..");
+            Subscription requestHosts = AuthManager.getHosts()
+                    .subscribeOn(Schedulers.io())
+                    .observeOn(AndroidSchedulers.mainThread())
+                    .subscribe(new Action1<List<AuthManager.Domain>>() {
+                        @Override
+                        public void call(List<AuthManager.Domain> domains) {
+                            handleSuccessGetHosts(domains);
+                        }
+                    }, new Action1<Throwable>() {
+                        @Override
+                        public void call(Throwable throwable) {
+                            handleErrorGetHosts(throwable);
+                        }
+                    });
+            compositeSubscription.add(requestHosts);
+        }
     }
 
     private void handleSuccessGetHosts(List<AuthManager.Domain> domains) {
         hideProgress();
 
-        List<String> hosts = new ArrayList<>();
+        hosts.clear();
         for (AuthManager.Domain domain : domains) {
             hosts.add(domain.getDomain());
         }
@@ -330,7 +336,10 @@ private void handleErrorSocialLogin(Throwable throwable, String token, String pr
         if (message != null) {
             if (message.contains("is not attached to any Xabber account")) {
                 // go to sign up
+                hideProgress();
                 showSignUpFragment(token, provider);
+                if (fragmentSignUp != null) ((XAccountSignUpFragment)fragmentSignUp)
+                        .setSocialProviderToken(provider, token);
             } else {
                 Log.d(LOG_TAG, "Error while social login request: " + message);
                 Toast.makeText(this, R.string.social_auth_fail, Toast.LENGTH_LONG).show();
diff --git a/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountSignUpFragment.java b/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountSignUpFragment.java
index 24b12594aa..38fbe3445e 100644
--- a/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountSignUpFragment.java
+++ b/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountSignUpFragment.java
@@ -12,6 +12,7 @@
 import android.widget.Button;
 import android.widget.EditText;
 import android.widget.ImageView;
+import android.widget.LinearLayout;
 import android.widget.Spinner;
 import android.widget.TextView;
 
@@ -34,7 +35,8 @@ public class XAccountSignUpFragment extends Fragment implements View.OnClickList
     private EditText edtUsername;
     private EditText edtPass;
     private Spinner spinnerDomain;
-    private Button btnSignUp;
+    private TextView tvSocialProvider;
+    private LinearLayout llSocialLogos;
 
     private Listener listener;
     private String socialToken;
@@ -80,13 +82,9 @@ public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
         edtUsername = view.findViewById(R.id.edtUsername);
         edtPass = view.findViewById(R.id.edtPass);
         spinnerDomain = view.findViewById(R.id.spinnerDomain);
-        btnSignUp = view.findViewById(R.id.btnSignUp);
-
-        btnSignUp.setOnClickListener(this);
-
-        TextView tvSocialProvider = view.findViewById(R.id.tvSocialProvider);
-        tvSocialProvider.setText(socialProvider);
 
+        tvSocialProvider = view.findViewById(R.id.tvSocialProvider);
+        llSocialLogos = view.findViewById(R.id.llSocialLogos);
         ImageView ivFacebook = view.findViewById(R.id.ivFacebook);
         ImageView ivGoogle = view.findViewById(R.id.ivGoogle);
         ImageView ivTwitter = view.findViewById(R.id.ivTwitter);
@@ -94,13 +92,16 @@ public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
         ivFacebook.setOnClickListener(this);
         ivGoogle.setOnClickListener(this);
         ivTwitter.setOnClickListener(this);
+
+        Button btnSignUp = view.findViewById(R.id.btnSignUp);
+        btnSignUp.setOnClickListener(this);
     }
 
     @Override
     public void onResume() {
         super.onResume();
-        // TODO: 08.08.18 после закрытия окна с каптчей, снова делается запрос доменов?
         listener.onGetHosts();
+        setupSocial();
     }
 
     @Override
@@ -121,6 +122,23 @@ public void onClick(View v) {
         }
     }
 
+    public void setSocialProviderToken(String socialProvider, String socialToken) {
+        this.socialProvider = socialProvider;
+        this.socialToken = socialToken;
+        setupSocial();
+    }
+
+    private void setupSocial() {
+        if (socialToken != null && socialProvider != null) {
+            llSocialLogos.setVisibility(View.GONE);
+            tvSocialProvider.setVisibility(View.VISIBLE);
+            tvSocialProvider.setText(socialProvider);
+        } else {
+            llSocialLogos.setVisibility(View.VISIBLE);
+            tvSocialProvider.setVisibility(View.GONE);
+        }
+    }
+
     private void onSignUpClick() {
         String username = edtUsername.getText().toString().trim();
         String pass = edtPass.getText().toString().trim();

From f38ce772c9e485d38c5667bfc1cf33804f67d4bd Mon Sep 17 00:00:00 2001
From: Valery Miller <valera_miller94@mail.ru>
Date: Thu, 16 Aug 2018 12:45:54 +0500
Subject: [PATCH 032/251] Changes in social auth flow

---
 .../com/xabber/android/ui/activity/XabberLoginActivity.java   | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/xabber/src/main/java/com/xabber/android/ui/activity/XabberLoginActivity.java b/xabber/src/main/java/com/xabber/android/ui/activity/XabberLoginActivity.java
index 9a035ef616..cb74690fd3 100644
--- a/xabber/src/main/java/com/xabber/android/ui/activity/XabberLoginActivity.java
+++ b/xabber/src/main/java/com/xabber/android/ui/activity/XabberLoginActivity.java
@@ -273,7 +273,9 @@ public void call(Throwable throwable) {
     }
 
     private void handleSuccessSignUp() {
-        // TODO: 15.08.18 go to xabber account
+        Intent intent = XabberAccountActivity.createIntent(this, true);
+        finish();
+        startActivity(intent);
     }
 
     private void handleErrorSignUp(Throwable throwable) {

From 170414ab3ce7b16d847a3ff9ee4c04150e503dae Mon Sep 17 00:00:00 2001
From: Valery Miller <valera_miller94@mail.ru>
Date: Thu, 16 Aug 2018 14:37:00 +0500
Subject: [PATCH 033/251] Refactoring in Xabber Account Activity

---
 .../ui/activity/XabberAccountActivity.java      | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/xabber/src/main/java/com/xabber/android/ui/activity/XabberAccountActivity.java b/xabber/src/main/java/com/xabber/android/ui/activity/XabberAccountActivity.java
index c8f54c8143..5855f46a06 100644
--- a/xabber/src/main/java/com/xabber/android/ui/activity/XabberAccountActivity.java
+++ b/xabber/src/main/java/com/xabber/android/ui/activity/XabberAccountActivity.java
@@ -30,6 +30,7 @@
 import java.util.List;
 
 import okhttp3.ResponseBody;
+import rx.Single;
 import rx.Subscription;
 import rx.android.schedulers.AndroidSchedulers;
 import rx.functions.Action1;
@@ -544,8 +545,17 @@ private void handleErrorConfirm(Throwable throwable) {
 
     @Override
     protected void onSocialAuthSuccess(String provider, String token) {
+        onSocialAuthSuccess(AuthManager.bindSocial(provider, token));
+    }
+
+    @Override
+    protected void onTwitterAuthSuccess(String token, String twitterTokenSecret, String secret, String key) {
+        onSocialAuthSuccess(AuthManager.bindSocial(token, twitterTokenSecret, secret, key));
+    }
+
+    private void onSocialAuthSuccess(Single<ResponseBody> source) {
         showProgress("Bind social");
-        Subscription loginSocialSubscription = AuthManager.bindSocial(provider, token)
+        Subscription loginSocialSubscription = source
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribe(new Action1<ResponseBody>() {
@@ -564,11 +574,6 @@ public void call(Throwable throwable) {
         compositeSubscription.add(loginSocialSubscription);
     }
 
-    @Override
-    protected void onTwitterAuthSuccess(String token, String twitterTokenSecret, String secret, String key) {
-        // TODO: 15.08.18 need implementation
-    }
-
     private void goToMainActivity() {
         Intent intent = ContactListActivity.createIntent(XabberAccountActivity.this);
         intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK);

From e7678dd7c7314afec00cdef994e135f97cfe1661 Mon Sep 17 00:00:00 2001
From: Valery Miller <valera_miller94@mail.ru>
Date: Thu, 16 Aug 2018 15:15:36 +0500
Subject: [PATCH 034/251] Refactoring social auth

---
 .../android/data/xaccount/AuthManager.java    | 14 +----
 .../ui/activity/BaseLoginActivity.java        | 24 +++++----
 .../ui/activity/XabberLoginActivity.java      | 51 +++++--------------
 .../ui/fragment/XAccountSignUpFragment.java   | 22 ++++----
 4 files changed, 40 insertions(+), 71 deletions(-)

diff --git a/xabber/src/main/java/com/xabber/android/data/xaccount/AuthManager.java b/xabber/src/main/java/com/xabber/android/data/xaccount/AuthManager.java
index 37802e599e..262279f94f 100644
--- a/xabber/src/main/java/com/xabber/android/data/xaccount/AuthManager.java
+++ b/xabber/src/main/java/com/xabber/android/data/xaccount/AuthManager.java
@@ -66,23 +66,11 @@ public Single<? extends ResponseBody> call(ResponseBody responseBody) {
                 });
     }
 
-    public static Single<XAccountTokenDTO> loginSocial(String provider, String socialToken) {
+    public static Single<XAccountTokenDTO> loginSocial(String provider, String credentials) {
         SettingsManager.setSyncAllAccounts(true);
-
-        Gson gson = new Gson();
-        String credentials = gson.toJson(new AccessToken(socialToken));
         return HttpApiManager.getXabberApi().loginSocial(new SocialAuthRequest(provider, credentials, getSource()));
     }
 
-    public static Single<XAccountTokenDTO> loginSocialTwitter(
-           String socialToken, String twitterTokenSecret, String secret, String key) {
-        SettingsManager.setSyncAllAccounts(true);
-
-        Gson gson = new Gson();
-        String credentials = gson.toJson(new TwitterAccessToken(new TwitterTokens(twitterTokenSecret, socialToken), secret, key));
-        return HttpApiManager.getXabberApi().loginSocial(new SocialAuthRequest(PROVIDER_TWITTER, credentials, getSource()));
-    }
-
     public static Single<XabberAccount> getAccount(final String token) {
         return HttpApiManager.getXabberApi().getAccount("Token " + token)
                 .flatMap(new Func1<XabberAccountDTO, Single<? extends XabberAccountDTO>>() {
diff --git a/xabber/src/main/java/com/xabber/android/ui/activity/BaseLoginActivity.java b/xabber/src/main/java/com/xabber/android/ui/activity/BaseLoginActivity.java
index 8afe4a703b..6e03b8e86b 100644
--- a/xabber/src/main/java/com/xabber/android/ui/activity/BaseLoginActivity.java
+++ b/xabber/src/main/java/com/xabber/android/ui/activity/BaseLoginActivity.java
@@ -21,6 +21,7 @@
 import com.google.api.client.googleapis.auth.oauth2.GoogleTokenResponse;
 import com.google.api.client.http.javanet.NetHttpTransport;
 import com.google.api.client.json.jackson2.JacksonFactory;
+import com.google.gson.Gson;
 import com.twitter.sdk.android.core.Callback;
 import com.twitter.sdk.android.core.DefaultLogger;
 import com.twitter.sdk.android.core.Result;
@@ -59,6 +60,7 @@ public abstract class BaseLoginActivity extends ManagedActivity implements Googl
     private static final int RC_SIGN_IN = 9001;
     private static final String GOOGLE_TOKEN_SERVER = "https://www.googleapis.com/oauth2/v4/token";
 
+    private Gson gson = new Gson();
     protected CompositeSubscription compositeSubscription = new CompositeSubscription();
 
     @Override
@@ -142,7 +144,8 @@ public void run() {
                             Application.getInstance().runOnUiThread(new Runnable() {
                                 @Override
                                 public void run() {
-                                    onSocialAuthSuccess(AuthManager.PROVIDER_GOOGLE, token);
+                                    String credentials = gson.toJson(new AuthManager.AccessToken(token));
+                                    onSocialAuthSuccess(AuthManager.PROVIDER_GOOGLE, credentials);
                                 }
                             });
                         } catch (IOException e) {
@@ -160,8 +163,10 @@ private void initFacebookAuth() {
             @Override
             public void onSuccess(LoginResult loginResult) {
                 String token = loginResult.getAccessToken().getToken();
-                if (token != null)
-                    onSocialAuthSuccess(AuthManager.PROVIDER_FACEBOOK, token);
+                if (token != null) {
+                    String credentials = gson.toJson(new AuthManager.AccessToken(token));
+                    onSocialAuthSuccess(AuthManager.PROVIDER_FACEBOOK, credentials);
+                }
             }
 
             @Override
@@ -191,10 +196,13 @@ private void initTwitterAuth() {
             public void success(Result<TwitterSession> result) {
                 String token = result.data.getAuthToken().token;
                 String secret = result.data.getAuthToken().secret;
-                if (token != null && secret != null)
-                    onTwitterAuthSuccess(token, secret,
+                if (token != null && secret != null) {
+                    String credentials = gson.toJson(new AuthManager.TwitterAccessToken(
+                            new AuthManager.TwitterTokens(secret, token),
                             getResources().getString(R.string.SOCIAL_AUTH_TWITTER_SECRET),
-                            getResources().getString(R.string.SOCIAL_AUTH_TWITTER_KEY));
+                            getResources().getString(R.string.SOCIAL_AUTH_TWITTER_KEY)));
+                    onSocialAuthSuccess(AuthManager.PROVIDER_TWITTER, credentials);
+                }
             }
 
             @Override
@@ -204,9 +212,7 @@ public void failure(TwitterException exception) {
         };
     }
 
-    protected abstract void onSocialAuthSuccess(final String provider, final String token);
-
-    protected abstract void onTwitterAuthSuccess(final String token, String twitterTokenSecret, String secret, String key);
+    protected abstract void onSocialAuthSuccess(final String provider, final String credentials);
 
     protected abstract void showProgress(String title);
 
diff --git a/xabber/src/main/java/com/xabber/android/ui/activity/XabberLoginActivity.java b/xabber/src/main/java/com/xabber/android/ui/activity/XabberLoginActivity.java
index cb74690fd3..bb85c9d68f 100644
--- a/xabber/src/main/java/com/xabber/android/ui/activity/XabberLoginActivity.java
+++ b/xabber/src/main/java/com/xabber/android/ui/activity/XabberLoginActivity.java
@@ -95,9 +95,9 @@ public void showLoginFragment() {
 //        currentFragment = FRAGMENT_LOGIN;
     }
 
-    public void showSignUpFragment(String socialToken, String socialProvider) {
+    public void showSignUpFragment(String credentials, String socialProvider) {
         if (fragmentSignUp == null)
-            fragmentSignUp = XAccountSignUpFragment.newInstance(this, socialToken, socialProvider);
+            fragmentSignUp = XAccountSignUpFragment.newInstance(this, credentials, socialProvider);
 
         fTrans = getFragmentManager().beginTransaction();
         fTrans.replace(R.id.container, fragmentSignUp, FRAGMENT_SIGNUP);
@@ -158,13 +158,8 @@ public void onBackPressed() {
     }
 
     @Override
-    protected void onSocialAuthSuccess(String provider, String token) {
-        socialLogin(provider, token);
-    }
-
-    @Override
-    protected void onTwitterAuthSuccess(String token, String twitterTokenSecret, String secret, String key) {
-        socialLogin(token, twitterTokenSecret, secret, key);
+    protected void onSocialAuthSuccess(String provider, String credentials) {
+        socialLogin(provider, credentials);
     }
 
     @Override
@@ -247,12 +242,12 @@ private void handleErrorGetHosts(Throwable throwable) {
     /** SIGN UP */
 
     private void signUp(String username, String host, String pass, String captchaToken,
-                        String socialToken, String socialProvider) {
+                        String credentials, String socialProvider) {
         showProgress("Sign Up..");
 
         Single<XabberAccount> signUpSingle;
-        if (socialToken != null && socialProvider != null)
-            signUpSingle = AuthManager.signupv2(username, host, pass, socialProvider, socialToken);
+        if (credentials != null && socialProvider != null)
+            signUpSingle = AuthManager.signupv2(username, host, pass, socialProvider, credentials);
         else signUpSingle = AuthManager.signupv2(username, host, pass, captchaToken);
 
         Subscription signUpSubscription = signUpSingle
@@ -290,29 +285,9 @@ private void handleErrorSignUp(Throwable throwable) {
 
     /** SOCIAL LOGIN */
 
-    private void socialLogin(final String provider, final String token) {
-        showProgress(getString(R.string.progress_title_login));
-        Subscription loginSocialSubscription = AuthManager.loginSocial(provider, token)
-                .subscribeOn(Schedulers.io())
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(new Action1<XAccountTokenDTO>() {
-                    @Override
-                    public void call(XAccountTokenDTO s) {
-                        handleSuccessSocialLogin(s);
-                    }
-                }, new Action1<Throwable>() {
-                    @Override
-                    public void call(Throwable throwable) {
-                        handleErrorSocialLogin(throwable, token, provider);
-                    }
-                });
-        compositeSubscription.add(loginSocialSubscription);
-    }
-
-    private void socialLogin(String socialToken, String twitterTokenSecret, String secret, String key) {
+    private void socialLogin(final String provider, final String credentials) {
         showProgress(getString(R.string.progress_title_login));
-        Subscription loginSocialSubscription = AuthManager.loginSocialTwitter(socialToken,
-                twitterTokenSecret, secret, key)
+        Subscription loginSocialSubscription = AuthManager.loginSocial(provider, credentials)
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribe(new Action1<XAccountTokenDTO>() {
@@ -323,7 +298,7 @@ public void call(XAccountTokenDTO s) {
                 }, new Action1<Throwable>() {
                     @Override
                     public void call(Throwable throwable) {
-                        //handleErrorSocialLogin(throwable, token, provider);
+                        handleErrorSocialLogin(throwable, credentials, provider);
                     }
                 });
         compositeSubscription.add(loginSocialSubscription);
@@ -333,15 +308,15 @@ private void handleSuccessSocialLogin(@NonNull XAccountTokenDTO response) {
         getAccount(response.getToken());
     }
 
-    private void handleErrorSocialLogin(Throwable throwable, String token, String provider) {
+    private void handleErrorSocialLogin(Throwable throwable, String credentials, String provider) {
         String message = RetrofitErrorConverter.throwableToHttpError(throwable);
         if (message != null) {
             if (message.contains("is not attached to any Xabber account")) {
                 // go to sign up
                 hideProgress();
-                showSignUpFragment(token, provider);
+                showSignUpFragment(credentials, provider);
                 if (fragmentSignUp != null) ((XAccountSignUpFragment)fragmentSignUp)
-                        .setSocialProviderToken(provider, token);
+                        .setSocialProviderCredentials(provider, credentials);
             } else {
                 Log.d(LOG_TAG, "Error while social login request: " + message);
                 Toast.makeText(this, R.string.social_auth_fail, Toast.LENGTH_LONG).show();
diff --git a/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountSignUpFragment.java b/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountSignUpFragment.java
index 38fbe3445e..9625163a4c 100644
--- a/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountSignUpFragment.java
+++ b/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountSignUpFragment.java
@@ -29,7 +29,7 @@
 public class XAccountSignUpFragment extends Fragment implements View.OnClickListener {
 
     private static final String CAPTCHA_TOKEN = "RECAPTCHA";
-    private static final String SOCIAL_TOKEN = "SOCIAL_TOKEN";
+    private static final String SOCIAL_CREDENTIALS = "SOCIAL_CREDENTIALS";
     private static final String SOCIAL_PROVIDER = "SOCIAL_PROVIDER";
 
     private EditText edtUsername;
@@ -39,23 +39,23 @@ public class XAccountSignUpFragment extends Fragment implements View.OnClickList
     private LinearLayout llSocialLogos;
 
     private Listener listener;
-    private String socialToken;
+    private String credentials;
     private String socialProvider;
 
     public interface Listener {
         void onGetHosts();
         void onSignupClick(String username, String host, String pass, String captchaToken);
         void onSignupClick(String username, String host, String pass,
-                           String socialToken, String socialProvider);
+                           String credentials, String socialProvider);
         void onGoogleClick();
         void onFacebookClick();
         void onTwitterClick();
     }
 
-    public static XAccountSignUpFragment newInstance(Listener listener, String socialToken, String socialProvider) {
+    public static XAccountSignUpFragment newInstance(Listener listener, String credentials, String socialProvider) {
         XAccountSignUpFragment fragment = new XAccountSignUpFragment();
         Bundle args = new Bundle();
-        args.putString(SOCIAL_TOKEN, socialToken);
+        args.putString(SOCIAL_CREDENTIALS, credentials);
         args.putString(SOCIAL_PROVIDER, socialProvider);
         fragment.setArguments(args);
         fragment.listener = listener;
@@ -65,7 +65,7 @@ public static XAccountSignUpFragment newInstance(Listener listener, String socia
     @Override
     public void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        this.socialToken = getArguments().getString(SOCIAL_TOKEN);
+        this.credentials = getArguments().getString(SOCIAL_CREDENTIALS);
         this.socialProvider = getArguments().getString(SOCIAL_PROVIDER);
     }
 
@@ -122,14 +122,14 @@ public void onClick(View v) {
         }
     }
 
-    public void setSocialProviderToken(String socialProvider, String socialToken) {
+    public void setSocialProviderCredentials(String socialProvider, String credentials) {
         this.socialProvider = socialProvider;
-        this.socialToken = socialToken;
+        this.credentials = credentials;
         setupSocial();
     }
 
     private void setupSocial() {
-        if (socialToken != null && socialProvider != null) {
+        if (credentials != null && socialProvider != null) {
             llSocialLogos.setVisibility(View.GONE);
             tvSocialProvider.setVisibility(View.VISIBLE);
             tvSocialProvider.setText(socialProvider);
@@ -144,9 +144,9 @@ private void onSignUpClick() {
         String pass = edtPass.getText().toString().trim();
 
         if (verifyFields(username, pass)) {
-            if (socialToken != null && socialProvider != null)
+            if (credentials != null && socialProvider != null)
                 listener.onSignupClick(username, spinnerDomain.getSelectedItem().toString(), pass,
-                        socialToken, socialProvider);
+                        credentials, socialProvider);
             else getCaptchaToken(username, pass, spinnerDomain.getSelectedItem().toString());
         }
     }

From 03af30ae0c5116726983e5538d6a13e3eaf968d3 Mon Sep 17 00:00:00 2001
From: Valery Miller <valera_miller94@mail.ru>
Date: Thu, 16 Aug 2018 15:39:15 +0500
Subject: [PATCH 035/251] Refactoring error handling in auth

---
 .../ui/activity/BaseLoginActivity.java        | 13 +++++
 .../ui/activity/XabberAccountActivity.java    | 47 +++----------------
 .../ui/activity/XabberLoginActivity.java      | 24 ++--------
 3 files changed, 22 insertions(+), 62 deletions(-)

diff --git a/xabber/src/main/java/com/xabber/android/ui/activity/BaseLoginActivity.java b/xabber/src/main/java/com/xabber/android/ui/activity/BaseLoginActivity.java
index 6e03b8e86b..9ff2bff4c0 100644
--- a/xabber/src/main/java/com/xabber/android/ui/activity/BaseLoginActivity.java
+++ b/xabber/src/main/java/com/xabber/android/ui/activity/BaseLoginActivity.java
@@ -34,6 +34,7 @@
 import com.xabber.android.R;
 import com.xabber.android.data.Application;
 import com.xabber.android.data.xaccount.AuthManager;
+import com.xabber.android.utils.RetrofitErrorConverter;
 
 import java.io.IOException;
 import java.util.Collections;
@@ -217,4 +218,16 @@ public void failure(TwitterException exception) {
     protected abstract void showProgress(String title);
 
     protected abstract void hideProgress();
+
+    protected void handleError(Throwable throwable, String errorContext, String logTag) {
+        String message = RetrofitErrorConverter.throwableToHttpError(throwable);
+        if (message != null) {
+            Log.d(logTag, errorContext + message);
+            Toast.makeText(this, message, Toast.LENGTH_SHORT).show();
+        } else {
+            Log.d(logTag, errorContext + throwable.toString());
+            Toast.makeText(this, errorContext + throwable.toString(),
+                    Toast.LENGTH_LONG).show();
+        }
+    }
 }
diff --git a/xabber/src/main/java/com/xabber/android/ui/activity/XabberAccountActivity.java b/xabber/src/main/java/com/xabber/android/ui/activity/XabberAccountActivity.java
index 5855f46a06..43c8869c05 100644
--- a/xabber/src/main/java/com/xabber/android/ui/activity/XabberAccountActivity.java
+++ b/xabber/src/main/java/com/xabber/android/ui/activity/XabberAccountActivity.java
@@ -419,12 +419,7 @@ private void handleSuccessRequestXMPPCode(AuthManager.XMPPCode code, String jid)
 
     private void handleErrorRequestXMPPCode(Throwable throwable) {
         hideProgress();
-
-        // TODO: 03.08.18 implement error parsing
-
-        String error = "Error while request XMPP auth-code: " + throwable.toString();
-        Log.d(LOG_TAG, error);
-        Toast.makeText(this, error, Toast.LENGTH_LONG).show();
+        handleError(throwable, "Error while request XMPP auth-code: ", LOG_TAG);
     }
 
     /** CONFIRM XMPP */
@@ -455,12 +450,7 @@ private void handleSuccessConfirmXMPP(XabberAccount account) {
 
     private void handleErrorConfirmXMPP(Throwable throwable) {
         hideProgress();
-
-        // TODO: 03.08.18 implement error parsing
-
-        String error = "Error while confirmEmail XMPP-account: " + throwable.toString();
-        Log.d(LOG_TAG, error);
-        Toast.makeText(this, error, Toast.LENGTH_LONG).show();
+        handleError(throwable, "Error while confirming XMPP-account: ", LOG_TAG);
     }
 
     /** ADD EMAIL */
@@ -491,15 +481,7 @@ private void handleSuccessResendEmail(ResponseBody response) {
 
     private void handleErrorResendEmail(Throwable throwable) {
         hideProgress();
-
-        String message = RetrofitErrorConverter.throwableToHttpError(throwable);
-        if (message != null) {
-            Log.d(LOG_TAG, "Error while send verification email: " + message);
-            Toast.makeText(this, message, Toast.LENGTH_SHORT).show();
-        } else {
-            Log.d(LOG_TAG, "Error while send verification email: " + throwable.toString());
-            Toast.makeText(this, "Error while send verification email: " + throwable.toString(), Toast.LENGTH_LONG).show();
-        }
+        handleError(throwable, "Error while send verification email: ", LOG_TAG);
     }
 
     /** CONFIRM EMAIL */
@@ -530,32 +512,15 @@ private void handleSuccessConfirm(XabberAccount response) {
 
     private void handleErrorConfirm(Throwable throwable) {
         hideProgress();
-
-        String message = RetrofitErrorConverter.throwableToHttpError(throwable);
-        if (message != null) {
-            Log.d(LOG_TAG, "Error while confirming email: " + message);
-            Toast.makeText(this, message, Toast.LENGTH_SHORT).show();
-        } else {
-            Log.d(LOG_TAG, "Error while confirming email: " + throwable.toString());
-            Toast.makeText(this, "Error while confirming email: " + throwable.toString(), Toast.LENGTH_LONG).show();
-        }
+        handleError(throwable, "Error while confirming email: ", LOG_TAG);
     }
 
     /** SOCIAL AUTH */
 
     @Override
-    protected void onSocialAuthSuccess(String provider, String token) {
-        onSocialAuthSuccess(AuthManager.bindSocial(provider, token));
-    }
-
-    @Override
-    protected void onTwitterAuthSuccess(String token, String twitterTokenSecret, String secret, String key) {
-        onSocialAuthSuccess(AuthManager.bindSocial(token, twitterTokenSecret, secret, key));
-    }
-
-    private void onSocialAuthSuccess(Single<ResponseBody> source) {
+    protected void onSocialAuthSuccess(String provider, String credentials) {
         showProgress("Bind social");
-        Subscription loginSocialSubscription = source
+        Subscription loginSocialSubscription = AuthManager.bindSocial(provider, credentials)
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribe(new Action1<ResponseBody>() {
diff --git a/xabber/src/main/java/com/xabber/android/ui/activity/XabberLoginActivity.java b/xabber/src/main/java/com/xabber/android/ui/activity/XabberLoginActivity.java
index bb85c9d68f..00a58c00bc 100644
--- a/xabber/src/main/java/com/xabber/android/ui/activity/XabberLoginActivity.java
+++ b/xabber/src/main/java/com/xabber/android/ui/activity/XabberLoginActivity.java
@@ -231,12 +231,7 @@ private void handleSuccessGetHosts(List<AuthManager.Domain> domains) {
 
     private void handleErrorGetHosts(Throwable throwable) {
         hideProgress();
-
-        // TODO: 03.08.18 implement error parsing
-
-        String error = "Error while request hosts: " + throwable.toString();
-        Log.d(LOG_TAG, error);
-        Toast.makeText(this, error, Toast.LENGTH_LONG).show();
+        handleError(throwable, "Error while request hosts: ", LOG_TAG);
     }
 
     /** SIGN UP */
@@ -275,12 +270,7 @@ private void handleSuccessSignUp() {
 
     private void handleErrorSignUp(Throwable throwable) {
         hideProgress();
-
-        // TODO: 03.08.18 implement error parsing
-
-        String error = "Error while signup: " + throwable.toString();
-        Log.d(LOG_TAG, error);
-        Toast.makeText(this, error, Toast.LENGTH_LONG).show();
+        handleError(throwable, "Error while signup: ", LOG_TAG);
     }
 
     /** SOCIAL LOGIN */
@@ -357,15 +347,7 @@ private void handleSuccessGetAccount(@NonNull XabberAccount xabberAccount) {
 
     private void handleErrorGetAccount(Throwable throwable) {
         hideProgress();
-
-        String message = RetrofitErrorConverter.throwableToHttpError(throwable);
-        if (message != null) {
-            Log.d(LOG_TAG, "Error while login: " + message);
-            Toast.makeText(this, message, Toast.LENGTH_SHORT).show();
-        } else {
-            Log.d(LOG_TAG, "Error while login: " + throwable.toString());
-            Toast.makeText(this, "Error while login: " + throwable.toString(), Toast.LENGTH_LONG).show();
-        }
+        handleError(throwable, "Error while login: ", LOG_TAG);
     }
 
 }

From 02192b3757648bc861f72c67ac03fd3cc1855486 Mon Sep 17 00:00:00 2001
From: Valery Miller <valera_miller94@mail.ru>
Date: Fri, 17 Aug 2018 11:58:26 +0500
Subject: [PATCH 036/251] Changes in login screen

---
 .../android/ui/activity/TutorialActivity.java |   2 +-
 .../ui/activity/XabberLoginActivity.java      |  18 +-
 .../ui/fragment/XAccountLoginFragment.java    | 128 ++++++++++++++
 .../res/layout/fragment_xaccount_login.xml    | 164 ++++++++++++++++++
 4 files changed, 303 insertions(+), 9 deletions(-)
 create mode 100644 xabber/src/main/java/com/xabber/android/ui/fragment/XAccountLoginFragment.java
 create mode 100644 xabber/src/main/res/layout/fragment_xaccount_login.xml

diff --git a/xabber/src/main/java/com/xabber/android/ui/activity/TutorialActivity.java b/xabber/src/main/java/com/xabber/android/ui/activity/TutorialActivity.java
index a0b4872d9c..5cb5b4f983 100644
--- a/xabber/src/main/java/com/xabber/android/ui/activity/TutorialActivity.java
+++ b/xabber/src/main/java/com/xabber/android/ui/activity/TutorialActivity.java
@@ -54,7 +54,7 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
         btnLogin.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                startActivity(AccountAddActivity.createIntent(TutorialActivity.this));
+                startActivity(XabberLoginActivity.createIntent(TutorialActivity.this, XabberLoginActivity.FRAGMENT_LOGIN));
             }
         });
 
diff --git a/xabber/src/main/java/com/xabber/android/ui/activity/XabberLoginActivity.java b/xabber/src/main/java/com/xabber/android/ui/activity/XabberLoginActivity.java
index 00a58c00bc..23676e95f5 100644
--- a/xabber/src/main/java/com/xabber/android/ui/activity/XabberLoginActivity.java
+++ b/xabber/src/main/java/com/xabber/android/ui/activity/XabberLoginActivity.java
@@ -20,6 +20,7 @@
 import com.xabber.android.data.xaccount.XAccountTokenDTO;
 import com.xabber.android.data.xaccount.XabberAccount;
 import com.xabber.android.ui.color.BarPainter;
+import com.xabber.android.ui.fragment.XAccountLoginFragment;
 import com.xabber.android.ui.fragment.XAccountSignUpFragment;
 import com.xabber.android.utils.RetrofitErrorConverter;
 
@@ -37,7 +38,8 @@
  * Created by valery.miller on 14.07.17.
  */
 
-public class XabberLoginActivity extends BaseLoginActivity implements XAccountSignUpFragment.Listener {
+public class XabberLoginActivity extends BaseLoginActivity implements XAccountSignUpFragment.Listener,
+        XAccountLoginFragment.Listener {
 
     private final static String LOG_TAG = XabberLoginActivity.class.getSimpleName();
     public final static String CURRENT_FRAGMENT = "current_fragment";
@@ -86,13 +88,13 @@ public void onClick(View v) {
     }
 
     public void showLoginFragment() {
-//        if (fragmentLogin == null)
-//            fragmentLogin = new XabberLoginFragment();
-//
-//        fTrans = getFragmentManager().beginTransaction();
-//        fTrans.replace(R.id.container, fragmentLogin);
-//        fTrans.commit();
-//        currentFragment = FRAGMENT_LOGIN;
+        if (fragmentLogin == null)
+            fragmentLogin = XAccountLoginFragment.newInstance(this);
+
+        fTrans = getFragmentManager().beginTransaction();
+        fTrans.replace(R.id.container, fragmentLogin);
+        fTrans.commit();
+        currentFragment = FRAGMENT_LOGIN;
     }
 
     public void showSignUpFragment(String credentials, String socialProvider) {
diff --git a/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountLoginFragment.java b/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountLoginFragment.java
new file mode 100644
index 0000000000..8ea76351fa
--- /dev/null
+++ b/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountLoginFragment.java
@@ -0,0 +1,128 @@
+package com.xabber.android.ui.fragment;
+
+import android.app.Fragment;
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.text.method.LinkMovementMethod;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Button;
+import android.widget.CheckBox;
+import android.widget.EditText;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import com.xabber.android.R;
+import com.xabber.android.data.Application;
+import com.xabber.android.data.NetworkException;
+import com.xabber.android.data.account.AccountManager;
+import com.xabber.android.data.entity.AccountJid;
+import com.xabber.android.data.xaccount.XabberAccountManager;
+import com.xabber.android.ui.activity.AccountActivity;
+import com.xabber.android.ui.dialog.OrbotInstallerDialog;
+import com.xabber.android.ui.helper.OrbotHelper;
+
+public class XAccountLoginFragment extends Fragment implements View.OnClickListener {
+
+    private CheckBox storePasswordView;
+    private CheckBox chkSync;
+    private CheckBox useOrbotView;
+    private EditText edtUsername;
+    private EditText edtPassword;
+    private Button btnLogin;
+
+    private Listener listener;
+
+    public interface Listener {
+        void onGoogleClick();
+        void onFacebookClick();
+        void onTwitterClick();
+    }
+
+    public static XAccountLoginFragment newInstance(Listener listener) {
+        XAccountLoginFragment fragment = new XAccountLoginFragment();
+        fragment.listener = listener;
+        return fragment;
+    }
+
+    @Nullable
+    @Override
+    public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, Bundle savedInstanceState) {
+        View view = inflater.inflate(R.layout.fragment_xaccount_login, container, false);
+
+        storePasswordView = (CheckBox) view.findViewById(R.id.store_password);
+        chkSync = (CheckBox) view.findViewById(R.id.chkSync);
+        if (XabberAccountManager.getInstance().getAccount() == null) {
+            chkSync.setVisibility(View.GONE);
+            chkSync.setChecked(false);
+        }
+
+        useOrbotView = (CheckBox) view.findViewById(R.id.use_orbot);
+
+        edtUsername = (EditText) view.findViewById(R.id.edtUsername);
+        edtPassword = (EditText) view.findViewById(R.id.edtPass);
+        btnLogin = view.findViewById(R.id.btnLogin);
+        btnLogin.setOnClickListener(this);
+
+        ((TextView) view.findViewById(R.id.account_help))
+                .setMovementMethod(LinkMovementMethod.getInstance());
+
+        ImageView ivFacebook = view.findViewById(R.id.ivFacebook);
+        ImageView ivGoogle = view.findViewById(R.id.ivGoogle);
+        ImageView ivTwitter = view.findViewById(R.id.ivTwitter);
+
+        ivFacebook.setOnClickListener(this);
+        ivGoogle.setOnClickListener(this);
+        ivTwitter.setOnClickListener(this);
+
+        return view;
+    }
+
+    @Override
+    public void onClick(View v) {
+        switch (v.getId()) {
+            case R.id.btnLogin:
+                addAccount();
+                break;
+            case R.id.ivFacebook:
+                listener.onFacebookClick();
+                break;
+            case R.id.ivGoogle:
+                listener.onGoogleClick();
+                break;
+            case R.id.ivTwitter:
+                listener.onTwitterClick();
+                break;
+        }
+    }
+
+    public void addAccount() {
+        if (useOrbotView.isChecked() && !OrbotHelper.isOrbotInstalled()) {
+            OrbotInstallerDialog.newInstance().show(getFragmentManager(), OrbotInstallerDialog.class.getName());
+            return;
+        }
+
+        AccountJid account;
+        try {
+            account = AccountManager.getInstance().addAccount(
+                    edtUsername.getText().toString().trim(),
+                    edtPassword.getText().toString(),
+                    "",
+                    false,
+                    storePasswordView.isChecked(),
+                    chkSync.isChecked(),
+                    useOrbotView.isChecked(),
+                    false, true);
+        } catch (NetworkException e) {
+            Application.getInstance().onError(e);
+            return;
+        }
+
+        // update remote settings
+        if (chkSync.isChecked()) XabberAccountManager.getInstance().updateSettingsWithSaveLastAccount(account);
+
+        startActivity(AccountActivity.createIntent(getActivity(), account));
+        getActivity().finish();
+    }
+}
diff --git a/xabber/src/main/res/layout/fragment_xaccount_login.xml b/xabber/src/main/res/layout/fragment_xaccount_login.xml
new file mode 100644
index 0000000000..6c7fdb8ed1
--- /dev/null
+++ b/xabber/src/main/res/layout/fragment_xaccount_login.xml
@@ -0,0 +1,164 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        android:layout_centerInParent="true"
+        android:layout_marginLeft="32dp"
+        android:layout_marginRight="32dp"
+        >
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="16dp"
+            android:paddingLeft="4dp"
+            android:textColor="@color/black_text_secondary"
+            android:text="@string/label_username"
+            />
+
+        <EditText
+            android:id="@+id/edtUsername"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:imeOptions="actionNext"
+            android:nextFocusForward="@+id/edtPass"
+            android:singleLine="true"
+            android:hint="@string/name_example_com"
+            android:textSize="16sp"
+            android:theme="@style/Theme"
+            />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:paddingLeft="4dp"
+            android:layout_marginTop="16dp"
+            android:textColor="@color/black_text_secondary"
+            android:text="@string/label_pass"
+            />
+
+        <EditText
+            android:id="@+id/edtPass"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:imeOptions="actionNext"
+            android:singleLine="true"
+            android:textSize="16sp"
+            android:theme="@style/Theme"
+            android:hint="@string/hint_pass"
+            android:inputType="textPassword"
+            />
+
+        <CheckBox
+            android:id="@+id/store_password"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:checked="true"
+            android:text="@string/account_store_password" />
+
+        <CheckBox
+            android:id="@+id/chkSync"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:checked="true"
+            android:text="@string/sync_with_xabber_account" />
+
+        <CheckBox
+            android:id="@+id/use_orbot"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:checked="false"
+            android:text="@string/account_use_orbot" />
+
+        <Button
+            android:id="@+id/btnLogin"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="8dp"
+            style="@style/Widget.AppCompat.Button.Colored"
+            android:theme="@style/BlueButton"
+            android:paddingRight="18dp"
+            android:paddingLeft="18dp"
+            android:textColor="@color/white"
+            android:text="@string/button_login"
+            />
+
+        <TextView
+            android:id="@+id/tvSocialProvider"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:paddingLeft="4dp"
+            android:textColor="@color/black_text_secondary"
+            android:visibility="gone"
+            />
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            >
+
+            <ImageView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:src="@drawable/ic_error_grey_24dp"
+                android:paddingTop="16dp"
+                android:paddingBottom="16dp"
+                android:paddingLeft="4dp"
+                android:paddingRight="4dp"
+                />
+
+            <TextView
+                android:id="@+id/account_help"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:text="@string/account_xmpp_register_warning"
+                android:layout_gravity="center_vertical"
+                android:gravity="center_vertical"
+                />
+
+        </LinearLayout>
+
+        <LinearLayout
+            android:id="@+id/llSocialLogos"
+            android:orientation="horizontal"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal"
+            android:layout_marginTop="18dp"
+            >
+
+            <ImageView
+                android:id="@+id/ivGoogle"
+                android:layout_width="48dp"
+                android:layout_height="48dp"
+                android:src="@drawable/ic_google_plus"
+                />
+
+            <ImageView
+                android:id="@+id/ivFacebook"
+                android:layout_width="48dp"
+                android:layout_height="48dp"
+                android:layout_marginLeft="32dp"
+                android:src="@drawable/ic_facebook"
+                />
+
+            <ImageView
+                android:id="@+id/ivTwitter"
+                android:layout_width="48dp"
+                android:layout_height="48dp"
+                android:layout_marginLeft="32dp"
+                android:src="@drawable/ic_twitter"
+                />
+
+        </LinearLayout>
+
+    </LinearLayout>
+
+
+</RelativeLayout>
\ No newline at end of file

From 1704d44ac1c8d0ca6659d81a8f29534418228643 Mon Sep 17 00:00:00 2001
From: Valery Miller <valera_miller94@mail.ru>
Date: Fri, 17 Aug 2018 15:37:48 +0500
Subject: [PATCH 037/251] Visual changes in login fragment

---
 .../ui/fragment/XAccountLoginFragment.java    |  24 +++-
 .../src/main/res/drawable/ic_email_circle.xml |  17 +++
 .../src/main/res/drawable/ic_logo_circle.xml  |  15 ++
 .../res/layout/fragment_xaccount_login.xml    | 136 +++++++++---------
 xabber/src/main/res/layout/include_social.xml |  76 ++++++++++
 xabber/src/main/res/values/xabber_account.xml |   8 +-
 6 files changed, 205 insertions(+), 71 deletions(-)
 create mode 100644 xabber/src/main/res/drawable/ic_email_circle.xml
 create mode 100644 xabber/src/main/res/drawable/ic_logo_circle.xml
 create mode 100644 xabber/src/main/res/layout/include_social.xml

diff --git a/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountLoginFragment.java b/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountLoginFragment.java
index 8ea76351fa..39cccd88c8 100644
--- a/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountLoginFragment.java
+++ b/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountLoginFragment.java
@@ -31,6 +31,9 @@ public class XAccountLoginFragment extends Fragment implements View.OnClickListe
     private EditText edtUsername;
     private EditText edtPassword;
     private Button btnLogin;
+    private Button btnOptions;
+    private View optionsView;
+    private View socialView;
 
     private Listener listener;
 
@@ -60,10 +63,14 @@ public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container,
 
         useOrbotView = (CheckBox) view.findViewById(R.id.use_orbot);
 
+        optionsView = view.findViewById(R.id.optionsView);
+        socialView = view.findViewById(R.id.socialView);
         edtUsername = (EditText) view.findViewById(R.id.edtUsername);
         edtPassword = (EditText) view.findViewById(R.id.edtPass);
         btnLogin = view.findViewById(R.id.btnLogin);
         btnLogin.setOnClickListener(this);
+        btnOptions = view.findViewById(R.id.btnOptions);
+        btnOptions.setOnClickListener(this);
 
         ((TextView) view.findViewById(R.id.account_help))
                 .setMovementMethod(LinkMovementMethod.getInstance());
@@ -94,10 +101,13 @@ public void onClick(View v) {
             case R.id.ivTwitter:
                 listener.onTwitterClick();
                 break;
+            case R.id.btnOptions:
+                showOptions();
+                break;
         }
     }
 
-    public void addAccount() {
+    private void addAccount() {
         if (useOrbotView.isChecked() && !OrbotHelper.isOrbotInstalled()) {
             OrbotInstallerDialog.newInstance().show(getFragmentManager(), OrbotInstallerDialog.class.getName());
             return;
@@ -125,4 +135,16 @@ public void addAccount() {
         startActivity(AccountActivity.createIntent(getActivity(), account));
         getActivity().finish();
     }
+
+    private void showOptions() {
+        if (optionsView.getVisibility() == View.VISIBLE) {
+            optionsView.setVisibility(View.GONE);
+            socialView.setVisibility(View.VISIBLE);
+            btnOptions.setText(R.string.button_advanced_options);
+        } else {
+            optionsView.setVisibility(View.VISIBLE);
+            socialView.setVisibility(View.GONE);
+            btnOptions.setText(R.string.button_hide_options);
+        }
+    }
 }
diff --git a/xabber/src/main/res/drawable/ic_email_circle.xml b/xabber/src/main/res/drawable/ic_email_circle.xml
new file mode 100644
index 0000000000..5e4f8bfbcb
--- /dev/null
+++ b/xabber/src/main/res/drawable/ic_email_circle.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape android:shape="oval">
+            <solid android:color="@color/grey_300"/>
+        </shape>
+    </item>
+    <item
+        android:drawable="@drawable/ic_email"
+        android:height="28dp"
+        android:width="28dp"
+        android:bottom="12dp"
+        android:left="12dp"
+        android:right="12dp"
+        android:top="12dp"
+        />
+</layer-list>
\ No newline at end of file
diff --git a/xabber/src/main/res/drawable/ic_logo_circle.xml b/xabber/src/main/res/drawable/ic_logo_circle.xml
new file mode 100644
index 0000000000..32202a773f
--- /dev/null
+++ b/xabber/src/main/res/drawable/ic_logo_circle.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape android:shape="oval">
+            <solid android:color="@color/grey_200"/>
+        </shape>
+    </item>
+    <item
+        android:drawable="@mipmap/ic_launcher"
+        android:bottom="10dp"
+        android:left="10dp"
+        android:right="10dp"
+        android:top="10dp"
+        />
+</layer-list>
\ No newline at end of file
diff --git a/xabber/src/main/res/layout/fragment_xaccount_login.xml b/xabber/src/main/res/layout/fragment_xaccount_login.xml
index 6c7fdb8ed1..9341955cf7 100644
--- a/xabber/src/main/res/layout/fragment_xaccount_login.xml
+++ b/xabber/src/main/res/layout/fragment_xaccount_login.xml
@@ -12,13 +12,21 @@
         android:layout_marginRight="32dp"
         >
 
+        <ImageView
+            android:layout_width="120dp"
+            android:layout_height="120dp"
+            android:src="@drawable/ic_logo_circle"
+            android:layout_gravity="center_horizontal"
+            android:layout_marginBottom="32dp"
+            />
+
         <TextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="16dp"
             android:paddingLeft="4dp"
             android:textColor="@color/black_text_secondary"
-            android:text="@string/label_username"
+            android:text="@string/label_xmpp_id"
             />
 
         <EditText
@@ -54,48 +62,70 @@
             android:inputType="textPassword"
             />
 
-        <CheckBox
-            android:id="@+id/store_password"
+        <LinearLayout
+            android:id="@+id/optionsView"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:checked="true"
-            android:text="@string/account_store_password" />
+            android:orientation="vertical"
+            android:visibility="gone"
+            >
 
-        <CheckBox
-            android:id="@+id/chkSync"
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:checked="true"
-            android:text="@string/sync_with_xabber_account" />
+            <CheckBox
+                android:id="@+id/store_password"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:checked="true"
+                android:text="@string/account_store_password" />
 
-        <CheckBox
-            android:id="@+id/use_orbot"
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:checked="false"
-            android:text="@string/account_use_orbot" />
+            <CheckBox
+                android:id="@+id/chkSync"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:checked="true"
+                android:text="@string/sync_with_xabber_account" />
 
-        <Button
-            android:id="@+id/btnLogin"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="8dp"
-            style="@style/Widget.AppCompat.Button.Colored"
-            android:theme="@style/BlueButton"
-            android:paddingRight="18dp"
-            android:paddingLeft="18dp"
-            android:textColor="@color/white"
-            android:text="@string/button_login"
-            />
+            <CheckBox
+                android:id="@+id/use_orbot"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:checked="false"
+                android:text="@string/account_use_orbot" />
 
-        <TextView
-            android:id="@+id/tvSocialProvider"
+        </LinearLayout>
+
+        <RelativeLayout
+            android:layout_marginTop="8dp"
+            android:layout_marginBottom="16dp"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:paddingLeft="4dp"
-            android:textColor="@color/black_text_secondary"
-            android:visibility="gone"
-            />
+            android:layout_height="wrap_content">
+
+            <Button
+                android:id="@+id/btnOptions"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                style="@style/Widget.AppCompat.Button.Borderless"
+                android:theme="@style/BlueButton"
+                android:textColor="@color/grey_500"
+                android:text="@string/button_advanced_options"
+                android:layout_centerVertical="true"
+                />
+
+            <Button
+                android:id="@+id/btnLogin"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                style="@style/Widget.AppCompat.Button.Colored"
+                android:theme="@style/BlueButton"
+                android:paddingRight="18dp"
+                android:paddingLeft="18dp"
+                android:layout_centerVertical="true"
+                android:layout_alignParentEnd="true"
+                android:layout_alignParentRight="true"
+                android:textColor="@color/white"
+                android:text="@string/button_connect"
+                />
+
+        </RelativeLayout>
 
         <LinearLayout
             android:layout_width="match_parent"
@@ -124,39 +154,7 @@
 
         </LinearLayout>
 
-        <LinearLayout
-            android:id="@+id/llSocialLogos"
-            android:orientation="horizontal"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_horizontal"
-            android:layout_marginTop="18dp"
-            >
-
-            <ImageView
-                android:id="@+id/ivGoogle"
-                android:layout_width="48dp"
-                android:layout_height="48dp"
-                android:src="@drawable/ic_google_plus"
-                />
-
-            <ImageView
-                android:id="@+id/ivFacebook"
-                android:layout_width="48dp"
-                android:layout_height="48dp"
-                android:layout_marginLeft="32dp"
-                android:src="@drawable/ic_facebook"
-                />
-
-            <ImageView
-                android:id="@+id/ivTwitter"
-                android:layout_width="48dp"
-                android:layout_height="48dp"
-                android:layout_marginLeft="32dp"
-                android:src="@drawable/ic_twitter"
-                />
-
-        </LinearLayout>
+        <include layout="@layout/include_social"/>
 
     </LinearLayout>
 
diff --git a/xabber/src/main/res/layout/include_social.xml b/xabber/src/main/res/layout/include_social.xml
new file mode 100644
index 0000000000..c65f73178d
--- /dev/null
+++ b/xabber/src/main/res/layout/include_social.xml
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/socialView"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="1dp"
+            android:layout_centerVertical="true"
+            android:background="@color/black_text_secondary"
+            />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerHorizontal="true"
+            android:padding="8dp"
+            android:background="@color/white"
+            android:textColor="@color/black_text_secondary"
+            android:text="Social Login"
+            />
+
+    </RelativeLayout>
+
+    <LinearLayout
+        android:id="@+id/llSocialLogos"
+        android:orientation="horizontal"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_horizontal"
+        android:layout_marginBottom="16dp"
+        android:layout_marginTop="8dp"
+        >
+
+        <ImageView
+            android:id="@+id/ivGoogle"
+            android:layout_width="48dp"
+            android:layout_height="48dp"
+            android:src="@drawable/ic_google_plus"
+            />
+
+        <ImageView
+            android:id="@+id/ivFacebook"
+            android:layout_width="48dp"
+            android:layout_height="48dp"
+            android:layout_marginLeft="30dp"
+            android:src="@drawable/ic_facebook"
+            />
+
+        <ImageView
+            android:id="@+id/ivTwitter"
+            android:layout_width="48dp"
+            android:layout_height="48dp"
+            android:layout_marginLeft="30dp"
+            android:src="@drawable/ic_twitter"
+            />
+
+        <ImageView
+            android:id="@+id/ivGithub"
+            android:layout_width="48dp"
+            android:layout_height="48dp"
+            android:layout_marginLeft="30dp"
+            android:src="@drawable/ic_email_circle"
+            android:visibility="visible"
+            />
+
+    </LinearLayout>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/xabber/src/main/res/values/xabber_account.xml b/xabber/src/main/res/values/xabber_account.xml
index f9e5b6e313..e67b251f4e 100644
--- a/xabber/src/main/res/values/xabber_account.xml
+++ b/xabber/src/main/res/values/xabber_account.xml
@@ -43,7 +43,7 @@
 
     <string name="label_username">Choose username*</string>
     <string name="hint_username">username</string>
-    <string name="label_pass">Password*</string>
+    <string name="label_pass">Password</string>
     <string name="hint_pass">Enter password</string>
     <string name="label_conf_pass">Confirm password*</string>
     <string name="hint_conf_pass">Confirm password</string>
@@ -52,6 +52,8 @@
     <string name="label_last_name">Last name</string>
     <string name="hint_last_name">Doe</string>
 
+    <string name="label_xmpp_id">Existing XMPP ID</string>
+
     <string name="hint_code">code</string>
 
     <string name="default_host" translatable="false">\@xabber.org</string>
@@ -74,6 +76,10 @@
     <string name="summary_xabber_account_in_login">Xabber account is required to use Xabber services and sync device settings.</string>
     <string name="summary_username">Xabber username will also act as a free XMPP ID</string>
 
+    <string name="button_connect">CONNECT</string>
+    <string name="button_advanced_options">ADVANCED OPTIONS</string>
+    <string name="button_hide_options">HIDE OPTIONS</string>
+    <string name="button_terms_of_service">TERMS OF SERVICE</string>
     <string name="button_quit">QUIT</string>
     <string name="button_login">SIGN IN</string>
     <string name="button_registration">SIGN UP</string>

From 2ef77b686c7dfc2f0f9388cc8b229642568f97bb Mon Sep 17 00:00:00 2001
From: Valery Miller <valera_miller94@mail.ru>
Date: Fri, 17 Aug 2018 18:28:06 +0500
Subject: [PATCH 038/251] Changes in signup screen

---
 .../ui/fragment/XAccountSignUpFragment.java   |  22 +--
 .../res/layout/fragment_xaccount_signup.xml   | 166 ++++++++++--------
 .../main/res/values-ru-rRU/xabber_account.xml |   4 +-
 xabber/src/main/res/values/xabber_account.xml |   5 +-
 4 files changed, 113 insertions(+), 84 deletions(-)

diff --git a/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountSignUpFragment.java b/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountSignUpFragment.java
index 9625163a4c..1532fc8218 100644
--- a/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountSignUpFragment.java
+++ b/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountSignUpFragment.java
@@ -36,7 +36,7 @@ public class XAccountSignUpFragment extends Fragment implements View.OnClickList
     private EditText edtPass;
     private Spinner spinnerDomain;
     private TextView tvSocialProvider;
-    private LinearLayout llSocialLogos;
+    //private LinearLayout llSocialLogos;
 
     private Listener listener;
     private String credentials;
@@ -84,14 +84,14 @@ public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
         spinnerDomain = view.findViewById(R.id.spinnerDomain);
 
         tvSocialProvider = view.findViewById(R.id.tvSocialProvider);
-        llSocialLogos = view.findViewById(R.id.llSocialLogos);
-        ImageView ivFacebook = view.findViewById(R.id.ivFacebook);
-        ImageView ivGoogle = view.findViewById(R.id.ivGoogle);
-        ImageView ivTwitter = view.findViewById(R.id.ivTwitter);
-
-        ivFacebook.setOnClickListener(this);
-        ivGoogle.setOnClickListener(this);
-        ivTwitter.setOnClickListener(this);
+//        llSocialLogos = view.findViewById(R.id.llSocialLogos);
+//        ImageView ivFacebook = view.findViewById(R.id.ivFacebook);
+//        ImageView ivGoogle = view.findViewById(R.id.ivGoogle);
+//        ImageView ivTwitter = view.findViewById(R.id.ivTwitter);
+//
+//        ivFacebook.setOnClickListener(this);
+//        ivGoogle.setOnClickListener(this);
+//        ivTwitter.setOnClickListener(this);
 
         Button btnSignUp = view.findViewById(R.id.btnSignUp);
         btnSignUp.setOnClickListener(this);
@@ -130,11 +130,11 @@ public void setSocialProviderCredentials(String socialProvider, String credentia
 
     private void setupSocial() {
         if (credentials != null && socialProvider != null) {
-            llSocialLogos.setVisibility(View.GONE);
+            //llSocialLogos.setVisibility(View.GONE);
             tvSocialProvider.setVisibility(View.VISIBLE);
             tvSocialProvider.setText(socialProvider);
         } else {
-            llSocialLogos.setVisibility(View.VISIBLE);
+            //llSocialLogos.setVisibility(View.VISIBLE);
             tvSocialProvider.setVisibility(View.GONE);
         }
     }
diff --git a/xabber/src/main/res/layout/fragment_xaccount_signup.xml b/xabber/src/main/res/layout/fragment_xaccount_signup.xml
index da4c157acd..3e94e5911c 100644
--- a/xabber/src/main/res/layout/fragment_xaccount_signup.xml
+++ b/xabber/src/main/res/layout/fragment_xaccount_signup.xml
@@ -12,41 +12,82 @@
         android:layout_marginRight="32dp"
         >
 
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="16dp"
-            android:paddingLeft="4dp"
-            android:textColor="@color/black_text_secondary"
-            android:text="@string/label_username"
+        <ImageView
+            android:layout_width="120dp"
+            android:layout_height="120dp"
+            android:src="@drawable/ic_logo_circle"
+            android:layout_gravity="center_horizontal"
+            android:layout_marginBottom="32dp"
             />
 
         <LinearLayout
-            android:orientation="horizontal"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            >
+            android:layout_height="wrap_content">
 
-            <EditText
-                android:id="@+id/edtUsername"
+            <LinearLayout
+                android:orientation="vertical"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:imeOptions="actionNext"
-                android:nextFocusForward="@+id/edtPass"
-                android:singleLine="true"
-                android:hint="@string/hint_username"
-                android:textSize="16sp"
-                android:theme="@style/Theme"
-                android:layout_weight="1"
-
-                />
-
-            <Spinner
-                android:id="@+id/spinnerDomain"
+                android:layout_weight="1">
+
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="16dp"
+                    android:paddingLeft="4dp"
+                    android:textColor="@color/black_text_secondary"
+                    android:text="@string/label_username"
+                    />
+
+                <EditText
+                    android:id="@+id/edtUsername"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:imeOptions="actionNext"
+                    android:nextFocusForward="@+id/edtPass"
+                    android:singleLine="true"
+                    android:hint="@string/hint_username"
+                    android:textSize="16sp"
+                    android:theme="@style/Theme"
+                    android:layout_weight="3"
+                    />
+
+            </LinearLayout>
+
+            <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:text="@string/host"
+                android:textColor="@color/black_text"
+                android:layout_gravity="bottom"
+                android:layout_marginBottom="6dp"
+                android:layout_marginLeft="4dp"
+                android:layout_marginRight="4dp"
                 />
 
+            <LinearLayout
+                android:orientation="vertical"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content">
+
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="16dp"
+                    android:paddingLeft="8dp"
+                    android:textColor="@color/black_text_secondary"
+                    android:text="Select domain"
+                    />
+
+                <Spinner
+                    android:id="@+id/spinnerDomain"
+                    android:layout_marginTop="8dp"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    />
+
+            </LinearLayout>
+
         </LinearLayout>
 
         <TextView
@@ -70,18 +111,39 @@
             android:inputType="textPassword"
             />
 
-        <Button
-            android:id="@+id/btnSignUp"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
+        <RelativeLayout
             android:layout_marginTop="8dp"
-            style="@style/Widget.AppCompat.Button.Colored"
-            android:theme="@style/BlueButton"
-            android:paddingRight="18dp"
-            android:paddingLeft="18dp"
-            android:textColor="@color/white"
-            android:text="@string/button_complete_registration"
-            />
+            android:layout_marginBottom="16dp"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+            <Button
+                android:id="@+id/btnOptions"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                style="@style/Widget.AppCompat.Button.Borderless"
+                android:theme="@style/BlueButton"
+                android:textColor="@color/grey_500"
+                android:text="@string/button_terms_of_service"
+                android:layout_centerVertical="true"
+                />
+
+            <Button
+                android:id="@+id/btnSignUp"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                style="@style/Widget.AppCompat.Button.Colored"
+                android:theme="@style/BlueButton"
+                android:paddingRight="18dp"
+                android:paddingLeft="18dp"
+                android:layout_centerVertical="true"
+                android:layout_alignParentEnd="true"
+                android:layout_alignParentRight="true"
+                android:textColor="@color/white"
+                android:text="@string/button_registration"
+                />
+
+        </RelativeLayout>
 
         <TextView
             android:id="@+id/tvSocialProvider"
@@ -91,40 +153,6 @@
             android:textColor="@color/black_text_secondary"
             />
 
-        <LinearLayout
-            android:id="@+id/llSocialLogos"
-            android:orientation="horizontal"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_horizontal"
-            android:layout_marginTop="18dp"
-            >
-
-            <ImageView
-                android:id="@+id/ivGoogle"
-                android:layout_width="48dp"
-                android:layout_height="48dp"
-                android:src="@drawable/ic_google_plus"
-                />
-
-            <ImageView
-                android:id="@+id/ivFacebook"
-                android:layout_width="48dp"
-                android:layout_height="48dp"
-                android:layout_marginLeft="32dp"
-                android:src="@drawable/ic_facebook"
-                />
-
-            <ImageView
-                android:id="@+id/ivTwitter"
-                android:layout_width="48dp"
-                android:layout_height="48dp"
-                android:layout_marginLeft="32dp"
-                android:src="@drawable/ic_twitter"
-                />
-
-        </LinearLayout>
-
     </LinearLayout>
 
 
diff --git a/xabber/src/main/res/values-ru-rRU/xabber_account.xml b/xabber/src/main/res/values-ru-rRU/xabber_account.xml
index 1858d0b9aa..b61128b1f3 100644
--- a/xabber/src/main/res/values-ru-rRU/xabber_account.xml
+++ b/xabber/src/main/res/values-ru-rRU/xabber_account.xml
@@ -32,9 +32,9 @@
   <string name="progress_title_complete">Завершение регистрации</string>
   <string name="progress_title_resend">Повторная отправка email</string>
   <string name="progress_title_delete_settings">Удаление настроек</string>
-  <string name="label_username">Имя пользователя*</string>
+  <string name="label_username">Имя пользователя</string>
   <string name="hint_username">username</string>
-  <string name="label_pass">Пароль*</string>
+  <string name="label_pass">Пароль</string>
   <string name="hint_pass">Введите пароль</string>
   <string name="label_conf_pass">Подтвердите пароль*</string>
   <string name="hint_conf_pass">Подтвердите пароль</string>
diff --git a/xabber/src/main/res/values/xabber_account.xml b/xabber/src/main/res/values/xabber_account.xml
index e67b251f4e..b498317407 100644
--- a/xabber/src/main/res/values/xabber_account.xml
+++ b/xabber/src/main/res/values/xabber_account.xml
@@ -41,9 +41,9 @@
     <string name="progress_title_confirm_phone">Confirming phone number</string>
     <string name="progress_title_delete_settings">Delete settings</string>
 
-    <string name="label_username">Choose username*</string>
+    <string name="label_username">Pick your username</string>
     <string name="hint_username">username</string>
-    <string name="label_pass">Password</string>
+    <string name="label_pass">Choose password</string>
     <string name="hint_pass">Enter password</string>
     <string name="label_conf_pass">Confirm password*</string>
     <string name="hint_conf_pass">Confirm password</string>
@@ -57,6 +57,7 @@
     <string name="hint_code">code</string>
 
     <string name="default_host" translatable="false">\@xabber.org</string>
+    <string name="host" translatable="false">\@</string>
 
     <string name="title_xabber_account">Xabber Account</string>
     <string name="title_xmpp_account">XMPP Accounts</string>

From bf898fe94616c233150a8f89d45ad4f03b3f6d03 Mon Sep 17 00:00:00 2001
From: Valery Miller <valera_miller94@mail.ru>
Date: Fri, 17 Aug 2018 18:55:48 +0500
Subject: [PATCH 039/251] Changes in login screen

---
 xabber/src/main/AndroidManifest.xml                |  2 +-
 .../android/ui/activity/XabberLoginActivity.java   | 14 ++++++++++----
 .../com/xabber/android/ui/color/BarPainter.java    |  5 +++++
 xabber/src/main/res/drawable/ic_arrow_left.xml     |  8 ++++++++
 xabber/src/main/res/values/xabber_account.xml      |  4 ++--
 5 files changed, 26 insertions(+), 7 deletions(-)
 create mode 100644 xabber/src/main/res/drawable/ic_arrow_left.xml

diff --git a/xabber/src/main/AndroidManifest.xml b/xabber/src/main/AndroidManifest.xml
index 7e2c03f460..1befa9520a 100644
--- a/xabber/src/main/AndroidManifest.xml
+++ b/xabber/src/main/AndroidManifest.xml
@@ -517,7 +517,7 @@
         <activity android:name=".ui.activity.TutorialActivity"
             android:theme="@style/ThemeDark"/>
         <activity android:name=".ui.activity.XabberLoginActivity"
-            android:theme="@style/ThemeDark"/>
+            android:theme="@style/Theme.Design.Light"/>
         <activity android:name=".ui.activity.XabberAccountActivity"
             android:theme="@style/ThemeDark">
 
diff --git a/xabber/src/main/java/com/xabber/android/ui/activity/XabberLoginActivity.java b/xabber/src/main/java/com/xabber/android/ui/activity/XabberLoginActivity.java
index 23676e95f5..b6a79f5420 100644
--- a/xabber/src/main/java/com/xabber/android/ui/activity/XabberLoginActivity.java
+++ b/xabber/src/main/java/com/xabber/android/ui/activity/XabberLoginActivity.java
@@ -53,6 +53,7 @@ public class XabberLoginActivity extends BaseLoginActivity implements XAccountSi
 
     private ProgressDialog progressDialog;
     private BarPainter barPainter;
+    private Toolbar toolbar;
 
     private List<String> hosts = new ArrayList<>();
 
@@ -75,15 +76,16 @@ protected void onCreate(Bundle savedInstanceState) {
 
         setContentView(R.layout.activity_xabber_login);
 
-        Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar_default);
+        toolbar = (Toolbar) findViewById(R.id.toolbar_default);
         toolbar.setTitle(R.string.title_login_xabber_account);
-        toolbar.setNavigationIcon(R.drawable.ic_arrow_left_white_24dp);
+        toolbar.setNavigationIcon(R.drawable.ic_arrow_left);
         toolbar.setNavigationOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
                 finish();
             }
         });
+        toolbar.setTitleTextColor(getResources().getColor(R.color.black_text));
         barPainter = new BarPainter(this, toolbar);
     }
 
@@ -95,6 +97,9 @@ public void showLoginFragment() {
         fTrans.replace(R.id.container, fragmentLogin);
         fTrans.commit();
         currentFragment = FRAGMENT_LOGIN;
+
+        toolbar.setTitle(R.string.title_login_xabber_account);
+        barPainter.setLiteGrey();
     }
 
     public void showSignUpFragment(String credentials, String socialProvider) {
@@ -104,9 +109,10 @@ public void showSignUpFragment(String credentials, String socialProvider) {
         fTrans = getFragmentManager().beginTransaction();
         fTrans.replace(R.id.container, fragmentSignUp, FRAGMENT_SIGNUP);
         fTrans.commit();
+        currentFragment = FRAGMENT_LOGIN;
 
-        //toolbar.setTitle(R.string.title_register_xabber_account);
-        barPainter.setBlue(this);
+        toolbar.setTitle(R.string.title_register_xabber_account);
+        barPainter.setLiteGrey();
     }
 
     @Override
diff --git a/xabber/src/main/java/com/xabber/android/ui/color/BarPainter.java b/xabber/src/main/java/com/xabber/android/ui/color/BarPainter.java
index dfb0931a93..e6483addcc 100644
--- a/xabber/src/main/java/com/xabber/android/ui/color/BarPainter.java
+++ b/xabber/src/main/java/com/xabber/android/ui/color/BarPainter.java
@@ -6,6 +6,7 @@
 import android.support.v7.widget.Toolbar;
 
 import com.xabber.android.R;
+import com.xabber.android.data.Application;
 import com.xabber.android.data.entity.AccountJid;
 
 public class BarPainter {
@@ -37,6 +38,10 @@ public void updateWithColorName(String targetColorName) {
         statusBarPainter.updateWithColor(accountPainter.getAccountDarkColorByColorName(targetColorName));
     }
 
+    public void setLiteGrey() {
+        toolbar.setBackgroundColor(Application.getInstance().getResources().getColor(R.color.grey_200));
+    }
+
     public void setGrey() {
         toolbar.setBackgroundColor(accountPainter.getGreyMain());
         statusBarPainter.updateWithColor(accountPainter.getGreyDark());
diff --git a/xabber/src/main/res/drawable/ic_arrow_left.xml b/xabber/src/main/res/drawable/ic_arrow_left.xml
new file mode 100644
index 0000000000..67ad5dcdc8
--- /dev/null
+++ b/xabber/src/main/res/drawable/ic_arrow_left.xml
@@ -0,0 +1,8 @@
+<!-- drawable/arrow_left.xml -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path android:fillColor="#000" android:pathData="M20,11V13H8L13.5,18.5L12.08,19.92L4.16,12L12.08,4.08L13.5,5.5L8,11H20Z" />
+</vector>
\ No newline at end of file
diff --git a/xabber/src/main/res/values/xabber_account.xml b/xabber/src/main/res/values/xabber_account.xml
index b498317407..ef871edab4 100644
--- a/xabber/src/main/res/values/xabber_account.xml
+++ b/xabber/src/main/res/values/xabber_account.xml
@@ -71,8 +71,8 @@
     <string name="title_reordering_account">Reorder accounts</string>
     <string name="title_sync">Synchronization</string>
 
-    <string name="title_login_xabber_account">Xabber Sign In</string>
-    <string name="title_register_xabber_account">Xabber Sign Up</string>
+    <string name="title_login_xabber_account">Sign In</string>
+    <string name="title_register_xabber_account">Sign Up</string>
 
     <string name="summary_xabber_account_in_login">Xabber account is required to use Xabber services and sync device settings.</string>
     <string name="summary_username">Xabber username will also act as a free XMPP ID</string>

From 1dcaa440b9a4af3e036029baf81741036cfb13d7 Mon Sep 17 00:00:00 2001
From: Valery Miller <valera_miller94@mail.ru>
Date: Fri, 17 Aug 2018 19:01:47 +0500
Subject: [PATCH 040/251] Up version to 503

---
 xabber/build.gradle                                  | 4 ++--
 xabber/src/main/res/values-ru-rRU/xabber_account.xml | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/xabber/build.gradle b/xabber/build.gradle
index 6f8e51a4b7..eaadd332a6 100644
--- a/xabber/build.gradle
+++ b/xabber/build.gradle
@@ -10,8 +10,8 @@ android {
     defaultConfig {
         minSdkVersion 15
         targetSdkVersion 27
-        versionCode 501
-        versionName '2.4.1(501)'
+        versionCode 503
+        versionName '2.4.2(503)'
     }
 
     lintOptions {
diff --git a/xabber/src/main/res/values-ru-rRU/xabber_account.xml b/xabber/src/main/res/values-ru-rRU/xabber_account.xml
index b61128b1f3..a30a0df880 100644
--- a/xabber/src/main/res/values-ru-rRU/xabber_account.xml
+++ b/xabber/src/main/res/values-ru-rRU/xabber_account.xml
@@ -52,8 +52,8 @@
   <string name="title_start_messaging">Начните общение!</string>
   <string name="title_reordering_account">Порядок аккаунтов</string>
   <string name="title_sync">Синхронизация</string>
-  <string name="title_login_xabber_account">Вход в Xabber</string>
-  <string name="title_register_xabber_account">Регистрация в Xabber</string>
+  <string name="title_login_xabber_account">Авторизация</string>
+  <string name="title_register_xabber_account">Регистрация</string>
   <string name="summary_xabber_account_in_login">Аккаунт Xabber требуется для использования сервисов Xabber и синхронизации настроек устройств.</string>
   <string name="summary_username">Имя пользователя Xabber также является XMPP id</string>
   <string name="button_quit">ВЫХОД</string>

From e89450a948af7b8672c8782f0faf2b243378e1a0 Mon Sep 17 00:00:00 2001
From: Valery Miller <valera_miller94@mail.ru>
Date: Mon, 3 Sep 2018 13:00:48 +0500
Subject: [PATCH 041/251] Changes in checkboxes of login screen and add account
 screen

---
 .../android/data/account/AccountManager.java     |  7 ++-----
 .../data/xaccount/XabberAccountManager.java      |  4 +++-
 .../android/ui/activity/ContactListActivity.java |  4 +++-
 .../android/ui/dialog/EnterPassDialog.java       |  3 ++-
 .../android/ui/fragment/AccountAddFragment.java  | 16 +++++++++-------
 .../ui/fragment/XAccountLoginFragment.java       | 13 ++++++++-----
 .../src/main/res/layout/fragment_account_add.xml | 11 +++++++++--
 .../main/res/layout/fragment_xaccount_login.xml  | 11 +++++++++--
 xabber/src/main/res/values/account_editor.xml    |  2 ++
 9 files changed, 47 insertions(+), 24 deletions(-)

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
index 1efd9461ba..9d3601ca2a 100644
--- a/xabber/src/main/java/com/xabber/android/data/account/AccountManager.java
+++ b/xabber/src/main/java/com/xabber/android/data/account/AccountManager.java
@@ -361,7 +361,8 @@ private AccountItem addAccount(boolean custom, String host, int port,
      * @throws NetworkException if user or server part are invalid.
      */
     public AccountJid addAccount(String user, String password, String token, boolean syncable,
-                                 boolean storePassword, boolean xabberSync, boolean useOrbot, boolean registerNewAccount, boolean enabled)
+                                 boolean storePassword, boolean xabberSync, boolean useOrbot,
+                                 boolean registerNewAccount, boolean enabled, boolean tlsRequired)
             throws NetworkException {
         if (user == null) {
             throw new NetworkException(R.string.EMPTY_USER_NAME);
@@ -391,10 +392,6 @@ public AccountJid addAccount(String user, String password, String token, boolean
         }
         String host = serverName.getDomain().toString();
         int port = 5222;
-        boolean tlsRequired = false;
-        if (useOrbot) {
-            tlsRequired = true;
-        }
 
         if (resource == null) {
             resource = generateResource();
diff --git a/xabber/src/main/java/com/xabber/android/data/xaccount/XabberAccountManager.java b/xabber/src/main/java/com/xabber/android/data/xaccount/XabberAccountManager.java
index 38dfe8000a..7fe2b772df 100644
--- a/xabber/src/main/java/com/xabber/android/data/xaccount/XabberAccountManager.java
+++ b/xabber/src/main/java/com/xabber/android/data/xaccount/XabberAccountManager.java
@@ -445,7 +445,9 @@ public void updateLocalAccount(XMPPAccountSettings account) {
             // create new xmpp-account
             if (accountJid == null && !account.isDeleted()) {
                 try {
-                    AccountJid jid = AccountManager.getInstance().addAccount(account.getJid(), "", account.getToken(), false, true, true, false, false, true);
+                    AccountJid jid = AccountManager.getInstance().addAccount(account.getJid(),
+                            "", account.getToken(), false, true,
+                            true, false, false, true, false);
                     AccountManager.getInstance().setColor(jid, ColorManager.getInstance().convertColorNameToIndex(account.getColor()));
                     AccountManager.getInstance().setOrder(jid, account.getOrder());
                     AccountManager.getInstance().setTimestamp(jid, account.getTimestamp());
diff --git a/xabber/src/main/java/com/xabber/android/ui/activity/ContactListActivity.java b/xabber/src/main/java/com/xabber/android/ui/activity/ContactListActivity.java
index 1163d74705..22158794e9 100644
--- a/xabber/src/main/java/com/xabber/android/ui/activity/ContactListActivity.java
+++ b/xabber/src/main/java/com/xabber/android/ui/activity/ContactListActivity.java
@@ -457,7 +457,9 @@ public void showPassDialogs() {
                             // create account if exist token
                             try {
                                 AccountJid accountJid = AccountManager.getInstance().addAccount(item.getJid(),
-                                        "", item.getToken(), false, true, true, false, false, true);
+                                        "", item.getToken(), false, true,
+                                        true, false, false,
+                                        true, false);
                                 AccountManager.getInstance().setColor(accountJid, ColorManager.getInstance().convertColorNameToIndex(item.getColor()));
                                 AccountManager.getInstance().setOrder(accountJid, item.getOrder());
                                 AccountManager.getInstance().setTimestamp(accountJid, item.getTimestamp());
diff --git a/xabber/src/main/java/com/xabber/android/ui/dialog/EnterPassDialog.java b/xabber/src/main/java/com/xabber/android/ui/dialog/EnterPassDialog.java
index 61619efe43..2b776fd7a8 100644
--- a/xabber/src/main/java/com/xabber/android/ui/dialog/EnterPassDialog.java
+++ b/xabber/src/main/java/com/xabber/android/ui/dialog/EnterPassDialog.java
@@ -92,7 +92,8 @@ public void onClick(DialogInterface dialog, int which) {
     private void createAccount(boolean enabled) {
         try {
             AccountJid accountJid = AccountManager.getInstance().addAccount(jid,
-                    edtPass.getText().toString(), token, false, true, true, false, false, enabled);
+                    edtPass.getText().toString(), token, false, true,
+                    true, false, false, enabled, false);
             AccountManager.getInstance().setColor(accountJid, ColorManager.getInstance().convertColorNameToIndex(color));
             AccountManager.getInstance().setOrder(accountJid, order);
             AccountManager.getInstance().setTimestamp(accountJid, timestamp);
diff --git a/xabber/src/main/java/com/xabber/android/ui/fragment/AccountAddFragment.java b/xabber/src/main/java/com/xabber/android/ui/fragment/AccountAddFragment.java
index ec813a5dcd..3322b697b4 100644
--- a/xabber/src/main/java/com/xabber/android/ui/fragment/AccountAddFragment.java
+++ b/xabber/src/main/java/com/xabber/android/ui/fragment/AccountAddFragment.java
@@ -18,10 +18,9 @@
 import com.xabber.android.data.NetworkException;
 import com.xabber.android.data.account.AccountManager;
 import com.xabber.android.data.entity.AccountJid;
-import com.xabber.android.data.xaccount.XabberAccount;
 import com.xabber.android.data.xaccount.XabberAccountManager;
-import com.xabber.android.ui.activity.AccountAddActivity;
 import com.xabber.android.ui.activity.AccountActivity;
+import com.xabber.android.ui.activity.AccountAddActivity;
 import com.xabber.android.ui.dialog.OrbotInstallerDialog;
 import com.xabber.android.ui.helper.OrbotHelper;
 
@@ -29,7 +28,8 @@ public class AccountAddFragment extends Fragment implements View.OnClickListener
 
     private CheckBox storePasswordView;
     private CheckBox chkSync;
-    private CheckBox useOrbotView;
+    private CheckBox chkRequireTLS;
+    private CheckBox chkUseTOR;
     private CheckBox createAccountCheckBox;
     private LinearLayout passwordConfirmView;
     private EditText userView;
@@ -51,7 +51,8 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle sa
             chkSync.setChecked(false);
         }
 
-        useOrbotView = (CheckBox) view.findViewById(R.id.use_orbot);
+        chkRequireTLS = view.findViewById(R.id.chkRequireTLS);
+        chkUseTOR = view.findViewById(R.id.chkUseTOR);
         createAccountCheckBox = (CheckBox) view.findViewById(R.id.register_account);
         createAccountCheckBox.setOnClickListener(this);
 
@@ -82,7 +83,7 @@ public void onClick(View v) {
     }
 
     public void addAccount() {
-        if (useOrbotView.isChecked() && !OrbotHelper.isOrbotInstalled()) {
+        if (chkUseTOR.isChecked() && !OrbotHelper.isOrbotInstalled()) {
             OrbotInstallerDialog.newInstance().show(getFragmentManager(), OrbotInstallerDialog.class.getName());
             return;
         }
@@ -102,8 +103,9 @@ public void addAccount() {
                     false,
                     storePasswordView.isChecked(),
                     chkSync.isChecked(),
-                    useOrbotView.isChecked(),
-                    createAccountCheckBox.isChecked(), true);
+                    chkUseTOR.isChecked(),
+                    createAccountCheckBox.isChecked(), true,
+                    chkRequireTLS.isChecked());
         } catch (NetworkException e) {
             Application.getInstance().onError(e);
             return;
diff --git a/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountLoginFragment.java b/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountLoginFragment.java
index 39cccd88c8..6d0a21f917 100644
--- a/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountLoginFragment.java
+++ b/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountLoginFragment.java
@@ -27,7 +27,8 @@ public class XAccountLoginFragment extends Fragment implements View.OnClickListe
 
     private CheckBox storePasswordView;
     private CheckBox chkSync;
-    private CheckBox useOrbotView;
+    private CheckBox chkRequireTLS;
+    private CheckBox chkUseTOR;
     private EditText edtUsername;
     private EditText edtPassword;
     private Button btnLogin;
@@ -61,7 +62,8 @@ public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container,
             chkSync.setChecked(false);
         }
 
-        useOrbotView = (CheckBox) view.findViewById(R.id.use_orbot);
+        chkRequireTLS = view.findViewById(R.id.chkRequireTLS);
+        chkUseTOR = view.findViewById(R.id.chkUseTOR);
 
         optionsView = view.findViewById(R.id.optionsView);
         socialView = view.findViewById(R.id.socialView);
@@ -108,7 +110,7 @@ public void onClick(View v) {
     }
 
     private void addAccount() {
-        if (useOrbotView.isChecked() && !OrbotHelper.isOrbotInstalled()) {
+        if (chkUseTOR.isChecked() && !OrbotHelper.isOrbotInstalled()) {
             OrbotInstallerDialog.newInstance().show(getFragmentManager(), OrbotInstallerDialog.class.getName());
             return;
         }
@@ -122,8 +124,9 @@ private void addAccount() {
                     false,
                     storePasswordView.isChecked(),
                     chkSync.isChecked(),
-                    useOrbotView.isChecked(),
-                    false, true);
+                    chkUseTOR.isChecked(),
+                    false, true,
+                    chkRequireTLS.isChecked());
         } catch (NetworkException e) {
             Application.getInstance().onError(e);
             return;
diff --git a/xabber/src/main/res/layout/fragment_account_add.xml b/xabber/src/main/res/layout/fragment_account_add.xml
index 7043c2174c..38abc562d8 100644
--- a/xabber/src/main/res/layout/fragment_account_add.xml
+++ b/xabber/src/main/res/layout/fragment_account_add.xml
@@ -75,11 +75,18 @@
             android:text="@string/sync_with_xabber_account" />
 
         <CheckBox
-            android:id="@+id/use_orbot"
+            android:id="@+id/chkRequireTLS"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
             android:checked="false"
-            android:text="@string/account_use_orbot" />
+            android:text="@string/account_enable_tls" />
+
+        <CheckBox
+            android:id="@+id/chkUseTOR"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:checked="false"
+            android:text="@string/account_use_tor" />
 
         <CheckBox
             android:id="@+id/register_account"
diff --git a/xabber/src/main/res/layout/fragment_xaccount_login.xml b/xabber/src/main/res/layout/fragment_xaccount_login.xml
index 9341955cf7..26bcf89d9c 100644
--- a/xabber/src/main/res/layout/fragment_xaccount_login.xml
+++ b/xabber/src/main/res/layout/fragment_xaccount_login.xml
@@ -85,11 +85,18 @@
                 android:text="@string/sync_with_xabber_account" />
 
             <CheckBox
-                android:id="@+id/use_orbot"
+                android:id="@+id/chkRequireTLS"
                 android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
                 android:checked="false"
-                android:text="@string/account_use_orbot" />
+                android:text="@string/account_enable_tls" />
+
+            <CheckBox
+                android:id="@+id/chkUseTOR"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:checked="false"
+                android:text="@string/account_use_tor" />
 
         </LinearLayout>
 
diff --git a/xabber/src/main/res/values/account_editor.xml b/xabber/src/main/res/values/account_editor.xml
index 7021ab5261..05fa7cd7f7 100644
--- a/xabber/src/main/res/values/account_editor.xml
+++ b/xabber/src/main/res/values/account_editor.xml
@@ -56,6 +56,8 @@
     <string name="account_tls_require">Require TLS</string>
     <string name="account_tls_require_summary">Require TLS encryption when connect to server</string>
     <string name="account_use_orbot">Chat through TOR anonymity network and force TLS cryptographic protocol</string>
+    <string name="account_enable_tls">Enable TLS cryptographic protocol</string>
+    <string name="account_use_tor">Use TOR anonymity network (requires Orbot proxy)</string>
     <string name="confirm_cancellation">Are you sure you want to discard all the changes?</string>
     <string name="INCORRECT_USER_NAME">Incorrect user name. Check help text below for details.</string>
     <string name="orbot_required_message">In order to process using TOR you must have Orbot installed and activated to proxy traffic through it. Would you like to install it from Google Play?</string>

From 0617db6b024fb331f94a42bc27dad5371486c92b Mon Sep 17 00:00:00 2001
From: Valery Miller <valera_miller94@mail.ru>
Date: Mon, 3 Sep 2018 16:33:17 +0500
Subject: [PATCH 042/251] Changes in login screen

---
 .../src/main/res/layout/fragment_xaccount_login.xml   |  5 ++---
 .../src/main/res/layout/fragment_xaccount_signup.xml  |  4 ++--
 xabber/src/main/res/layout/include_social.xml         | 11 +++++++----
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/xabber/src/main/res/layout/fragment_xaccount_login.xml b/xabber/src/main/res/layout/fragment_xaccount_login.xml
index 26bcf89d9c..306aebb10e 100644
--- a/xabber/src/main/res/layout/fragment_xaccount_login.xml
+++ b/xabber/src/main/res/layout/fragment_xaccount_login.xml
@@ -13,11 +13,10 @@
         >
 
         <ImageView
-            android:layout_width="120dp"
-            android:layout_height="120dp"
+            android:layout_width="100dp"
+            android:layout_height="100dp"
             android:src="@drawable/ic_logo_circle"
             android:layout_gravity="center_horizontal"
-            android:layout_marginBottom="32dp"
             />
 
         <TextView
diff --git a/xabber/src/main/res/layout/fragment_xaccount_signup.xml b/xabber/src/main/res/layout/fragment_xaccount_signup.xml
index 3e94e5911c..ace15c1251 100644
--- a/xabber/src/main/res/layout/fragment_xaccount_signup.xml
+++ b/xabber/src/main/res/layout/fragment_xaccount_signup.xml
@@ -13,8 +13,8 @@
         >
 
         <ImageView
-            android:layout_width="120dp"
-            android:layout_height="120dp"
+            android:layout_width="100dp"
+            android:layout_height="100dp"
             android:src="@drawable/ic_logo_circle"
             android:layout_gravity="center_horizontal"
             android:layout_marginBottom="32dp"
diff --git a/xabber/src/main/res/layout/include_social.xml b/xabber/src/main/res/layout/include_social.xml
index c65f73178d..853b824ee2 100644
--- a/xabber/src/main/res/layout/include_social.xml
+++ b/xabber/src/main/res/layout/include_social.xml
@@ -32,7 +32,7 @@
     <LinearLayout
         android:id="@+id/llSocialLogos"
         android:orientation="horizontal"
-        android:layout_width="wrap_content"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_gravity="center_horizontal"
         android:layout_marginBottom="16dp"
@@ -44,31 +44,34 @@
             android:layout_width="48dp"
             android:layout_height="48dp"
             android:src="@drawable/ic_google_plus"
+            android:layout_weight="1"
             />
 
         <ImageView
             android:id="@+id/ivFacebook"
             android:layout_width="48dp"
             android:layout_height="48dp"
-            android:layout_marginLeft="30dp"
+
             android:src="@drawable/ic_facebook"
+            android:layout_weight="1"
             />
 
         <ImageView
             android:id="@+id/ivTwitter"
             android:layout_width="48dp"
             android:layout_height="48dp"
-            android:layout_marginLeft="30dp"
+
             android:src="@drawable/ic_twitter"
+            android:layout_weight="1"
             />
 
         <ImageView
             android:id="@+id/ivGithub"
             android:layout_width="48dp"
             android:layout_height="48dp"
-            android:layout_marginLeft="30dp"
             android:src="@drawable/ic_email_circle"
             android:visibility="visible"
+            android:layout_weight="1"
             />
 
     </LinearLayout>

From 2f6b8344d7eb974f345049fec8df9fcac8ab8745 Mon Sep 17 00:00:00 2001
From: Valery Miller <valera_miller94@mail.ru>
Date: Mon, 3 Sep 2018 17:32:24 +0500
Subject: [PATCH 043/251] Changes in Xabber Account Info screen

---
 .../fragment/XabberAccountInfoFragment.java   |   6 +
 .../layout/fragment_xabber_account_info.xml   | 188 +++++++++---------
 2 files changed, 105 insertions(+), 89 deletions(-)

diff --git a/xabber/src/main/java/com/xabber/android/ui/fragment/XabberAccountInfoFragment.java b/xabber/src/main/java/com/xabber/android/ui/fragment/XabberAccountInfoFragment.java
index f69b7faf57..e415b77bae 100644
--- a/xabber/src/main/java/com/xabber/android/ui/fragment/XabberAccountInfoFragment.java
+++ b/xabber/src/main/java/com/xabber/android/ui/fragment/XabberAccountInfoFragment.java
@@ -321,12 +321,18 @@ private void setupSocial(List<SocialBindingDTO> socialBindings) {
             if ("google".equals(socialBinding.getProvider())) {
                 tvStatusGoogle.setText(socialBinding.getFirstName() + " " + socialBinding.getLastName());
                 tvActionGoogle.setText("DISCONNECT");
+                tvStatusGoogle.setTextColor(getActivity().getResources().getColor(R.color.black_text));
+                tvActionGoogle.setTextColor(getActivity().getResources().getColor(R.color.black_text));
             } else if ("facebook".equals(socialBinding.getProvider())) {
                 tvStatusFacebook.setText(socialBinding.getFirstName() + " " + socialBinding.getLastName());
                 tvActionFacebook.setText("DISCONNECT");
+                tvStatusFacebook.setTextColor(getActivity().getResources().getColor(R.color.black_text));
+                tvActionFacebook.setTextColor(getActivity().getResources().getColor(R.color.black_text));
             } else if ("twitter".equals(socialBinding.getProvider())) {
                 tvStatusTwitter.setText(socialBinding.getFirstName() + " " + socialBinding.getLastName());
                 tvActionTwitter.setText("DISCONNECT");
+                tvStatusTwitter.setTextColor(getActivity().getResources().getColor(R.color.black_text));
+                tvActionTwitter.setTextColor(getActivity().getResources().getColor(R.color.black_text));
             }
         }
     }
diff --git a/xabber/src/main/res/layout/fragment_xabber_account_info.xml b/xabber/src/main/res/layout/fragment_xabber_account_info.xml
index 7c72621a20..99316fb125 100644
--- a/xabber/src/main/res/layout/fragment_xabber_account_info.xml
+++ b/xabber/src/main/res/layout/fragment_xabber_account_info.xml
@@ -12,7 +12,8 @@
         android:layout_height="wrap_content"
         >
 
-        <RelativeLayout
+        <LinearLayout
+            android:orientation="vertical"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             >
@@ -117,7 +118,7 @@
             <RelativeLayout
                 android:id="@+id/rlSync"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
+                android:layout_height="52dp"
                 android:layout_below="@id/llAccount"
                 >
 
@@ -174,69 +175,24 @@
                     </LinearLayout>
 
                 </RelativeLayout>
-            </RelativeLayout>
-
-            <RelativeLayout
-                android:id="@+id/rlLogout"
-                android:layout_width="match_parent"
-                android:layout_height="48dp"
-                android:layout_below="@id/rlSync"
-                >
 
                 <View
                     android:layout_width="match_parent"
                     android:layout_height="1dp"
                     android:background="?attr/settings_separator_background_color"
+                    android:layout_alignParentBottom="true"
                     />
-
-                <RelativeLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="48dp"
-                    android:paddingLeft="24dp"
-                    android:paddingRight="16dp"
-                    android:paddingTop="8dp"
-                    android:paddingBottom="8dp"
-                    android:background="?android:attr/selectableItemBackground"
-                    >
-
-                    <ImageView
-                        android:id="@+id/ivLogout"
-                        android:layout_width="24dp"
-                        android:layout_height="24dp"
-                        android:src="@drawable/ic_exit_grey600_24dp"
-                        android:layout_centerVertical="true"
-                        android:tint="@color/grey_600"
-                        />
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_centerVertical="true"
-                        android:layout_toRightOf="@+id/ivLogout"
-                        android:layout_marginLeft="24dp"
-                        android:textColor="?android:attr/textColorPrimary"
-                        android:text="@string/button_quit"
-                        />
-
-                </RelativeLayout>
             </RelativeLayout>
 
-        </RelativeLayout>
-    </android.support.v7.widget.CardView>
-
-    <android.support.v7.widget.CardView
-        android:id="@+id/cardSocial"
-        android:layout_marginTop="12dp"
-        android:layout_below="@id/cardInfo"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        >
-
-        <LinearLayout
-            android:orientation="vertical"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            >
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="Social bindings:"
+                android:paddingLeft="24dp"
+                android:paddingBottom="8dp"
+                android:paddingTop="12dp"
+                android:textColor="@color/green_700"
+                />
 
             <LinearLayout
                 android:id="@+id/itemGoogle"
@@ -263,7 +219,7 @@
                     android:layout_height="wrap_content"
                     android:layout_gravity="center_vertical"
                     android:layout_marginLeft="24dp"
-                    android:textColor="?android:attr/textColorPrimary"
+                    android:textColor="@color/grey_500"
                     android:text="Not connected"
                     />
 
@@ -274,7 +230,7 @@
                     android:layout_marginLeft="24dp"
                     android:gravity="right"
                     android:layout_gravity="center_vertical"
-                    android:textColor="?android:attr/textColorPrimary"
+                    android:textColor="@color/grey_500"
                     android:text="CONNECT"
                     />
 
@@ -311,7 +267,7 @@
                     android:layout_height="wrap_content"
                     android:layout_gravity="center_vertical"
                     android:layout_marginLeft="24dp"
-                    android:textColor="?android:attr/textColorPrimary"
+                    android:textColor="@color/grey_500"
                     android:text="Not connected"
                     />
 
@@ -322,7 +278,7 @@
                     android:layout_marginLeft="24dp"
                     android:layout_gravity="center_vertical"
                     android:gravity="right"
-                    android:textColor="?android:attr/textColorPrimary"
+                    android:textColor="@color/grey_500"
                     android:text="CONNECT"
                     />
 
@@ -359,7 +315,7 @@
                     android:layout_height="wrap_content"
                     android:layout_gravity="center_vertical"
                     android:layout_marginLeft="24dp"
-                    android:textColor="?android:attr/textColorPrimary"
+                    android:textColor="@color/grey_500"
                     android:text="Not connected"
                     />
 
@@ -370,45 +326,99 @@
                     android:layout_gravity="center_vertical"
                     android:gravity="right"
                     android:layout_marginLeft="24dp"
-                    android:textColor="?android:attr/textColorPrimary"
+                    android:textColor="@color/grey_500"
                     android:text="CONNECT"
                     />
 
             </LinearLayout>
-        </LinearLayout>
-    </android.support.v7.widget.CardView>
 
-    <android.support.v7.widget.CardView
-        android:id="@+id/cardEmail"
-        android:layout_marginTop="12dp"
-        android:layout_below="@id/cardSocial"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        >
-
-        <LinearLayout
-            android:orientation="vertical"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent">
-
-            <android.support.v7.widget.RecyclerView
-                android:id="@+id/rvEmails"
+            <View
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:nestedScrollingEnabled="false"
-                tools:listitem="@layout/item_email"
+                android:layout_height="1dp"
+                android:background="?attr/settings_separator_background_color"
                 />
 
-            <Button
-                android:id="@+id/btnAddEmail"
+            <TextView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:text="bind email"
-                android:textColor="@color/teal_500"
-                style="@style/Widget.AppCompat.Button.Borderless"
+                android:text="Binded emails:"
+                android:paddingLeft="24dp"
+                android:paddingBottom="8dp"
+                android:paddingTop="12dp"
+                android:textColor="@color/green_700"
                 />
 
-        </LinearLayout>
+            <LinearLayout
+                android:orientation="vertical"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent">
+
+                <android.support.v7.widget.RecyclerView
+                    android:id="@+id/rvEmails"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:nestedScrollingEnabled="false"
+                    tools:listitem="@layout/item_email"
+                    />
+
+                <Button
+                    android:id="@+id/btnAddEmail"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:text="bind email"
+                    android:textColor="@color/teal_500"
+                    style="@style/Widget.AppCompat.Button.Borderless"
+                    />
+
+            </LinearLayout>
+
+            <RelativeLayout
+                android:id="@+id/rlLogout"
+                android:layout_width="match_parent"
+                android:layout_height="48dp"
+                android:layout_below="@id/rlSync"
+                >
+
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="1dp"
+                    android:background="?attr/settings_separator_background_color"
+                    />
+
+                <RelativeLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="48dp"
+                    android:paddingLeft="24dp"
+                    android:paddingRight="16dp"
+                    android:paddingTop="8dp"
+                    android:paddingBottom="8dp"
+                    android:background="?android:attr/selectableItemBackground"
+                    >
+
+                    <ImageView
+                        android:id="@+id/ivLogout"
+                        android:layout_width="24dp"
+                        android:layout_height="24dp"
+                        android:src="@drawable/ic_exit_grey600_24dp"
+                        android:layout_centerVertical="true"
+                        android:tint="@color/grey_600"
+                        />
 
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_centerVertical="true"
+                        android:layout_toRightOf="@+id/ivLogout"
+                        android:layout_marginLeft="24dp"
+                        android:textColor="?android:attr/textColorPrimary"
+                        android:text="@string/button_quit"
+                        />
+
+                </RelativeLayout>
+
+            </RelativeLayout>
+
+        </LinearLayout>
     </android.support.v7.widget.CardView>
+
 </RelativeLayout>
\ No newline at end of file

From 38b7068d0f8d80e6dfcf2ee9fecf645e0ad41d65 Mon Sep 17 00:00:00 2001
From: Valery Miller <valera_miller94@mail.ru>
Date: Mon, 3 Sep 2018 17:35:03 +0500
Subject: [PATCH 044/251] Changed icon for confirmed email

---
 xabber/src/main/res/drawable/ic_email_confirmed.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/xabber/src/main/res/drawable/ic_email_confirmed.xml b/xabber/src/main/res/drawable/ic_email_confirmed.xml
index de96fe52bd..e44a808cce 100644
--- a/xabber/src/main/res/drawable/ic_email_confirmed.xml
+++ b/xabber/src/main/res/drawable/ic_email_confirmed.xml
@@ -1,8 +1,8 @@
-<!-- drawable/email_secure.xml -->
+<!-- drawable/email_check.xml -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:height="24dp"
     android:width="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path android:fillColor="#757575" android:pathData="M20.5,0A2.5,2.5 0 0,1 23,2.5V3A1,1 0 0,1 24,4V8A1,1 0 0,1 23,9H18A1,1 0 0,1 17,8V4A1,1 0 0,1 18,3V2.5A2.5,2.5 0 0,1 20.5,0M12,11L4,6V8L12,13L16.18,10.39C16.69,10.77 17.32,11 18,11H22V18A2,2 0 0,1 20,20H4A2,2 0 0,1 2,18V6A2,2 0 0,1 4,4H15V8C15,8.36 15.06,8.7 15.18,9L12,11M20.5,1A1.5,1.5 0 0,0 19,2.5V3H22V2.5A1.5,1.5 0 0,0 20.5,1Z" />
+    <path android:fillColor="#757575" android:pathData="M21,13.34C20.37,13.12 19.7,13 19,13A6,6 0 0,0 13,19C13,19.34 13.03,19.67 13.08,20H3A2,2 0 0,1 1,18V6C1,4.89 1.89,4 3,4H19A2,2 0 0,1 21,6V13.34M23.5,17L18.5,22L15,18.5L16.5,17L18.5,19L22,15.5L23.5,17M3,6V8L11,13L19,8V6L11,11L3,6Z" />
 </vector>
\ No newline at end of file

From 02d184ce0629dba32c02d8ea049e3f67bd38c15d Mon Sep 17 00:00:00 2001
From: Valery Miller <valera_miller94@mail.ru>
Date: Mon, 3 Sep 2018 17:59:15 +0500
Subject: [PATCH 045/251] Changes in dimens of login and signup screens

---
 xabber/src/main/res/layout/fragment_xaccount_login.xml  | 4 ++--
 xabber/src/main/res/layout/fragment_xaccount_signup.xml | 4 ++--
 xabber/src/main/res/values-w760dp/dimens.xml            | 2 ++
 xabber/src/main/res/values/dimens.xml                   | 1 +
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/xabber/src/main/res/layout/fragment_xaccount_login.xml b/xabber/src/main/res/layout/fragment_xaccount_login.xml
index 306aebb10e..e52476c761 100644
--- a/xabber/src/main/res/layout/fragment_xaccount_login.xml
+++ b/xabber/src/main/res/layout/fragment_xaccount_login.xml
@@ -8,8 +8,8 @@
         android:layout_height="wrap_content"
         android:orientation="vertical"
         android:layout_centerInParent="true"
-        android:layout_marginLeft="32dp"
-        android:layout_marginRight="32dp"
+        android:layout_marginLeft="@dimen/login_horizontal_margin"
+        android:layout_marginRight="@dimen/login_horizontal_margin"
         >
 
         <ImageView
diff --git a/xabber/src/main/res/layout/fragment_xaccount_signup.xml b/xabber/src/main/res/layout/fragment_xaccount_signup.xml
index ace15c1251..fb8ce7bec3 100644
--- a/xabber/src/main/res/layout/fragment_xaccount_signup.xml
+++ b/xabber/src/main/res/layout/fragment_xaccount_signup.xml
@@ -8,8 +8,8 @@
         android:layout_height="wrap_content"
         android:orientation="vertical"
         android:layout_centerInParent="true"
-        android:layout_marginLeft="32dp"
-        android:layout_marginRight="32dp"
+        android:layout_marginLeft="@dimen/login_horizontal_margin"
+        android:layout_marginRight="@dimen/login_horizontal_margin"
         >
 
         <ImageView
diff --git a/xabber/src/main/res/values-w760dp/dimens.xml b/xabber/src/main/res/values-w760dp/dimens.xml
index 49e4bfec8d..48d32d18bd 100644
--- a/xabber/src/main/res/values-w760dp/dimens.xml
+++ b/xabber/src/main/res/values-w760dp/dimens.xml
@@ -2,4 +2,6 @@
 <resources>
     <dimen name="intro_horizontal_margin">180dp</dimen>
     <dimen name="intro_vertical_margin">130dp</dimen>
+
+    <dimen name="login_horizontal_margin">32dp</dimen>
 </resources>
\ No newline at end of file
diff --git a/xabber/src/main/res/values/dimens.xml b/xabber/src/main/res/values/dimens.xml
index 25e5a5ac5e..0c9189f17e 100644
--- a/xabber/src/main/res/values/dimens.xml
+++ b/xabber/src/main/res/values/dimens.xml
@@ -31,6 +31,7 @@
 
     <dimen name="intro_screen_bottom_space_height">48dp</dimen>
     <dimen name="intro_screen_right_space_wight">0dp</dimen>
+    <dimen name="login_horizontal_margin">8dp</dimen>
 
     <dimen name="vcard_main_text">16sp</dimen>
     <dimen name="vcard_secondary_text">14sp</dimen>

From da7acce21ebc1e22c43a98d679e4917d8312eba4 Mon Sep 17 00:00:00 2001
From: Valery Miller <valera_miller94@mail.ru>
Date: Mon, 3 Sep 2018 18:19:27 +0500
Subject: [PATCH 046/251] Fixed crash in XAccountSignUpFragment

---
 .../android/ui/fragment/XAccountSignUpFragment.java    | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountSignUpFragment.java b/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountSignUpFragment.java
index 1532fc8218..146bbcc41c 100644
--- a/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountSignUpFragment.java
+++ b/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountSignUpFragment.java
@@ -130,12 +130,12 @@ public void setSocialProviderCredentials(String socialProvider, String credentia
 
     private void setupSocial() {
         if (credentials != null && socialProvider != null) {
-            //llSocialLogos.setVisibility(View.GONE);
-            tvSocialProvider.setVisibility(View.VISIBLE);
-            tvSocialProvider.setText(socialProvider);
+            if (tvSocialProvider != null) {
+                tvSocialProvider.setVisibility(View.VISIBLE);
+                tvSocialProvider.setText(socialProvider);
+            }
         } else {
-            //llSocialLogos.setVisibility(View.VISIBLE);
-            tvSocialProvider.setVisibility(View.GONE);
+            if (tvSocialProvider != null) tvSocialProvider.setVisibility(View.GONE);
         }
     }
 

From 23819589aa84aca8a01d2b03bf4085be5470ba85 Mon Sep 17 00:00:00 2001
From: Valery Miller <valera_miller94@mail.ru>
Date: Mon, 3 Sep 2018 18:25:58 +0500
Subject: [PATCH 047/251] Up version to 504

---
 xabber/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/xabber/build.gradle b/xabber/build.gradle
index eaadd332a6..bf3066df4c 100644
--- a/xabber/build.gradle
+++ b/xabber/build.gradle
@@ -10,8 +10,8 @@ android {
     defaultConfig {
         minSdkVersion 15
         targetSdkVersion 27
-        versionCode 503
-        versionName '2.4.2(503)'
+        versionCode 504
+        versionName '2.4.2(504)'
     }
 
     lintOptions {

From 5c057dba6cc80bf9b8e3071e37453f85787b1778 Mon Sep 17 00:00:00 2001
From: Valery Miller <valera_miller94@mail.ru>
Date: Tue, 4 Sep 2018 10:53:49 +0500
Subject: [PATCH 048/251] Fixed NPE in XAccountSignUpFragment

---
 .../android/ui/fragment/XAccountSignUpFragment.java  | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountSignUpFragment.java b/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountSignUpFragment.java
index 146bbcc41c..7733832ab0 100644
--- a/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountSignUpFragment.java
+++ b/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountSignUpFragment.java
@@ -100,7 +100,7 @@ public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
     @Override
     public void onResume() {
         super.onResume();
-        listener.onGetHosts();
+        if (listener != null) listener.onGetHosts();
         setupSocial();
     }
 
@@ -111,13 +111,13 @@ public void onClick(View v) {
                 onSignUpClick();
                 break;
             case R.id.ivFacebook:
-                listener.onFacebookClick();
+                if (listener != null) listener.onFacebookClick();
                 break;
             case R.id.ivGoogle:
-                listener.onGoogleClick();
+                if (listener != null) listener.onGoogleClick();
                 break;
             case R.id.ivTwitter:
-                listener.onTwitterClick();
+                if (listener != null) listener.onTwitterClick();
                 break;
         }
     }
@@ -145,7 +145,7 @@ private void onSignUpClick() {
 
         if (verifyFields(username, pass)) {
             if (credentials != null && socialProvider != null)
-                listener.onSignupClick(username, spinnerDomain.getSelectedItem().toString(), pass,
+                if (listener != null) listener.onSignupClick(username, spinnerDomain.getSelectedItem().toString(), pass,
                         credentials, socialProvider);
             else getCaptchaToken(username, pass, spinnerDomain.getSelectedItem().toString());
         }
@@ -202,7 +202,7 @@ public void onSuccess(SafetyNetApi.RecaptchaTokenResponse response) {
                             // Validate the user response token using the
                             // reCAPTCHA siteverify API.
                             Log.d(CAPTCHA_TOKEN, "Success: " + userResponseToken);
-                            listener.onSignupClick(username, domain, pass, userResponseToken);
+                            if (listener != null) listener.onSignupClick(username, domain, pass, userResponseToken);
                         }
                     }
                 })

From 5fefc0fbebeffbf1f0d4ed12769f3bf3bccf51c6 Mon Sep 17 00:00:00 2001
From: Valery Miller <valera_miller94@mail.ru>
Date: Tue, 4 Sep 2018 11:01:10 +0500
Subject: [PATCH 049/251] Fixed saving current fragment in login

---
 .../com/xabber/android/ui/activity/XabberLoginActivity.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/xabber/src/main/java/com/xabber/android/ui/activity/XabberLoginActivity.java b/xabber/src/main/java/com/xabber/android/ui/activity/XabberLoginActivity.java
index b6a79f5420..cb7cbf8c13 100644
--- a/xabber/src/main/java/com/xabber/android/ui/activity/XabberLoginActivity.java
+++ b/xabber/src/main/java/com/xabber/android/ui/activity/XabberLoginActivity.java
@@ -109,7 +109,7 @@ public void showSignUpFragment(String credentials, String socialProvider) {
         fTrans = getFragmentManager().beginTransaction();
         fTrans.replace(R.id.container, fragmentSignUp, FRAGMENT_SIGNUP);
         fTrans.commit();
-        currentFragment = FRAGMENT_LOGIN;
+        currentFragment = FRAGMENT_SIGNUP;
 
         toolbar.setTitle(R.string.title_register_xabber_account);
         barPainter.setLiteGrey();

From 3627bf1258b0706886d9aee893ee8970de2950be Mon Sep 17 00:00:00 2001
From: Valery Miller <valera_miller94@mail.ru>
Date: Tue, 4 Sep 2018 12:38:10 +0500
Subject: [PATCH 050/251] Changes in progress bar for get hosts

---
 .../android/ui/activity/XabberLoginActivity.java     | 12 ++++++------
 .../android/ui/fragment/XAccountSignUpFragment.java  | 12 +++++++++++-
 .../src/main/res/layout/fragment_xaccount_signup.xml |  8 ++++++++
 3 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/xabber/src/main/java/com/xabber/android/ui/activity/XabberLoginActivity.java b/xabber/src/main/java/com/xabber/android/ui/activity/XabberLoginActivity.java
index cb7cbf8c13..a6f7750a34 100644
--- a/xabber/src/main/java/com/xabber/android/ui/activity/XabberLoginActivity.java
+++ b/xabber/src/main/java/com/xabber/android/ui/activity/XabberLoginActivity.java
@@ -206,7 +206,7 @@ private void getHosts() {
         if (hosts != null && !hosts.isEmpty()) {
             if (fragmentSignUp != null) ((XAccountSignUpFragment)fragmentSignUp).setupSpinner(hosts);
         } else {
-            showProgress("Request hosts..");
+            if (fragmentSignUp != null) ((XAccountSignUpFragment) fragmentSignUp).showHostsProgress(true);
             Subscription requestHosts = AuthManager.getHosts()
                     .subscribeOn(Schedulers.io())
                     .observeOn(AndroidSchedulers.mainThread())
@@ -226,19 +226,19 @@ public void call(Throwable throwable) {
     }
 
     private void handleSuccessGetHosts(List<AuthManager.Domain> domains) {
-        hideProgress();
-
         hosts.clear();
         for (AuthManager.Domain domain : domains) {
             hosts.add(domain.getDomain());
         }
 
-        if (fragmentSignUp != null)
-            ((XAccountSignUpFragment)fragmentSignUp).setupSpinner(hosts);
+        if (fragmentSignUp != null) {
+            ((XAccountSignUpFragment) fragmentSignUp).showHostsProgress(false);
+            ((XAccountSignUpFragment) fragmentSignUp).setupSpinner(hosts);
+        }
     }
 
     private void handleErrorGetHosts(Throwable throwable) {
-        hideProgress();
+        if (fragmentSignUp != null) ((XAccountSignUpFragment) fragmentSignUp).showHostsProgress(false);
         handleError(throwable, "Error while request hosts: ", LOG_TAG);
     }
 
diff --git a/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountSignUpFragment.java b/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountSignUpFragment.java
index 7733832ab0..8166f3a343 100644
--- a/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountSignUpFragment.java
+++ b/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountSignUpFragment.java
@@ -13,6 +13,7 @@
 import android.widget.EditText;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
+import android.widget.ProgressBar;
 import android.widget.Spinner;
 import android.widget.TextView;
 
@@ -36,6 +37,8 @@ public class XAccountSignUpFragment extends Fragment implements View.OnClickList
     private EditText edtPass;
     private Spinner spinnerDomain;
     private TextView tvSocialProvider;
+    private ProgressBar pbHosts;
+    private Button btnSignUp;
     //private LinearLayout llSocialLogos;
 
     private Listener listener;
@@ -92,8 +95,9 @@ public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
 //        ivFacebook.setOnClickListener(this);
 //        ivGoogle.setOnClickListener(this);
 //        ivTwitter.setOnClickListener(this);
+        pbHosts = view.findViewById(R.id.pbHosts);
 
-        Button btnSignUp = view.findViewById(R.id.btnSignUp);
+        btnSignUp = view.findViewById(R.id.btnSignUp);
         btnSignUp.setOnClickListener(this);
     }
 
@@ -128,6 +132,12 @@ public void setSocialProviderCredentials(String socialProvider, String credentia
         setupSocial();
     }
 
+    public void showHostsProgress(boolean visible) {
+        pbHosts.setVisibility(visible ? View.VISIBLE : View.GONE);
+        spinnerDomain.setVisibility(visible ? View.GONE : View.VISIBLE);
+        btnSignUp.setEnabled(!visible);
+    }
+
     private void setupSocial() {
         if (credentials != null && socialProvider != null) {
             if (tvSocialProvider != null) {
diff --git a/xabber/src/main/res/layout/fragment_xaccount_signup.xml b/xabber/src/main/res/layout/fragment_xaccount_signup.xml
index fb8ce7bec3..250ef3bb7d 100644
--- a/xabber/src/main/res/layout/fragment_xaccount_signup.xml
+++ b/xabber/src/main/res/layout/fragment_xaccount_signup.xml
@@ -86,6 +86,14 @@
                     android:layout_height="wrap_content"
                     />
 
+                <ProgressBar
+                    android:id="@+id/pbHosts"
+                    android:layout_width="140dp"
+                    android:layout_height="30dp"
+                    android:layout_marginTop="8dp"
+                    android:visibility="gone"
+                    />
+
             </LinearLayout>
 
         </LinearLayout>

From bbd3a51fe044b9a3e33303a3d8bcecd482265c09 Mon Sep 17 00:00:00 2001
From: Valery Miller <valera_miller94@mail.ru>
Date: Tue, 4 Sep 2018 15:13:45 +0500
Subject: [PATCH 051/251] Implementation of resend confirmation xmpp-code

---
 .../android/ui/activity/XabberAccountActivity.java     |  5 +++++
 .../ui/fragment/XAccountXMPPConfirmFragment.java       | 10 ++++++++--
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/xabber/src/main/java/com/xabber/android/ui/activity/XabberAccountActivity.java b/xabber/src/main/java/com/xabber/android/ui/activity/XabberAccountActivity.java
index 43c8869c05..5e51523b11 100644
--- a/xabber/src/main/java/com/xabber/android/ui/activity/XabberAccountActivity.java
+++ b/xabber/src/main/java/com/xabber/android/ui/activity/XabberAccountActivity.java
@@ -139,6 +139,11 @@ public void onConfirmXMPPClick(String jid, String code) {
             Toast.makeText(this, R.string.toast_no_internet, Toast.LENGTH_LONG).show();
     }
 
+    @Override
+    public void onResendClick(String jid) {
+        onAccountClick(jid);
+    }
+
     /** Social Auth */
 
     @Override
diff --git a/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountXMPPConfirmFragment.java b/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountXMPPConfirmFragment.java
index 348857e4b9..dbad3a2e64 100644
--- a/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountXMPPConfirmFragment.java
+++ b/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountXMPPConfirmFragment.java
@@ -30,6 +30,7 @@ public class XAccountXMPPConfirmFragment extends Fragment implements View.OnClic
 
     public interface Listener {
         void onConfirmXMPPClick(String jid, String code);
+        void onResendClick(String jid);
     }
 
     public static XAccountXMPPConfirmFragment newInstance(Listener listener) {
@@ -87,13 +88,18 @@ public void setJid(String jid) {
     }
 
     private void onConfirmClick() {
-        // TODO: 06.08.18 verify fields
         String code = edtCode.getText().toString();
+
+        if (code.isEmpty()) {
+            edtCode.setError(getString(R.string.empty_field));
+            return;
+        }
+
         listener.onConfirmXMPPClick(jid, code);
     }
 
     private void onResendClick() {
-        // TODO: 06.08.18 implement
+        listener.onResendClick(jid);
     }
 
     private void subscribeForAuthCode() {

From 6c5d750adf7914499ea81af4f9eba0c40df852d6 Mon Sep 17 00:00:00 2001
From: Valery Miller <valera_miller94@mail.ru>
Date: Tue, 4 Sep 2018 15:23:27 +0500
Subject: [PATCH 052/251] Added removing accounts for checkng of Xabber Account
 xmpp-auth

---
 .../java/com/xabber/android/data/xaccount/XMPPAuthManager.java | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/xabber/src/main/java/com/xabber/android/data/xaccount/XMPPAuthManager.java b/xabber/src/main/java/com/xabber/android/data/xaccount/XMPPAuthManager.java
index 4c451b0b49..3a5bd50f9a 100644
--- a/xabber/src/main/java/com/xabber/android/data/xaccount/XMPPAuthManager.java
+++ b/xabber/src/main/java/com/xabber/android/data/xaccount/XMPPAuthManager.java
@@ -96,8 +96,7 @@ public void run() {
                         }
                         if (PrivateStorageManager.getInstance().haveXabberAccountBinding(accountJid))
                             requestXMPPAuthCode(accountJid);
-                        // TODO: 07.08.18 включить удаление аккаунта из очереди после попытки авториазации?
-                        //accountsForCheck.remove(accountJid);
+                        accountsForCheck.remove(accountJid);
                     }
                 }
             }

From 07b11b41860f55eb429278e3addffe6e693a98f7 Mon Sep 17 00:00:00 2001
From: Valery Miller <valera_miller94@mail.ru>
Date: Tue, 4 Sep 2018 15:35:17 +0500
Subject: [PATCH 053/251] Changes in ime options

---
 xabber/src/main/res/layout/fragment_xaccount_login.xml  | 2 +-
 xabber/src/main/res/layout/fragment_xaccount_signup.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/xabber/src/main/res/layout/fragment_xaccount_login.xml b/xabber/src/main/res/layout/fragment_xaccount_login.xml
index e52476c761..4bdc824aa3 100644
--- a/xabber/src/main/res/layout/fragment_xaccount_login.xml
+++ b/xabber/src/main/res/layout/fragment_xaccount_login.xml
@@ -53,7 +53,7 @@
             android:id="@+id/edtPass"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:imeOptions="actionNext"
+            android:imeOptions="actionDone"
             android:singleLine="true"
             android:textSize="16sp"
             android:theme="@style/Theme"
diff --git a/xabber/src/main/res/layout/fragment_xaccount_signup.xml b/xabber/src/main/res/layout/fragment_xaccount_signup.xml
index 250ef3bb7d..ece46db322 100644
--- a/xabber/src/main/res/layout/fragment_xaccount_signup.xml
+++ b/xabber/src/main/res/layout/fragment_xaccount_signup.xml
@@ -111,7 +111,7 @@
             android:id="@+id/edtPass"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:imeOptions="actionNext"
+            android:imeOptions="actionDone"
             android:singleLine="true"
             android:textSize="16sp"
             android:theme="@style/Theme"

From 3da4618706fca5dce33808ecb1ed904ae6dbd889 Mon Sep 17 00:00:00 2001
From: Valery Miller <valera_miller94@mail.ru>
Date: Tue, 4 Sep 2018 15:47:26 +0500
Subject: [PATCH 054/251] Fixed on signupClick

---
 .../android/ui/fragment/XAccountSignUpFragment.java      | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountSignUpFragment.java b/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountSignUpFragment.java
index 8166f3a343..399135a2e2 100644
--- a/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountSignUpFragment.java
+++ b/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountSignUpFragment.java
@@ -154,10 +154,11 @@ private void onSignUpClick() {
         String pass = edtPass.getText().toString().trim();
 
         if (verifyFields(username, pass)) {
-            if (credentials != null && socialProvider != null)
-                if (listener != null) listener.onSignupClick(username, spinnerDomain.getSelectedItem().toString(), pass,
-                        credentials, socialProvider);
-            else getCaptchaToken(username, pass, spinnerDomain.getSelectedItem().toString());
+            if (credentials != null && socialProvider != null) {
+                if (listener != null)
+                    listener.onSignupClick(username, spinnerDomain.getSelectedItem().toString(), pass,
+                            credentials, socialProvider);
+            } else getCaptchaToken(username, pass, spinnerDomain.getSelectedItem().toString());
         }
     }
 

From 81e22a22e5ef0aeb5a37ed12b4f77ceabf3e0acc Mon Sep 17 00:00:00 2001
From: Valery Miller <valera_miller94@mail.ru>
Date: Tue, 4 Sep 2018 17:15:01 +0500
Subject: [PATCH 055/251] After new account register do synchronization and go
 to contact list

---
 .../ui/activity/BaseLoginActivity.java        | 117 +++++++++++++++++-
 .../ui/activity/XabberAccountActivity.java    | 113 +----------------
 .../ui/activity/XabberLoginActivity.java      |   4 +-
 3 files changed, 121 insertions(+), 113 deletions(-)

diff --git a/xabber/src/main/java/com/xabber/android/ui/activity/BaseLoginActivity.java b/xabber/src/main/java/com/xabber/android/ui/activity/BaseLoginActivity.java
index 9ff2bff4c0..4d87861e9a 100644
--- a/xabber/src/main/java/com/xabber/android/ui/activity/BaseLoginActivity.java
+++ b/xabber/src/main/java/com/xabber/android/ui/activity/BaseLoginActivity.java
@@ -33,12 +33,22 @@
 import com.twitter.sdk.android.core.identity.TwitterAuthClient;
 import com.xabber.android.R;
 import com.xabber.android.data.Application;
+import com.xabber.android.data.SettingsManager;
+import com.xabber.android.data.account.AccountManager;
 import com.xabber.android.data.xaccount.AuthManager;
+import com.xabber.android.data.xaccount.XMPPAccountSettings;
+import com.xabber.android.data.xaccount.XabberAccount;
+import com.xabber.android.data.xaccount.XabberAccountManager;
 import com.xabber.android.utils.RetrofitErrorConverter;
 
 import java.io.IOException;
 import java.util.Collections;
+import java.util.List;
 
+import rx.Subscription;
+import rx.android.schedulers.AndroidSchedulers;
+import rx.functions.Action1;
+import rx.schedulers.Schedulers;
 import rx.subscriptions.CompositeSubscription;
 
 /**
@@ -47,7 +57,7 @@
 
 public abstract class BaseLoginActivity extends ManagedActivity implements GoogleApiClient.OnConnectionFailedListener {
 
-    private final static String TAG = BaseLoginActivity.class.getSimpleName();
+    private final static String LOG_TAG = BaseLoginActivity.class.getSimpleName();
 
     // facebook auth
     private CallbackManager callbackManager;
@@ -230,4 +240,109 @@ protected void handleError(Throwable throwable, String errorContext, String logT
                     Toast.LENGTH_LONG).show();
         }
     }
+
+    /** SYNCHRONIZATION */
+
+    protected void synchronize(boolean needGoToMainActivity) {
+        XabberAccount account = XabberAccountManager.getInstance().getAccount();
+        if (account != null && account.getToken() != null) {
+            showProgress(getResources().getString(R.string.progress_title_sync));
+            getAccountWithUpdate(account.getToken(), needGoToMainActivity);
+        } else {
+            Toast.makeText(BaseLoginActivity.this, R.string.sync_fail, Toast.LENGTH_SHORT).show();
+        }
+    }
+
+    protected void getAccountWithUpdate(String token, final boolean needGoToMainActivity) {
+        Subscription loadAccountsSubscription = AuthManager.getAccount(token)
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(new Action1<XabberAccount>() {
+                    @Override
+                    public void call(XabberAccount s) {
+                        Log.d(LOG_TAG, "Xabber account loading from net: successfully");
+                        updateAccountInfo(s);
+
+                        // if exist local accounts
+                        if (AccountManager.getInstance().getAllAccountItems().size() > 0)
+                            updateSettings(needGoToMainActivity);
+                        else getSettings();
+
+                    }
+                }, new Action1<Throwable>() {
+                    @Override
+                    public void call(Throwable throwable) {
+                        Log.d(LOG_TAG, "Xabber account loading from net: error: " + throwable.toString());
+                        String message = RetrofitErrorConverter.throwableToHttpError(throwable);
+                        if (message != null && message.equals("Invalid token")) {
+                            XabberAccountManager.getInstance().onInvalidToken();
+                            //showLoginFragment();
+                        }
+
+                        hideProgress();
+                        Toast.makeText(BaseLoginActivity.this, R.string.sync_fail, Toast.LENGTH_SHORT).show();
+                    }
+                });
+        compositeSubscription.add(loadAccountsSubscription);
+    }
+
+    protected void updateSettings(final boolean needGoToMainActivity) {
+        Subscription getSettingsSubscription = AuthManager.patchClientSettings(XabberAccountManager.getInstance().createSettingsList())
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(new Action1<List<XMPPAccountSettings>>() {
+                    @Override
+                    public void call(List<XMPPAccountSettings> s) {
+                        Log.d(LOG_TAG, "XMPP accounts loading from net: successfully");
+                        hideProgress();
+                        updateLastSyncTime();
+                        Toast.makeText(BaseLoginActivity.this, R.string.sync_success, Toast.LENGTH_SHORT).show();
+                        if (needGoToMainActivity) goToMainActivity();
+                    }
+                }, new Action1<Throwable>() {
+                    @Override
+                    public void call(Throwable throwable) {
+                        Log.d(LOG_TAG, "XMPP accounts loading from net: error: " + throwable.toString());
+                        hideProgress();
+                        Toast.makeText(BaseLoginActivity.this, R.string.sync_fail, Toast.LENGTH_SHORT).show();
+                    }
+                });
+        compositeSubscription.add(getSettingsSubscription);
+    }
+
+    protected void getSettings() {
+        Subscription getSettingsSubscription = AuthManager.getClientSettings()
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(new Action1<List<XMPPAccountSettings>>() {
+                    @Override
+                    public void call(List<XMPPAccountSettings> settings) {
+                        Log.d(LOG_TAG, "XMPP accounts loading from net: successfully");
+                        XabberAccountManager.getInstance().setXmppAccountsForCreate(settings);
+                        hideProgress();
+                        // update last synchronization time
+                        SettingsManager.setLastSyncDate(XabberAccountManager.getCurrentTimeString());
+                        Toast.makeText(BaseLoginActivity.this, R.string.sync_success, Toast.LENGTH_SHORT).show();
+                        goToMainActivity();
+                    }
+                }, new Action1<Throwable>() {
+                    @Override
+                    public void call(Throwable throwable) {
+                        Log.d(LOG_TAG, "XMPP accounts loading from net: error: " + throwable.toString());
+                        hideProgress();
+                    }
+                });
+        compositeSubscription.add(getSettingsSubscription);
+    }
+
+    protected void updateAccountInfo(XabberAccount account) {}
+
+    protected void updateLastSyncTime() {}
+
+    private void goToMainActivity() {
+        Intent intent = ContactListActivity.createIntent(BaseLoginActivity.this);
+        intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK);
+        finish();
+        startActivity(intent);
+    }
 }
diff --git a/xabber/src/main/java/com/xabber/android/ui/activity/XabberAccountActivity.java b/xabber/src/main/java/com/xabber/android/ui/activity/XabberAccountActivity.java
index 5e51523b11..c5e3f51ae9 100644
--- a/xabber/src/main/java/com/xabber/android/ui/activity/XabberAccountActivity.java
+++ b/xabber/src/main/java/com/xabber/android/ui/activity/XabberAccountActivity.java
@@ -13,11 +13,8 @@
 import android.widget.Toast;
 
 import com.xabber.android.R;
-import com.xabber.android.data.SettingsManager;
-import com.xabber.android.data.account.AccountManager;
 import com.xabber.android.data.connection.NetworkManager;
 import com.xabber.android.data.xaccount.AuthManager;
-import com.xabber.android.data.xaccount.XMPPAccountSettings;
 import com.xabber.android.data.xaccount.XMPPAuthManager;
 import com.xabber.android.data.xaccount.XabberAccount;
 import com.xabber.android.data.xaccount.XabberAccountManager;
@@ -27,10 +24,7 @@
 import com.xabber.android.ui.fragment.XabberAccountInfoFragment;
 import com.xabber.android.utils.RetrofitErrorConverter;
 
-import java.util.List;
-
 import okhttp3.ResponseBody;
-import rx.Single;
 import rx.Subscription;
 import rx.android.schedulers.AndroidSchedulers;
 import rx.functions.Action1;
@@ -238,7 +232,8 @@ private void showXMPPConfirmFragment(String jid) {
         barPainter.setBlue(this);
     }
 
-    private void updateAccountInfo(XabberAccount account) {
+    @Override
+    protected void updateAccountInfo(XabberAccount account) {
         if (account != null) {
             XabberAccountInfoFragment fragment = (XabberAccountInfoFragment) getFragmentManager().findFragmentByTag(FRAGMENT_INFO);
             if (fragment != null && fragment.isVisible())
@@ -246,7 +241,8 @@ private void updateAccountInfo(XabberAccount account) {
         }
     }
 
-    private void updateLastSyncTime() {
+    @Override
+    protected void updateLastSyncTime() {
         XabberAccountInfoFragment fragment = (XabberAccountInfoFragment) getFragmentManager().findFragmentByTag(FRAGMENT_INFO);
         if (fragment != null && fragment.isVisible())
             ((XabberAccountInfoFragment) fragmentInfo).updateLastSyncTime();
@@ -301,100 +297,6 @@ private void handleErrorLogout(Throwable throwable) {
         hideProgress();
     }
 
-    /** SYNCHRONIZATION */
-
-    private void synchronize(boolean needGoToMainActivity) {
-        XabberAccount account = XabberAccountManager.getInstance().getAccount();
-        if (account != null && account.getToken() != null) {
-            showProgress(getResources().getString(R.string.progress_title_sync));
-            getAccountWithUpdate(account.getToken(), needGoToMainActivity);
-        } else {
-            Toast.makeText(XabberAccountActivity.this, R.string.sync_fail, Toast.LENGTH_SHORT).show();
-        }
-    }
-
-    private void getAccountWithUpdate(String token, final boolean needGoToMainActivity) {
-        Subscription loadAccountsSubscription = AuthManager.getAccount(token)
-                .subscribeOn(Schedulers.io())
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(new Action1<XabberAccount>() {
-                    @Override
-                    public void call(XabberAccount s) {
-                        Log.d(LOG_TAG, "Xabber account loading from net: successfully");
-                        updateAccountInfo(s);
-
-                        // if exist local accounts
-                        if (AccountManager.getInstance().getAllAccountItems().size() > 0)
-                            updateSettings(needGoToMainActivity);
-                        else getSettings();
-
-                    }
-                }, new Action1<Throwable>() {
-                    @Override
-                    public void call(Throwable throwable) {
-                        Log.d(LOG_TAG, "Xabber account loading from net: error: " + throwable.toString());
-                        String message = RetrofitErrorConverter.throwableToHttpError(throwable);
-                        if (message != null && message.equals("Invalid token")) {
-                            XabberAccountManager.getInstance().onInvalidToken();
-                            //showLoginFragment();
-                        }
-
-                        hideProgress();
-                        Toast.makeText(XabberAccountActivity.this, R.string.sync_fail, Toast.LENGTH_SHORT).show();
-                    }
-                });
-        compositeSubscription.add(loadAccountsSubscription);
-    }
-
-    private void updateSettings(final boolean needGoToMainActivity) {
-        Subscription getSettingsSubscription = AuthManager.patchClientSettings(XabberAccountManager.getInstance().createSettingsList())
-                .subscribeOn(Schedulers.io())
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(new Action1<List<XMPPAccountSettings>>() {
-                    @Override
-                    public void call(List<XMPPAccountSettings> s) {
-                        Log.d(LOG_TAG, "XMPP accounts loading from net: successfully");
-                        hideProgress();
-                        updateLastSyncTime();
-                        Toast.makeText(XabberAccountActivity.this, R.string.sync_success, Toast.LENGTH_SHORT).show();
-                        if (needGoToMainActivity) goToMainActivity();
-                    }
-                }, new Action1<Throwable>() {
-                    @Override
-                    public void call(Throwable throwable) {
-                        Log.d(LOG_TAG, "XMPP accounts loading from net: error: " + throwable.toString());
-                        hideProgress();
-                        Toast.makeText(XabberAccountActivity.this, R.string.sync_fail, Toast.LENGTH_SHORT).show();
-                    }
-                });
-        compositeSubscription.add(getSettingsSubscription);
-    }
-
-    private void getSettings() {
-        Subscription getSettingsSubscription = AuthManager.getClientSettings()
-                .subscribeOn(Schedulers.io())
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(new Action1<List<XMPPAccountSettings>>() {
-                    @Override
-                    public void call(List<XMPPAccountSettings> settings) {
-                        Log.d(LOG_TAG, "XMPP accounts loading from net: successfully");
-                        XabberAccountManager.getInstance().setXmppAccountsForCreate(settings);
-                        hideProgress();
-                        // update last synchronization time
-                        SettingsManager.setLastSyncDate(XabberAccountManager.getCurrentTimeString());
-                        Toast.makeText(XabberAccountActivity.this, R.string.sync_success, Toast.LENGTH_SHORT).show();
-                        goToMainActivity();
-                    }
-                }, new Action1<Throwable>() {
-                    @Override
-                    public void call(Throwable throwable) {
-                        Log.d(LOG_TAG, "XMPP accounts loading from net: error: " + throwable.toString());
-                        hideProgress();
-                    }
-                });
-        compositeSubscription.add(getSettingsSubscription);
-    }
-
     /** REQUEST XMPP CODE */
 
     private void requestXMPPCode(final String jid) {
@@ -543,11 +445,4 @@ public void call(Throwable throwable) {
                 });
         compositeSubscription.add(loginSocialSubscription);
     }
-
-    private void goToMainActivity() {
-        Intent intent = ContactListActivity.createIntent(XabberAccountActivity.this);
-        intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK);
-        finish();
-        startActivity(intent);
-    }
 }
diff --git a/xabber/src/main/java/com/xabber/android/ui/activity/XabberLoginActivity.java b/xabber/src/main/java/com/xabber/android/ui/activity/XabberLoginActivity.java
index a6f7750a34..1e768993ec 100644
--- a/xabber/src/main/java/com/xabber/android/ui/activity/XabberLoginActivity.java
+++ b/xabber/src/main/java/com/xabber/android/ui/activity/XabberLoginActivity.java
@@ -271,9 +271,7 @@ public void call(Throwable throwable) {
     }
 
     private void handleSuccessSignUp() {
-        Intent intent = XabberAccountActivity.createIntent(this, true);
-        finish();
-        startActivity(intent);
+        synchronize(true);
     }
 
     private void handleErrorSignUp(Throwable throwable) {

From 3aa87c3206664d73a800b513e2d7a84deca47c4b Mon Sep 17 00:00:00 2001
From: Valery Miller <valera_miller94@mail.ru>
Date: Tue, 4 Sep 2018 18:04:29 +0500
Subject: [PATCH 056/251] Refactoring

---
 .../android/data/xaccount/XMPPAuthManager.java       |  1 -
 .../android/ui/activity/BaseLoginActivity.java       |  8 ++++----
 .../android/ui/activity/XabberAccountActivity.java   | 12 ++++++------
 xabber/src/main/res/values/xabber_account.xml        | 12 ++++++++++++
 4 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/xabber/src/main/java/com/xabber/android/data/xaccount/XMPPAuthManager.java b/xabber/src/main/java/com/xabber/android/data/xaccount/XMPPAuthManager.java
index 3a5bd50f9a..be96ba04b7 100644
--- a/xabber/src/main/java/com/xabber/android/data/xaccount/XMPPAuthManager.java
+++ b/xabber/src/main/java/com/xabber/android/data/xaccount/XMPPAuthManager.java
@@ -27,7 +27,6 @@
 import java.util.List;
 import java.util.Map;
 
-import io.realm.internal.Collection;
 import rx.android.schedulers.AndroidSchedulers;
 import rx.functions.Action1;
 import rx.schedulers.Schedulers;
diff --git a/xabber/src/main/java/com/xabber/android/ui/activity/BaseLoginActivity.java b/xabber/src/main/java/com/xabber/android/ui/activity/BaseLoginActivity.java
index 4d87861e9a..fa2059a5cb 100644
--- a/xabber/src/main/java/com/xabber/android/ui/activity/BaseLoginActivity.java
+++ b/xabber/src/main/java/com/xabber/android/ui/activity/BaseLoginActivity.java
@@ -165,7 +165,7 @@ public void run() {
                     }
                 });
             }
-        } else Toast.makeText(this, "google error", Toast.LENGTH_LONG).show();
+        } else Toast.makeText(this, R.string.auth_google_error, Toast.LENGTH_LONG).show();
     }
 
     private void initFacebookAuth() {
@@ -182,12 +182,12 @@ public void onSuccess(LoginResult loginResult) {
 
             @Override
             public void onCancel() {
-                Toast.makeText(BaseLoginActivity.this, "fcb cancel", Toast.LENGTH_SHORT).show();
+                Toast.makeText(BaseLoginActivity.this, R.string.auth_facebook_cancel, Toast.LENGTH_SHORT).show();
             }
 
             @Override
             public void onError(FacebookException error) {
-                Toast.makeText(BaseLoginActivity.this, "fcb error", Toast.LENGTH_SHORT).show();
+                Toast.makeText(BaseLoginActivity.this, R.string.auth_facebook_error, Toast.LENGTH_SHORT).show();
             }
         });
     }
@@ -218,7 +218,7 @@ public void success(Result<TwitterSession> result) {
 
             @Override
             public void failure(TwitterException exception) {
-                Toast.makeText(BaseLoginActivity.this, "twitter error", Toast.LENGTH_SHORT).show();
+                Toast.makeText(BaseLoginActivity.this, R.string.auth_twitter_error, Toast.LENGTH_SHORT).show();
             }
         };
     }
diff --git a/xabber/src/main/java/com/xabber/android/ui/activity/XabberAccountActivity.java b/xabber/src/main/java/com/xabber/android/ui/activity/XabberAccountActivity.java
index c5e3f51ae9..0bab09a097 100644
--- a/xabber/src/main/java/com/xabber/android/ui/activity/XabberAccountActivity.java
+++ b/xabber/src/main/java/com/xabber/android/ui/activity/XabberAccountActivity.java
@@ -292,7 +292,7 @@ private void handleErrorLogout(Throwable throwable) {
             }
         } else {
             Log.d(LOG_TAG, "Error while logout: " + throwable.toString());
-            Toast.makeText(this, "Error while logout: " + throwable.toString(), Toast.LENGTH_LONG).show();
+            Toast.makeText(this, R.string.logout_error, Toast.LENGTH_LONG).show();
         }
         hideProgress();
     }
@@ -300,7 +300,7 @@ private void handleErrorLogout(Throwable throwable) {
     /** REQUEST XMPP CODE */
 
     private void requestXMPPCode(final String jid) {
-        showProgress("Request XMPP auth-code..");
+        showProgress(getResources().getString(R.string.progress_title_request_xmpp_auth));
         Subscription requestXMPPCodeSubscription = AuthManager.requestXMPPCode(jid)
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
@@ -332,7 +332,7 @@ private void handleErrorRequestXMPPCode(Throwable throwable) {
     /** CONFIRM XMPP */
 
     private void confirmXMPP(String code, String jid) {
-        showProgress("Confirm XMPP-account with code..");
+        showProgress(getResources().getString(R.string.progress_title_confirm_xmpp));
         Subscription confirmXMPPSubscription = AuthManager.confirmXMPP(jid, code)
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
@@ -426,7 +426,7 @@ private void handleErrorConfirm(Throwable throwable) {
 
     @Override
     protected void onSocialAuthSuccess(String provider, String credentials) {
-        showProgress("Bind social");
+        showProgress(getResources().getString(R.string.progress_title_bind_social));
         Subscription loginSocialSubscription = AuthManager.bindSocial(provider, credentials)
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
@@ -434,13 +434,13 @@ protected void onSocialAuthSuccess(String provider, String credentials) {
                     @Override
                     public void call(ResponseBody s) {
                         Toast.makeText(XabberAccountActivity.this,
-                                "Social bind successfull", Toast.LENGTH_SHORT).show();
+                                R.string.social_bind_success, Toast.LENGTH_SHORT).show();
                     }
                 }, new Action1<Throwable>() {
                     @Override
                     public void call(Throwable throwable) {
                         Toast.makeText(XabberAccountActivity.this,
-                                "Social bind failure", Toast.LENGTH_SHORT).show();
+                                R.string.social_bind_fail, Toast.LENGTH_SHORT).show();
                     }
                 });
         compositeSubscription.add(loginSocialSubscription);
diff --git a/xabber/src/main/res/values/xabber_account.xml b/xabber/src/main/res/values/xabber_account.xml
index ef871edab4..e0072ff31d 100644
--- a/xabber/src/main/res/values/xabber_account.xml
+++ b/xabber/src/main/res/values/xabber_account.xml
@@ -25,6 +25,9 @@
     <string name="confirm_phone_success">Phone number successfully confirmed</string>
     <string name="set_phone_success">Confirmation code sent</string>
 
+    <string name="social_bind_success">Social network bind successfully</string>
+    <string name="social_bind_fail">Social network bind failed</string>
+
     <string name="toast_email_already_confirm">Email already confirmed</string>
     <string name="toast_not_authorized">You are not authorized</string>
     <string name="toast_no_internet">No internet connection</string>
@@ -40,6 +43,9 @@
     <string name="progress_title_set_phone">Setting phone number</string>
     <string name="progress_title_confirm_phone">Confirming phone number</string>
     <string name="progress_title_delete_settings">Delete settings</string>
+    <string name="progress_title_request_xmpp_auth">Request XMPP auth-code</string>
+    <string name="progress_title_confirm_xmpp">Confirm XMPP-account with code</string>
+    <string name="progress_title_bind_social">Bind social network</string>
 
     <string name="label_username">Pick your username</string>
     <string name="hint_username">username</string>
@@ -116,6 +122,7 @@
     <string name="delete_settings">Delete synchronised settings for this XMPP account from Xabber Account?</string>
     <string name="logout_summary">You will quit from Xabber Account. You will not be able to use enhanced Xabber services, but basic XMPP will work as usual.</string>
     <string name="delete_settings_summary">Synchronized settings for this XMPP account will be deleted from Xabber Account</string>
+    <string name="logout_error">Logout failed</string>
 
     <string name="sign_up_email_social">Sign up with Social account or Email</string>
     <string name="signed_up_email">Signed up with Email</string>
@@ -124,6 +131,11 @@
     <string name="signed_up_github">Signed up with GitHub</string>
     <string name="signed_up_twitter">Signed up with Twitter</string>
 
+    <string name="auth_google_error">Authorization via Google failed</string>
+    <string name="auth_facebook_error">Authorization via Facebook failed</string>
+    <string name="auth_twitter_error">Authorization via Twitter failed</string>
+    <string name="auth_facebook_cancel">Authorization via Facebook canceled</string>
+
     <string name="reorder_summary">To synchronize accounts order between devices you need to enable "Synchronize all" option in Xabber Account settings</string>
 
     <string name="cancel_registration_progress">Cancel registration</string>

From a4dafb0d3f74ca13536bc6746643fd6b08d4659f Mon Sep 17 00:00:00 2001
From: Valery Miller <valera_miller94@mail.ru>
Date: Tue, 4 Sep 2018 18:06:29 +0500
Subject: [PATCH 057/251] Up version to 505

---
 xabber/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/xabber/build.gradle b/xabber/build.gradle
index bf3066df4c..c0baa8e5fd 100644
--- a/xabber/build.gradle
+++ b/xabber/build.gradle
@@ -10,8 +10,8 @@ android {
     defaultConfig {
         minSdkVersion 15
         targetSdkVersion 27
-        versionCode 504
-        versionName '2.4.2(504)'
+        versionCode 505
+        versionName '2.4.2(505)'
     }
 
     lintOptions {

From 5c8ad43e0757f0c15e0534f904786a8d99ccfa7f Mon Sep 17 00:00:00 2001
From: Valery Miller <valera_miller94@mail.ru>
Date: Wed, 5 Sep 2018 12:16:27 +0500
Subject: [PATCH 058/251] Fixed bind social and unbind social methods

---
 .../android/data/xaccount/AuthManager.java    |  4 +-
 .../android/data/xaccount/IXabberApi.java     |  4 +-
 .../ui/activity/XabberAccountActivity.java    | 40 ++++++++++++++-----
 .../fragment/XabberAccountInfoFragment.java   | 17 +++++---
 .../layout/fragment_xabber_account_info.xml   |  6 +--
 xabber/src/main/res/values/xabber_account.xml |  6 +++
 6 files changed, 54 insertions(+), 23 deletions(-)

diff --git a/xabber/src/main/java/com/xabber/android/data/xaccount/AuthManager.java b/xabber/src/main/java/com/xabber/android/data/xaccount/AuthManager.java
index 262279f94f..97a8b5021e 100644
--- a/xabber/src/main/java/com/xabber/android/data/xaccount/AuthManager.java
+++ b/xabber/src/main/java/com/xabber/android/data/xaccount/AuthManager.java
@@ -311,9 +311,7 @@ public Single<? extends XabberAccount> call(XabberAccountDTO xabberAccountDTO) {
                 });
     }
 
-    public static Single<ResponseBody> bindSocial(String provider, String socialToken) {
-        Gson gson = new Gson();
-        String credentials = gson.toJson(new AccessToken(socialToken));
+    public static Single<ResponseBody> bindSocial(String provider, String credentials) {
         return HttpApiManager.getXabberApi().bindSocial(getXabberTokenHeader(),
                 new SocialAuthRequest(provider, credentials, getSource()));
     }
diff --git a/xabber/src/main/java/com/xabber/android/data/xaccount/IXabberApi.java b/xabber/src/main/java/com/xabber/android/data/xaccount/IXabberApi.java
index df2687da5b..d8f4509225 100644
--- a/xabber/src/main/java/com/xabber/android/data/xaccount/IXabberApi.java
+++ b/xabber/src/main/java/com/xabber/android/data/xaccount/IXabberApi.java
@@ -79,10 +79,10 @@ public interface IXabberApi {
     @POST("accounts/signup/")
     Single<XabberAccountDTO> signupv2(@Body AuthManager.SignUpFields fields);
 
-    @POST("accounts/current/social_bind")
+    @POST("accounts/current/social_bind/")
     Single<ResponseBody> bindSocial(@Header("Authorization") String token, @Body AuthManager.SocialAuthRequest body);
 
-    @POST("accounts/current/social_unbind")
+    @POST("accounts/current/social_unbind/")
     Single<ResponseBody> unbindSocial(@Header("Authorization") String token, @Body AuthManager.Provider provider);
 }
 
diff --git a/xabber/src/main/java/com/xabber/android/ui/activity/XabberAccountActivity.java b/xabber/src/main/java/com/xabber/android/ui/activity/XabberAccountActivity.java
index 0bab09a097..c716ab2873 100644
--- a/xabber/src/main/java/com/xabber/android/ui/activity/XabberAccountActivity.java
+++ b/xabber/src/main/java/com/xabber/android/ui/activity/XabberAccountActivity.java
@@ -141,18 +141,40 @@ public void onResendClick(String jid) {
     /** Social Auth */
 
     @Override
-    public void onGoogleClick() {
-        loginGoogle();
-    }
-
-    @Override
-    public void onFacebookClick() {
-        loginFacebook();
+    public void onSocialBindClick(String provider) {
+        switch (provider) {
+            case AuthManager.PROVIDER_GOOGLE:
+                loginGoogle();
+                break;
+            case AuthManager.PROVIDER_FACEBOOK:
+                loginFacebook();
+                break;
+            case AuthManager.PROVIDER_TWITTER:
+                loginTwitter();
+                break;
+        }
     }
 
     @Override
-    public void onTwitterClick() {
-        loginTwitter();
+    public void onSocialUnbindClick(String provider) {
+        showProgress(getResources().getString(R.string.progress_title_unbind_social));
+        Subscription unbindSocialSubscription = AuthManager.unbindSocial(provider)
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(new Action1<ResponseBody>() {
+                    @Override
+                    public void call(ResponseBody responseBody) {
+                        Toast.makeText(XabberAccountActivity.this,
+                                R.string.social_unbind_success, Toast.LENGTH_SHORT).show();
+                    }
+                }, new Action1<Throwable>() {
+                    @Override
+                    public void call(Throwable throwable) {
+                        Toast.makeText(XabberAccountActivity.this,
+                                R.string.social_unbind_fail, Toast.LENGTH_SHORT).show();
+                    }
+                });
+        compositeSubscription.add(unbindSocialSubscription);
     }
 
     /** Xabber Account Info */
diff --git a/xabber/src/main/java/com/xabber/android/ui/fragment/XabberAccountInfoFragment.java b/xabber/src/main/java/com/xabber/android/ui/fragment/XabberAccountInfoFragment.java
index e415b77bae..26731d978e 100644
--- a/xabber/src/main/java/com/xabber/android/ui/fragment/XabberAccountInfoFragment.java
+++ b/xabber/src/main/java/com/xabber/android/ui/fragment/XabberAccountInfoFragment.java
@@ -80,9 +80,8 @@ public class XabberAccountInfoFragment extends Fragment implements AddEmailDialo
     private Listener listener;
 
     public interface Listener {
-        void onGoogleClick();
-        void onFacebookClick();
-        void onTwitterClick();
+        void onSocialBindClick(String provider);
+        void onSocialUnbindClick(String provider);
         void onAddEmailClick(String email);
         void onConfirmEmailClick(String email, String code);
         void onLogoutClick(boolean deleteAccounts);
@@ -140,7 +139,9 @@ public void onClick(View v) {
         itemGoogle.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                listener.onGoogleClick();
+                if (tvActionGoogle.getText().equals(getString(R.string.action_connect)))
+                    listener.onSocialBindClick(AuthManager.PROVIDER_GOOGLE);
+                else listener.onSocialUnbindClick(AuthManager.PROVIDER_GOOGLE);
             }
         });
 
@@ -150,7 +151,9 @@ public void onClick(View v) {
         itemFacebook.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                listener.onFacebookClick();
+                if (tvActionGoogle.getText().equals(getString(R.string.action_connect)))
+                    listener.onSocialBindClick(AuthManager.PROVIDER_FACEBOOK);
+                else listener.onSocialUnbindClick(AuthManager.PROVIDER_FACEBOOK);
             }
         });
 
@@ -160,7 +163,9 @@ public void onClick(View v) {
         itemTwitter.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                listener.onTwitterClick();
+                if (tvActionGoogle.getText().equals(getString(R.string.action_connect)))
+                    listener.onSocialBindClick(AuthManager.PROVIDER_TWITTER);
+                else listener.onSocialUnbindClick(AuthManager.PROVIDER_TWITTER);
             }
         });
 
diff --git a/xabber/src/main/res/layout/fragment_xabber_account_info.xml b/xabber/src/main/res/layout/fragment_xabber_account_info.xml
index 99316fb125..5d85d430c8 100644
--- a/xabber/src/main/res/layout/fragment_xabber_account_info.xml
+++ b/xabber/src/main/res/layout/fragment_xabber_account_info.xml
@@ -231,7 +231,7 @@
                     android:gravity="right"
                     android:layout_gravity="center_vertical"
                     android:textColor="@color/grey_500"
-                    android:text="CONNECT"
+                    android:text="@string/action_connect"
                     />
 
             </LinearLayout>
@@ -279,7 +279,7 @@
                     android:layout_gravity="center_vertical"
                     android:gravity="right"
                     android:textColor="@color/grey_500"
-                    android:text="CONNECT"
+                    android:text="@string/action_connect"
                     />
 
             </LinearLayout>
@@ -327,7 +327,7 @@
                     android:gravity="right"
                     android:layout_marginLeft="24dp"
                     android:textColor="@color/grey_500"
-                    android:text="CONNECT"
+                    android:text="@string/action_connect"
                     />
 
             </LinearLayout>
diff --git a/xabber/src/main/res/values/xabber_account.xml b/xabber/src/main/res/values/xabber_account.xml
index e0072ff31d..f74309fb7c 100644
--- a/xabber/src/main/res/values/xabber_account.xml
+++ b/xabber/src/main/res/values/xabber_account.xml
@@ -27,6 +27,8 @@
 
     <string name="social_bind_success">Social network bind successfully</string>
     <string name="social_bind_fail">Social network bind failed</string>
+    <string name="social_unbind_success">Social network unbind successfully</string>
+    <string name="social_unbind_fail">Social network unbind failed</string>
 
     <string name="toast_email_already_confirm">Email already confirmed</string>
     <string name="toast_not_authorized">You are not authorized</string>
@@ -46,6 +48,7 @@
     <string name="progress_title_request_xmpp_auth">Request XMPP auth-code</string>
     <string name="progress_title_confirm_xmpp">Confirm XMPP-account with code</string>
     <string name="progress_title_bind_social">Bind social network</string>
+    <string name="progress_title_unbind_social">Unbind social network</string>
 
     <string name="label_username">Pick your username</string>
     <string name="hint_username">username</string>
@@ -136,6 +139,9 @@
     <string name="auth_twitter_error">Authorization via Twitter failed</string>
     <string name="auth_facebook_cancel">Authorization via Facebook canceled</string>
 
+    <string name="action_connect">CONNECT</string>
+    <string name="action_disconnect">DISCONNECT</string>
+
     <string name="reorder_summary">To synchronize accounts order between devices you need to enable "Synchronize all" option in Xabber Account settings</string>
 
     <string name="cancel_registration_progress">Cancel registration</string>

From b4162eafd88e317c8cd6e26bcb91f832edc851fb Mon Sep 17 00:00:00 2001
From: Valery Miller <valera_miller94@mail.ru>
Date: Wed, 5 Sep 2018 14:50:26 +0500
Subject: [PATCH 059/251] Refactoring

---
 .../xabber/android/ui/activity/TutorialActivity.java |  1 -
 .../android/ui/activity/XabberLoginActivity.java     |  2 +-
 .../android/ui/dialog/AddEmailDialogFragment.java    |  6 +++---
 .../ui/dialog/ConfirmEmailDialogFragment.java        |  6 +++---
 .../android/ui/fragment/XAccountSignUpFragment.java  | 11 -----------
 .../ui/fragment/XabberAccountInfoFragment.java       | 12 ++++++------
 xabber/src/main/res/values/xabber_account.xml        |  1 +
 7 files changed, 14 insertions(+), 25 deletions(-)

diff --git a/xabber/src/main/java/com/xabber/android/ui/activity/TutorialActivity.java b/xabber/src/main/java/com/xabber/android/ui/activity/TutorialActivity.java
index 5cb5b4f983..2cc020a775 100644
--- a/xabber/src/main/java/com/xabber/android/ui/activity/TutorialActivity.java
+++ b/xabber/src/main/java/com/xabber/android/ui/activity/TutorialActivity.java
@@ -6,7 +6,6 @@
 import android.support.annotation.Nullable;
 import android.support.v13.app.FragmentPagerAdapter;
 import android.support.v4.view.ViewPager;
-import android.support.v7.app.AppCompatActivity;
 import android.view.View;
 import android.widget.Button;
 
diff --git a/xabber/src/main/java/com/xabber/android/ui/activity/XabberLoginActivity.java b/xabber/src/main/java/com/xabber/android/ui/activity/XabberLoginActivity.java
index 1e768993ec..d1684f165a 100644
--- a/xabber/src/main/java/com/xabber/android/ui/activity/XabberLoginActivity.java
+++ b/xabber/src/main/java/com/xabber/android/ui/activity/XabberLoginActivity.java
@@ -246,7 +246,7 @@ private void handleErrorGetHosts(Throwable throwable) {
 
     private void signUp(String username, String host, String pass, String captchaToken,
                         String credentials, String socialProvider) {
-        showProgress("Sign Up..");
+        showProgress(getResources().getString(R.string.progress_title_signup));
 
         Single<XabberAccount> signUpSingle;
         if (credentials != null && socialProvider != null)
diff --git a/xabber/src/main/java/com/xabber/android/ui/dialog/AddEmailDialogFragment.java b/xabber/src/main/java/com/xabber/android/ui/dialog/AddEmailDialogFragment.java
index 2741992e59..a232599a1f 100644
--- a/xabber/src/main/java/com/xabber/android/ui/dialog/AddEmailDialogFragment.java
+++ b/xabber/src/main/java/com/xabber/android/ui/dialog/AddEmailDialogFragment.java
@@ -30,14 +30,14 @@ public static AddEmailDialogFragment newInstance(Listener listener) {
     public Dialog onCreateDialog(Bundle savedInstanceState) {
         AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
         builder.setView(setupView())
-                .setTitle("Add email")
-                .setNegativeButton("Cancel", new DialogInterface.OnClickListener() {
+                .setTitle(R.string.title_add_email)
+                .setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() {
                     @Override
                     public void onClick(DialogInterface dialog, int which) {
 
                     }
                 })
-                .setPositiveButton("Add", new DialogInterface.OnClickListener() {
+                .setPositiveButton(R.string.complete_register_add, new DialogInterface.OnClickListener() {
                     @Override
                     public void onClick(DialogInterface dialog, int which) {
                         listener.onAddEmailClick(edtEmail.getText().toString());
diff --git a/xabber/src/main/java/com/xabber/android/ui/dialog/ConfirmEmailDialogFragment.java b/xabber/src/main/java/com/xabber/android/ui/dialog/ConfirmEmailDialogFragment.java
index 15848821b5..f9d5cef011 100644
--- a/xabber/src/main/java/com/xabber/android/ui/dialog/ConfirmEmailDialogFragment.java
+++ b/xabber/src/main/java/com/xabber/android/ui/dialog/ConfirmEmailDialogFragment.java
@@ -36,14 +36,14 @@ public Dialog onCreateDialog(Bundle savedInstanceState) {
 
         AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
         builder.setView(setupView())
-                .setTitle("Confirm email")
-                .setNeutralButton("Resend code", new DialogInterface.OnClickListener() {
+                .setTitle(R.string.title_email_confirm)
+                .setNeutralButton(R.string.button_resend_link, new DialogInterface.OnClickListener() {
                     @Override
                     public void onClick(DialogInterface dialog, int which) {
                         listener.onResendCodeClick(email);
                     }
                 })
-                .setPositiveButton("Confirm", new DialogInterface.OnClickListener() {
+                .setPositiveButton(R.string.button_confirm, new DialogInterface.OnClickListener() {
                     @Override
                     public void onClick(DialogInterface dialog, int which) {
                         listener.onConfirmClick(email, edtCode.getText().toString());
diff --git a/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountSignUpFragment.java b/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountSignUpFragment.java
index 399135a2e2..1a7f51041f 100644
--- a/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountSignUpFragment.java
+++ b/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountSignUpFragment.java
@@ -11,8 +11,6 @@
 import android.widget.ArrayAdapter;
 import android.widget.Button;
 import android.widget.EditText;
-import android.widget.ImageView;
-import android.widget.LinearLayout;
 import android.widget.ProgressBar;
 import android.widget.Spinner;
 import android.widget.TextView;
@@ -39,7 +37,6 @@ public class XAccountSignUpFragment extends Fragment implements View.OnClickList
     private TextView tvSocialProvider;
     private ProgressBar pbHosts;
     private Button btnSignUp;
-    //private LinearLayout llSocialLogos;
 
     private Listener listener;
     private String credentials;
@@ -87,14 +84,6 @@ public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
         spinnerDomain = view.findViewById(R.id.spinnerDomain);
 
         tvSocialProvider = view.findViewById(R.id.tvSocialProvider);
-//        llSocialLogos = view.findViewById(R.id.llSocialLogos);
-//        ImageView ivFacebook = view.findViewById(R.id.ivFacebook);
-//        ImageView ivGoogle = view.findViewById(R.id.ivGoogle);
-//        ImageView ivTwitter = view.findViewById(R.id.ivTwitter);
-//
-//        ivFacebook.setOnClickListener(this);
-//        ivGoogle.setOnClickListener(this);
-//        ivTwitter.setOnClickListener(this);
         pbHosts = view.findViewById(R.id.pbHosts);
 
         btnSignUp = view.findViewById(R.id.btnSignUp);
diff --git a/xabber/src/main/java/com/xabber/android/ui/fragment/XabberAccountInfoFragment.java b/xabber/src/main/java/com/xabber/android/ui/fragment/XabberAccountInfoFragment.java
index 26731d978e..9a50dc592b 100644
--- a/xabber/src/main/java/com/xabber/android/ui/fragment/XabberAccountInfoFragment.java
+++ b/xabber/src/main/java/com/xabber/android/ui/fragment/XabberAccountInfoFragment.java
@@ -272,7 +272,7 @@ public void call(List<XMPPAccountSettings> list) {
                             AccountSyncDialogFragment.newInstance(XabberAccountInfoFragment.this, noCancel)
                                     .show(getFragmentManager(), AccountSyncDialogFragment.class.getSimpleName());
                             dialogShowed = false;
-                        } else Toast.makeText(getActivity(), "Не удалось начать синхронизацию", Toast.LENGTH_SHORT).show();
+                        } else Toast.makeText(getActivity(), R.string.sync_fail, Toast.LENGTH_SHORT).show();
                     }
                 }, new Action1<Throwable>() {
                     @Override
@@ -289,14 +289,14 @@ private void handleErrorGetSettings(Throwable throwable) {
             if (message.equals("Invalid token")) {
                 XabberAccountManager.getInstance().onInvalidToken();
                 listener.needXMPPAuthFragment();
-                Toast.makeText(getActivity(), "Аккаунт был удален", Toast.LENGTH_LONG).show();
+                Toast.makeText(getActivity(), R.string.account_deleted, Toast.LENGTH_LONG).show();
             } else {
                 Log.d(LOG_TAG, "Error while synchronization: " + message);
                 Toast.makeText(getActivity(), message, Toast.LENGTH_SHORT).show();
             }
         } else {
             Log.d(LOG_TAG, "Error while synchronization: " + throwable.toString());
-            Toast.makeText(getActivity(), "Error while synchronization: " + throwable.toString(), Toast.LENGTH_LONG).show();
+            Toast.makeText(getActivity(), R.string.sync_fail, Toast.LENGTH_LONG).show();
         }
     }
 
@@ -325,17 +325,17 @@ private void setupSocial(List<SocialBindingDTO> socialBindings) {
         for (SocialBindingDTO socialBinding : socialBindings) {
             if ("google".equals(socialBinding.getProvider())) {
                 tvStatusGoogle.setText(socialBinding.getFirstName() + " " + socialBinding.getLastName());
-                tvActionGoogle.setText("DISCONNECT");
+                tvActionGoogle.setText(R.string.action_disconnect);
                 tvStatusGoogle.setTextColor(getActivity().getResources().getColor(R.color.black_text));
                 tvActionGoogle.setTextColor(getActivity().getResources().getColor(R.color.black_text));
             } else if ("facebook".equals(socialBinding.getProvider())) {
                 tvStatusFacebook.setText(socialBinding.getFirstName() + " " + socialBinding.getLastName());
-                tvActionFacebook.setText("DISCONNECT");
+                tvActionFacebook.setText(R.string.action_disconnect);
                 tvStatusFacebook.setTextColor(getActivity().getResources().getColor(R.color.black_text));
                 tvActionFacebook.setTextColor(getActivity().getResources().getColor(R.color.black_text));
             } else if ("twitter".equals(socialBinding.getProvider())) {
                 tvStatusTwitter.setText(socialBinding.getFirstName() + " " + socialBinding.getLastName());
-                tvActionTwitter.setText("DISCONNECT");
+                tvActionTwitter.setText(R.string.action_disconnect);
                 tvStatusTwitter.setTextColor(getActivity().getResources().getColor(R.color.black_text));
                 tvActionTwitter.setTextColor(getActivity().getResources().getColor(R.color.black_text));
             }
diff --git a/xabber/src/main/res/values/xabber_account.xml b/xabber/src/main/res/values/xabber_account.xml
index f74309fb7c..d4227a2a35 100644
--- a/xabber/src/main/res/values/xabber_account.xml
+++ b/xabber/src/main/res/values/xabber_account.xml
@@ -79,6 +79,7 @@
     <string name="title_start_messaging">Start messaging!</string>
     <string name="title_reordering_account">Reorder accounts</string>
     <string name="title_sync">Synchronization</string>
+    <string name="title_add_email">Add email</string>
 
     <string name="title_login_xabber_account">Sign In</string>
     <string name="title_register_xabber_account">Sign Up</string>

From 13c5913ccd4f5b31d3ff3ab0b77220378da67d11 Mon Sep 17 00:00:00 2001
From: Valery Miller <valera_miller94@mail.ru>
Date: Wed, 5 Sep 2018 15:38:15 +0500
Subject: [PATCH 060/251] Show social bind in signup screen

---
 .../ui/fragment/XAccountSignUpFragment.java   | 21 +++++++++++++++----
 xabber/src/main/res/drawable/ic_facebook.xml  |  4 ++--
 .../src/main/res/drawable/ic_google_plus.xml  |  4 ++--
 xabber/src/main/res/drawable/ic_twitter.xml   |  4 ++--
 .../res/layout/fragment_xaccount_signup.xml   |  4 +++-
 xabber/src/main/res/values/xabber_account.xml |  1 +
 6 files changed, 27 insertions(+), 11 deletions(-)

diff --git a/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountSignUpFragment.java b/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountSignUpFragment.java
index 1a7f51041f..75a2f7364a 100644
--- a/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountSignUpFragment.java
+++ b/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountSignUpFragment.java
@@ -1,6 +1,7 @@
 package com.xabber.android.ui.fragment;
 
 import android.app.Fragment;
+import android.graphics.drawable.Drawable;
 import android.os.Bundle;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
@@ -22,6 +23,7 @@
 import com.google.android.gms.tasks.OnFailureListener;
 import com.google.android.gms.tasks.OnSuccessListener;
 import com.xabber.android.R;
+import com.xabber.android.data.xaccount.AuthManager;
 
 import java.util.List;
 
@@ -131,11 +133,22 @@ private void setupSocial() {
         if (credentials != null && socialProvider != null) {
             if (tvSocialProvider != null) {
                 tvSocialProvider.setVisibility(View.VISIBLE);
-                tvSocialProvider.setText(socialProvider);
+                tvSocialProvider.setText(getString(R.string.signup_with_social, socialProvider));
+
+                Drawable drawable;
+                switch (socialProvider) {
+                    case AuthManager.PROVIDER_TWITTER:
+                        drawable = getResources().getDrawable(R.drawable.ic_twitter);
+                        break;
+                    case AuthManager.PROVIDER_FACEBOOK:
+                        drawable = getResources().getDrawable(R.drawable.ic_facebook);
+                        break;
+                    default:
+                        drawable = getResources().getDrawable(R.drawable.ic_google_plus);
+                }
+                tvSocialProvider.setCompoundDrawablesWithIntrinsicBounds(drawable, null, null, null);
             }
-        } else {
-            if (tvSocialProvider != null) tvSocialProvider.setVisibility(View.GONE);
-        }
+        } else if (tvSocialProvider != null) tvSocialProvider.setVisibility(View.GONE);
     }
 
     private void onSignUpClick() {
diff --git a/xabber/src/main/res/drawable/ic_facebook.xml b/xabber/src/main/res/drawable/ic_facebook.xml
index e1781fdf88..1827888c28 100644
--- a/xabber/src/main/res/drawable/ic_facebook.xml
+++ b/xabber/src/main/res/drawable/ic_facebook.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="112.196dp"
-    android:height="112.196dp"
+    android:width="24dp"
+    android:height="24dp"
     android:viewportWidth="112.196"
     android:viewportHeight="112.196">
 
diff --git a/xabber/src/main/res/drawable/ic_google_plus.xml b/xabber/src/main/res/drawable/ic_google_plus.xml
index 3dc8ee5e5f..137d79d439 100644
--- a/xabber/src/main/res/drawable/ic_google_plus.xml
+++ b/xabber/src/main/res/drawable/ic_google_plus.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="291.32dp"
-    android:height="291.32dp"
+    android:width="24dp"
+    android:height="24dp"
     android:viewportWidth="291.32"
     android:viewportHeight="291.32">
 
diff --git a/xabber/src/main/res/drawable/ic_twitter.xml b/xabber/src/main/res/drawable/ic_twitter.xml
index 6c2e56e601..ec631353be 100644
--- a/xabber/src/main/res/drawable/ic_twitter.xml
+++ b/xabber/src/main/res/drawable/ic_twitter.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="291.319dp"
-    android:height="291.319dp"
+    android:width="24dp"
+    android:height="24dp"
     android:viewportWidth="291.319"
     android:viewportHeight="291.319">
 
diff --git a/xabber/src/main/res/layout/fragment_xaccount_signup.xml b/xabber/src/main/res/layout/fragment_xaccount_signup.xml
index ece46db322..0147ade805 100644
--- a/xabber/src/main/res/layout/fragment_xaccount_signup.xml
+++ b/xabber/src/main/res/layout/fragment_xaccount_signup.xml
@@ -157,8 +157,10 @@
             android:id="@+id/tvSocialProvider"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:paddingLeft="4dp"
             android:textColor="@color/black_text_secondary"
+            android:drawablePadding="8dp"
+            android:visibility="gone"
+            android:layout_gravity="center_horizontal"
             />
 
     </LinearLayout>
diff --git a/xabber/src/main/res/values/xabber_account.xml b/xabber/src/main/res/values/xabber_account.xml
index d4227a2a35..4221f2055c 100644
--- a/xabber/src/main/res/values/xabber_account.xml
+++ b/xabber/src/main/res/values/xabber_account.xml
@@ -134,6 +134,7 @@
     <string name="signed_up_facebook">Signed up with Facebook</string>
     <string name="signed_up_github">Signed up with GitHub</string>
     <string name="signed_up_twitter">Signed up with Twitter</string>
+    <string name="signup_with_social">Your %1$s account will be bound to new Xabber Account</string>
 
     <string name="auth_google_error">Authorization via Google failed</string>
     <string name="auth_facebook_error">Authorization via Facebook failed</string>

From 31a676d2e88d6bf5a41b31ebe6f2afb78b6f9556 Mon Sep 17 00:00:00 2001
From: Valery Miller <valera_miller94@mail.ru>
Date: Wed, 5 Sep 2018 17:41:20 +0500
Subject: [PATCH 061/251] Changes in xmpp-accounts list

---
 xabber/build.gradle                           |  2 +-
 .../adapter/AccountListPreferenceAdapter.java | 22 +++++++++++++++++--
 .../layout/item_account_for_preference.xml    | 21 +++++++++++++-----
 3 files changed, 37 insertions(+), 8 deletions(-)

diff --git a/xabber/build.gradle b/xabber/build.gradle
index c0baa8e5fd..8283a3bf72 100644
--- a/xabber/build.gradle
+++ b/xabber/build.gradle
@@ -188,7 +188,7 @@ dependencies {
     implementation 'ru.egslava:MaskedEditText:1.0.5'
     implementation 'eu.davidea:flexible-adapter:5.0.0-rc4'
     implementation 'com.soundcloud.android:android-crop:1.0.1@aar'
-    implementation 'de.hdodenhof:circleimageview:2.1.0'
+    implementation 'de.hdodenhof:circleimageview:2.2.0'
     implementation 'com.melnykov:floatingactionbutton:1.3.0'
 
     implementation('com.crashlytics.sdk.android:crashlytics:2.6.8@aar') {
diff --git a/xabber/src/main/java/com/xabber/android/ui/adapter/AccountListPreferenceAdapter.java b/xabber/src/main/java/com/xabber/android/ui/adapter/AccountListPreferenceAdapter.java
index ccb1a4b563..e1ad50543d 100644
--- a/xabber/src/main/java/com/xabber/android/ui/adapter/AccountListPreferenceAdapter.java
+++ b/xabber/src/main/java/com/xabber/android/ui/adapter/AccountListPreferenceAdapter.java
@@ -5,6 +5,8 @@
  */
 
 import android.app.Activity;
+import android.graphics.ColorMatrix;
+import android.graphics.ColorMatrixColorFilter;
 import android.support.v7.widget.RecyclerView;
 import android.support.v7.widget.SwitchCompat;
 import android.view.ContextMenu;
@@ -22,6 +24,7 @@
 import com.xabber.android.data.extension.avatar.AvatarManager;
 import com.xabber.android.data.log.LogManager;
 import com.xabber.android.data.xaccount.XMPPAccountSettings;
+import com.xabber.android.data.xaccount.XabberAccount;
 import com.xabber.android.data.xaccount.XabberAccountManager;
 import com.xabber.android.ui.color.ColorManager;
 
@@ -80,10 +83,23 @@ public void onBindViewHolder(RecyclerView.ViewHolder holder, int position) {
         accountHolder.avatar.setImageDrawable(
                 AvatarManager.getInstance().getAccountAvatar(accountItem.getAccount()));
 
-        accountHolder.avatar.setBorderColor(ColorManager.getInstance().getAccountPainter().
-                getAccountMainColor(accountItem.getAccount()));
+        accountHolder.avatarBorder.setBorderColor(accountItem.isEnabled() ? ColorManager.getInstance().getAccountPainter().
+                getAccountMainColor(accountItem.getAccount()) : activity.getResources().getColor(R.color.grey_400));
+
+        XabberAccount xabberAccount = XabberAccountManager.getInstance().getAccount();
+        if (xabberAccount == null || !xabberAccount.getUsername().equals(accountItem.getAccount().getFullJid().getLocalpartOrNull().toString()))
+            accountHolder.avatarBorder.setBorderColor(activity.getResources().getColor(R.color.transparent));
+
+        if (!accountItem.isEnabled()) {
+            ColorMatrix matrix = new ColorMatrix();
+            matrix.setSaturation(0);
+            ColorMatrixColorFilter filter = new ColorMatrixColorFilter(matrix);
+            accountHolder.avatar.setColorFilter(filter);
+        } else accountHolder.avatar.clearColorFilter();
 
         accountHolder.name.setText(AccountManager.getInstance().getVerboseName(accountItem.getAccount()));
+        accountHolder.name.setTextColor(accountItem.isEnabled() ? ColorManager.getInstance().getAccountPainter().
+                getAccountMainColor(accountItem.getAccount()) : activity.getResources().getColor(R.color.black_text));
 
         accountHolder.status.setText(accountItem.getState().getStringId());
 
@@ -98,6 +114,7 @@ public int getItemCount() {
 
     private class AccountViewHolder extends RecyclerView.ViewHolder implements View.OnClickListener, View.OnCreateContextMenuListener, MenuItem.OnMenuItemClickListener {
         CircleImageView avatar;
+        CircleImageView avatarBorder;
         TextView name;
         TextView status;
         SwitchCompat enabledSwitch;
@@ -106,6 +123,7 @@ private class AccountViewHolder extends RecyclerView.ViewHolder implements View.
         AccountViewHolder(View itemView) {
             super(itemView);
             avatar = (CircleImageView) itemView.findViewById(R.id.avatar);
+            avatarBorder = (CircleImageView) itemView.findViewById(R.id.avatarBorder);
             name = (TextView) itemView.findViewById(R.id.item_account_name);
             status = (TextView) itemView.findViewById(R.id.item_account_status);
             enabledSwitch = (SwitchCompat) itemView.findViewById(R.id.item_account_switch);
diff --git a/xabber/src/main/res/layout/item_account_for_preference.xml b/xabber/src/main/res/layout/item_account_for_preference.xml
index b912365698..a3ffe8dfa6 100644
--- a/xabber/src/main/res/layout/item_account_for_preference.xml
+++ b/xabber/src/main/res/layout/item_account_for_preference.xml
@@ -19,20 +19,31 @@
     android:gravity="center_vertical"
     android:background="@drawable/ripple_background">
 
-    <FrameLayout
+    <RelativeLayout
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center_vertical"
         android:layout_marginLeft="16dp"
         android:layout_marginRight="16dp">
 
+        <de.hdodenhof.circleimageview.CircleImageView
+            android:id="@+id/avatarBorder"
+            android:layout_width="45dp"
+            android:layout_height="45dp"
+            android:layout_centerInParent="true"
+            app:civ_border_color="@color/transparent"
+            app:civ_border_width="2dp"
+            android:src="@color/transparent"
+            />
+
         <de.hdodenhof.circleimageview.CircleImageView
             android:id="@+id/avatar"
-            android:layout_width="40dp"
-            android:layout_height="40dp"
-            app:civ_border_width="2dp"/>
+            android:layout_width="38dp"
+            android:layout_height="38dp"
+            android:layout_centerInParent="true"
+            />
 
-    </FrameLayout>
+    </RelativeLayout>
 
     <LinearLayout
         android:orientation="vertical"

From 865d44aa849385c6076356b86abaaf05adb2f943 Mon Sep 17 00:00:00 2001
From: Valery Miller <valera_miller94@mail.ru>
Date: Wed, 5 Sep 2018 18:12:59 +0500
Subject: [PATCH 062/251] Added filed "domain" to Xabber Account model. Changes
 in Xabber Account views.

---
 .../android/data/database/RealmManager.java    | 11 ++++++++++-
 .../database/realm/XabberAccountRealm.java     |  9 +++++++++
 .../android/data/xaccount/XabberAccount.java   | 12 +++++++++++-
 .../data/xaccount/XabberAccountDTO.java        |  8 +++++++-
 .../data/xaccount/XabberAccountManager.java    |  2 ++
 .../adapter/AccountListPreferenceAdapter.java  |  3 ++-
 .../ui/fragment/ContactListDrawerFragment.java | 18 +++---------------
 .../ui/fragment/XabberAccountInfoFragment.java |  7 ++-----
 8 files changed, 46 insertions(+), 24 deletions(-)

diff --git a/xabber/src/main/java/com/xabber/android/data/database/RealmManager.java b/xabber/src/main/java/com/xabber/android/data/database/RealmManager.java
index 6134b13153..350439a672 100644
--- a/xabber/src/main/java/com/xabber/android/data/database/RealmManager.java
+++ b/xabber/src/main/java/com/xabber/android/data/database/RealmManager.java
@@ -29,7 +29,7 @@
 
 public class RealmManager {
     private static final String REALM_DATABASE_NAME = "realm_database.realm";
-    private static final int REALM_DATABASE_VERSION = 14;
+    private static final int REALM_DATABASE_VERSION = 15;
     private static final String LOG_TAG = RealmManager.class.getSimpleName();
     private final RealmConfiguration realmConfiguration;
 
@@ -213,6 +213,15 @@ public void migrate(DynamicRealm realm, long oldVersion, long newVersion) {
 
                             oldVersion++;
                         }
+
+                        if (oldVersion == 14) {
+                            RealmObjectSchema xabberAccountSchema =
+                                    schema.get(XabberAccountRealm.class.getSimpleName());
+
+                                xabberAccountSchema.addField("domain", String.class);
+
+                            oldVersion++;
+                        }
                     }
                 })
                 .modules(new RealmDatabaseModule())
diff --git a/xabber/src/main/java/com/xabber/android/data/database/realm/XabberAccountRealm.java b/xabber/src/main/java/com/xabber/android/data/database/realm/XabberAccountRealm.java
index 10a97ed19f..aefbe19dd8 100644
--- a/xabber/src/main/java/com/xabber/android/data/database/realm/XabberAccountRealm.java
+++ b/xabber/src/main/java/com/xabber/android/data/database/realm/XabberAccountRealm.java
@@ -19,6 +19,7 @@ public class XabberAccountRealm extends RealmObject {
     private String accountStatus;
     private String token;
     private String username;
+    private String domain;
     private String firstName;
     private String lastName;
     private String registerDate;
@@ -65,6 +66,14 @@ public void setUsername(String username) {
         this.username = username;
     }
 
+    public String getDomain() {
+        return domain;
+    }
+
+    public void setDomain(String domain) {
+        this.domain = domain;
+    }
+
     public String getFirstName() {
         return firstName;
     }
diff --git a/xabber/src/main/java/com/xabber/android/data/xaccount/XabberAccount.java b/xabber/src/main/java/com/xabber/android/data/xaccount/XabberAccount.java
index 2c6b2dc666..4d53ccf4bf 100644
--- a/xabber/src/main/java/com/xabber/android/data/xaccount/XabberAccount.java
+++ b/xabber/src/main/java/com/xabber/android/data/xaccount/XabberAccount.java
@@ -15,6 +15,7 @@ public class XabberAccount {
     private int id;
     private String accountStatus;
     private String username;
+    private String domain;
     private String firstName;
     private String lastName;
     private String registerDate;
@@ -26,13 +27,14 @@ public class XabberAccount {
     private String phone;
     private boolean needToVerifyPhone;
 
-    public XabberAccount(int id, String accountStatus, String username, String firstName,
+    public XabberAccount(int id, String accountStatus, String username, String domain, String firstName,
                          String lastName, String registerDate, String language, List<XMPPUser> xmppUsers,
                          List<EmailDTO> emails, List<SocialBindingDTO> socialBindings, String token,
                          boolean needToVerifyPhone, String phone) {
         this.id = id;
         this.accountStatus = accountStatus;
         this.username = username;
+        this.domain = domain;
         this.firstName = firstName;
         this.lastName = lastName;
         this.registerDate = registerDate;
@@ -57,6 +59,14 @@ public String getUsername() {
         return username;
     }
 
+    public String getDomain() {
+        return domain;
+    }
+
+    public String getFullUsername() {
+        return username + "@" + domain;
+    }
+
     public String getFirstName() {
         return firstName;
     }
diff --git a/xabber/src/main/java/com/xabber/android/data/xaccount/XabberAccountDTO.java b/xabber/src/main/java/com/xabber/android/data/xaccount/XabberAccountDTO.java
index e3b2ed4f4e..edccf77dd2 100644
--- a/xabber/src/main/java/com/xabber/android/data/xaccount/XabberAccountDTO.java
+++ b/xabber/src/main/java/com/xabber/android/data/xaccount/XabberAccountDTO.java
@@ -11,6 +11,7 @@ public class XabberAccountDTO {
     private int id;
     private String account_status;
     private String username;
+    private String domain;
     private String first_name;
     private String last_name;
     private String registration_date;
@@ -22,13 +23,14 @@ public class XabberAccountDTO {
     private List<EmailDTO> email_list;
     private List<SocialBindingDTO> social_bindings;
 
-    public XabberAccountDTO(int id, String account_status, String username, String first_name,
+    public XabberAccountDTO(int id, String account_status, String username, String domain, String first_name,
                             String last_name, String registration_date, String language, String phone,
                             boolean need_to_verify_phone, String token, List<XMPPUserDTO> xmpp_users,
                             List<EmailDTO> email_list, List<SocialBindingDTO> social_bindings) {
         this.id = id;
         this.account_status = account_status;
         this.username = username;
+        this.domain = domain;
         this.first_name = first_name;
         this.last_name = last_name;
         this.registration_date = registration_date;
@@ -52,6 +54,10 @@ public String getUsername() {
         return username;
     }
 
+    public String getDomain() {
+        return domain;
+    }
+
     public String getFirstName() {
         return first_name;
     }
diff --git a/xabber/src/main/java/com/xabber/android/data/xaccount/XabberAccountManager.java b/xabber/src/main/java/com/xabber/android/data/xaccount/XabberAccountManager.java
index 7fe2b772df..c6574fd460 100644
--- a/xabber/src/main/java/com/xabber/android/data/xaccount/XabberAccountManager.java
+++ b/xabber/src/main/java/com/xabber/android/data/xaccount/XabberAccountManager.java
@@ -290,6 +290,7 @@ public Single<XabberAccount> saveOrUpdateXabberAccountToRealm(XabberAccountDTO x
         xabberAccountRealm.setToken(token);
         xabberAccountRealm.setAccountStatus(xabberAccount.getAccountStatus());
         xabberAccountRealm.setUsername(xabberAccount.getUsername());
+        xabberAccountRealm.setDomain(xabberAccount.getDomain());
         xabberAccountRealm.setFirstName(xabberAccount.getFirstName());
         xabberAccountRealm.setLastName(xabberAccount.getLastName());
         xabberAccountRealm.setLanguage(xabberAccount.getLanguage());
@@ -382,6 +383,7 @@ public static XabberAccount xabberAccountRealmToPOJO(XabberAccountRealm accountR
                 Integer.parseInt(accountRealm.getId()),
                 accountRealm.getAccountStatus(),
                 accountRealm.getUsername(),
+                accountRealm.getDomain(),
                 accountRealm.getFirstName(),
                 accountRealm.getLastName(),
                 accountRealm.getRegisterDate(),
diff --git a/xabber/src/main/java/com/xabber/android/ui/adapter/AccountListPreferenceAdapter.java b/xabber/src/main/java/com/xabber/android/ui/adapter/AccountListPreferenceAdapter.java
index e1ad50543d..aea15cea73 100644
--- a/xabber/src/main/java/com/xabber/android/ui/adapter/AccountListPreferenceAdapter.java
+++ b/xabber/src/main/java/com/xabber/android/ui/adapter/AccountListPreferenceAdapter.java
@@ -87,7 +87,8 @@ public void onBindViewHolder(RecyclerView.ViewHolder holder, int position) {
                 getAccountMainColor(accountItem.getAccount()) : activity.getResources().getColor(R.color.grey_400));
 
         XabberAccount xabberAccount = XabberAccountManager.getInstance().getAccount();
-        if (xabberAccount == null || !xabberAccount.getUsername().equals(accountItem.getAccount().getFullJid().getLocalpartOrNull().toString()))
+        if (xabberAccount == null || !xabberAccount.getFullUsername()
+                .equals(AccountManager.getInstance().getVerboseName(accountItem.getAccount())))
             accountHolder.avatarBorder.setBorderColor(activity.getResources().getColor(R.color.transparent));
 
         if (!accountItem.isEnabled()) {
diff --git a/xabber/src/main/java/com/xabber/android/ui/fragment/ContactListDrawerFragment.java b/xabber/src/main/java/com/xabber/android/ui/fragment/ContactListDrawerFragment.java
index c3a6f7cd31..d800e9ccc8 100644
--- a/xabber/src/main/java/com/xabber/android/ui/fragment/ContactListDrawerFragment.java
+++ b/xabber/src/main/java/com/xabber/android/ui/fragment/ContactListDrawerFragment.java
@@ -213,22 +213,10 @@ private void setupXabberAccountView() {
             llNoAccount.setVisibility(View.GONE);
 
             String accountName = account.getFirstName() + " " + account.getLastName();
-            if (accountName.trim().isEmpty())
-                accountName = getActivity().getString(R.string.title_xabber_account);
+            if (accountName.trim().isEmpty()) accountName = getActivity().getString(R.string.title_xabber_account);
+            tvAccountName.setText(accountName);
+            tvAccountEmail.setText(account.getFullUsername());
 
-            if (XabberAccount.STATUS_NOT_CONFIRMED.equals(account.getAccountStatus())) {
-                tvAccountName.setText(accountName);
-                tvAccountEmail.setText(R.string.title_email_confirm);
-            }
-            if (XabberAccount.STATUS_CONFIRMED.equals(account.getAccountStatus())) {
-                tvAccountName.setText(accountName);
-                tvAccountEmail.setText(R.string.title_complete_register);
-            }
-            if (XabberAccount.STATUS_REGISTERED.equals(account.getAccountStatus())) {
-
-                tvAccountName.setText(accountName);
-                tvAccountEmail.setText(account.getUsername());
-            }
         } else {
             llAccountInfo.setVisibility(View.GONE);
             llNoAccount.setVisibility(View.VISIBLE);
diff --git a/xabber/src/main/java/com/xabber/android/ui/fragment/XabberAccountInfoFragment.java b/xabber/src/main/java/com/xabber/android/ui/fragment/XabberAccountInfoFragment.java
index 9a50dc592b..8660ba819f 100644
--- a/xabber/src/main/java/com/xabber/android/ui/fragment/XabberAccountInfoFragment.java
+++ b/xabber/src/main/java/com/xabber/android/ui/fragment/XabberAccountInfoFragment.java
@@ -229,13 +229,10 @@ public void onSyncClick(boolean needGoToMainActivity) {
     }
 
     public void updateData(@NonNull XabberAccount account) {
-        String accountName = account.getFirstName() + " " + account.getLastName();
-        if (accountName.trim().isEmpty())
-            accountName = getString(R.string.title_xabber_account);
+        String accountName = account.getFullUsername();
 
         tvAccountName.setText(accountName);
-        if (account.getUsername() != null && !account.getUsername().isEmpty())
-            tvAccountUsername.setText(account.getUsername());
+        tvAccountUsername.setText("Free account");
 
         if (account.getLanguage() != null && !account.getLanguage().equals("")) {
             tvLanguage.setText(account.getLanguage());

From ae8ea5b3cb4471dd7e3f3c0c8ca7fee194f4b460 Mon Sep 17 00:00:00 2001
From: Valery Miller <valera_miller94@mail.ru>
Date: Wed, 5 Sep 2018 18:28:11 +0500
Subject: [PATCH 063/251] Up version to 506

---
 xabber/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/xabber/build.gradle b/xabber/build.gradle
index 8283a3bf72..8c31501b94 100644
--- a/xabber/build.gradle
+++ b/xabber/build.gradle
@@ -10,8 +10,8 @@ android {
     defaultConfig {
         minSdkVersion 15
         targetSdkVersion 27
-        versionCode 505
-        versionName '2.4.2(505)'
+        versionCode 506
+        versionName '2.4.2(506)'
     }
 
     lintOptions {

From f61f70e9d41b3d823f76eb409fa4c8d489c4fc51 Mon Sep 17 00:00:00 2001
From: Valery Miller <valera_miller94@mail.ru>
Date: Thu, 6 Sep 2018 11:45:57 +0500
Subject: [PATCH 064/251] Fixed whitespace in link on login screen

---
 xabber/src/main/res/values/account_editor.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/xabber/src/main/res/values/account_editor.xml b/xabber/src/main/res/values/account_editor.xml
index 05fa7cd7f7..6be666d98d 100644
--- a/xabber/src/main/res/values/account_editor.xml
+++ b/xabber/src/main/res/values/account_editor.xml
@@ -12,7 +12,7 @@
     <string name="account_type">Account type</string>
     <string name="account_type_hints_gtalk">username for gmail.com or Google Apps domain</string>
     <string name="account_type_helps_gtalk">If you don\'t have Google account you may create one at http://mail.google.com\nAlso you can use your_user_name@your_google_domain</string>
-    <string name="account_xmpp_register_warning">You must <a href="http://www.google.com/#q=register an XMPP account">register an XMPP account</a> before adding it to Xabber!</string>
+    <string name="account_xmpp_register_warning">You must&#160;<a href="http://www.google.com/#q=register an XMPP account">register an XMPP account</a> before adding it to Xabber!</string>
     <string name="account_type_helps_xmpp">If you want to learn more about XMPP (Jabber) here: https://xmpp.org</string>
     <string name="account_user_name">Username</string>
     <string name="EMPTY_SERVER_NAME">Server name is not specified</string>

From 5d07c5ed7d3f38979c323ed3f1ca48944fa38ad0 Mon Sep 17 00:00:00 2001
From: Valery Miller <valera_miller94@mail.ru>
Date: Thu, 6 Sep 2018 12:00:50 +0500
Subject: [PATCH 065/251] Prevent screen rotation in LoginActivity

---
 xabber/src/main/AndroidManifest.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/xabber/src/main/AndroidManifest.xml b/xabber/src/main/AndroidManifest.xml
index 1befa9520a..ef4bf9fd68 100644
--- a/xabber/src/main/AndroidManifest.xml
+++ b/xabber/src/main/AndroidManifest.xml
@@ -517,6 +517,7 @@
         <activity android:name=".ui.activity.TutorialActivity"
             android:theme="@style/ThemeDark"/>
         <activity android:name=".ui.activity.XabberLoginActivity"
+            android:screenOrientation="portrait"
             android:theme="@style/Theme.Design.Light"/>
         <activity android:name=".ui.activity.XabberAccountActivity"
             android:theme="@style/ThemeDark">

From 86a0d93f00d507cced0fe2e48c983880b6f3ab54 Mon Sep 17 00:00:00 2001
From: Valery Miller <valera_miller94@mail.ru>
Date: Thu, 6 Sep 2018 13:02:42 +0500
Subject: [PATCH 066/251] Added auto scroll login screen on showing keyboard

---
 xabber/src/main/AndroidManifest.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/xabber/src/main/AndroidManifest.xml b/xabber/src/main/AndroidManifest.xml
index ef4bf9fd68..1b2f398970 100644
--- a/xabber/src/main/AndroidManifest.xml
+++ b/xabber/src/main/AndroidManifest.xml
@@ -517,6 +517,7 @@
         <activity android:name=".ui.activity.TutorialActivity"
             android:theme="@style/ThemeDark"/>
         <activity android:name=".ui.activity.XabberLoginActivity"
+            android:windowSoftInputMode="adjustResize"
             android:screenOrientation="portrait"
             android:theme="@style/Theme.Design.Light"/>
         <activity android:name=".ui.activity.XabberAccountActivity"

From 56897e7ddb057c1e8cea034f1cc837b054a833cb Mon Sep 17 00:00:00 2001
From: Valery Miller <valera_miller94@mail.ru>
Date: Thu, 6 Sep 2018 16:49:18 +0500
Subject: [PATCH 067/251] Visual changes in domain spinner

---
 .../ui/fragment/XAccountSignUpFragment.java   |  3 +++
 .../res/layout/fragment_xaccount_signup.xml   | 19 +++++++++++++++----
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountSignUpFragment.java b/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountSignUpFragment.java
index 75a2f7364a..d5af9e961c 100644
--- a/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountSignUpFragment.java
+++ b/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountSignUpFragment.java
@@ -36,6 +36,7 @@ public class XAccountSignUpFragment extends Fragment implements View.OnClickList
     private EditText edtUsername;
     private EditText edtPass;
     private Spinner spinnerDomain;
+    private View spinnerBorder;
     private TextView tvSocialProvider;
     private ProgressBar pbHosts;
     private Button btnSignUp;
@@ -84,6 +85,7 @@ public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
         edtUsername = view.findViewById(R.id.edtUsername);
         edtPass = view.findViewById(R.id.edtPass);
         spinnerDomain = view.findViewById(R.id.spinnerDomain);
+        spinnerBorder = view.findViewById(R.id.spinnerBorder);
 
         tvSocialProvider = view.findViewById(R.id.tvSocialProvider);
         pbHosts = view.findViewById(R.id.pbHosts);
@@ -126,6 +128,7 @@ public void setSocialProviderCredentials(String socialProvider, String credentia
     public void showHostsProgress(boolean visible) {
         pbHosts.setVisibility(visible ? View.VISIBLE : View.GONE);
         spinnerDomain.setVisibility(visible ? View.GONE : View.VISIBLE);
+        spinnerBorder.setVisibility(visible ? View.GONE : View.VISIBLE);
         btnSignUp.setEnabled(!visible);
     }
 
diff --git a/xabber/src/main/res/layout/fragment_xaccount_signup.xml b/xabber/src/main/res/layout/fragment_xaccount_signup.xml
index 0147ade805..1e7f794289 100644
--- a/xabber/src/main/res/layout/fragment_xaccount_signup.xml
+++ b/xabber/src/main/res/layout/fragment_xaccount_signup.xml
@@ -26,7 +26,7 @@
 
             <LinearLayout
                 android:orientation="vertical"
-                android:layout_width="wrap_content"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_weight="1">
 
@@ -49,7 +49,6 @@
                     android:hint="@string/hint_username"
                     android:textSize="16sp"
                     android:theme="@style/Theme"
-                    android:layout_weight="3"
                     />
 
             </LinearLayout>
@@ -67,8 +66,10 @@
 
             <LinearLayout
                 android:orientation="vertical"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content">
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                >
 
                 <TextView
                     android:layout_width="match_parent"
@@ -86,6 +87,16 @@
                     android:layout_height="wrap_content"
                     />
 
+                <View
+                    android:id="@+id/spinnerBorder"
+                    android:layout_width="match_parent"
+                    android:layout_height="1dp"
+                    android:background="#757575"
+                    android:layout_marginTop="2dp"
+                    android:layout_marginLeft="7dp"
+                    android:layout_marginRight="16dp"
+                    />
+
                 <ProgressBar
                     android:id="@+id/pbHosts"
                     android:layout_width="140dp"

From f93181d62895d7fcf1bc49b1f5276c0efc8f8d31 Mon Sep 17 00:00:00 2001
From: Valery Miller <valera_miller94@mail.ru>
Date: Thu, 6 Sep 2018 18:07:43 +0500
Subject: [PATCH 068/251] Add custom adapter for host spinner

---
 .../ui/adapter/HostSpinnerAdapter.java        | 41 +++++++++++++++++++
 .../ui/fragment/XAccountSignUpFragment.java   |  5 +--
 xabber/src/main/res/layout/item_host.xml      | 32 +++++++++++++++
 3 files changed, 75 insertions(+), 3 deletions(-)
 create mode 100644 xabber/src/main/java/com/xabber/android/ui/adapter/HostSpinnerAdapter.java
 create mode 100644 xabber/src/main/res/layout/item_host.xml

diff --git a/xabber/src/main/java/com/xabber/android/ui/adapter/HostSpinnerAdapter.java b/xabber/src/main/java/com/xabber/android/ui/adapter/HostSpinnerAdapter.java
new file mode 100644
index 0000000000..58e5ce4cb3
--- /dev/null
+++ b/xabber/src/main/java/com/xabber/android/ui/adapter/HostSpinnerAdapter.java
@@ -0,0 +1,41 @@
+package com.xabber.android.ui.adapter;
+
+import android.content.Context;
+import android.support.annotation.NonNull;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ArrayAdapter;
+import android.widget.TextView;
+
+import com.xabber.android.R;
+
+import java.util.List;
+
+public class HostSpinnerAdapter extends ArrayAdapter<String> {
+
+    private List<String> mData;
+    private LayoutInflater mInflater;
+
+    public HostSpinnerAdapter(@NonNull Context context, int resource, @NonNull List<String> objects) {
+        super(context, resource, objects);
+
+        mData = objects;
+        mInflater = (LayoutInflater) context.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
+    }
+
+    @Override
+    public View getDropDownView(int position, View convertView, ViewGroup parent) {
+        return getCustomView(position, convertView, parent);
+    }
+
+    public View getCustomView(int position, View convertView, ViewGroup parent) {
+
+        View view = mInflater.inflate(R.layout.item_host, parent, false);
+        TextView tvHost = (TextView) view.findViewById(R.id.tvHost);
+        TextView tvStatus = (TextView) view.findViewById(R.id.tvStatus);
+        tvHost.setText(mData.get(position));
+
+        return view;
+    }
+}
diff --git a/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountSignUpFragment.java b/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountSignUpFragment.java
index d5af9e961c..632cdb5b4e 100644
--- a/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountSignUpFragment.java
+++ b/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountSignUpFragment.java
@@ -9,7 +9,6 @@
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.ArrayAdapter;
 import android.widget.Button;
 import android.widget.EditText;
 import android.widget.ProgressBar;
@@ -24,6 +23,7 @@
 import com.google.android.gms.tasks.OnSuccessListener;
 import com.xabber.android.R;
 import com.xabber.android.data.xaccount.AuthManager;
+import com.xabber.android.ui.adapter.HostSpinnerAdapter;
 
 import java.util.List;
 
@@ -244,9 +244,8 @@ public void onFailure(@NonNull Exception e) {
 
     public void setupSpinner(List<String> domains) {
         if (spinnerDomain == null) return;
-        ArrayAdapter<String> adapter = new ArrayAdapter<>(getActivity(),
+        HostSpinnerAdapter adapter = new HostSpinnerAdapter(getActivity(),
                 android.R.layout.simple_spinner_item, domains);
-        adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
         spinnerDomain.setAdapter(adapter);
     }
 }
diff --git a/xabber/src/main/res/layout/item_host.xml b/xabber/src/main/res/layout/item_host.xml
new file mode 100644
index 0000000000..abc57071b4
--- /dev/null
+++ b/xabber/src/main/res/layout/item_host.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="horizontal"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:paddingLeft="8dp"
+    android:paddingRight="8dp"
+    android:paddingTop="16dp"
+    android:paddingBottom="16dp"
+    >
+
+    <TextView
+        android:id="@+id/tvHost"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:textColor="@color/black_text"
+        android:textSize="16sp"
+        android:text="xabber.org"
+        />
+
+    <TextView
+        android:id="@+id/tvStatus"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="8dp"
+        android:textColor="@color/account_register_blue"
+        android:textSize="16sp"
+        android:gravity="right"
+        android:text="free"
+        />
+
+</LinearLayout>
\ No newline at end of file

From b61bbed8e448bee005937ae6e6652fef83d0ba74 Mon Sep 17 00:00:00 2001
From: Valery Miller <valera_miller94@mail.ru>
Date: Thu, 6 Sep 2018 18:14:15 +0500
Subject: [PATCH 069/251] Up version to 507

---
 xabber/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/xabber/build.gradle b/xabber/build.gradle
index 8c31501b94..a1e0400399 100644
--- a/xabber/build.gradle
+++ b/xabber/build.gradle
@@ -10,8 +10,8 @@ android {
     defaultConfig {
         minSdkVersion 15
         targetSdkVersion 27
-        versionCode 506
-        versionName '2.4.2(506)'
+        versionCode 507
+        versionName '2.4.2(507)'
     }
 
     lintOptions {

From c78628938bfd4184f03dfc40c9237cfb7864b507 Mon Sep 17 00:00:00 2001
From: Valery Miller <valera_miller94@mail.ru>
Date: Fri, 7 Sep 2018 16:14:57 +0500
Subject: [PATCH 070/251] Fixed image compression - save original orientation

---
 .../httpfileupload/ImageCompressor.java       | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/xabber/src/main/java/com/xabber/android/data/extension/httpfileupload/ImageCompressor.java b/xabber/src/main/java/com/xabber/android/data/extension/httpfileupload/ImageCompressor.java
index 006c470212..55e1ea80e4 100644
--- a/xabber/src/main/java/com/xabber/android/data/extension/httpfileupload/ImageCompressor.java
+++ b/xabber/src/main/java/com/xabber/android/data/extension/httpfileupload/ImageCompressor.java
@@ -2,12 +2,14 @@
 
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
+import android.media.ExifInterface;
 import android.util.Log;
 
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
+import java.io.IOException;
 
 public class ImageCompressor {
 
@@ -93,10 +95,25 @@ public static File compressImage(final File file, String outputDirectory) {
             fOut.close();
             source.recycle();
             resizedBmp.recycle();
-            return result;
+
         } catch (Exception e) {
             return null;
         }
+
+        // copy EXIF orientation from original image
+        try {
+            ExifInterface oldExif = new ExifInterface(file.getPath());
+            String exifOrientation = oldExif.getAttribute(ExifInterface.TAG_ORIENTATION);
+            if (exifOrientation != null) {
+                ExifInterface newExif = new ExifInterface(result.getPath());
+                newExif.setAttribute(ExifInterface.TAG_ORIENTATION, exifOrientation);
+                newExif.saveAttributes();
+            }
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+
+        return result;
     }
 
     private static Bitmap resizeBitmap(Bitmap source, int maxSizePixels) {

From 5d91cef670298803b3a31b331e4ac523036c0a98 Mon Sep 17 00:00:00 2001
From: Valery Miller <valera_miller94@mail.ru>
Date: Fri, 7 Sep 2018 18:43:29 +0500
Subject: [PATCH 071/251] Changes in XMPP-auth in Xabber Account

---
 .../data/xaccount/XabberAccountManager.java   | 19 ++++--
 .../ui/activity/ContactListActivity.java      | 68 ++++++++++++++++++-
 .../fragment/ContactListDrawerFragment.java   | 28 ++++++--
 3 files changed, 104 insertions(+), 11 deletions(-)

diff --git a/xabber/src/main/java/com/xabber/android/data/xaccount/XabberAccountManager.java b/xabber/src/main/java/com/xabber/android/data/xaccount/XabberAccountManager.java
index c6574fd460..8f76b253e4 100644
--- a/xabber/src/main/java/com/xabber/android/data/xaccount/XabberAccountManager.java
+++ b/xabber/src/main/java/com/xabber/android/data/xaccount/XabberAccountManager.java
@@ -41,6 +41,7 @@
 import rx.android.schedulers.AndroidSchedulers;
 import rx.functions.Action1;
 import rx.schedulers.Schedulers;
+import rx.subjects.BehaviorSubject;
 import rx.subscriptions.CompositeSubscription;
 
 /**
@@ -53,6 +54,7 @@ public class XabberAccountManager implements OnLoadListener {
     private static XabberAccountManager instance;
 
     private XabberAccount account;
+    private BehaviorSubject<XabberAccount> accountSubject = BehaviorSubject.create();
 
     private List<XMPPAccountSettings> xmppAccountsForSync;
     private List<XMPPAccountSettings> xmppAccountsForCreate;
@@ -201,7 +203,7 @@ public void call(Throwable throwable) {
     @Override
     public void onLoad() {
         XabberAccount account = loadXabberAccountFromRealm();
-        this.account = account;
+        setAccount(account);
 
         this.lastOrderChangeTimestamp = SettingsManager.getLastOrderChangeTimestamp();
 
@@ -259,7 +261,7 @@ public void call(Throwable throwable) {
 
     private void handleSuccessGetAccount(@NonNull XabberAccount xabberAccount) {
         Log.d(LOG_TAG, "Xabber account loading from net: successfully");
-        this.account = xabberAccount;
+        setAccount(xabberAccount);
         updateAccountSettings();
     }
 
@@ -278,8 +280,17 @@ public XabberAccount getAccount() {
         return account;
     }
 
+    public BehaviorSubject<XabberAccount> subscribeForAccount() {
+        return accountSubject;
+    }
+
+    private void setAccount(XabberAccount account) {
+        this.account = account;
+        accountSubject.onNext(this.account);
+    }
+
     public void removeAccount() {
-        this.account = null;
+        setAccount(null);
         this.accountsSyncState.clear();
     }
 
@@ -336,7 +347,7 @@ public Single<XabberAccount> saveOrUpdateXabberAccountToRealm(XabberAccountDTO x
         realm.commitTransaction();
         realm.close();
 
-        this.account = account;
+        setAccount(account);
         return Single.just(account);
     }
 
diff --git a/xabber/src/main/java/com/xabber/android/ui/activity/ContactListActivity.java b/xabber/src/main/java/com/xabber/android/ui/activity/ContactListActivity.java
index 22158794e9..fb612b847c 100644
--- a/xabber/src/main/java/com/xabber/android/ui/activity/ContactListActivity.java
+++ b/xabber/src/main/java/com/xabber/android/ui/activity/ContactListActivity.java
@@ -45,6 +45,7 @@
 import com.xabber.android.data.account.AccountManager;
 import com.xabber.android.data.account.CommonState;
 import com.xabber.android.data.account.listeners.OnAccountChangedListener;
+import com.xabber.android.data.connection.NetworkManager;
 import com.xabber.android.data.entity.AccountJid;
 import com.xabber.android.data.entity.BaseEntity;
 import com.xabber.android.data.entity.UserJid;
@@ -57,7 +58,9 @@
 import com.xabber.android.data.roster.AbstractContact;
 import com.xabber.android.data.roster.RosterContact;
 import com.xabber.android.data.roster.RosterManager;
+import com.xabber.android.data.xaccount.AuthManager;
 import com.xabber.android.data.xaccount.XMPPAccountSettings;
+import com.xabber.android.data.xaccount.XMPPAuthManager;
 import com.xabber.android.data.xaccount.XabberAccount;
 import com.xabber.android.data.xaccount.XabberAccountManager;
 import com.xabber.android.presentation.mvp.contactlist.ContactListPresenter;
@@ -83,6 +86,12 @@
 import java.util.List;
 import java.util.Locale;
 
+import rx.Subscription;
+import rx.android.schedulers.AndroidSchedulers;
+import rx.functions.Action1;
+import rx.schedulers.Schedulers;
+import rx.subscriptions.CompositeSubscription;
+
 /**
  * Main application activity.
  *
@@ -129,6 +138,8 @@ public class ContactListActivity extends ManagedActivity implements OnAccountCha
     private View showcaseView;
     private Button btnShowcaseGotIt;
 
+    private CompositeSubscription compositeSubscription = new CompositeSubscription();
+
     public static Intent createPersistentIntent(Context context) {
         Intent intent = new Intent(context, ContactListActivity.class);
         intent.setAction("android.intent.action.MAIN");
@@ -221,6 +232,12 @@ public void onClick(View v) {
         });
     }
 
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+        compositeSubscription.clear();
+    }
+
     @Override
     protected void onNewIntent(Intent intent) {
         super.onNewIntent(intent);
@@ -703,7 +720,15 @@ public void onContactListDrawerListener(int viewId) {
                 startActivity(PreferenceEditor.createIntent(this));
                 break;
             case R.id.drawer_header_action_xabber_account:
-                startActivity(XabberAccountActivity.createIntent(this, false));
+                XabberAccount account = XabberAccountManager.getInstance().getAccount();
+                if (account != null) startActivity(XabberAccountActivity.createIntent(this, false));
+                else {
+                    // TODO: 07.09.18 запрос списка аккаунтов вынести из UI ?
+                    ArrayList<AccountJid> accounts = new ArrayList<>(AccountManager.getInstance().getEnabledAccounts());
+                    if (accounts.size() < 1) return;
+                    if (accounts.size() > 1) startActivity(XabberAccountActivity.createIntent(this, false));
+                    else loginXabberAccountViaXMPP(accounts.get(0).getFullJid().toString());
+                }
                 break;
             case R.id.drawer_action_patreon:
                 startActivity(PatreonAppealActivity.createIntent(this));
@@ -827,4 +852,45 @@ public void showShowcase(boolean show) {
     public void closeSearch() {
         if (bottomMenu != null) bottomMenu.closeSearch();
     }
+
+    public void loginXabberAccountViaXMPP(String accountJid) {
+        if (NetworkManager.isNetworkAvailable()) {
+            requestXMPPCode(accountJid);
+        } else
+            Toast.makeText(this, R.string.toast_no_internet, Toast.LENGTH_LONG).show();
+    }
+
+    private void requestXMPPCode(final String jid) {
+
+        // ! show progress !
+
+        Subscription requestXMPPCodeSubscription = AuthManager.requestXMPPCode(jid)
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(new Action1<AuthManager.XMPPCode>() {
+                    @Override
+                    public void call(AuthManager.XMPPCode code) {
+                        handleSuccessRequestXMPPCode(code, jid);
+                    }
+                }, new Action1<Throwable>() {
+                    @Override
+                    public void call(Throwable throwable) {
+                        handleErrorRequestXMPPCode(throwable);
+                    }
+                });
+        compositeSubscription.add(requestXMPPCodeSubscription);
+    }
+
+    private void handleSuccessRequestXMPPCode(AuthManager.XMPPCode code, String jid) {
+
+        // ! hide progress !
+
+        XMPPAuthManager.getInstance().addRequest(code.getRequestId(), code.getApiJid(), jid);
+    }
+
+    private void handleErrorRequestXMPPCode(Throwable throwable) {
+        // ! hide progress !
+        // TODO: 07.09.18 сделать корректную обработку ошибок
+        Toast.makeText(this, "Error while xmpp-auth: " + throwable.toString(), Toast.LENGTH_LONG).show();
+    }
 }
diff --git a/xabber/src/main/java/com/xabber/android/ui/fragment/ContactListDrawerFragment.java b/xabber/src/main/java/com/xabber/android/ui/fragment/ContactListDrawerFragment.java
index d800e9ccc8..0211a114e7 100644
--- a/xabber/src/main/java/com/xabber/android/ui/fragment/ContactListDrawerFragment.java
+++ b/xabber/src/main/java/com/xabber/android/ui/fragment/ContactListDrawerFragment.java
@@ -2,12 +2,12 @@
 
 
 import android.app.Activity;
-import android.support.v4.app.Fragment;
 import android.content.pm.PackageManager;
 import android.content.res.TypedArray;
 import android.os.Build;
 import android.os.Bundle;
 import android.support.annotation.Nullable;
+import android.support.v4.app.Fragment;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
 import android.view.LayoutInflater;
@@ -46,9 +46,15 @@
 import java.util.Collection;
 import java.util.List;
 
+import rx.android.schedulers.AndroidSchedulers;
+import rx.functions.Action1;
+import rx.schedulers.Schedulers;
+import rx.subscriptions.CompositeSubscription;
+
 public class ContactListDrawerFragment extends Fragment implements View.OnClickListener,
         OnAccountChangedListener, AdapterView.OnItemClickListener, AccountListPreferenceAdapter.Listener {
 
+    private CompositeSubscription compositeSubscription = new CompositeSubscription();
     ContactListDrawerListener listener;
     private ImageView drawerHeaderImage;
     private int[] headerImageResources;
@@ -148,6 +154,7 @@ public void onResume() {
             getActivity().getWindow().setStatusBarColor(ColorManager.getInstance().getAccountPainter().getDefaultMainColor());
         }
         update();
+        subscribeForXabberAccount();
     }
 
     @Override
@@ -155,6 +162,7 @@ public void onPause() {
         super.onPause();
         Application.getInstance().removeUIListener(OnAccountChangedListener.class, this);
         stopPatreonAnim();
+        compositeSubscription.clear();
     }
 
     @Override
@@ -184,14 +192,12 @@ public void onAccountsChanged(Collection<AccountJid> accounts) {
     }
 
     private void update() {
-
         Glide.with(this)
                 .fromResource()
                 .load(headerImageResources[AccountPainter.getDefaultAccountColorLevel()])
                 .fitCenter()
                 .into(drawerHeaderImage);
 
-        setupXabberAccountView();
         setupPatreonView();
         setupAccountList();
     }
@@ -205,9 +211,7 @@ public interface ContactListDrawerListener {
         void onAccountSelected(AccountJid account);
     }
 
-    private void setupXabberAccountView() {
-        XabberAccount account = XabberAccountManager.getInstance().getAccount();
-
+    private void setupXabberAccountView(XabberAccount account) {
         if (account != null) {
             llAccountInfo.setVisibility(View.VISIBLE);
             llNoAccount.setVisibility(View.GONE);
@@ -295,4 +299,16 @@ public void onDeleteAccount(AccountItem accountItem) {
         AccountDeleteDialog.newInstance(accountItem.getAccount()).show(getFragmentManager(),
                 AccountDeleteDialog.class.getName());
     }
+
+    private void subscribeForXabberAccount() {
+        compositeSubscription.add(XabberAccountManager.getInstance().subscribeForAccount()
+            .subscribeOn(Schedulers.io())
+            .observeOn(AndroidSchedulers.mainThread())
+            .doOnNext(new Action1<XabberAccount>() {
+                @Override
+                public void call(XabberAccount account) {
+                    setupXabberAccountView(account);
+                }
+            }).subscribe());
+    }
 }

From 83c4005d7f7672d04e8c8358738cbf19d1de3cdc Mon Sep 17 00:00:00 2001
From: Valery Miller <valera_miller94@mail.ru>
Date: Mon, 10 Sep 2018 12:43:01 +0500
Subject: [PATCH 072/251] Changes in Xabber Account item

---
 .../fragment/ContactListDrawerFragment.java   | 16 ++---
 .../main/res/layout/item_drawer_header.xml    |  2 +-
 .../main/res/layout/item_xabber_account.xml   | 58 +++++++++++++++++++
 3 files changed, 65 insertions(+), 11 deletions(-)
 create mode 100644 xabber/src/main/res/layout/item_xabber_account.xml

diff --git a/xabber/src/main/java/com/xabber/android/ui/fragment/ContactListDrawerFragment.java b/xabber/src/main/java/com/xabber/android/ui/fragment/ContactListDrawerFragment.java
index 0211a114e7..ad8604e4e2 100644
--- a/xabber/src/main/java/com/xabber/android/ui/fragment/ContactListDrawerFragment.java
+++ b/xabber/src/main/java/com/xabber/android/ui/fragment/ContactListDrawerFragment.java
@@ -16,7 +16,6 @@
 import android.widget.AdapterView;
 import android.widget.Button;
 import android.widget.ImageView;
-import android.widget.LinearLayout;
 import android.widget.ProgressBar;
 import android.widget.TextView;
 
@@ -59,10 +58,9 @@ public class ContactListDrawerFragment extends Fragment implements View.OnClickL
     private ImageView drawerHeaderImage;
     private int[] headerImageResources;
 
-    private LinearLayout llAccountInfo;
-    private LinearLayout llNoAccount;
     private TextView tvAccountName;
     private TextView tvAccountEmail;
+    private ImageView ivSync;
 
     private TextView tvPatreonTitle;
     private ProgressBar pbPatreon;
@@ -118,8 +116,7 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle sa
 
         view.findViewById(R.id.drawer_header_action_xabber_account).setOnClickListener(this);
 
-        llAccountInfo = (LinearLayout) view.findViewById(R.id.accountInfo);
-        llNoAccount = (LinearLayout) view.findViewById(R.id.noAccount);
+        ivSync = view.findViewById(R.id.ivSync);
         tvAccountName = (TextView) view.findViewById(R.id.tvAccountName);
         tvAccountEmail = (TextView) view.findViewById(R.id.tvAccountEmail);
 
@@ -213,17 +210,16 @@ public interface ContactListDrawerListener {
 
     private void setupXabberAccountView(XabberAccount account) {
         if (account != null) {
-            llAccountInfo.setVisibility(View.VISIBLE);
-            llNoAccount.setVisibility(View.GONE);
-
             String accountName = account.getFirstName() + " " + account.getLastName();
             if (accountName.trim().isEmpty()) accountName = getActivity().getString(R.string.title_xabber_account);
             tvAccountName.setText(accountName);
             tvAccountEmail.setText(account.getFullUsername());
+            ivSync.setImageResource(R.drawable.ic_sync_done);
 
         } else {
-            llAccountInfo.setVisibility(View.GONE);
-            llNoAccount.setVisibility(View.VISIBLE);
+            tvAccountName.setText(R.string.title_xabber_account);
+            tvAccountEmail.setText(R.string.not_login);
+            ivSync.setImageResource(R.drawable.ic_sync_disable);
         }
     }
 
diff --git a/xabber/src/main/res/layout/item_drawer_header.xml b/xabber/src/main/res/layout/item_drawer_header.xml
index 4ce85aec9d..d8af71694f 100644
--- a/xabber/src/main/res/layout/item_drawer_header.xml
+++ b/xabber/src/main/res/layout/item_drawer_header.xml
@@ -82,7 +82,7 @@
                 android:layout_alignParentBottom="true"
                 android:background="@drawable/ripple_background">
 
-                <include layout="@layout/item_nav_drawer_xabber_account" />
+                <include layout="@layout/item_xabber_account" />
 
             </LinearLayout>
 
diff --git a/xabber/src/main/res/layout/item_xabber_account.xml b/xabber/src/main/res/layout/item_xabber_account.xml
new file mode 100644
index 0000000000..92faefefb8
--- /dev/null
+++ b/xabber/src/main/res/layout/item_xabber_account.xml
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="48dp"
+    android:paddingRight="16dp"
+    android:paddingLeft="16dp"
+    >
+
+    <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        android:layout_centerVertical="true">
+
+        <TextView
+            android:id="@+id/tvAccountName"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="2dp"
+            android:textStyle="bold"
+            android:textColor="@color/white_text"
+            android:textSize="16sp"
+            android:shadowColor="@color/black"
+            android:shadowDy="2"
+            android:shadowDx="2"
+            android:shadowRadius="1"
+            android:text="@string/title_xabber_account"/>
+
+        <TextView
+            android:id="@+id/tvAccountEmail"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:ellipsize="marquee"
+            android:singleLine="true"
+            android:textColor="@color/white_text"
+            android:textSize="14sp"
+            android:shadowColor="@color/black"
+            android:shadowDy="2"
+            android:shadowDx="2"
+            android:shadowRadius="1"
+            android:text="@string/not_login"
+            />
+
+    </LinearLayout>
+
+    <ImageView
+        android:id="@+id/ivSync"
+        android:layout_width="24dp"
+        android:layout_height="24dp"
+        android:src="@drawable/ic_sync_disable"
+        android:layout_centerVertical="true"
+        android:layout_alignParentEnd="true"
+        android:layout_alignParentRight="true"
+        android:tint="@color/white"
+        />
+
+</RelativeLayout>
\ No newline at end of file

From 12bdc0d46655d48ea908da1848ecf1d329644c44 Mon Sep 17 00:00:00 2001
From: Valery Miller <valera_miller94@mail.ru>
Date: Mon, 10 Sep 2018 15:05:50 +0500
Subject: [PATCH 073/251] Changes in choose account dialog

---
 .../ui/activity/ContactListActivity.java      | 32 +++++++++++------
 .../ui/activity/XabberAccountActivity.java    |  2 +-
 .../ui/adapter/XMPPAccountAuthAdapter.java    | 10 +++---
 .../ui/fragment/XAccountXMPPAuthFragment.java | 36 ++++++++++---------
 .../layout/fragment_xaccount_xmpp_auth.xml    | 31 +++++-----------
 xabber/src/main/res/values/xabber_account.xml |  2 ++
 6 files changed, 58 insertions(+), 55 deletions(-)

diff --git a/xabber/src/main/java/com/xabber/android/ui/activity/ContactListActivity.java b/xabber/src/main/java/com/xabber/android/ui/activity/ContactListActivity.java
index fb612b847c..e0f2c07b4c 100644
--- a/xabber/src/main/java/com/xabber/android/ui/activity/ContactListActivity.java
+++ b/xabber/src/main/java/com/xabber/android/ui/activity/ContactListActivity.java
@@ -74,6 +74,7 @@
 import com.xabber.android.ui.dialog.MucPrivateChatInvitationDialog;
 import com.xabber.android.ui.dialog.TranslationDialog;
 import com.xabber.android.ui.fragment.ContactListDrawerFragment;
+import com.xabber.android.ui.fragment.XAccountXMPPAuthFragment;
 import com.xabber.android.ui.preferences.PreferenceEditor;
 import com.xabber.android.ui.widget.bottomnavigation.BottomMenu;
 import com.xabber.xmpp.uri.XMPPUri;
@@ -99,7 +100,7 @@
  */
 public class ContactListActivity extends ManagedActivity implements OnAccountChangedListener,
         View.OnClickListener, OnChooseListener, ContactListFragment.ContactListFragmentListener,
-        ContactListDrawerFragment.ContactListDrawerListener,
+        ContactListDrawerFragment.ContactListDrawerListener, XAccountXMPPAuthFragment.Listener,
         BottomMenu.OnClickListener {
 
     /**
@@ -720,15 +721,7 @@ public void onContactListDrawerListener(int viewId) {
                 startActivity(PreferenceEditor.createIntent(this));
                 break;
             case R.id.drawer_header_action_xabber_account:
-                XabberAccount account = XabberAccountManager.getInstance().getAccount();
-                if (account != null) startActivity(XabberAccountActivity.createIntent(this, false));
-                else {
-                    // TODO: 07.09.18 запрос списка аккаунтов вынести из UI ?
-                    ArrayList<AccountJid> accounts = new ArrayList<>(AccountManager.getInstance().getEnabledAccounts());
-                    if (accounts.size() < 1) return;
-                    if (accounts.size() > 1) startActivity(XabberAccountActivity.createIntent(this, false));
-                    else loginXabberAccountViaXMPP(accounts.get(0).getFullJid().toString());
-                }
+                onXabberAccountClick();
                 break;
             case R.id.drawer_action_patreon:
                 startActivity(PatreonAppealActivity.createIntent(this));
@@ -779,6 +772,25 @@ public void onSearchClick() {
         } else showContactListFragment(null);
     }
 
+    @Override
+    public void onAccountClick(String accountJid) {
+        loginXabberAccountViaXMPP(accountJid);
+    }
+
+    private void onXabberAccountClick() {
+        XabberAccount account = XabberAccountManager.getInstance().getAccount();
+        if (account != null) startActivity(XabberAccountActivity.createIntent(this, false));
+        else {
+            // TODO: 07.09.18 запрос списка аккаунтов вынести из UI ?
+            ArrayList<AccountJid> accounts = new ArrayList<>(AccountManager.getInstance().getEnabledAccounts());
+            if (accounts.size() < 1) return;
+            if (accounts.size() > 1)
+                XAccountXMPPAuthFragment.newInstance(null, accounts)
+                    .show(getFragmentManager(), XAccountXMPPAuthFragment.class.getSimpleName());
+            else onAccountClick(accounts.get(0).getFullJid().toString());
+        }
+    }
+
     private void showBottomNavigation() {
         if (!isFinishing()) {
             if (bottomMenu == null)
diff --git a/xabber/src/main/java/com/xabber/android/ui/activity/XabberAccountActivity.java b/xabber/src/main/java/com/xabber/android/ui/activity/XabberAccountActivity.java
index c716ab2873..5a42313b2c 100644
--- a/xabber/src/main/java/com/xabber/android/ui/activity/XabberAccountActivity.java
+++ b/xabber/src/main/java/com/xabber/android/ui/activity/XabberAccountActivity.java
@@ -230,7 +230,7 @@ private void showInfoFragment() {
 
     private void showXMPPAuthFragment() {
         if (fragmentXMPPAuth == null)
-            fragmentXMPPAuth = XAccountXMPPAuthFragment.newInstance(this);
+            //fragmentXMPPAuth = XAccountXMPPAuthFragment.newInstance(this);
 
         fTrans = getFragmentManager().beginTransaction();
         fTrans.replace(R.id.container, fragmentXMPPAuth, FRAGMENT_XMPP_AUTH);
diff --git a/xabber/src/main/java/com/xabber/android/ui/adapter/XMPPAccountAuthAdapter.java b/xabber/src/main/java/com/xabber/android/ui/adapter/XMPPAccountAuthAdapter.java
index 15eba8de96..2c1690fcf0 100644
--- a/xabber/src/main/java/com/xabber/android/ui/adapter/XMPPAccountAuthAdapter.java
+++ b/xabber/src/main/java/com/xabber/android/ui/adapter/XMPPAccountAuthAdapter.java
@@ -9,6 +9,8 @@
 
 import com.xabber.android.R;
 import com.xabber.android.data.account.AccountItem;
+import com.xabber.android.data.account.AccountManager;
+import com.xabber.android.data.entity.AccountJid;
 import com.xabber.android.data.extension.avatar.AvatarManager;
 import com.xabber.android.data.extension.privatestorage.PrivateStorageManager;
 import com.xabber.android.ui.color.ColorManager;
@@ -21,7 +23,7 @@
 
 public class XMPPAccountAuthAdapter extends RecyclerView.Adapter {
 
-    private List<AccountItem> items;
+    private List<AccountJid> items;
     private Listener listener;
 
     public XMPPAccountAuthAdapter(Listener listener) {
@@ -32,7 +34,7 @@ public interface Listener {
         void onAccountClick(String accountJid);
     }
 
-    public void setItems(List<AccountItem> items) {
+    public void setItems(List<AccountJid> items) {
         this.items = items;
         notifyDataSetChanged();
     }
@@ -45,7 +47,7 @@ public RecyclerView.ViewHolder onCreateViewHolder(ViewGroup parent, int viewType
 
     @Override
     public void onBindViewHolder(RecyclerView.ViewHolder holder, int position) {
-        final AccountItem account = items.get(position);
+        final AccountItem account = AccountManager.getInstance().getAccount(items.get(position));
         XMPPAccountVH viewHolder = (XMPPAccountVH) holder;
 
         // set color
@@ -63,7 +65,7 @@ public void onBindViewHolder(RecyclerView.ViewHolder holder, int position) {
 
         // set action
         boolean haveBind = PrivateStorageManager.getInstance().haveXabberAccountBinding(account.getAccount());
-        viewHolder.action.setText(haveBind ? "also binded for Xabber Account" : "will be created new Xabber Account");
+        viewHolder.action.setText(haveBind ? R.string.xaccount_exist : R.string.xaccount_not_exist);
 
         // set listener
         viewHolder.itemView.setOnClickListener(new View.OnClickListener() {
diff --git a/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountXMPPAuthFragment.java b/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountXMPPAuthFragment.java
index 8b4faea1ff..3fa666faf2 100644
--- a/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountXMPPAuthFragment.java
+++ b/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountXMPPAuthFragment.java
@@ -1,49 +1,50 @@
 package com.xabber.android.ui.fragment;
 
-import android.app.Fragment;
+import android.app.AlertDialog;
+import android.app.Dialog;
+import android.app.DialogFragment;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
-import android.view.ViewGroup;
 
 import com.xabber.android.R;
-import com.xabber.android.data.account.AccountItem;
-import com.xabber.android.data.account.AccountManager;
+import com.xabber.android.data.entity.AccountJid;
 import com.xabber.android.ui.adapter.XMPPAccountAuthAdapter;
 
 import java.util.ArrayList;
 import java.util.List;
 
-public class XAccountXMPPAuthFragment extends Fragment implements XMPPAccountAuthAdapter.Listener {
+public class XAccountXMPPAuthFragment extends DialogFragment implements XMPPAccountAuthAdapter.Listener {
 
-    private List<AccountItem> xmppAccounts = new ArrayList<>();
+    private List<AccountJid> xmppAccounts = new ArrayList<>();
     private Listener listener;
 
     public interface Listener {
         void onAccountClick(String accountJid);
     }
 
-    public static XAccountXMPPAuthFragment newInstance(Listener listener) {
+    public static XAccountXMPPAuthFragment newInstance(Listener listener, ArrayList<AccountJid> items) {
         XAccountXMPPAuthFragment fragment = new XAccountXMPPAuthFragment();
         fragment.listener = listener;
+        fragment.xmppAccounts = items;
         return fragment;
     }
 
-    @Nullable
     @Override
-    public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, Bundle savedInstanceState) {
-        return inflater.inflate(R.layout.fragment_xaccount_xmpp_auth, container, false);
-    }
+    public Dialog onCreateDialog(Bundle savedInstanceState) {
 
-    @Override
-    public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
-        super.onViewCreated(view, savedInstanceState);
+        AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
+        builder.setView(setupView())
+                .setTitle(R.string.choose_account);
+
+        return builder.create();
+    }
 
-        xmppAccounts.clear();
-        xmppAccounts.addAll(AccountManager.getInstance().getAllAccountItems());
+    public View setupView() {
+        LayoutInflater inflater = getActivity().getLayoutInflater();
+        View view = inflater.inflate(R.layout.fragment_xaccount_xmpp_auth, null);
 
         XMPPAccountAuthAdapter adapter = new XMPPAccountAuthAdapter(this);
         adapter.setItems(xmppAccounts);
@@ -51,6 +52,7 @@ public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
         RecyclerView recyclerView = view.findViewById(R.id.rlAccounts);
         recyclerView.setLayoutManager(new LinearLayoutManager(getActivity()));
         recyclerView.setAdapter(adapter);
+        return view;
     }
 
     @Override
diff --git a/xabber/src/main/res/layout/fragment_xaccount_xmpp_auth.xml b/xabber/src/main/res/layout/fragment_xaccount_xmpp_auth.xml
index 0219ffb182..2a4f5006d6 100644
--- a/xabber/src/main/res/layout/fragment_xaccount_xmpp_auth.xml
+++ b/xabber/src/main/res/layout/fragment_xaccount_xmpp_auth.xml
@@ -8,30 +8,15 @@
     android:background="@color/cardview_light_background"
     >
 
-    <LinearLayout
+    <android.support.v7.widget.RecyclerView
+        android:id="@+id/rlAccounts"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:orientation="vertical"
-        android:layout_centerInParent="true"
-        android:layout_marginLeft="32dp"
-        android:layout_marginRight="32dp"
-        >
+        tools:listitem="@layout/item_xmpp_account_choose"
+        android:layout_marginBottom="12dp"
+        android:layout_marginTop="8dp"
+        android:layout_marginRight="8dp"
+        android:layout_marginLeft="8dp"
+        />
 
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_margin="8dp"
-            android:text="Choose account that will be used for registration Xabber Account:"
-            android:textSize="18sp"
-            android:gravity="center"
-            />
-
-        <android.support.v7.widget.RecyclerView
-            android:id="@+id/rlAccounts"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            tools:listitem="@layout/item_xmpp_account_choose"
-            />
-
-    </LinearLayout>
 </RelativeLayout>
\ No newline at end of file
diff --git a/xabber/src/main/res/values/xabber_account.xml b/xabber/src/main/res/values/xabber_account.xml
index 4221f2055c..a7f10b09a1 100644
--- a/xabber/src/main/res/values/xabber_account.xml
+++ b/xabber/src/main/res/values/xabber_account.xml
@@ -190,4 +190,6 @@
     <string name="patreon_appeal_url" translatable="false">https://www.xabber.com/appeal/</string>
 
     <string name="xmpp_confirm_title">Enter confirmation code that was send to %1$s</string>
+    <string name="xaccount_not_exist">Will create new account</string>
+    <string name="xaccount_exist">Xabber Account exists</string>
 </resources>
\ No newline at end of file

From b56d20729aded1dd19c196fb8d5c7278debf07b2 Mon Sep 17 00:00:00 2001
From: Valery Miller <valera_miller94@mail.ru>
Date: Mon, 10 Sep 2018 15:25:31 +0500
Subject: [PATCH 074/251] Changes in choose account dialog

---
 .../ui/activity/ContactListActivity.java      |   8 +-
 .../ui/activity/XabberAccountActivity.java    | 129 +-----------------
 ...va => ChooseAccountForXMPPAuthDialog.java} |   7 +-
 .../fragment/XabberAccountInfoFragment.java   |  11 +-
 4 files changed, 16 insertions(+), 139 deletions(-)
 rename xabber/src/main/java/com/xabber/android/ui/fragment/{XAccountXMPPAuthFragment.java => ChooseAccountForXMPPAuthDialog.java} (84%)

diff --git a/xabber/src/main/java/com/xabber/android/ui/activity/ContactListActivity.java b/xabber/src/main/java/com/xabber/android/ui/activity/ContactListActivity.java
index e0f2c07b4c..690a502f70 100644
--- a/xabber/src/main/java/com/xabber/android/ui/activity/ContactListActivity.java
+++ b/xabber/src/main/java/com/xabber/android/ui/activity/ContactListActivity.java
@@ -74,7 +74,7 @@
 import com.xabber.android.ui.dialog.MucPrivateChatInvitationDialog;
 import com.xabber.android.ui.dialog.TranslationDialog;
 import com.xabber.android.ui.fragment.ContactListDrawerFragment;
-import com.xabber.android.ui.fragment.XAccountXMPPAuthFragment;
+import com.xabber.android.ui.fragment.ChooseAccountForXMPPAuthDialog;
 import com.xabber.android.ui.preferences.PreferenceEditor;
 import com.xabber.android.ui.widget.bottomnavigation.BottomMenu;
 import com.xabber.xmpp.uri.XMPPUri;
@@ -100,7 +100,7 @@
  */
 public class ContactListActivity extends ManagedActivity implements OnAccountChangedListener,
         View.OnClickListener, OnChooseListener, ContactListFragment.ContactListFragmentListener,
-        ContactListDrawerFragment.ContactListDrawerListener, XAccountXMPPAuthFragment.Listener,
+        ContactListDrawerFragment.ContactListDrawerListener, ChooseAccountForXMPPAuthDialog.Listener,
         BottomMenu.OnClickListener {
 
     /**
@@ -785,8 +785,8 @@ private void onXabberAccountClick() {
             ArrayList<AccountJid> accounts = new ArrayList<>(AccountManager.getInstance().getEnabledAccounts());
             if (accounts.size() < 1) return;
             if (accounts.size() > 1)
-                XAccountXMPPAuthFragment.newInstance(null, accounts)
-                    .show(getFragmentManager(), XAccountXMPPAuthFragment.class.getSimpleName());
+                ChooseAccountForXMPPAuthDialog.newInstance(this, accounts)
+                    .show(getFragmentManager(), ChooseAccountForXMPPAuthDialog.class.getSimpleName());
             else onAccountClick(accounts.get(0).getFullJid().toString());
         }
     }
diff --git a/xabber/src/main/java/com/xabber/android/ui/activity/XabberAccountActivity.java b/xabber/src/main/java/com/xabber/android/ui/activity/XabberAccountActivity.java
index 5a42313b2c..91c334fc17 100644
--- a/xabber/src/main/java/com/xabber/android/ui/activity/XabberAccountActivity.java
+++ b/xabber/src/main/java/com/xabber/android/ui/activity/XabberAccountActivity.java
@@ -15,12 +15,9 @@
 import com.xabber.android.R;
 import com.xabber.android.data.connection.NetworkManager;
 import com.xabber.android.data.xaccount.AuthManager;
-import com.xabber.android.data.xaccount.XMPPAuthManager;
 import com.xabber.android.data.xaccount.XabberAccount;
 import com.xabber.android.data.xaccount.XabberAccountManager;
 import com.xabber.android.ui.color.BarPainter;
-import com.xabber.android.ui.fragment.XAccountXMPPAuthFragment;
-import com.xabber.android.ui.fragment.XAccountXMPPConfirmFragment;
 import com.xabber.android.ui.fragment.XabberAccountInfoFragment;
 import com.xabber.android.utils.RetrofitErrorConverter;
 
@@ -31,19 +28,14 @@
 import rx.schedulers.Schedulers;
 
 public class XabberAccountActivity extends BaseLoginActivity
-        implements XAccountXMPPAuthFragment.Listener, XAccountXMPPConfirmFragment.Listener,
-                    XabberAccountInfoFragment.Listener {
+        implements XabberAccountInfoFragment.Listener {
 
     private final static String LOG_TAG = XabberAccountActivity.class.getSimpleName();
     private final static String FRAGMENT_INFO = "fragment_info";
-    private final static String FRAGMENT_XMPP_AUTH = "fragment_xmpp_auth";
-    private final static String FRAGMENT_XMPP_CONFIRM = "fragment_xmpp_confirm";
     private final static String SHOW_SYNC = "show_sync";
 
     private FragmentTransaction fTrans;
     private Fragment fragmentInfo;
-    private Fragment fragmentXMPPAuth;
-    private Fragment fragmentXMPPConfirm;
 
     private Toolbar toolbar;
     private BarPainter barPainter;
@@ -88,7 +80,7 @@ protected void onResume() {
 
         XabberAccount account = XabberAccountManager.getInstance().getAccount();
         if (account != null) showInfoFragment();
-        else showXMPPAuthFragment();
+        else finish();
     }
 
     @Override
@@ -115,29 +107,6 @@ protected void hideProgress() {
         }
     }
 
-    /** XMPP Auth */
-
-    @Override
-    public void onAccountClick(String accountJid) {
-        if (NetworkManager.isNetworkAvailable()) {
-            requestXMPPCode(accountJid);
-        } else
-            Toast.makeText(this, R.string.toast_no_internet, Toast.LENGTH_LONG).show();
-    }
-
-    @Override
-    public void onConfirmXMPPClick(String jid, String code) {
-        if (NetworkManager.isNetworkAvailable()) {
-            confirmXMPP(code, jid);
-        } else
-            Toast.makeText(this, R.string.toast_no_internet, Toast.LENGTH_LONG).show();
-    }
-
-    @Override
-    public void onResendClick(String jid) {
-        onAccountClick(jid);
-    }
-
     /** Social Auth */
 
     @Override
@@ -179,11 +148,6 @@ public void call(Throwable throwable) {
 
     /** Xabber Account Info */
 
-    @Override
-    public void needXMPPAuthFragment() {
-        showXMPPAuthFragment();
-    }
-
     @Override
     public void onLogoutClick(boolean deleteAccounts) {
         if (NetworkManager.isNetworkAvailable()) {
@@ -228,32 +192,6 @@ private void showInfoFragment() {
         barPainter.setDefaultColor();
     }
 
-    private void showXMPPAuthFragment() {
-        if (fragmentXMPPAuth == null)
-            //fragmentXMPPAuth = XAccountXMPPAuthFragment.newInstance(this);
-
-        fTrans = getFragmentManager().beginTransaction();
-        fTrans.replace(R.id.container, fragmentXMPPAuth, FRAGMENT_XMPP_AUTH);
-        fTrans.commit();
-
-        toolbar.setTitle(R.string.title_register_xabber_account);
-        barPainter.setBlue(this);
-    }
-
-    private void showXMPPConfirmFragment(String jid) {
-        if (fragmentXMPPConfirm == null)
-            fragmentXMPPConfirm = XAccountXMPPConfirmFragment.newInstance(this);
-
-        ((XAccountXMPPConfirmFragment)fragmentXMPPConfirm).setJid(jid);
-
-        fTrans = getFragmentManager().beginTransaction();
-        fTrans.replace(R.id.container, fragmentXMPPConfirm, FRAGMENT_XMPP_CONFIRM);
-        fTrans.commit();
-
-        toolbar.setTitle(R.string.title_register_xabber_account);
-        barPainter.setBlue(this);
-    }
-
     @Override
     protected void updateAccountInfo(XabberAccount account) {
         if (account != null) {
@@ -319,69 +257,6 @@ private void handleErrorLogout(Throwable throwable) {
         hideProgress();
     }
 
-    /** REQUEST XMPP CODE */
-
-    private void requestXMPPCode(final String jid) {
-        showProgress(getResources().getString(R.string.progress_title_request_xmpp_auth));
-        Subscription requestXMPPCodeSubscription = AuthManager.requestXMPPCode(jid)
-                .subscribeOn(Schedulers.io())
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(new Action1<AuthManager.XMPPCode>() {
-                    @Override
-                    public void call(AuthManager.XMPPCode code) {
-                        handleSuccessRequestXMPPCode(code, jid);
-                    }
-                }, new Action1<Throwable>() {
-                    @Override
-                    public void call(Throwable throwable) {
-                        handleErrorRequestXMPPCode(throwable);
-                    }
-                });
-        compositeSubscription.add(requestXMPPCodeSubscription);
-    }
-
-    private void handleSuccessRequestXMPPCode(AuthManager.XMPPCode code, String jid) {
-        hideProgress();
-        XMPPAuthManager.getInstance().addRequest(code.getRequestId(), code.getApiJid(), jid);
-        showXMPPConfirmFragment(jid);
-    }
-
-    private void handleErrorRequestXMPPCode(Throwable throwable) {
-        hideProgress();
-        handleError(throwable, "Error while request XMPP auth-code: ", LOG_TAG);
-    }
-
-    /** CONFIRM XMPP */
-
-    private void confirmXMPP(String code, String jid) {
-        showProgress(getResources().getString(R.string.progress_title_confirm_xmpp));
-        Subscription confirmXMPPSubscription = AuthManager.confirmXMPP(jid, code)
-                .subscribeOn(Schedulers.io())
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(new Action1<XabberAccount>() {
-                    @Override
-                    public void call(XabberAccount account) {
-                        handleSuccessConfirmXMPP(account);
-                    }
-                }, new Action1<Throwable>() {
-                    @Override
-                    public void call(Throwable throwable) {
-                        handleErrorConfirmXMPP(throwable);
-                    }
-                });
-        compositeSubscription.add(confirmXMPPSubscription);
-    }
-
-    private void handleSuccessConfirmXMPP(XabberAccount account) {
-        hideProgress();
-        showInfoFragment();
-    }
-
-    private void handleErrorConfirmXMPP(Throwable throwable) {
-        hideProgress();
-        handleError(throwable, "Error while confirming XMPP-account: ", LOG_TAG);
-    }
-
     /** ADD EMAIL */
 
     private void resendConfirmEmail(String email) {
diff --git a/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountXMPPAuthFragment.java b/xabber/src/main/java/com/xabber/android/ui/fragment/ChooseAccountForXMPPAuthDialog.java
similarity index 84%
rename from xabber/src/main/java/com/xabber/android/ui/fragment/XAccountXMPPAuthFragment.java
rename to xabber/src/main/java/com/xabber/android/ui/fragment/ChooseAccountForXMPPAuthDialog.java
index 3fa666faf2..197c892af9 100644
--- a/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountXMPPAuthFragment.java
+++ b/xabber/src/main/java/com/xabber/android/ui/fragment/ChooseAccountForXMPPAuthDialog.java
@@ -16,7 +16,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
-public class XAccountXMPPAuthFragment extends DialogFragment implements XMPPAccountAuthAdapter.Listener {
+public class ChooseAccountForXMPPAuthDialog extends DialogFragment implements XMPPAccountAuthAdapter.Listener {
 
     private List<AccountJid> xmppAccounts = new ArrayList<>();
     private Listener listener;
@@ -25,8 +25,8 @@ public interface Listener {
         void onAccountClick(String accountJid);
     }
 
-    public static XAccountXMPPAuthFragment newInstance(Listener listener, ArrayList<AccountJid> items) {
-        XAccountXMPPAuthFragment fragment = new XAccountXMPPAuthFragment();
+    public static ChooseAccountForXMPPAuthDialog newInstance(Listener listener, ArrayList<AccountJid> items) {
+        ChooseAccountForXMPPAuthDialog fragment = new ChooseAccountForXMPPAuthDialog();
         fragment.listener = listener;
         fragment.xmppAccounts = items;
         return fragment;
@@ -58,5 +58,6 @@ public View setupView() {
     @Override
     public void onAccountClick(String accountJid) {
         listener.onAccountClick(accountJid);
+        dismiss();
     }
 }
diff --git a/xabber/src/main/java/com/xabber/android/ui/fragment/XabberAccountInfoFragment.java b/xabber/src/main/java/com/xabber/android/ui/fragment/XabberAccountInfoFragment.java
index 8660ba819f..98f033e98c 100644
--- a/xabber/src/main/java/com/xabber/android/ui/fragment/XabberAccountInfoFragment.java
+++ b/xabber/src/main/java/com/xabber/android/ui/fragment/XabberAccountInfoFragment.java
@@ -86,7 +86,6 @@ public interface Listener {
         void onConfirmEmailClick(String email, String code);
         void onLogoutClick(boolean deleteAccounts);
         void onSyncClick(boolean needGoToMainActivity);
-        void needXMPPAuthFragment();
     }
 
     public static XabberAccountInfoFragment newInstance(Listener listener) {
@@ -191,9 +190,11 @@ public void onResume() {
         super.onResume();
 
         XabberAccount account = XabberAccountManager.getInstance().getAccount();
-        if (account != null) updateData(account);
-        else listener.needXMPPAuthFragment();
-        updateLastSyncTime();
+        if (account != null) {
+            updateData(account);
+            updateLastSyncTime();
+        }
+        else getActivity().finish();
     }
 
     @Override
@@ -285,8 +286,8 @@ private void handleErrorGetSettings(Throwable throwable) {
         if (message != null) {
             if (message.equals("Invalid token")) {
                 XabberAccountManager.getInstance().onInvalidToken();
-                listener.needXMPPAuthFragment();
                 Toast.makeText(getActivity(), R.string.account_deleted, Toast.LENGTH_LONG).show();
+                getActivity().finish();
             } else {
                 Log.d(LOG_TAG, "Error while synchronization: " + message);
                 Toast.makeText(getActivity(), message, Toast.LENGTH_SHORT).show();

From a50398ffc0b0b85b3ba1751a685caed6832d9ed2 Mon Sep 17 00:00:00 2001
From: Valery Miller <valera_miller94@mail.ru>
Date: Mon, 10 Sep 2018 17:27:57 +0500
Subject: [PATCH 075/251] Change in Xabber Account screen

---
 .../ui/activity/XabberAccountActivity.java    |   5 +-
 .../fragment/XabberAccountInfoFragment.java   |  20 +-
 .../src/main/res/drawable/ic_chevron_up.xml   |  10 +
 .../res/layout/fragment_xaccount_info.xml     | 452 ++++++++++++++++++
 4 files changed, 484 insertions(+), 3 deletions(-)
 create mode 100644 xabber/src/main/res/drawable/ic_chevron_up.xml
 create mode 100644 xabber/src/main/res/layout/fragment_xaccount_info.xml

diff --git a/xabber/src/main/java/com/xabber/android/ui/activity/XabberAccountActivity.java b/xabber/src/main/java/com/xabber/android/ui/activity/XabberAccountActivity.java
index 91c334fc17..7db851bd2d 100644
--- a/xabber/src/main/java/com/xabber/android/ui/activity/XabberAccountActivity.java
+++ b/xabber/src/main/java/com/xabber/android/ui/activity/XabberAccountActivity.java
@@ -56,7 +56,7 @@ protected void onCreate(Bundle savedInstanceState) {
         setContentView(R.layout.activity_xabber_account_info);
 
         toolbar = (Toolbar) findViewById(R.id.toolbar_default);
-        toolbar.setNavigationIcon(R.drawable.ic_arrow_left_white_24dp);
+        toolbar.setNavigationIcon(R.drawable.ic_arrow_left);
         toolbar.setNavigationOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
@@ -64,6 +64,7 @@ public void onClick(View v) {
             }
         });
         toolbar.inflateMenu(R.menu.toolbar_xabber_account_info);
+        toolbar.setTitleTextColor(getResources().getColor(R.color.black_text));
         barPainter = new BarPainter(this, toolbar);
     }
 
@@ -189,7 +190,7 @@ private void showInfoFragment() {
         fTrans.commit();
 
         toolbar.setTitle(R.string.title_xabber_account);
-        barPainter.setDefaultColor();
+        barPainter.setLiteGrey();
     }
 
     @Override
diff --git a/xabber/src/main/java/com/xabber/android/ui/fragment/XabberAccountInfoFragment.java b/xabber/src/main/java/com/xabber/android/ui/fragment/XabberAccountInfoFragment.java
index 98f033e98c..b48dba28dc 100644
--- a/xabber/src/main/java/com/xabber/android/ui/fragment/XabberAccountInfoFragment.java
+++ b/xabber/src/main/java/com/xabber/android/ui/fragment/XabberAccountInfoFragment.java
@@ -15,6 +15,7 @@
 import android.view.ViewGroup;
 import android.widget.Button;
 import android.widget.CheckBox;
+import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
@@ -74,6 +75,10 @@ public class XabberAccountInfoFragment extends Fragment implements AddEmailDialo
     private EmailAdapter emailAdapter;
     private Button btnAddEmail;
 
+    private View viewShowLinks;
+    private View viewLinks;
+    private ImageView ivChevron;
+
     private boolean dialogShowed;
 
     private CompositeSubscription compositeSubscription = new CompositeSubscription();
@@ -97,7 +102,7 @@ public static XabberAccountInfoFragment newInstance(Listener listener) {
     @Nullable
     @Override
     public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
-        return inflater.inflate(R.layout.fragment_xabber_account_info, container, false);
+        return inflater.inflate(R.layout.fragment_xaccount_info, container, false);
     }
 
     @Override
@@ -132,6 +137,19 @@ public void onClick(View v) {
             }
         });
 
+        ivChevron = view.findViewById(R.id.ivChevron);
+        viewLinks = view.findViewById(R.id.viewLinks);
+        viewShowLinks = view.findViewById(R.id.viewShowLinks);
+        viewShowLinks.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                viewLinks.setVisibility(viewLinks.getVisibility() == View.VISIBLE
+                        ? View.GONE : View.VISIBLE );
+                ivChevron.setImageResource(viewLinks.getVisibility() == View.VISIBLE
+                        ? R.drawable.ic_chevron_up : R.drawable.ic_chevron_down);
+            }
+        });
+
         tvStatusGoogle = view.findViewById(R.id.tvStatusGoogle);
         tvActionGoogle = view.findViewById(R.id.tvActionGoogle);
         itemGoogle = view.findViewById(R.id.itemGoogle);
diff --git a/xabber/src/main/res/drawable/ic_chevron_up.xml b/xabber/src/main/res/drawable/ic_chevron_up.xml
new file mode 100644
index 0000000000..f718a97485
--- /dev/null
+++ b/xabber/src/main/res/drawable/ic_chevron_up.xml
@@ -0,0 +1,10 @@
+<!-- drawable/chevron_up.xml -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path android:fillColor="?attr/contact_list_account_group_small_right_icon_color"
+        android:fillAlpha="0.5"
+        android:pathData="M7.41,15.41L12,10.83L16.59,15.41L18,14L12,8L6,14L7.41,15.41Z" />
+</vector>
\ No newline at end of file
diff --git a/xabber/src/main/res/layout/fragment_xaccount_info.xml b/xabber/src/main/res/layout/fragment_xaccount_info.xml
new file mode 100644
index 0000000000..27c6ea1216
--- /dev/null
+++ b/xabber/src/main/res/layout/fragment_xaccount_info.xml
@@ -0,0 +1,452 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="?attr/settings_background_color">
+
+    <android.support.v7.widget.CardView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        >
+
+        <LinearLayout
+            android:orientation="vertical"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            >
+
+            <LinearLayout
+                android:id="@+id/llAccount"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:paddingLeft="16dp"
+                android:paddingRight="16dp"
+                android:paddingTop="16dp"
+                android:paddingBottom="16dp"
+                >
+
+                <FrameLayout
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical">
+
+                    <de.hdodenhof.circleimageview.CircleImageView
+                        android:id="@+id/color"
+                        android:layout_width="40dp"
+                        android:layout_height="40dp"
+                        android:src="@color/account_register_blue" />
+
+                    <de.hdodenhof.circleimageview.CircleImageView
+                        android:id="@+id/avatar"
+                        android:layout_width="30dp"
+                        android:layout_height="30dp"
+                        android:layout_gravity="center"
+                        android:src="@drawable/ic_stat_online"
+                        app:civ_border_color="@android:color/transparent"
+                        app:civ_border_width="3dp" />
+
+                </FrameLayout>
+
+                <LinearLayout
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
+                    android:layout_weight="1"
+                    android:orientation="vertical"
+                    android:paddingLeft="16dp">
+
+                    <LinearLayout
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:orientation="horizontal"
+                        >
+
+                        <TextView
+                            android:id="@+id/tvAccountName"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="1"
+                            android:singleLine="true"
+                            android:textSize="16sp"
+                            android:textColor="@color/black_text"
+                            />
+
+                        <TextView
+                            android:id="@+id/tvLanguage"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginLeft="8dp"
+                            android:paddingTop="0dp"
+                            android:paddingBottom="0dp"
+                            android:paddingLeft="6dp"
+                            android:paddingRight="6dp"
+                            android:singleLine="true"
+                            android:textColor="@color/white"
+                            android:textStyle="bold"
+                            android:textAllCaps="true"
+                            android:background="@drawable/rounded_background_grey"
+                            />
+
+                    </LinearLayout>
+
+                    <TextView
+                        android:id="@+id/tvAccountUsername"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:singleLine="true"
+                        android:text="@string/no_username"
+                        android:textColor="@color/grey_500"
+                        android:textSize="14sp" />
+
+                    <TextView
+                        android:id="@+id/tvPhoneNumber"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:singleLine="true"
+                        android:text="@string/no_phone"
+                        android:textColor="@color/grey_500"
+                        android:textSize="14sp" />
+
+                </LinearLayout>
+            </LinearLayout>
+
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="1dp"
+                android:background="?attr/settings_separator_background_color"
+                />
+
+            <LinearLayout
+                android:id="@+id/viewShowLinks"
+                android:layout_width="match_parent"
+                android:layout_height="40dp"
+                android:orientation="horizontal"
+                android:background="?android:attr/selectableItemBackground"
+                >
+
+                <ImageView
+                    android:id="@+id/ivChevron"
+                    android:layout_width="24dp"
+                    android:layout_height="24dp"
+                    android:src="@drawable/ic_chevron_down"
+                    android:layout_gravity="center_vertical"
+                    android:layout_marginLeft="24dp"
+                    />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="No linked social accounts or emails"
+                    android:layout_marginLeft="24dp"
+                    android:layout_gravity="center_vertical"
+                    />
+
+            </LinearLayout>
+
+            <LinearLayout
+                android:id="@+id/viewLinks"
+                android:orientation="vertical"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:visibility="gone"
+                >
+
+                <LinearLayout
+                    android:id="@+id/itemGoogle"
+                    android:layout_width="match_parent"
+                    android:layout_height="48dp"
+                    android:paddingLeft="24dp"
+                    android:paddingRight="16dp"
+                    android:paddingTop="8dp"
+                    android:paddingBottom="8dp"
+                    android:clickable="true"
+                    android:background="?android:attr/selectableItemBackground"
+                    >
+
+                    <ImageView
+                        android:layout_width="24dp"
+                        android:layout_height="24dp"
+                        android:src="@drawable/ic_google_plus"
+                        android:layout_gravity="center_vertical"
+                        />
+
+                    <TextView
+                        android:id="@+id/tvStatusGoogle"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center_vertical"
+                        android:layout_marginLeft="24dp"
+                        android:textColor="@color/grey_500"
+                        android:text="Not connected"
+                        />
+
+                    <TextView
+                        android:id="@+id/tvActionGoogle"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="24dp"
+                        android:gravity="right"
+                        android:layout_gravity="center_vertical"
+                        android:textColor="@color/grey_500"
+                        android:text="@string/action_connect"
+                        />
+
+                </LinearLayout>
+
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="1dp"
+                    android:background="?attr/settings_separator_background_color"
+                    />
+
+                <LinearLayout
+                    android:id="@+id/itemFacebook"
+                    android:layout_width="match_parent"
+                    android:layout_height="48dp"
+                    android:paddingLeft="24dp"
+                    android:paddingRight="16dp"
+                    android:paddingTop="8dp"
+                    android:paddingBottom="8dp"
+                    android:clickable="true"
+                    android:background="?android:attr/selectableItemBackground"
+                    >
+
+                    <ImageView
+                        android:layout_width="24dp"
+                        android:layout_height="24dp"
+                        android:src="@drawable/ic_facebook"
+                        android:layout_gravity="center_vertical"
+                        />
+
+                    <TextView
+                        android:id="@+id/tvStatusFacebook"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center_vertical"
+                        android:layout_marginLeft="24dp"
+                        android:textColor="@color/grey_500"
+                        android:text="Not connected"
+                        />
+
+                    <TextView
+                        android:id="@+id/tvActionFacebook"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="24dp"
+                        android:layout_gravity="center_vertical"
+                        android:gravity="right"
+                        android:textColor="@color/grey_500"
+                        android:text="@string/action_connect"
+                        />
+
+                </LinearLayout>
+
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="1dp"
+                    android:background="?attr/settings_separator_background_color"
+                    />
+
+                <LinearLayout
+                    android:id="@+id/itemTwitter"
+                    android:layout_width="match_parent"
+                    android:layout_height="48dp"
+                    android:paddingLeft="24dp"
+                    android:paddingRight="16dp"
+                    android:paddingTop="8dp"
+                    android:paddingBottom="8dp"
+                    android:clickable="true"
+                    android:background="?android:attr/selectableItemBackground"
+                    >
+
+                    <ImageView
+                        android:layout_width="24dp"
+                        android:layout_height="24dp"
+                        android:src="@drawable/ic_twitter"
+                        android:layout_gravity="center_vertical"
+                        />
+
+                    <TextView
+                        android:id="@+id/tvStatusTwitter"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center_vertical"
+                        android:layout_marginLeft="24dp"
+                        android:textColor="@color/grey_500"
+                        android:text="Not connected"
+                        />
+
+                    <TextView
+                        android:id="@+id/tvActionTwitter"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center_vertical"
+                        android:gravity="right"
+                        android:layout_marginLeft="24dp"
+                        android:textColor="@color/grey_500"
+                        android:text="@string/action_connect"
+                        />
+
+                </LinearLayout>
+
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="1dp"
+                    android:background="?attr/settings_separator_background_color"
+                    />
+
+                <LinearLayout
+                    android:orientation="vertical"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent">
+
+                    <android.support.v7.widget.RecyclerView
+                        android:id="@+id/rvEmails"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:nestedScrollingEnabled="false"
+                        tools:listitem="@layout/item_email"
+                        />
+
+                    <Button
+                        android:id="@+id/btnAddEmail"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:text="bind email"
+                        android:textColor="@color/teal_500"
+                        style="@style/Widget.AppCompat.Button.Borderless"
+                        />
+
+                </LinearLayout>
+
+            </LinearLayout>
+
+        </LinearLayout>
+    </android.support.v7.widget.CardView>
+
+    <android.support.v7.widget.CardView
+        android:layout_marginTop="8dp"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        >
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            >
+
+            <RelativeLayout
+                android:id="@+id/rlSync"
+                android:layout_width="match_parent"
+                android:layout_height="52dp"
+                android:layout_below="@id/llAccount"
+                >
+
+                <RelativeLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:paddingLeft="24dp"
+                    android:paddingRight="16dp"
+                    android:paddingTop="8dp"
+                    android:paddingBottom="8dp"
+                    android:background="?android:attr/selectableItemBackground"
+                    >
+
+                    <ImageView
+                        android:id="@+id/ivSync"
+                        android:layout_width="24dp"
+                        android:layout_height="24dp"
+                        android:src="@drawable/ic_sync"
+                        android:layout_centerVertical="true"
+                        android:tint="@color/grey_600"
+                        />
+
+                    <LinearLayout
+                        android:orientation="vertical"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_centerVertical="true"
+                        android:layout_toRightOf="@+id/ivSync"
+                        android:layout_marginLeft="24dp"
+                        >
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:textColor="?android:attr/textColorPrimary"
+                            android:text="@string/button_sync"
+                            />
+
+                        <TextView
+                            android:id="@+id/tvLastSyncDate"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:singleLine="true"
+                            android:text="@string/last_sync_date"
+                            android:textColor="@color/grey_500"
+                            android:textSize="14sp" />
+
+                    </LinearLayout>
+
+                </RelativeLayout>
+
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="1dp"
+                    android:background="?attr/settings_separator_background_color"
+                    android:layout_alignParentBottom="true"
+                    />
+            </RelativeLayout>
+
+            <RelativeLayout
+                android:id="@+id/rlLogout"
+                android:layout_width="match_parent"
+                android:layout_height="48dp"
+                android:layout_below="@id/rlSync"
+                >
+
+                <RelativeLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="48dp"
+                    android:paddingLeft="24dp"
+                    android:paddingRight="16dp"
+                    android:paddingTop="8dp"
+                    android:paddingBottom="8dp"
+                    android:background="?android:attr/selectableItemBackground"
+                    >
+
+                    <ImageView
+                        android:id="@+id/ivLogout"
+                        android:layout_width="24dp"
+                        android:layout_height="24dp"
+                        android:src="@drawable/ic_exit_grey600_24dp"
+                        android:layout_centerVertical="true"
+                        android:tint="@color/grey_600"
+                        />
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_centerVertical="true"
+                        android:layout_toRightOf="@+id/ivLogout"
+                        android:layout_marginLeft="24dp"
+                        android:textColor="?android:attr/textColorPrimary"
+                        android:text="@string/button_quit"
+                        />
+
+                </RelativeLayout>
+
+            </RelativeLayout>
+
+        </LinearLayout>
+
+    </android.support.v7.widget.CardView>
+
+
+</LinearLayout>
\ No newline at end of file

From 5b77221c7fcf994d566d9dc730b4aa3d28a8b032 Mon Sep 17 00:00:00 2001
From: Valery Miller <valera_miller94@mail.ru>
Date: Mon, 10 Sep 2018 17:44:35 +0500
Subject: [PATCH 076/251] Up version to 508 Changes in translations

---
 xabber/build.gradle                           | 4 ++--
 xabber/src/main/res/values/xabber_account.xml | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/xabber/build.gradle b/xabber/build.gradle
index a1e0400399..986fa72634 100644
--- a/xabber/build.gradle
+++ b/xabber/build.gradle
@@ -10,8 +10,8 @@ android {
     defaultConfig {
         minSdkVersion 15
         targetSdkVersion 27
-        versionCode 507
-        versionName '2.4.2(507)'
+        versionCode 508
+        versionName '2.4.2(508)'
     }
 
     lintOptions {
diff --git a/xabber/src/main/res/values/xabber_account.xml b/xabber/src/main/res/values/xabber_account.xml
index a7f10b09a1..d10e8f1bf9 100644
--- a/xabber/src/main/res/values/xabber_account.xml
+++ b/xabber/src/main/res/values/xabber_account.xml
@@ -141,8 +141,8 @@
     <string name="auth_twitter_error">Authorization via Twitter failed</string>
     <string name="auth_facebook_cancel">Authorization via Facebook canceled</string>
 
-    <string name="action_connect">CONNECT</string>
-    <string name="action_disconnect">DISCONNECT</string>
+    <string name="action_connect">LINK</string>
+    <string name="action_disconnect">UNLINK</string>
 
     <string name="reorder_summary">To synchronize accounts order between devices you need to enable "Synchronize all" option in Xabber Account settings</string>
 

From 7ad89831c157fa4f9e54da53a5586d07f2c3c2cd Mon Sep 17 00:00:00 2001
From: Valery Miller <valera_miller94@mail.ru>
Date: Tue, 11 Sep 2018 15:32:57 +0500
Subject: [PATCH 077/251] Changes in Xabber Account info screen

---
 .../android/ui/adapter/EmailAdapter.java      |  9 ++-
 .../fragment/XabberAccountInfoFragment.java   |  6 +-
 .../main/res/drawable/ic_add_email_circle.xml | 17 +++++
 .../drawable/ic_confirmed_email_circle.xml    | 17 +++++
 xabber/src/main/res/drawable/ic_email.xml     |  2 +-
 xabber/src/main/res/drawable/ic_email_add.xml |  8 +++
 .../src/main/res/drawable/ic_email_circle.xml |  2 +-
 .../main/res/drawable/ic_email_confirmed.xml  |  2 +-
 .../res/layout/fragment_xaccount_info.xml     | 61 ++++++++++--------
 xabber/src/main/res/layout/item_email.xml     | 63 ++++++++++++-------
 xabber/src/main/res/values/xabber_account.xml |  5 +-
 11 files changed, 136 insertions(+), 56 deletions(-)
 create mode 100644 xabber/src/main/res/drawable/ic_add_email_circle.xml
 create mode 100644 xabber/src/main/res/drawable/ic_confirmed_email_circle.xml
 create mode 100644 xabber/src/main/res/drawable/ic_email_add.xml

diff --git a/xabber/src/main/java/com/xabber/android/ui/adapter/EmailAdapter.java b/xabber/src/main/java/com/xabber/android/ui/adapter/EmailAdapter.java
index 1fb4b2f3c5..49efe9a9f0 100644
--- a/xabber/src/main/java/com/xabber/android/ui/adapter/EmailAdapter.java
+++ b/xabber/src/main/java/com/xabber/android/ui/adapter/EmailAdapter.java
@@ -42,8 +42,9 @@ public void onBindViewHolder(EmailViewHolder holder, final int position) {
         final EmailDTO emailDTO = emails.get(position);
 
         holder.tvEmail.setText(emailDTO.getEmail());
-        holder.ivEmail.setImageResource(emailDTO.isVerified() ? R.drawable.ic_email_confirmed :
-                R.drawable.ic_email);
+        holder.tvStatus.setText(emailDTO.isVerified() ? R.string.title_verified_email : R.string.title_unverified_email);
+        holder.tvAction.setText(emailDTO.isVerified() ? R.string.action_disconnect : R.string.action_verify);
+        holder.ivEmail.setImageResource(emailDTO.isVerified() ? R.drawable.ic_confirmed_email_circle : R.drawable.ic_email_circle);
 
         holder.itemView.setOnClickListener(new View.OnClickListener() {
             @Override
@@ -61,11 +62,15 @@ public int getItemCount() {
     class EmailViewHolder extends RecyclerView.ViewHolder {
 
         final TextView tvEmail;
+        final TextView tvStatus;
+        final TextView tvAction;
         final ImageView ivEmail;
 
         public EmailViewHolder(View itemView) {
             super(itemView);
             this.tvEmail = itemView.findViewById(R.id.tvEmail);
+            this.tvStatus = itemView.findViewById(R.id.tvStatus);
+            this.tvAction = itemView.findViewById(R.id.tvAction);
             this.ivEmail = itemView.findViewById(R.id.ivEmail);
         }
     }
diff --git a/xabber/src/main/java/com/xabber/android/ui/fragment/XabberAccountInfoFragment.java b/xabber/src/main/java/com/xabber/android/ui/fragment/XabberAccountInfoFragment.java
index b48dba28dc..0d581c364b 100644
--- a/xabber/src/main/java/com/xabber/android/ui/fragment/XabberAccountInfoFragment.java
+++ b/xabber/src/main/java/com/xabber/android/ui/fragment/XabberAccountInfoFragment.java
@@ -73,7 +73,7 @@ public class XabberAccountInfoFragment extends Fragment implements AddEmailDialo
 
     private RecyclerView rvEmails;
     private EmailAdapter emailAdapter;
-    private Button btnAddEmail;
+    private View viewAddEmail;
 
     private View viewShowLinks;
     private View viewLinks;
@@ -190,8 +190,8 @@ public void onClick(View v) {
         rvEmails.setLayoutManager(new LinearLayoutManager(getActivity()));
         emailAdapter = new EmailAdapter(this);
         rvEmails.setAdapter(emailAdapter);
-        btnAddEmail = view.findViewById(R.id.btnAddEmail);
-        btnAddEmail.setOnClickListener(new View.OnClickListener() {
+        viewAddEmail = view.findViewById(R.id.viewAddEmail);
+        viewAddEmail.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
                 AddEmailDialogFragment.newInstance(XabberAccountInfoFragment.this)
diff --git a/xabber/src/main/res/drawable/ic_add_email_circle.xml b/xabber/src/main/res/drawable/ic_add_email_circle.xml
new file mode 100644
index 0000000000..67a87416d2
--- /dev/null
+++ b/xabber/src/main/res/drawable/ic_add_email_circle.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape android:shape="oval">
+            <solid android:color="@color/grey_500"/>
+        </shape>
+    </item>
+    <item
+        android:drawable="@drawable/ic_email_add"
+        android:height="28dp"
+        android:width="28dp"
+        android:bottom="12dp"
+        android:left="12dp"
+        android:right="12dp"
+        android:top="12dp"
+        />
+</layer-list>
\ No newline at end of file
diff --git a/xabber/src/main/res/drawable/ic_confirmed_email_circle.xml b/xabber/src/main/res/drawable/ic_confirmed_email_circle.xml
new file mode 100644
index 0000000000..aed36af58f
--- /dev/null
+++ b/xabber/src/main/res/drawable/ic_confirmed_email_circle.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape android:shape="oval">
+            <solid android:color="@color/account_register_blue"/>
+        </shape>
+    </item>
+    <item
+        android:drawable="@drawable/ic_email_confirmed"
+        android:height="28dp"
+        android:width="28dp"
+        android:bottom="12dp"
+        android:left="12dp"
+        android:right="12dp"
+        android:top="12dp"
+        />
+</layer-list>
\ No newline at end of file
diff --git a/xabber/src/main/res/drawable/ic_email.xml b/xabber/src/main/res/drawable/ic_email.xml
index 3a4c427737..bb3d177ce6 100644
--- a/xabber/src/main/res/drawable/ic_email.xml
+++ b/xabber/src/main/res/drawable/ic_email.xml
@@ -4,5 +4,5 @@
     android:width="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path android:fillColor="#757575" android:pathData="M20,8L12,13L4,8V6L12,11L20,6M20,4H4C2.89,4 2,4.89 2,6V18A2,2 0 0,0 4,20H20A2,2 0 0,0 22,18V6C22,4.89 21.1,4 20,4Z" />
+    <path android:fillColor="#fff" android:pathData="M20,8L12,13L4,8V6L12,11L20,6M20,4H4C2.89,4 2,4.89 2,6V18A2,2 0 0,0 4,20H20A2,2 0 0,0 22,18V6C22,4.89 21.1,4 20,4Z" />
 </vector>
\ No newline at end of file
diff --git a/xabber/src/main/res/drawable/ic_email_add.xml b/xabber/src/main/res/drawable/ic_email_add.xml
new file mode 100644
index 0000000000..344b815c00
--- /dev/null
+++ b/xabber/src/main/res/drawable/ic_email_add.xml
@@ -0,0 +1,8 @@
+<!-- drawable/email_plus.xml -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path android:fillColor="#fff" android:pathData="M3,4C1.89,4 1,4.89 1,6V18A2,2 0 0,0 3,20H14.09C14.03,19.67 14,19.34 14,19A6,6 0 0,1 20,13C20.34,13 20.67,13.03 21,13.09V6C21,4.89 20.1,4 19,4H3M3,6L11,11L19,6V8L11,13L3,8V6M19,15V18H16V20H19V23H21V20H24V18H21V15H19Z" />
+</vector>
\ No newline at end of file
diff --git a/xabber/src/main/res/drawable/ic_email_circle.xml b/xabber/src/main/res/drawable/ic_email_circle.xml
index 5e4f8bfbcb..ea98ec41ac 100644
--- a/xabber/src/main/res/drawable/ic_email_circle.xml
+++ b/xabber/src/main/res/drawable/ic_email_circle.xml
@@ -2,7 +2,7 @@
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
     <item>
         <shape android:shape="oval">
-            <solid android:color="@color/grey_300"/>
+            <solid android:color="@color/grey_500"/>
         </shape>
     </item>
     <item
diff --git a/xabber/src/main/res/drawable/ic_email_confirmed.xml b/xabber/src/main/res/drawable/ic_email_confirmed.xml
index e44a808cce..64a893307a 100644
--- a/xabber/src/main/res/drawable/ic_email_confirmed.xml
+++ b/xabber/src/main/res/drawable/ic_email_confirmed.xml
@@ -4,5 +4,5 @@
     android:width="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path android:fillColor="#757575" android:pathData="M21,13.34C20.37,13.12 19.7,13 19,13A6,6 0 0,0 13,19C13,19.34 13.03,19.67 13.08,20H3A2,2 0 0,1 1,18V6C1,4.89 1.89,4 3,4H19A2,2 0 0,1 21,6V13.34M23.5,17L18.5,22L15,18.5L16.5,17L18.5,19L22,15.5L23.5,17M3,6V8L11,13L19,8V6L11,11L3,6Z" />
+    <path android:fillColor="#fff" android:pathData="M21,13.34C20.37,13.12 19.7,13 19,13A6,6 0 0,0 13,19C13,19.34 13.03,19.67 13.08,20H3A2,2 0 0,1 1,18V6C1,4.89 1.89,4 3,4H19A2,2 0 0,1 21,6V13.34M23.5,17L18.5,22L15,18.5L16.5,17L18.5,19L22,15.5L23.5,17M3,6V8L11,13L19,8V6L11,11L3,6Z" />
 </vector>
\ No newline at end of file
diff --git a/xabber/src/main/res/layout/fragment_xaccount_info.xml b/xabber/src/main/res/layout/fragment_xaccount_info.xml
index 27c6ea1216..58c72f0a31 100644
--- a/xabber/src/main/res/layout/fragment_xaccount_info.xml
+++ b/xabber/src/main/res/layout/fragment_xaccount_info.xml
@@ -198,12 +198,6 @@
 
                 </LinearLayout>
 
-                <View
-                    android:layout_width="match_parent"
-                    android:layout_height="1dp"
-                    android:background="?attr/settings_separator_background_color"
-                    />
-
                 <LinearLayout
                     android:id="@+id/itemFacebook"
                     android:layout_width="match_parent"
@@ -246,12 +240,6 @@
 
                 </LinearLayout>
 
-                <View
-                    android:layout_width="match_parent"
-                    android:layout_height="1dp"
-                    android:background="?attr/settings_separator_background_color"
-                    />
-
                 <LinearLayout
                     android:id="@+id/itemTwitter"
                     android:layout_width="match_parent"
@@ -294,12 +282,6 @@
 
                 </LinearLayout>
 
-                <View
-                    android:layout_width="match_parent"
-                    android:layout_height="1dp"
-                    android:background="?attr/settings_separator_background_color"
-                    />
-
                 <LinearLayout
                     android:orientation="vertical"
                     android:layout_width="match_parent"
@@ -313,14 +295,43 @@
                         tools:listitem="@layout/item_email"
                         />
 
-                    <Button
-                        android:id="@+id/btnAddEmail"
+                    <LinearLayout
+                        android:id="@+id/viewAddEmail"
                         android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:text="bind email"
-                        android:textColor="@color/teal_500"
-                        style="@style/Widget.AppCompat.Button.Borderless"
-                        />
+                        android:layout_height="48dp"
+                        android:paddingLeft="18dp"
+                        android:paddingRight="16dp"
+                        android:clickable="true"
+                        android:background="?android:attr/selectableItemBackground"
+                        >
+
+                        <ImageView
+                            android:layout_width="36dp"
+                            android:layout_height="36dp"
+                            android:src="@drawable/ic_add_email_circle"
+                            android:layout_gravity="center_vertical"
+                            />
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_gravity="center_vertical"
+                            android:layout_marginLeft="18dp"
+                            android:textColor="@color/grey_500"
+                            android:text="@string/title_add_email"
+                            />
+
+                        <TextView
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:layout_gravity="center_vertical"
+                            android:gravity="right"
+                            android:layout_marginLeft="24dp"
+                            android:textColor="@color/grey_500"
+                            android:text="@string/action_connect"
+                            />
+
+                    </LinearLayout>
 
                 </LinearLayout>
 
diff --git a/xabber/src/main/res/layout/item_email.xml b/xabber/src/main/res/layout/item_email.xml
index b834cf16e6..678d17e2bb 100644
--- a/xabber/src/main/res/layout/item_email.xml
+++ b/xabber/src/main/res/layout/item_email.xml
@@ -1,38 +1,57 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:orientation="horizontal"
     android:layout_width="match_parent"
     android:layout_height="48dp"
     android:clickable="true"
-    android:background="?android:attr/selectableItemBackground"
-    >
+    android:background="?android:attr/selectableItemBackground">
 
     <ImageView
         android:id="@+id/ivEmail"
-        android:layout_width="24dp"
-        android:layout_height="24dp"
-        android:layout_marginLeft="24dp"
-        android:src="@drawable/ic_email"
-        android:layout_centerVertical="true"
+        android:layout_width="36dp"
+        android:layout_height="36dp"
+        android:layout_marginLeft="18dp"
+        android:src="@drawable/ic_email_circle"
+        android:layout_gravity="center_vertical"
         />
 
-    <TextView
-        android:id="@+id/tvEmail"
+    <LinearLayout
+        android:orientation="vertical"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_centerVertical="true"
-        android:layout_marginLeft="24dp"
-        android:layout_marginRight="16dp"
-        android:layout_toRightOf="@id/ivEmail"
-        android:textColor="?android:attr/textColorPrimary"
-        android:text="example@example.com"
-        />
+        android:layout_marginLeft="18dp"
+        android:layout_marginRight="8dp"
+        android:layout_gravity="center_vertical"
+        >
+
+        <TextView
+            android:id="@+id/tvEmail"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textColor="?android:attr/textColorPrimary"
+            tools:text="@tools:sample/full_names"
+            />
+
+        <TextView
+            android:id="@+id/tvStatus"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textColor="@color/grey_500"
+            android:text="@string/title_unverified_email"
+            />
 
-    <View
+    </LinearLayout>
+
+    <TextView
+        android:id="@+id/tvAction"
         android:layout_width="match_parent"
-        android:layout_height="1dp"
-        android:layout_alignParentBottom="true"
-        android:background="?attr/settings_separator_background_color"
+        android:layout_height="wrap_content"
+        android:textColor="@color/account_register_blue"
+        android:text="@string/action_verify"
+        android:layout_gravity="center_vertical"
+        android:gravity="right"
+        android:layout_marginRight="16dp"
         />
 
-</RelativeLayout>
\ No newline at end of file
+</LinearLayout>
\ No newline at end of file
diff --git a/xabber/src/main/res/values/xabber_account.xml b/xabber/src/main/res/values/xabber_account.xml
index d10e8f1bf9..0044a95c2a 100644
--- a/xabber/src/main/res/values/xabber_account.xml
+++ b/xabber/src/main/res/values/xabber_account.xml
@@ -79,7 +79,9 @@
     <string name="title_start_messaging">Start messaging!</string>
     <string name="title_reordering_account">Reorder accounts</string>
     <string name="title_sync">Synchronization</string>
-    <string name="title_add_email">Add email</string>
+    <string name="title_add_email">Link email account</string>
+    <string name="title_verified_email">Verified email address</string>
+    <string name="title_unverified_email">Unverified email address</string>
 
     <string name="title_login_xabber_account">Sign In</string>
     <string name="title_register_xabber_account">Sign Up</string>
@@ -143,6 +145,7 @@
 
     <string name="action_connect">LINK</string>
     <string name="action_disconnect">UNLINK</string>
+    <string name="action_verify">VERIFY</string>
 
     <string name="reorder_summary">To synchronize accounts order between devices you need to enable "Synchronize all" option in Xabber Account settings</string>
 

From 96d2fbbb85162eb316c689aa601167a4c8171336 Mon Sep 17 00:00:00 2001
From: Valery Miller <valera_miller94@mail.ru>
Date: Tue, 11 Sep 2018 16:10:46 +0500
Subject: [PATCH 078/251] Changes in Xabber Account info screen

---
 .../fragment/XabberAccountInfoFragment.java   |  36 +++--
 .../main/res/drawable/ic_add_email_circle.xml |   2 +-
 .../src/main/res/drawable/ic_email_circle.xml |   2 +-
 .../res/drawable/ic_facebook_disabled.xml     |  15 +++
 .../res/drawable/ic_google_plus_disabled.xml  |  22 +++
 .../main/res/drawable/ic_twitter_disabled.xml |  21 +++
 .../res/layout/fragment_xaccount_info.xml     | 126 +++++++++++++-----
 xabber/src/main/res/values/xabber_account.xml |   2 +
 8 files changed, 179 insertions(+), 47 deletions(-)
 create mode 100644 xabber/src/main/res/drawable/ic_facebook_disabled.xml
 create mode 100644 xabber/src/main/res/drawable/ic_google_plus_disabled.xml
 create mode 100644 xabber/src/main/res/drawable/ic_twitter_disabled.xml

diff --git a/xabber/src/main/java/com/xabber/android/ui/fragment/XabberAccountInfoFragment.java b/xabber/src/main/java/com/xabber/android/ui/fragment/XabberAccountInfoFragment.java
index 0d581c364b..e3fe174dcf 100644
--- a/xabber/src/main/java/com/xabber/android/ui/fragment/XabberAccountInfoFragment.java
+++ b/xabber/src/main/java/com/xabber/android/ui/fragment/XabberAccountInfoFragment.java
@@ -61,12 +61,18 @@ public class XabberAccountInfoFragment extends Fragment implements AddEmailDialo
     private RelativeLayout rlLogout;
     private RelativeLayout rlSync;
 
+    private ImageView ivGoogle;
+    private TextView tvNameGoogle;
     private TextView tvStatusGoogle;
     private TextView tvActionGoogle;
     private LinearLayout itemGoogle;
+    private ImageView ivFacebook;
+    private TextView tvNameFacebook;
     private TextView tvStatusFacebook;
     private TextView tvActionFacebook;
     private LinearLayout itemFacebook;
+    private ImageView ivTwitter;
+    private TextView tvNameTwitter;
     private TextView tvStatusTwitter;
     private TextView tvActionTwitter;
     private LinearLayout itemTwitter;
@@ -151,6 +157,8 @@ public void onClick(View v) {
         });
 
         tvStatusGoogle = view.findViewById(R.id.tvStatusGoogle);
+        ivGoogle = view.findViewById(R.id.ivGoogle);
+        tvNameGoogle = view.findViewById(R.id.tvNameGoogle);
         tvActionGoogle = view.findViewById(R.id.tvActionGoogle);
         itemGoogle = view.findViewById(R.id.itemGoogle);
         itemGoogle.setOnClickListener(new View.OnClickListener() {
@@ -163,6 +171,8 @@ public void onClick(View v) {
         });
 
         tvStatusFacebook = view.findViewById(R.id.tvStatusFacebook);
+        ivFacebook = view.findViewById(R.id.ivFacebook);
+        tvNameFacebook = view.findViewById(R.id.tvNameFacebook);
         tvActionFacebook = view.findViewById(R.id.tvActionFacebook);
         itemFacebook = view.findViewById(R.id.itemFacebook);
         itemFacebook.setOnClickListener(new View.OnClickListener() {
@@ -175,6 +185,8 @@ public void onClick(View v) {
         });
 
         tvStatusTwitter = view.findViewById(R.id.tvStatusTwitter);
+        ivTwitter = view.findViewById(R.id.ivTwitter);
+        tvNameTwitter = view.findViewById(R.id.tvNameTwitter);
         tvActionTwitter = view.findViewById(R.id.tvActionTwitter);
         itemTwitter = view.findViewById(R.id.itemTwitter);
         itemTwitter.setOnClickListener(new View.OnClickListener() {
@@ -340,20 +352,26 @@ public void onClick(DialogInterface dialog, int which) {
     private void setupSocial(List<SocialBindingDTO> socialBindings) {
         for (SocialBindingDTO socialBinding : socialBindings) {
             if ("google".equals(socialBinding.getProvider())) {
-                tvStatusGoogle.setText(socialBinding.getFirstName() + " " + socialBinding.getLastName());
+                ivGoogle.setImageResource(R.drawable.ic_google_plus);
+                tvNameGoogle.setText(socialBinding.getFirstName() + " " + socialBinding.getLastName());
+                tvNameGoogle.setVisibility(View.VISIBLE);
+                tvStatusGoogle.setText(getResources().getString(R.string.title_linked_account, "Google +"));
                 tvActionGoogle.setText(R.string.action_disconnect);
-                tvStatusGoogle.setTextColor(getActivity().getResources().getColor(R.color.black_text));
-                tvActionGoogle.setTextColor(getActivity().getResources().getColor(R.color.black_text));
+                tvActionGoogle.setTextColor(getActivity().getResources().getColor(R.color.account_register_blue));
             } else if ("facebook".equals(socialBinding.getProvider())) {
-                tvStatusFacebook.setText(socialBinding.getFirstName() + " " + socialBinding.getLastName());
+                ivFacebook.setImageResource(R.drawable.ic_facebook);
+                tvNameFacebook.setText(socialBinding.getFirstName() + " " + socialBinding.getLastName());
+                tvNameFacebook.setVisibility(View.VISIBLE);
+                tvStatusFacebook.setText(getResources().getString(R.string.title_linked_account, "Facebook"));
                 tvActionFacebook.setText(R.string.action_disconnect);
-                tvStatusFacebook.setTextColor(getActivity().getResources().getColor(R.color.black_text));
-                tvActionFacebook.setTextColor(getActivity().getResources().getColor(R.color.black_text));
+                tvActionFacebook.setTextColor(getActivity().getResources().getColor(R.color.account_register_blue));
             } else if ("twitter".equals(socialBinding.getProvider())) {
-                tvStatusTwitter.setText(socialBinding.getFirstName() + " " + socialBinding.getLastName());
+                ivTwitter.setImageResource(R.drawable.ic_twitter);
+                tvNameTwitter.setText(socialBinding.getFirstName() + " " + socialBinding.getLastName());
+                tvNameTwitter.setVisibility(View.VISIBLE);
+                tvStatusTwitter.setText(getResources().getString(R.string.title_linked_account, "Twitter"));
                 tvActionTwitter.setText(R.string.action_disconnect);
-                tvStatusTwitter.setTextColor(getActivity().getResources().getColor(R.color.black_text));
-                tvActionTwitter.setTextColor(getActivity().getResources().getColor(R.color.black_text));
+                tvActionTwitter.setTextColor(getActivity().getResources().getColor(R.color.account_register_blue));
             }
         }
     }
diff --git a/xabber/src/main/res/drawable/ic_add_email_circle.xml b/xabber/src/main/res/drawable/ic_add_email_circle.xml
index 67a87416d2..275b4092f3 100644
--- a/xabber/src/main/res/drawable/ic_add_email_circle.xml
+++ b/xabber/src/main/res/drawable/ic_add_email_circle.xml
@@ -2,7 +2,7 @@
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
     <item>
         <shape android:shape="oval">
-            <solid android:color="@color/grey_500"/>
+            <solid android:color="@color/grey_400"/>
         </shape>
     </item>
     <item
diff --git a/xabber/src/main/res/drawable/ic_email_circle.xml b/xabber/src/main/res/drawable/ic_email_circle.xml
index ea98ec41ac..fda227304a 100644
--- a/xabber/src/main/res/drawable/ic_email_circle.xml
+++ b/xabber/src/main/res/drawable/ic_email_circle.xml
@@ -2,7 +2,7 @@
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
     <item>
         <shape android:shape="oval">
-            <solid android:color="@color/grey_500"/>
+            <solid android:color="@color/grey_400"/>
         </shape>
     </item>
     <item
diff --git a/xabber/src/main/res/drawable/ic_facebook_disabled.xml b/xabber/src/main/res/drawable/ic_facebook_disabled.xml
new file mode 100644
index 0000000000..8ed747fec6
--- /dev/null
+++ b/xabber/src/main/res/drawable/ic_facebook_disabled.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="112.196"
+    android:viewportHeight="112.196">
+
+    <path
+        android:fillColor="#bdbdbd"
+        android:pathData="M 56.098 0 C 87.080069896 0 112.196 25.115930104 112.196 56.098 C 112.196 87.080069896 87.080069896 112.196 56.098 112.196 C 25.115930104 112.196 0 87.080069896 0 56.098 C 0 25.115930104 25.115930104 0 56.098 0 Z" />
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M70.201,58.294h-10.01v36.672H45.025V58.294h-7.213V45.406h7.213v-8.34
+c0-5.964,2.833-15.303,15.301-15.303L71.56,21.81v12.51h-8.151c-1.337,0-3.217,0.668-3.217,3.513v7.585h11.334L70.201,58.294z" />
+</vector>
\ No newline at end of file
diff --git a/xabber/src/main/res/drawable/ic_google_plus_disabled.xml b/xabber/src/main/res/drawable/ic_google_plus_disabled.xml
new file mode 100644
index 0000000000..cfed3eb9b4
--- /dev/null
+++ b/xabber/src/main/res/drawable/ic_google_plus_disabled.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="291.32"
+    android:viewportHeight="291.32">
+
+    <path
+        android:fillColor="#bdbdbd"
+        android:pathData="M145.66,0c80.113,0,145.66,65.547,145.66,145.66s-65.547,145.66-145.66,145.66S0,225.772,0,145.66
+S65.547,0,145.66,0z" />
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M 219.4 121.079 L 219.4 137.466 L 235.786 137.466 L 235.786 153.853 L 219.4 153.853 L 219.4 170.24 L 203.013 170.24 L 203.013 153.853 L 186.626 153.853 L 186.626 137.466 L 203.013 137.466 L 203.013 121.079 Z" />
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M71.919,186.626c-21.849-21.849-21.849-60.085,0.91-81.933
+c16.387-16.387,40.056-20.028,60.995-11.835l8.193,4.552l9.104,6.373l-14.566,14.566l-5.462-3.641
+c-12.745-8.193-30.953-6.373-42.787,5.462c-13.656,13.656-14.566,38.236,0,52.802c13.656,14.566,38.236,14.566,50.981,0
+c3.641-3.641,7.283-9.104,8.193-14.566v-1.821h-32.773v-18.207h51.891l0.91,4.552v12.745c-0.91,11.835-5.462,23.67-13.656,31.863
+C132.004,208.475,93.768,208.475,71.919,186.626z" />
+</vector>
\ No newline at end of file
diff --git a/xabber/src/main/res/drawable/ic_twitter_disabled.xml b/xabber/src/main/res/drawable/ic_twitter_disabled.xml
new file mode 100644
index 0000000000..63e7147e4d
--- /dev/null
+++ b/xabber/src/main/res/drawable/ic_twitter_disabled.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="291.319"
+    android:viewportHeight="291.319">
+
+    <path
+        android:fillColor="#bdbdbd"
+        android:pathData="M145.659,0c80.45,0,145.66,65.219,145.66,145.66c0,80.45-65.21,145.659-145.66,145.659
+S0,226.109,0,145.66C0,65.219,65.21,0,145.659,0z" />
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M236.724,98.129c-6.363,2.749-13.21,4.597-20.392,5.435c7.338-4.27,12.964-11.016,15.613-19.072
+c-6.864,3.96-14.457,6.828-22.55,8.366c-6.473-6.691-15.695-10.87-25.909-10.87c-19.591,0-35.486,15.413-35.486,34.439
+c0,2.704,0.31,5.335,0.919,7.857c-29.496-1.438-55.66-15.158-73.157-35.996c-3.059,5.089-4.807,10.997-4.807,17.315
+c0,11.944,6.263,22.504,15.786,28.668c-5.826-0.182-11.289-1.721-16.086-4.315v0.437c0,16.696,12.235,30.616,28.476,33.784
+c-2.977,0.783-6.109,1.211-9.35,1.211c-2.285,0-4.506-0.209-6.673-0.619c4.515,13.692,17.625,23.651,33.165,23.925
+c-12.153,9.249-27.457,14.748-44.089,14.748c-2.868,0-5.69-0.164-8.476-0.482c15.722,9.777,34.367,15.485,54.422,15.485
+c65.292,0,100.997-52.51,100.997-98.029l-0.1-4.461C225.945,111.111,231.963,105.048,236.724,98.129z" />
+</vector>
\ No newline at end of file
diff --git a/xabber/src/main/res/layout/fragment_xaccount_info.xml b/xabber/src/main/res/layout/fragment_xaccount_info.xml
index 58c72f0a31..959497515a 100644
--- a/xabber/src/main/res/layout/fragment_xaccount_info.xml
+++ b/xabber/src/main/res/layout/fragment_xaccount_info.xml
@@ -160,30 +160,48 @@
                     android:id="@+id/itemGoogle"
                     android:layout_width="match_parent"
                     android:layout_height="48dp"
-                    android:paddingLeft="24dp"
+                    android:paddingLeft="18dp"
                     android:paddingRight="16dp"
-                    android:paddingTop="8dp"
-                    android:paddingBottom="8dp"
                     android:clickable="true"
                     android:background="?android:attr/selectableItemBackground"
                     >
 
                     <ImageView
-                        android:layout_width="24dp"
-                        android:layout_height="24dp"
-                        android:src="@drawable/ic_google_plus"
+                        android:id="@+id/ivGoogle"
+                        android:layout_width="36dp"
+                        android:layout_height="36dp"
+                        android:src="@drawable/ic_google_plus_disabled"
                         android:layout_gravity="center_vertical"
                         />
 
-                    <TextView
-                        android:id="@+id/tvStatusGoogle"
+                    <LinearLayout
+                        android:orientation="vertical"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_gravity="center_vertical"
-                        android:layout_marginLeft="24dp"
-                        android:textColor="@color/grey_500"
-                        android:text="Not connected"
-                        />
+                        android:layout_marginLeft="18dp"
+                        >
+
+                        <TextView
+                            android:id="@+id/tvNameGoogle"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_gravity="center_vertical"
+                            android:textColor="@color/black_text"
+                            tools:text="@tools:sample/full_names"
+                            android:visibility="gone"
+                            />
+
+                        <TextView
+                            android:id="@+id/tvStatusGoogle"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_gravity="center_vertical"
+                            android:textColor="@color/grey_500"
+                            android:text="@string/title_not_linked_account"
+                            />
+
+                    </LinearLayout>
 
                     <TextView
                         android:id="@+id/tvActionGoogle"
@@ -202,30 +220,48 @@
                     android:id="@+id/itemFacebook"
                     android:layout_width="match_parent"
                     android:layout_height="48dp"
-                    android:paddingLeft="24dp"
+                    android:paddingLeft="18dp"
                     android:paddingRight="16dp"
-                    android:paddingTop="8dp"
-                    android:paddingBottom="8dp"
                     android:clickable="true"
                     android:background="?android:attr/selectableItemBackground"
                     >
 
                     <ImageView
-                        android:layout_width="24dp"
-                        android:layout_height="24dp"
-                        android:src="@drawable/ic_facebook"
+                        android:id="@+id/ivFacebook"
+                        android:layout_width="36dp"
+                        android:layout_height="36dp"
+                        android:src="@drawable/ic_facebook_disabled"
                         android:layout_gravity="center_vertical"
                         />
 
-                    <TextView
-                        android:id="@+id/tvStatusFacebook"
+                    <LinearLayout
+                        android:orientation="vertical"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_gravity="center_vertical"
-                        android:layout_marginLeft="24dp"
-                        android:textColor="@color/grey_500"
-                        android:text="Not connected"
-                        />
+                        android:layout_marginLeft="18dp"
+                        >
+
+                        <TextView
+                            android:id="@+id/tvNameFacebook"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_gravity="center_vertical"
+                            android:textColor="@color/black_text"
+                            tools:text="@tools:sample/full_names"
+                            android:visibility="gone"
+                            />
+
+                        <TextView
+                            android:id="@+id/tvStatusFacebook"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_gravity="center_vertical"
+                            android:textColor="@color/grey_500"
+                            android:text="@string/title_not_linked_account"
+                            />
+
+                    </LinearLayout>
 
                     <TextView
                         android:id="@+id/tvActionFacebook"
@@ -244,30 +280,48 @@
                     android:id="@+id/itemTwitter"
                     android:layout_width="match_parent"
                     android:layout_height="48dp"
-                    android:paddingLeft="24dp"
+                    android:paddingLeft="18dp"
                     android:paddingRight="16dp"
-                    android:paddingTop="8dp"
-                    android:paddingBottom="8dp"
                     android:clickable="true"
                     android:background="?android:attr/selectableItemBackground"
                     >
 
                     <ImageView
-                        android:layout_width="24dp"
-                        android:layout_height="24dp"
-                        android:src="@drawable/ic_twitter"
+                        android:id="@+id/ivTwitter"
+                        android:layout_width="36dp"
+                        android:layout_height="36dp"
+                        android:src="@drawable/ic_twitter_disabled"
                         android:layout_gravity="center_vertical"
                         />
 
-                    <TextView
-                        android:id="@+id/tvStatusTwitter"
+                    <LinearLayout
+                        android:orientation="vertical"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_gravity="center_vertical"
-                        android:layout_marginLeft="24dp"
-                        android:textColor="@color/grey_500"
-                        android:text="Not connected"
-                        />
+                        android:layout_marginLeft="18dp"
+                        >
+
+                        <TextView
+                            android:id="@+id/tvNameTwitter"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_gravity="center_vertical"
+                            android:textColor="@color/black_text"
+                            tools:text="@tools:sample/full_names"
+                            android:visibility="gone"
+                            />
+
+                        <TextView
+                            android:id="@+id/tvStatusTwitter"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_gravity="center_vertical"
+                            android:textColor="@color/grey_500"
+                            android:text="@string/title_not_linked_account"
+                            />
+
+                    </LinearLayout>
 
                     <TextView
                         android:id="@+id/tvActionTwitter"
diff --git a/xabber/src/main/res/values/xabber_account.xml b/xabber/src/main/res/values/xabber_account.xml
index 0044a95c2a..3e8c7e13c3 100644
--- a/xabber/src/main/res/values/xabber_account.xml
+++ b/xabber/src/main/res/values/xabber_account.xml
@@ -82,6 +82,8 @@
     <string name="title_add_email">Link email account</string>
     <string name="title_verified_email">Verified email address</string>
     <string name="title_unverified_email">Unverified email address</string>
+    <string name="title_not_linked_account">Not linked</string>
+    <string name="title_linked_account">Linked %1$s account</string>
 
     <string name="title_login_xabber_account">Sign In</string>
     <string name="title_register_xabber_account">Sign Up</string>

From 0196c346be67e4f53de16c42c4d34be5c4eba354 Mon Sep 17 00:00:00 2001
From: Valery Miller <valera_miller94@mail.ru>
Date: Tue, 11 Sep 2018 16:26:00 +0500
Subject: [PATCH 079/251] Changes in Xabber Account info screen

---
 .../xabber/android/ui/fragment/XabberAccountInfoFragment.java | 4 ++++
 xabber/src/main/res/layout/fragment_xaccount_info.xml         | 3 ++-
 xabber/src/main/res/values/xabber_account.xml                 | 2 ++
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/xabber/src/main/java/com/xabber/android/ui/fragment/XabberAccountInfoFragment.java b/xabber/src/main/java/com/xabber/android/ui/fragment/XabberAccountInfoFragment.java
index e3fe174dcf..32964bda6b 100644
--- a/xabber/src/main/java/com/xabber/android/ui/fragment/XabberAccountInfoFragment.java
+++ b/xabber/src/main/java/com/xabber/android/ui/fragment/XabberAccountInfoFragment.java
@@ -81,6 +81,7 @@ public class XabberAccountInfoFragment extends Fragment implements AddEmailDialo
     private EmailAdapter emailAdapter;
     private View viewAddEmail;
 
+    private TextView tvLinks;
     private View viewShowLinks;
     private View viewLinks;
     private ImageView ivChevron;
@@ -144,6 +145,7 @@ public void onClick(View v) {
         });
 
         ivChevron = view.findViewById(R.id.ivChevron);
+        tvLinks = view.findViewById(R.id.tvLinks);
         viewLinks = view.findViewById(R.id.viewLinks);
         viewShowLinks = view.findViewById(R.id.viewShowLinks);
         viewShowLinks.setOnClickListener(new View.OnClickListener() {
@@ -374,10 +376,12 @@ private void setupSocial(List<SocialBindingDTO> socialBindings) {
                 tvActionTwitter.setTextColor(getActivity().getResources().getColor(R.color.account_register_blue));
             }
         }
+        if (socialBindings.size() > 0) tvLinks.setText(R.string.title_linked_accounts);
     }
 
 
     private void setupEmailList(List<EmailDTO> emails) {
+        if (emails.size() > 0) tvLinks.setText(R.string.title_linked_accounts);
         emailAdapter.setItems(emails);
         emailAdapter.notifyDataSetChanged();
     }
diff --git a/xabber/src/main/res/layout/fragment_xaccount_info.xml b/xabber/src/main/res/layout/fragment_xaccount_info.xml
index 959497515a..2a074b64bd 100644
--- a/xabber/src/main/res/layout/fragment_xaccount_info.xml
+++ b/xabber/src/main/res/layout/fragment_xaccount_info.xml
@@ -139,9 +139,10 @@
                     />
 
                 <TextView
+                    android:id="@+id/tvLinks"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="No linked social accounts or emails"
+                    android:text="@string/title_no_linked_accounts"
                     android:layout_marginLeft="24dp"
                     android:layout_gravity="center_vertical"
                     />
diff --git a/xabber/src/main/res/values/xabber_account.xml b/xabber/src/main/res/values/xabber_account.xml
index 3e8c7e13c3..0fd74635dc 100644
--- a/xabber/src/main/res/values/xabber_account.xml
+++ b/xabber/src/main/res/values/xabber_account.xml
@@ -84,6 +84,8 @@
     <string name="title_unverified_email">Unverified email address</string>
     <string name="title_not_linked_account">Not linked</string>
     <string name="title_linked_account">Linked %1$s account</string>
+    <string name="title_no_linked_accounts">No linked social accounts or emails</string>
+    <string name="title_linked_accounts">Linked social accounts and emails</string>
 
     <string name="title_login_xabber_account">Sign In</string>
     <string name="title_register_xabber_account">Sign Up</string>

From fcc25dd44c197ac037647b58d015dd1e0bfd1d62 Mon Sep 17 00:00:00 2001
From: Valery Miller <valera_miller94@mail.ru>
Date: Tue, 11 Sep 2018 16:33:02 +0500
Subject: [PATCH 080/251] Fixed social bind and unbind

---
 .../ui/activity/XabberAccountActivity.java    | 50 ++++++++++---------
 .../fragment/XabberAccountInfoFragment.java   |  4 +-
 2 files changed, 28 insertions(+), 26 deletions(-)

diff --git a/xabber/src/main/java/com/xabber/android/ui/activity/XabberAccountActivity.java b/xabber/src/main/java/com/xabber/android/ui/activity/XabberAccountActivity.java
index 7db851bd2d..482b8a215c 100644
--- a/xabber/src/main/java/com/xabber/android/ui/activity/XabberAccountActivity.java
+++ b/xabber/src/main/java/com/xabber/android/ui/activity/XabberAccountActivity.java
@@ -125,6 +125,30 @@ public void onSocialBindClick(String provider) {
         }
     }
 
+    @Override
+    protected void onSocialAuthSuccess(String provider, String credentials) {
+        showProgress(getResources().getString(R.string.progress_title_bind_social));
+        Subscription loginSocialSubscription = AuthManager.bindSocial(provider, credentials)
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(new Action1<ResponseBody>() {
+                    @Override
+                    public void call(ResponseBody s) {
+                        hideProgress();
+                        Toast.makeText(XabberAccountActivity.this,
+                                R.string.social_bind_success, Toast.LENGTH_SHORT).show();
+                    }
+                }, new Action1<Throwable>() {
+                    @Override
+                    public void call(Throwable throwable) {
+                        hideProgress();
+                        Toast.makeText(XabberAccountActivity.this,
+                                R.string.social_bind_fail, Toast.LENGTH_SHORT).show();
+                    }
+                });
+        compositeSubscription.add(loginSocialSubscription);
+    }
+
     @Override
     public void onSocialUnbindClick(String provider) {
         showProgress(getResources().getString(R.string.progress_title_unbind_social));
@@ -134,12 +158,14 @@ public void onSocialUnbindClick(String provider) {
                 .subscribe(new Action1<ResponseBody>() {
                     @Override
                     public void call(ResponseBody responseBody) {
+                        hideProgress();
                         Toast.makeText(XabberAccountActivity.this,
                                 R.string.social_unbind_success, Toast.LENGTH_SHORT).show();
                     }
                 }, new Action1<Throwable>() {
                     @Override
                     public void call(Throwable throwable) {
+                        hideProgress();
                         Toast.makeText(XabberAccountActivity.this,
                                 R.string.social_unbind_fail, Toast.LENGTH_SHORT).show();
                     }
@@ -319,28 +345,4 @@ private void handleErrorConfirm(Throwable throwable) {
         hideProgress();
         handleError(throwable, "Error while confirming email: ", LOG_TAG);
     }
-
-    /** SOCIAL AUTH */
-
-    @Override
-    protected void onSocialAuthSuccess(String provider, String credentials) {
-        showProgress(getResources().getString(R.string.progress_title_bind_social));
-        Subscription loginSocialSubscription = AuthManager.bindSocial(provider, credentials)
-                .subscribeOn(Schedulers.io())
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(new Action1<ResponseBody>() {
-                    @Override
-                    public void call(ResponseBody s) {
-                        Toast.makeText(XabberAccountActivity.this,
-                                R.string.social_bind_success, Toast.LENGTH_SHORT).show();
-                    }
-                }, new Action1<Throwable>() {
-                    @Override
-                    public void call(Throwable throwable) {
-                        Toast.makeText(XabberAccountActivity.this,
-                                R.string.social_bind_fail, Toast.LENGTH_SHORT).show();
-                    }
-                });
-        compositeSubscription.add(loginSocialSubscription);
-    }
 }
diff --git a/xabber/src/main/java/com/xabber/android/ui/fragment/XabberAccountInfoFragment.java b/xabber/src/main/java/com/xabber/android/ui/fragment/XabberAccountInfoFragment.java
index 32964bda6b..853116507a 100644
--- a/xabber/src/main/java/com/xabber/android/ui/fragment/XabberAccountInfoFragment.java
+++ b/xabber/src/main/java/com/xabber/android/ui/fragment/XabberAccountInfoFragment.java
@@ -180,7 +180,7 @@ public void onClick(View v) {
         itemFacebook.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                if (tvActionGoogle.getText().equals(getString(R.string.action_connect)))
+                if (tvActionFacebook.getText().equals(getString(R.string.action_connect)))
                     listener.onSocialBindClick(AuthManager.PROVIDER_FACEBOOK);
                 else listener.onSocialUnbindClick(AuthManager.PROVIDER_FACEBOOK);
             }
@@ -194,7 +194,7 @@ public void onClick(View v) {
         itemTwitter.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                if (tvActionGoogle.getText().equals(getString(R.string.action_connect)))
+                if (tvActionTwitter.getText().equals(getString(R.string.action_connect)))
                     listener.onSocialBindClick(AuthManager.PROVIDER_TWITTER);
                 else listener.onSocialUnbindClick(AuthManager.PROVIDER_TWITTER);
             }

From 1c2f2df431ee1dbfff84c7b645823a471d257b48 Mon Sep 17 00:00:00 2001
From: Valery Miller <valera_miller94@mail.ru>
Date: Wed, 12 Sep 2018 11:22:20 +0500
Subject: [PATCH 081/251] Fixed bug with proguard rules for rxjava

---
 xabber/proguard-rules.pro | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/xabber/proguard-rules.pro b/xabber/proguard-rules.pro
index 2743f915a8..b818fb83cb 100644
--- a/xabber/proguard-rules.pro
+++ b/xabber/proguard-rules.pro
@@ -7,6 +7,22 @@
 
 # RxJava
 -dontwarn rx.internal.util.**
+-dontwarn sun.misc.**
+
+-keepclassmembers class rx.internal.util.unsafe.*ArrayQueue*Field* {
+   long producerIndex;
+   long consumerIndex;
+}
+
+-keepclassmembers class rx.internal.util.unsafe.BaseLinkedQueueProducerNodeRef {
+    rx.internal.util.atomic.LinkedQueueNode producerNode;
+}
+
+-keepclassmembers class rx.internal.util.unsafe.BaseLinkedQueueConsumerNodeRef {
+    rx.internal.util.atomic.LinkedQueueNode consumerNode;
+}
+
+-dontnote rx.internal.util.PlatformDependent
 
 # google
 -keep class com.google.**

From 4b95ff02afb4b9e730e5a05222c9a54c03be0687 Mon Sep 17 00:00:00 2001
From: Valery Miller <valera_miller94@mail.ru>
Date: Wed, 12 Sep 2018 12:41:54 +0500
Subject: [PATCH 082/251] Replace quit button to overflow menu

---
 .../ui/activity/XabberAccountActivity.java    | 47 ++++++++++++++++++-
 .../fragment/XabberAccountInfoFragment.java   | 38 ---------------
 .../res/layout/fragment_xaccount_info.xml     | 46 ------------------
 .../res/menu/toolbar_xabber_account_info.xml  |  6 +--
 .../main/res/values-ru-rRU/xabber_account.xml |  2 +-
 xabber/src/main/res/values/styles.xml         |  5 ++
 xabber/src/main/res/values/theme.xml          |  4 ++
 xabber/src/main/res/values/xabber_account.xml |  2 +-
 8 files changed, 60 insertions(+), 90 deletions(-)

diff --git a/xabber/src/main/java/com/xabber/android/ui/activity/XabberAccountActivity.java b/xabber/src/main/java/com/xabber/android/ui/activity/XabberAccountActivity.java
index 482b8a215c..1fee00636c 100644
--- a/xabber/src/main/java/com/xabber/android/ui/activity/XabberAccountActivity.java
+++ b/xabber/src/main/java/com/xabber/android/ui/activity/XabberAccountActivity.java
@@ -1,15 +1,21 @@
 package com.xabber.android.ui.activity;
 
+import android.app.AlertDialog;
+import android.app.Dialog;
 import android.app.Fragment;
 import android.app.FragmentTransaction;
 import android.app.ProgressDialog;
 import android.content.Context;
+import android.content.DialogInterface;
 import android.content.Intent;
 import android.os.Bundle;
 import android.support.annotation.NonNull;
 import android.support.v7.widget.Toolbar;
 import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.MenuItem;
 import android.view.View;
+import android.widget.CheckBox;
 import android.widget.Toast;
 
 import com.xabber.android.R;
@@ -28,7 +34,7 @@
 import rx.schedulers.Schedulers;
 
 public class XabberAccountActivity extends BaseLoginActivity
-        implements XabberAccountInfoFragment.Listener {
+        implements XabberAccountInfoFragment.Listener, Toolbar.OnMenuItemClickListener {
 
     private final static String LOG_TAG = XabberAccountActivity.class.getSimpleName();
     private final static String FRAGMENT_INFO = "fragment_info";
@@ -42,6 +48,8 @@ public class XabberAccountActivity extends BaseLoginActivity
     private ProgressDialog progressDialog;
     private boolean needShowSyncDialog = false;
 
+    private boolean dialogShowed;
+
     @NonNull
     public static Intent createIntent(Context context, boolean showSync) {
         Intent intent = new Intent(context, XabberAccountActivity.class);
@@ -53,9 +61,11 @@ public static Intent createIntent(Context context, boolean showSync) {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
+        setTheme(R.style.Theme_LightToolbar);
         setContentView(R.layout.activity_xabber_account_info);
 
         toolbar = (Toolbar) findViewById(R.id.toolbar_default);
+        toolbar.setOnMenuItemClickListener(this);
         toolbar.setNavigationIcon(R.drawable.ic_arrow_left);
         toolbar.setNavigationOnClickListener(new View.OnClickListener() {
             @Override
@@ -90,6 +100,20 @@ protected void onDestroy() {
         compositeSubscription.clear();
     }
 
+    @Override
+    public boolean onMenuItemClick(MenuItem item) {
+        switch (item.getItemId()) {
+            case R.id.action_quit:
+                if (!dialogShowed) {
+                    dialogShowed = true;
+                    showLogoutDialog();
+                }
+                return true;
+            default:
+                return false;
+        }
+    }
+
     @Override
     protected void showProgress(String title) {
         if (!isFinishing()) {
@@ -237,6 +261,27 @@ protected void updateLastSyncTime() {
 
     /** LOGOUT */
 
+    private void showLogoutDialog() {
+        LayoutInflater inflater = getLayoutInflater();
+        View view = inflater.inflate(R.layout.dialog_logout_xabber_account, null);
+        final CheckBox chbDeleteAccounts = (CheckBox) view.findViewById(R.id.chbDeleteAccounts);
+
+        AlertDialog.Builder builder = new AlertDialog.Builder(this);
+        builder.setTitle(R.string.progress_title_quit)
+                .setMessage(R.string.logout_summary)
+                .setView(view)
+                .setPositiveButton(R.string.button_quit, new DialogInterface.OnClickListener() {
+                    @Override
+                    public void onClick(DialogInterface dialog, int which) {
+                        onLogoutClick(chbDeleteAccounts.isChecked());
+                    }
+                })
+                .setNegativeButton(R.string.cancel, null);
+        Dialog dialog = builder.create();
+        dialog.show();
+        dialogShowed = false;
+    }
+
     private void logout(final boolean deleteAccounts) {
         showProgress(getResources().getString(R.string.progress_title_quit));
         Subscription logoutSubscription = AuthManager.logout(deleteAccounts)
diff --git a/xabber/src/main/java/com/xabber/android/ui/fragment/XabberAccountInfoFragment.java b/xabber/src/main/java/com/xabber/android/ui/fragment/XabberAccountInfoFragment.java
index 853116507a..a28f2a3e6c 100644
--- a/xabber/src/main/java/com/xabber/android/ui/fragment/XabberAccountInfoFragment.java
+++ b/xabber/src/main/java/com/xabber/android/ui/fragment/XabberAccountInfoFragment.java
@@ -1,9 +1,6 @@
 package com.xabber.android.ui.fragment;
 
-import android.app.AlertDialog;
-import android.app.Dialog;
 import android.app.Fragment;
-import android.content.DialogInterface;
 import android.os.Bundle;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
@@ -13,8 +10,6 @@
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.Button;
-import android.widget.CheckBox;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.RelativeLayout;
@@ -58,7 +53,6 @@ public class XabberAccountInfoFragment extends Fragment implements AddEmailDialo
     private TextView tvLanguage;
     private TextView tvPhone;
     private TextView tvLastSyncDate;
-    private RelativeLayout rlLogout;
     private RelativeLayout rlSync;
 
     private ImageView ivGoogle;
@@ -122,17 +116,6 @@ public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
         tvLanguage = (TextView) view.findViewById(R.id.tvLanguage);
         tvLastSyncDate = (TextView) view.findViewById(R.id.tvLastSyncDate);
 
-        rlLogout = (RelativeLayout) view.findViewById(R.id.rlLogout);
-        rlLogout.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                if (!dialogShowed) {
-                    dialogShowed = true;
-                    showLogoutDialog();
-                }
-            }
-        });
-
         rlSync = (RelativeLayout) view.findViewById(R.id.rlSync);
         rlSync.setOnClickListener(new View.OnClickListener() {
             @Override
@@ -330,27 +313,6 @@ private void handleErrorGetSettings(Throwable throwable) {
         }
     }
 
-    private void showLogoutDialog() {
-        LayoutInflater inflater = getActivity().getLayoutInflater();
-        View view = inflater.inflate(R.layout.dialog_logout_xabber_account, null);
-        final CheckBox chbDeleteAccounts = (CheckBox) view.findViewById(R.id.chbDeleteAccounts);
-
-        AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
-        builder.setTitle(R.string.progress_title_quit)
-                .setMessage(R.string.logout_summary)
-                .setView(view)
-                .setPositiveButton(R.string.button_quit, new DialogInterface.OnClickListener() {
-                    @Override
-                    public void onClick(DialogInterface dialog, int which) {
-                        listener.onLogoutClick(chbDeleteAccounts.isChecked());
-                    }
-                })
-                .setNegativeButton(R.string.cancel, null);
-        Dialog dialog = builder.create();
-        dialog.show();
-        dialogShowed = false;
-    }
-
     private void setupSocial(List<SocialBindingDTO> socialBindings) {
         for (SocialBindingDTO socialBinding : socialBindings) {
             if ("google".equals(socialBinding.getProvider())) {
diff --git a/xabber/src/main/res/layout/fragment_xaccount_info.xml b/xabber/src/main/res/layout/fragment_xaccount_info.xml
index 2a074b64bd..dc82b2fa05 100644
--- a/xabber/src/main/res/layout/fragment_xaccount_info.xml
+++ b/xabber/src/main/res/layout/fragment_xaccount_info.xml
@@ -462,52 +462,6 @@
 
                 </RelativeLayout>
 
-                <View
-                    android:layout_width="match_parent"
-                    android:layout_height="1dp"
-                    android:background="?attr/settings_separator_background_color"
-                    android:layout_alignParentBottom="true"
-                    />
-            </RelativeLayout>
-
-            <RelativeLayout
-                android:id="@+id/rlLogout"
-                android:layout_width="match_parent"
-                android:layout_height="48dp"
-                android:layout_below="@id/rlSync"
-                >
-
-                <RelativeLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="48dp"
-                    android:paddingLeft="24dp"
-                    android:paddingRight="16dp"
-                    android:paddingTop="8dp"
-                    android:paddingBottom="8dp"
-                    android:background="?android:attr/selectableItemBackground"
-                    >
-
-                    <ImageView
-                        android:id="@+id/ivLogout"
-                        android:layout_width="24dp"
-                        android:layout_height="24dp"
-                        android:src="@drawable/ic_exit_grey600_24dp"
-                        android:layout_centerVertical="true"
-                        android:tint="@color/grey_600"
-                        />
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_centerVertical="true"
-                        android:layout_toRightOf="@+id/ivLogout"
-                        android:layout_marginLeft="24dp"
-                        android:textColor="?android:attr/textColorPrimary"
-                        android:text="@string/button_quit"
-                        />
-
-                </RelativeLayout>
-
             </RelativeLayout>
 
         </LinearLayout>
diff --git a/xabber/src/main/res/menu/toolbar_xabber_account_info.xml b/xabber/src/main/res/menu/toolbar_xabber_account_info.xml
index 3d2d96ad53..1f2aa34c9c 100644
--- a/xabber/src/main/res/menu/toolbar_xabber_account_info.xml
+++ b/xabber/src/main/res/menu/toolbar_xabber_account_info.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
-    <item android:id="@+id/action_cancel_register"
-        android:title="@string/button_cancel_registration"
+    <item android:id="@+id/action_quit"
+        android:title="@string/button_quit"
         app:showAsAction="never"
-        android:visible="false"/>
+        />
 </menu>
\ No newline at end of file
diff --git a/xabber/src/main/res/values-ru-rRU/xabber_account.xml b/xabber/src/main/res/values-ru-rRU/xabber_account.xml
index a30a0df880..03a25c0a61 100644
--- a/xabber/src/main/res/values-ru-rRU/xabber_account.xml
+++ b/xabber/src/main/res/values-ru-rRU/xabber_account.xml
@@ -56,7 +56,7 @@
   <string name="title_register_xabber_account">Регистрация</string>
   <string name="summary_xabber_account_in_login">Аккаунт Xabber требуется для использования сервисов Xabber и синхронизации настроек устройств.</string>
   <string name="summary_username">Имя пользователя Xabber также является XMPP id</string>
-  <string name="button_quit">ВЫХОД</string>
+  <string name="button_quit">Выход</string>
   <string name="button_login">ВХОД</string>
   <string name="button_registration">РЕГИСТРАЦИЯ</string>
   <string name="button_resend_link">ОТПРАВИТЬ КОД</string>
diff --git a/xabber/src/main/res/values/styles.xml b/xabber/src/main/res/values/styles.xml
index b058e39f5a..52aa453deb 100644
--- a/xabber/src/main/res/values/styles.xml
+++ b/xabber/src/main/res/values/styles.xml
@@ -13,6 +13,11 @@
      along with this program. If not, see http://www.gnu.org/licenses/.
 -->
 <resources>
+
+    <style name="OverflowButtonStyle" parent="Widget.AppCompat.ActionButton.Overflow">
+        <item name="android:tint">#000</item>
+    </style>
+
     <style name="ChatHeader" parent="@android:style/TextAppearance">
         <item name="android:textSize">12sp</item>
     </style>
diff --git a/xabber/src/main/res/values/theme.xml b/xabber/src/main/res/values/theme.xml
index cafcb33796..76980fd67d 100644
--- a/xabber/src/main/res/values/theme.xml
+++ b/xabber/src/main/res/values/theme.xml
@@ -14,6 +14,10 @@
 -->
 <resources>
 
+    <style name="Theme.LightToolbar" parent="Theme">
+        <item name="actionOverflowButtonStyle">@style/OverflowButtonStyle</item>
+    </style>
+
     <style name="Theme" parent="Theme.AppCompat.Light.DarkActionBar">
         <item name="windowActionBar">false</item>
         <item name="windowNoTitle">true</item>
diff --git a/xabber/src/main/res/values/xabber_account.xml b/xabber/src/main/res/values/xabber_account.xml
index 0fd74635dc..5c4fd6906a 100644
--- a/xabber/src/main/res/values/xabber_account.xml
+++ b/xabber/src/main/res/values/xabber_account.xml
@@ -97,7 +97,7 @@
     <string name="button_advanced_options">ADVANCED OPTIONS</string>
     <string name="button_hide_options">HIDE OPTIONS</string>
     <string name="button_terms_of_service">TERMS OF SERVICE</string>
-    <string name="button_quit">QUIT</string>
+    <string name="button_quit">Quit</string>
     <string name="button_login">SIGN IN</string>
     <string name="button_registration">SIGN UP</string>
     <string name="button_resend_link">RESEND CODE</string>

From fc61dd8e4038161b1f9dd2f1fdfa9e71be450ddf Mon Sep 17 00:00:00 2001
From: Valery Miller <valera_miller94@mail.ru>
Date: Wed, 12 Sep 2018 16:49:35 +0500
Subject: [PATCH 083/251] Synchronization screen removed from dialog to xabber
 account info

---
 .../ui/fragment/AccountSyncFragment.java      | 88 +++++++++++++++++++
 .../fragment/XabberAccountInfoFragment.java   | 35 ++++----
 .../res/layout/fragment_xaccount_info.xml     | 66 +++-----------
 3 files changed, 115 insertions(+), 74 deletions(-)
 create mode 100644 xabber/src/main/java/com/xabber/android/ui/fragment/AccountSyncFragment.java

diff --git a/xabber/src/main/java/com/xabber/android/ui/fragment/AccountSyncFragment.java b/xabber/src/main/java/com/xabber/android/ui/fragment/AccountSyncFragment.java
new file mode 100644
index 0000000000..76059bdc1b
--- /dev/null
+++ b/xabber/src/main/java/com/xabber/android/ui/fragment/AccountSyncFragment.java
@@ -0,0 +1,88 @@
+package com.xabber.android.ui.fragment;
+
+import android.app.Fragment;
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.support.v7.widget.LinearLayoutManager;
+import android.support.v7.widget.RecyclerView;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.CompoundButton;
+import android.widget.Switch;
+
+import com.xabber.android.R;
+import com.xabber.android.data.SettingsManager;
+import com.xabber.android.data.account.AccountManager;
+import com.xabber.android.data.xaccount.XMPPAccountSettings;
+import com.xabber.android.data.xaccount.XabberAccountManager;
+import com.xabber.android.ui.adapter.XMPPAccountAdapter;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+public class AccountSyncFragment extends Fragment {
+
+    private List<XMPPAccountSettings> xmppAccounts;
+    private Switch switchSyncAll;
+    private XMPPAccountAdapter adapter;
+
+    public static AccountSyncFragment newInstance() {
+        AccountSyncFragment fragment = new AccountSyncFragment();
+        return fragment;
+    }
+
+    @Nullable
+    @Override
+    public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, Bundle savedInstanceState) {
+        return inflater.inflate(R.layout.dialog_account_sync, container, false);
+    }
+
+    @Override
+    public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+
+        switchSyncAll = (Switch) view.findViewById(R.id.switchSyncAll);
+        switchSyncAll.setChecked(SettingsManager.isSyncAllAccounts());
+        switchSyncAll.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
+            @Override
+            public void onCheckedChanged(CompoundButton compoundButton, boolean b) {
+                if (adapter != null)
+                    adapter.setAllChecked(b);
+            }
+        });
+        if (AccountManager.getInstance().haveNotAllowedSyncAccounts()) switchSyncAll.setEnabled(false);
+
+        setXmppAccounts(XabberAccountManager.getInstance().getXmppAccountsForSync());
+
+        adapter = new XMPPAccountAdapter(getActivity());
+        adapter.setItems(xmppAccounts);
+
+        if (adapter != null && SettingsManager.isSyncAllAccounts())
+            adapter.setAllChecked(true);
+
+        RecyclerView recyclerView = (RecyclerView) view.findViewById(R.id.list);
+        recyclerView.setLayoutManager(new LinearLayoutManager(getActivity()));
+        recyclerView.setAdapter(adapter);
+    }
+
+    private void setXmppAccounts(List<XMPPAccountSettings> items) {
+        this.xmppAccounts = new ArrayList<>();
+        for (XMPPAccountSettings account : items) {
+            XMPPAccountSettings newAccount = new XMPPAccountSettings(
+                    account.getJid(),
+                    account.isSynchronization(),
+                    account.getTimestamp());
+            newAccount.setUsername(account.getUsername());
+            newAccount.setColor(account.getColor());
+            newAccount.setOrder(account.getOrder());
+            newAccount.setStatus(account.getStatus());
+            newAccount.setDeleted(account.isDeleted());
+            newAccount.setSyncNotAllowed(account.isSyncNotAllowed());
+
+            this.xmppAccounts.add(newAccount);
+        }
+        Collections.sort(xmppAccounts);
+    }
+}
diff --git a/xabber/src/main/java/com/xabber/android/ui/fragment/XabberAccountInfoFragment.java b/xabber/src/main/java/com/xabber/android/ui/fragment/XabberAccountInfoFragment.java
index a28f2a3e6c..cc57735a5d 100644
--- a/xabber/src/main/java/com/xabber/android/ui/fragment/XabberAccountInfoFragment.java
+++ b/xabber/src/main/java/com/xabber/android/ui/fragment/XabberAccountInfoFragment.java
@@ -1,6 +1,7 @@
 package com.xabber.android.ui.fragment;
 
 import android.app.Fragment;
+import android.app.FragmentTransaction;
 import android.os.Bundle;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
@@ -80,7 +81,8 @@ public class XabberAccountInfoFragment extends Fragment implements AddEmailDialo
     private View viewLinks;
     private ImageView ivChevron;
 
-    private boolean dialogShowed;
+    private Fragment fragmentSync;
+    private FragmentTransaction fTrans;
 
     private CompositeSubscription compositeSubscription = new CompositeSubscription();
     private Listener listener;
@@ -116,17 +118,6 @@ public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
         tvLanguage = (TextView) view.findViewById(R.id.tvLanguage);
         tvLastSyncDate = (TextView) view.findViewById(R.id.tvLastSyncDate);
 
-        rlSync = (RelativeLayout) view.findViewById(R.id.rlSync);
-        rlSync.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                if (!dialogShowed) {
-                    dialogShowed = true;
-                    showSyncDialog(false);
-                }
-            }
-        });
-
         ivChevron = view.findViewById(R.id.ivChevron);
         tvLinks = view.findViewById(R.id.tvLinks);
         viewLinks = view.findViewById(R.id.viewLinks);
@@ -195,9 +186,6 @@ public void onClick(View v) {
                         .show(getFragmentManager(), AccountSyncDialogFragment.class.getSimpleName());
             }
         });
-
-        if (getArguments().getBoolean("SHOW_SYNC", false))
-            showSyncDialog(true);
     }
 
     @Override
@@ -210,6 +198,8 @@ public void onResume() {
             updateLastSyncTime();
         }
         else getActivity().finish();
+
+        getSettings();
     }
 
     @Override
@@ -269,7 +259,7 @@ public void updateLastSyncTime() {
         tvLastSyncDate.setText(getString(R.string.last_sync_date, SettingsManager.getLastSyncDate()));
     }
 
-    public void showSyncDialog(final boolean noCancel) {
+    private void getSettings() {
         Subscription getSettingsSubscription = AuthManager.getClientSettings()
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
@@ -281,10 +271,8 @@ public void call(List<XMPPAccountSettings> list) {
                         if (items != null && items.size() > 0) {
                             // save full list to list for sync
                             XabberAccountManager.getInstance().setXmppAccountsForSync(items);
-                            // show dialog
-                            AccountSyncDialogFragment.newInstance(XabberAccountInfoFragment.this, noCancel)
-                                    .show(getFragmentManager(), AccountSyncDialogFragment.class.getSimpleName());
-                            dialogShowed = false;
+                            // show fragment
+                            showSyncFragment();
                         } else Toast.makeText(getActivity(), R.string.sync_fail, Toast.LENGTH_SHORT).show();
                     }
                 }, new Action1<Throwable>() {
@@ -296,6 +284,13 @@ public void call(Throwable throwable) {
         compositeSubscription.add(getSettingsSubscription);
     }
 
+    private void showSyncFragment() {
+        fragmentSync = AccountSyncFragment.newInstance();
+        fTrans = getFragmentManager().beginTransaction();
+        fTrans.replace(R.id.childContainer, fragmentSync);
+        fTrans.commit();
+    }
+
     private void handleErrorGetSettings(Throwable throwable) {
         String message = RetrofitErrorConverter.throwableToHttpError(throwable);
         if (message != null) {
diff --git a/xabber/src/main/res/layout/fragment_xaccount_info.xml b/xabber/src/main/res/layout/fragment_xaccount_info.xml
index dc82b2fa05..d97b553130 100644
--- a/xabber/src/main/res/layout/fragment_xaccount_info.xml
+++ b/xabber/src/main/res/layout/fragment_xaccount_info.xml
@@ -407,62 +407,20 @@
             android:orientation="vertical"
             >
 
-            <RelativeLayout
-                android:id="@+id/rlSync"
+            <FrameLayout
+                android:id="@+id/childContainer"
                 android:layout_width="match_parent"
-                android:layout_height="52dp"
-                android:layout_below="@id/llAccount"
-                >
-
-                <RelativeLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:paddingLeft="24dp"
-                    android:paddingRight="16dp"
-                    android:paddingTop="8dp"
-                    android:paddingBottom="8dp"
-                    android:background="?android:attr/selectableItemBackground"
-                    >
-
-                    <ImageView
-                        android:id="@+id/ivSync"
-                        android:layout_width="24dp"
-                        android:layout_height="24dp"
-                        android:src="@drawable/ic_sync"
-                        android:layout_centerVertical="true"
-                        android:tint="@color/grey_600"
-                        />
-
-                    <LinearLayout
-                        android:orientation="vertical"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_centerVertical="true"
-                        android:layout_toRightOf="@+id/ivSync"
-                        android:layout_marginLeft="24dp"
-                        >
-
-                        <TextView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:textColor="?android:attr/textColorPrimary"
-                            android:text="@string/button_sync"
-                            />
-
-                        <TextView
-                            android:id="@+id/tvLastSyncDate"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:singleLine="true"
-                            android:text="@string/last_sync_date"
-                            android:textColor="@color/grey_500"
-                            android:textSize="14sp" />
+                android:layout_height="wrap_content"/>
 
-                    </LinearLayout>
-
-                </RelativeLayout>
-
-            </RelativeLayout>
+            <TextView
+                android:id="@+id/tvLastSyncDate"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:singleLine="true"
+                android:text="@string/last_sync_date"
+                android:textColor="@color/grey_500"
+                android:textSize="14sp"
+                android:padding="8dp"/>
 
         </LinearLayout>
 

From e70a37d557de87cc4cf4c8543a96be9c70c070fa Mon Sep 17 00:00:00 2001
From: Valery Miller <valera_miller94@mail.ru>
Date: Wed, 12 Sep 2018 17:07:49 +0500
Subject: [PATCH 084/251] Added auto-save sync settings on change

---
 .../ui/adapter/XMPPAccountAdapter.java        | 10 ++++--
 .../ui/dialog/AccountSyncDialogFragment.java  |  2 +-
 .../ui/fragment/AccountSyncFragment.java      | 31 +++++++++++++++++--
 3 files changed, 38 insertions(+), 5 deletions(-)

diff --git a/xabber/src/main/java/com/xabber/android/ui/adapter/XMPPAccountAdapter.java b/xabber/src/main/java/com/xabber/android/ui/adapter/XMPPAccountAdapter.java
index 40badbf1d8..42c3f7f115 100644
--- a/xabber/src/main/java/com/xabber/android/ui/adapter/XMPPAccountAdapter.java
+++ b/xabber/src/main/java/com/xabber/android/ui/adapter/XMPPAccountAdapter.java
@@ -14,7 +14,6 @@
 import com.xabber.android.data.account.AccountItem;
 import com.xabber.android.data.account.AccountManager;
 import com.xabber.android.data.xaccount.XMPPAccountSettings;
-import com.xabber.android.data.xaccount.XabberAccount;
 import com.xabber.android.data.xaccount.XabberAccountManager;
 import com.xabber.android.ui.color.ColorManager;
 
@@ -29,9 +28,15 @@ public class XMPPAccountAdapter extends RecyclerView.Adapter {
     private List<XMPPAccountSettings> items;
     private boolean isAllChecked;
     private Context context;
+    private Listener listener;
 
-    public XMPPAccountAdapter(Context context) {
+    public interface Listener {
+        void onChkClick();
+    }
+
+    public XMPPAccountAdapter(Context context, Listener listener) {
         this.context = context;
+        this.listener = listener;
     }
 
     public void setItems(List<XMPPAccountSettings> items) {
@@ -179,6 +184,7 @@ private class XMPPAccountVH extends RecyclerView.ViewHolder {
                 @Override
                 public void onClick(View v) {
                     notifyDataSetChanged();
+                    listener.onChkClick();
                 }
             });
         }
diff --git a/xabber/src/main/java/com/xabber/android/ui/dialog/AccountSyncDialogFragment.java b/xabber/src/main/java/com/xabber/android/ui/dialog/AccountSyncDialogFragment.java
index 7a1834f4d8..0dff2e37a0 100644
--- a/xabber/src/main/java/com/xabber/android/ui/dialog/AccountSyncDialogFragment.java
+++ b/xabber/src/main/java/com/xabber/android/ui/dialog/AccountSyncDialogFragment.java
@@ -107,7 +107,7 @@ public void onCheckedChanged(CompoundButton compoundButton, boolean b) {
 
         setXmppAccounts(XabberAccountManager.getInstance().getXmppAccountsForSync());
 
-        adapter = new XMPPAccountAdapter(getActivity());
+        //adapter = new XMPPAccountAdapter(getActivity());
         adapter.setItems(xmppAccounts);
 
         if (adapter != null && SettingsManager.isSyncAllAccounts())
diff --git a/xabber/src/main/java/com/xabber/android/ui/fragment/AccountSyncFragment.java b/xabber/src/main/java/com/xabber/android/ui/fragment/AccountSyncFragment.java
index 76059bdc1b..d6285cf409 100644
--- a/xabber/src/main/java/com/xabber/android/ui/fragment/AccountSyncFragment.java
+++ b/xabber/src/main/java/com/xabber/android/ui/fragment/AccountSyncFragment.java
@@ -20,9 +20,11 @@
 
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
-public class AccountSyncFragment extends Fragment {
+public class AccountSyncFragment extends Fragment implements XMPPAccountAdapter.Listener {
 
     private List<XMPPAccountSettings> xmppAccounts;
     private Switch switchSyncAll;
@@ -50,13 +52,14 @@ public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
             public void onCheckedChanged(CompoundButton compoundButton, boolean b) {
                 if (adapter != null)
                     adapter.setAllChecked(b);
+                saveSyncSettings();
             }
         });
         if (AccountManager.getInstance().haveNotAllowedSyncAccounts()) switchSyncAll.setEnabled(false);
 
         setXmppAccounts(XabberAccountManager.getInstance().getXmppAccountsForSync());
 
-        adapter = new XMPPAccountAdapter(getActivity());
+        adapter = new XMPPAccountAdapter(getActivity(), this);
         adapter.setItems(xmppAccounts);
 
         if (adapter != null && SettingsManager.isSyncAllAccounts())
@@ -85,4 +88,28 @@ private void setXmppAccounts(List<XMPPAccountSettings> items) {
         }
         Collections.sort(xmppAccounts);
     }
+
+    private void saveSyncSettings() {
+        // set accounts to sync map
+        if (!switchSyncAll.isChecked()) {
+            Map<String, Boolean> syncState = new HashMap<>();
+            for (XMPPAccountSettings account : xmppAccounts) {
+                if (account.getStatus() != XMPPAccountSettings.SyncStatus.local) {
+                    syncState.put(account.getJid(), account.isSynchronization());
+                } else if (account.isSynchronization() || XabberAccountManager.getInstance()
+                        .getAccountSyncState(account.getJid()) != null) {
+                    syncState.put(account.getJid(), account.isSynchronization());
+                }
+            }
+            XabberAccountManager.getInstance().setAccountSyncState(syncState);
+        }
+
+        // set sync all
+        SettingsManager.setSyncAllAccounts(switchSyncAll.isChecked());
+    }
+
+    @Override
+    public void onChkClick() {
+        saveSyncSettings();
+    }
 }

From 4ec1bfc00b53a532454aa80271d787c3cc6e13c6 Mon Sep 17 00:00:00 2001
From: Valery Miller <valera_miller94@mail.ru>
Date: Wed, 12 Sep 2018 17:54:20 +0500
Subject: [PATCH 085/251] Changes in synchronization fragment

---
 .../ui/fragment/AccountSyncFragment.java      | 14 ++++
 .../fragment/XabberAccountInfoFragment.java   |  9 +--
 .../main/res/layout/dialog_account_sync.xml   | 68 +++++++++++++++++--
 .../res/layout/fragment_xaccount_info.xml     | 10 ---
 .../main/res/values-ru-rRU/xabber_account.xml |  2 +-
 xabber/src/main/res/values/xabber_account.xml |  3 +-
 6 files changed, 80 insertions(+), 26 deletions(-)

diff --git a/xabber/src/main/java/com/xabber/android/ui/fragment/AccountSyncFragment.java b/xabber/src/main/java/com/xabber/android/ui/fragment/AccountSyncFragment.java
index d6285cf409..cb6b2223e5 100644
--- a/xabber/src/main/java/com/xabber/android/ui/fragment/AccountSyncFragment.java
+++ b/xabber/src/main/java/com/xabber/android/ui/fragment/AccountSyncFragment.java
@@ -10,6 +10,7 @@
 import android.view.ViewGroup;
 import android.widget.CompoundButton;
 import android.widget.Switch;
+import android.widget.TextView;
 
 import com.xabber.android.R;
 import com.xabber.android.data.SettingsManager;
@@ -29,6 +30,7 @@ public class AccountSyncFragment extends Fragment implements XMPPAccountAdapter.
     private List<XMPPAccountSettings> xmppAccounts;
     private Switch switchSyncAll;
     private XMPPAccountAdapter adapter;
+    private TextView tvLastSyncDate;
 
     public static AccountSyncFragment newInstance() {
         AccountSyncFragment fragment = new AccountSyncFragment();
@@ -45,6 +47,8 @@ public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container,
     public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
 
+        tvLastSyncDate = (TextView) view.findViewById(R.id.tvLastSyncDate);
+
         switchSyncAll = (Switch) view.findViewById(R.id.switchSyncAll);
         switchSyncAll.setChecked(SettingsManager.isSyncAllAccounts());
         switchSyncAll.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
@@ -70,6 +74,16 @@ public void onCheckedChanged(CompoundButton compoundButton, boolean b) {
         recyclerView.setAdapter(adapter);
     }
 
+    @Override
+    public void onResume() {
+        super.onResume();
+        updateLastSyncTime();
+    }
+
+    public void updateLastSyncTime() {
+        tvLastSyncDate.setText(getString(R.string.last_sync_date, SettingsManager.getLastSyncDate()));
+    }
+
     private void setXmppAccounts(List<XMPPAccountSettings> items) {
         this.xmppAccounts = new ArrayList<>();
         for (XMPPAccountSettings account : items) {
diff --git a/xabber/src/main/java/com/xabber/android/ui/fragment/XabberAccountInfoFragment.java b/xabber/src/main/java/com/xabber/android/ui/fragment/XabberAccountInfoFragment.java
index cc57735a5d..89e64d6302 100644
--- a/xabber/src/main/java/com/xabber/android/ui/fragment/XabberAccountInfoFragment.java
+++ b/xabber/src/main/java/com/xabber/android/ui/fragment/XabberAccountInfoFragment.java
@@ -13,13 +13,11 @@
 import android.view.ViewGroup;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
-import android.widget.RelativeLayout;
 import android.widget.TextView;
 import android.widget.Toast;
 
 import com.xabber.android.BuildConfig;
 import com.xabber.android.R;
-import com.xabber.android.data.SettingsManager;
 import com.xabber.android.data.xaccount.AuthManager;
 import com.xabber.android.data.xaccount.EmailDTO;
 import com.xabber.android.data.xaccount.SocialBindingDTO;
@@ -53,8 +51,6 @@ public class XabberAccountInfoFragment extends Fragment implements AddEmailDialo
     private TextView tvAccountUsername;
     private TextView tvLanguage;
     private TextView tvPhone;
-    private TextView tvLastSyncDate;
-    private RelativeLayout rlSync;
 
     private ImageView ivGoogle;
     private TextView tvNameGoogle;
@@ -116,7 +112,6 @@ public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
         tvAccountName = (TextView) view.findViewById(R.id.tvAccountName);
         tvAccountUsername = (TextView) view.findViewById(R.id.tvAccountUsername);
         tvLanguage = (TextView) view.findViewById(R.id.tvLanguage);
-        tvLastSyncDate = (TextView) view.findViewById(R.id.tvLastSyncDate);
 
         ivChevron = view.findViewById(R.id.ivChevron);
         tvLinks = view.findViewById(R.id.tvLinks);
@@ -195,7 +190,6 @@ public void onResume() {
         XabberAccount account = XabberAccountManager.getInstance().getAccount();
         if (account != null) {
             updateData(account);
-            updateLastSyncTime();
         }
         else getActivity().finish();
 
@@ -256,7 +250,8 @@ public void updateData(@NonNull XabberAccount account) {
     }
 
     public void updateLastSyncTime() {
-        tvLastSyncDate.setText(getString(R.string.last_sync_date, SettingsManager.getLastSyncDate()));
+        if (fragmentSync != null && fragmentSync.isVisible())
+            ((AccountSyncFragment) fragmentSync).updateLastSyncTime();
     }
 
     private void getSettings() {
diff --git a/xabber/src/main/res/layout/dialog_account_sync.xml b/xabber/src/main/res/layout/dialog_account_sync.xml
index 8ee0bcb0db..aa27844ce3 100644
--- a/xabber/src/main/res/layout/dialog_account_sync.xml
+++ b/xabber/src/main/res/layout/dialog_account_sync.xml
@@ -4,16 +4,28 @@
     android:orientation="vertical"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:paddingTop="8dp"
     android:paddingLeft="16dp"
     android:paddingRight="16dp">
 
-    <Switch
-        android:id="@+id/switchSyncAll"
-        android:layout_width="match_parent"
+    <TextView
+        android:id="@+id/drawer_header_action_xmpp_accounts"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:textAppearance="?android:attr/textAppearanceMedium"
+        android:textSize="16sp"
+        android:textStyle="bold"
+        android:text="@string/title_sync"
+        />
+
+    <TextView
+        android:id="@+id/tvLastSyncDate"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="16dp"
-        android:text="@string/sync_all"
-        android:theme="@style/RedSwitchStyle"
+        android:singleLine="true"
+        android:text="@string/last_sync_date"
+        android:textColor="@color/grey_500"
+        android:textSize="14sp"
         />
 
     <android.support.v7.widget.RecyclerView
@@ -21,8 +33,50 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_marginTop="8dp"
-        android:layout_marginBottom="16dp"
         tools:listitem="@layout/item_xmpp_account"
         />
 
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="8dp"
+        android:layout_marginBottom="16dp"
+        >
+
+        <LinearLayout
+            android:orientation="vertical"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerVertical="true"
+            android:layout_toLeftOf="@id/switchSyncAll"
+            android:layout_marginRight="8dp"
+            >
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/sync_all"
+                android:textStyle="bold"
+                />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/sync_all_description"
+                />
+
+        </LinearLayout>
+
+        <Switch
+            android:id="@+id/switchSyncAll"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="16dp"
+            android:theme="@style/RedSwitchStyle"
+            android:layout_alignParentRight="true"
+            android:layout_centerVertical="true"
+            />
+
+    </RelativeLayout>
+
 </LinearLayout>
\ No newline at end of file
diff --git a/xabber/src/main/res/layout/fragment_xaccount_info.xml b/xabber/src/main/res/layout/fragment_xaccount_info.xml
index d97b553130..84dc891e3b 100644
--- a/xabber/src/main/res/layout/fragment_xaccount_info.xml
+++ b/xabber/src/main/res/layout/fragment_xaccount_info.xml
@@ -412,16 +412,6 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"/>
 
-            <TextView
-                android:id="@+id/tvLastSyncDate"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:singleLine="true"
-                android:text="@string/last_sync_date"
-                android:textColor="@color/grey_500"
-                android:textSize="14sp"
-                android:padding="8dp"/>
-
         </LinearLayout>
 
     </android.support.v7.widget.CardView>
diff --git a/xabber/src/main/res/values-ru-rRU/xabber_account.xml b/xabber/src/main/res/values-ru-rRU/xabber_account.xml
index 03a25c0a61..395b60680f 100644
--- a/xabber/src/main/res/values-ru-rRU/xabber_account.xml
+++ b/xabber/src/main/res/values-ru-rRU/xabber_account.xml
@@ -51,7 +51,7 @@
   <string name="title_completed_register">Регистрация завершена</string>
   <string name="title_start_messaging">Начните общение!</string>
   <string name="title_reordering_account">Порядок аккаунтов</string>
-  <string name="title_sync">Синхронизация</string>
+  <string name="title_sync">Синхронизированные аккаунты</string>
   <string name="title_login_xabber_account">Авторизация</string>
   <string name="title_register_xabber_account">Регистрация</string>
   <string name="summary_xabber_account_in_login">Аккаунт Xabber требуется для использования сервисов Xabber и синхронизации настроек устройств.</string>
diff --git a/xabber/src/main/res/values/xabber_account.xml b/xabber/src/main/res/values/xabber_account.xml
index 5c4fd6906a..5c097afcc8 100644
--- a/xabber/src/main/res/values/xabber_account.xml
+++ b/xabber/src/main/res/values/xabber_account.xml
@@ -78,7 +78,7 @@
     <string name="title_completed_register">Registration completed</string>
     <string name="title_start_messaging">Start messaging!</string>
     <string name="title_reordering_account">Reorder accounts</string>
-    <string name="title_sync">Synchronization</string>
+    <string name="title_sync">Synchronized accounts</string>
     <string name="title_add_email">Link email account</string>
     <string name="title_verified_email">Verified email address</string>
     <string name="title_unverified_email">Unverified email address</string>
@@ -115,6 +115,7 @@
     <string name="last_sync_date">Last synchronization: %1$s</string>
     <string name="last_sync_date_never">never</string>
     <string name="sync_all">Synchronize all</string>
+    <string name="sync_all_description">Settings of all accounts and account order will be automatically synced with other devices</string>
     <string name="no_email">no email</string>
     <string name="no_username">no username</string>
     <string name="no_phone">no phone</string>

From 0dc295aa35fa038ad6e0c45125dd69abfb775757 Mon Sep 17 00:00:00 2001
From: Valery Miller <valera_miller94@mail.ru>
Date: Wed, 12 Sep 2018 18:06:52 +0500
Subject: [PATCH 086/251] Added sync now function

---
 .../xabber/android/ui/activity/XabberAccountActivity.java  | 3 +++
 xabber/src/main/res/layout/fragment_xaccount_info.xml      | 1 +
 xabber/src/main/res/menu/toolbar_xabber_account_info.xml   | 7 +++++++
 xabber/src/main/res/values-ru-rRU/xabber_account.xml       | 2 +-
 xabber/src/main/res/values/xabber_account.xml              | 2 +-
 5 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/xabber/src/main/java/com/xabber/android/ui/activity/XabberAccountActivity.java b/xabber/src/main/java/com/xabber/android/ui/activity/XabberAccountActivity.java
index 1fee00636c..10dcf30e66 100644
--- a/xabber/src/main/java/com/xabber/android/ui/activity/XabberAccountActivity.java
+++ b/xabber/src/main/java/com/xabber/android/ui/activity/XabberAccountActivity.java
@@ -109,6 +109,9 @@ public boolean onMenuItemClick(MenuItem item) {
                     showLogoutDialog();
                 }
                 return true;
+            case R.id.action_sync:
+                synchronize(false);
+                return true;
             default:
                 return false;
         }
diff --git a/xabber/src/main/res/layout/fragment_xaccount_info.xml b/xabber/src/main/res/layout/fragment_xaccount_info.xml
index 84dc891e3b..2cdbcf7c7c 100644
--- a/xabber/src/main/res/layout/fragment_xaccount_info.xml
+++ b/xabber/src/main/res/layout/fragment_xaccount_info.xml
@@ -155,6 +155,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:visibility="gone"
+                android:paddingBottom="8dp"
                 >
 
                 <LinearLayout
diff --git a/xabber/src/main/res/menu/toolbar_xabber_account_info.xml b/xabber/src/main/res/menu/toolbar_xabber_account_info.xml
index 1f2aa34c9c..637bae3d6f 100644
--- a/xabber/src/main/res/menu/toolbar_xabber_account_info.xml
+++ b/xabber/src/main/res/menu/toolbar_xabber_account_info.xml
@@ -1,8 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <item android:id="@+id/action_sync"
+        android:title="@string/button_sync"
+        app:showAsAction="never"
+        />
+
     <item android:id="@+id/action_quit"
         android:title="@string/button_quit"
         app:showAsAction="never"
         />
+
 </menu>
\ No newline at end of file
diff --git a/xabber/src/main/res/values-ru-rRU/xabber_account.xml b/xabber/src/main/res/values-ru-rRU/xabber_account.xml
index 395b60680f..e7dc213ebf 100644
--- a/xabber/src/main/res/values-ru-rRU/xabber_account.xml
+++ b/xabber/src/main/res/values-ru-rRU/xabber_account.xml
@@ -64,7 +64,7 @@
   <string name="button_confirm">подтвердить</string>
   <string name="button_cancel_registration">Прервать регистрацию</string>
   <string name="button_continue">продолжить</string>
-  <string name="button_sync">СИНХРОНИЗИРОВАТЬ</string>
+  <string name="button_sync">Синхронизировать</string>
   <string name="btn_done">закончить</string>
   <string name="not_login">Вход не выполнен</string>
   <string name="enter_password">Пожалуйста, введите пароль для этого аккаунта</string>
diff --git a/xabber/src/main/res/values/xabber_account.xml b/xabber/src/main/res/values/xabber_account.xml
index 5c097afcc8..894718aa75 100644
--- a/xabber/src/main/res/values/xabber_account.xml
+++ b/xabber/src/main/res/values/xabber_account.xml
@@ -105,7 +105,7 @@
     <string name="button_confirm">confirm</string>
     <string name="button_cancel_registration">Cancel registration</string>
     <string name="button_continue">continue</string>
-    <string name="button_sync">SYNCHRONIZE</string>
+    <string name="button_sync">Sync now</string>
 
     <string name="btn_done">done</string>
 

From ab2f9c975f9083a57de65842facd4fc95721e597 Mon Sep 17 00:00:00 2001
From: Valery Miller <valera_miller94@mail.ru>
Date: Wed, 12 Sep 2018 18:12:28 +0500
Subject: [PATCH 087/251] Added description to Xabber Account screen

---
 xabber/src/main/res/layout/fragment_xaccount_info.xml | 11 ++++++++++-
 xabber/src/main/res/values/xabber_account.xml         |  1 +
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/xabber/src/main/res/layout/fragment_xaccount_info.xml b/xabber/src/main/res/layout/fragment_xaccount_info.xml
index 2cdbcf7c7c..745389d337 100644
--- a/xabber/src/main/res/layout/fragment_xaccount_info.xml
+++ b/xabber/src/main/res/layout/fragment_xaccount_info.xml
@@ -5,7 +5,7 @@
     android:orientation="vertical"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="?attr/settings_background_color">
+    android:background="?attr/settings_separator_background_color">
 
     <android.support.v7.widget.CardView
         android:layout_width="match_parent"
@@ -417,5 +417,14 @@
 
     </android.support.v7.widget.CardView>
 
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="@string/sync_security_description"
+        android:paddingTop="8dp"
+        android:paddingLeft="16dp"
+        android:paddingRight="16dp"
+        android:paddingBottom="16dp"
+        />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/xabber/src/main/res/values/xabber_account.xml b/xabber/src/main/res/values/xabber_account.xml
index 894718aa75..775c5bb842 100644
--- a/xabber/src/main/res/values/xabber_account.xml
+++ b/xabber/src/main/res/values/xabber_account.xml
@@ -126,6 +126,7 @@
     <string name="username_rules">Username may contain only lowercase latin letters, numbers and dots</string>
     <string name="username_rules_first_symbol">Username must start with letter</string>
     <string name="username_rules_dots">Username must not contain two dots in a row</string>
+    <string name="sync_security_description">Your passwords are never synchronized and are safe from theft. But you have to enter them on every device (unless you use tokens, which you should)</string>
 
     <string name="sync_with_xabber_account">Synchronize with Xabber account</string>
     <string name="delete_synced_accounts">Delete synchronized XMPP accounts from this device?</string>

From acb52d9181689e5912d3d7ae89211c6eb60f9f58 Mon Sep 17 00:00:00 2001
From: Valery Miller <valera_miller94@mail.ru>
Date: Wed, 12 Sep 2018 18:25:06 +0500
Subject: [PATCH 088/251] Visual changes in Xabber Account screen

---
 .../android/ui/adapter/XMPPAccountAdapter.java       |  5 +++--
 xabber/src/main/res/layout/dialog_account_sync.xml   |  6 ++----
 xabber/src/main/res/layout/item_xmpp_account.xml     | 12 +++++-------
 xabber/src/main/res/values/colors.xml                |  1 +
 4 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/xabber/src/main/java/com/xabber/android/ui/adapter/XMPPAccountAdapter.java b/xabber/src/main/java/com/xabber/android/ui/adapter/XMPPAccountAdapter.java
index 42c3f7f115..b25cca5461 100644
--- a/xabber/src/main/java/com/xabber/android/ui/adapter/XMPPAccountAdapter.java
+++ b/xabber/src/main/java/com/xabber/android/ui/adapter/XMPPAccountAdapter.java
@@ -8,6 +8,7 @@
 import android.widget.CheckBox;
 import android.widget.CompoundButton;
 import android.widget.ImageView;
+import android.widget.Switch;
 import android.widget.TextView;
 
 import com.xabber.android.R;
@@ -170,7 +171,7 @@ private class XMPPAccountVH extends RecyclerView.ViewHolder {
         ImageView avatar;
         TextView username;
         TextView jid;
-        CheckBox chkAccountSync;
+        Switch chkAccountSync;
 
 
         XMPPAccountVH(View itemView) {
@@ -179,7 +180,7 @@ private class XMPPAccountVH extends RecyclerView.ViewHolder {
             avatar = (ImageView) itemView.findViewById(R.id.avatar);
             username = (TextView) itemView.findViewById(R.id.tvAccountName);
             jid = (TextView) itemView.findViewById(R.id.tvAccountJid);
-            chkAccountSync = (CheckBox) itemView.findViewById(R.id.chkAccountSync);
+            chkAccountSync = (Switch) itemView.findViewById(R.id.chkAccountSync);
             chkAccountSync.setOnClickListener(new View.OnClickListener() {
                 @Override
                 public void onClick(View v) {
diff --git a/xabber/src/main/res/layout/dialog_account_sync.xml b/xabber/src/main/res/layout/dialog_account_sync.xml
index aa27844ce3..3ee748204c 100644
--- a/xabber/src/main/res/layout/dialog_account_sync.xml
+++ b/xabber/src/main/res/layout/dialog_account_sync.xml
@@ -4,18 +4,17 @@
     android:orientation="vertical"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:paddingTop="8dp"
+    android:paddingTop="16dp"
     android:paddingLeft="16dp"
     android:paddingRight="16dp">
 
     <TextView
-        android:id="@+id/drawer_header_action_xmpp_accounts"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:textAppearance="?android:attr/textAppearanceMedium"
         android:textSize="16sp"
-        android:textStyle="bold"
         android:text="@string/title_sync"
+        android:textColor="@color/android_default_accent_color"
         />
 
     <TextView
@@ -72,7 +71,6 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="16dp"
-            android:theme="@style/RedSwitchStyle"
             android:layout_alignParentRight="true"
             android:layout_centerVertical="true"
             />
diff --git a/xabber/src/main/res/layout/item_xmpp_account.xml b/xabber/src/main/res/layout/item_xmpp_account.xml
index ed1f3d6407..0aaaf4f42f 100644
--- a/xabber/src/main/res/layout/item_xmpp_account.xml
+++ b/xabber/src/main/res/layout/item_xmpp_account.xml
@@ -1,12 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:orientation="horizontal"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:paddingTop="8dp"
-    android:paddingBottom="8dp"
-    >
+    android:paddingBottom="8dp">
 
     <FrameLayout
         android:layout_width="wrap_content"
@@ -57,13 +55,13 @@
             android:textColor="@color/grey_500"
             android:textSize="14sp" />
     </LinearLayout>
-    <android.support.v7.widget.AppCompatCheckBox
+
+    <Switch
         android:id="@+id/chkAccountSync"
         android:layout_width="wrap_content"
-        android:layout_height="match_parent"
-        android:layout_gravity="center"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_vertical"
         android:layout_marginLeft="8dp"
-        android:theme="@style/RedCheckBox"
         />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/xabber/src/main/res/values/colors.xml b/xabber/src/main/res/values/colors.xml
index 412e1d5228..c55592e96f 100644
--- a/xabber/src/main/res/values/colors.xml
+++ b/xabber/src/main/res/values/colors.xml
@@ -391,6 +391,7 @@
     <color name="contact_list_background">#FFE8EBEE</color>
 
     <color name="patreon_coral">#F96854</color>
+    <color name="android_default_accent_color">#FF019284</color>
 
     <color name="unread_messages_background">#66cfd8dc</color>
 

From 2f2342e2f3cee401b3aeca0c62091f19de840e5c Mon Sep 17 00:00:00 2001
From: Valery Miller <valera_miller94@mail.ru>
Date: Wed, 12 Sep 2018 18:37:59 +0500
Subject: [PATCH 089/251] Up version to 509

---
 xabber/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/xabber/build.gradle b/xabber/build.gradle
index 986fa72634..70b588d1d2 100644
--- a/xabber/build.gradle
+++ b/xabber/build.gradle
@@ -10,8 +10,8 @@ android {
     defaultConfig {
         minSdkVersion 15
         targetSdkVersion 27
-        versionCode 508
-        versionName '2.4.2(508)'
+        versionCode 509
+        versionName '2.4.2(509)'
     }
 
     lintOptions {

From e2b23e763258de5e27a48d1eb96340c1a0877af4 Mon Sep 17 00:00:00 2001
From: Valery Miller <valera_miller94@mail.ru>
Date: Thu, 13 Sep 2018 14:47:36 +0500
Subject: [PATCH 090/251] Changes in xabber account item

---
 xabber/src/main/res/layout/item_xabber_account.xml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/xabber/src/main/res/layout/item_xabber_account.xml b/xabber/src/main/res/layout/item_xabber_account.xml
index 92faefefb8..d49c587d34 100644
--- a/xabber/src/main/res/layout/item_xabber_account.xml
+++ b/xabber/src/main/res/layout/item_xabber_account.xml
@@ -16,7 +16,6 @@
             android:id="@+id/tvAccountName"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginBottom="2dp"
             android:textStyle="bold"
             android:textColor="@color/white_text"
             android:textSize="16sp"
@@ -34,7 +33,7 @@
             android:ellipsize="marquee"
             android:singleLine="true"
             android:textColor="@color/white_text"
-            android:textSize="14sp"
+            android:textSize="16sp"
             android:shadowColor="@color/black"
             android:shadowDy="2"
             android:shadowDx="2"

From 0d453a8b6c57e2d6e7cfb2af9334d91a4f25ffd5 Mon Sep 17 00:00:00 2001
From: Valery Miller <valera_miller94@mail.ru>
Date: Thu, 13 Sep 2018 16:12:51 +0500
Subject: [PATCH 091/251] Changes in sync-settings

---
 .../data/extension/avatar/AvatarManager.java  | 15 +++++
 .../ui/adapter/XMPPAccountAdapter.java        | 57 ++++---------------
 .../src/main/res/layout/item_xmpp_account.xml | 19 ++-----
 3 files changed, 31 insertions(+), 60 deletions(-)

diff --git a/xabber/src/main/java/com/xabber/android/data/extension/avatar/AvatarManager.java b/xabber/src/main/java/com/xabber/android/data/extension/avatar/AvatarManager.java
index 1cd740baa7..66543a933e 100644
--- a/xabber/src/main/java/com/xabber/android/data/extension/avatar/AvatarManager.java
+++ b/xabber/src/main/java/com/xabber/android/data/extension/avatar/AvatarManager.java
@@ -330,6 +330,15 @@ public Drawable getAccountAvatar(AccountJid account) {
         }
     }
 
+    public Drawable getAccountAvatarForSync(AccountJid account, int color) {
+        Bitmap value = getBitmap(account.getFullJid().asBareJid());
+        if (value != null) {
+            return new BitmapDrawable(application.getResources(), value);
+        } else {
+            return getDefaultAccountAvatarForSync(account, color);
+        }
+    }
+
     @NonNull
     public Drawable getDefaultAccountAvatar(AccountJid account) {
         String name = AccountManager.getInstance().getVerboseName(account);
@@ -337,6 +346,12 @@ public Drawable getDefaultAccountAvatar(AccountJid account) {
         return generateDefaultAvatar(account.getFullJid().asBareJid().toString(), name, color);
     }
 
+    @NonNull
+    public Drawable getDefaultAccountAvatarForSync(AccountJid account, int color) {
+        String name = AccountManager.getInstance().getVerboseName(account);
+        return generateDefaultAvatar(account.getFullJid().asBareJid().toString(), name, color);
+    }
+
     /**
      * Gets avatar for regular user.
      *
diff --git a/xabber/src/main/java/com/xabber/android/ui/adapter/XMPPAccountAdapter.java b/xabber/src/main/java/com/xabber/android/ui/adapter/XMPPAccountAdapter.java
index b25cca5461..a02f54ba2d 100644
--- a/xabber/src/main/java/com/xabber/android/ui/adapter/XMPPAccountAdapter.java
+++ b/xabber/src/main/java/com/xabber/android/ui/adapter/XMPPAccountAdapter.java
@@ -5,19 +5,19 @@
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.CheckBox;
 import android.widget.CompoundButton;
 import android.widget.ImageView;
 import android.widget.Switch;
 import android.widget.TextView;
 
 import com.xabber.android.R;
-import com.xabber.android.data.account.AccountItem;
-import com.xabber.android.data.account.AccountManager;
+import com.xabber.android.data.entity.AccountJid;
+import com.xabber.android.data.extension.avatar.AvatarManager;
 import com.xabber.android.data.xaccount.XMPPAccountSettings;
-import com.xabber.android.data.xaccount.XabberAccountManager;
 import com.xabber.android.ui.color.ColorManager;
 
+import org.jxmpp.stringprep.XmppStringprepException;
+
 import java.util.List;
 
 /**
@@ -68,74 +68,43 @@ public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
             }
         });
 
-        viewHolder.avatar.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                if (account.isSynchronization() || isAllChecked) {
-                    if (account.getStatus() == XMPPAccountSettings.SyncStatus.localNewer) {
-                        account.setStatus(XMPPAccountSettings.SyncStatus.remoteNewer);
-                        account.setTimestamp(0);
-
-                        // change settings
-                        XMPPAccountSettings set = XabberAccountManager.getInstance().getAccountSettingsForSync(account.getJid());
-                        if (set != null) {
-                            account.setColor(set.getColor());
-                        }
-                    } else if (account.getStatus() == XMPPAccountSettings.SyncStatus.remoteNewer) {
-                        account.setStatus(XMPPAccountSettings.SyncStatus.localNewer);
-                        account.setTimestamp((int) (System.currentTimeMillis() / 1000L));
-
-                        // change settings
-                        AccountItem item = AccountManager.getInstance().getAccount(XabberAccountManager.getInstance().getExistingAccount(account.getJid()));
-                        if (item != null) {
-                            account.setColor(ColorManager.getInstance().convertIndexToColorName(item.getColorIndex()));
-                        }
-                    }
-                    notifyDataSetChanged();
-                }
-            }
-        });
-
         // set colors
         int colorId = ColorManager.getInstance().convertColorNameToId(account.getColor());
-        viewHolder.color.setColorFilter(colorId);
-        viewHolder.username.setTextColor(colorId);
 
         // set username
         if (account.getUsername() != null && !account.getUsername().isEmpty())
             viewHolder.username.setText(account.getUsername());
         else viewHolder.username.setText(account.getJid());
 
-        // set jid
-        //viewHolder.jid.setText(account.getJid());
+        // set avatar
+        try {
+            AccountJid accountJid = AccountJid.from(account.getJid() + "/resource");
+            viewHolder.avatar.setImageDrawable(AvatarManager.getInstance().getAccountAvatarForSync(accountJid, colorId));
+        } catch (XmppStringprepException e) {
+            e.printStackTrace();
+        }
 
         if (account.isSynchronization() || isAllChecked) {
             if (account.getStatus() != null) {
                 switch (account.getStatus()) {
                     case local:
                         viewHolder.jid.setText(R.string.sync_status_local);
-                        viewHolder.avatar.setImageResource(R.drawable.ic_sync_upload);
                         break;
                     case remote:
                         viewHolder.jid.setText(R.string.sync_status_remote);
-                        viewHolder.avatar.setImageResource(R.drawable.ic_sync_download);
                         break;
                     case localNewer:
                         viewHolder.jid.setText(R.string.sync_status_local);
-                        viewHolder.avatar.setImageResource(R.drawable.ic_sync_upload);
                         break;
                     case remoteNewer:
                         if (account.isDeleted()) {
                             viewHolder.jid.setText(R.string.sync_status_deleted);
-                            viewHolder.avatar.setImageResource(R.drawable.ic_delete_grey);
                         } else {
                             viewHolder.jid.setText(R.string.sync_status_remote);
-                            viewHolder.avatar.setImageResource(R.drawable.ic_sync_download);
                         }
                         break;
                     case localEqualsRemote:
                         viewHolder.jid.setText(R.string.sync_status_ok);
-                        viewHolder.avatar.setImageResource(R.drawable.ic_sync_done);
                         break;
                     default:
                         break;
@@ -143,8 +112,6 @@ public void onClick(View v) {
             }
         } else {
             viewHolder.jid.setText(R.string.sync_status_no);
-            viewHolder.avatar.setImageResource(R.drawable.ic_sync_disable);
-            viewHolder.username.setTextColor(context.getResources().getColor(R.color.grey_500));
         }
 
         // set sync checkbox
@@ -167,7 +134,6 @@ public int getItemCount() {
 
     private class XMPPAccountVH extends RecyclerView.ViewHolder {
 
-        ImageView color;
         ImageView avatar;
         TextView username;
         TextView jid;
@@ -176,7 +142,6 @@ private class XMPPAccountVH extends RecyclerView.ViewHolder {
 
         XMPPAccountVH(View itemView) {
             super(itemView);
-            color = (ImageView) itemView.findViewById(R.id.color);
             avatar = (ImageView) itemView.findViewById(R.id.avatar);
             username = (TextView) itemView.findViewById(R.id.tvAccountName);
             jid = (TextView) itemView.findViewById(R.id.tvAccountJid);
diff --git a/xabber/src/main/res/layout/item_xmpp_account.xml b/xabber/src/main/res/layout/item_xmpp_account.xml
index 0aaaf4f42f..ff7a3e06ce 100644
--- a/xabber/src/main/res/layout/item_xmpp_account.xml
+++ b/xabber/src/main/res/layout/item_xmpp_account.xml
@@ -12,18 +12,10 @@
         android:layout_gravity="center_vertical">
 
         <de.hdodenhof.circleimageview.CircleImageView
-            android:id="@+id/color"
-            android:layout_width="40dp"
-            android:layout_height="40dp"
-            android:src="@color/green_500"
-            android:visibility="invisible"/>
-
-        <ImageView
             android:id="@+id/avatar"
             android:layout_width="40dp"
             android:layout_height="40dp"
-            android:padding="8dp"
-            android:src="@drawable/ic_sync_disable" />
+            />
 
     </FrameLayout>
     <LinearLayout
@@ -32,25 +24,24 @@
         android:layout_gravity="center_vertical"
         android:layout_weight="1"
         android:orientation="vertical"
-        android:paddingLeft="8dp"
+        android:paddingLeft="16dp"
         >
 
         <TextView
             android:id="@+id/tvAccountName"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_weight="1"
             android:ellipsize="marquee"
-            android:lines="1"
+            android:singleLine="true"
             android:text="Username"
             android:textColor="@color/black_text"
-            android:textSize="18sp" />
+            android:textSize="16sp" />
 
         <TextView
             android:id="@+id/tvAccountJid"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_weight="1"
+
             android:text="jid"
             android:textColor="@color/grey_500"
             android:textSize="14sp" />

From 2744d9bdbaae142ecb3391f48bcec65e4631bbe0 Mon Sep 17 00:00:00 2001
From: Valery Miller <valera_miller94@mail.ru>
Date: Thu, 13 Sep 2018 18:03:52 +0500
Subject: [PATCH 092/251] Up version to 510

---
 xabber/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/xabber/build.gradle b/xabber/build.gradle
index 70b588d1d2..75f0228f08 100644
--- a/xabber/build.gradle
+++ b/xabber/build.gradle
@@ -10,8 +10,8 @@ android {
     defaultConfig {
         minSdkVersion 15
         targetSdkVersion 27
-        versionCode 509
-        versionName '2.4.2(509)'
+        versionCode 510
+        versionName '2.4.2(510)'
     }
 
     lintOptions {

From 324cbaf8319ff2256b061b07b01e04e4c4fb3c96 Mon Sep 17 00:00:00 2001
From: Valery Miller <valera_miller94@mail.ru>
Date: Fri, 14 Sep 2018 16:28:33 +0500
Subject: [PATCH 093/251] Fixed email item xml

---
 xabber/src/main/res/layout/item_email.xml | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/xabber/src/main/res/layout/item_email.xml b/xabber/src/main/res/layout/item_email.xml
index 678d17e2bb..0962faaf01 100644
--- a/xabber/src/main/res/layout/item_email.xml
+++ b/xabber/src/main/res/layout/item_email.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    android:orientation="horizontal"
     android:layout_width="match_parent"
     android:layout_height="48dp"
     android:clickable="true"
@@ -13,7 +12,7 @@
         android:layout_height="36dp"
         android:layout_marginLeft="18dp"
         android:src="@drawable/ic_email_circle"
-        android:layout_gravity="center_vertical"
+        android:layout_centerVertical="true"
         />
 
     <LinearLayout
@@ -22,7 +21,9 @@
         android:layout_height="wrap_content"
         android:layout_marginLeft="18dp"
         android:layout_marginRight="8dp"
-        android:layout_gravity="center_vertical"
+        android:layout_centerVertical="true"
+        android:layout_toRightOf="@id/ivEmail"
+        android:layout_toLeftOf="@id/tvAction"
         >
 
         <TextView
@@ -31,6 +32,8 @@
             android:layout_height="wrap_content"
             android:textColor="?android:attr/textColorPrimary"
             tools:text="@tools:sample/full_names"
+            android:singleLine="true"
+            android:ellipsize="middle"
             />
 
         <TextView
@@ -38,6 +41,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:textColor="@color/grey_500"
+            android:singleLine="true"
             android:text="@string/title_unverified_email"
             />
 
@@ -45,13 +49,14 @@
 
     <TextView
         android:id="@+id/tvAction"
-        android:layout_width="match_parent"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:textColor="@color/account_register_blue"
         android:text="@string/action_verify"
-        android:layout_gravity="center_vertical"
-        android:gravity="right"
+        android:singleLine="true"
+        android:layout_centerVertical="true"
+        android:layout_alignParentRight="true"
         android:layout_marginRight="16dp"
         />
 
-</LinearLayout>
\ No newline at end of file
+</RelativeLayout>
\ No newline at end of file

From 1575950c9ceacda6784ba66b573738f889c1a6e4 Mon Sep 17 00:00:00 2001
From: Valery Miller <valera_miller94@mail.ru>
Date: Fri, 14 Sep 2018 17:00:54 +0500
Subject: [PATCH 094/251] On link or unlink social do sync and update screen

---
 .../ui/activity/XabberAccountActivity.java      |  2 ++
 .../ui/fragment/XabberAccountInfoFragment.java  | 17 +++++++++++++++++
 2 files changed, 19 insertions(+)

diff --git a/xabber/src/main/java/com/xabber/android/ui/activity/XabberAccountActivity.java b/xabber/src/main/java/com/xabber/android/ui/activity/XabberAccountActivity.java
index 10dcf30e66..de3dbee9cf 100644
--- a/xabber/src/main/java/com/xabber/android/ui/activity/XabberAccountActivity.java
+++ b/xabber/src/main/java/com/xabber/android/ui/activity/XabberAccountActivity.java
@@ -164,6 +164,7 @@ public void call(ResponseBody s) {
                         hideProgress();
                         Toast.makeText(XabberAccountActivity.this,
                                 R.string.social_bind_success, Toast.LENGTH_SHORT).show();
+                        synchronize(false);
                     }
                 }, new Action1<Throwable>() {
                     @Override
@@ -188,6 +189,7 @@ public void call(ResponseBody responseBody) {
                         hideProgress();
                         Toast.makeText(XabberAccountActivity.this,
                                 R.string.social_unbind_success, Toast.LENGTH_SHORT).show();
+                        synchronize(false);
                     }
                 }, new Action1<Throwable>() {
                     @Override
diff --git a/xabber/src/main/java/com/xabber/android/ui/fragment/XabberAccountInfoFragment.java b/xabber/src/main/java/com/xabber/android/ui/fragment/XabberAccountInfoFragment.java
index 89e64d6302..422bbc3a15 100644
--- a/xabber/src/main/java/com/xabber/android/ui/fragment/XabberAccountInfoFragment.java
+++ b/xabber/src/main/java/com/xabber/android/ui/fragment/XabberAccountInfoFragment.java
@@ -304,6 +304,7 @@ private void handleErrorGetSettings(Throwable throwable) {
     }
 
     private void setupSocial(List<SocialBindingDTO> socialBindings) {
+        clearSocial();
         for (SocialBindingDTO socialBinding : socialBindings) {
             if ("google".equals(socialBinding.getProvider())) {
                 ivGoogle.setImageResource(R.drawable.ic_google_plus);
@@ -331,6 +332,22 @@ private void setupSocial(List<SocialBindingDTO> socialBindings) {
         if (socialBindings.size() > 0) tvLinks.setText(R.string.title_linked_accounts);
     }
 
+    private void clearSocial() {
+        ivGoogle.setImageResource(R.drawable.ic_google_plus_disabled);
+        tvNameGoogle.setVisibility(View.GONE);
+        tvStatusGoogle.setText(R.string.title_not_linked_account);
+        tvActionGoogle.setText(R.string.action_connect);
+
+        ivFacebook.setImageResource(R.drawable.ic_google_plus_disabled);
+        tvNameFacebook.setVisibility(View.GONE);
+        tvStatusFacebook.setText(R.string.title_not_linked_account);
+        tvActionFacebook.setText(R.string.action_connect);
+
+        ivTwitter.setImageResource(R.drawable.ic_google_plus_disabled);
+        tvNameTwitter.setVisibility(View.GONE);
+        tvStatusTwitter.setText(R.string.title_not_linked_account);
+        tvActionTwitter.setText(R.string.action_connect);
+    }
 
     private void setupEmailList(List<EmailDTO> emails) {
         if (emails.size() > 0) tvLinks.setText(R.string.title_linked_accounts);

From 8e6aae42ae8352dc0175a54cd2b4ace0eb666295 Mon Sep 17 00:00:00 2001
From: Valery Miller <valera_miller94@mail.ru>
Date: Fri, 14 Sep 2018 17:21:30 +0500
Subject: [PATCH 095/251] On add and verify email do sync and update screen

---
 .../com/xabber/android/ui/activity/XabberAccountActivity.java   | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/xabber/src/main/java/com/xabber/android/ui/activity/XabberAccountActivity.java b/xabber/src/main/java/com/xabber/android/ui/activity/XabberAccountActivity.java
index de3dbee9cf..b6011df788 100644
--- a/xabber/src/main/java/com/xabber/android/ui/activity/XabberAccountActivity.java
+++ b/xabber/src/main/java/com/xabber/android/ui/activity/XabberAccountActivity.java
@@ -358,6 +358,7 @@ public void call(Throwable throwable) {
     private void handleSuccessResendEmail(ResponseBody response) {
         hideProgress();
         Toast.makeText(this, R.string.resend_success, Toast.LENGTH_SHORT).show();
+        synchronize(false);
     }
 
     private void handleErrorResendEmail(Throwable throwable) {
@@ -389,6 +390,7 @@ public void call(Throwable throwable) {
     private void handleSuccessConfirm(XabberAccount response) {
         hideProgress();
         Toast.makeText(this, R.string.confirm_success, Toast.LENGTH_SHORT).show();
+        synchronize(false);
     }
 
     private void handleErrorConfirm(Throwable throwable) {

From 5bb02c8673d83842a740a52d1bd211c07d3a617c Mon Sep 17 00:00:00 2001
From: Valery Miller <valera_miller94@mail.ru>
Date: Fri, 14 Sep 2018 17:41:56 +0500
Subject: [PATCH 096/251] Added progress for loading list of accounts in xabber
 account screen

---
 .../fragment/XabberAccountInfoFragment.java   |  9 +++++++
 .../res/layout/fragment_xaccount_info.xml     | 25 +++++++++++++++++++
 xabber/src/main/res/values/xabber_account.xml |  1 +
 3 files changed, 35 insertions(+)

diff --git a/xabber/src/main/java/com/xabber/android/ui/fragment/XabberAccountInfoFragment.java b/xabber/src/main/java/com/xabber/android/ui/fragment/XabberAccountInfoFragment.java
index 422bbc3a15..0cef075706 100644
--- a/xabber/src/main/java/com/xabber/android/ui/fragment/XabberAccountInfoFragment.java
+++ b/xabber/src/main/java/com/xabber/android/ui/fragment/XabberAccountInfoFragment.java
@@ -77,6 +77,7 @@ public class XabberAccountInfoFragment extends Fragment implements AddEmailDialo
     private View viewLinks;
     private ImageView ivChevron;
 
+    private View progressView;
     private Fragment fragmentSync;
     private FragmentTransaction fTrans;
 
@@ -113,6 +114,7 @@ public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
         tvAccountUsername = (TextView) view.findViewById(R.id.tvAccountUsername);
         tvLanguage = (TextView) view.findViewById(R.id.tvLanguage);
 
+        progressView = view.findViewById(R.id.progressView);
         ivChevron = view.findViewById(R.id.ivChevron);
         tvLinks = view.findViewById(R.id.tvLinks);
         viewLinks = view.findViewById(R.id.viewLinks);
@@ -255,12 +257,14 @@ public void updateLastSyncTime() {
     }
 
     private void getSettings() {
+        showProgressView(true);
         Subscription getSettingsSubscription = AuthManager.getClientSettings()
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribe(new Action1<List<XMPPAccountSettings>>() {
                     @Override
                     public void call(List<XMPPAccountSettings> list) {
+                        showProgressView(false);
                         List<XMPPAccountSettings> items = XabberAccountManager.getInstance().createSyncList(list);
 
                         if (items != null && items.size() > 0) {
@@ -286,7 +290,12 @@ private void showSyncFragment() {
         fTrans.commit();
     }
 
+    private void showProgressView(boolean show) {
+        progressView.setVisibility(show ? View.VISIBLE : View.GONE);
+    }
+
     private void handleErrorGetSettings(Throwable throwable) {
+        showProgressView(false);
         String message = RetrofitErrorConverter.throwableToHttpError(throwable);
         if (message != null) {
             if (message.equals("Invalid token")) {
diff --git a/xabber/src/main/res/layout/fragment_xaccount_info.xml b/xabber/src/main/res/layout/fragment_xaccount_info.xml
index 745389d337..602751a5c8 100644
--- a/xabber/src/main/res/layout/fragment_xaccount_info.xml
+++ b/xabber/src/main/res/layout/fragment_xaccount_info.xml
@@ -413,6 +413,31 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"/>
 
+            <LinearLayout
+                android:id="@+id/progressView"
+                android:orientation="vertical"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:visibility="gone"
+                >
+
+                <ProgressBar
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center"
+                    android:layout_marginTop="20dp"
+                    />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/progress_title_account_list"
+                    android:layout_gravity="center_horizontal"
+                    android:layout_marginBottom="20dp"
+                    />
+
+            </LinearLayout>
+
         </LinearLayout>
 
     </android.support.v7.widget.CardView>
diff --git a/xabber/src/main/res/values/xabber_account.xml b/xabber/src/main/res/values/xabber_account.xml
index 775c5bb842..cde729c3a2 100644
--- a/xabber/src/main/res/values/xabber_account.xml
+++ b/xabber/src/main/res/values/xabber_account.xml
@@ -49,6 +49,7 @@
     <string name="progress_title_confirm_xmpp">Confirm XMPP-account with code</string>
     <string name="progress_title_bind_social">Bind social network</string>
     <string name="progress_title_unbind_social">Unbind social network</string>
+    <string name="progress_title_account_list">Loading list of accounts..</string>
 
     <string name="label_username">Pick your username</string>
     <string name="hint_username">username</string>

From ba3ec81fa06db57525ef4deec9a7da6f151560cc Mon Sep 17 00:00:00 2001
From: Valery Miller <valera_miller94@mail.ru>
Date: Fri, 14 Sep 2018 18:13:50 +0500
Subject: [PATCH 097/251] Added function for deleting email

---
 .../android/data/xaccount/AuthManager.java    |  4 ++
 .../android/data/xaccount/IXabberApi.java     |  5 +++
 .../ui/activity/XabberAccountActivity.java    | 39 ++++++++++++++++++-
 .../android/ui/adapter/EmailAdapter.java      |  7 +++-
 .../fragment/XabberAccountInfoFragment.java   |  8 +++-
 xabber/src/main/res/values/xabber_account.xml |  2 +
 6 files changed, 61 insertions(+), 4 deletions(-)

diff --git a/xabber/src/main/java/com/xabber/android/data/xaccount/AuthManager.java b/xabber/src/main/java/com/xabber/android/data/xaccount/AuthManager.java
index 97a8b5021e..d6ee7de703 100644
--- a/xabber/src/main/java/com/xabber/android/data/xaccount/AuthManager.java
+++ b/xabber/src/main/java/com/xabber/android/data/xaccount/AuthManager.java
@@ -246,6 +246,10 @@ public static Single<ResponseBody> addEmail(String email) {
         return HttpApiManager.getXabberApi().addEmail(getXabberTokenHeader(), new Email(email, getSource()));
     }
 
+    public static Single<ResponseBody> deleteEmail(int emailId) {
+        return HttpApiManager.getXabberApi().deleteEmail(getXabberTokenHeader(), emailId);
+    }
+
     public static Single<ResponseBody> setPhoneNumber(String phoneNumber) {
         return HttpApiManager.getXabberApi().setPhoneNumber(getXabberTokenHeader(), new SetPhoneNumber("set", phoneNumber));
     }
diff --git a/xabber/src/main/java/com/xabber/android/data/xaccount/IXabberApi.java b/xabber/src/main/java/com/xabber/android/data/xaccount/IXabberApi.java
index d8f4509225..5b095c1ccf 100644
--- a/xabber/src/main/java/com/xabber/android/data/xaccount/IXabberApi.java
+++ b/xabber/src/main/java/com/xabber/android/data/xaccount/IXabberApi.java
@@ -4,11 +4,13 @@
 
 import okhttp3.ResponseBody;
 import retrofit2.http.Body;
+import retrofit2.http.DELETE;
 import retrofit2.http.GET;
 import retrofit2.http.HTTP;
 import retrofit2.http.Header;
 import retrofit2.http.PATCH;
 import retrofit2.http.POST;
+import retrofit2.http.Path;
 import rx.Single;
 
 /**
@@ -65,6 +67,9 @@ public interface IXabberApi {
     @POST("accounts/current/email_list/")
     Single<ResponseBody> addEmail(@Header("Authorization") String token, @Body AuthManager.Email email);
 
+    @DELETE("accounts/current/email_list/{email_id}/")
+    Single<ResponseBody> deleteEmail(@Header("Authorization") String token, @Path(value = "email_id", encoded = true) int emailId);
+
     /* Xabber API v2 */
 
     @POST("accounts/xmpp_code_request/")
diff --git a/xabber/src/main/java/com/xabber/android/ui/activity/XabberAccountActivity.java b/xabber/src/main/java/com/xabber/android/ui/activity/XabberAccountActivity.java
index b6011df788..718e0f2079 100644
--- a/xabber/src/main/java/com/xabber/android/ui/activity/XabberAccountActivity.java
+++ b/xabber/src/main/java/com/xabber/android/ui/activity/XabberAccountActivity.java
@@ -227,6 +227,11 @@ public void onAddEmailClick(String email) {
         resendConfirmEmail(email);
     }
 
+    @Override
+    public void onDeleteEmailClick(int emailId) {
+        deleteEmail(emailId);
+    }
+
     @Override
     public void onConfirmEmailClick(String email, String code) {
         confirmEmail(code);
@@ -390,11 +395,43 @@ public void call(Throwable throwable) {
     private void handleSuccessConfirm(XabberAccount response) {
         hideProgress();
         Toast.makeText(this, R.string.confirm_success, Toast.LENGTH_SHORT).show();
-        synchronize(false);
+        updateAccountInfo(response);
     }
 
     private void handleErrorConfirm(Throwable throwable) {
         hideProgress();
         handleError(throwable, "Error while confirming email: ", LOG_TAG);
     }
+
+    /** DELETE EMAIL */
+
+    private void deleteEmail(int emailId) {
+        showProgress(getResources().getString(R.string.progress_title_delete));
+        Subscription deleteSubscription = AuthManager.deleteEmail(emailId)
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(new Action1<ResponseBody>() {
+                    @Override
+                    public void call(ResponseBody s) {
+                        handleSuccessDelete(s);
+                    }
+                }, new Action1<Throwable>() {
+                    @Override
+                    public void call(Throwable throwable) {
+                        handleErrorDelete(throwable);
+                    }
+                });
+        compositeSubscription.add(deleteSubscription);
+    }
+
+    private void handleSuccessDelete(ResponseBody response) {
+        hideProgress();
+        Toast.makeText(this, R.string.delete_success, Toast.LENGTH_SHORT).show();
+        synchronize(false);
+    }
+
+    private void handleErrorDelete(Throwable throwable) {
+        hideProgress();
+        handleError(throwable, "Error while deleting email: ", LOG_TAG);
+    }
 }
diff --git a/xabber/src/main/java/com/xabber/android/ui/adapter/EmailAdapter.java b/xabber/src/main/java/com/xabber/android/ui/adapter/EmailAdapter.java
index 49efe9a9f0..d1ef697442 100644
--- a/xabber/src/main/java/com/xabber/android/ui/adapter/EmailAdapter.java
+++ b/xabber/src/main/java/com/xabber/android/ui/adapter/EmailAdapter.java
@@ -19,7 +19,8 @@ public class EmailAdapter extends RecyclerView.Adapter<EmailAdapter.EmailViewHol
     private Listener listener;
 
     public interface Listener {
-        void onEmailClick(String email);
+        void onEmailVerifyClick(String email);
+        void onEmailDeleteClick(int id);
     }
 
     public EmailAdapter(Listener listener) {
@@ -49,7 +50,9 @@ public void onBindViewHolder(EmailViewHolder holder, final int position) {
         holder.itemView.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                listener.onEmailClick(emailDTO.getEmail());
+                if (emailDTO.isVerified())
+                    listener.onEmailDeleteClick(emailDTO.getId());
+                else listener.onEmailVerifyClick(emailDTO.getEmail());
             }
         });
     }
diff --git a/xabber/src/main/java/com/xabber/android/ui/fragment/XabberAccountInfoFragment.java b/xabber/src/main/java/com/xabber/android/ui/fragment/XabberAccountInfoFragment.java
index 0cef075706..3f2b185b8c 100644
--- a/xabber/src/main/java/com/xabber/android/ui/fragment/XabberAccountInfoFragment.java
+++ b/xabber/src/main/java/com/xabber/android/ui/fragment/XabberAccountInfoFragment.java
@@ -88,6 +88,7 @@ public interface Listener {
         void onSocialBindClick(String provider);
         void onSocialUnbindClick(String provider);
         void onAddEmailClick(String email);
+        void onDeleteEmailClick(int emailId);
         void onConfirmEmailClick(String email, String code);
         void onLogoutClick(boolean deleteAccounts);
         void onSyncClick(boolean needGoToMainActivity);
@@ -210,11 +211,16 @@ public void onAddEmailClick(String email) {
     }
 
     @Override
-    public void onEmailClick(String email) {
+    public void onEmailVerifyClick(String email) {
         ConfirmEmailDialogFragment.newInstance(this, email)
                 .show(getFragmentManager(), AccountSyncDialogFragment.class.getSimpleName());
     }
 
+    @Override
+    public void onEmailDeleteClick(int id) {
+        listener.onDeleteEmailClick(id);
+    }
+
     @Override
     public void onResendCodeClick(String email) {
         listener.onAddEmailClick(email);
diff --git a/xabber/src/main/res/values/xabber_account.xml b/xabber/src/main/res/values/xabber_account.xml
index cde729c3a2..04a8937ea2 100644
--- a/xabber/src/main/res/values/xabber_account.xml
+++ b/xabber/src/main/res/values/xabber_account.xml
@@ -16,6 +16,7 @@
     <string name="quit_fail">Quit failed</string>
     <string name="confirm_success">Email confirmed</string>
     <string name="confirm_fail">Email confirmation failed</string>
+    <string name="delete_success">Email deleted</string>
     <string name="complete_success">Registration completed</string>
     <string name="complete_fail">Registration failed</string>
     <string name="resend_success">Verification email sent</string>
@@ -42,6 +43,7 @@
     <string name="progress_title_confirm">Confirmation</string>
     <string name="progress_title_complete">Registration completion</string>
     <string name="progress_title_resend">Resending email</string>
+    <string name="progress_title_delete">Deleting email</string>
     <string name="progress_title_set_phone">Setting phone number</string>
     <string name="progress_title_confirm_phone">Confirming phone number</string>
     <string name="progress_title_delete_settings">Delete settings</string>

From 3cfa97369d7f141ec70a8e5acc5bc5ae5199a4b7 Mon Sep 17 00:00:00 2001
From: Valery Miller <valera_miller94@mail.ru>
Date: Fri, 14 Sep 2018 18:17:05 +0500
Subject: [PATCH 098/251] Up version to 511

---
 xabber/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/xabber/build.gradle b/xabber/build.gradle
index 75f0228f08..8849a32510 100644
--- a/xabber/build.gradle
+++ b/xabber/build.gradle
@@ -10,8 +10,8 @@ android {
     defaultConfig {
         minSdkVersion 15
         targetSdkVersion 27
-        versionCode 510
-        versionName '2.4.2(510)'
+        versionCode 511
+        versionName '2.4.2(511)'
     }
 
     lintOptions {

From 6ee9f03ecc903988c0f0c2178c0b3b596274d2a2 Mon Sep 17 00:00:00 2001
From: Valery Miller <valera_miller94@mail.ru>
Date: Tue, 18 Sep 2018 18:50:33 +0500
Subject: [PATCH 099/251] New screens for signup in Xabber account

---
 .../res/layout/fragment_xaccount_signup_1.xml | 158 +++++++++++
 .../res/layout/fragment_xaccount_signup_2.xml |  93 +++++++
 .../res/layout/fragment_xaccount_signup_3.xml | 261 ++++++++++++++++++
 3 files changed, 512 insertions(+)
 create mode 100644 xabber/src/main/res/layout/fragment_xaccount_signup_1.xml
 create mode 100644 xabber/src/main/res/layout/fragment_xaccount_signup_2.xml
 create mode 100644 xabber/src/main/res/layout/fragment_xaccount_signup_3.xml

diff --git a/xabber/src/main/res/layout/fragment_xaccount_signup_1.xml b/xabber/src/main/res/layout/fragment_xaccount_signup_1.xml
new file mode 100644
index 0000000000..40cde80ff7
--- /dev/null
+++ b/xabber/src/main/res/layout/fragment_xaccount_signup_1.xml
@@ -0,0 +1,158 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/white"
+    >
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="48dp"
+        android:background="#F5F5F5"
+        android:elevation="16dp"
+        >
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="Step 1 of 3"
+            android:textStyle="bold"
+            android:layout_marginLeft="16dp"
+            android:layout_gravity="center_vertical"
+            />
+
+    </LinearLayout>
+
+    <LinearLayout
+        android:orientation="vertical"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="24dp"
+        android:layout_marginLeft="24dp"
+        android:layout_marginRight="24dp"
+        >
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="Pick your username and domain"
+            android:textSize="12sp"
+            android:paddingLeft="4dp"
+            android:textColor="@color/contact_item_text_second"
+            />
+
+        <LinearLayout
+            android:orientation="horizontal"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+            <EditText
+                android:id="@+id/edtUsername"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:imeOptions="actionNext"
+                android:nextFocusForward="@+id/edtPass"
+                android:singleLine="true"
+                android:hint="@string/hint_username"
+                android:textSize="16sp"
+                android:theme="@style/Theme"
+                android:layout_weight="1"
+                />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/host"
+                android:textColor="@color/black_text"
+                android:layout_gravity="bottom"
+                android:layout_marginBottom="6dp"
+                android:layout_marginLeft="4dp"
+                android:layout_marginRight="4dp"
+                />
+
+            <LinearLayout
+                android:orientation="vertical"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                >
+
+                <Spinner
+                    android:id="@+id/spinnerDomain"
+                    android:layout_marginTop="8dp"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    />
+
+                <View
+                    android:id="@+id/spinnerBorder"
+                    android:layout_width="match_parent"
+                    android:layout_height="1dp"
+                    android:background="#757575"
+                    android:layout_marginTop="1dp"
+                    android:layout_marginLeft="7dp"
+                    android:layout_marginRight="16dp"
+                    />
+
+                <ProgressBar
+                    android:id="@+id/pbHosts"
+                    android:layout_width="140dp"
+                    android:layout_height="30dp"
+                    android:layout_marginTop="8dp"
+                    android:visibility="gone"
+                    />
+
+            </LinearLayout>
+
+        </LinearLayout>
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="Xabber.org accounts are free, that includes 30 days of chat history and 100MB for sent and received files. You can unlock additional storage options for $1/month."
+            android:paddingLeft="4dp"
+            android:layout_marginTop="16dp"
+            />
+
+        <RelativeLayout
+            android:layout_marginTop="16dp"
+            android:layout_marginBottom="16dp"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+            <Button
+                android:id="@+id/btnOptions"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                style="@style/Widget.AppCompat.Button.Borderless"
+                android:theme="@style/BlueButton"
+                android:textColor="@color/grey_500"
+                android:text="@string/button_terms_of_service"
+                android:layout_centerVertical="true"
+                />
+
+            <Button
+                android:id="@+id/btnSignUp"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                style="@style/Widget.AppCompat.Button.Colored"
+                android:theme="@style/BlueButton"
+                android:paddingRight="18dp"
+                android:paddingLeft="18dp"
+                android:layout_centerVertical="true"
+                android:layout_alignParentEnd="true"
+                android:layout_alignParentRight="true"
+                android:textColor="@color/white"
+                android:text="@string/button_registration"
+                />
+
+        </RelativeLayout>
+
+
+    </LinearLayout>
+
+
+
+</LinearLayout>
\ No newline at end of file
diff --git a/xabber/src/main/res/layout/fragment_xaccount_signup_2.xml b/xabber/src/main/res/layout/fragment_xaccount_signup_2.xml
new file mode 100644
index 0000000000..9a43897017
--- /dev/null
+++ b/xabber/src/main/res/layout/fragment_xaccount_signup_2.xml
@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="48dp"
+        android:background="#F5F5F5"
+        android:elevation="16dp"
+        >
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="Step 2 of 3"
+            android:textStyle="bold"
+            android:layout_marginLeft="16dp"
+            android:layout_gravity="center_vertical"
+            />
+
+    </LinearLayout>
+
+    <LinearLayout
+        android:orientation="vertical"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="24dp"
+        android:layout_marginLeft="24dp"
+        android:layout_marginRight="24dp"
+        >
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/label_pass"
+            android:textSize="12sp"
+            android:paddingLeft="4dp"
+            android:textColor="@color/contact_item_text_second"
+            />
+
+        <EditText
+            android:id="@+id/edtPass"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:imeOptions="actionDone"
+            android:singleLine="true"
+            android:textSize="16sp"
+            android:theme="@style/Theme"
+            android:hint="@string/hint_pass"
+            android:inputType="textPassword"
+            />
+
+        <RelativeLayout
+            android:layout_marginTop="16dp"
+            android:layout_marginBottom="16dp"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+            <Button
+                android:id="@+id/btnOptions"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                style="@style/Widget.AppCompat.Button.Borderless"
+                android:theme="@style/BlueButton"
+                android:textColor="@color/grey_500"
+                android:text="@string/button_terms_of_service"
+                android:layout_centerVertical="true"
+                />
+
+            <Button
+                android:id="@+id/btnSignUp"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                style="@style/Widget.AppCompat.Button.Colored"
+                android:theme="@style/BlueButton"
+                android:paddingRight="18dp"
+                android:paddingLeft="18dp"
+                android:layout_centerVertical="true"
+                android:layout_alignParentEnd="true"
+                android:layout_alignParentRight="true"
+                android:textColor="@color/white"
+                android:text="@string/button_registration"
+                />
+
+        </RelativeLayout>
+
+
+    </LinearLayout>
+
+
+</LinearLayout>
\ No newline at end of file
diff --git a/xabber/src/main/res/layout/fragment_xaccount_signup_3.xml b/xabber/src/main/res/layout/fragment_xaccount_signup_3.xml
new file mode 100644
index 0000000000..1a70ef5cd2
--- /dev/null
+++ b/xabber/src/main/res/layout/fragment_xaccount_signup_3.xml
@@ -0,0 +1,261 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="48dp"
+        android:background="#F5F5F5"
+        android:elevation="16dp"
+        >
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="Step 3 of 3"
+            android:textStyle="bold"
+            android:layout_marginLeft="16dp"
+            android:layout_gravity="center_vertical"
+            />
+
+    </LinearLayout>
+
+    <LinearLayout
+        android:orientation="vertical"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="24dp"
+        android:layout_marginLeft="24dp"
+        android:layout_marginRight="24dp"
+        >
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="Secure your account by linking it with at least one social network or email. If you don’t do that and lose your password, you’ll never be able to restore access to your account!"
+            android:paddingLeft="4dp"
+            android:layout_marginBottom="16dp"
+            />
+
+        <LinearLayout
+            android:id="@+id/itemGoogle"
+            android:layout_width="match_parent"
+            android:layout_height="48dp"
+            android:paddingLeft="18dp"
+            android:paddingRight="16dp"
+            android:clickable="true"
+            android:background="?android:attr/selectableItemBackground"
+            >
+
+            <ImageView
+                android:id="@+id/ivGoogle"
+                android:layout_width="36dp"
+                android:layout_height="36dp"
+                android:src="@drawable/ic_google_plus_disabled"
+                android:layout_gravity="center_vertical"
+                />
+
+            <LinearLayout
+                android:orientation="vertical"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical"
+                android:layout_marginLeft="18dp"
+                >
+
+                <TextView
+                    android:id="@+id/tvNameGoogle"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
+                    android:textColor="@color/black_text"
+                    tools:text="@tools:sample/full_names"
+                    android:visibility="gone"
+                    />
+
+                <TextView
+                    android:id="@+id/tvStatusGoogle"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
+                    android:textColor="@color/grey_500"
+                    android:text="@string/title_not_linked_account"
+                    />
+
+            </LinearLayout>
+
+            <TextView
+                android:id="@+id/tvActionGoogle"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="24dp"
+                android:gravity="right"
+                android:layout_gravity="center_vertical"
+                android:textColor="@color/grey_500"
+                android:text="@string/action_connect"
+                />
+
+        </LinearLayout>
+
+        <LinearLayout
+            android:id="@+id/itemFacebook"
+            android:layout_width="match_parent"
+            android:layout_height="48dp"
+            android:paddingLeft="18dp"
+            android:paddingRight="16dp"
+            android:clickable="true"
+            android:background="?android:attr/selectableItemBackground"
+            >
+
+            <ImageView
+                android:id="@+id/ivFacebook"
+                android:layout_width="36dp"
+                android:layout_height="36dp"
+                android:src="@drawable/ic_facebook_disabled"
+                android:layout_gravity="center_vertical"
+                />
+
+            <LinearLayout
+                android:orientation="vertical"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical"
+                android:layout_marginLeft="18dp"
+                >
+
+                <TextView
+                    android:id="@+id/tvNameFacebook"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
+                    android:textColor="@color/black_text"
+                    tools:text="@tools:sample/full_names"
+                    android:visibility="gone"
+                    />
+
+                <TextView
+                    android:id="@+id/tvStatusFacebook"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
+                    android:textColor="@color/grey_500"
+                    android:text="@string/title_not_linked_account"
+                    />
+
+            </LinearLayout>
+
+            <TextView
+                android:id="@+id/tvActionFacebook"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="24dp"
+                android:layout_gravity="center_vertical"
+                android:gravity="right"
+                android:textColor="@color/grey_500"
+                android:text="@string/action_connect"
+                />
+
+        </LinearLayout>
+
+        <LinearLayout
+            android:id="@+id/itemTwitter"
+            android:layout_width="match_parent"
+            android:layout_height="48dp"
+            android:paddingLeft="18dp"
+            android:paddingRight="16dp"
+            android:clickable="true"
+            android:background="?android:attr/selectableItemBackground"
+            >
+
+            <ImageView
+                android:id="@+id/ivTwitter"
+                android:layout_width="36dp"
+                android:layout_height="36dp"
+                android:src="@drawable/ic_twitter_disabled"
+                android:layout_gravity="center_vertical"
+                />
+
+            <LinearLayout
+                android:orientation="vertical"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical"
+                android:layout_marginLeft="18dp"
+                >
+
+                <TextView
+                    android:id="@+id/tvNameTwitter"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
+                    android:textColor="@color/black_text"
+                    tools:text="@tools:sample/full_names"
+                    android:visibility="gone"
+                    />
+
+                <TextView
+                    android:id="@+id/tvStatusTwitter"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
+                    android:textColor="@color/grey_500"
+                    android:text="@string/title_not_linked_account"
+                    />
+
+            </LinearLayout>
+
+            <TextView
+                android:id="@+id/tvActionTwitter"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical"
+                android:gravity="right"
+                android:layout_marginLeft="24dp"
+                android:textColor="@color/grey_500"
+                android:text="@string/action_connect"
+                />
+
+        </LinearLayout>
+
+        <RelativeLayout
+            android:layout_marginTop="16dp"
+            android:layout_marginBottom="16dp"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+            <Button
+                android:id="@+id/btnOptions"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                style="@style/Widget.AppCompat.Button.Borderless"
+                android:theme="@style/BlueButton"
+                android:textColor="@color/grey_500"
+                android:text="@string/button_terms_of_service"
+                android:layout_centerVertical="true"
+                />
+
+            <Button
+                android:id="@+id/btnSignUp"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                style="@style/Widget.AppCompat.Button.Colored"
+                android:theme="@style/BlueButton"
+                android:paddingRight="18dp"
+                android:paddingLeft="18dp"
+                android:layout_centerVertical="true"
+                android:layout_alignParentEnd="true"
+                android:layout_alignParentRight="true"
+                android:textColor="@color/white"
+                android:text="@string/button_registration"
+                />
+
+        </RelativeLayout>
+
+
+    </LinearLayout>
+
+
+</LinearLayout>
\ No newline at end of file

From dbb3e7cfb67691ac440187658c05283ffd14597b Mon Sep 17 00:00:00 2001
From: Valery Miller <valera_miller94@mail.ru>
Date: Wed, 19 Sep 2018 15:19:03 +0500
Subject: [PATCH 100/251] Work on new signup screens

---
 .../android/data/xaccount/AuthManager.java    |  38 +++-
 .../android/data/xaccount/IXabberApi.java     |   4 +-
 .../ui/activity/XabberLoginActivity.java      |  55 +++--
 .../ui/adapter/HostSpinnerAdapter.java        |  13 +-
 .../ui/fragment/XAccountSignUpFragment1.java  | 202 ++++++++++++++++++
 .../main/res/layout/activity_xabber_login.xml |   4 +-
 .../res/layout/fragment_xaccount_signup_1.xml |  12 +-
 .../main/res/values-ru-rRU/xabber_account.xml |   2 +-
 xabber/src/main/res/values/words.xml          |   1 +
 xabber/src/main/res/values/xabber_account.xml |   2 +-
 10 files changed, 287 insertions(+), 46 deletions(-)
 create mode 100644 xabber/src/main/java/com/xabber/android/ui/fragment/XAccountSignUpFragment1.java

diff --git a/xabber/src/main/java/com/xabber/android/data/xaccount/AuthManager.java b/xabber/src/main/java/com/xabber/android/data/xaccount/AuthManager.java
index d6ee7de703..04ab1c6baa 100644
--- a/xabber/src/main/java/com/xabber/android/data/xaccount/AuthManager.java
+++ b/xabber/src/main/java/com/xabber/android/data/xaccount/AuthManager.java
@@ -281,7 +281,7 @@ public Single<? extends XabberAccount> call(XabberAccountDTO xabberAccountDTO) {
                 });
     }
 
-    public static Single<List<Domain>> getHosts() {
+    public static Single<HostResponse> getHosts() {
         return HttpApiManager.getXabberApi().getHosts();
     }
 
@@ -398,15 +398,39 @@ public CodeConfirm(String code, String jid) {
         }
     }
 
-    public static class Domain {
-        final String domain;
+    public static class HostResponse {
+        final List<Host> results;
 
-        public Domain(String domain) {
-            this.domain = domain;
+        public HostResponse(List<Host> results) {
+            this.results = results;
         }
 
-        public String getDomain() {
-            return domain;
+        public List<Host> getHosts() {
+            return results;
+        }
+    }
+
+    public static class Host {
+        final String host;
+        final String description;
+        final boolean is_free;
+
+        public Host(String host, String description, boolean is_free) {
+            this.host = host;
+            this.description = description;
+            this.is_free = is_free;
+        }
+
+        public String getHost() {
+            return host;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public boolean isFree() {
+            return is_free;
         }
     }
 
diff --git a/xabber/src/main/java/com/xabber/android/data/xaccount/IXabberApi.java b/xabber/src/main/java/com/xabber/android/data/xaccount/IXabberApi.java
index 5b095c1ccf..44351f69dd 100644
--- a/xabber/src/main/java/com/xabber/android/data/xaccount/IXabberApi.java
+++ b/xabber/src/main/java/com/xabber/android/data/xaccount/IXabberApi.java
@@ -1,7 +1,5 @@
 package com.xabber.android.data.xaccount;
 
-import java.util.List;
-
 import okhttp3.ResponseBody;
 import retrofit2.http.Body;
 import retrofit2.http.DELETE;
@@ -79,7 +77,7 @@ public interface IXabberApi {
     Single<XabberAccountDTO> confirmXMPP(@Body AuthManager.CodeConfirm codeConfirm);
 
     @GET("accounts/xmpp/hosts/")
-    Single<List<AuthManager.Domain>> getHosts();
+    Single<AuthManager.HostResponse> getHosts();
 
     @POST("accounts/signup/")
     Single<XabberAccountDTO> signupv2(@Body AuthManager.SignUpFields fields);
diff --git a/xabber/src/main/java/com/xabber/android/ui/activity/XabberLoginActivity.java b/xabber/src/main/java/com/xabber/android/ui/activity/XabberLoginActivity.java
index d1684f165a..b19ee2bb7a 100644
--- a/xabber/src/main/java/com/xabber/android/ui/activity/XabberLoginActivity.java
+++ b/xabber/src/main/java/com/xabber/android/ui/activity/XabberLoginActivity.java
@@ -21,7 +21,7 @@
 import com.xabber.android.data.xaccount.XabberAccount;
 import com.xabber.android.ui.color.BarPainter;
 import com.xabber.android.ui.fragment.XAccountLoginFragment;
-import com.xabber.android.ui.fragment.XAccountSignUpFragment;
+import com.xabber.android.ui.fragment.XAccountSignUpFragment1;
 import com.xabber.android.utils.RetrofitErrorConverter;
 
 import java.util.ArrayList;
@@ -38,7 +38,7 @@
  * Created by valery.miller on 14.07.17.
  */
 
-public class XabberLoginActivity extends BaseLoginActivity implements XAccountSignUpFragment.Listener,
+public class XabberLoginActivity extends BaseLoginActivity implements XAccountSignUpFragment1.Listener,
         XAccountLoginFragment.Listener {
 
     private final static String LOG_TAG = XabberLoginActivity.class.getSimpleName();
@@ -55,7 +55,7 @@ public class XabberLoginActivity extends BaseLoginActivity implements XAccountSi
     private BarPainter barPainter;
     private Toolbar toolbar;
 
-    private List<String> hosts = new ArrayList<>();
+    private List<AuthManager.Host> hosts = new ArrayList<>();
 
     public static Intent createIntent(Context context, @Nullable String currentFragment) {
         Intent intent = new Intent(context, XabberLoginActivity.class);
@@ -104,7 +104,7 @@ public void showLoginFragment() {
 
     public void showSignUpFragment(String credentials, String socialProvider) {
         if (fragmentSignUp == null)
-            fragmentSignUp = XAccountSignUpFragment.newInstance(this, credentials, socialProvider);
+            fragmentSignUp = XAccountSignUpFragment1.newInstance(this, credentials, socialProvider);
 
         fTrans = getFragmentManager().beginTransaction();
         fTrans.replace(R.id.container, fragmentSignUp, FRAGMENT_SIGNUP);
@@ -176,15 +176,25 @@ public void onGetHosts() {
     }
 
     @Override
-    public void onSignupClick(String username, String host, String pass, String captchaToken) {
-        signUp(username, host, pass, captchaToken,null, null);
+    public void onNextClick(String username, String host) {
+
     }
 
     @Override
-    public void onSignupClick(String username, String host, String pass, String socialToken, String socialProvider) {
-        signUp(username, host, pass, null, socialToken, socialProvider);
+    public void onNextClick(String username, String host, String credentials, String socialProvider) {
+
     }
 
+    //    @Override
+//    public void onSignupClick(String username, String host, String pass, String captchaToken) {
+//        signUp(username, host, pass, captchaToken,null, null);
+//    }
+//
+//    @Override
+//    public void onSignupClick(String username, String host, String pass, String socialToken, String socialProvider) {
+//        signUp(username, host, pass, null, socialToken, socialProvider);
+//    }
+
     @Override
     public void onGoogleClick() {
         loginGoogle();
@@ -204,16 +214,16 @@ public void onTwitterClick() {
 
     private void getHosts() {
         if (hosts != null && !hosts.isEmpty()) {
-            if (fragmentSignUp != null) ((XAccountSignUpFragment)fragmentSignUp).setupSpinner(hosts);
+            if (fragmentSignUp != null) ((XAccountSignUpFragment1)fragmentSignUp).setupHosts(hosts);
         } else {
-            if (fragmentSignUp != null) ((XAccountSignUpFragment) fragmentSignUp).showHostsProgress(true);
+            if (fragmentSignUp != null) ((XAccountSignUpFragment1) fragmentSignUp).showHostsProgress(true);
             Subscription requestHosts = AuthManager.getHosts()
                     .subscribeOn(Schedulers.io())
                     .observeOn(AndroidSchedulers.mainThread())
-                    .subscribe(new Action1<List<AuthManager.Domain>>() {
+                    .subscribe(new Action1<AuthManager.HostResponse>() {
                         @Override
-                        public void call(List<AuthManager.Domain> domains) {
-                            handleSuccessGetHosts(domains);
+                        public void call(AuthManager.HostResponse response) {
+                            handleSuccessGetHosts(response);
                         }
                     }, new Action1<Throwable>() {
                         @Override
@@ -225,20 +235,21 @@ public void call(Throwable throwable) {
         }
     }
 
-    private void handleSuccessGetHosts(List<AuthManager.Domain> domains) {
-        hosts.clear();
-        for (AuthManager.Domain domain : domains) {
-            hosts.add(domain.getDomain());
-        }
+    private void handleSuccessGetHosts(AuthManager.HostResponse response) {
+        List<AuthManager.Host> hosts = response.getHosts();
+        if (hosts == null) return;
+
+        this.hosts.clear();
+        this.hosts.addAll(hosts);
 
         if (fragmentSignUp != null) {
-            ((XAccountSignUpFragment) fragmentSignUp).showHostsProgress(false);
-            ((XAccountSignUpFragment) fragmentSignUp).setupSpinner(hosts);
+            ((XAccountSignUpFragment1) fragmentSignUp).showHostsProgress(false);
+            ((XAccountSignUpFragment1) fragmentSignUp).setupHosts(this.hosts);
         }
     }
 
     private void handleErrorGetHosts(Throwable throwable) {
-        if (fragmentSignUp != null) ((XAccountSignUpFragment) fragmentSignUp).showHostsProgress(false);
+        if (fragmentSignUp != null) ((XAccountSignUpFragment1) fragmentSignUp).showHostsProgress(false);
         handleError(throwable, "Error while request hosts: ", LOG_TAG);
     }
 
@@ -311,7 +322,7 @@ private void handleErrorSocialLogin(Throwable throwable, String credentials, Str
                 // go to sign up
                 hideProgress();
                 showSignUpFragment(credentials, provider);
-                if (fragmentSignUp != null) ((XAccountSignUpFragment)fragmentSignUp)
+                if (fragmentSignUp != null) ((XAccountSignUpFragment1)fragmentSignUp)
                         .setSocialProviderCredentials(provider, credentials);
             } else {
                 Log.d(LOG_TAG, "Error while social login request: " + message);
diff --git a/xabber/src/main/java/com/xabber/android/ui/adapter/HostSpinnerAdapter.java b/xabber/src/main/java/com/xabber/android/ui/adapter/HostSpinnerAdapter.java
index 58e5ce4cb3..3103c854c7 100644
--- a/xabber/src/main/java/com/xabber/android/ui/adapter/HostSpinnerAdapter.java
+++ b/xabber/src/main/java/com/xabber/android/ui/adapter/HostSpinnerAdapter.java
@@ -9,16 +9,18 @@
 import android.widget.TextView;
 
 import com.xabber.android.R;
+import com.xabber.android.data.Application;
+import com.xabber.android.data.xaccount.AuthManager;
 
 import java.util.List;
 
 public class HostSpinnerAdapter extends ArrayAdapter<String> {
 
-    private List<String> mData;
+    private List<AuthManager.Host> mData;
     private LayoutInflater mInflater;
 
-    public HostSpinnerAdapter(@NonNull Context context, int resource, @NonNull List<String> objects) {
-        super(context, resource, objects);
+    public HostSpinnerAdapter(@NonNull Context context, int resource, @NonNull List<String> hosts,  @NonNull List<AuthManager.Host> objects) {
+        super(context, resource, hosts);
 
         mData = objects;
         mInflater = (LayoutInflater) context.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
@@ -34,7 +36,10 @@ public View getCustomView(int position, View convertView, ViewGroup parent) {
         View view = mInflater.inflate(R.layout.item_host, parent, false);
         TextView tvHost = (TextView) view.findViewById(R.id.tvHost);
         TextView tvStatus = (TextView) view.findViewById(R.id.tvStatus);
-        tvHost.setText(mData.get(position));
+
+        tvHost.setText(mData.get(position).getHost());
+        tvStatus.setText(mData.get(position).isFree()
+                ? Application.getInstance().getResources().getString(R.string.free) : "");
 
         return view;
     }
diff --git a/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountSignUpFragment1.java b/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountSignUpFragment1.java
new file mode 100644
index 0000000000..f02ef4b0e7
--- /dev/null
+++ b/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountSignUpFragment1.java
@@ -0,0 +1,202 @@
+package com.xabber.android.ui.fragment;
+
+import android.app.Fragment;
+import android.graphics.drawable.Drawable;
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.AdapterView;
+import android.widget.Button;
+import android.widget.EditText;
+import android.widget.ProgressBar;
+import android.widget.Spinner;
+import android.widget.TextView;
+
+import com.xabber.android.R;
+import com.xabber.android.data.xaccount.AuthManager;
+import com.xabber.android.ui.adapter.HostSpinnerAdapter;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class XAccountSignUpFragment1 extends Fragment implements View.OnClickListener {
+
+    private static final String SOCIAL_CREDENTIALS = "SOCIAL_CREDENTIALS";
+    private static final String SOCIAL_PROVIDER = "SOCIAL_PROVIDER";
+
+    private EditText edtUsername;
+    private Spinner spinnerDomain;
+    private View spinnerBorder;
+    private TextView tvSocialProvider;
+    private ProgressBar pbHosts;
+    private Button btnNext;
+    private TextView tvDescription;
+
+    private XAccountSignUpFragment1.Listener listener;
+    private String credentials;
+    private String socialProvider;
+
+    private List<AuthManager.Host> hosts;
+
+    public interface Listener {
+        void onGetHosts();
+        void onNextClick(String username, String host);
+        void onNextClick(String username, String host, String credentials, String socialProvider);
+    }
+
+    public static XAccountSignUpFragment1 newInstance(XAccountSignUpFragment1.Listener listener, String credentials, String socialProvider) {
+        XAccountSignUpFragment1 fragment = new XAccountSignUpFragment1();
+        Bundle args = new Bundle();
+        args.putString(SOCIAL_CREDENTIALS, credentials);
+        args.putString(SOCIAL_PROVIDER, socialProvider);
+        fragment.setArguments(args);
+        fragment.listener = listener;
+        return fragment;
+    }
+
+    @Override
+    public void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        this.credentials = getArguments().getString(SOCIAL_CREDENTIALS);
+        this.socialProvider = getArguments().getString(SOCIAL_PROVIDER);
+    }
+
+    @Nullable
+    @Override
+    public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, Bundle savedInstanceState) {
+        return inflater.inflate(R.layout.fragment_xaccount_signup_1, container, false);
+    }
+
+    @Override
+    public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+
+        edtUsername = view.findViewById(R.id.edtUsername);
+        spinnerDomain = view.findViewById(R.id.spinnerDomain);
+        spinnerDomain.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
+            @Override
+            public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
+                tvDescription.setText(hosts.get(position).getDescription());
+            }
+
+            @Override
+            public void onNothingSelected(AdapterView<?> parent) {
+
+            }
+        });
+        spinnerBorder = view.findViewById(R.id.spinnerBorder);
+
+        tvSocialProvider = view.findViewById(R.id.tvSocialProvider);
+        pbHosts = view.findViewById(R.id.pbHosts);
+
+        btnNext = view.findViewById(R.id.btnNext);
+        btnNext.setOnClickListener(this);
+
+        tvDescription = view.findViewById(R.id.tvDescription);
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        if (listener != null) listener.onGetHosts();
+        setupSocial();
+    }
+
+    @Override
+    public void onClick(View v) {
+        switch (v.getId()) {
+            case R.id.btnNext:
+                onNextClick();
+                break;
+        }
+    }
+
+    public void setSocialProviderCredentials(String socialProvider, String credentials) {
+        this.socialProvider = socialProvider;
+        this.credentials = credentials;
+        setupSocial();
+    }
+
+    public void showHostsProgress(boolean visible) {
+        pbHosts.setVisibility(visible ? View.VISIBLE : View.GONE);
+        spinnerDomain.setVisibility(visible ? View.GONE : View.VISIBLE);
+        spinnerBorder.setVisibility(visible ? View.GONE : View.VISIBLE);
+        btnNext.setEnabled(!visible);
+    }
+
+    private void setupSocial() {
+        if (credentials != null && socialProvider != null) {
+            if (tvSocialProvider != null) {
+                tvSocialProvider.setVisibility(View.VISIBLE);
+                tvSocialProvider.setText(getString(R.string.signup_with_social, socialProvider));
+
+                Drawable drawable;
+                switch (socialProvider) {
+                    case AuthManager.PROVIDER_TWITTER:
+                        drawable = getResources().getDrawable(R.drawable.ic_twitter);
+                        break;
+                    case AuthManager.PROVIDER_FACEBOOK:
+                        drawable = getResources().getDrawable(R.drawable.ic_facebook);
+                        break;
+                    default:
+                        drawable = getResources().getDrawable(R.drawable.ic_google_plus);
+                }
+                tvSocialProvider.setCompoundDrawablesWithIntrinsicBounds(drawable, null, null, null);
+            }
+        } else if (tvSocialProvider != null) tvSocialProvider.setVisibility(View.GONE);
+    }
+
+    private void onNextClick() {
+        String username = edtUsername.getText().toString().trim();
+
+        if (verifyFields(username)) {
+            if (listener == null) return;
+            else if (credentials != null && socialProvider != null)
+                listener.onNextClick(username, spinnerDomain.getSelectedItem().toString(), credentials, socialProvider);
+            else listener.onNextClick(username, spinnerDomain.getSelectedItem().toString());
+        }
+    }
+
+    private boolean verifyFields(String username) {
+
+        if (username.isEmpty()) {
+            edtUsername.setError(getString(R.string.empty_field));
+            return false;
+        }
+
+        // Username can contain only latin letters, numbers and dots
+        if (!username.matches("[a-z0-9.]+")) {
+            edtUsername.setError(getString(R.string.username_rules));
+            return false;
+        }
+
+        // Username must start with letter
+        if (!username.substring(0, 1).matches("[a-z]")) {
+            edtUsername.setError(getString(R.string.username_rules_first_symbol));
+            return false;
+        }
+
+        // Username cannot have two dots in a row
+        if (username.contains("..")) {
+            edtUsername.setError(getString(R.string.username_rules_dots));
+            return false;
+        }
+
+        return true;
+    }
+
+    public void setupHosts(List<AuthManager.Host> hosts) {
+        if (spinnerDomain == null) return;
+
+        this.hosts = hosts;
+        List<String> strings = new ArrayList<>();
+        for (AuthManager.Host host : hosts) {
+            strings.add(host.getHost());
+        }
+        HostSpinnerAdapter adapter = new HostSpinnerAdapter(getActivity(),
+                android.R.layout.simple_spinner_item, strings, this.hosts);
+        spinnerDomain.setAdapter(adapter);
+    }
+}
diff --git a/xabber/src/main/res/layout/activity_xabber_login.xml b/xabber/src/main/res/layout/activity_xabber_login.xml
index 99e9c23d14..8b7a352aea 100644
--- a/xabber/src/main/res/layout/activity_xabber_login.xml
+++ b/xabber/src/main/res/layout/activity_xabber_login.xml
@@ -12,7 +12,7 @@
         android:layout_below="@+id/toolbar_default"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_marginLeft="16dp"
-        android:layout_marginRight="16dp"/>
+        android:elevation="8dp"
+        />
 
 </RelativeLayout>
\ No newline at end of file
diff --git a/xabber/src/main/res/layout/fragment_xaccount_signup_1.xml b/xabber/src/main/res/layout/fragment_xaccount_signup_1.xml
index 40cde80ff7..6584fd3974 100644
--- a/xabber/src/main/res/layout/fragment_xaccount_signup_1.xml
+++ b/xabber/src/main/res/layout/fragment_xaccount_signup_1.xml
@@ -11,7 +11,7 @@
         android:layout_width="match_parent"
         android:layout_height="48dp"
         android:background="#F5F5F5"
-        android:elevation="16dp"
+        android:elevation="4dp"
         >
 
         <TextView
@@ -37,7 +37,7 @@
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="Pick your username and domain"
+            android:text="@string/label_username"
             android:textSize="12sp"
             android:paddingLeft="4dp"
             android:textColor="@color/contact_item_text_second"
@@ -74,7 +74,7 @@
 
             <LinearLayout
                 android:orientation="vertical"
-                android:layout_width="wrap_content"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
                 >
@@ -109,9 +109,9 @@
         </LinearLayout>
 
         <TextView
+            android:id="@+id/tvDescription"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="Xabber.org accounts are free, that includes 30 days of chat history and 100MB for sent and received files. You can unlock additional storage options for $1/month."
             android:paddingLeft="4dp"
             android:layout_marginTop="16dp"
             />
@@ -134,7 +134,7 @@
                 />
 
             <Button
-                android:id="@+id/btnSignUp"
+                android:id="@+id/btnNext"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 style="@style/Widget.AppCompat.Button.Colored"
@@ -145,7 +145,7 @@
                 android:layout_alignParentEnd="true"
                 android:layout_alignParentRight="true"
                 android:textColor="@color/white"
-                android:text="@string/button_registration"
+                android:text="@string/muc_next"
                 />
 
         </RelativeLayout>
diff --git a/xabber/src/main/res/values-ru-rRU/xabber_account.xml b/xabber/src/main/res/values-ru-rRU/xabber_account.xml
index e7dc213ebf..462868ec7e 100644
--- a/xabber/src/main/res/values-ru-rRU/xabber_account.xml
+++ b/xabber/src/main/res/values-ru-rRU/xabber_account.xml
@@ -32,7 +32,7 @@
   <string name="progress_title_complete">Завершение регистрации</string>
   <string name="progress_title_resend">Повторная отправка email</string>
   <string name="progress_title_delete_settings">Удаление настроек</string>
-  <string name="label_username">Имя пользователя</string>
+  <string name="label_username">Выберите имя пользователя и домен</string>
   <string name="hint_username">username</string>
   <string name="label_pass">Пароль</string>
   <string name="hint_pass">Введите пароль</string>
diff --git a/xabber/src/main/res/values/words.xml b/xabber/src/main/res/values/words.xml
index e0aa7ab1d9..4c19ebf1c3 100644
--- a/xabber/src/main/res/values/words.xml
+++ b/xabber/src/main/res/values/words.xml
@@ -28,4 +28,5 @@
 
     <string name="got_it">Got it</string>
     <string name="search">Search</string>
+    <string name="free">free</string>
 </resources>
\ No newline at end of file
diff --git a/xabber/src/main/res/values/xabber_account.xml b/xabber/src/main/res/values/xabber_account.xml
index 04a8937ea2..8128906ebd 100644
--- a/xabber/src/main/res/values/xabber_account.xml
+++ b/xabber/src/main/res/values/xabber_account.xml
@@ -53,7 +53,7 @@
     <string name="progress_title_unbind_social">Unbind social network</string>
     <string name="progress_title_account_list">Loading list of accounts..</string>
 
-    <string name="label_username">Pick your username</string>
+    <string name="label_username">Pick your username and host</string>
     <string name="hint_username">username</string>
     <string name="label_pass">Choose password</string>
     <string name="hint_pass">Enter password</string>

From a330cd99698e53c7c8cf2cf5b382bdb01e8bf307 Mon Sep 17 00:00:00 2001
From: Valery Miller <valera_miller94@mail.ru>
Date: Wed, 19 Sep 2018 17:25:14 +0500
Subject: [PATCH 101/251] Work on new signup screens

---
 .../presentation/mvp/signup/SignUpRepo.java   | 75 +++++++++++++++++++
 .../android/ui/activity/TutorialActivity.java |  2 +-
 .../ui/activity/XabberLoginActivity.java      | 72 ++++++++++++------
 .../ui/fragment/XAccountSignUpFragment1.java  | 42 +++--------
 .../ui/fragment/XAccountSignUpFragment2.java  | 71 ++++++++++++++++++
 .../res/layout/fragment_xaccount_signup_1.xml |  9 +++
 .../res/layout/fragment_xaccount_signup_2.xml |  4 +-
 7 files changed, 218 insertions(+), 57 deletions(-)
 create mode 100644 xabber/src/main/java/com/xabber/android/presentation/mvp/signup/SignUpRepo.java
 create mode 100644 xabber/src/main/java/com/xabber/android/ui/fragment/XAccountSignUpFragment2.java

diff --git a/xabber/src/main/java/com/xabber/android/presentation/mvp/signup/SignUpRepo.java b/xabber/src/main/java/com/xabber/android/presentation/mvp/signup/SignUpRepo.java
new file mode 100644
index 0000000000..ca6e4f422c
--- /dev/null
+++ b/xabber/src/main/java/com/xabber/android/presentation/mvp/signup/SignUpRepo.java
@@ -0,0 +1,75 @@
+package com.xabber.android.presentation.mvp.signup;
+
+public class SignUpRepo {
+
+    private String username;
+    private String host;
+    private String pass;
+    private String socialCredentials;
+    private String socialProvider;
+    private String captchaToken;
+
+    private static SignUpRepo instance;
+
+    public static SignUpRepo getInstance() {
+        if (instance == null) instance = new SignUpRepo();
+        return instance;
+    }
+
+    public void clearRepo() {
+        username = null;
+        host = null;
+        pass = null;
+        socialCredentials = null;
+        socialProvider = null;
+        captchaToken = null;
+    }
+
+    public String getUsername() {
+        return username;
+    }
+
+    public void setUsername(String username) {
+        this.username = username;
+    }
+
+    public String getHost() {
+        return host;
+    }
+
+    public void setHost(String host) {
+        this.host = host;
+    }
+
+    public String getPass() {
+        return pass;
+    }
+
+    public void setPass(String pass) {
+        this.pass = pass;
+    }
+
+    public String getSocialCredentials() {
+        return socialCredentials;
+    }
+
+    public void setSocialCredentials(String socialCredentials) {
+        this.socialCredentials = socialCredentials;
+    }
+
+    public String getSocialProvider() {
+        return socialProvider;
+    }
+
+    public void setSocialProvider(String socialProvider) {
+        this.socialProvider = socialProvider;
+    }
+
+    public String getCaptchaToken() {
+        return captchaToken;
+    }
+
+    public void setCaptchaToken(String captchaToken) {
+        this.captchaToken = captchaToken;
+    }
+}
diff --git a/xabber/src/main/java/com/xabber/android/ui/activity/TutorialActivity.java b/xabber/src/main/java/com/xabber/android/ui/activity/TutorialActivity.java
index 2cc020a775..5e67113d21 100644
--- a/xabber/src/main/java/com/xabber/android/ui/activity/TutorialActivity.java
+++ b/xabber/src/main/java/com/xabber/android/ui/activity/TutorialActivity.java
@@ -61,7 +61,7 @@ public void onClick(View v) {
         btnRegister.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                startActivity(XabberLoginActivity.createIntent(TutorialActivity.this, XabberLoginActivity.FRAGMENT_SIGNUP));
+                startActivity(XabberLoginActivity.createIntent(TutorialActivity.this, XabberLoginActivity.FRAGMENT_SIGNUP_STEP1));
             }
         });
     }
diff --git a/xabber/src/main/java/com/xabber/android/ui/activity/XabberLoginActivity.java b/xabber/src/main/java/com/xabber/android/ui/activity/XabberLoginActivity.java
index b19ee2bb7a..8f0cd2dd47 100644
--- a/xabber/src/main/java/com/xabber/android/ui/activity/XabberLoginActivity.java
+++ b/xabber/src/main/java/com/xabber/android/ui/activity/XabberLoginActivity.java
@@ -19,9 +19,11 @@
 import com.xabber.android.data.xaccount.HttpApiManager;
 import com.xabber.android.data.xaccount.XAccountTokenDTO;
 import com.xabber.android.data.xaccount.XabberAccount;
+import com.xabber.android.presentation.mvp.signup.SignUpRepo;
 import com.xabber.android.ui.color.BarPainter;
 import com.xabber.android.ui.fragment.XAccountLoginFragment;
 import com.xabber.android.ui.fragment.XAccountSignUpFragment1;
+import com.xabber.android.ui.fragment.XAccountSignUpFragment2;
 import com.xabber.android.utils.RetrofitErrorConverter;
 
 import java.util.ArrayList;
@@ -39,16 +41,20 @@
  */
 
 public class XabberLoginActivity extends BaseLoginActivity implements XAccountSignUpFragment1.Listener,
-        XAccountLoginFragment.Listener {
+        XAccountSignUpFragment2.Listener, XAccountLoginFragment.Listener {
 
     private final static String LOG_TAG = XabberLoginActivity.class.getSimpleName();
     public final static String CURRENT_FRAGMENT = "current_fragment";
     public final static String FRAGMENT_LOGIN = "fragment_login";
-    public final static String FRAGMENT_SIGNUP = "fragment_signup";
+    public final static String FRAGMENT_SIGNUP_STEP1 = "fragment_signup_step1";
+    public final static String FRAGMENT_SIGNUP_STEP2 = "fragment_signup_step2";
+    public final static String FRAGMENT_SIGNUP_STEP3 = "fragment_signup_step3";
 
     private FragmentTransaction fTrans;
     private Fragment fragmentLogin;
-    private Fragment fragmentSignUp;
+    private Fragment fragmentSignUpStep1;
+    private Fragment fragmentSignUpStep2;
+    private Fragment fragmentSignUpStep3;
     private String currentFragment = FRAGMENT_LOGIN;
 
     private ProgressDialog progressDialog;
@@ -102,14 +108,27 @@ public void showLoginFragment() {
         barPainter.setLiteGrey();
     }
 
-    public void showSignUpFragment(String credentials, String socialProvider) {
-        if (fragmentSignUp == null)
-            fragmentSignUp = XAccountSignUpFragment1.newInstance(this, credentials, socialProvider);
+    public void showSignUpStep1Fragment() {
+        if (fragmentSignUpStep1 == null)
+            fragmentSignUpStep1 = XAccountSignUpFragment1.newInstance(this);
 
         fTrans = getFragmentManager().beginTransaction();
-        fTrans.replace(R.id.container, fragmentSignUp, FRAGMENT_SIGNUP);
+        fTrans.replace(R.id.container, fragmentSignUpStep1, FRAGMENT_SIGNUP_STEP1);
         fTrans.commit();
-        currentFragment = FRAGMENT_SIGNUP;
+        currentFragment = FRAGMENT_SIGNUP_STEP1;
+
+        toolbar.setTitle(R.string.title_register_xabber_account);
+        barPainter.setLiteGrey();
+    }
+
+    public void showSignUpStep2Fragment() {
+        if (fragmentSignUpStep2 == null)
+            fragmentSignUpStep2 = XAccountSignUpFragment2.newInstance(this);
+
+        fTrans = getFragmentManager().beginTransaction();
+        fTrans.replace(R.id.container, fragmentSignUpStep2, FRAGMENT_SIGNUP_STEP2);
+        fTrans.commit();
+        currentFragment = FRAGMENT_SIGNUP_STEP2;
 
         toolbar.setTitle(R.string.title_register_xabber_account);
         barPainter.setLiteGrey();
@@ -120,8 +139,11 @@ protected void onResume() {
         super.onResume();
         if (currentFragment != null) {
             switch (currentFragment) {
-                case FRAGMENT_SIGNUP:
-                    showSignUpFragment(null, null);
+                case FRAGMENT_SIGNUP_STEP1:
+                    showSignUpStep1Fragment();
+                    break;
+                case FRAGMENT_SIGNUP_STEP2:
+                    showSignUpStep2Fragment();
                     break;
                 default:
                     showLoginFragment();
@@ -176,13 +198,18 @@ public void onGetHosts() {
     }
 
     @Override
-    public void onNextClick(String username, String host) {
+    public void onStep1Completed(String username, String host) {
+        SignUpRepo signUpRepo = SignUpRepo.getInstance();
+        signUpRepo.setUsername(username);
+        signUpRepo.setHost(host);
 
+        showSignUpStep2Fragment();
     }
 
     @Override
-    public void onNextClick(String username, String host, String credentials, String socialProvider) {
-
+    public void on2StepCompleted(String pass) {
+        SignUpRepo.getInstance().setPass(pass);
+        //showSignUpStep3Fragment();
     }
 
     //    @Override
@@ -214,9 +241,9 @@ public void onTwitterClick() {
 
     private void getHosts() {
         if (hosts != null && !hosts.isEmpty()) {
-            if (fragmentSignUp != null) ((XAccountSignUpFragment1)fragmentSignUp).setupHosts(hosts);
+            if (fragmentSignUpStep1 != null) ((XAccountSignUpFragment1)fragmentSignUpStep1).setupHosts(hosts);
         } else {
-            if (fragmentSignUp != null) ((XAccountSignUpFragment1) fragmentSignUp).showHostsProgress(true);
+            if (fragmentSignUpStep1 != null) ((XAccountSignUpFragment1) fragmentSignUpStep1).showHostsProgress(true);
             Subscription requestHosts = AuthManager.getHosts()
                     .subscribeOn(Schedulers.io())
                     .observeOn(AndroidSchedulers.mainThread())
@@ -242,14 +269,14 @@ private void handleSuccessGetHosts(AuthManager.HostResponse response) {
         this.hosts.clear();
         this.hosts.addAll(hosts);
 
-        if (fragmentSignUp != null) {
-            ((XAccountSignUpFragment1) fragmentSignUp).showHostsProgress(false);
-            ((XAccountSignUpFragment1) fragmentSignUp).setupHosts(this.hosts);
+        if (fragmentSignUpStep1 != null) {
+            ((XAccountSignUpFragment1) fragmentSignUpStep1).showHostsProgress(false);
+            ((XAccountSignUpFragment1) fragmentSignUpStep1).setupHosts(this.hosts);
         }
     }
 
     private void handleErrorGetHosts(Throwable throwable) {
-        if (fragmentSignUp != null) ((XAccountSignUpFragment1) fragmentSignUp).showHostsProgress(false);
+        if (fragmentSignUpStep1 != null) ((XAccountSignUpFragment1) fragmentSignUpStep1).showHostsProgress(false);
         handleError(throwable, "Error while request hosts: ", LOG_TAG);
     }
 
@@ -320,10 +347,11 @@ private void handleErrorSocialLogin(Throwable throwable, String credentials, Str
         if (message != null) {
             if (message.contains("is not attached to any Xabber account")) {
                 // go to sign up
+                SignUpRepo.getInstance().setSocialCredentials(credentials);
+                SignUpRepo.getInstance().setSocialProvider(provider);
                 hideProgress();
-                showSignUpFragment(credentials, provider);
-                if (fragmentSignUp != null) ((XAccountSignUpFragment1)fragmentSignUp)
-                        .setSocialProviderCredentials(provider, credentials);
+                showSignUpStep1Fragment();
+
             } else {
                 Log.d(LOG_TAG, "Error while social login request: " + message);
                 Toast.makeText(this, R.string.social_auth_fail, Toast.LENGTH_LONG).show();
diff --git a/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountSignUpFragment1.java b/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountSignUpFragment1.java
index f02ef4b0e7..71db2d5cc2 100644
--- a/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountSignUpFragment1.java
+++ b/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountSignUpFragment1.java
@@ -16,6 +16,7 @@
 
 import com.xabber.android.R;
 import com.xabber.android.data.xaccount.AuthManager;
+import com.xabber.android.presentation.mvp.signup.SignUpRepo;
 import com.xabber.android.ui.adapter.HostSpinnerAdapter;
 
 import java.util.ArrayList;
@@ -23,9 +24,6 @@
 
 public class XAccountSignUpFragment1 extends Fragment implements View.OnClickListener {
 
-    private static final String SOCIAL_CREDENTIALS = "SOCIAL_CREDENTIALS";
-    private static final String SOCIAL_PROVIDER = "SOCIAL_PROVIDER";
-
     private EditText edtUsername;
     private Spinner spinnerDomain;
     private View spinnerBorder;
@@ -35,34 +33,20 @@ public class XAccountSignUpFragment1 extends Fragment implements View.OnClickLis
     private TextView tvDescription;
 
     private XAccountSignUpFragment1.Listener listener;
-    private String credentials;
-    private String socialProvider;
 
     private List<AuthManager.Host> hosts;
 
     public interface Listener {
         void onGetHosts();
-        void onNextClick(String username, String host);
-        void onNextClick(String username, String host, String credentials, String socialProvider);
+        void onStep1Completed(String username, String host);
     }
 
-    public static XAccountSignUpFragment1 newInstance(XAccountSignUpFragment1.Listener listener, String credentials, String socialProvider) {
+    public static XAccountSignUpFragment1 newInstance(XAccountSignUpFragment1.Listener listener) {
         XAccountSignUpFragment1 fragment = new XAccountSignUpFragment1();
-        Bundle args = new Bundle();
-        args.putString(SOCIAL_CREDENTIALS, credentials);
-        args.putString(SOCIAL_PROVIDER, socialProvider);
-        fragment.setArguments(args);
         fragment.listener = listener;
         return fragment;
     }
 
-    @Override
-    public void onCreate(@Nullable Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        this.credentials = getArguments().getString(SOCIAL_CREDENTIALS);
-        this.socialProvider = getArguments().getString(SOCIAL_PROVIDER);
-    }
-
     @Nullable
     @Override
     public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, Bundle savedInstanceState) {
@@ -113,12 +97,6 @@ public void onClick(View v) {
         }
     }
 
-    public void setSocialProviderCredentials(String socialProvider, String credentials) {
-        this.socialProvider = socialProvider;
-        this.credentials = credentials;
-        setupSocial();
-    }
-
     public void showHostsProgress(boolean visible) {
         pbHosts.setVisibility(visible ? View.VISIBLE : View.GONE);
         spinnerDomain.setVisibility(visible ? View.GONE : View.VISIBLE);
@@ -127,13 +105,15 @@ public void showHostsProgress(boolean visible) {
     }
 
     private void setupSocial() {
-        if (credentials != null && socialProvider != null) {
+        String credentials = SignUpRepo.getInstance().getSocialCredentials();
+        String provider = SignUpRepo.getInstance().getSocialProvider();
+        if (credentials != null && provider != null) {
             if (tvSocialProvider != null) {
                 tvSocialProvider.setVisibility(View.VISIBLE);
-                tvSocialProvider.setText(getString(R.string.signup_with_social, socialProvider));
+                tvSocialProvider.setText(getString(R.string.signup_with_social, provider));
 
                 Drawable drawable;
-                switch (socialProvider) {
+                switch (provider) {
                     case AuthManager.PROVIDER_TWITTER:
                         drawable = getResources().getDrawable(R.drawable.ic_twitter);
                         break;
@@ -152,10 +132,8 @@ private void onNextClick() {
         String username = edtUsername.getText().toString().trim();
 
         if (verifyFields(username)) {
-            if (listener == null) return;
-            else if (credentials != null && socialProvider != null)
-                listener.onNextClick(username, spinnerDomain.getSelectedItem().toString(), credentials, socialProvider);
-            else listener.onNextClick(username, spinnerDomain.getSelectedItem().toString());
+            if (listener != null)
+                listener.onStep1Completed(username, spinnerDomain.getSelectedItem().toString());
         }
     }
 
diff --git a/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountSignUpFragment2.java b/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountSignUpFragment2.java
new file mode 100644
index 0000000000..970498a2db
--- /dev/null
+++ b/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountSignUpFragment2.java
@@ -0,0 +1,71 @@
+package com.xabber.android.ui.fragment;
+
+import android.app.Fragment;
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Button;
+import android.widget.EditText;
+
+import com.xabber.android.R;
+
+public class XAccountSignUpFragment2 extends Fragment implements View.OnClickListener {
+
+    private Listener listener;
+
+    private EditText edtPass;
+    private Button btnNext;
+
+    public interface Listener {
+        void on2StepCompleted(String pass);
+    }
+
+    public static XAccountSignUpFragment2 newInstance(Listener listener) {
+        XAccountSignUpFragment2 fragment = new XAccountSignUpFragment2();
+        fragment.listener = listener;
+        return fragment;
+    }
+
+    @Nullable
+    @Override
+    public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, Bundle savedInstanceState) {
+        return inflater.inflate(R.layout.fragment_xaccount_signup_2, container, false);
+    }
+
+    @Override
+    public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+
+        edtPass = view.findViewById(R.id.edtPass);
+
+        btnNext = view.findViewById(R.id.btnNext);
+        btnNext.setOnClickListener(this);
+    }
+
+    @Override
+    public void onClick(View v) {
+        switch (v.getId()) {
+            case R.id.btnNext:
+                String pass = edtPass.getText().toString().trim();
+                if (verifyFields(pass) && listener != null) listener.on2StepCompleted(pass);
+                break;
+        }
+    }
+
+    private boolean verifyFields(String pass) {
+
+        if (pass.isEmpty()) {
+            edtPass.setError(getString(R.string.empty_field));
+            return false;
+        }
+
+        if (pass.length() < 4) {
+            edtPass.setError(getString(R.string.pass_too_short));
+            return false;
+        }
+
+        return true;
+    }
+}
diff --git a/xabber/src/main/res/layout/fragment_xaccount_signup_1.xml b/xabber/src/main/res/layout/fragment_xaccount_signup_1.xml
index 6584fd3974..46f6711e8b 100644
--- a/xabber/src/main/res/layout/fragment_xaccount_signup_1.xml
+++ b/xabber/src/main/res/layout/fragment_xaccount_signup_1.xml
@@ -150,6 +150,15 @@
 
         </RelativeLayout>
 
+        <TextView
+            android:id="@+id/tvSocialProvider"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:textColor="@color/black_text_secondary"
+            android:drawablePadding="8dp"
+            android:visibility="gone"
+            android:layout_gravity="center_horizontal"
+            />
 
     </LinearLayout>
 
diff --git a/xabber/src/main/res/layout/fragment_xaccount_signup_2.xml b/xabber/src/main/res/layout/fragment_xaccount_signup_2.xml
index 9a43897017..85ee142638 100644
--- a/xabber/src/main/res/layout/fragment_xaccount_signup_2.xml
+++ b/xabber/src/main/res/layout/fragment_xaccount_signup_2.xml
@@ -8,7 +8,7 @@
         android:layout_width="match_parent"
         android:layout_height="48dp"
         android:background="#F5F5F5"
-        android:elevation="16dp"
+        android:elevation="4dp"
         >
 
         <TextView
@@ -70,7 +70,7 @@
                 />
 
             <Button
-                android:id="@+id/btnSignUp"
+                android:id="@+id/btnNext"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 style="@style/Widget.AppCompat.Button.Colored"

From 7924830d59efcac2f6cf3b0dd852c525a0e8e084 Mon Sep 17 00:00:00 2001
From: Valery Miller <valera_miller94@mail.ru>
Date: Wed, 19 Sep 2018 18:04:27 +0500
Subject: [PATCH 102/251] Work on new signup screens

---
 .../ui/activity/XabberLoginActivity.java      |  26 +-
 .../ui/fragment/XAccountSignUpFragment1.java  |   5 +-
 .../ui/fragment/XAccountSignUpFragment3.java  |  59 ++++
 .../res/layout/fragment_xaccount_signup_1.xml |  13 +-
 .../res/layout/fragment_xaccount_signup_2.xml |  15 +-
 .../res/layout/fragment_xaccount_signup_3.xml | 208 +-------------
 .../res/layout/fragment_xaccount_signup_4.xml | 261 ++++++++++++++++++
 7 files changed, 362 insertions(+), 225 deletions(-)
 create mode 100644 xabber/src/main/java/com/xabber/android/ui/fragment/XAccountSignUpFragment3.java
 create mode 100644 xabber/src/main/res/layout/fragment_xaccount_signup_4.xml

diff --git a/xabber/src/main/java/com/xabber/android/ui/activity/XabberLoginActivity.java b/xabber/src/main/java/com/xabber/android/ui/activity/XabberLoginActivity.java
index 8f0cd2dd47..c5724a4a2b 100644
--- a/xabber/src/main/java/com/xabber/android/ui/activity/XabberLoginActivity.java
+++ b/xabber/src/main/java/com/xabber/android/ui/activity/XabberLoginActivity.java
@@ -24,6 +24,7 @@
 import com.xabber.android.ui.fragment.XAccountLoginFragment;
 import com.xabber.android.ui.fragment.XAccountSignUpFragment1;
 import com.xabber.android.ui.fragment.XAccountSignUpFragment2;
+import com.xabber.android.ui.fragment.XAccountSignUpFragment3;
 import com.xabber.android.utils.RetrofitErrorConverter;
 
 import java.util.ArrayList;
@@ -41,7 +42,7 @@
  */
 
 public class XabberLoginActivity extends BaseLoginActivity implements XAccountSignUpFragment1.Listener,
-        XAccountSignUpFragment2.Listener, XAccountLoginFragment.Listener {
+        XAccountSignUpFragment2.Listener, XAccountLoginFragment.Listener, XAccountSignUpFragment3.Listener {
 
     private final static String LOG_TAG = XabberLoginActivity.class.getSimpleName();
     public final static String CURRENT_FRAGMENT = "current_fragment";
@@ -134,6 +135,19 @@ public void showSignUpStep2Fragment() {
         barPainter.setLiteGrey();
     }
 
+    public void showSignUpStep3Fragment() {
+        if (fragmentSignUpStep3 == null)
+            fragmentSignUpStep3 = XAccountSignUpFragment3.newInstance(this);
+
+        fTrans = getFragmentManager().beginTransaction();
+        fTrans.replace(R.id.container, fragmentSignUpStep3, FRAGMENT_SIGNUP_STEP3);
+        fTrans.commit();
+        currentFragment = FRAGMENT_SIGNUP_STEP3;
+
+        toolbar.setTitle(R.string.title_register_xabber_account);
+        barPainter.setLiteGrey();
+    }
+
     @Override
     protected void onResume() {
         super.onResume();
@@ -145,6 +159,9 @@ protected void onResume() {
                 case FRAGMENT_SIGNUP_STEP2:
                     showSignUpStep2Fragment();
                     break;
+                case FRAGMENT_SIGNUP_STEP3:
+                    showSignUpStep3Fragment();
+                    break;
                 default:
                     showLoginFragment();
             }
@@ -209,7 +226,12 @@ public void onStep1Completed(String username, String host) {
     @Override
     public void on2StepCompleted(String pass) {
         SignUpRepo.getInstance().setPass(pass);
-        //showSignUpStep3Fragment();
+        showSignUpStep3Fragment();
+    }
+
+    @Override
+    public void onStep3Completed() {
+
     }
 
     //    @Override
diff --git a/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountSignUpFragment1.java b/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountSignUpFragment1.java
index 71db2d5cc2..dcdfd0b98f 100644
--- a/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountSignUpFragment1.java
+++ b/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountSignUpFragment1.java
@@ -131,9 +131,8 @@ private void setupSocial() {
     private void onNextClick() {
         String username = edtUsername.getText().toString().trim();
 
-        if (verifyFields(username)) {
-            if (listener != null)
-                listener.onStep1Completed(username, spinnerDomain.getSelectedItem().toString());
+        if (verifyFields(username) && spinnerDomain.getSelectedItem() != null && listener != null) {
+            listener.onStep1Completed(username, spinnerDomain.getSelectedItem().toString());
         }
     }
 
diff --git a/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountSignUpFragment3.java b/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountSignUpFragment3.java
new file mode 100644
index 0000000000..ee8877b5c4
--- /dev/null
+++ b/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountSignUpFragment3.java
@@ -0,0 +1,59 @@
+package com.xabber.android.ui.fragment;
+
+import android.app.Fragment;
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Button;
+import android.widget.CheckBox;
+import android.widget.CompoundButton;
+
+import com.xabber.android.R;
+
+public class XAccountSignUpFragment3 extends Fragment {
+
+    private Listener listener;
+
+    private Button btnSignUp;
+    private CheckBox chkAccept;
+
+    public interface Listener {
+        void onStep3Completed();
+    }
+
+    public static XAccountSignUpFragment3 newInstance(XAccountSignUpFragment3.Listener listener) {
+        XAccountSignUpFragment3 fragment = new XAccountSignUpFragment3();
+        fragment.listener = listener;
+        return fragment;
+    }
+
+    @Nullable
+    @Override
+    public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, Bundle savedInstanceState) {
+        return inflater.inflate(R.layout.fragment_xaccount_signup_3, container, false);
+    }
+
+    @Override
+    public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+
+        btnSignUp = view.findViewById(R.id.btnSignUp);
+        btnSignUp.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                listener.onStep3Completed();
+            }
+        });
+
+        chkAccept = view.findViewById(R.id.chkAccept);
+        chkAccept.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
+            @Override
+            public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
+                btnSignUp.setEnabled(isChecked);
+            }
+        });
+    }
+
+}
diff --git a/xabber/src/main/res/layout/fragment_xaccount_signup_1.xml b/xabber/src/main/res/layout/fragment_xaccount_signup_1.xml
index 46f6711e8b..55d30e0972 100644
--- a/xabber/src/main/res/layout/fragment_xaccount_signup_1.xml
+++ b/xabber/src/main/res/layout/fragment_xaccount_signup_1.xml
@@ -17,7 +17,7 @@
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="Step 1 of 3"
+            android:text="Step 1 of 4"
             android:textStyle="bold"
             android:layout_marginLeft="16dp"
             android:layout_gravity="center_vertical"
@@ -122,17 +122,6 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content">
 
-            <Button
-                android:id="@+id/btnOptions"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                style="@style/Widget.AppCompat.Button.Borderless"
-                android:theme="@style/BlueButton"
-                android:textColor="@color/grey_500"
-                android:text="@string/button_terms_of_service"
-                android:layout_centerVertical="true"
-                />
-
             <Button
                 android:id="@+id/btnNext"
                 android:layout_width="wrap_content"
diff --git a/xabber/src/main/res/layout/fragment_xaccount_signup_2.xml b/xabber/src/main/res/layout/fragment_xaccount_signup_2.xml
index 85ee142638..ecb6e6e60b 100644
--- a/xabber/src/main/res/layout/fragment_xaccount_signup_2.xml
+++ b/xabber/src/main/res/layout/fragment_xaccount_signup_2.xml
@@ -14,7 +14,7 @@
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="Step 2 of 3"
+            android:text="Step 2 of 4"
             android:textStyle="bold"
             android:layout_marginLeft="16dp"
             android:layout_gravity="center_vertical"
@@ -58,17 +58,6 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content">
 
-            <Button
-                android:id="@+id/btnOptions"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                style="@style/Widget.AppCompat.Button.Borderless"
-                android:theme="@style/BlueButton"
-                android:textColor="@color/grey_500"
-                android:text="@string/button_terms_of_service"
-                android:layout_centerVertical="true"
-                />
-
             <Button
                 android:id="@+id/btnNext"
                 android:layout_width="wrap_content"
@@ -81,7 +70,7 @@
                 android:layout_alignParentEnd="true"
                 android:layout_alignParentRight="true"
                 android:textColor="@color/white"
-                android:text="@string/button_registration"
+                android:text="@string/muc_next"
                 />
 
         </RelativeLayout>
diff --git a/xabber/src/main/res/layout/fragment_xaccount_signup_3.xml b/xabber/src/main/res/layout/fragment_xaccount_signup_3.xml
index 1a70ef5cd2..b0c9ecfbbd 100644
--- a/xabber/src/main/res/layout/fragment_xaccount_signup_3.xml
+++ b/xabber/src/main/res/layout/fragment_xaccount_signup_3.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
     android:orientation="vertical"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
@@ -9,13 +8,13 @@
         android:layout_width="match_parent"
         android:layout_height="48dp"
         android:background="#F5F5F5"
-        android:elevation="16dp"
+        android:elevation="4dp"
         >
 
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="Step 3 of 3"
+            android:text="Step 3 of 4"
             android:textStyle="bold"
             android:layout_marginLeft="16dp"
             android:layout_gravity="center_vertical"
@@ -33,192 +32,21 @@
         >
 
         <TextView
-            android:layout_width="wrap_content"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:text="Secure your account by linking it with at least one social network or email. If you don’t do that and lose your password, you’ll never be able to restore access to your account!"
+            android:text="Terms of services"
+            android:gravity="center"
             android:paddingLeft="4dp"
             android:layout_marginBottom="16dp"
             />
 
-        <LinearLayout
-            android:id="@+id/itemGoogle"
-            android:layout_width="match_parent"
-            android:layout_height="48dp"
-            android:paddingLeft="18dp"
-            android:paddingRight="16dp"
-            android:clickable="true"
-            android:background="?android:attr/selectableItemBackground"
-            >
-
-            <ImageView
-                android:id="@+id/ivGoogle"
-                android:layout_width="36dp"
-                android:layout_height="36dp"
-                android:src="@drawable/ic_google_plus_disabled"
-                android:layout_gravity="center_vertical"
-                />
-
-            <LinearLayout
-                android:orientation="vertical"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_vertical"
-                android:layout_marginLeft="18dp"
-                >
-
-                <TextView
-                    android:id="@+id/tvNameGoogle"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center_vertical"
-                    android:textColor="@color/black_text"
-                    tools:text="@tools:sample/full_names"
-                    android:visibility="gone"
-                    />
-
-                <TextView
-                    android:id="@+id/tvStatusGoogle"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center_vertical"
-                    android:textColor="@color/grey_500"
-                    android:text="@string/title_not_linked_account"
-                    />
-
-            </LinearLayout>
-
-            <TextView
-                android:id="@+id/tvActionGoogle"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginLeft="24dp"
-                android:gravity="right"
-                android:layout_gravity="center_vertical"
-                android:textColor="@color/grey_500"
-                android:text="@string/action_connect"
-                />
-
-        </LinearLayout>
-
-        <LinearLayout
-            android:id="@+id/itemFacebook"
-            android:layout_width="match_parent"
-            android:layout_height="48dp"
-            android:paddingLeft="18dp"
-            android:paddingRight="16dp"
-            android:clickable="true"
-            android:background="?android:attr/selectableItemBackground"
-            >
-
-            <ImageView
-                android:id="@+id/ivFacebook"
-                android:layout_width="36dp"
-                android:layout_height="36dp"
-                android:src="@drawable/ic_facebook_disabled"
-                android:layout_gravity="center_vertical"
-                />
-
-            <LinearLayout
-                android:orientation="vertical"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_vertical"
-                android:layout_marginLeft="18dp"
-                >
-
-                <TextView
-                    android:id="@+id/tvNameFacebook"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center_vertical"
-                    android:textColor="@color/black_text"
-                    tools:text="@tools:sample/full_names"
-                    android:visibility="gone"
-                    />
-
-                <TextView
-                    android:id="@+id/tvStatusFacebook"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center_vertical"
-                    android:textColor="@color/grey_500"
-                    android:text="@string/title_not_linked_account"
-                    />
-
-            </LinearLayout>
-
-            <TextView
-                android:id="@+id/tvActionFacebook"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginLeft="24dp"
-                android:layout_gravity="center_vertical"
-                android:gravity="right"
-                android:textColor="@color/grey_500"
-                android:text="@string/action_connect"
-                />
-
-        </LinearLayout>
-
-        <LinearLayout
-            android:id="@+id/itemTwitter"
-            android:layout_width="match_parent"
-            android:layout_height="48dp"
-            android:paddingLeft="18dp"
-            android:paddingRight="16dp"
-            android:clickable="true"
-            android:background="?android:attr/selectableItemBackground"
-            >
-
-            <ImageView
-                android:id="@+id/ivTwitter"
-                android:layout_width="36dp"
-                android:layout_height="36dp"
-                android:src="@drawable/ic_twitter_disabled"
-                android:layout_gravity="center_vertical"
-                />
-
-            <LinearLayout
-                android:orientation="vertical"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_vertical"
-                android:layout_marginLeft="18dp"
-                >
-
-                <TextView
-                    android:id="@+id/tvNameTwitter"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center_vertical"
-                    android:textColor="@color/black_text"
-                    tools:text="@tools:sample/full_names"
-                    android:visibility="gone"
-                    />
-
-                <TextView
-                    android:id="@+id/tvStatusTwitter"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center_vertical"
-                    android:textColor="@color/grey_500"
-                    android:text="@string/title_not_linked_account"
-                    />
-
-            </LinearLayout>
-
-            <TextView
-                android:id="@+id/tvActionTwitter"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_vertical"
-                android:gravity="right"
-                android:layout_marginLeft="24dp"
-                android:textColor="@color/grey_500"
-                android:text="@string/action_connect"
-                />
-
-        </LinearLayout>
+        <CheckBox
+            android:id="@+id/chkAccept"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:text="acept license"
+            />
 
         <RelativeLayout
             android:layout_marginTop="16dp"
@@ -226,17 +54,6 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content">
 
-            <Button
-                android:id="@+id/btnOptions"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                style="@style/Widget.AppCompat.Button.Borderless"
-                android:theme="@style/BlueButton"
-                android:textColor="@color/grey_500"
-                android:text="@string/button_terms_of_service"
-                android:layout_centerVertical="true"
-                />
-
             <Button
                 android:id="@+id/btnSignUp"
                 android:layout_width="wrap_content"
@@ -250,6 +67,7 @@
                 android:layout_alignParentRight="true"
                 android:textColor="@color/white"
                 android:text="@string/button_registration"
+                android:enabled="false"
                 />
 
         </RelativeLayout>
diff --git a/xabber/src/main/res/layout/fragment_xaccount_signup_4.xml b/xabber/src/main/res/layout/fragment_xaccount_signup_4.xml
new file mode 100644
index 0000000000..eaa4e439ee
--- /dev/null
+++ b/xabber/src/main/res/layout/fragment_xaccount_signup_4.xml
@@ -0,0 +1,261 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="48dp"
+        android:background="#F5F5F5"
+        android:elevation="4dp"
+        >
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="Step 4 of 4"
+            android:textStyle="bold"
+            android:layout_marginLeft="16dp"
+            android:layout_gravity="center_vertical"
+            />
+
+    </LinearLayout>
+
+    <LinearLayout
+        android:orientation="vertical"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="24dp"
+        android:layout_marginLeft="24dp"
+        android:layout_marginRight="24dp"
+        >
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="Secure your account by linking it with at least one social network or email. If you don’t do that and lose your password, you’ll never be able to restore access to your account!"
+            android:paddingLeft="4dp"
+            android:layout_marginBottom="16dp"
+            />
+
+        <LinearLayout
+            android:id="@+id/itemGoogle"
+            android:layout_width="match_parent"
+            android:layout_height="48dp"
+            android:paddingLeft="18dp"
+            android:paddingRight="16dp"
+            android:clickable="true"
+            android:background="?android:attr/selectableItemBackground"
+            >
+
+            <ImageView
+                android:id="@+id/ivGoogle"
+                android:layout_width="36dp"
+                android:layout_height="36dp"
+                android:src="@drawable/ic_google_plus_disabled"
+                android:layout_gravity="center_vertical"
+                />
+
+            <LinearLayout
+                android:orientation="vertical"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical"
+                android:layout_marginLeft="18dp"
+                >
+
+                <TextView
+                    android:id="@+id/tvNameGoogle"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
+                    android:textColor="@color/black_text"
+                    tools:text="@tools:sample/full_names"
+                    android:visibility="gone"
+                    />
+
+                <TextView
+                    android:id="@+id/tvStatusGoogle"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
+                    android:textColor="@color/grey_500"
+                    android:text="@string/title_not_linked_account"
+                    />
+
+            </LinearLayout>
+
+            <TextView
+                android:id="@+id/tvActionGoogle"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="24dp"
+                android:gravity="right"
+                android:layout_gravity="center_vertical"
+                android:textColor="@color/grey_500"
+                android:text="@string/action_connect"
+                />
+
+        </LinearLayout>
+
+        <LinearLayout
+            android:id="@+id/itemFacebook"
+            android:layout_width="match_parent"
+            android:layout_height="48dp"
+            android:paddingLeft="18dp"
+            android:paddingRight="16dp"
+            android:clickable="true"
+            android:background="?android:attr/selectableItemBackground"
+            >
+
+            <ImageView
+                android:id="@+id/ivFacebook"
+                android:layout_width="36dp"
+                android:layout_height="36dp"
+                android:src="@drawable/ic_facebook_disabled"
+                android:layout_gravity="center_vertical"
+                />
+
+            <LinearLayout
+                android:orientation="vertical"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical"
+                android:layout_marginLeft="18dp"
+                >
+
+                <TextView
+                    android:id="@+id/tvNameFacebook"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
+                    android:textColor="@color/black_text"
+                    tools:text="@tools:sample/full_names"
+                    android:visibility="gone"
+                    />
+
+                <TextView
+                    android:id="@+id/tvStatusFacebook"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
+                    android:textColor="@color/grey_500"
+                    android:text="@string/title_not_linked_account"
+                    />
+
+            </LinearLayout>
+
+            <TextView
+                android:id="@+id/tvActionFacebook"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="24dp"
+                android:layout_gravity="center_vertical"
+                android:gravity="right"
+                android:textColor="@color/grey_500"
+                android:text="@string/action_connect"
+                />
+
+        </LinearLayout>
+
+        <LinearLayout
+            android:id="@+id/itemTwitter"
+            android:layout_width="match_parent"
+            android:layout_height="48dp"
+            android:paddingLeft="18dp"
+            android:paddingRight="16dp"
+            android:clickable="true"
+            android:background="?android:attr/selectableItemBackground"
+            >
+
+            <ImageView
+                android:id="@+id/ivTwitter"
+                android:layout_width="36dp"
+                android:layout_height="36dp"
+                android:src="@drawable/ic_twitter_disabled"
+                android:layout_gravity="center_vertical"
+                />
+
+            <LinearLayout
+                android:orientation="vertical"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical"
+                android:layout_marginLeft="18dp"
+                >
+
+                <TextView
+                    android:id="@+id/tvNameTwitter"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
+                    android:textColor="@color/black_text"
+                    tools:text="@tools:sample/full_names"
+                    android:visibility="gone"
+                    />
+
+                <TextView
+                    android:id="@+id/tvStatusTwitter"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
+                    android:textColor="@color/grey_500"
+                    android:text="@string/title_not_linked_account"
+                    />
+
+            </LinearLayout>
+
+            <TextView
+                android:id="@+id/tvActionTwitter"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical"
+                android:gravity="right"
+                android:layout_marginLeft="24dp"
+                android:textColor="@color/grey_500"
+                android:text="@string/action_connect"
+                />
+
+        </LinearLayout>
+
+        <RelativeLayout
+            android:layout_marginTop="16dp"
+            android:layout_marginBottom="16dp"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+            <Button
+                android:id="@+id/btnOptions"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                style="@style/Widget.AppCompat.Button.Borderless"
+                android:theme="@style/BlueButton"
+                android:textColor="@color/grey_500"
+                android:text="@string/button_terms_of_service"
+                android:layout_centerVertical="true"
+                />
+
+            <Button
+                android:id="@+id/btnSignUp"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                style="@style/Widget.AppCompat.Button.Colored"
+                android:theme="@style/BlueButton"
+                android:paddingRight="18dp"
+                android:paddingLeft="18dp"
+                android:layout_centerVertical="true"
+                android:layout_alignParentEnd="true"
+                android:layout_alignParentRight="true"
+                android:textColor="@color/white"
+                android:text="@string/button_registration"
+                />
+
+        </RelativeLayout>
+
+
+    </LinearLayout>
+
+
+</LinearLayout>
\ No newline at end of file

From bf3f82ac03109a7b1ed02542160dc7bb5fe01f70 Mon Sep 17 00:00:00 2001
From: Valery Miller <valera_miller94@mail.ru>
Date: Wed, 19 Sep 2018 18:16:06 +0500
Subject: [PATCH 103/251] Work on new signup screens

---
 .../ui/activity/XabberLoginActivity.java      | 65 ++++++++++++++++---
 .../ui/fragment/XAccountSignUpFragment.java   |  6 +-
 2 files changed, 58 insertions(+), 13 deletions(-)

diff --git a/xabber/src/main/java/com/xabber/android/ui/activity/XabberLoginActivity.java b/xabber/src/main/java/com/xabber/android/ui/activity/XabberLoginActivity.java
index c5724a4a2b..6af386cc7b 100644
--- a/xabber/src/main/java/com/xabber/android/ui/activity/XabberLoginActivity.java
+++ b/xabber/src/main/java/com/xabber/android/ui/activity/XabberLoginActivity.java
@@ -14,6 +14,12 @@
 import android.view.View;
 import android.widget.Toast;
 
+import com.google.android.gms.common.api.ApiException;
+import com.google.android.gms.common.api.CommonStatusCodes;
+import com.google.android.gms.safetynet.SafetyNet;
+import com.google.android.gms.safetynet.SafetyNetApi;
+import com.google.android.gms.tasks.OnFailureListener;
+import com.google.android.gms.tasks.OnSuccessListener;
 import com.xabber.android.R;
 import com.xabber.android.data.xaccount.AuthManager;
 import com.xabber.android.data.xaccount.HttpApiManager;
@@ -51,6 +57,8 @@ public class XabberLoginActivity extends BaseLoginActivity implements XAccountSi
     public final static String FRAGMENT_SIGNUP_STEP2 = "fragment_signup_step2";
     public final static String FRAGMENT_SIGNUP_STEP3 = "fragment_signup_step3";
 
+    private static final String CAPTCHA_TOKEN = "RECAPTCHA";
+
     private FragmentTransaction fTrans;
     private Fragment fragmentLogin;
     private Fragment fragmentSignUpStep1;
@@ -231,19 +239,17 @@ public void on2StepCompleted(String pass) {
 
     @Override
     public void onStep3Completed() {
+        String username = SignUpRepo.getInstance().getUsername();
+        String host = SignUpRepo.getInstance().getHost();
+        String pass = SignUpRepo.getInstance().getPass();
+        String provider = SignUpRepo.getInstance().getSocialProvider();
+        String credentials = SignUpRepo.getInstance().getSocialCredentials();
 
+        if (provider != null && credentials != null)
+            signUp(username, host, pass, null, credentials, provider);
+        else getCaptchaToken(username, pass, host);
     }
 
-    //    @Override
-//    public void onSignupClick(String username, String host, String pass, String captchaToken) {
-//        signUp(username, host, pass, captchaToken,null, null);
-//    }
-//
-//    @Override
-//    public void onSignupClick(String username, String host, String pass, String socialToken, String socialProvider) {
-//        signUp(username, host, pass, null, socialToken, socialProvider);
-//    }
-
     @Override
     public void onGoogleClick() {
         loginGoogle();
@@ -417,4 +423,43 @@ private void handleErrorGetAccount(Throwable throwable) {
         handleError(throwable, "Error while login: ", LOG_TAG);
     }
 
+    /** CAPTCHA */
+
+    private void getCaptchaToken(final String username, final String pass, final String domain) {
+        SafetyNet.getClient(this).verifyWithRecaptcha(getString(R.string.RECAPTCHA_KEY))
+                .addOnSuccessListener(this,
+                        new OnSuccessListener<SafetyNetApi.RecaptchaTokenResponse>() {
+                            @Override
+                            public void onSuccess(SafetyNetApi.RecaptchaTokenResponse response) {
+                                // Indicates communication with reCAPTCHA service was
+                                // successful.
+                                String userResponseToken = response.getTokenResult();
+                                if (!userResponseToken.isEmpty()) {
+                                    // Validate the user response token using the
+                                    // reCAPTCHA siteverify API.
+                                    Log.d(CAPTCHA_TOKEN, "Success: " + userResponseToken);
+                                    signUp(username, domain, pass, userResponseToken, null, null);
+                                }
+                            }
+                        })
+                .addOnFailureListener(this,
+                        new OnFailureListener() {
+                            @Override
+                            public void onFailure(@NonNull Exception e) {
+                                if (e instanceof ApiException) {
+                                    // An error occurred when communicating with the
+                                    // reCAPTCHA service. Refer to the status code to
+                                    // handle the error appropriately.
+                                    ApiException apiException = (ApiException) e;
+                                    int statusCode = apiException.getStatusCode();
+                                    Log.d(CAPTCHA_TOKEN, "Error: "
+                                            + CommonStatusCodes.getStatusCodeString(statusCode));
+                                } else {
+                                    // A different, unknown type of error occurred.
+                                    Log.d(CAPTCHA_TOKEN, "Error: " + e.getMessage());
+                                }
+                            }
+                        });
+    }
+
 }
diff --git a/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountSignUpFragment.java b/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountSignUpFragment.java
index 632cdb5b4e..ada54340d6 100644
--- a/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountSignUpFragment.java
+++ b/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountSignUpFragment.java
@@ -244,8 +244,8 @@ public void onFailure(@NonNull Exception e) {
 
     public void setupSpinner(List<String> domains) {
         if (spinnerDomain == null) return;
-        HostSpinnerAdapter adapter = new HostSpinnerAdapter(getActivity(),
-                android.R.layout.simple_spinner_item, domains);
-        spinnerDomain.setAdapter(adapter);
+//        HostSpinnerAdapter adapter = new HostSpinnerAdapter(getActivity(),
+//                android.R.layout.simple_spinner_item, domains);
+        //spinnerDomain.setAdapter(adapter);
     }
 }

From ef8e1330f9222bfc472b075a14f4a610431c48ad Mon Sep 17 00:00:00 2001
From: Valery Miller <valera_miller94@mail.ru>
Date: Wed, 19 Sep 2018 18:22:21 +0500
Subject: [PATCH 104/251] Up version to 512

---
 xabber/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/xabber/build.gradle b/xabber/build.gradle
index 8849a32510..285e7f5cac 100644
--- a/xabber/build.gradle
+++ b/xabber/build.gradle
@@ -10,8 +10,8 @@ android {
     defaultConfig {
         minSdkVersion 15
         targetSdkVersion 27
-        versionCode 511
-        versionName '2.4.2(511)'
+        versionCode 512
+        versionName '2.4.2(512)'
     }
 
     lintOptions {

From bbf011586f133096d8d4695630ee61994563c14e Mon Sep 17 00:00:00 2001
From: Valery Miller <valera_miller94@mail.ru>
Date: Thu, 20 Sep 2018 11:42:04 +0500
Subject: [PATCH 105/251] Work on new signup screens

---
 .../ui/activity/BaseLoginActivity.java        |  2 +-
 .../ui/activity/XabberLoginActivity.java      | 20 ++++++++++++++-
 .../ui/fragment/XAccountSignUpFragment4.java  | 25 +++++++++++++++++++
 .../fragment/XabberAccountInfoFragment.java   |  4 +--
 .../res/layout/fragment_xaccount_signup_4.xml | 13 +---------
 5 files changed, 48 insertions(+), 16 deletions(-)
 create mode 100644 xabber/src/main/java/com/xabber/android/ui/fragment/XAccountSignUpFragment4.java

diff --git a/xabber/src/main/java/com/xabber/android/ui/activity/BaseLoginActivity.java b/xabber/src/main/java/com/xabber/android/ui/activity/BaseLoginActivity.java
index fa2059a5cb..adb919187b 100644
--- a/xabber/src/main/java/com/xabber/android/ui/activity/BaseLoginActivity.java
+++ b/xabber/src/main/java/com/xabber/android/ui/activity/BaseLoginActivity.java
@@ -323,7 +323,7 @@ public void call(List<XMPPAccountSettings> settings) {
                         // update last synchronization time
                         SettingsManager.setLastSyncDate(XabberAccountManager.getCurrentTimeString());
                         Toast.makeText(BaseLoginActivity.this, R.string.sync_success, Toast.LENGTH_SHORT).show();
-                        goToMainActivity();
+                        //goToMainActivity();
                     }
                 }, new Action1<Throwable>() {
                     @Override
diff --git a/xabber/src/main/java/com/xabber/android/ui/activity/XabberLoginActivity.java b/xabber/src/main/java/com/xabber/android/ui/activity/XabberLoginActivity.java
index 6af386cc7b..dca19d516f 100644
--- a/xabber/src/main/java/com/xabber/android/ui/activity/XabberLoginActivity.java
+++ b/xabber/src/main/java/com/xabber/android/ui/activity/XabberLoginActivity.java
@@ -31,6 +31,7 @@
 import com.xabber.android.ui.fragment.XAccountSignUpFragment1;
 import com.xabber.android.ui.fragment.XAccountSignUpFragment2;
 import com.xabber.android.ui.fragment.XAccountSignUpFragment3;
+import com.xabber.android.ui.fragment.XAccountSignUpFragment4;
 import com.xabber.android.utils.RetrofitErrorConverter;
 
 import java.util.ArrayList;
@@ -56,6 +57,7 @@ public class XabberLoginActivity extends BaseLoginActivity implements XAccountSi
     public final static String FRAGMENT_SIGNUP_STEP1 = "fragment_signup_step1";
     public final static String FRAGMENT_SIGNUP_STEP2 = "fragment_signup_step2";
     public final static String FRAGMENT_SIGNUP_STEP3 = "fragment_signup_step3";
+    public final static String FRAGMENT_SIGNUP_STEP4 = "fragment_signup_step4";
 
     private static final String CAPTCHA_TOKEN = "RECAPTCHA";
 
@@ -64,6 +66,7 @@ public class XabberLoginActivity extends BaseLoginActivity implements XAccountSi
     private Fragment fragmentSignUpStep1;
     private Fragment fragmentSignUpStep2;
     private Fragment fragmentSignUpStep3;
+    private Fragment fragmentSignUpStep4;
     private String currentFragment = FRAGMENT_LOGIN;
 
     private ProgressDialog progressDialog;
@@ -156,6 +159,19 @@ public void showSignUpStep3Fragment() {
         barPainter.setLiteGrey();
     }
 
+    public void showSignUpStep4Fragment() {
+        if (fragmentSignUpStep4 == null)
+            fragmentSignUpStep4 = XAccountSignUpFragment4.newInstance();
+
+        fTrans = getFragmentManager().beginTransaction();
+        fTrans.replace(R.id.container, fragmentSignUpStep4, FRAGMENT_SIGNUP_STEP4);
+        fTrans.commit();
+        currentFragment = FRAGMENT_SIGNUP_STEP4;
+
+        toolbar.setTitle(R.string.title_register_xabber_account);
+        barPainter.setLiteGrey();
+    }
+
     @Override
     protected void onResume() {
         super.onResume();
@@ -337,7 +353,9 @@ public void call(Throwable throwable) {
     }
 
     private void handleSuccessSignUp() {
-        synchronize(true);
+        hideProgress();
+        synchronize(false);
+        showSignUpStep4Fragment();
     }
 
     private void handleErrorSignUp(Throwable throwable) {
diff --git a/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountSignUpFragment4.java b/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountSignUpFragment4.java
new file mode 100644
index 0000000000..3783a18472
--- /dev/null
+++ b/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountSignUpFragment4.java
@@ -0,0 +1,25 @@
+package com.xabber.android.ui.fragment;
+
+import android.app.Fragment;
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import com.xabber.android.R;
+
+public class XAccountSignUpFragment4 extends Fragment {
+
+    public static XAccountSignUpFragment4 newInstance() {
+        XAccountSignUpFragment4 fragment = new XAccountSignUpFragment4();
+        return fragment;
+    }
+
+    @Nullable
+    @Override
+    public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, Bundle savedInstanceState) {
+        return inflater.inflate(R.layout.fragment_xaccount_signup_4, container, false);
+    }
+
+}
diff --git a/xabber/src/main/java/com/xabber/android/ui/fragment/XabberAccountInfoFragment.java b/xabber/src/main/java/com/xabber/android/ui/fragment/XabberAccountInfoFragment.java
index 3f2b185b8c..c88efcac29 100644
--- a/xabber/src/main/java/com/xabber/android/ui/fragment/XabberAccountInfoFragment.java
+++ b/xabber/src/main/java/com/xabber/android/ui/fragment/XabberAccountInfoFragment.java
@@ -353,12 +353,12 @@ private void clearSocial() {
         tvStatusGoogle.setText(R.string.title_not_linked_account);
         tvActionGoogle.setText(R.string.action_connect);
 
-        ivFacebook.setImageResource(R.drawable.ic_google_plus_disabled);
+        ivFacebook.setImageResource(R.drawable.ic_facebook_disabled);
         tvNameFacebook.setVisibility(View.GONE);
         tvStatusFacebook.setText(R.string.title_not_linked_account);
         tvActionFacebook.setText(R.string.action_connect);
 
-        ivTwitter.setImageResource(R.drawable.ic_google_plus_disabled);
+        ivTwitter.setImageResource(R.drawable.ic_twitter_disabled);
         tvNameTwitter.setVisibility(View.GONE);
         tvStatusTwitter.setText(R.string.title_not_linked_account);
         tvActionTwitter.setText(R.string.action_connect);
diff --git a/xabber/src/main/res/layout/fragment_xaccount_signup_4.xml b/xabber/src/main/res/layout/fragment_xaccount_signup_4.xml
index eaa4e439ee..a9eadddbfb 100644
--- a/xabber/src/main/res/layout/fragment_xaccount_signup_4.xml
+++ b/xabber/src/main/res/layout/fragment_xaccount_signup_4.xml
@@ -226,17 +226,6 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content">
 
-            <Button
-                android:id="@+id/btnOptions"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                style="@style/Widget.AppCompat.Button.Borderless"
-                android:theme="@style/BlueButton"
-                android:textColor="@color/grey_500"
-                android:text="@string/button_terms_of_service"
-                android:layout_centerVertical="true"
-                />
-
             <Button
                 android:id="@+id/btnSignUp"
                 android:layout_width="wrap_content"
@@ -249,7 +238,7 @@
                 android:layout_alignParentEnd="true"
                 android:layout_alignParentRight="true"
                 android:textColor="@color/white"
-                android:text="@string/button_registration"
+                android:text="@string/title_start_messaging"
                 />
 
         </RelativeLayout>

From 831a673862b53cacde08da7c7cbf3b0b53a82834 Mon Sep 17 00:00:00 2001
From: Valery Miller <valera_miller94@mail.ru>
Date: Thu, 20 Sep 2018 14:59:32 +0500
Subject: [PATCH 106/251] Work on new signup screens

---
 .../ui/activity/BaseLoginActivity.java        | 149 +++++++++-
 .../ui/activity/XabberAccountActivity.java    | 139 +---------
 .../ui/activity/XabberLoginActivity.java      |  55 +++-
 .../ui/fragment/XAccountLinksFragment.java    | 257 ++++++++++++++++++
 .../ui/fragment/XAccountSignUpFragment4.java  |  39 +++
 .../res/layout/fragment_xaccount_links.xml    | 242 +++++++++++++++++
 .../res/layout/fragment_xaccount_signup_4.xml | 185 +------------
 7 files changed, 746 insertions(+), 320 deletions(-)
 create mode 100644 xabber/src/main/java/com/xabber/android/ui/fragment/XAccountLinksFragment.java
 create mode 100644 xabber/src/main/res/layout/fragment_xaccount_links.xml

diff --git a/xabber/src/main/java/com/xabber/android/ui/activity/BaseLoginActivity.java b/xabber/src/main/java/com/xabber/android/ui/activity/BaseLoginActivity.java
index adb919187b..8d31045a63 100644
--- a/xabber/src/main/java/com/xabber/android/ui/activity/BaseLoginActivity.java
+++ b/xabber/src/main/java/com/xabber/android/ui/activity/BaseLoginActivity.java
@@ -45,6 +45,7 @@
 import java.util.Collections;
 import java.util.List;
 
+import okhttp3.ResponseBody;
 import rx.Subscription;
 import rx.android.schedulers.AndroidSchedulers;
 import rx.functions.Action1;
@@ -339,10 +340,156 @@ protected void updateAccountInfo(XabberAccount account) {}
 
     protected void updateLastSyncTime() {}
 
-    private void goToMainActivity() {
+    protected void goToMainActivity() {
         Intent intent = ContactListActivity.createIntent(BaseLoginActivity.this);
         intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK);
         finish();
         startActivity(intent);
     }
+
+    /** ADD EMAIL */
+
+    protected void resendConfirmEmail(String email) {
+        showProgress(getResources().getString(R.string.progress_title_resend));
+        Subscription resendEmailSubscription = AuthManager.addEmail(email)
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(new Action1<ResponseBody>() {
+                    @Override
+                    public void call(ResponseBody s) {
+                        handleSuccessResendEmail(s);
+                    }
+                }, new Action1<Throwable>() {
+                    @Override
+                    public void call(Throwable throwable) {
+                        handleErrorResendEmail(throwable);
+                    }
+                });
+        compositeSubscription.add(resendEmailSubscription);
+    }
+
+    private void handleSuccessResendEmail(ResponseBody response) {
+        hideProgress();
+        Toast.makeText(this, R.string.resend_success, Toast.LENGTH_SHORT).show();
+        synchronize(false);
+    }
+
+    private void handleErrorResendEmail(Throwable throwable) {
+        hideProgress();
+        handleError(throwable, "Error while send verification email: ", LOG_TAG);
+    }
+
+    /** CONFIRM EMAIL */
+
+    protected void confirmEmail(String code) {
+        showProgress(getResources().getString(R.string.progress_title_confirm));
+        Subscription confirmSubscription = AuthManager.confirmEmail(code)
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(new Action1<XabberAccount>() {
+                    @Override
+                    public void call(XabberAccount s) {
+                        handleSuccessConfirm(s);
+                    }
+                }, new Action1<Throwable>() {
+                    @Override
+                    public void call(Throwable throwable) {
+                        handleErrorConfirm(throwable);
+                    }
+                });
+        compositeSubscription.add(confirmSubscription);
+    }
+
+    private void handleSuccessConfirm(XabberAccount response) {
+        hideProgress();
+        Toast.makeText(this, R.string.confirm_success, Toast.LENGTH_SHORT).show();
+        updateAccountInfo(response);
+    }
+
+    private void handleErrorConfirm(Throwable throwable) {
+        hideProgress();
+        handleError(throwable, "Error while confirming email: ", LOG_TAG);
+    }
+
+    /** DELETE EMAIL */
+
+    protected void deleteEmail(int emailId) {
+        showProgress(getResources().getString(R.string.progress_title_delete));
+        Subscription deleteSubscription = AuthManager.deleteEmail(emailId)
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(new Action1<ResponseBody>() {
+                    @Override
+                    public void call(ResponseBody s) {
+                        handleSuccessDelete(s);
+                    }
+                }, new Action1<Throwable>() {
+                    @Override
+                    public void call(Throwable throwable) {
+                        handleErrorDelete(throwable);
+                    }
+                });
+        compositeSubscription.add(deleteSubscription);
+    }
+
+    private void handleSuccessDelete(ResponseBody response) {
+        hideProgress();
+        Toast.makeText(this, R.string.delete_success, Toast.LENGTH_SHORT).show();
+        synchronize(false);
+    }
+
+    private void handleErrorDelete(Throwable throwable) {
+        hideProgress();
+        handleError(throwable, "Error while deleting email: ", LOG_TAG);
+    }
+
+    /** SOCIAL BIND / UNBIND */
+
+    protected void bindSocial(String provider, String credentials) {
+        showProgress(getResources().getString(R.string.progress_title_bind_social));
+        Subscription loginSocialSubscription = AuthManager.bindSocial(provider, credentials)
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(new Action1<ResponseBody>() {
+                    @Override
+                    public void call(ResponseBody s) {
+                        hideProgress();
+                        Toast.makeText(BaseLoginActivity.this,
+                                R.string.social_bind_success, Toast.LENGTH_SHORT).show();
+                        synchronize(false);
+                    }
+                }, new Action1<Throwable>() {
+                    @Override
+                    public void call(Throwable throwable) {
+                        hideProgress();
+                        Toast.makeText(BaseLoginActivity.this,
+                                R.string.social_bind_fail, Toast.LENGTH_SHORT).show();
+                    }
+                });
+        compositeSubscription.add(loginSocialSubscription);
+    }
+
+    protected void unbindSocial(String provider) {
+        showProgress(getResources().getString(R.string.progress_title_unbind_social));
+        Subscription unbindSocialSubscription = AuthManager.unbindSocial(provider)
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(new Action1<ResponseBody>() {
+                    @Override
+                    public void call(ResponseBody responseBody) {
+                        hideProgress();
+                        Toast.makeText(BaseLoginActivity.this,
+                                R.string.social_unbind_success, Toast.LENGTH_SHORT).show();
+                        synchronize(false);
+                    }
+                }, new Action1<Throwable>() {
+                    @Override
+                    public void call(Throwable throwable) {
+                        hideProgress();
+                        Toast.makeText(BaseLoginActivity.this,
+                                R.string.social_unbind_fail, Toast.LENGTH_SHORT).show();
+                    }
+                });
+        compositeSubscription.add(unbindSocialSubscription);
+    }
 }
diff --git a/xabber/src/main/java/com/xabber/android/ui/activity/XabberAccountActivity.java b/xabber/src/main/java/com/xabber/android/ui/activity/XabberAccountActivity.java
index 718e0f2079..6b72705325 100644
--- a/xabber/src/main/java/com/xabber/android/ui/activity/XabberAccountActivity.java
+++ b/xabber/src/main/java/com/xabber/android/ui/activity/XabberAccountActivity.java
@@ -154,52 +154,12 @@ public void onSocialBindClick(String provider) {
 
     @Override
     protected void onSocialAuthSuccess(String provider, String credentials) {
-        showProgress(getResources().getString(R.string.progress_title_bind_social));
-        Subscription loginSocialSubscription = AuthManager.bindSocial(provider, credentials)
-                .subscribeOn(Schedulers.io())
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(new Action1<ResponseBody>() {
-                    @Override
-                    public void call(ResponseBody s) {
-                        hideProgress();
-                        Toast.makeText(XabberAccountActivity.this,
-                                R.string.social_bind_success, Toast.LENGTH_SHORT).show();
-                        synchronize(false);
-                    }
-                }, new Action1<Throwable>() {
-                    @Override
-                    public void call(Throwable throwable) {
-                        hideProgress();
-                        Toast.makeText(XabberAccountActivity.this,
-                                R.string.social_bind_fail, Toast.LENGTH_SHORT).show();
-                    }
-                });
-        compositeSubscription.add(loginSocialSubscription);
+        bindSocial(provider, credentials);
     }
 
     @Override
     public void onSocialUnbindClick(String provider) {
-        showProgress(getResources().getString(R.string.progress_title_unbind_social));
-        Subscription unbindSocialSubscription = AuthManager.unbindSocial(provider)
-                .subscribeOn(Schedulers.io())
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(new Action1<ResponseBody>() {
-                    @Override
-                    public void call(ResponseBody responseBody) {
-                        hideProgress();
-                        Toast.makeText(XabberAccountActivity.this,
-                                R.string.social_unbind_success, Toast.LENGTH_SHORT).show();
-                        synchronize(false);
-                    }
-                }, new Action1<Throwable>() {
-                    @Override
-                    public void call(Throwable throwable) {
-                        hideProgress();
-                        Toast.makeText(XabberAccountActivity.this,
-                                R.string.social_unbind_fail, Toast.LENGTH_SHORT).show();
-                    }
-                });
-        compositeSubscription.add(unbindSocialSubscription);
+        unbindSocial(provider);
     }
 
     /** Xabber Account Info */
@@ -339,99 +299,4 @@ private void handleErrorLogout(Throwable throwable) {
         hideProgress();
     }
 
-    /** ADD EMAIL */
-
-    private void resendConfirmEmail(String email) {
-        showProgress(getResources().getString(R.string.progress_title_resend));
-        Subscription resendEmailSubscription = AuthManager.addEmail(email)
-                .subscribeOn(Schedulers.io())
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(new Action1<ResponseBody>() {
-                    @Override
-                    public void call(ResponseBody s) {
-                        handleSuccessResendEmail(s);
-                    }
-                }, new Action1<Throwable>() {
-                    @Override
-                    public void call(Throwable throwable) {
-                        handleErrorResendEmail(throwable);
-                    }
-                });
-        compositeSubscription.add(resendEmailSubscription);
-    }
-
-    private void handleSuccessResendEmail(ResponseBody response) {
-        hideProgress();
-        Toast.makeText(this, R.string.resend_success, Toast.LENGTH_SHORT).show();
-        synchronize(false);
-    }
-
-    private void handleErrorResendEmail(Throwable throwable) {
-        hideProgress();
-        handleError(throwable, "Error while send verification email: ", LOG_TAG);
-    }
-
-    /** CONFIRM EMAIL */
-
-    private void confirmEmail(String code) {
-        showProgress(getResources().getString(R.string.progress_title_confirm));
-        Subscription confirmSubscription = AuthManager.confirmEmail(code)
-                .subscribeOn(Schedulers.io())
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(new Action1<XabberAccount>() {
-                    @Override
-                    public void call(XabberAccount s) {
-                        handleSuccessConfirm(s);
-                    }
-                }, new Action1<Throwable>() {
-                    @Override
-                    public void call(Throwable throwable) {
-                        handleErrorConfirm(throwable);
-                    }
-                });
-        compositeSubscription.add(confirmSubscription);
-    }
-
-    private void handleSuccessConfirm(XabberAccount response) {
-        hideProgress();
-        Toast.makeText(this, R.string.confirm_success, Toast.LENGTH_SHORT).show();
-        updateAccountInfo(response);
-    }
-
-    private void handleErrorConfirm(Throwable throwable) {
-        hideProgress();
-        handleError(throwable, "Error while confirming email: ", LOG_TAG);
-    }
-
-    /** DELETE EMAIL */
-
-    private void deleteEmail(int emailId) {
-        showProgress(getResources().getString(R.string.progress_title_delete));
-        Subscription deleteSubscription = AuthManager.deleteEmail(emailId)
-                .subscribeOn(Schedulers.io())
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(new Action1<ResponseBody>() {
-                    @Override
-                    public void call(ResponseBody s) {
-                        handleSuccessDelete(s);
-                    }
-                }, new Action1<Throwable>() {
-                    @Override
-                    public void call(Throwable throwable) {
-                        handleErrorDelete(throwable);
-                    }
-                });
-        compositeSubscription.add(deleteSubscription);
-    }
-
-    private void handleSuccessDelete(ResponseBody response) {
-        hideProgress();
-        Toast.makeText(this, R.string.delete_success, Toast.LENGTH_SHORT).show();
-        synchronize(false);
-    }
-
-    private void handleErrorDelete(Throwable throwable) {
-        hideProgress();
-        handleError(throwable, "Error while deleting email: ", LOG_TAG);
-    }
 }
diff --git a/xabber/src/main/java/com/xabber/android/ui/activity/XabberLoginActivity.java b/xabber/src/main/java/com/xabber/android/ui/activity/XabberLoginActivity.java
index dca19d516f..fd7a25041d 100644
--- a/xabber/src/main/java/com/xabber/android/ui/activity/XabberLoginActivity.java
+++ b/xabber/src/main/java/com/xabber/android/ui/activity/XabberLoginActivity.java
@@ -25,8 +25,10 @@
 import com.xabber.android.data.xaccount.HttpApiManager;
 import com.xabber.android.data.xaccount.XAccountTokenDTO;
 import com.xabber.android.data.xaccount.XabberAccount;
+import com.xabber.android.data.xaccount.XabberAccountManager;
 import com.xabber.android.presentation.mvp.signup.SignUpRepo;
 import com.xabber.android.ui.color.BarPainter;
+import com.xabber.android.ui.fragment.XAccountLinksFragment;
 import com.xabber.android.ui.fragment.XAccountLoginFragment;
 import com.xabber.android.ui.fragment.XAccountSignUpFragment1;
 import com.xabber.android.ui.fragment.XAccountSignUpFragment2;
@@ -49,7 +51,9 @@
  */
 
 public class XabberLoginActivity extends BaseLoginActivity implements XAccountSignUpFragment1.Listener,
-        XAccountSignUpFragment2.Listener, XAccountLoginFragment.Listener, XAccountSignUpFragment3.Listener {
+        XAccountSignUpFragment2.Listener, XAccountLoginFragment.Listener,
+        XAccountSignUpFragment3.Listener, XAccountSignUpFragment4.Listener,
+        XAccountLinksFragment.Listener {
 
     private final static String LOG_TAG = XabberLoginActivity.class.getSimpleName();
     public final static String CURRENT_FRAGMENT = "current_fragment";
@@ -186,6 +190,9 @@ protected void onResume() {
                 case FRAGMENT_SIGNUP_STEP3:
                     showSignUpStep3Fragment();
                     break;
+                case FRAGMENT_SIGNUP_STEP4:
+                    showSignUpStep4Fragment();
+                    break;
                 default:
                     showLoginFragment();
             }
@@ -230,7 +237,9 @@ public void onBackPressed() {
 
     @Override
     protected void onSocialAuthSuccess(String provider, String credentials) {
-        socialLogin(provider, credentials);
+        XabberAccount account = XabberAccountManager.getInstance().getAccount();
+        if (account != null) bindSocial(provider, credentials);
+        else socialLogin(provider, credentials);
     }
 
     @Override
@@ -266,6 +275,11 @@ public void onStep3Completed() {
         else getCaptchaToken(username, pass, host);
     }
 
+    @Override
+    public void onStep4Completed() {
+        goToMainActivity();
+    }
+
     @Override
     public void onGoogleClick() {
         loginGoogle();
@@ -281,6 +295,43 @@ public void onTwitterClick() {
         loginTwitter();
     }
 
+    /** Xabber Account Links callbacks */
+
+    @Override
+    public void onSocialBindClick(String provider) {
+        switch (provider) {
+            case AuthManager.PROVIDER_GOOGLE:
+                loginGoogle();
+                break;
+            case AuthManager.PROVIDER_FACEBOOK:
+                loginFacebook();
+                break;
+            case AuthManager.PROVIDER_TWITTER:
+                loginTwitter();
+                break;
+        }
+    }
+
+    @Override
+    public void onSocialUnbindClick(String provider) {
+        unbindSocial(provider);
+    }
+
+    @Override
+    public void onAddEmailClick(String email) {
+        resendConfirmEmail(email);
+    }
+
+    @Override
+    public void onDeleteEmailClick(int emailId) {
+        deleteEmail(emailId);
+    }
+
+    @Override
+    public void onConfirmEmailClick(String email, String code) {
+        confirmEmail(code);
+    }
+
     /** GET HOSTS */
 
     private void getHosts() {
diff --git a/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountLinksFragment.java b/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountLinksFragment.java
new file mode 100644
index 0000000000..5c3872be57
--- /dev/null
+++ b/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountLinksFragment.java
@@ -0,0 +1,257 @@
+package com.xabber.android.ui.fragment;
+
+import android.app.Fragment;
+import android.content.Context;
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.support.v7.widget.LinearLayoutManager;
+import android.support.v7.widget.RecyclerView;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+
+import com.xabber.android.R;
+import com.xabber.android.data.xaccount.AuthManager;
+import com.xabber.android.data.xaccount.EmailDTO;
+import com.xabber.android.data.xaccount.SocialBindingDTO;
+import com.xabber.android.data.xaccount.XabberAccount;
+import com.xabber.android.data.xaccount.XabberAccountManager;
+import com.xabber.android.ui.adapter.EmailAdapter;
+import com.xabber.android.ui.dialog.AccountSyncDialogFragment;
+import com.xabber.android.ui.dialog.AddEmailDialogFragment;
+import com.xabber.android.ui.dialog.ConfirmEmailDialogFragment;
+
+import java.util.List;
+
+import rx.android.schedulers.AndroidSchedulers;
+import rx.functions.Action1;
+import rx.schedulers.Schedulers;
+import rx.subscriptions.CompositeSubscription;
+
+public class XAccountLinksFragment  extends Fragment implements AddEmailDialogFragment.Listener,
+        EmailAdapter.Listener, ConfirmEmailDialogFragment.Listener {
+
+    private ImageView ivGoogle;
+    private TextView tvNameGoogle;
+    private TextView tvStatusGoogle;
+    private TextView tvActionGoogle;
+    private LinearLayout itemGoogle;
+    private ImageView ivFacebook;
+    private TextView tvNameFacebook;
+    private TextView tvStatusFacebook;
+    private TextView tvActionFacebook;
+    private LinearLayout itemFacebook;
+    private ImageView ivTwitter;
+    private TextView tvNameTwitter;
+    private TextView tvStatusTwitter;
+    private TextView tvActionTwitter;
+    private LinearLayout itemTwitter;
+
+    private RecyclerView rvEmails;
+    private EmailAdapter emailAdapter;
+    private View viewAddEmail;
+
+    private CompositeSubscription compositeSubscription = new CompositeSubscription();
+    private Listener listener;
+
+    public interface Listener {
+        void onSocialBindClick(String provider);
+        void onSocialUnbindClick(String provider);
+        void onAddEmailClick(String email);
+        void onDeleteEmailClick(int emailId);
+        void onConfirmEmailClick(String email, String code);
+    }
+
+    public static XAccountLinksFragment newInstance() {
+        XAccountLinksFragment fragment = new XAccountLinksFragment();
+        return fragment;
+    }
+
+    @Nullable
+    @Override
+    public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, Bundle savedInstanceState) {
+        return inflater.inflate(R.layout.fragment_xaccount_links, container, false);
+    }
+
+    @Override
+    public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+
+        tvStatusGoogle = view.findViewById(R.id.tvStatusGoogle);
+        ivGoogle = view.findViewById(R.id.ivGoogle);
+        tvNameGoogle = view.findViewById(R.id.tvNameGoogle);
+        tvActionGoogle = view.findViewById(R.id.tvActionGoogle);
+        itemGoogle = view.findViewById(R.id.itemGoogle);
+        itemGoogle.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                if (tvActionGoogle.getText().equals(getString(R.string.action_connect)))
+                    listener.onSocialBindClick(AuthManager.PROVIDER_GOOGLE);
+                else listener.onSocialUnbindClick(AuthManager.PROVIDER_GOOGLE);
+            }
+        });
+
+        tvStatusFacebook = view.findViewById(R.id.tvStatusFacebook);
+        ivFacebook = view.findViewById(R.id.ivFacebook);
+        tvNameFacebook = view.findViewById(R.id.tvNameFacebook);
+        tvActionFacebook = view.findViewById(R.id.tvActionFacebook);
+        itemFacebook = view.findViewById(R.id.itemFacebook);
+        itemFacebook.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                if (tvActionFacebook.getText().equals(getString(R.string.action_connect)))
+                    listener.onSocialBindClick(AuthManager.PROVIDER_FACEBOOK);
+                else listener.onSocialUnbindClick(AuthManager.PROVIDER_FACEBOOK);
+            }
+        });
+
+        tvStatusTwitter = view.findViewById(R.id.tvStatusTwitter);
+        ivTwitter = view.findViewById(R.id.ivTwitter);
+        tvNameTwitter = view.findViewById(R.id.tvNameTwitter);
+        tvActionTwitter = view.findViewById(R.id.tvActionTwitter);
+        itemTwitter = view.findViewById(R.id.itemTwitter);
+        itemTwitter.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                if (tvActionTwitter.getText().equals(getString(R.string.action_connect)))
+                    listener.onSocialBindClick(AuthManager.PROVIDER_TWITTER);
+                else listener.onSocialUnbindClick(AuthManager.PROVIDER_TWITTER);
+            }
+        });
+
+        rvEmails = view.findViewById(R.id.rvEmails);
+        rvEmails.setLayoutManager(new LinearLayoutManager(getActivity()));
+        emailAdapter = new EmailAdapter(this);
+        rvEmails.setAdapter(emailAdapter);
+        viewAddEmail = view.findViewById(R.id.viewAddEmail);
+        viewAddEmail.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                AddEmailDialogFragment.newInstance(XAccountLinksFragment.this)
+                        .show(getFragmentManager(), AccountSyncDialogFragment.class.getSimpleName());
+            }
+        });
+    }
+
+    @Override
+    public void onAttach(Context context) {
+        super.onAttach(context);
+        if (context instanceof Listener) {
+            listener = (Listener) context;
+        } else {
+            throw new RuntimeException(context.toString()
+                    + " must implement XAccountLinksFragment.Listener");
+        }
+    }
+
+    @Override
+    public void onDetach() {
+        super.onDetach();
+        listener = null;
+    }
+
+    @Override
+    public void onPause() {
+        super.onPause();
+        compositeSubscription.clear();
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        subscribeForXabberAccount();
+    }
+
+    @Override
+    public void onEmailVerifyClick(String email) {
+        ConfirmEmailDialogFragment.newInstance(this, email)
+                .show(getFragmentManager(), AccountSyncDialogFragment.class.getSimpleName());
+    }
+
+    @Override
+    public void onEmailDeleteClick(int id) {
+        listener.onDeleteEmailClick(id);
+    }
+
+    @Override
+    public void onAddEmailClick(String email) {
+        listener.onAddEmailClick(email);
+    }
+
+    @Override
+    public void onResendCodeClick(String email) {
+        listener.onAddEmailClick(email);
+    }
+
+    @Override
+    public void onConfirmClick(String email, String code) {
+        listener.onConfirmEmailClick(email, code);
+    }
+
+    private void setupSocial(List<SocialBindingDTO> socialBindings) {
+        clearSocial();
+        for (SocialBindingDTO socialBinding : socialBindings) {
+            if ("google".equals(socialBinding.getProvider())) {
+                ivGoogle.setImageResource(R.drawable.ic_google_plus);
+                tvNameGoogle.setText(socialBinding.getFirstName() + " " + socialBinding.getLastName());
+                tvNameGoogle.setVisibility(View.VISIBLE);
+                tvStatusGoogle.setText(getResources().getString(R.string.title_linked_account, "Google +"));
+                tvActionGoogle.setText(R.string.action_disconnect);
+                tvActionGoogle.setTextColor(getActivity().getResources().getColor(R.color.account_register_blue));
+            } else if ("facebook".equals(socialBinding.getProvider())) {
+                ivFacebook.setImageResource(R.drawable.ic_facebook);
+                tvNameFacebook.setText(socialBinding.getFirstName() + " " + socialBinding.getLastName());
+                tvNameFacebook.setVisibility(View.VISIBLE);
+                tvStatusFacebook.setText(getResources().getString(R.string.title_linked_account, "Facebook"));
+                tvActionFacebook.setText(R.string.action_disconnect);
+                tvActionFacebook.setTextColor(getActivity().getResources().getColor(R.color.account_register_blue));
+            } else if ("twitter".equals(socialBinding.getProvider())) {
+                ivTwitter.setImageResource(R.drawable.ic_twitter);
+                tvNameTwitter.setText(socialBinding.getFirstName() + " " + socialBinding.getLastName());
+                tvNameTwitter.setVisibility(View.VISIBLE);
+                tvStatusTwitter.setText(getResources().getString(R.string.title_linked_account, "Twitter"));
+                tvActionTwitter.setText(R.string.action_disconnect);
+                tvActionTwitter.setTextColor(getActivity().getResources().getColor(R.color.account_register_blue));
+            }
+        }
+    }
+
+    private void clearSocial() {
+        ivGoogle.setImageResource(R.drawable.ic_google_plus_disabled);
+        tvNameGoogle.setVisibility(View.GONE);
+        tvStatusGoogle.setText(R.string.title_not_linked_account);
+        tvActionGoogle.setText(R.string.action_connect);
+
+        ivFacebook.setImageResource(R.drawable.ic_facebook_disabled);
+        tvNameFacebook.setVisibility(View.GONE);
+        tvStatusFacebook.setText(R.string.title_not_linked_account);
+        tvActionFacebook.setText(R.string.action_connect);
+
+        ivTwitter.setImageResource(R.drawable.ic_twitter_disabled);
+        tvNameTwitter.setVisibility(View.GONE);
+        tvStatusTwitter.setText(R.string.title_not_linked_account);
+        tvActionTwitter.setText(R.string.action_connect);
+    }
+
+    private void setupEmailList(List<EmailDTO> emails) {
+        emailAdapter.setItems(emails);
+        emailAdapter.notifyDataSetChanged();
+    }
+
+    private void subscribeForXabberAccount() {
+        compositeSubscription.add(XabberAccountManager.getInstance().subscribeForAccount()
+            .subscribeOn(Schedulers.io())
+            .observeOn(AndroidSchedulers.mainThread())
+            .doOnNext(new Action1<XabberAccount>() {
+                @Override
+                public void call(XabberAccount account) {
+                    setupSocial(account.getSocialBindings());
+                    setupEmailList(account.getEmails());
+                }
+            }).subscribe());
+    }
+
+}
diff --git a/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountSignUpFragment4.java b/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountSignUpFragment4.java
index 3783a18472..e8fd413ba9 100644
--- a/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountSignUpFragment4.java
+++ b/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountSignUpFragment4.java
@@ -1,16 +1,26 @@
 package com.xabber.android.ui.fragment;
 
 import android.app.Fragment;
+import android.app.FragmentTransaction;
+import android.content.Context;
 import android.os.Bundle;
 import android.support.annotation.Nullable;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.Button;
 
 import com.xabber.android.R;
 
 public class XAccountSignUpFragment4 extends Fragment {
 
+    private Button btnStart;
+    private Listener listener;
+
+    public interface Listener {
+        void onStep4Completed();
+    }
+
     public static XAccountSignUpFragment4 newInstance() {
         XAccountSignUpFragment4 fragment = new XAccountSignUpFragment4();
         return fragment;
@@ -22,4 +32,33 @@ public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container,
         return inflater.inflate(R.layout.fragment_xaccount_signup_4, container, false);
     }
 
+    @Override
+    public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
+
+        btnStart = view.findViewById(R.id.btnStart);
+        btnStart.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                listener.onStep4Completed();
+            }
+        });
+
+        Fragment linksFragment = XAccountLinksFragment.newInstance();
+        FragmentTransaction transaction = getFragmentManager().beginTransaction();
+        transaction.replace(R.id.childContainer, linksFragment).commit();
+    }
+
+    @Override
+    public void onAttach(Context context) {
+        super.onAttach(context);
+        if (context instanceof Listener) listener = (Listener) context;
+        else throw new RuntimeException(context.toString()
+                    + " must implement XAccountSignUpFragment4.Listener");
+    }
+
+    @Override
+    public void onDetach() {
+        super.onDetach();
+        listener = null;
+    }
 }
diff --git a/xabber/src/main/res/layout/fragment_xaccount_links.xml b/xabber/src/main/res/layout/fragment_xaccount_links.xml
new file mode 100644
index 0000000000..eaf9d5a8be
--- /dev/null
+++ b/xabber/src/main/res/layout/fragment_xaccount_links.xml
@@ -0,0 +1,242 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <LinearLayout
+        android:id="@+id/itemGoogle"
+        android:layout_width="match_parent"
+        android:layout_height="48dp"
+        android:paddingLeft="18dp"
+        android:paddingRight="16dp"
+        android:clickable="true"
+        android:background="?android:attr/selectableItemBackground"
+        >
+
+        <ImageView
+            android:id="@+id/ivGoogle"
+            android:layout_width="36dp"
+            android:layout_height="36dp"
+            android:src="@drawable/ic_google_plus_disabled"
+            android:layout_gravity="center_vertical"
+            />
+
+        <LinearLayout
+            android:orientation="vertical"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:layout_marginLeft="18dp"
+            >
+
+            <TextView
+                android:id="@+id/tvNameGoogle"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical"
+                android:textColor="@color/black_text"
+                tools:text="@tools:sample/full_names"
+                android:visibility="gone"
+                />
+
+            <TextView
+                android:id="@+id/tvStatusGoogle"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical"
+                android:textColor="@color/grey_500"
+                android:text="@string/title_not_linked_account"
+                />
+
+        </LinearLayout>
+
+        <TextView
+            android:id="@+id/tvActionGoogle"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="24dp"
+            android:gravity="right"
+            android:layout_gravity="center_vertical"
+            android:textColor="@color/grey_500"
+            android:text="@string/action_connect"
+            />
+
+    </LinearLayout>
+
+    <LinearLayout
+        android:id="@+id/itemFacebook"
+        android:layout_width="match_parent"
+        android:layout_height="48dp"
+        android:paddingLeft="18dp"
+        android:paddingRight="16dp"
+        android:clickable="true"
+        android:background="?android:attr/selectableItemBackground"
+        >
+
+        <ImageView
+            android:id="@+id/ivFacebook"
+            android:layout_width="36dp"
+            android:layout_height="36dp"
+            android:src="@drawable/ic_facebook_disabled"
+            android:layout_gravity="center_vertical"
+            />
+
+        <LinearLayout
+            android:orientation="vertical"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:layout_marginLeft="18dp"
+            >
+
+            <TextView
+                android:id="@+id/tvNameFacebook"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical"
+                android:textColor="@color/black_text"
+                tools:text="@tools:sample/full_names"
+                android:visibility="gone"
+                />
+
+            <TextView
+                android:id="@+id/tvStatusFacebook"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical"
+                android:textColor="@color/grey_500"
+                android:text="@string/title_not_linked_account"
+                />
+
+        </LinearLayout>
+
+        <TextView
+            android:id="@+id/tvActionFacebook"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="24dp"
+            android:layout_gravity="center_vertical"
+            android:gravity="right"
+            android:textColor="@color/grey_500"
+            android:text="@string/action_connect"
+            />
+
+    </LinearLayout>
+
+    <LinearLayout
+        android:id="@+id/itemTwitter"
+        android:layout_width="match_parent"
+        android:layout_height="48dp"
+        android:paddingLeft="18dp"
+        android:paddingRight="16dp"
+        android:clickable="true"
+        android:background="?android:attr/selectableItemBackground"
+        >
+
+        <ImageView
+            android:id="@+id/ivTwitter"
+            android:layout_width="36dp"
+            android:layout_height="36dp"
+            android:src="@drawable/ic_twitter_disabled"
+            android:layout_gravity="center_vertical"
+            />
+
+        <LinearLayout
+            android:orientation="vertical"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:layout_marginLeft="18dp"
+            >
+
+            <TextView
+                android:id="@+id/tvNameTwitter"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical"
+                android:textColor="@color/black_text"
+                tools:text="@tools:sample/full_names"
+                android:visibility="gone"
+                />
+
+            <TextView
+                android:id="@+id/tvStatusTwitter"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical"
+                android:textColor="@color/grey_500"
+                android:text="@string/title_not_linked_account"
+                />
+
+        </LinearLayout>
+
+        <TextView
+            android:id="@+id/tvActionTwitter"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:gravity="right"
+            android:layout_marginLeft="24dp"
+            android:textColor="@color/grey_500"
+            android:text="@string/action_connect"
+            />
+
+    </LinearLayout>
+
+    <LinearLayout
+        android:orientation="vertical"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <android.support.v7.widget.RecyclerView
+            android:id="@+id/rvEmails"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:nestedScrollingEnabled="false"
+            tools:listitem="@layout/item_email"
+            />
+
+        <LinearLayout
+            android:id="@+id/viewAddEmail"
+            android:layout_width="match_parent"
+            android:layout_height="48dp"
+            android:paddingLeft="18dp"
+            android:paddingRight="16dp"
+            android:clickable="true"
+            android:background="?android:attr/selectableItemBackground"
+            >
+
+            <ImageView
+                android:layout_width="36dp"
+                android:layout_height="36dp"
+                android:src="@drawable/ic_add_email_circle"
+                android:layout_gravity="center_vertical"
+                />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical"
+                android:layout_marginLeft="18dp"
+                android:textColor="@color/grey_500"
+                android:text="@string/title_add_email"
+                />
+
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical"
+                android:gravity="right"
+                android:layout_marginLeft="24dp"
+                android:textColor="@color/grey_500"
+                android:text="@string/action_connect"
+                />
+
+        </LinearLayout>
+
+    </LinearLayout>
+
+
+</LinearLayout>
\ No newline at end of file
diff --git a/xabber/src/main/res/layout/fragment_xaccount_signup_4.xml b/xabber/src/main/res/layout/fragment_xaccount_signup_4.xml
index a9eadddbfb..7e40120832 100644
--- a/xabber/src/main/res/layout/fragment_xaccount_signup_4.xml
+++ b/xabber/src/main/res/layout/fragment_xaccount_signup_4.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
     android:orientation="vertical"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
@@ -40,185 +39,11 @@
             android:layout_marginBottom="16dp"
             />
 
-        <LinearLayout
-            android:id="@+id/itemGoogle"
+        <FrameLayout
+            android:id="@+id/childContainer"
             android:layout_width="match_parent"
-            android:layout_height="48dp"
-            android:paddingLeft="18dp"
-            android:paddingRight="16dp"
-            android:clickable="true"
-            android:background="?android:attr/selectableItemBackground"
-            >
-
-            <ImageView
-                android:id="@+id/ivGoogle"
-                android:layout_width="36dp"
-                android:layout_height="36dp"
-                android:src="@drawable/ic_google_plus_disabled"
-                android:layout_gravity="center_vertical"
-                />
-
-            <LinearLayout
-                android:orientation="vertical"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_vertical"
-                android:layout_marginLeft="18dp"
-                >
-
-                <TextView
-                    android:id="@+id/tvNameGoogle"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center_vertical"
-                    android:textColor="@color/black_text"
-                    tools:text="@tools:sample/full_names"
-                    android:visibility="gone"
-                    />
-
-                <TextView
-                    android:id="@+id/tvStatusGoogle"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center_vertical"
-                    android:textColor="@color/grey_500"
-                    android:text="@string/title_not_linked_account"
-                    />
-
-            </LinearLayout>
-
-            <TextView
-                android:id="@+id/tvActionGoogle"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginLeft="24dp"
-                android:gravity="right"
-                android:layout_gravity="center_vertical"
-                android:textColor="@color/grey_500"
-                android:text="@string/action_connect"
-                />
-
-        </LinearLayout>
-
-        <LinearLayout
-            android:id="@+id/itemFacebook"
-            android:layout_width="match_parent"
-            android:layout_height="48dp"
-            android:paddingLeft="18dp"
-            android:paddingRight="16dp"
-            android:clickable="true"
-            android:background="?android:attr/selectableItemBackground"
-            >
-
-            <ImageView
-                android:id="@+id/ivFacebook"
-                android:layout_width="36dp"
-                android:layout_height="36dp"
-                android:src="@drawable/ic_facebook_disabled"
-                android:layout_gravity="center_vertical"
-                />
-
-            <LinearLayout
-                android:orientation="vertical"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_vertical"
-                android:layout_marginLeft="18dp"
-                >
-
-                <TextView
-                    android:id="@+id/tvNameFacebook"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center_vertical"
-                    android:textColor="@color/black_text"
-                    tools:text="@tools:sample/full_names"
-                    android:visibility="gone"
-                    />
-
-                <TextView
-                    android:id="@+id/tvStatusFacebook"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center_vertical"
-                    android:textColor="@color/grey_500"
-                    android:text="@string/title_not_linked_account"
-                    />
-
-            </LinearLayout>
-
-            <TextView
-                android:id="@+id/tvActionFacebook"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginLeft="24dp"
-                android:layout_gravity="center_vertical"
-                android:gravity="right"
-                android:textColor="@color/grey_500"
-                android:text="@string/action_connect"
-                />
-
-        </LinearLayout>
-
-        <LinearLayout
-            android:id="@+id/itemTwitter"
-            android:layout_width="match_parent"
-            android:layout_height="48dp"
-            android:paddingLeft="18dp"
-            android:paddingRight="16dp"
-            android:clickable="true"
-            android:background="?android:attr/selectableItemBackground"
-            >
-
-            <ImageView
-                android:id="@+id/ivTwitter"
-                android:layout_width="36dp"
-                android:layout_height="36dp"
-                android:src="@drawable/ic_twitter_disabled"
-                android:layout_gravity="center_vertical"
-                />
-
-            <LinearLayout
-                android:orientation="vertical"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_vertical"
-                android:layout_marginLeft="18dp"
-                >
-
-                <TextView
-                    android:id="@+id/tvNameTwitter"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center_vertical"
-                    android:textColor="@color/black_text"
-                    tools:text="@tools:sample/full_names"
-                    android:visibility="gone"
-                    />
-
-                <TextView
-                    android:id="@+id/tvStatusTwitter"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center_vertical"
-                    android:textColor="@color/grey_500"
-                    android:text="@string/title_not_linked_account"
-                    />
-
-            </LinearLayout>
-
-            <TextView
-                android:id="@+id/tvActionTwitter"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_vertical"
-                android:gravity="right"
-                android:layout_marginLeft="24dp"
-                android:textColor="@color/grey_500"
-                android:text="@string/action_connect"
-                />
-
-        </LinearLayout>
+            android:layout_height="match_parent"
+            />
 
         <RelativeLayout
             android:layout_marginTop="16dp"
@@ -227,7 +52,7 @@
             android:layout_height="wrap_content">
 
             <Button
-                android:id="@+id/btnSignUp"
+                android:id="@+id/btnStart"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 style="@style/Widget.AppCompat.Button.Colored"

From 9289cb8a2240ea3f345d28ace619f3c872f184c6 Mon Sep 17 00:00:00 2001
From: Valery Miller <valera_miller94@mail.ru>
Date: Thu, 20 Sep 2018 15:22:58 +0500
Subject: [PATCH 107/251] Work on new signup screens

---
 .../ui/activity/BaseLoginActivity.java        |  41 ++-
 .../ui/activity/XabberAccountActivity.java    |  37 ---
 .../ui/activity/XabberLoginActivity.java      |  41 +--
 .../fragment/XabberAccountInfoFragment.java   | 174 +------------
 .../res/layout/fragment_xaccount_info.xml     | 235 +-----------------
 5 files changed, 49 insertions(+), 479 deletions(-)

diff --git a/xabber/src/main/java/com/xabber/android/ui/activity/BaseLoginActivity.java b/xabber/src/main/java/com/xabber/android/ui/activity/BaseLoginActivity.java
index 8d31045a63..a0cd3fbd6c 100644
--- a/xabber/src/main/java/com/xabber/android/ui/activity/BaseLoginActivity.java
+++ b/xabber/src/main/java/com/xabber/android/ui/activity/BaseLoginActivity.java
@@ -39,6 +39,7 @@
 import com.xabber.android.data.xaccount.XMPPAccountSettings;
 import com.xabber.android.data.xaccount.XabberAccount;
 import com.xabber.android.data.xaccount.XabberAccountManager;
+import com.xabber.android.ui.fragment.XAccountLinksFragment;
 import com.xabber.android.utils.RetrofitErrorConverter;
 
 import java.io.IOException;
@@ -56,7 +57,8 @@
  * Created by valery.miller on 31.07.17.
  */
 
-public abstract class BaseLoginActivity extends ManagedActivity implements GoogleApiClient.OnConnectionFailedListener {
+public abstract class BaseLoginActivity extends ManagedActivity implements
+        GoogleApiClient.OnConnectionFailedListener, XAccountLinksFragment.Listener  {
 
     private final static String LOG_TAG = BaseLoginActivity.class.getSimpleName();
 
@@ -492,4 +494,41 @@ public void call(Throwable throwable) {
                 });
         compositeSubscription.add(unbindSocialSubscription);
     }
+
+    /** XABBER ACCOUNT LINKS LISTENER */
+
+    @Override
+    public void onSocialBindClick(String provider) {
+        switch (provider) {
+            case AuthManager.PROVIDER_GOOGLE:
+                loginGoogle();
+                break;
+            case AuthManager.PROVIDER_FACEBOOK:
+                loginFacebook();
+                break;
+            case AuthManager.PROVIDER_TWITTER:
+                loginTwitter();
+                break;
+        }
+    }
+
+    @Override
+    public void onSocialUnbindClick(String provider) {
+        unbindSocial(provider);
+    }
+
+    @Override
+    public void onAddEmailClick(String email) {
+        resendConfirmEmail(email);
+    }
+
+    @Override
+    public void onDeleteEmailClick(int emailId) {
+        deleteEmail(emailId);
+    }
+
+    @Override
+    public void onConfirmEmailClick(String email, String code) {
+        confirmEmail(code);
+    }
 }
diff --git a/xabber/src/main/java/com/xabber/android/ui/activity/XabberAccountActivity.java b/xabber/src/main/java/com/xabber/android/ui/activity/XabberAccountActivity.java
index 6b72705325..443f9af5c7 100644
--- a/xabber/src/main/java/com/xabber/android/ui/activity/XabberAccountActivity.java
+++ b/xabber/src/main/java/com/xabber/android/ui/activity/XabberAccountActivity.java
@@ -137,31 +137,11 @@ protected void hideProgress() {
 
     /** Social Auth */
 
-    @Override
-    public void onSocialBindClick(String provider) {
-        switch (provider) {
-            case AuthManager.PROVIDER_GOOGLE:
-                loginGoogle();
-                break;
-            case AuthManager.PROVIDER_FACEBOOK:
-                loginFacebook();
-                break;
-            case AuthManager.PROVIDER_TWITTER:
-                loginTwitter();
-                break;
-        }
-    }
-
     @Override
     protected void onSocialAuthSuccess(String provider, String credentials) {
         bindSocial(provider, credentials);
     }
 
-    @Override
-    public void onSocialUnbindClick(String provider) {
-        unbindSocial(provider);
-    }
-
     /** Xabber Account Info */
 
     @Override
@@ -180,23 +160,6 @@ public void onSyncClick(boolean needGoToMainActivity) {
             Toast.makeText(this, R.string.toast_no_internet, Toast.LENGTH_LONG).show();
     }
 
-    /** Email */
-
-    @Override
-    public void onAddEmailClick(String email) {
-        resendConfirmEmail(email);
-    }
-
-    @Override
-    public void onDeleteEmailClick(int emailId) {
-        deleteEmail(emailId);
-    }
-
-    @Override
-    public void onConfirmEmailClick(String email, String code) {
-        confirmEmail(code);
-    }
-
     private void showInfoFragment() {
         if (fragmentInfo == null) {
             fragmentInfo = XabberAccountInfoFragment.newInstance(this);
diff --git a/xabber/src/main/java/com/xabber/android/ui/activity/XabberLoginActivity.java b/xabber/src/main/java/com/xabber/android/ui/activity/XabberLoginActivity.java
index fd7a25041d..b82fc6390b 100644
--- a/xabber/src/main/java/com/xabber/android/ui/activity/XabberLoginActivity.java
+++ b/xabber/src/main/java/com/xabber/android/ui/activity/XabberLoginActivity.java
@@ -28,7 +28,6 @@
 import com.xabber.android.data.xaccount.XabberAccountManager;
 import com.xabber.android.presentation.mvp.signup.SignUpRepo;
 import com.xabber.android.ui.color.BarPainter;
-import com.xabber.android.ui.fragment.XAccountLinksFragment;
 import com.xabber.android.ui.fragment.XAccountLoginFragment;
 import com.xabber.android.ui.fragment.XAccountSignUpFragment1;
 import com.xabber.android.ui.fragment.XAccountSignUpFragment2;
@@ -52,8 +51,7 @@
 
 public class XabberLoginActivity extends BaseLoginActivity implements XAccountSignUpFragment1.Listener,
         XAccountSignUpFragment2.Listener, XAccountLoginFragment.Listener,
-        XAccountSignUpFragment3.Listener, XAccountSignUpFragment4.Listener,
-        XAccountLinksFragment.Listener {
+        XAccountSignUpFragment3.Listener, XAccountSignUpFragment4.Listener {
 
     private final static String LOG_TAG = XabberLoginActivity.class.getSimpleName();
     public final static String CURRENT_FRAGMENT = "current_fragment";
@@ -295,43 +293,6 @@ public void onTwitterClick() {
         loginTwitter();
     }
 
-    /** Xabber Account Links callbacks */
-
-    @Override
-    public void onSocialBindClick(String provider) {
-        switch (provider) {
-            case AuthManager.PROVIDER_GOOGLE:
-                loginGoogle();
-                break;
-            case AuthManager.PROVIDER_FACEBOOK:
-                loginFacebook();
-                break;
-            case AuthManager.PROVIDER_TWITTER:
-                loginTwitter();
-                break;
-        }
-    }
-
-    @Override
-    public void onSocialUnbindClick(String provider) {
-        unbindSocial(provider);
-    }
-
-    @Override
-    public void onAddEmailClick(String email) {
-        resendConfirmEmail(email);
-    }
-
-    @Override
-    public void onDeleteEmailClick(int emailId) {
-        deleteEmail(emailId);
-    }
-
-    @Override
-    public void onConfirmEmailClick(String email, String code) {
-        confirmEmail(code);
-    }
-
     /** GET HOSTS */
 
     private void getHosts() {
diff --git a/xabber/src/main/java/com/xabber/android/ui/fragment/XabberAccountInfoFragment.java b/xabber/src/main/java/com/xabber/android/ui/fragment/XabberAccountInfoFragment.java
index c88efcac29..3461c9c856 100644
--- a/xabber/src/main/java/com/xabber/android/ui/fragment/XabberAccountInfoFragment.java
+++ b/xabber/src/main/java/com/xabber/android/ui/fragment/XabberAccountInfoFragment.java
@@ -5,29 +5,21 @@
 import android.os.Bundle;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ImageView;
-import android.widget.LinearLayout;
 import android.widget.TextView;
 import android.widget.Toast;
 
 import com.xabber.android.BuildConfig;
 import com.xabber.android.R;
 import com.xabber.android.data.xaccount.AuthManager;
-import com.xabber.android.data.xaccount.EmailDTO;
-import com.xabber.android.data.xaccount.SocialBindingDTO;
 import com.xabber.android.data.xaccount.XMPPAccountSettings;
 import com.xabber.android.data.xaccount.XabberAccount;
 import com.xabber.android.data.xaccount.XabberAccountManager;
-import com.xabber.android.ui.adapter.EmailAdapter;
 import com.xabber.android.ui.dialog.AccountSyncDialogFragment;
-import com.xabber.android.ui.dialog.AddEmailDialogFragment;
-import com.xabber.android.ui.dialog.ConfirmEmailDialogFragment;
 import com.xabber.android.utils.RetrofitErrorConverter;
 
 import java.util.List;
@@ -42,8 +34,7 @@
  * Created by valery.miller on 27.07.17.
  */
 
-public class XabberAccountInfoFragment extends Fragment implements AddEmailDialogFragment.Listener,
-        EmailAdapter.Listener, ConfirmEmailDialogFragment.Listener, AccountSyncDialogFragment.Listener {
+public class XabberAccountInfoFragment extends Fragment implements AccountSyncDialogFragment.Listener {
 
     private static final String LOG_TAG = XabberAccountInfoFragment.class.getSimpleName();
 
@@ -52,26 +43,6 @@ public class XabberAccountInfoFragment extends Fragment implements AddEmailDialo
     private TextView tvLanguage;
     private TextView tvPhone;
 
-    private ImageView ivGoogle;
-    private TextView tvNameGoogle;
-    private TextView tvStatusGoogle;
-    private TextView tvActionGoogle;
-    private LinearLayout itemGoogle;
-    private ImageView ivFacebook;
-    private TextView tvNameFacebook;
-    private TextView tvStatusFacebook;
-    private TextView tvActionFacebook;
-    private LinearLayout itemFacebook;
-    private ImageView ivTwitter;
-    private TextView tvNameTwitter;
-    private TextView tvStatusTwitter;
-    private TextView tvActionTwitter;
-    private LinearLayout itemTwitter;
-
-    private RecyclerView rvEmails;
-    private EmailAdapter emailAdapter;
-    private View viewAddEmail;
-
     private TextView tvLinks;
     private View viewShowLinks;
     private View viewLinks;
@@ -85,11 +56,6 @@ public class XabberAccountInfoFragment extends Fragment implements AddEmailDialo
     private Listener listener;
 
     public interface Listener {
-        void onSocialBindClick(String provider);
-        void onSocialUnbindClick(String provider);
-        void onAddEmailClick(String email);
-        void onDeleteEmailClick(int emailId);
-        void onConfirmEmailClick(String email, String code);
         void onLogoutClick(boolean deleteAccounts);
         void onSyncClick(boolean needGoToMainActivity);
     }
@@ -130,60 +96,9 @@ public void onClick(View v) {
             }
         });
 
-        tvStatusGoogle = view.findViewById(R.id.tvStatusGoogle);
-        ivGoogle = view.findViewById(R.id.ivGoogle);
-        tvNameGoogle = view.findViewById(R.id.tvNameGoogle);
-        tvActionGoogle = view.findViewById(R.id.tvActionGoogle);
-        itemGoogle = view.findViewById(R.id.itemGoogle);
-        itemGoogle.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                if (tvActionGoogle.getText().equals(getString(R.string.action_connect)))
-                    listener.onSocialBindClick(AuthManager.PROVIDER_GOOGLE);
-                else listener.onSocialUnbindClick(AuthManager.PROVIDER_GOOGLE);
-            }
-        });
-
-        tvStatusFacebook = view.findViewById(R.id.tvStatusFacebook);
-        ivFacebook = view.findViewById(R.id.ivFacebook);
-        tvNameFacebook = view.findViewById(R.id.tvNameFacebook);
-        tvActionFacebook = view.findViewById(R.id.tvActionFacebook);
-        itemFacebook = view.findViewById(R.id.itemFacebook);
-        itemFacebook.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                if (tvActionFacebook.getText().equals(getString(R.string.action_connect)))
-                    listener.onSocialBindClick(AuthManager.PROVIDER_FACEBOOK);
-                else listener.onSocialUnbindClick(AuthManager.PROVIDER_FACEBOOK);
-            }
-        });
-
-        tvStatusTwitter = view.findViewById(R.id.tvStatusTwitter);
-        ivTwitter = view.findViewById(R.id.ivTwitter);
-        tvNameTwitter = view.findViewById(R.id.tvNameTwitter);
-        tvActionTwitter = view.findViewById(R.id.tvActionTwitter);
-        itemTwitter = view.findViewById(R.id.itemTwitter);
-        itemTwitter.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                if (tvActionTwitter.getText().equals(getString(R.string.action_connect)))
-                    listener.onSocialBindClick(AuthManager.PROVIDER_TWITTER);
-                else listener.onSocialUnbindClick(AuthManager.PROVIDER_TWITTER);
-            }
-        });
-
-        rvEmails = view.findViewById(R.id.rvEmails);
-        rvEmails.setLayoutManager(new LinearLayoutManager(getActivity()));
-        emailAdapter = new EmailAdapter(this);
-        rvEmails.setAdapter(emailAdapter);
-        viewAddEmail = view.findViewById(R.id.viewAddEmail);
-        viewAddEmail.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                AddEmailDialogFragment.newInstance(XabberAccountInfoFragment.this)
-                        .show(getFragmentManager(), AccountSyncDialogFragment.class.getSimpleName());
-            }
-        });
+        Fragment linksFragment = XAccountLinksFragment.newInstance();
+        FragmentTransaction transaction = getFragmentManager().beginTransaction();
+        transaction.replace(R.id.accountLinksFrame, linksFragment).commit();
     }
 
     @Override
@@ -205,32 +120,6 @@ public void onDestroy() {
         compositeSubscription.clear();
     }
 
-    @Override
-    public void onAddEmailClick(String email) {
-        listener.onAddEmailClick(email);
-    }
-
-    @Override
-    public void onEmailVerifyClick(String email) {
-        ConfirmEmailDialogFragment.newInstance(this, email)
-                .show(getFragmentManager(), AccountSyncDialogFragment.class.getSimpleName());
-    }
-
-    @Override
-    public void onEmailDeleteClick(int id) {
-        listener.onDeleteEmailClick(id);
-    }
-
-    @Override
-    public void onResendCodeClick(String email) {
-        listener.onAddEmailClick(email);
-    }
-
-    @Override
-    public void onConfirmClick(String email, String code) {
-        listener.onConfirmEmailClick(email, code);
-    }
-
     @Override
     public void onSyncClick(boolean needGoToMainActivity) {
         listener.onSyncClick(needGoToMainActivity);
@@ -252,9 +141,6 @@ public void updateData(@NonNull XabberAccount account) {
             String phone = account.getPhone();
             tvPhone.setText(phone != null ? phone : getString(R.string.no_phone));
         } else tvPhone.setVisibility(View.GONE);
-
-        setupSocial(account.getSocialBindings());
-        setupEmailList(account.getEmails());
     }
 
     public void updateLastSyncTime() {
@@ -317,56 +203,4 @@ private void handleErrorGetSettings(Throwable throwable) {
             Toast.makeText(getActivity(), R.string.sync_fail, Toast.LENGTH_LONG).show();
         }
     }
-
-    private void setupSocial(List<SocialBindingDTO> socialBindings) {
-        clearSocial();
-        for (SocialBindingDTO socialBinding : socialBindings) {
-            if ("google".equals(socialBinding.getProvider())) {
-                ivGoogle.setImageResource(R.drawable.ic_google_plus);
-                tvNameGoogle.setText(socialBinding.getFirstName() + " " + socialBinding.getLastName());
-                tvNameGoogle.setVisibility(View.VISIBLE);
-                tvStatusGoogle.setText(getResources().getString(R.string.title_linked_account, "Google +"));
-                tvActionGoogle.setText(R.string.action_disconnect);
-                tvActionGoogle.setTextColor(getActivity().getResources().getColor(R.color.account_register_blue));
-            } else if ("facebook".equals(socialBinding.getProvider())) {
-                ivFacebook.setImageResource(R.drawable.ic_facebook);
-                tvNameFacebook.setText(socialBinding.getFirstName() + " " + socialBinding.getLastName());
-                tvNameFacebook.setVisibility(View.VISIBLE);
-                tvStatusFacebook.setText(getResources().getString(R.string.title_linked_account, "Facebook"));
-                tvActionFacebook.setText(R.string.action_disconnect);
-                tvActionFacebook.setTextColor(getActivity().getResources().getColor(R.color.account_register_blue));
-            } else if ("twitter".equals(socialBinding.getProvider())) {
-                ivTwitter.setImageResource(R.drawable.ic_twitter);
-                tvNameTwitter.setText(socialBinding.getFirstName() + " " + socialBinding.getLastName());
-                tvNameTwitter.setVisibility(View.VISIBLE);
-                tvStatusTwitter.setText(getResources().getString(R.string.title_linked_account, "Twitter"));
-                tvActionTwitter.setText(R.string.action_disconnect);
-                tvActionTwitter.setTextColor(getActivity().getResources().getColor(R.color.account_register_blue));
-            }
-        }
-        if (socialBindings.size() > 0) tvLinks.setText(R.string.title_linked_accounts);
-    }
-
-    private void clearSocial() {
-        ivGoogle.setImageResource(R.drawable.ic_google_plus_disabled);
-        tvNameGoogle.setVisibility(View.GONE);
-        tvStatusGoogle.setText(R.string.title_not_linked_account);
-        tvActionGoogle.setText(R.string.action_connect);
-
-        ivFacebook.setImageResource(R.drawable.ic_facebook_disabled);
-        tvNameFacebook.setVisibility(View.GONE);
-        tvStatusFacebook.setText(R.string.title_not_linked_account);
-        tvActionFacebook.setText(R.string.action_connect);
-
-        ivTwitter.setImageResource(R.drawable.ic_twitter_disabled);
-        tvNameTwitter.setVisibility(View.GONE);
-        tvStatusTwitter.setText(R.string.title_not_linked_account);
-        tvActionTwitter.setText(R.string.action_connect);
-    }
-
-    private void setupEmailList(List<EmailDTO> emails) {
-        if (emails.size() > 0) tvLinks.setText(R.string.title_linked_accounts);
-        emailAdapter.setItems(emails);
-        emailAdapter.notifyDataSetChanged();
-    }
 }
diff --git a/xabber/src/main/res/layout/fragment_xaccount_info.xml b/xabber/src/main/res/layout/fragment_xaccount_info.xml
index 602751a5c8..1f89cb4898 100644
--- a/xabber/src/main/res/layout/fragment_xaccount_info.xml
+++ b/xabber/src/main/res/layout/fragment_xaccount_info.xml
@@ -158,238 +158,11 @@
                 android:paddingBottom="8dp"
                 >
 
-                <LinearLayout
-                    android:id="@+id/itemGoogle"
-                    android:layout_width="match_parent"
-                    android:layout_height="48dp"
-                    android:paddingLeft="18dp"
-                    android:paddingRight="16dp"
-                    android:clickable="true"
-                    android:background="?android:attr/selectableItemBackground"
-                    >
-
-                    <ImageView
-                        android:id="@+id/ivGoogle"
-                        android:layout_width="36dp"
-                        android:layout_height="36dp"
-                        android:src="@drawable/ic_google_plus_disabled"
-                        android:layout_gravity="center_vertical"
-                        />
-
-                    <LinearLayout
-                        android:orientation="vertical"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="center_vertical"
-                        android:layout_marginLeft="18dp"
-                        >
-
-                        <TextView
-                            android:id="@+id/tvNameGoogle"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_gravity="center_vertical"
-                            android:textColor="@color/black_text"
-                            tools:text="@tools:sample/full_names"
-                            android:visibility="gone"
-                            />
-
-                        <TextView
-                            android:id="@+id/tvStatusGoogle"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_gravity="center_vertical"
-                            android:textColor="@color/grey_500"
-                            android:text="@string/title_not_linked_account"
-                            />
-
-                    </LinearLayout>
-
-                    <TextView
-                        android:id="@+id/tvActionGoogle"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_marginLeft="24dp"
-                        android:gravity="right"
-                        android:layout_gravity="center_vertical"
-                        android:textColor="@color/grey_500"
-                        android:text="@string/action_connect"
-                        />
-
-                </LinearLayout>
-
-                <LinearLayout
-                    android:id="@+id/itemFacebook"
-                    android:layout_width="match_parent"
-                    android:layout_height="48dp"
-                    android:paddingLeft="18dp"
-                    android:paddingRight="16dp"
-                    android:clickable="true"
-                    android:background="?android:attr/selectableItemBackground"
-                    >
-
-                    <ImageView
-                        android:id="@+id/ivFacebook"
-                        android:layout_width="36dp"
-                        android:layout_height="36dp"
-                        android:src="@drawable/ic_facebook_disabled"
-                        android:layout_gravity="center_vertical"
-                        />
-
-                    <LinearLayout
-                        android:orientation="vertical"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="center_vertical"
-                        android:layout_marginLeft="18dp"
-                        >
-
-                        <TextView
-                            android:id="@+id/tvNameFacebook"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_gravity="center_vertical"
-                            android:textColor="@color/black_text"
-                            tools:text="@tools:sample/full_names"
-                            android:visibility="gone"
-                            />
-
-                        <TextView
-                            android:id="@+id/tvStatusFacebook"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_gravity="center_vertical"
-                            android:textColor="@color/grey_500"
-                            android:text="@string/title_not_linked_account"
-                            />
-
-                    </LinearLayout>
-
-                    <TextView
-                        android:id="@+id/tvActionFacebook"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_marginLeft="24dp"
-                        android:layout_gravity="center_vertical"
-                        android:gravity="right"
-                        android:textColor="@color/grey_500"
-                        android:text="@string/action_connect"
-                        />
-
-                </LinearLayout>
-
-                <LinearLayout
-                    android:id="@+id/itemTwitter"
-                    android:layout_width="match_parent"
-                    android:layout_height="48dp"
-                    android:paddingLeft="18dp"
-                    android:paddingRight="16dp"
-                    android:clickable="true"
-                    android:background="?android:attr/selectableItemBackground"
-                    >
-
-                    <ImageView
-                        android:id="@+id/ivTwitter"
-                        android:layout_width="36dp"
-                        android:layout_height="36dp"
-                        android:src="@drawable/ic_twitter_disabled"
-                        android:layout_gravity="center_vertical"
-                        />
-
-                    <LinearLayout
-                        android:orientation="vertical"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="center_vertical"
-                        android:layout_marginLeft="18dp"
-                        >
-
-                        <TextView
-                            android:id="@+id/tvNameTwitter"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_gravity="center_vertical"
-                            android:textColor="@color/black_text"
-                            tools:text="@tools:sample/full_names"
-                            android:visibility="gone"
-                            />
-
-                        <TextView
-                            android:id="@+id/tvStatusTwitter"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_gravity="center_vertical"
-                            android:textColor="@color/grey_500"
-                            android:text="@string/title_not_linked_account"
-                            />
-
-                    </LinearLayout>
-
-                    <TextView
-                        android:id="@+id/tvActionTwitter"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="center_vertical"
-                        android:gravity="right"
-                        android:layout_marginLeft="24dp"
-                        android:textColor="@color/grey_500"
-                        android:text="@string/action_connect"
-                        />
-
-                </LinearLayout>
-
-                <LinearLayout
-                    android:orientation="vertical"
+                <FrameLayout
+                    android:id="@+id/accountLinksFrame"
                     android:layout_width="match_parent"
-                    android:layout_height="match_parent">
-
-                    <android.support.v7.widget.RecyclerView
-                        android:id="@+id/rvEmails"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:nestedScrollingEnabled="false"
-                        tools:listitem="@layout/item_email"
-                        />
-
-                    <LinearLayout
-                        android:id="@+id/viewAddEmail"
-                        android:layout_width="match_parent"
-                        android:layout_height="48dp"
-                        android:paddingLeft="18dp"
-                        android:paddingRight="16dp"
-                        android:clickable="true"
-                        android:background="?android:attr/selectableItemBackground"
-                        >
-
-                        <ImageView
-                            android:layout_width="36dp"
-                            android:layout_height="36dp"
-                            android:src="@drawable/ic_add_email_circle"
-                            android:layout_gravity="center_vertical"
-                            />
-
-                        <TextView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_gravity="center_vertical"
-                            android:layout_marginLeft="18dp"
-                            android:textColor="@color/grey_500"
-                            android:text="@string/title_add_email"
-                            />
-
-                        <TextView
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:layout_gravity="center_vertical"
-                            android:gravity="right"
-                            android:layout_marginLeft="24dp"
-                            android:textColor="@color/grey_500"
-                            android:text="@string/action_connect"
-                            />
-
-                    </LinearLayout>
-
-                </LinearLayout>
+                    android:layout_height="match_parent"
+                    />
 
             </LinearLayout>
 

From 70a3e98d89695b1a7bb949639fc266a9b387cd89 Mon Sep 17 00:00:00 2001
From: Valery Miller <valera_miller94@mail.ru>
Date: Thu, 20 Sep 2018 15:42:17 +0500
Subject: [PATCH 108/251] Work on new signup screens

---
 .../ui/activity/XabberAccountActivity.java    |  8 ++--
 .../fragment/XabberAccountInfoFragment.java   | 48 +++++++++----------
 2 files changed, 27 insertions(+), 29 deletions(-)

diff --git a/xabber/src/main/java/com/xabber/android/ui/activity/XabberAccountActivity.java b/xabber/src/main/java/com/xabber/android/ui/activity/XabberAccountActivity.java
index 443f9af5c7..03c04bf96a 100644
--- a/xabber/src/main/java/com/xabber/android/ui/activity/XabberAccountActivity.java
+++ b/xabber/src/main/java/com/xabber/android/ui/activity/XabberAccountActivity.java
@@ -34,7 +34,7 @@
 import rx.schedulers.Schedulers;
 
 public class XabberAccountActivity extends BaseLoginActivity
-        implements XabberAccountInfoFragment.Listener, Toolbar.OnMenuItemClickListener {
+        implements Toolbar.OnMenuItemClickListener {
 
     private final static String LOG_TAG = XabberAccountActivity.class.getSimpleName();
     private final static String FRAGMENT_INFO = "fragment_info";
@@ -110,7 +110,7 @@ public boolean onMenuItemClick(MenuItem item) {
                 }
                 return true;
             case R.id.action_sync:
-                synchronize(false);
+                onSyncClick(false);
                 return true;
             default:
                 return false;
@@ -144,7 +144,6 @@ protected void onSocialAuthSuccess(String provider, String credentials) {
 
     /** Xabber Account Info */
 
-    @Override
     public void onLogoutClick(boolean deleteAccounts) {
         if (NetworkManager.isNetworkAvailable()) {
             logout(deleteAccounts);
@@ -152,7 +151,6 @@ public void onLogoutClick(boolean deleteAccounts) {
             Toast.makeText(this, R.string.toast_no_internet, Toast.LENGTH_LONG).show();
     }
 
-    @Override
     public void onSyncClick(boolean needGoToMainActivity) {
         if (NetworkManager.isNetworkAvailable()) {
             synchronize(needGoToMainActivity);
@@ -162,7 +160,7 @@ public void onSyncClick(boolean needGoToMainActivity) {
 
     private void showInfoFragment() {
         if (fragmentInfo == null) {
-            fragmentInfo = XabberAccountInfoFragment.newInstance(this);
+            fragmentInfo = XabberAccountInfoFragment.newInstance();
             Bundle bundle = new Bundle();
             bundle.putBoolean("SHOW_SYNC", needShowSyncDialog);
             fragmentInfo.setArguments(bundle);
diff --git a/xabber/src/main/java/com/xabber/android/ui/fragment/XabberAccountInfoFragment.java b/xabber/src/main/java/com/xabber/android/ui/fragment/XabberAccountInfoFragment.java
index 3461c9c856..7f22e5f1cb 100644
--- a/xabber/src/main/java/com/xabber/android/ui/fragment/XabberAccountInfoFragment.java
+++ b/xabber/src/main/java/com/xabber/android/ui/fragment/XabberAccountInfoFragment.java
@@ -19,7 +19,6 @@
 import com.xabber.android.data.xaccount.XMPPAccountSettings;
 import com.xabber.android.data.xaccount.XabberAccount;
 import com.xabber.android.data.xaccount.XabberAccountManager;
-import com.xabber.android.ui.dialog.AccountSyncDialogFragment;
 import com.xabber.android.utils.RetrofitErrorConverter;
 
 import java.util.List;
@@ -34,7 +33,7 @@
  * Created by valery.miller on 27.07.17.
  */
 
-public class XabberAccountInfoFragment extends Fragment implements AccountSyncDialogFragment.Listener {
+public class XabberAccountInfoFragment extends Fragment {
 
     private static final String LOG_TAG = XabberAccountInfoFragment.class.getSimpleName();
 
@@ -53,16 +52,9 @@ public class XabberAccountInfoFragment extends Fragment implements AccountSyncDi
     private FragmentTransaction fTrans;
 
     private CompositeSubscription compositeSubscription = new CompositeSubscription();
-    private Listener listener;
 
-    public interface Listener {
-        void onLogoutClick(boolean deleteAccounts);
-        void onSyncClick(boolean needGoToMainActivity);
-    }
-
-    public static XabberAccountInfoFragment newInstance(Listener listener) {
+    public static XabberAccountInfoFragment newInstance() {
         XabberAccountInfoFragment fragment = new XabberAccountInfoFragment();
-        fragment.listener = listener;
         return fragment;
     }
 
@@ -104,27 +96,16 @@ public void onClick(View v) {
     @Override
     public void onResume() {
         super.onResume();
-
-        XabberAccount account = XabberAccountManager.getInstance().getAccount();
-        if (account != null) {
-            updateData(account);
-        }
-        else getActivity().finish();
-
+        subscribeForXabberAccount();
         getSettings();
     }
 
     @Override
-    public void onDestroy() {
-        super.onDestroy();
+    public void onPause() {
+        super.onPause();
         compositeSubscription.clear();
     }
 
-    @Override
-    public void onSyncClick(boolean needGoToMainActivity) {
-        listener.onSyncClick(needGoToMainActivity);
-    }
-
     public void updateData(@NonNull XabberAccount account) {
         String accountName = account.getFullUsername();
 
@@ -141,6 +122,11 @@ public void updateData(@NonNull XabberAccount account) {
             String phone = account.getPhone();
             tvPhone.setText(phone != null ? phone : getString(R.string.no_phone));
         } else tvPhone.setVisibility(View.GONE);
+
+        // links
+        if (account.getSocialBindings().size() > 0 || account.getEmails().size() > 0)
+            tvLinks.setText(R.string.title_linked_accounts);
+        else tvLinks.setText(R.string.title_no_linked_accounts);
     }
 
     public void updateLastSyncTime() {
@@ -148,6 +134,20 @@ public void updateLastSyncTime() {
             ((AccountSyncFragment) fragmentSync).updateLastSyncTime();
     }
 
+    private void subscribeForXabberAccount() {
+        compositeSubscription.add(XabberAccountManager.getInstance().subscribeForAccount()
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .doOnNext(new Action1<XabberAccount>() {
+                    @Override
+                    public void call(XabberAccount account) {
+                        updateData(account);
+                    }
+                }).subscribe());
+    }
+
+    /** GET SETTINGS */
+
     private void getSettings() {
         showProgressView(true);
         Subscription getSettingsSubscription = AuthManager.getClientSettings()

From aa545c783c3fe386caa611bd70b7b9f3d8fd8b4b Mon Sep 17 00:00:00 2001
From: Valery Miller <valera_miller94@mail.ru>
Date: Thu, 20 Sep 2018 17:05:34 +0500
Subject: [PATCH 109/251] Added handling not available username in signup

---
 .../android/data/xaccount/AuthManager.java    |  5 +--
 .../presentation/mvp/signup/SignUpRepo.java   |  4 ++
 .../ui/activity/XabberLoginActivity.java      | 38 ++++++++++++-------
 .../ui/fragment/XAccountSignUpFragment1.java  |  3 ++
 .../fragment/XabberAccountInfoFragment.java   |  5 ++-
 5 files changed, 35 insertions(+), 20 deletions(-)

diff --git a/xabber/src/main/java/com/xabber/android/data/xaccount/AuthManager.java b/xabber/src/main/java/com/xabber/android/data/xaccount/AuthManager.java
index 04ab1c6baa..c14abb1846 100644
--- a/xabber/src/main/java/com/xabber/android/data/xaccount/AuthManager.java
+++ b/xabber/src/main/java/com/xabber/android/data/xaccount/AuthManager.java
@@ -299,10 +299,7 @@ public Single<? extends XabberAccount> call(XabberAccountDTO xabberAccountDTO) {
     }
 
     public static Single<XabberAccount> signupv2(String username, String host, String password,
-                                                 String provider, String socialToken) {
-
-        Gson gson = new Gson();
-        String credentials = gson.toJson(new AccessToken(socialToken));
+                                                 String provider, String credentials) {
 
         return HttpApiManager.getXabberApi().signupv2(new SignUpFields(username, host,
                 password, provider, credentials))
diff --git a/xabber/src/main/java/com/xabber/android/presentation/mvp/signup/SignUpRepo.java b/xabber/src/main/java/com/xabber/android/presentation/mvp/signup/SignUpRepo.java
index ca6e4f422c..2a3d0a3dfa 100644
--- a/xabber/src/main/java/com/xabber/android/presentation/mvp/signup/SignUpRepo.java
+++ b/xabber/src/main/java/com/xabber/android/presentation/mvp/signup/SignUpRepo.java
@@ -72,4 +72,8 @@ public String getCaptchaToken() {
     public void setCaptchaToken(String captchaToken) {
         this.captchaToken = captchaToken;
     }
+
+    public boolean isCompleted() {
+        return username != null && pass != null && host != null;
+    }
 }
diff --git a/xabber/src/main/java/com/xabber/android/ui/activity/XabberLoginActivity.java b/xabber/src/main/java/com/xabber/android/ui/activity/XabberLoginActivity.java
index b82fc6390b..9d9f32e8fe 100644
--- a/xabber/src/main/java/com/xabber/android/ui/activity/XabberLoginActivity.java
+++ b/xabber/src/main/java/com/xabber/android/ui/activity/XabberLoginActivity.java
@@ -62,6 +62,7 @@ public class XabberLoginActivity extends BaseLoginActivity implements XAccountSi
     public final static String FRAGMENT_SIGNUP_STEP4 = "fragment_signup_step4";
 
     private static final String CAPTCHA_TOKEN = "RECAPTCHA";
+    private static final String ERROR_NAME_NOT_AVAILABLE = "Username is not available.";
 
     private FragmentTransaction fTrans;
     private Fragment fragmentLogin;
@@ -251,7 +252,8 @@ public void onStep1Completed(String username, String host) {
         signUpRepo.setUsername(username);
         signUpRepo.setHost(host);
 
-        showSignUpStep2Fragment();
+        if (signUpRepo.isCompleted()) onStep3Completed();
+        else showSignUpStep2Fragment();
     }
 
     @Override
@@ -262,15 +264,11 @@ public void on2StepCompleted(String pass) {
 
     @Override
     public void onStep3Completed() {
-        String username = SignUpRepo.getInstance().getUsername();
-        String host = SignUpRepo.getInstance().getHost();
-        String pass = SignUpRepo.getInstance().getPass();
-        String provider = SignUpRepo.getInstance().getSocialProvider();
-        String credentials = SignUpRepo.getInstance().getSocialCredentials();
+        SignUpRepo signUpRepo = SignUpRepo.getInstance();
 
-        if (provider != null && credentials != null)
-            signUp(username, host, pass, null, credentials, provider);
-        else getCaptchaToken(username, pass, host);
+        if (signUpRepo.getSocialProvider() != null
+                && signUpRepo.getSocialCredentials() != null) signUp(signUpRepo);
+        else getCaptchaToken(signUpRepo);
     }
 
     @Override
@@ -338,8 +336,14 @@ private void handleErrorGetHosts(Throwable throwable) {
 
     /** SIGN UP */
 
-    private void signUp(String username, String host, String pass, String captchaToken,
-                        String credentials, String socialProvider) {
+    private void signUp(SignUpRepo signUpRepo) {
+        String username = signUpRepo.getUsername();
+        String host = signUpRepo.getHost();
+        String pass = signUpRepo.getPass();
+        String captchaToken = signUpRepo.getCaptchaToken();
+        String credentials = signUpRepo.getSocialCredentials();
+        String socialProvider = signUpRepo.getSocialProvider();
+
         showProgress(getResources().getString(R.string.progress_title_signup));
 
         Single<XabberAccount> signUpSingle;
@@ -365,14 +369,19 @@ public void call(Throwable throwable) {
     }
 
     private void handleSuccessSignUp() {
+        SignUpRepo.getInstance().clearRepo();
         hideProgress();
         synchronize(false);
         showSignUpStep4Fragment();
     }
 
     private void handleErrorSignUp(Throwable throwable) {
+        SignUpRepo.getInstance().setCaptchaToken(null);
         hideProgress();
-        handleError(throwable, "Error while signup: ", LOG_TAG);
+
+        //handleError(throwable, "Error while signup: ", LOG_TAG);
+        String message = RetrofitErrorConverter.throwableToHttpError(throwable);
+        if (ERROR_NAME_NOT_AVAILABLE.equals(message)) showSignUpStep1Fragment();
     }
 
     /** SOCIAL LOGIN */
@@ -455,7 +464,7 @@ private void handleErrorGetAccount(Throwable throwable) {
 
     /** CAPTCHA */
 
-    private void getCaptchaToken(final String username, final String pass, final String domain) {
+    private void getCaptchaToken(final SignUpRepo signUpRepo) {
         SafetyNet.getClient(this).verifyWithRecaptcha(getString(R.string.RECAPTCHA_KEY))
                 .addOnSuccessListener(this,
                         new OnSuccessListener<SafetyNetApi.RecaptchaTokenResponse>() {
@@ -468,7 +477,8 @@ public void onSuccess(SafetyNetApi.RecaptchaTokenResponse response) {
                                     // Validate the user response token using the
                                     // reCAPTCHA siteverify API.
                                     Log.d(CAPTCHA_TOKEN, "Success: " + userResponseToken);
-                                    signUp(username, domain, pass, userResponseToken, null, null);
+                                    signUpRepo.setCaptchaToken(userResponseToken);
+                                    signUp(signUpRepo);
                                 }
                             }
                         })
diff --git a/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountSignUpFragment1.java b/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountSignUpFragment1.java
index dcdfd0b98f..bcddd28b59 100644
--- a/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountSignUpFragment1.java
+++ b/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountSignUpFragment1.java
@@ -86,6 +86,9 @@ public void onResume() {
         super.onResume();
         if (listener != null) listener.onGetHosts();
         setupSocial();
+
+        String username = SignUpRepo.getInstance().getUsername();
+        if (username != null) edtUsername.setText(username);
     }
 
     @Override
diff --git a/xabber/src/main/java/com/xabber/android/ui/fragment/XabberAccountInfoFragment.java b/xabber/src/main/java/com/xabber/android/ui/fragment/XabberAccountInfoFragment.java
index 7f22e5f1cb..23857dea53 100644
--- a/xabber/src/main/java/com/xabber/android/ui/fragment/XabberAccountInfoFragment.java
+++ b/xabber/src/main/java/com/xabber/android/ui/fragment/XabberAccountInfoFragment.java
@@ -3,7 +3,6 @@
 import android.app.Fragment;
 import android.app.FragmentTransaction;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.util.Log;
 import android.view.LayoutInflater;
@@ -106,7 +105,9 @@ public void onPause() {
         compositeSubscription.clear();
     }
 
-    public void updateData(@NonNull XabberAccount account) {
+    public void updateData(XabberAccount account) {
+        if (account == null) return;
+
         String accountName = account.getFullUsername();
 
         tvAccountName.setText(accountName);

From 2def313c0b7efc17d4c85db86fde8921bec01da7 Mon Sep 17 00:00:00 2001
From: Valery Miller <valera_miller94@mail.ru>
Date: Thu, 20 Sep 2018 17:35:35 +0500
Subject: [PATCH 110/251] Added showing error message on 1 step in signup

---
 .../android/presentation/mvp/signup/SignUpRepo.java | 10 ++++++++++
 .../android/ui/activity/XabberLoginActivity.java    |  7 ++++---
 .../ui/fragment/XAccountSignUpFragment1.java        |  8 ++++++++
 .../main/res/layout/fragment_xaccount_signup_1.xml  | 13 +++++++++++++
 4 files changed, 35 insertions(+), 3 deletions(-)

diff --git a/xabber/src/main/java/com/xabber/android/presentation/mvp/signup/SignUpRepo.java b/xabber/src/main/java/com/xabber/android/presentation/mvp/signup/SignUpRepo.java
index 2a3d0a3dfa..e50374d18b 100644
--- a/xabber/src/main/java/com/xabber/android/presentation/mvp/signup/SignUpRepo.java
+++ b/xabber/src/main/java/com/xabber/android/presentation/mvp/signup/SignUpRepo.java
@@ -8,6 +8,7 @@ public class SignUpRepo {
     private String socialCredentials;
     private String socialProvider;
     private String captchaToken;
+    private String lastErrorMessage;
 
     private static SignUpRepo instance;
 
@@ -23,6 +24,7 @@ public void clearRepo() {
         socialCredentials = null;
         socialProvider = null;
         captchaToken = null;
+        lastErrorMessage = null;
     }
 
     public String getUsername() {
@@ -73,6 +75,14 @@ public void setCaptchaToken(String captchaToken) {
         this.captchaToken = captchaToken;
     }
 
+    public String getLastErrorMessage() {
+        return lastErrorMessage;
+    }
+
+    public void setLastErrorMessage(String lastErrorMessage) {
+        this.lastErrorMessage = lastErrorMessage;
+    }
+
     public boolean isCompleted() {
         return username != null && pass != null && host != null;
     }
diff --git a/xabber/src/main/java/com/xabber/android/ui/activity/XabberLoginActivity.java b/xabber/src/main/java/com/xabber/android/ui/activity/XabberLoginActivity.java
index 9d9f32e8fe..a980ab3118 100644
--- a/xabber/src/main/java/com/xabber/android/ui/activity/XabberLoginActivity.java
+++ b/xabber/src/main/java/com/xabber/android/ui/activity/XabberLoginActivity.java
@@ -378,10 +378,11 @@ private void handleSuccessSignUp() {
     private void handleErrorSignUp(Throwable throwable) {
         SignUpRepo.getInstance().setCaptchaToken(null);
         hideProgress();
-
-        //handleError(throwable, "Error while signup: ", LOG_TAG);
         String message = RetrofitErrorConverter.throwableToHttpError(throwable);
-        if (ERROR_NAME_NOT_AVAILABLE.equals(message)) showSignUpStep1Fragment();
+        if (ERROR_NAME_NOT_AVAILABLE.equals(message)) {
+            SignUpRepo.getInstance().setLastErrorMessage(message);
+            showSignUpStep1Fragment();
+        }
     }
 
     /** SOCIAL LOGIN */
diff --git a/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountSignUpFragment1.java b/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountSignUpFragment1.java
index bcddd28b59..00892355ed 100644
--- a/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountSignUpFragment1.java
+++ b/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountSignUpFragment1.java
@@ -31,6 +31,7 @@ public class XAccountSignUpFragment1 extends Fragment implements View.OnClickLis
     private ProgressBar pbHosts;
     private Button btnNext;
     private TextView tvDescription;
+    private TextView tvError;
 
     private XAccountSignUpFragment1.Listener listener;
 
@@ -79,6 +80,7 @@ public void onNothingSelected(AdapterView<?> parent) {
         btnNext.setOnClickListener(this);
 
         tvDescription = view.findViewById(R.id.tvDescription);
+        tvError = view.findViewById(R.id.tvError);
     }
 
     @Override
@@ -89,6 +91,12 @@ public void onResume() {
 
         String username = SignUpRepo.getInstance().getUsername();
         if (username != null) edtUsername.setText(username);
+
+        String errorMessage = SignUpRepo.getInstance().getLastErrorMessage();
+        if (errorMessage != null) {
+            tvError.setText(errorMessage);
+            tvError.setVisibility(View.VISIBLE);
+        } else tvError.setVisibility(View.GONE);
     }
 
     @Override
diff --git a/xabber/src/main/res/layout/fragment_xaccount_signup_1.xml b/xabber/src/main/res/layout/fragment_xaccount_signup_1.xml
index 55d30e0972..4baae06e3c 100644
--- a/xabber/src/main/res/layout/fragment_xaccount_signup_1.xml
+++ b/xabber/src/main/res/layout/fragment_xaccount_signup_1.xml
@@ -34,6 +34,19 @@
         android:layout_marginRight="24dp"
         >
 
+        <TextView
+            android:id="@+id/tvError"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:paddingLeft="4dp"
+            android:layout_marginBottom="8dp"
+            android:textColor="@color/grey_700"
+            android:drawableLeft="@drawable/ic_error_grey_24dp"
+            android:drawablePadding="4dp"
+            android:gravity="center"
+            android:visibility="gone"
+            />
+
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"

From 6ff3e3d02a854332ce470a668bccb0d1d71e80e7 Mon Sep 17 00:00:00 2001
From: Valery Miller <valera_miller94@mail.ru>
Date: Thu, 20 Sep 2018 17:41:45 +0500
Subject: [PATCH 111/251] Clear signuprepo on cancel from login activity

---
 .../com/xabber/android/ui/activity/XabberLoginActivity.java     | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/xabber/src/main/java/com/xabber/android/ui/activity/XabberLoginActivity.java b/xabber/src/main/java/com/xabber/android/ui/activity/XabberLoginActivity.java
index a980ab3118..cd808b9e72 100644
--- a/xabber/src/main/java/com/xabber/android/ui/activity/XabberLoginActivity.java
+++ b/xabber/src/main/java/com/xabber/android/ui/activity/XabberLoginActivity.java
@@ -103,6 +103,7 @@ protected void onCreate(Bundle savedInstanceState) {
         toolbar.setNavigationOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
+                SignUpRepo.getInstance().clearRepo();
                 finish();
             }
         });
@@ -232,6 +233,7 @@ protected void hideProgress() {
     @Override
     public void onBackPressed() {
         super.onBackPressed();
+        SignUpRepo.getInstance().clearRepo();
     }
 
     @Override

From f8ed72ba6076f957dfaf3544a035895119f8dc4c Mon Sep 17 00:00:00 2001
From: Valery Miller <valera_miller94@mail.ru>
Date: Thu, 20 Sep 2018 17:59:42 +0500
Subject: [PATCH 112/251] Changed color of toolbar in login screen

---
 .../ui/activity/XabberLoginActivity.java      | 33 +++++++++++--------
 1 file changed, 20 insertions(+), 13 deletions(-)

diff --git a/xabber/src/main/java/com/xabber/android/ui/activity/XabberLoginActivity.java b/xabber/src/main/java/com/xabber/android/ui/activity/XabberLoginActivity.java
index cd808b9e72..7e1fb2369f 100644
--- a/xabber/src/main/java/com/xabber/android/ui/activity/XabberLoginActivity.java
+++ b/xabber/src/main/java/com/xabber/android/ui/activity/XabberLoginActivity.java
@@ -98,8 +98,6 @@ protected void onCreate(Bundle savedInstanceState) {
         setContentView(R.layout.activity_xabber_login);
 
         toolbar = (Toolbar) findViewById(R.id.toolbar_default);
-        toolbar.setTitle(R.string.title_login_xabber_account);
-        toolbar.setNavigationIcon(R.drawable.ic_arrow_left);
         toolbar.setNavigationOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
@@ -107,8 +105,22 @@ public void onClick(View v) {
                 finish();
             }
         });
-        toolbar.setTitleTextColor(getResources().getColor(R.color.black_text));
         barPainter = new BarPainter(this, toolbar);
+        setupToolbar(true);
+    }
+
+    private void setupToolbar(boolean signIn) {
+        if (signIn) {
+            toolbar.setTitle(R.string.title_login_xabber_account);
+            toolbar.setNavigationIcon(R.drawable.ic_arrow_left);
+            toolbar.setTitleTextColor(getResources().getColor(R.color.black_text));
+            barPainter.setLiteGrey();
+        } else {
+            toolbar.setTitle(R.string.title_register_xabber_account);
+            toolbar.setNavigationIcon(R.drawable.ic_arrow_left_white_24dp);
+            toolbar.setTitleTextColor(getResources().getColor(R.color.white));
+            barPainter.setBlue(this);
+        }
     }
 
     public void showLoginFragment() {
@@ -120,8 +132,7 @@ public void showLoginFragment() {
         fTrans.commit();
         currentFragment = FRAGMENT_LOGIN;
 
-        toolbar.setTitle(R.string.title_login_xabber_account);
-        barPainter.setLiteGrey();
+        setupToolbar(true);
     }
 
     public void showSignUpStep1Fragment() {
@@ -133,8 +144,7 @@ public void showSignUpStep1Fragment() {
         fTrans.commit();
         currentFragment = FRAGMENT_SIGNUP_STEP1;
 
-        toolbar.setTitle(R.string.title_register_xabber_account);
-        barPainter.setLiteGrey();
+        setupToolbar(false);
     }
 
     public void showSignUpStep2Fragment() {
@@ -146,8 +156,7 @@ public void showSignUpStep2Fragment() {
         fTrans.commit();
         currentFragment = FRAGMENT_SIGNUP_STEP2;
 
-        toolbar.setTitle(R.string.title_register_xabber_account);
-        barPainter.setLiteGrey();
+        setupToolbar(false);
     }
 
     public void showSignUpStep3Fragment() {
@@ -159,8 +168,7 @@ public void showSignUpStep3Fragment() {
         fTrans.commit();
         currentFragment = FRAGMENT_SIGNUP_STEP3;
 
-        toolbar.setTitle(R.string.title_register_xabber_account);
-        barPainter.setLiteGrey();
+        setupToolbar(false);
     }
 
     public void showSignUpStep4Fragment() {
@@ -172,8 +180,7 @@ public void showSignUpStep4Fragment() {
         fTrans.commit();
         currentFragment = FRAGMENT_SIGNUP_STEP4;
 
-        toolbar.setTitle(R.string.title_register_xabber_account);
-        barPainter.setLiteGrey();
+        setupToolbar(false);
     }
 
     @Override

From a64b7e44e411a71f65eb2034162971b3e0bed951 Mon Sep 17 00:00:00 2001
From: Valery Miller <valera_miller94@mail.ru>
Date: Thu, 20 Sep 2018 18:05:33 +0500
Subject: [PATCH 113/251] Visual changes in signup steps

---
 xabber/src/main/res/layout/fragment_xaccount_signup_1.xml | 4 ++--
 xabber/src/main/res/layout/fragment_xaccount_signup_2.xml | 4 ++--
 xabber/src/main/res/layout/fragment_xaccount_signup_3.xml | 6 +++---
 xabber/src/main/res/layout/fragment_xaccount_signup_4.xml | 6 +++---
 xabber/src/main/res/values/xabber_account.xml             | 8 ++++++++
 5 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/xabber/src/main/res/layout/fragment_xaccount_signup_1.xml b/xabber/src/main/res/layout/fragment_xaccount_signup_1.xml
index 4baae06e3c..3af7516886 100644
--- a/xabber/src/main/res/layout/fragment_xaccount_signup_1.xml
+++ b/xabber/src/main/res/layout/fragment_xaccount_signup_1.xml
@@ -11,13 +11,13 @@
         android:layout_width="match_parent"
         android:layout_height="48dp"
         android:background="#F5F5F5"
-        android:elevation="4dp"
+        android:elevation="8dp"
         >
 
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="Step 1 of 4"
+            android:text="@string/title_signup_step_1"
             android:textStyle="bold"
             android:layout_marginLeft="16dp"
             android:layout_gravity="center_vertical"
diff --git a/xabber/src/main/res/layout/fragment_xaccount_signup_2.xml b/xabber/src/main/res/layout/fragment_xaccount_signup_2.xml
index ecb6e6e60b..058bb770ff 100644
--- a/xabber/src/main/res/layout/fragment_xaccount_signup_2.xml
+++ b/xabber/src/main/res/layout/fragment_xaccount_signup_2.xml
@@ -8,13 +8,13 @@
         android:layout_width="match_parent"
         android:layout_height="48dp"
         android:background="#F5F5F5"
-        android:elevation="4dp"
+        android:elevation="8dp"
         >
 
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="Step 2 of 4"
+            android:text="@string/title_signup_step_2"
             android:textStyle="bold"
             android:layout_marginLeft="16dp"
             android:layout_gravity="center_vertical"
diff --git a/xabber/src/main/res/layout/fragment_xaccount_signup_3.xml b/xabber/src/main/res/layout/fragment_xaccount_signup_3.xml
index b0c9ecfbbd..f4fed03b0c 100644
--- a/xabber/src/main/res/layout/fragment_xaccount_signup_3.xml
+++ b/xabber/src/main/res/layout/fragment_xaccount_signup_3.xml
@@ -8,13 +8,13 @@
         android:layout_width="match_parent"
         android:layout_height="48dp"
         android:background="#F5F5F5"
-        android:elevation="4dp"
+        android:elevation="8dp"
         >
 
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="Step 3 of 4"
+            android:text="@string/title_signup_step_3"
             android:textStyle="bold"
             android:layout_marginLeft="16dp"
             android:layout_gravity="center_vertical"
@@ -45,7 +45,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
-            android:text="acept license"
+            android:text="@string/accept_license"
             />
 
         <RelativeLayout
diff --git a/xabber/src/main/res/layout/fragment_xaccount_signup_4.xml b/xabber/src/main/res/layout/fragment_xaccount_signup_4.xml
index 7e40120832..7081dc3897 100644
--- a/xabber/src/main/res/layout/fragment_xaccount_signup_4.xml
+++ b/xabber/src/main/res/layout/fragment_xaccount_signup_4.xml
@@ -8,13 +8,13 @@
         android:layout_width="match_parent"
         android:layout_height="48dp"
         android:background="#F5F5F5"
-        android:elevation="4dp"
+        android:elevation="8dp"
         >
 
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="Step 4 of 4"
+            android:text="@string/title_signup_step_4"
             android:textStyle="bold"
             android:layout_marginLeft="16dp"
             android:layout_gravity="center_vertical"
@@ -34,7 +34,7 @@
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="Secure your account by linking it with at least one social network or email. If you don’t do that and lose your password, you’ll never be able to restore access to your account!"
+            android:text="@string/account_secure_description"
             android:paddingLeft="4dp"
             android:layout_marginBottom="16dp"
             />
diff --git a/xabber/src/main/res/values/xabber_account.xml b/xabber/src/main/res/values/xabber_account.xml
index 8128906ebd..be8c0b6b42 100644
--- a/xabber/src/main/res/values/xabber_account.xml
+++ b/xabber/src/main/res/values/xabber_account.xml
@@ -204,4 +204,12 @@
     <string name="xmpp_confirm_title">Enter confirmation code that was send to %1$s</string>
     <string name="xaccount_not_exist">Will create new account</string>
     <string name="xaccount_exist">Xabber Account exists</string>
+
+    <string name="title_signup_step_1">Step 1 of 4</string>
+    <string name="title_signup_step_2">Step 2 of 4</string>
+    <string name="title_signup_step_3">Step 3 of 4</string>
+    <string name="title_signup_step_4">Step 4 of 4</string>
+
+    <string name="accept_license">Accept license</string>
+    <string name="account_secure_description">Secure your account by linking it with at least one social network or email. If you don’t do that and lose your password, you’ll never be able to restore access to your account!</string>
 </resources>
\ No newline at end of file

From 65313d336a2e4a8e9d58778cc956604786d51bdc Mon Sep 17 00:00:00 2001
From: Valery Miller <valera_miller94@mail.ru>
Date: Thu, 20 Sep 2018 18:10:08 +0500
Subject: [PATCH 114/251] Fixed NPE in XAccountLinksFragment

---
 .../xabber/android/ui/fragment/XAccountLinksFragment.java   | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountLinksFragment.java b/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountLinksFragment.java
index 5c3872be57..15efbf501b 100644
--- a/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountLinksFragment.java
+++ b/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountLinksFragment.java
@@ -248,8 +248,10 @@ private void subscribeForXabberAccount() {
             .doOnNext(new Action1<XabberAccount>() {
                 @Override
                 public void call(XabberAccount account) {
-                    setupSocial(account.getSocialBindings());
-                    setupEmailList(account.getEmails());
+                    if (account != null) {
+                        setupSocial(account.getSocialBindings());
+                        setupEmailList(account.getEmails());
+                    }
                 }
             }).subscribe());
     }

From 049acd64453cb2e0685c9ec8a139d1db07c5f9d1 Mon Sep 17 00:00:00 2001
From: Valery Miller <valera_miller94@mail.ru>
Date: Thu, 20 Sep 2018 18:29:04 +0500
Subject: [PATCH 115/251] Up version to 513

---
 xabber/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/xabber/build.gradle b/xabber/build.gradle
index 285e7f5cac..243f36d1c2 100644
--- a/xabber/build.gradle
+++ b/xabber/build.gradle
@@ -10,8 +10,8 @@ android {
     defaultConfig {
         minSdkVersion 15
         targetSdkVersion 27
-        versionCode 512
-        versionName '2.4.2(512)'
+        versionCode 513
+        versionName '2.4.2(513)'
     }
 
     lintOptions {

From fee4ce9188d94a209cb3c802b092caa57c87741c Mon Sep 17 00:00:00 2001
From: Valery Miller <valera_miller94@mail.ru>
Date: Fri, 21 Sep 2018 10:49:01 +0500
Subject: [PATCH 116/251] Changes in privacy screen

---
 .../ui/fragment/XAccountSignUpFragment3.java  |  4 ++
 .../res/layout/fragment_xaccount_signup_3.xml | 38 ++++++++++---------
 xabber/src/main/res/values/xabber_account.xml |  3 +-
 3 files changed, 26 insertions(+), 19 deletions(-)

diff --git a/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountSignUpFragment3.java b/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountSignUpFragment3.java
index ee8877b5c4..a174c70366 100644
--- a/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountSignUpFragment3.java
+++ b/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountSignUpFragment3.java
@@ -6,6 +6,7 @@
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.webkit.WebView;
 import android.widget.Button;
 import android.widget.CheckBox;
 import android.widget.CompoundButton;
@@ -54,6 +55,9 @@ public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
                 btnSignUp.setEnabled(isChecked);
             }
         });
+
+        WebView webView = view.findViewById(R.id.webView);
+        webView.loadUrl(getString(R.string.license_url));
     }
 
 }
diff --git a/xabber/src/main/res/layout/fragment_xaccount_signup_3.xml b/xabber/src/main/res/layout/fragment_xaccount_signup_3.xml
index f4fed03b0c..58fd4fcc5b 100644
--- a/xabber/src/main/res/layout/fragment_xaccount_signup_3.xml
+++ b/xabber/src/main/res/layout/fragment_xaccount_signup_3.xml
@@ -22,37 +22,39 @@
 
     </LinearLayout>
 
-    <LinearLayout
+    <RelativeLayout
         android:orientation="vertical"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
+        android:layout_height="match_parent"
         android:layout_marginTop="24dp"
         android:layout_marginLeft="24dp"
         android:layout_marginRight="24dp"
         >
 
-        <TextView
+        <WebView
+            android:id="@+id/webView"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="Terms of services"
-            android:gravity="center"
-            android:paddingLeft="4dp"
-            android:layout_marginBottom="16dp"
-            />
-
-        <CheckBox
-            android:id="@+id/chkAccept"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:text="@string/accept_license"
+            android:layout_height="match_parent"
+            android:layout_above="@id/buttons"
             />
 
         <RelativeLayout
+            android:id="@+id/buttons"
             android:layout_marginTop="16dp"
             android:layout_marginBottom="16dp"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content">
+            android:layout_height="wrap_content"
+            android:layout_alignParentBottom="true"
+            >
+
+            <CheckBox
+                android:id="@+id/chkAccept"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:layout_centerVertical="true"
+                android:text="@string/accept_license"
+                />
 
             <Button
                 android:id="@+id/btnSignUp"
@@ -73,7 +75,7 @@
         </RelativeLayout>
 
 
-    </LinearLayout>
+    </RelativeLayout>
 
 
 </LinearLayout>
\ No newline at end of file
diff --git a/xabber/src/main/res/values/xabber_account.xml b/xabber/src/main/res/values/xabber_account.xml
index be8c0b6b42..56f182d12c 100644
--- a/xabber/src/main/res/values/xabber_account.xml
+++ b/xabber/src/main/res/values/xabber_account.xml
@@ -210,6 +210,7 @@
     <string name="title_signup_step_3">Step 3 of 4</string>
     <string name="title_signup_step_4">Step 4 of 4</string>
 
-    <string name="accept_license">Accept license</string>
+    <string name="license_url" translatable="false">https://www.xabber.com/policy/</string>
+    <string name="accept_license">Accept privacy policy</string>
     <string name="account_secure_description">Secure your account by linking it with at least one social network or email. If you don’t do that and lose your password, you’ll never be able to restore access to your account!</string>
 </resources>
\ No newline at end of file

From 6bf0b66e22070bb44d1ed9d33855ee39ed6d210a Mon Sep 17 00:00:00 2001
From: Valery Miller <valera_miller94@mail.ru>
Date: Fri, 21 Sep 2018 11:07:57 +0500
Subject: [PATCH 117/251] Added show password button

---
 .../res/layout/fragment_xaccount_signup_2.xml | 29 +++++++------------
 1 file changed, 11 insertions(+), 18 deletions(-)

diff --git a/xabber/src/main/res/layout/fragment_xaccount_signup_2.xml b/xabber/src/main/res/layout/fragment_xaccount_signup_2.xml
index 058bb770ff..5899d43609 100644
--- a/xabber/src/main/res/layout/fragment_xaccount_signup_2.xml
+++ b/xabber/src/main/res/layout/fragment_xaccount_signup_2.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:orientation="vertical"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
@@ -31,26 +32,18 @@
         android:layout_marginRight="24dp"
         >
 
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/label_pass"
-            android:textSize="12sp"
-            android:paddingLeft="4dp"
-            android:textColor="@color/contact_item_text_second"
-            />
-
-        <EditText
-            android:id="@+id/edtPass"
+        <android.support.design.widget.TextInputLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:imeOptions="actionDone"
-            android:singleLine="true"
-            android:textSize="16sp"
-            android:theme="@style/Theme"
-            android:hint="@string/hint_pass"
-            android:inputType="textPassword"
-            />
+            app:passwordToggleEnabled="true">
+
+            <android.support.design.widget.TextInputEditText
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:hint="@string/hint_pass"
+                android:inputType="textPassword"/>
+
+        </android.support.design.widget.TextInputLayout>
 
         <RelativeLayout
             android:layout_marginTop="16dp"

From ed4ef6551509214084a5c50744ca59e969130037 Mon Sep 17 00:00:00 2001
From: Valery Miller <valera_miller94@mail.ru>
Date: Fri, 21 Sep 2018 11:28:01 +0500
Subject: [PATCH 118/251] Changes in signup screens

---
 .../ui/fragment/XAccountSignUpFragment1.java        |  7 +------
 .../ui/fragment/XAccountSignUpFragment2.java        |  4 ++--
 .../main/res/layout/fragment_xaccount_signup_1.xml  | 13 -------------
 .../main/res/layout/fragment_xaccount_signup_2.xml  |  1 +
 4 files changed, 4 insertions(+), 21 deletions(-)

diff --git a/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountSignUpFragment1.java b/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountSignUpFragment1.java
index 00892355ed..8fddb4b1fe 100644
--- a/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountSignUpFragment1.java
+++ b/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountSignUpFragment1.java
@@ -31,7 +31,6 @@ public class XAccountSignUpFragment1 extends Fragment implements View.OnClickLis
     private ProgressBar pbHosts;
     private Button btnNext;
     private TextView tvDescription;
-    private TextView tvError;
 
     private XAccountSignUpFragment1.Listener listener;
 
@@ -80,7 +79,6 @@ public void onNothingSelected(AdapterView<?> parent) {
         btnNext.setOnClickListener(this);
 
         tvDescription = view.findViewById(R.id.tvDescription);
-        tvError = view.findViewById(R.id.tvError);
     }
 
     @Override
@@ -93,10 +91,7 @@ public void onResume() {
         if (username != null) edtUsername.setText(username);
 
         String errorMessage = SignUpRepo.getInstance().getLastErrorMessage();
-        if (errorMessage != null) {
-            tvError.setText(errorMessage);
-            tvError.setVisibility(View.VISIBLE);
-        } else tvError.setVisibility(View.GONE);
+        if (errorMessage != null) edtUsername.setError(errorMessage);
     }
 
     @Override
diff --git a/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountSignUpFragment2.java b/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountSignUpFragment2.java
index 970498a2db..89ea1eee55 100644
--- a/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountSignUpFragment2.java
+++ b/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountSignUpFragment2.java
@@ -3,11 +3,11 @@
 import android.app.Fragment;
 import android.os.Bundle;
 import android.support.annotation.Nullable;
+import android.support.design.widget.TextInputEditText;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.Button;
-import android.widget.EditText;
 
 import com.xabber.android.R;
 
@@ -15,7 +15,7 @@ public class XAccountSignUpFragment2 extends Fragment implements View.OnClickLis
 
     private Listener listener;
 
-    private EditText edtPass;
+    private TextInputEditText edtPass;
     private Button btnNext;
 
     public interface Listener {
diff --git a/xabber/src/main/res/layout/fragment_xaccount_signup_1.xml b/xabber/src/main/res/layout/fragment_xaccount_signup_1.xml
index 3af7516886..6d6d19bdc0 100644
--- a/xabber/src/main/res/layout/fragment_xaccount_signup_1.xml
+++ b/xabber/src/main/res/layout/fragment_xaccount_signup_1.xml
@@ -34,19 +34,6 @@
         android:layout_marginRight="24dp"
         >
 
-        <TextView
-            android:id="@+id/tvError"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:paddingLeft="4dp"
-            android:layout_marginBottom="8dp"
-            android:textColor="@color/grey_700"
-            android:drawableLeft="@drawable/ic_error_grey_24dp"
-            android:drawablePadding="4dp"
-            android:gravity="center"
-            android:visibility="gone"
-            />
-
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
diff --git a/xabber/src/main/res/layout/fragment_xaccount_signup_2.xml b/xabber/src/main/res/layout/fragment_xaccount_signup_2.xml
index 5899d43609..c5dc25b09e 100644
--- a/xabber/src/main/res/layout/fragment_xaccount_signup_2.xml
+++ b/xabber/src/main/res/layout/fragment_xaccount_signup_2.xml
@@ -38,6 +38,7 @@
             app:passwordToggleEnabled="true">
 
             <android.support.design.widget.TextInputEditText
+                android:id="@+id/edtPass"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:hint="@string/hint_pass"

From edc54fd9aa789a3d9ba8c4e71926f99545a01ef1 Mon Sep 17 00:00:00 2001
From: Valery Miller <valera_miller94@mail.ru>
Date: Fri, 21 Sep 2018 14:54:37 +0500
Subject: [PATCH 119/251] Start work on new xmpp-auth screen

---
 .../ui/activity/ContactListActivity.java      | 70 +------------
 .../ui/activity/XabberAccountActivity.java    | 97 +++++++++++++++----
 .../ui/activity/XabberLoginActivity.java      |  2 +-
 .../ui/adapter/XMPPAccountAuthAdapter.java    |  3 +-
 .../fragment/XAccountXMPPLoginFragment.java   | 91 +++++++++++++++++
 .../layout/fragment_xaccount_xmpp_auth.xml    | 80 ++++++++++++---
 xabber/src/main/res/values/xabber_account.xml |  2 +
 7 files changed, 245 insertions(+), 100 deletions(-)
 create mode 100644 xabber/src/main/java/com/xabber/android/ui/fragment/XAccountXMPPLoginFragment.java

diff --git a/xabber/src/main/java/com/xabber/android/ui/activity/ContactListActivity.java b/xabber/src/main/java/com/xabber/android/ui/activity/ContactListActivity.java
index 690a502f70..b372644528 100644
--- a/xabber/src/main/java/com/xabber/android/ui/activity/ContactListActivity.java
+++ b/xabber/src/main/java/com/xabber/android/ui/activity/ContactListActivity.java
@@ -45,7 +45,6 @@
 import com.xabber.android.data.account.AccountManager;
 import com.xabber.android.data.account.CommonState;
 import com.xabber.android.data.account.listeners.OnAccountChangedListener;
-import com.xabber.android.data.connection.NetworkManager;
 import com.xabber.android.data.entity.AccountJid;
 import com.xabber.android.data.entity.BaseEntity;
 import com.xabber.android.data.entity.UserJid;
@@ -58,10 +57,7 @@
 import com.xabber.android.data.roster.AbstractContact;
 import com.xabber.android.data.roster.RosterContact;
 import com.xabber.android.data.roster.RosterManager;
-import com.xabber.android.data.xaccount.AuthManager;
 import com.xabber.android.data.xaccount.XMPPAccountSettings;
-import com.xabber.android.data.xaccount.XMPPAuthManager;
-import com.xabber.android.data.xaccount.XabberAccount;
 import com.xabber.android.data.xaccount.XabberAccountManager;
 import com.xabber.android.presentation.mvp.contactlist.ContactListPresenter;
 import com.xabber.android.presentation.ui.contactlist.ContactListFragment;
@@ -74,7 +70,6 @@
 import com.xabber.android.ui.dialog.MucPrivateChatInvitationDialog;
 import com.xabber.android.ui.dialog.TranslationDialog;
 import com.xabber.android.ui.fragment.ContactListDrawerFragment;
-import com.xabber.android.ui.fragment.ChooseAccountForXMPPAuthDialog;
 import com.xabber.android.ui.preferences.PreferenceEditor;
 import com.xabber.android.ui.widget.bottomnavigation.BottomMenu;
 import com.xabber.xmpp.uri.XMPPUri;
@@ -87,10 +82,6 @@
 import java.util.List;
 import java.util.Locale;
 
-import rx.Subscription;
-import rx.android.schedulers.AndroidSchedulers;
-import rx.functions.Action1;
-import rx.schedulers.Schedulers;
 import rx.subscriptions.CompositeSubscription;
 
 /**
@@ -100,8 +91,7 @@
  */
 public class ContactListActivity extends ManagedActivity implements OnAccountChangedListener,
         View.OnClickListener, OnChooseListener, ContactListFragment.ContactListFragmentListener,
-        ContactListDrawerFragment.ContactListDrawerListener, ChooseAccountForXMPPAuthDialog.Listener,
-        BottomMenu.OnClickListener {
+        ContactListDrawerFragment.ContactListDrawerListener, BottomMenu.OnClickListener {
 
     /**
      * Select contact to be invited to the room was requested.
@@ -772,23 +762,8 @@ public void onSearchClick() {
         } else showContactListFragment(null);
     }
 
-    @Override
-    public void onAccountClick(String accountJid) {
-        loginXabberAccountViaXMPP(accountJid);
-    }
-
     private void onXabberAccountClick() {
-        XabberAccount account = XabberAccountManager.getInstance().getAccount();
-        if (account != null) startActivity(XabberAccountActivity.createIntent(this, false));
-        else {
-            // TODO: 07.09.18 запрос списка аккаунтов вынести из UI ?
-            ArrayList<AccountJid> accounts = new ArrayList<>(AccountManager.getInstance().getEnabledAccounts());
-            if (accounts.size() < 1) return;
-            if (accounts.size() > 1)
-                ChooseAccountForXMPPAuthDialog.newInstance(this, accounts)
-                    .show(getFragmentManager(), ChooseAccountForXMPPAuthDialog.class.getSimpleName());
-            else onAccountClick(accounts.get(0).getFullJid().toString());
-        }
+        startActivity(XabberAccountActivity.createIntent(this));
     }
 
     private void showBottomNavigation() {
@@ -864,45 +839,4 @@ public void showShowcase(boolean show) {
     public void closeSearch() {
         if (bottomMenu != null) bottomMenu.closeSearch();
     }
-
-    public void loginXabberAccountViaXMPP(String accountJid) {
-        if (NetworkManager.isNetworkAvailable()) {
-            requestXMPPCode(accountJid);
-        } else
-            Toast.makeText(this, R.string.toast_no_internet, Toast.LENGTH_LONG).show();
-    }
-
-    private void requestXMPPCode(final String jid) {
-
-        // ! show progress !
-
-        Subscription requestXMPPCodeSubscription = AuthManager.requestXMPPCode(jid)
-                .subscribeOn(Schedulers.io())
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(new Action1<AuthManager.XMPPCode>() {
-                    @Override
-                    public void call(AuthManager.XMPPCode code) {
-                        handleSuccessRequestXMPPCode(code, jid);
-                    }
-                }, new Action1<Throwable>() {
-                    @Override
-                    public void call(Throwable throwable) {
-                        handleErrorRequestXMPPCode(throwable);
-                    }
-                });
-        compositeSubscription.add(requestXMPPCodeSubscription);
-    }
-
-    private void handleSuccessRequestXMPPCode(AuthManager.XMPPCode code, String jid) {
-
-        // ! hide progress !
-
-        XMPPAuthManager.getInstance().addRequest(code.getRequestId(), code.getApiJid(), jid);
-    }
-
-    private void handleErrorRequestXMPPCode(Throwable throwable) {
-        // ! hide progress !
-        // TODO: 07.09.18 сделать корректную обработку ошибок
-        Toast.makeText(this, "Error while xmpp-auth: " + throwable.toString(), Toast.LENGTH_LONG).show();
-    }
 }
diff --git a/xabber/src/main/java/com/xabber/android/ui/activity/XabberAccountActivity.java b/xabber/src/main/java/com/xabber/android/ui/activity/XabberAccountActivity.java
index 03c04bf96a..11b563f09e 100644
--- a/xabber/src/main/java/com/xabber/android/ui/activity/XabberAccountActivity.java
+++ b/xabber/src/main/java/com/xabber/android/ui/activity/XabberAccountActivity.java
@@ -13,6 +13,7 @@
 import android.support.v7.widget.Toolbar;
 import android.util.Log;
 import android.view.LayoutInflater;
+import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
 import android.widget.CheckBox;
@@ -21,9 +22,11 @@
 import com.xabber.android.R;
 import com.xabber.android.data.connection.NetworkManager;
 import com.xabber.android.data.xaccount.AuthManager;
+import com.xabber.android.data.xaccount.XMPPAuthManager;
 import com.xabber.android.data.xaccount.XabberAccount;
 import com.xabber.android.data.xaccount.XabberAccountManager;
 import com.xabber.android.ui.color.BarPainter;
+import com.xabber.android.ui.fragment.XAccountXMPPLoginFragment;
 import com.xabber.android.ui.fragment.XabberAccountInfoFragment;
 import com.xabber.android.utils.RetrofitErrorConverter;
 
@@ -34,27 +37,25 @@
 import rx.schedulers.Schedulers;
 
 public class XabberAccountActivity extends BaseLoginActivity
-        implements Toolbar.OnMenuItemClickListener {
+        implements Toolbar.OnMenuItemClickListener, XAccountXMPPLoginFragment.Listener {
 
     private final static String LOG_TAG = XabberAccountActivity.class.getSimpleName();
     private final static String FRAGMENT_INFO = "fragment_info";
-    private final static String SHOW_SYNC = "show_sync";
+    private final static String FRAGMENT_LOGIN = "fragment_login";
 
     private FragmentTransaction fTrans;
     private Fragment fragmentInfo;
+    private Fragment fragmentLogin;
 
     private Toolbar toolbar;
     private BarPainter barPainter;
     private ProgressDialog progressDialog;
-    private boolean needShowSyncDialog = false;
 
     private boolean dialogShowed;
 
     @NonNull
-    public static Intent createIntent(Context context, boolean showSync) {
-        Intent intent = new Intent(context, XabberAccountActivity.class);
-        intent.putExtra(SHOW_SYNC, showSync);
-        return intent;
+    public static Intent createIntent(Context context) {
+        return new Intent(context, XabberAccountActivity.class);
     }
 
     @Override
@@ -83,15 +84,9 @@ protected void onResume() {
         super.onResume();
         onPrepareOptionsMenu(toolbar.getMenu());
 
-        Bundle extras = getIntent().getExtras();
-        if (extras != null) {
-            needShowSyncDialog = extras.getBoolean(SHOW_SYNC);
-            extras.clear();
-        }
-
         XabberAccount account = XabberAccountManager.getInstance().getAccount();
         if (account != null) showInfoFragment();
-        else finish();
+        else showLoginFragment();
     }
 
     @Override
@@ -142,6 +137,54 @@ protected void onSocialAuthSuccess(String provider, String credentials) {
         bindSocial(provider, credentials);
     }
 
+    /** XMPP-login */
+
+    @Override
+    public void onAccountClick(String jid) {
+        loginXabberAccountViaXMPP(jid);
+    }
+
+    public void loginXabberAccountViaXMPP(String accountJid) {
+        if (NetworkManager.isNetworkAvailable()) {
+            requestXMPPCode(accountJid);
+        } else
+            Toast.makeText(this, R.string.toast_no_internet, Toast.LENGTH_LONG).show();
+    }
+
+    private void requestXMPPCode(final String jid) {
+
+        // ! show progress !
+
+        Subscription requestXMPPCodeSubscription = AuthManager.requestXMPPCode(jid)
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(new Action1<AuthManager.XMPPCode>() {
+                    @Override
+                    public void call(AuthManager.XMPPCode code) {
+                        handleSuccessRequestXMPPCode(code, jid);
+                    }
+                }, new Action1<Throwable>() {
+                    @Override
+                    public void call(Throwable throwable) {
+                        handleErrorRequestXMPPCode(throwable);
+                    }
+                });
+        compositeSubscription.add(requestXMPPCodeSubscription);
+    }
+
+    private void handleSuccessRequestXMPPCode(AuthManager.XMPPCode code, String jid) {
+
+        // ! hide progress !
+
+        XMPPAuthManager.getInstance().addRequest(code.getRequestId(), code.getApiJid(), jid);
+    }
+
+    private void handleErrorRequestXMPPCode(Throwable throwable) {
+        // ! hide progress !
+        // TODO: 07.09.18 сделать корректную обработку ошибок
+        Toast.makeText(this, "Error while xmpp-auth: " + throwable.toString(), Toast.LENGTH_LONG).show();
+    }
+
     /** Xabber Account Info */
 
     public void onLogoutClick(boolean deleteAccounts) {
@@ -159,12 +202,8 @@ public void onSyncClick(boolean needGoToMainActivity) {
     }
 
     private void showInfoFragment() {
-        if (fragmentInfo == null) {
+        if (fragmentInfo == null)
             fragmentInfo = XabberAccountInfoFragment.newInstance();
-            Bundle bundle = new Bundle();
-            bundle.putBoolean("SHOW_SYNC", needShowSyncDialog);
-            fragmentInfo.setArguments(bundle);
-        }
 
         fTrans = getFragmentManager().beginTransaction();
         fTrans.replace(R.id.container, fragmentInfo, FRAGMENT_INFO);
@@ -172,6 +211,26 @@ private void showInfoFragment() {
 
         toolbar.setTitle(R.string.title_xabber_account);
         barPainter.setLiteGrey();
+        setupMenu(true);
+    }
+
+    private void showLoginFragment() {
+        if (fragmentLogin == null)
+            fragmentLogin = XAccountXMPPLoginFragment.newInstance();
+
+        fTrans = getFragmentManager().beginTransaction();
+        fTrans.replace(R.id.container, fragmentLogin, FRAGMENT_LOGIN);
+        fTrans.commit();
+
+        toolbar.setTitle(R.string.title_login_xabber_account);
+        barPainter.setLiteGrey();
+        setupMenu(false);
+    }
+
+    private void setupMenu(boolean show) {
+        Menu menu = toolbar.getMenu();
+        menu.findItem(R.id.action_quit).setVisible(show);
+        menu.findItem(R.id.action_sync).setVisible(show);
     }
 
     @Override
diff --git a/xabber/src/main/java/com/xabber/android/ui/activity/XabberLoginActivity.java b/xabber/src/main/java/com/xabber/android/ui/activity/XabberLoginActivity.java
index 7e1fb2369f..487837312d 100644
--- a/xabber/src/main/java/com/xabber/android/ui/activity/XabberLoginActivity.java
+++ b/xabber/src/main/java/com/xabber/android/ui/activity/XabberLoginActivity.java
@@ -462,7 +462,7 @@ public void call(Throwable throwable) {
 
     private void handleSuccessGetAccount(@NonNull XabberAccount xabberAccount) {
         hideProgress();
-        Intent intent = XabberAccountActivity.createIntent(this, true);
+        Intent intent = XabberAccountActivity.createIntent(this);
         finish();
         startActivity(intent);
     }
diff --git a/xabber/src/main/java/com/xabber/android/ui/adapter/XMPPAccountAuthAdapter.java b/xabber/src/main/java/com/xabber/android/ui/adapter/XMPPAccountAuthAdapter.java
index 2c1690fcf0..31dcfaf70a 100644
--- a/xabber/src/main/java/com/xabber/android/ui/adapter/XMPPAccountAuthAdapter.java
+++ b/xabber/src/main/java/com/xabber/android/ui/adapter/XMPPAccountAuthAdapter.java
@@ -15,6 +15,7 @@
 import com.xabber.android.data.extension.privatestorage.PrivateStorageManager;
 import com.xabber.android.ui.color.ColorManager;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -23,7 +24,7 @@
 
 public class XMPPAccountAuthAdapter extends RecyclerView.Adapter {
 
-    private List<AccountJid> items;
+    private List<AccountJid> items = new ArrayList<>();
     private Listener listener;
 
     public XMPPAccountAuthAdapter(Listener listener) {
diff --git a/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountXMPPLoginFragment.java b/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountXMPPLoginFragment.java
new file mode 100644
index 0000000000..9c22fa7cc0
--- /dev/null
+++ b/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountXMPPLoginFragment.java
@@ -0,0 +1,91 @@
+package com.xabber.android.ui.fragment;
+
+import android.app.Fragment;
+import android.content.Context;
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.support.v7.widget.LinearLayoutManager;
+import android.support.v7.widget.RecyclerView;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Toast;
+
+import com.xabber.android.R;
+import com.xabber.android.data.account.AccountManager;
+import com.xabber.android.data.entity.AccountJid;
+import com.xabber.android.ui.adapter.XMPPAccountAuthAdapter;
+
+import java.util.ArrayList;
+
+public class XAccountXMPPLoginFragment extends Fragment implements XMPPAccountAuthAdapter.Listener {
+
+    private View progressView;
+    private XMPPAccountAuthAdapter adapter;
+
+    private Listener listener;
+
+    public interface Listener {
+        void onAccountClick(String jid);
+    }
+
+    public static XAccountXMPPLoginFragment newInstance() {
+        XAccountXMPPLoginFragment fragment = new XAccountXMPPLoginFragment();
+        return fragment;
+    }
+
+    @Nullable
+    @Override
+    public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, Bundle savedInstanceState) {
+        return inflater.inflate(R.layout.fragment_xaccount_xmpp_auth, container, false);
+    }
+
+    @Override
+    public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+        progressView = view.findViewById(R.id.progressView);
+
+        RecyclerView recyclerView = view.findViewById(R.id.rlAccounts);
+        adapter = new XMPPAccountAuthAdapter(this);
+        recyclerView.setLayoutManager(new LinearLayoutManager(getActivity()));
+        recyclerView.setAdapter(adapter);
+    }
+
+    @Override
+    public void onAttach(Context context) {
+        super.onAttach(context);
+        if (context instanceof Listener) listener = (Listener) context;
+        else throw new RuntimeException(context.toString()
+                + " must implement XAccountXMPPLoginFragment.Listener");
+    }
+
+    @Override
+    public void onDetach() {
+        super.onDetach();
+        listener = null;
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        loadData();
+    }
+
+    @Override
+    public void onAccountClick(String accountJid) {
+        listener.onAccountClick(accountJid);
+    }
+
+    private void loadData() {
+        ArrayList<AccountJid> accounts = new ArrayList<>(AccountManager.getInstance().getEnabledAccounts());
+        if (accounts.size() < 1)
+            Toast.makeText(getActivity(), "error", Toast.LENGTH_SHORT).show();
+        else if (accounts.size() > 1)
+            adapter.setItems(accounts);
+        else listener.onAccountClick(accounts.get(0).getFullJid().toString());
+    }
+
+    private void showProgress(boolean show) {
+        progressView.setVisibility(show ? View.VISIBLE : View.GONE);
+    }
+}
diff --git a/xabber/src/main/res/layout/fragment_xaccount_xmpp_auth.xml b/xabber/src/main/res/layout/fragment_xaccount_xmpp_auth.xml
index 2a4f5006d6..8726ece982 100644
--- a/xabber/src/main/res/layout/fragment_xaccount_xmpp_auth.xml
+++ b/xabber/src/main/res/layout/fragment_xaccount_xmpp_auth.xml
@@ -1,22 +1,80 @@
 <?xml version="1.0" encoding="utf-8"?>
-
-<RelativeLayout
+<LinearLayout
+    android:orientation="vertical"
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/cardview_light_background"
+    android:background="?attr/settings_separator_background_color"
     >
 
-    <android.support.v7.widget.RecyclerView
-        android:id="@+id/rlAccounts"
+    <android.support.v7.widget.CardView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <LinearLayout
+            android:orientation="vertical"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:textAppearance="?android:attr/textAppearanceMedium"
+                android:textSize="16sp"
+                android:text="@string/title_select_xmpp_account"
+                android:textColor="@color/android_default_accent_color"
+                android:layout_marginTop="16dp"
+                android:layout_marginLeft="16dp"
+                />
+
+            <LinearLayout
+                android:id="@+id/progressView"
+                android:orientation="vertical"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:visibility="gone"
+                >
+
+                <ProgressBar
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center"
+                    android:layout_marginTop="20dp"
+                    />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/progress_title_account_list"
+                    android:layout_gravity="center_horizontal"
+                    android:layout_marginBottom="20dp"
+                    />
+
+            </LinearLayout>
+
+            <android.support.v7.widget.RecyclerView
+                android:id="@+id/rlAccounts"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                tools:listitem="@layout/item_xmpp_account_choose"
+                android:layout_marginBottom="16dp"
+                android:layout_marginTop="16dp"
+                android:layout_marginRight="8dp"
+                android:layout_marginLeft="8dp"
+                />
+
+        </LinearLayout>
+    </android.support.v7.widget.CardView>
+
+    <TextView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        tools:listitem="@layout/item_xmpp_account_choose"
-        android:layout_marginBottom="12dp"
-        android:layout_marginTop="8dp"
-        android:layout_marginRight="8dp"
-        android:layout_marginLeft="8dp"
+        android:text="@string/xmpp_auth_description"
+        android:paddingTop="8dp"
+        android:paddingLeft="16dp"
+        android:paddingRight="16dp"
+        android:paddingBottom="16dp"
         />
 
-</RelativeLayout>
\ No newline at end of file
+</LinearLayout>
\ No newline at end of file
diff --git a/xabber/src/main/res/values/xabber_account.xml b/xabber/src/main/res/values/xabber_account.xml
index 56f182d12c..599b18c3bb 100644
--- a/xabber/src/main/res/values/xabber_account.xml
+++ b/xabber/src/main/res/values/xabber_account.xml
@@ -89,6 +89,7 @@
     <string name="title_linked_account">Linked %1$s account</string>
     <string name="title_no_linked_accounts">No linked social accounts or emails</string>
     <string name="title_linked_accounts">Linked social accounts and emails</string>
+    <string name="title_select_xmpp_account">Select XMPP account to proceed</string>
 
     <string name="title_login_xabber_account">Sign In</string>
     <string name="title_register_xabber_account">Sign Up</string>
@@ -130,6 +131,7 @@
     <string name="username_rules_first_symbol">Username must start with letter</string>
     <string name="username_rules_dots">Username must not contain two dots in a row</string>
     <string name="sync_security_description">Your passwords are never synchronized and are safe from theft. But you have to enter them on every device (unless you use tokens, which you should)</string>
+    <string name="xmpp_auth_description">Chosen XMPP account would be used to sign in to Xabber Account. By signing in you accept our privacy policy and terms of service.</string>
 
     <string name="sync_with_xabber_account">Synchronize with Xabber account</string>
     <string name="delete_synced_accounts">Delete synchronized XMPP accounts from this device?</string>

From ca2168cf754309d27a665e8becb8643fb7dab7b3 Mon Sep 17 00:00:00 2001
From: Valery Miller <valera_miller94@mail.ru>
Date: Fri, 21 Sep 2018 15:51:19 +0500
Subject: [PATCH 120/251] Changes in xmpp auth screen

---
 .../privatestorage/PrivateStorageManager.java | 32 ++++++++++
 .../ui/adapter/XMPPAccountAuthAdapter.java    | 20 ++++--
 .../ChooseAccountForXMPPAuthDialog.java       | 63 -------------------
 .../fragment/XAccountXMPPLoginFragment.java   | 27 +++++++-
 .../layout/fragment_xaccount_xmpp_auth.xml    |  1 +
 5 files changed, 71 insertions(+), 72 deletions(-)
 delete mode 100644 xabber/src/main/java/com/xabber/android/ui/fragment/ChooseAccountForXMPPAuthDialog.java

diff --git a/xabber/src/main/java/com/xabber/android/data/extension/privatestorage/PrivateStorageManager.java b/xabber/src/main/java/com/xabber/android/data/extension/privatestorage/PrivateStorageManager.java
index bb9157c495..6dde5e6748 100644
--- a/xabber/src/main/java/com/xabber/android/data/extension/privatestorage/PrivateStorageManager.java
+++ b/xabber/src/main/java/com/xabber/android/data/extension/privatestorage/PrivateStorageManager.java
@@ -5,6 +5,7 @@
 import com.xabber.android.data.account.AccountItem;
 import com.xabber.android.data.account.AccountManager;
 import com.xabber.android.data.entity.AccountJid;
+import com.xabber.android.ui.adapter.XMPPAccountAuthAdapter;
 
 import org.jivesoftware.smack.SmackException;
 import org.jivesoftware.smack.XMPPException;
@@ -13,6 +14,12 @@
 import org.jivesoftware.smackx.iqprivate.packet.DefaultPrivateData;
 import org.jivesoftware.smackx.iqprivate.packet.PrivateData;
 
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.Callable;
+
+import rx.Single;
+
 public class PrivateStorageManager {
 
     private static final String NAMESPACE = "xabber:options";
@@ -74,4 +81,29 @@ private void setPrivateData(AccountJid accountJid, PrivateData privateData) {
         }
     }
 
+    /** Prepare views */
+
+    public Single<List<XMPPAccountAuthAdapter.AccountView>> getAccountViewWithBindings(List<AccountJid> accounts) {
+        return Single.fromCallable(new CallableLoadBindings(accounts));
+    }
+
+    private class CallableLoadBindings implements Callable<List<XMPPAccountAuthAdapter.AccountView>> {
+
+        private List<AccountJid> accounts;
+
+        public CallableLoadBindings(List<AccountJid> accounts) {
+            this.accounts = accounts;
+        }
+
+        @Override
+        public List<XMPPAccountAuthAdapter.AccountView> call() throws Exception {
+            List<XMPPAccountAuthAdapter.AccountView> items = new ArrayList<>();
+            for (AccountJid accountJid : accounts) {
+                items.add(new XMPPAccountAuthAdapter.AccountView(accountJid,
+                        haveXabberAccountBinding(accountJid)));
+            }
+            return items;
+        }
+    }
+
 }
diff --git a/xabber/src/main/java/com/xabber/android/ui/adapter/XMPPAccountAuthAdapter.java b/xabber/src/main/java/com/xabber/android/ui/adapter/XMPPAccountAuthAdapter.java
index 31dcfaf70a..e45ea1f70a 100644
--- a/xabber/src/main/java/com/xabber/android/ui/adapter/XMPPAccountAuthAdapter.java
+++ b/xabber/src/main/java/com/xabber/android/ui/adapter/XMPPAccountAuthAdapter.java
@@ -12,7 +12,6 @@
 import com.xabber.android.data.account.AccountManager;
 import com.xabber.android.data.entity.AccountJid;
 import com.xabber.android.data.extension.avatar.AvatarManager;
-import com.xabber.android.data.extension.privatestorage.PrivateStorageManager;
 import com.xabber.android.ui.color.ColorManager;
 
 import java.util.ArrayList;
@@ -24,7 +23,7 @@
 
 public class XMPPAccountAuthAdapter extends RecyclerView.Adapter {
 
-    private List<AccountJid> items = new ArrayList<>();
+    private List<AccountView> items = new ArrayList<>();
     private Listener listener;
 
     public XMPPAccountAuthAdapter(Listener listener) {
@@ -35,7 +34,7 @@ public interface Listener {
         void onAccountClick(String accountJid);
     }
 
-    public void setItems(List<AccountJid> items) {
+    public void setItems(List<AccountView> items) {
         this.items = items;
         notifyDataSetChanged();
     }
@@ -48,7 +47,7 @@ public RecyclerView.ViewHolder onCreateViewHolder(ViewGroup parent, int viewType
 
     @Override
     public void onBindViewHolder(RecyclerView.ViewHolder holder, int position) {
-        final AccountItem account = AccountManager.getInstance().getAccount(items.get(position));
+        final AccountItem account = AccountManager.getInstance().getAccount(items.get(position).jid);
         XMPPAccountVH viewHolder = (XMPPAccountVH) holder;
 
         // set color
@@ -65,8 +64,7 @@ public void onBindViewHolder(RecyclerView.ViewHolder holder, int position) {
         viewHolder.jid.setText(accountJid);
 
         // set action
-        boolean haveBind = PrivateStorageManager.getInstance().haveXabberAccountBinding(account.getAccount());
-        viewHolder.action.setText(haveBind ? R.string.xaccount_exist : R.string.xaccount_not_exist);
+        viewHolder.action.setText(items.get(position).bind ? R.string.xaccount_exist : R.string.xaccount_not_exist);
 
         // set listener
         viewHolder.itemView.setOnClickListener(new View.OnClickListener() {
@@ -95,4 +93,14 @@ private class XMPPAccountVH extends RecyclerView.ViewHolder {
             action = (TextView) itemView.findViewById(R.id.tvAction);
         }
     }
+
+    public static class AccountView {
+        AccountJid jid;
+        boolean bind;
+
+        public AccountView(AccountJid jid, boolean bind) {
+            this.jid = jid;
+            this.bind = bind;
+        }
+    }
 }
diff --git a/xabber/src/main/java/com/xabber/android/ui/fragment/ChooseAccountForXMPPAuthDialog.java b/xabber/src/main/java/com/xabber/android/ui/fragment/ChooseAccountForXMPPAuthDialog.java
deleted file mode 100644
index 197c892af9..0000000000
--- a/xabber/src/main/java/com/xabber/android/ui/fragment/ChooseAccountForXMPPAuthDialog.java
+++ /dev/null
@@ -1,63 +0,0 @@
-package com.xabber.android.ui.fragment;
-
-import android.app.AlertDialog;
-import android.app.Dialog;
-import android.app.DialogFragment;
-import android.os.Bundle;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
-import android.view.LayoutInflater;
-import android.view.View;
-
-import com.xabber.android.R;
-import com.xabber.android.data.entity.AccountJid;
-import com.xabber.android.ui.adapter.XMPPAccountAuthAdapter;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class ChooseAccountForXMPPAuthDialog extends DialogFragment implements XMPPAccountAuthAdapter.Listener {
-
-    private List<AccountJid> xmppAccounts = new ArrayList<>();
-    private Listener listener;
-
-    public interface Listener {
-        void onAccountClick(String accountJid);
-    }
-
-    public static ChooseAccountForXMPPAuthDialog newInstance(Listener listener, ArrayList<AccountJid> items) {
-        ChooseAccountForXMPPAuthDialog fragment = new ChooseAccountForXMPPAuthDialog();
-        fragment.listener = listener;
-        fragment.xmppAccounts = items;
-        return fragment;
-    }
-
-    @Override
-    public Dialog onCreateDialog(Bundle savedInstanceState) {
-
-        AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
-        builder.setView(setupView())
-                .setTitle(R.string.choose_account);
-
-        return builder.create();
-    }
-
-    public View setupView() {
-        LayoutInflater inflater = getActivity().getLayoutInflater();
-        View view = inflater.inflate(R.layout.fragment_xaccount_xmpp_auth, null);
-
-        XMPPAccountAuthAdapter adapter = new XMPPAccountAuthAdapter(this);
-        adapter.setItems(xmppAccounts);
-
-        RecyclerView recyclerView = view.findViewById(R.id.rlAccounts);
-        recyclerView.setLayoutManager(new LinearLayoutManager(getActivity()));
-        recyclerView.setAdapter(adapter);
-        return view;
-    }
-
-    @Override
-    public void onAccountClick(String accountJid) {
-        listener.onAccountClick(accountJid);
-        dismiss();
-    }
-}
diff --git a/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountXMPPLoginFragment.java b/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountXMPPLoginFragment.java
index 9c22fa7cc0..ef76e99c2a 100644
--- a/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountXMPPLoginFragment.java
+++ b/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountXMPPLoginFragment.java
@@ -14,14 +14,21 @@
 import com.xabber.android.R;
 import com.xabber.android.data.account.AccountManager;
 import com.xabber.android.data.entity.AccountJid;
+import com.xabber.android.data.extension.privatestorage.PrivateStorageManager;
 import com.xabber.android.ui.adapter.XMPPAccountAuthAdapter;
 
 import java.util.ArrayList;
+import java.util.List;
+
+import rx.android.schedulers.AndroidSchedulers;
+import rx.functions.Action1;
+import rx.schedulers.Schedulers;
 
 public class XAccountXMPPLoginFragment extends Fragment implements XMPPAccountAuthAdapter.Listener {
 
     private View progressView;
     private XMPPAccountAuthAdapter adapter;
+    private RecyclerView recyclerView;
 
     private Listener listener;
 
@@ -44,8 +51,7 @@ public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container,
     public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
         progressView = view.findViewById(R.id.progressView);
-
-        RecyclerView recyclerView = view.findViewById(R.id.rlAccounts);
+        recyclerView = view.findViewById(R.id.rlAccounts);
         adapter = new XMPPAccountAuthAdapter(this);
         recyclerView.setLayoutManager(new LinearLayoutManager(getActivity()));
         recyclerView.setAdapter(adapter);
@@ -81,10 +87,25 @@ private void loadData() {
         if (accounts.size() < 1)
             Toast.makeText(getActivity(), "error", Toast.LENGTH_SHORT).show();
         else if (accounts.size() > 1)
-            adapter.setItems(accounts);
+            loadBindings(accounts);
         else listener.onAccountClick(accounts.get(0).getFullJid().toString());
     }
 
+    private void loadBindings(ArrayList<AccountJid> accounts) {
+        showProgress(true);
+        PrivateStorageManager.getInstance().getAccountViewWithBindings(accounts)
+            .subscribeOn(Schedulers.io())
+            .observeOn(AndroidSchedulers.mainThread())
+            .subscribe(new Action1<List<XMPPAccountAuthAdapter.AccountView>>() {
+                @Override
+                public void call(List<XMPPAccountAuthAdapter.AccountView> accountViews) {
+                    showProgress(false);
+                    adapter.setItems(accountViews);
+                    recyclerView.setVisibility(View.VISIBLE);
+                }
+            });
+    }
+
     private void showProgress(boolean show) {
         progressView.setVisibility(show ? View.VISIBLE : View.GONE);
     }
diff --git a/xabber/src/main/res/layout/fragment_xaccount_xmpp_auth.xml b/xabber/src/main/res/layout/fragment_xaccount_xmpp_auth.xml
index 8726ece982..9975fe8e91 100644
--- a/xabber/src/main/res/layout/fragment_xaccount_xmpp_auth.xml
+++ b/xabber/src/main/res/layout/fragment_xaccount_xmpp_auth.xml
@@ -62,6 +62,7 @@
                 android:layout_marginTop="16dp"
                 android:layout_marginRight="8dp"
                 android:layout_marginLeft="8dp"
+                android:visibility="gone"
                 />
 
         </LinearLayout>

From f3d4ea9789d47919334b91f63beb8c66c7e3cca8 Mon Sep 17 00:00:00 2001
From: Valery Miller <valera_miller94@mail.ru>
Date: Fri, 21 Sep 2018 16:01:09 +0500
Subject: [PATCH 121/251] Changes in xmpp auth screen

---
 .../ui/fragment/XAccountXMPPLoginFragment.java      | 13 ++++++++-----
 .../main/res/layout/fragment_xaccount_xmpp_auth.xml | 11 +++++++++++
 xabber/src/main/res/values/xabber_account.xml       |  1 +
 3 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountXMPPLoginFragment.java b/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountXMPPLoginFragment.java
index ef76e99c2a..7404401cae 100644
--- a/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountXMPPLoginFragment.java
+++ b/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountXMPPLoginFragment.java
@@ -9,7 +9,7 @@
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.Toast;
+import android.widget.TextView;
 
 import com.xabber.android.R;
 import com.xabber.android.data.account.AccountManager;
@@ -27,6 +27,7 @@
 public class XAccountXMPPLoginFragment extends Fragment implements XMPPAccountAuthAdapter.Listener {
 
     private View progressView;
+    private TextView tvError;
     private XMPPAccountAuthAdapter adapter;
     private RecyclerView recyclerView;
 
@@ -51,6 +52,7 @@ public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container,
     public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
         progressView = view.findViewById(R.id.progressView);
+        tvError = view.findViewById(R.id.tvError);
         recyclerView = view.findViewById(R.id.rlAccounts);
         adapter = new XMPPAccountAuthAdapter(this);
         recyclerView.setLayoutManager(new LinearLayoutManager(getActivity()));
@@ -83,11 +85,12 @@ public void onAccountClick(String accountJid) {
     }
 
     private void loadData() {
+        tvError.setVisibility(View.GONE);
+        recyclerView.setVisibility(View.GONE);
+
         ArrayList<AccountJid> accounts = new ArrayList<>(AccountManager.getInstance().getEnabledAccounts());
-        if (accounts.size() < 1)
-            Toast.makeText(getActivity(), "error", Toast.LENGTH_SHORT).show();
-        else if (accounts.size() > 1)
-            loadBindings(accounts);
+        if (accounts.size() < 1) tvError.setVisibility(View.VISIBLE);
+        else if (accounts.size() > 1) loadBindings(accounts);
         else listener.onAccountClick(accounts.get(0).getFullJid().toString());
     }
 
diff --git a/xabber/src/main/res/layout/fragment_xaccount_xmpp_auth.xml b/xabber/src/main/res/layout/fragment_xaccount_xmpp_auth.xml
index 9975fe8e91..94e74c4870 100644
--- a/xabber/src/main/res/layout/fragment_xaccount_xmpp_auth.xml
+++ b/xabber/src/main/res/layout/fragment_xaccount_xmpp_auth.xml
@@ -28,6 +28,17 @@
                 android:layout_marginLeft="16dp"
                 />
 
+            <TextView
+                android:id="@+id/tvError"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/xmpp_auth_no_account"
+                android:layout_marginLeft="16dp"
+                android:layout_marginTop="16dp"
+                android:layout_marginBottom="16dp"
+                android:visibility="gone"
+                />
+
             <LinearLayout
                 android:id="@+id/progressView"
                 android:orientation="vertical"
diff --git a/xabber/src/main/res/values/xabber_account.xml b/xabber/src/main/res/values/xabber_account.xml
index 599b18c3bb..1832e613b1 100644
--- a/xabber/src/main/res/values/xabber_account.xml
+++ b/xabber/src/main/res/values/xabber_account.xml
@@ -132,6 +132,7 @@
     <string name="username_rules_dots">Username must not contain two dots in a row</string>
     <string name="sync_security_description">Your passwords are never synchronized and are safe from theft. But you have to enter them on every device (unless you use tokens, which you should)</string>
     <string name="xmpp_auth_description">Chosen XMPP account would be used to sign in to Xabber Account. By signing in you accept our privacy policy and terms of service.</string>
+    <string name="xmpp_auth_no_account">All your XMPP accounts are disabled</string>
 
     <string name="sync_with_xabber_account">Synchronize with Xabber account</string>
     <string name="delete_synced_accounts">Delete synchronized XMPP accounts from this device?</string>

From 1810def044acf5fad5df0787900414e620baaa74 Mon Sep 17 00:00:00 2001
From: Valery Miller <valera_miller94@mail.ru>
Date: Fri, 21 Sep 2018 16:24:21 +0500
Subject: [PATCH 122/251] Changes in xmpp auth screen

---
 .../fragment/XAccountXMPPLoginFragment.java   | 22 ++++++++++++++-----
 .../layout/fragment_xaccount_xmpp_auth.xml    |  5 +++--
 xabber/src/main/res/values/xabber_account.xml |  1 +
 3 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountXMPPLoginFragment.java b/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountXMPPLoginFragment.java
index 7404401cae..c64366e01d 100644
--- a/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountXMPPLoginFragment.java
+++ b/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountXMPPLoginFragment.java
@@ -27,6 +27,7 @@
 public class XAccountXMPPLoginFragment extends Fragment implements XMPPAccountAuthAdapter.Listener {
 
     private View progressView;
+    private TextView tvProgressTitle;
     private TextView tvError;
     private XMPPAccountAuthAdapter adapter;
     private RecyclerView recyclerView;
@@ -52,6 +53,7 @@ public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container,
     public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
         progressView = view.findViewById(R.id.progressView);
+        tvProgressTitle = view.findViewById(R.id.tvProgressTitle);
         tvError = view.findViewById(R.id.tvError);
         recyclerView = view.findViewById(R.id.rlAccounts);
         adapter = new XMPPAccountAuthAdapter(this);
@@ -91,25 +93,35 @@ private void loadData() {
         ArrayList<AccountJid> accounts = new ArrayList<>(AccountManager.getInstance().getEnabledAccounts());
         if (accounts.size() < 1) tvError.setVisibility(View.VISIBLE);
         else if (accounts.size() > 1) loadBindings(accounts);
-        else listener.onAccountClick(accounts.get(0).getFullJid().toString());
+        else connectViaJid(accounts.get(0).getFullJid().toString());
     }
 
     private void loadBindings(ArrayList<AccountJid> accounts) {
-        showProgress(true);
+        showProgress(getActivity().getResources().getString(R.string.progress_title_account_list));
         PrivateStorageManager.getInstance().getAccountViewWithBindings(accounts)
             .subscribeOn(Schedulers.io())
             .observeOn(AndroidSchedulers.mainThread())
             .subscribe(new Action1<List<XMPPAccountAuthAdapter.AccountView>>() {
                 @Override
                 public void call(List<XMPPAccountAuthAdapter.AccountView> accountViews) {
-                    showProgress(false);
+                    hideProgress();
                     adapter.setItems(accountViews);
                     recyclerView.setVisibility(View.VISIBLE);
                 }
             });
     }
 
-    private void showProgress(boolean show) {
-        progressView.setVisibility(show ? View.VISIBLE : View.GONE);
+    private void showProgress(String title) {
+        tvProgressTitle.setText(title);
+        progressView.setVisibility(View.VISIBLE);
+    }
+
+    private void hideProgress() {
+        progressView.setVisibility(View.GONE);
+    }
+
+    private void connectViaJid(String jid) {
+        showProgress(getActivity().getResources().getString(R.string.progress_title_connect, jid));
+        listener.onAccountClick(jid);
     }
 }
diff --git a/xabber/src/main/res/layout/fragment_xaccount_xmpp_auth.xml b/xabber/src/main/res/layout/fragment_xaccount_xmpp_auth.xml
index 94e74c4870..2eb5a82af8 100644
--- a/xabber/src/main/res/layout/fragment_xaccount_xmpp_auth.xml
+++ b/xabber/src/main/res/layout/fragment_xaccount_xmpp_auth.xml
@@ -55,10 +55,11 @@
                     />
 
                 <TextView
-                    android:layout_width="wrap_content"
+                    android:id="@+id/tvProgressTitle"
+                    android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:text="@string/progress_title_account_list"
-                    android:layout_gravity="center_horizontal"
+                    android:gravity="center"
                     android:layout_marginBottom="20dp"
                     />
 
diff --git a/xabber/src/main/res/values/xabber_account.xml b/xabber/src/main/res/values/xabber_account.xml
index 1832e613b1..617cc369a2 100644
--- a/xabber/src/main/res/values/xabber_account.xml
+++ b/xabber/src/main/res/values/xabber_account.xml
@@ -52,6 +52,7 @@
     <string name="progress_title_bind_social">Bind social network</string>
     <string name="progress_title_unbind_social">Unbind social network</string>
     <string name="progress_title_account_list">Loading list of accounts..</string>
+    <string name="progress_title_connect">Connecting to Xabber Account via %1$s</string>
 
     <string name="label_username">Pick your username and host</string>
     <string name="hint_username">username</string>

From 19c2faeef45c4fb1c7ca47d8f0debf4aa62d15ac Mon Sep 17 00:00:00 2001
From: Valery Miller <valera_miller94@mail.ru>
Date: Fri, 21 Sep 2018 16:46:42 +0500
Subject: [PATCH 123/251] Changes in xmpp auth screen

---
 .../ui/activity/XabberAccountActivity.java     | 18 ++++++++++++++----
 .../ui/fragment/XAccountXMPPLoginFragment.java | 15 ++++++++++++---
 2 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/xabber/src/main/java/com/xabber/android/ui/activity/XabberAccountActivity.java b/xabber/src/main/java/com/xabber/android/ui/activity/XabberAccountActivity.java
index 11b563f09e..6beaf130cb 100644
--- a/xabber/src/main/java/com/xabber/android/ui/activity/XabberAccountActivity.java
+++ b/xabber/src/main/java/com/xabber/android/ui/activity/XabberAccountActivity.java
@@ -83,10 +83,7 @@ public void onClick(View v) {
     protected void onResume() {
         super.onResume();
         onPrepareOptionsMenu(toolbar.getMenu());
-
-        XabberAccount account = XabberAccountManager.getInstance().getAccount();
-        if (account != null) showInfoFragment();
-        else showLoginFragment();
+        subscribeForXabberAccount();
     }
 
     @Override
@@ -130,6 +127,19 @@ protected void hideProgress() {
         }
     }
 
+    private void subscribeForXabberAccount() {
+        compositeSubscription.add(XabberAccountManager.getInstance().subscribeForAccount()
+            .subscribeOn(Schedulers.io())
+            .observeOn(AndroidSchedulers.mainThread())
+            .doOnNext(new Action1<XabberAccount>() {
+                @Override
+                public void call(XabberAccount account) {
+                    if (account != null) showInfoFragment();
+                    else showLoginFragment();
+                }
+            }).subscribe());
+    }
+
     /** Social Auth */
 
     @Override
diff --git a/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountXMPPLoginFragment.java b/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountXMPPLoginFragment.java
index c64366e01d..da830319e4 100644
--- a/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountXMPPLoginFragment.java
+++ b/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountXMPPLoginFragment.java
@@ -23,6 +23,7 @@
 import rx.android.schedulers.AndroidSchedulers;
 import rx.functions.Action1;
 import rx.schedulers.Schedulers;
+import rx.subscriptions.CompositeSubscription;
 
 public class XAccountXMPPLoginFragment extends Fragment implements XMPPAccountAuthAdapter.Listener {
 
@@ -32,6 +33,7 @@ public class XAccountXMPPLoginFragment extends Fragment implements XMPPAccountAu
     private XMPPAccountAuthAdapter adapter;
     private RecyclerView recyclerView;
 
+    private CompositeSubscription compositeSubscription = new CompositeSubscription();
     private Listener listener;
 
     public interface Listener {
@@ -75,6 +77,12 @@ public void onDetach() {
         listener = null;
     }
 
+    @Override
+    public void onPause() {
+        super.onPause();
+        compositeSubscription.clear();
+    }
+
     @Override
     public void onResume() {
         super.onResume();
@@ -83,7 +91,7 @@ public void onResume() {
 
     @Override
     public void onAccountClick(String accountJid) {
-        listener.onAccountClick(accountJid);
+        connectViaJid(accountJid);
     }
 
     private void loadData() {
@@ -98,7 +106,7 @@ private void loadData() {
 
     private void loadBindings(ArrayList<AccountJid> accounts) {
         showProgress(getActivity().getResources().getString(R.string.progress_title_account_list));
-        PrivateStorageManager.getInstance().getAccountViewWithBindings(accounts)
+        compositeSubscription.add(PrivateStorageManager.getInstance().getAccountViewWithBindings(accounts)
             .subscribeOn(Schedulers.io())
             .observeOn(AndroidSchedulers.mainThread())
             .subscribe(new Action1<List<XMPPAccountAuthAdapter.AccountView>>() {
@@ -108,7 +116,7 @@ public void call(List<XMPPAccountAuthAdapter.AccountView> accountViews) {
                     adapter.setItems(accountViews);
                     recyclerView.setVisibility(View.VISIBLE);
                 }
-            });
+            }));
     }
 
     private void showProgress(String title) {
@@ -121,6 +129,7 @@ private void hideProgress() {
     }
 
     private void connectViaJid(String jid) {
+        recyclerView.setVisibility(View.GONE);
         showProgress(getActivity().getResources().getString(R.string.progress_title_connect, jid));
         listener.onAccountClick(jid);
     }

From 8b1c1d1a38d40320dcba8c0126b0995f5d610584 Mon Sep 17 00:00:00 2001
From: Valery Miller <valera_miller94@mail.ru>
Date: Fri, 21 Sep 2018 17:16:13 +0500
Subject: [PATCH 124/251] Added support html for some textviews

---
 .../xabber/android/ui/fragment/XAccountSignUpFragment1.java  | 3 ++-
 .../xabber/android/ui/fragment/XAccountSignUpFragment4.java  | 5 +++++
 xabber/src/main/res/layout/fragment_xaccount_signup_4.xml    | 1 +
 xabber/src/main/res/values/xabber_account.xml                | 2 +-
 4 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountSignUpFragment1.java b/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountSignUpFragment1.java
index 8fddb4b1fe..7d9cb2502f 100644
--- a/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountSignUpFragment1.java
+++ b/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountSignUpFragment1.java
@@ -4,6 +4,7 @@
 import android.graphics.drawable.Drawable;
 import android.os.Bundle;
 import android.support.annotation.Nullable;
+import android.text.Html;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -62,7 +63,7 @@ public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
         spinnerDomain.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
             @Override
             public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
-                tvDescription.setText(hosts.get(position).getDescription());
+                tvDescription.setText(Html.fromHtml(hosts.get(position).getDescription()));
             }
 
             @Override
diff --git a/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountSignUpFragment4.java b/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountSignUpFragment4.java
index e8fd413ba9..f33121af8f 100644
--- a/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountSignUpFragment4.java
+++ b/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountSignUpFragment4.java
@@ -5,10 +5,12 @@
 import android.content.Context;
 import android.os.Bundle;
 import android.support.annotation.Nullable;
+import android.text.Html;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.Button;
+import android.widget.TextView;
 
 import com.xabber.android.R;
 
@@ -16,6 +18,7 @@ public class XAccountSignUpFragment4 extends Fragment {
 
     private Button btnStart;
     private Listener listener;
+    private TextView tvDescription;
 
     public interface Listener {
         void onStep4Completed();
@@ -35,6 +38,8 @@ public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container,
     @Override
     public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
 
+        tvDescription = view.findViewById(R.id.tvDescription);
+        tvDescription.setText(Html.fromHtml(getActivity().getString(R.string.account_secure_description)));
         btnStart = view.findViewById(R.id.btnStart);
         btnStart.setOnClickListener(new View.OnClickListener() {
             @Override
diff --git a/xabber/src/main/res/layout/fragment_xaccount_signup_4.xml b/xabber/src/main/res/layout/fragment_xaccount_signup_4.xml
index 7081dc3897..1e1a33e2bd 100644
--- a/xabber/src/main/res/layout/fragment_xaccount_signup_4.xml
+++ b/xabber/src/main/res/layout/fragment_xaccount_signup_4.xml
@@ -32,6 +32,7 @@
         >
 
         <TextView
+            android:id="@+id/tvDescription"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="@string/account_secure_description"
diff --git a/xabber/src/main/res/values/xabber_account.xml b/xabber/src/main/res/values/xabber_account.xml
index 617cc369a2..29eca0fe43 100644
--- a/xabber/src/main/res/values/xabber_account.xml
+++ b/xabber/src/main/res/values/xabber_account.xml
@@ -216,5 +216,5 @@
 
     <string name="license_url" translatable="false">https://www.xabber.com/policy/</string>
     <string name="accept_license">Accept privacy policy</string>
-    <string name="account_secure_description">Secure your account by linking it with at least one social network or email. If you don’t do that and lose your password, you’ll never be able to restore access to your account!</string>
+    <string name="account_secure_description"><![CDATA[Secure your account by linking it with <i>at least one</i> social network or email. If you don’t do that and lose your password, you’ll never be able to restore access to your account!]]></string>
 </resources>
\ No newline at end of file

From 801bbb230a5bd0234c603bba9f5045e08a3cc13c Mon Sep 17 00:00:00 2001
From: Valery Miller <valera_miller94@mail.ru>
Date: Fri, 21 Sep 2018 17:38:32 +0500
Subject: [PATCH 125/251] Added support for price field from hosts

---
 .../com/xabber/android/data/xaccount/AuthManager.java     | 8 +++++++-
 .../com/xabber/android/ui/adapter/HostSpinnerAdapter.java | 6 +++---
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/xabber/src/main/java/com/xabber/android/data/xaccount/AuthManager.java b/xabber/src/main/java/com/xabber/android/data/xaccount/AuthManager.java
index c14abb1846..a374190a07 100644
--- a/xabber/src/main/java/com/xabber/android/data/xaccount/AuthManager.java
+++ b/xabber/src/main/java/com/xabber/android/data/xaccount/AuthManager.java
@@ -410,11 +410,13 @@ public List<Host> getHosts() {
     public static class Host {
         final String host;
         final String description;
+        final String price;
         final boolean is_free;
 
-        public Host(String host, String description, boolean is_free) {
+        public Host(String host, String description, String price, boolean is_free) {
             this.host = host;
             this.description = description;
+            this.price = price;
             this.is_free = is_free;
         }
 
@@ -426,6 +428,10 @@ public String getDescription() {
             return description;
         }
 
+        public String getPrice() {
+            return price;
+        }
+
         public boolean isFree() {
             return is_free;
         }
diff --git a/xabber/src/main/java/com/xabber/android/ui/adapter/HostSpinnerAdapter.java b/xabber/src/main/java/com/xabber/android/ui/adapter/HostSpinnerAdapter.java
index 3103c854c7..4a95d528d4 100644
--- a/xabber/src/main/java/com/xabber/android/ui/adapter/HostSpinnerAdapter.java
+++ b/xabber/src/main/java/com/xabber/android/ui/adapter/HostSpinnerAdapter.java
@@ -32,14 +32,14 @@ public View getDropDownView(int position, View convertView, ViewGroup parent) {
     }
 
     public View getCustomView(int position, View convertView, ViewGroup parent) {
+        AuthManager.Host host = mData.get(position);
 
         View view = mInflater.inflate(R.layout.item_host, parent, false);
         TextView tvHost = (TextView) view.findViewById(R.id.tvHost);
         TextView tvStatus = (TextView) view.findViewById(R.id.tvStatus);
 
-        tvHost.setText(mData.get(position).getHost());
-        tvStatus.setText(mData.get(position).isFree()
-                ? Application.getInstance().getResources().getString(R.string.free) : "");
+        tvHost.setText(host.getHost());
+        tvStatus.setText(host.isFree() ? Application.getInstance().getResources().getString(R.string.free) : host.getPrice());
 
         return view;
     }

From 6a9ba918daea188e23919b914a57ac40ceeb0c20 Mon Sep 17 00:00:00 2001
From: Valery Miller <valera_miller94@mail.ru>
Date: Fri, 21 Sep 2018 18:00:48 +0500
Subject: [PATCH 126/251] Added showing current item in host-spinner

---
 .../com/xabber/android/ui/adapter/HostSpinnerAdapter.java | 8 ++++++++
 .../android/ui/fragment/XAccountSignUpFragment1.java      | 4 +++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/xabber/src/main/java/com/xabber/android/ui/adapter/HostSpinnerAdapter.java b/xabber/src/main/java/com/xabber/android/ui/adapter/HostSpinnerAdapter.java
index 4a95d528d4..bfef0cdd3e 100644
--- a/xabber/src/main/java/com/xabber/android/ui/adapter/HostSpinnerAdapter.java
+++ b/xabber/src/main/java/com/xabber/android/ui/adapter/HostSpinnerAdapter.java
@@ -18,6 +18,7 @@ public class HostSpinnerAdapter extends ArrayAdapter<String> {
 
     private List<AuthManager.Host> mData;
     private LayoutInflater mInflater;
+    private int currentPosition;
 
     public HostSpinnerAdapter(@NonNull Context context, int resource, @NonNull List<String> hosts,  @NonNull List<AuthManager.Host> objects) {
         super(context, resource, hosts);
@@ -26,6 +27,10 @@ public HostSpinnerAdapter(@NonNull Context context, int resource, @NonNull List<
         mInflater = (LayoutInflater) context.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
     }
 
+    public void setCurrentPosition(int position) {
+        this.currentPosition = position;
+    }
+
     @Override
     public View getDropDownView(int position, View convertView, ViewGroup parent) {
         return getCustomView(position, convertView, parent);
@@ -41,6 +46,9 @@ public View getCustomView(int position, View convertView, ViewGroup parent) {
         tvHost.setText(host.getHost());
         tvStatus.setText(host.isFree() ? Application.getInstance().getResources().getString(R.string.free) : host.getPrice());
 
+        if (position == currentPosition) view.setBackgroundColor(
+                Application.getInstance().getResources().getColor(R.color.grey_200));
+
         return view;
     }
 }
diff --git a/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountSignUpFragment1.java b/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountSignUpFragment1.java
index 7d9cb2502f..74f07833dc 100644
--- a/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountSignUpFragment1.java
+++ b/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountSignUpFragment1.java
@@ -36,6 +36,7 @@ public class XAccountSignUpFragment1 extends Fragment implements View.OnClickLis
     private XAccountSignUpFragment1.Listener listener;
 
     private List<AuthManager.Host> hosts;
+    private HostSpinnerAdapter adapter;
 
     public interface Listener {
         void onGetHosts();
@@ -64,6 +65,7 @@ public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
             @Override
             public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
                 tvDescription.setText(Html.fromHtml(hosts.get(position).getDescription()));
+                if (adapter != null) adapter.setCurrentPosition(position);
             }
 
             @Override
@@ -179,7 +181,7 @@ public void setupHosts(List<AuthManager.Host> hosts) {
         for (AuthManager.Host host : hosts) {
             strings.add(host.getHost());
         }
-        HostSpinnerAdapter adapter = new HostSpinnerAdapter(getActivity(),
+        adapter = new HostSpinnerAdapter(getActivity(),
                 android.R.layout.simple_spinner_item, strings, this.hosts);
         spinnerDomain.setAdapter(adapter);
     }

From 64a6e795521bba31272c096fab1bf9f4b396ddd7 Mon Sep 17 00:00:00 2001
From: Valery Miller <valera_miller94@mail.ru>
Date: Fri, 21 Sep 2018 18:12:56 +0500
Subject: [PATCH 127/251] Save current host in signup screen

---
 .../xabber/android/ui/fragment/XAccountSignUpFragment1.java    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountSignUpFragment1.java b/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountSignUpFragment1.java
index 74f07833dc..87158ae215 100644
--- a/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountSignUpFragment1.java
+++ b/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountSignUpFragment1.java
@@ -82,12 +82,13 @@ public void onNothingSelected(AdapterView<?> parent) {
         btnNext.setOnClickListener(this);
 
         tvDescription = view.findViewById(R.id.tvDescription);
+
+        if (listener != null) listener.onGetHosts();
     }
 
     @Override
     public void onResume() {
         super.onResume();
-        if (listener != null) listener.onGetHosts();
         setupSocial();
 
         String username = SignUpRepo.getInstance().getUsername();

From bd4808b0ce9dfae0cdf9982c6e50100a049edcb2 Mon Sep 17 00:00:00 2001
From: Valery Miller <valera_miller94@mail.ru>
Date: Fri, 21 Sep 2018 18:31:03 +0500
Subject: [PATCH 128/251] Changes in signup_1 screen. Added scroll. Changed
 spinner.

---
 .../main/res/layout/fragment_xaccount_signup_1.xml  | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/xabber/src/main/res/layout/fragment_xaccount_signup_1.xml b/xabber/src/main/res/layout/fragment_xaccount_signup_1.xml
index 6d6d19bdc0..64e968311b 100644
--- a/xabber/src/main/res/layout/fragment_xaccount_signup_1.xml
+++ b/xabber/src/main/res/layout/fragment_xaccount_signup_1.xml
@@ -25,6 +25,10 @@
 
     </LinearLayout>
 
+    <ScrollView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
     <LinearLayout
         android:orientation="vertical"
         android:layout_width="match_parent"
@@ -77,6 +81,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
+                android:paddingRight="-12dp"
                 >
 
                 <Spinner
@@ -89,8 +94,8 @@
                 <View
                     android:id="@+id/spinnerBorder"
                     android:layout_width="match_parent"
-                    android:layout_height="1dp"
-                    android:background="#757575"
+                    android:layout_height="2dp"
+                    android:background="@color/android_default_accent_color"
                     android:layout_marginTop="1dp"
                     android:layout_marginLeft="7dp"
                     android:layout_marginRight="16dp"
@@ -113,7 +118,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:paddingLeft="4dp"
-            android:layout_marginTop="16dp"
+            android:layout_marginTop="8dp"
             />
 
         <RelativeLayout
@@ -151,6 +156,6 @@
 
     </LinearLayout>
 
-
+    </ScrollView>
 
 </LinearLayout>
\ No newline at end of file

From 2d8e1865c9c1002f5714a857c8b28a61e4cc6d45 Mon Sep 17 00:00:00 2001
From: Valery Miller <valera_miller94@mail.ru>
Date: Fri, 21 Sep 2018 18:42:07 +0500
Subject: [PATCH 129/251] Hide keyboard on 3 step signup

---
 .../android/ui/activity/XabberLoginActivity.java     | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/xabber/src/main/java/com/xabber/android/ui/activity/XabberLoginActivity.java b/xabber/src/main/java/com/xabber/android/ui/activity/XabberLoginActivity.java
index 487837312d..b91950216f 100644
--- a/xabber/src/main/java/com/xabber/android/ui/activity/XabberLoginActivity.java
+++ b/xabber/src/main/java/com/xabber/android/ui/activity/XabberLoginActivity.java
@@ -1,5 +1,6 @@
 package com.xabber.android.ui.activity;
 
+import android.app.Activity;
 import android.app.Fragment;
 import android.app.FragmentTransaction;
 import android.app.ProgressDialog;
@@ -12,6 +13,7 @@
 import android.support.v7.widget.Toolbar;
 import android.util.Log;
 import android.view.View;
+import android.view.inputmethod.InputMethodManager;
 import android.widget.Toast;
 
 import com.google.android.gms.common.api.ApiException;
@@ -169,6 +171,7 @@ public void showSignUpStep3Fragment() {
         currentFragment = FRAGMENT_SIGNUP_STEP3;
 
         setupToolbar(false);
+        hideKeyboard();
     }
 
     public void showSignUpStep4Fragment() {
@@ -219,6 +222,15 @@ public void onForgotPassClick() {
         startActivity(intent);
     }
 
+    public void hideKeyboard() {
+        // Check if no view has focus
+        View view = getCurrentFocus();
+        if (view != null) {
+            InputMethodManager inputManager = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
+            if (inputManager != null) inputManager.hideSoftInputFromWindow(view.getWindowToken(), InputMethodManager.HIDE_NOT_ALWAYS);
+        }
+    }
+
     @Override
     protected void showProgress(String title) {
         if (!isFinishing()) {

From 5ce15b5b9011c764cff7d385f3c10d799cd60c71 Mon Sep 17 00:00:00 2001
From: Valery Miller <valera_miller94@mail.ru>
Date: Fri, 21 Sep 2018 18:56:27 +0500
Subject: [PATCH 130/251] Button in signup step 4 depend of binded emails

---
 .../ui/fragment/XAccountSignUpFragment4.java  | 35 +++++++++++++++++++
 .../res/layout/fragment_xaccount_signup_4.xml |  2 +-
 2 files changed, 36 insertions(+), 1 deletion(-)

diff --git a/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountSignUpFragment4.java b/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountSignUpFragment4.java
index f33121af8f..e2e0fa65f3 100644
--- a/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountSignUpFragment4.java
+++ b/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountSignUpFragment4.java
@@ -13,6 +13,13 @@
 import android.widget.TextView;
 
 import com.xabber.android.R;
+import com.xabber.android.data.xaccount.XabberAccount;
+import com.xabber.android.data.xaccount.XabberAccountManager;
+
+import rx.android.schedulers.AndroidSchedulers;
+import rx.functions.Action1;
+import rx.schedulers.Schedulers;
+import rx.subscriptions.CompositeSubscription;
 
 public class XAccountSignUpFragment4 extends Fragment {
 
@@ -24,6 +31,8 @@ public interface Listener {
         void onStep4Completed();
     }
 
+    private CompositeSubscription compositeSubscription = new CompositeSubscription();
+
     public static XAccountSignUpFragment4 newInstance() {
         XAccountSignUpFragment4 fragment = new XAccountSignUpFragment4();
         return fragment;
@@ -66,4 +75,30 @@ public void onDetach() {
         super.onDetach();
         listener = null;
     }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        subscribeForXabberAccount();
+    }
+
+    @Override
+    public void onPause() {
+        super.onPause();
+        compositeSubscription.clear();
+    }
+
+    private void subscribeForXabberAccount() {
+        compositeSubscription.add(XabberAccountManager.getInstance().subscribeForAccount()
+            .subscribeOn(Schedulers.io())
+            .observeOn(AndroidSchedulers.mainThread())
+            .doOnNext(new Action1<XabberAccount>() {
+                @Override
+                public void call(XabberAccount account) {
+                    if (account.getSocialBindings().size() > 0 || account.getEmails().size() > 0)
+                        btnStart.setText(R.string.title_start_messaging);
+                    else btnStart.setText(R.string.skip);
+                }
+            }).subscribe());
+    }
 }
diff --git a/xabber/src/main/res/layout/fragment_xaccount_signup_4.xml b/xabber/src/main/res/layout/fragment_xaccount_signup_4.xml
index 1e1a33e2bd..13b6d01981 100644
--- a/xabber/src/main/res/layout/fragment_xaccount_signup_4.xml
+++ b/xabber/src/main/res/layout/fragment_xaccount_signup_4.xml
@@ -64,7 +64,7 @@
                 android:layout_alignParentEnd="true"
                 android:layout_alignParentRight="true"
                 android:textColor="@color/white"
-                android:text="@string/title_start_messaging"
+                android:text="@string/skip"
                 />
 
         </RelativeLayout>

From 530161201fdce997ac849e98b8fcabce285ab4da Mon Sep 17 00:00:00 2001
From: Valery Miller <valera_miller94@mail.ru>
Date: Fri, 21 Sep 2018 19:20:24 +0500
Subject: [PATCH 131/251] Up version to 514

---
 xabber/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/xabber/build.gradle b/xabber/build.gradle
index 243f36d1c2..864c3211f4 100644
--- a/xabber/build.gradle
+++ b/xabber/build.gradle
@@ -10,8 +10,8 @@ android {
     defaultConfig {
         minSdkVersion 15
         targetSdkVersion 27
-        versionCode 513
-        versionName '2.4.2(513)'
+        versionCode 514
+        versionName '2.4.2(514)'
     }
 
     lintOptions {

From f5fa893c46b2227386d89bdaf42725acd7cdea79 Mon Sep 17 00:00:00 2001
From: Valery Miller <valera_miller94@mail.ru>
Date: Mon, 24 Sep 2018 12:11:33 +0500
Subject: [PATCH 132/251] Fixed error with binding activities for MTM

---
 .../xabber/android/data/connection/CertificateManager.java   | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/xabber/src/main/java/com/xabber/android/data/connection/CertificateManager.java b/xabber/src/main/java/com/xabber/android/data/connection/CertificateManager.java
index efe6d4495d..6d8539cf6a 100644
--- a/xabber/src/main/java/com/xabber/android/data/connection/CertificateManager.java
+++ b/xabber/src/main/java/com/xabber/android/data/connection/CertificateManager.java
@@ -16,6 +16,7 @@
 
 public class CertificateManager implements OnAccountRemovedListener {
 
+    private Activity currentActivityForBind;
     private static CertificateManager instance;
 
     public static CertificateManager getInstance() {
@@ -37,6 +38,7 @@ private CertificateManager() {
     @NonNull
     MemorizingTrustManager getNewMemorizingTrustManager(@NonNull final AccountJid accountJid) {
         MemorizingTrustManager mtm = new MemorizingTrustManager(Application.getInstance());
+        if (currentActivityForBind != null) mtm.bindDisplayActivity(currentActivityForBind);
         memorizingTrustManagerMap.put(accountJid, mtm);
         return mtm;
     }
@@ -44,6 +46,7 @@ MemorizingTrustManager getNewMemorizingTrustManager(@NonNull final AccountJid ac
     @NonNull
     public MemorizingTrustManager getNewFileUploadManager(@NonNull final AccountJid accountJid) {
         MemorizingTrustManager mtm = new MemorizingTrustManager(Application.getInstance());
+        if (currentActivityForBind != null) mtm.bindDisplayActivity(currentActivityForBind);
         fileUploadMap.put(accountJid, mtm);
         return mtm;
     }
@@ -56,6 +59,7 @@ public void registerActivity(Activity activity) {
         for (MemorizingTrustManager memorizingTrustManager : fileUploadMap.values()) {
             memorizingTrustManager.bindDisplayActivity(activity);
         }
+        currentActivityForBind = activity;
     }
 
     public void unregisterActivity(Activity activity) {
@@ -66,6 +70,7 @@ public void unregisterActivity(Activity activity) {
         for (MemorizingTrustManager memorizingTrustManager : fileUploadMap.values()) {
             memorizingTrustManager.unbindDisplayActivity(activity);
         }
+        if (currentActivityForBind == activity) currentActivityForBind = null;
     }
 
     @Override

From 9e7fdd463c72f739f7dd255e355c28a8cb7daf8f Mon Sep 17 00:00:00 2001
From: Valery Miller <valera_miller94@mail.ru>
Date: Mon, 24 Sep 2018 12:55:37 +0500
Subject: [PATCH 133/251] Add binding to Xabber Account in xmpp-private storage
 on connect to XMPP-account

---
 .../android/data/xaccount/XMPPAuthManager.java     | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/xabber/src/main/java/com/xabber/android/data/xaccount/XMPPAuthManager.java b/xabber/src/main/java/com/xabber/android/data/xaccount/XMPPAuthManager.java
index be96ba04b7..1ecde64f02 100644
--- a/xabber/src/main/java/com/xabber/android/data/xaccount/XMPPAuthManager.java
+++ b/xabber/src/main/java/com/xabber/android/data/xaccount/XMPPAuthManager.java
@@ -4,6 +4,7 @@
 
 import com.xabber.android.data.Application;
 import com.xabber.android.data.NetworkException;
+import com.xabber.android.data.account.AccountManager;
 import com.xabber.android.data.connection.ConnectionItem;
 import com.xabber.android.data.connection.listeners.OnConnectedListener;
 import com.xabber.android.data.connection.listeners.OnPacketListener;
@@ -85,8 +86,9 @@ public void onConnected(final ConnectionItem connection) {
         Application.getInstance().runInBackground(new Runnable() {
             @Override
             public void run() {
-                if (XabberAccountManager.getInstance().getAccount() == null) {
-                    AccountJid accountJid = connection.getAccount();
+                XabberAccount xabberAccount = XabberAccountManager.getInstance().getAccount();
+                AccountJid accountJid = connection.getAccount();
+                if (xabberAccount == null) {
                     if (accountsForCheck.contains(accountJid)) {
                         try {
                             Thread.sleep(500);
@@ -97,6 +99,14 @@ public void run() {
                             requestXMPPAuthCode(accountJid);
                         accountsForCheck.remove(accountJid);
                     }
+                } else if (xabberAccount.getFullUsername()
+                        .equals(AccountManager.getInstance().getVerboseName(accountJid))) {
+                    try {
+                        Thread.sleep(500);
+                    } catch (InterruptedException e) {
+                        e.printStackTrace();
+                    }
+                    PrivateStorageManager.getInstance().setXabberAccountBinding(accountJid, true);
                 }
             }
         });

From 3db6da102399e30ec7f8d292895ffc0f21723df0 Mon Sep 17 00:00:00 2001
From: Valery Miller <valera_miller94@mail.ru>
Date: Mon, 24 Sep 2018 15:10:29 +0500
Subject: [PATCH 134/251] Set sync all accounts on signup and xmpp-auth

---
 .../java/com/xabber/android/data/xaccount/AuthManager.java    | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/xabber/src/main/java/com/xabber/android/data/xaccount/AuthManager.java b/xabber/src/main/java/com/xabber/android/data/xaccount/AuthManager.java
index a374190a07..4ba905988e 100644
--- a/xabber/src/main/java/com/xabber/android/data/xaccount/AuthManager.java
+++ b/xabber/src/main/java/com/xabber/android/data/xaccount/AuthManager.java
@@ -265,6 +265,7 @@ public static Single<XMPPCode> requestXMPPCode(String jid) {
     }
 
     public static Single<XabberAccount> confirmXMPP(final String jid, String code) {
+        SettingsManager.setSyncAllAccounts(true);
         return HttpApiManager.getXabberApi().confirmXMPP(new CodeConfirm(code, jid))
                 .flatMap(new Func1<XabberAccountDTO, Single<? extends XabberAccount>>() {
                     @Override
@@ -287,6 +288,7 @@ public static Single<HostResponse> getHosts() {
 
     public static Single<XabberAccount> signupv2(String username, String host, String password,
                                                  String captchaToken) {
+        SettingsManager.setSyncAllAccounts(true);
         return HttpApiManager.getXabberApi().signupv2(new SignUpFields(username, host,
             password, captchaToken))
             .flatMap(new Func1<XabberAccountDTO, Single<? extends XabberAccount>>() {
@@ -300,7 +302,7 @@ public Single<? extends XabberAccount> call(XabberAccountDTO xabberAccountDTO) {
 
     public static Single<XabberAccount> signupv2(String username, String host, String password,
                                                  String provider, String credentials) {
-
+        SettingsManager.setSyncAllAccounts(true);
         return HttpApiManager.getXabberApi().signupv2(new SignUpFields(username, host,
                 password, provider, credentials))
                 .flatMap(new Func1<XabberAccountDTO, Single<? extends XabberAccount>>() {

From 36952bae9f508ccc097ee71a1c3c08c2b3bc2582 Mon Sep 17 00:00:00 2001
From: Valery Miller <valera_miller94@mail.ru>
Date: Mon, 24 Sep 2018 15:23:38 +0500
Subject: [PATCH 135/251] Changes in tutorial screen - added new slides

---
 .../android/ui/adapter/TutorialAdapter.java   | 12 +++++++-
 .../main/res/values-ru-rRU/xabber_account.xml |  8 ------
 xabber/src/main/res/values/xabber_account.xml | 28 +++++++++++++------
 3 files changed, 30 insertions(+), 18 deletions(-)

diff --git a/xabber/src/main/java/com/xabber/android/ui/adapter/TutorialAdapter.java b/xabber/src/main/java/com/xabber/android/ui/adapter/TutorialAdapter.java
index b68805fdfe..a4c6f1d960 100644
--- a/xabber/src/main/java/com/xabber/android/ui/adapter/TutorialAdapter.java
+++ b/xabber/src/main/java/com/xabber/android/ui/adapter/TutorialAdapter.java
@@ -14,7 +14,7 @@
  */
 
 public class TutorialAdapter extends FragmentPagerAdapter {
-    private static int PAGE_NUMBERS = 4;
+    private static int PAGE_NUMBERS = 9;
 
     public TutorialAdapter(FragmentManager fm) {
         super(fm);
@@ -31,6 +31,16 @@ public Fragment getItem(int position) {
                 return TutorialFragment.newInstance(R.string.tutorial_title_3, R.string.tutorial_description_3, R.drawable.art_tutorial_3);
             case 3:
                 return TutorialFragment.newInstance(R.string.tutorial_title_4, R.string.tutorial_description_4, R.drawable.art_tutorial_4);
+            case 4:
+                return TutorialFragment.newInstance(R.string.tutorial_title_5, R.string.tutorial_description_5, R.drawable.art_tutorial_1);
+            case 5:
+                return TutorialFragment.newInstance(R.string.tutorial_title_6, R.string.tutorial_description_6, R.drawable.art_tutorial_2);
+            case 6:
+                return TutorialFragment.newInstance(R.string.tutorial_title_7, R.string.tutorial_description_7, R.drawable.art_tutorial_3);
+            case 7:
+                return TutorialFragment.newInstance(R.string.tutorial_title_8, R.string.tutorial_description_8, R.drawable.art_tutorial_4);
+            case 8:
+                return TutorialFragment.newInstance(R.string.tutorial_title_9, R.string.tutorial_description_9, R.drawable.art_tutorial_1);
             default:
                 return null;
         }
diff --git a/xabber/src/main/res/values-ru-rRU/xabber_account.xml b/xabber/src/main/res/values-ru-rRU/xabber_account.xml
index 462868ec7e..7c8f74312e 100644
--- a/xabber/src/main/res/values-ru-rRU/xabber_account.xml
+++ b/xabber/src/main/res/values-ru-rRU/xabber_account.xml
@@ -107,14 +107,6 @@
   <string name="sync_status_not_allowed">Синхронизация недоступна</string>
   <string name="sync_status_enabled">Синхронизация включена</string>
   <string name="sync_status_disabled">Синхронизация выключена</string>
-  <string name="tutorial_title_1">Лучший XMPP сервис</string>
-  <string name="tutorial_title_2">Представляем аккаунт Xabber</string>
-  <string name="tutorial_title_3">Синхронизация устройств</string>
-  <string name="tutorial_title_4">Социальная авторизация</string>
-  <string name="tutorial_description_1">Бесплатный XMPP аккаунт от разработчиков Xabber с гарантированной поддержкой всех необходимых функций</string>
-  <string name="tutorial_description_2">Зарегистрируйте учётную запись Xabber и улучшите работу чата на всех используемых платформах</string>
-  <string name="tutorial_description_3">С помощью аккаунта Xabber вы сможете синхронизировать настройки на всех используемых Вами устройствах</string>
-  <string name="tutorial_description_4">Используйте социальную авторизацию для быстрой настройки Xabber на новом устройстве</string>
   <string name="account_deleted">Используемый аккаунт Xabber был удалён</string>
   <string name="login_without_xabber_account">обычный xmpp</string>
   <string name="sync_not_allowed_summary">Аккаунты с нестандартными настройками (нестандартный порт, старый SSL, прокси) не могут быть синхронизированы.</string>
diff --git a/xabber/src/main/res/values/xabber_account.xml b/xabber/src/main/res/values/xabber_account.xml
index 29eca0fe43..1c298875f4 100644
--- a/xabber/src/main/res/values/xabber_account.xml
+++ b/xabber/src/main/res/values/xabber_account.xml
@@ -179,15 +179,25 @@
     <string name="sync_status_enabled">Synchronization enabled</string>
     <string name="sync_status_disabled">Synchronization disabled</string>
 
-    <string name="tutorial_title_1">A better way to chat</string>
-    <string name="tutorial_title_2">Introducing Xabber Account</string>
-    <string name="tutorial_title_3">Perfectly in Sync</string>
-    <string name="tutorial_title_4">Social Login</string>
-
-    <string name="tutorial_description_1">Get free XMPP account from creators of Xabber, with guaranteed support of all latest features and extensions</string>
-    <string name="tutorial_description_2">Create an account to manage our services and enhance XMPP experience on all supported platforms</string>
-    <string name="tutorial_description_3">Xabber account lets you easily sync your accounts and their settings between devices and platforms</string>
-    <string name="tutorial_description_4">Use social authentification to quickly log in to Xabber and instantly connect all your accounts on new device</string>
+    <string name="tutorial_title_1">Welcome to Xabber</string>
+    <string name="tutorial_title_2">Open Standards</string>
+    <string name="tutorial_title_3">Rich Multimedia</string>
+    <string name="tutorial_title_4">Privacy and Security</string>
+    <string name="tutorial_title_5">Multiple Platforms</string>
+    <string name="tutorial_title_6">Perfectly in Sync</string>
+    <string name="tutorial_title_7">Federated Network</string>
+    <string name="tutorial_title_8">Social Login</string>
+    <string name="tutorial_title_9">Open Source</string>
+
+    <string name="tutorial_description_1">Open source XMPP client for Android with multiple accounts support</string>
+    <string name="tutorial_description_2">You are not locked into using a single service provider. Xabber works with to any standard-compliant XMPP server</string>
+    <string name="tutorial_description_3">Send multiple images, video and audio files or voice messages, viewing and playing them seamlessly in chat window</string>
+    <string name="tutorial_description_4">For maximum privacy, use a trustworthy secure server and end-to-end encryption for your communications</string>
+    <string name="tutorial_description_5">Versions of Xabber for Android, iOS and Web provide you consistent chat experience on every OS and device type</string>
+    <string name="tutorial_description_6">Xabber account lets you easily sync your accounts and their settings between devices and platforms</string>
+    <string name="tutorial_description_7">You can choose a trustworthy server for yourself and chat with contacts who are using other servers</string>
+    <string name="tutorial_description_8">Use social authentification to quickly log in to Xabber and instantly connect all your accounts on new device</string>
+    <string name="tutorial_description_9">Xabber is developed on GitHub by an open community. Anyone is welcome to participate by reporting bugs or contributing code</string>
 
     <string name="account_deleted">This Xabber Account was deleted</string>
 

From 60858674b608b7ab8a5b1c778f6643f0168f502f Mon Sep 17 00:00:00 2001
From: Valery Miller <valera_miller94@mail.ru>
Date: Mon, 24 Sep 2018 16:13:45 +0500
Subject: [PATCH 136/251] Removed unused code

---
 .../data/xaccount/XMPPAuthManager.java        |   7 --
 .../fragment/XAccountXMPPConfirmFragment.java | 118 ------------------
 2 files changed, 125 deletions(-)
 delete mode 100644 xabber/src/main/java/com/xabber/android/ui/fragment/XAccountXMPPConfirmFragment.java

diff --git a/xabber/src/main/java/com/xabber/android/data/xaccount/XMPPAuthManager.java b/xabber/src/main/java/com/xabber/android/data/xaccount/XMPPAuthManager.java
index 1ecde64f02..38c0fe3d14 100644
--- a/xabber/src/main/java/com/xabber/android/data/xaccount/XMPPAuthManager.java
+++ b/xabber/src/main/java/com/xabber/android/data/xaccount/XMPPAuthManager.java
@@ -31,7 +31,6 @@
 import rx.android.schedulers.AndroidSchedulers;
 import rx.functions.Action1;
 import rx.schedulers.Schedulers;
-import rx.subjects.PublishSubject;
 
 public class XMPPAuthManager implements OnPacketListener, OnConnectedListener {
 
@@ -39,7 +38,6 @@ public class XMPPAuthManager implements OnPacketListener, OnConnectedListener {
     private static final String ATTRIBUTE_ID = "id";
 
     private static XMPPAuthManager instance;
-    private PublishSubject<String> authCodeSubscribe = PublishSubject.create();
     private List<AccountJid> accountsForCheck = new ArrayList<>();
     private Map<String, Request> requests = new HashMap<>();
 
@@ -48,10 +46,6 @@ public static XMPPAuthManager getInstance() {
         return instance;
     }
 
-    public PublishSubject<String> subscribeForAuthCode() {
-        return authCodeSubscribe;
-    }
-
     public void addRequest(String requestId, String apiJid, String clientJid) {
         onRequestReceived(new Request(requestId, clientJid, apiJid));
         addContactToRoster(apiJid, clientJid);
@@ -77,7 +71,6 @@ public void onStanza(ConnectionItem connection, Stanza packet) {
 
             if (requestId != null && code != null)
                 onRequestReceived(new Request(requestId, clientJid, apiJid, code));
-            //authCodeSubscribe.onNext(this.authCode);
         }
     }
 
diff --git a/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountXMPPConfirmFragment.java b/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountXMPPConfirmFragment.java
deleted file mode 100644
index dbad3a2e64..0000000000
--- a/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountXMPPConfirmFragment.java
+++ /dev/null
@@ -1,118 +0,0 @@
-package com.xabber.android.ui.fragment;
-
-import android.app.Fragment;
-import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.Button;
-import android.widget.EditText;
-import android.widget.TextView;
-
-import com.xabber.android.R;
-import com.xabber.android.data.xaccount.XMPPAuthManager;
-
-import rx.functions.Action1;
-import rx.subscriptions.CompositeSubscription;
-
-public class XAccountXMPPConfirmFragment extends Fragment implements View.OnClickListener {
-
-    private String jid;
-    private CompositeSubscription subscriptions = new CompositeSubscription();
-
-    private EditText edtCode;
-    private Button btnConfirm;
-    private Button btnResend;
-    private TextView tvTitle;
-
-    private Listener listener;
-
-    public interface Listener {
-        void onConfirmXMPPClick(String jid, String code);
-        void onResendClick(String jid);
-    }
-
-    public static XAccountXMPPConfirmFragment newInstance(Listener listener) {
-        XAccountXMPPConfirmFragment fragment = new XAccountXMPPConfirmFragment();
-        fragment.listener = listener;
-        return fragment;
-    }
-
-    @Nullable
-    @Override
-    public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, Bundle savedInstanceState) {
-        return inflater.inflate(R.layout.fragment_xaccount_xmpp_confirm, container, false);
-    }
-
-    @Override
-    public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
-        super.onViewCreated(view, savedInstanceState);
-
-        edtCode = view.findViewById(R.id.edtCode);
-        btnConfirm = view.findViewById(R.id.btnConfirm);
-        btnResend = view.findViewById(R.id.btnResend);
-        tvTitle = view.findViewById(R.id.tvTitle);
-
-        btnConfirm.setOnClickListener(this);
-        btnResend.setOnClickListener(this);
-    }
-
-    @Override
-    public void onResume() {
-        super.onResume();
-        subscribeForAuthCode();
-        tvTitle.setText(getString(R.string.xmpp_confirm_title, jid));
-    }
-
-    @Override
-    public void onPause() {
-        super.onPause();
-        unsubscribeAll();
-    }
-
-    @Override
-    public void onClick(View v) {
-        switch (v.getId()) {
-            case R.id.btnConfirm:
-                onConfirmClick();
-                break;
-            case R.id.btnResend:
-                onResendClick();
-                break;
-        }
-    }
-
-    public void setJid(String jid) {
-        this.jid = jid;
-    }
-
-    private void onConfirmClick() {
-        String code = edtCode.getText().toString();
-
-        if (code.isEmpty()) {
-            edtCode.setError(getString(R.string.empty_field));
-            return;
-        }
-
-        listener.onConfirmXMPPClick(jid, code);
-    }
-
-    private void onResendClick() {
-        listener.onResendClick(jid);
-    }
-
-    private void subscribeForAuthCode() {
-        subscriptions.add(XMPPAuthManager.getInstance().subscribeForAuthCode()
-            .doOnNext(new Action1<String>() {
-                @Override
-                public void call(String authCode) {
-                    if (edtCode != null) edtCode.setText(authCode);
-                }
-            }).subscribe());
-    }
-
-    private void unsubscribeAll() {
-        subscriptions.clear();
-    }
-}

From 66139bfd66062f169c2ba3bceb6580bd1c778f48 Mon Sep 17 00:00:00 2001
From: Valery Miller <valera_miller94@mail.ru>
Date: Mon, 24 Sep 2018 18:24:14 +0500
Subject: [PATCH 137/251] Changes in xmpp-auth

---
 .../com/xabber/android/data/message/RegularChat.java     | 7 +++++++
 .../xabber/android/data/xaccount/XMPPAuthManager.java    | 9 ++++++++-
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/xabber/src/main/java/com/xabber/android/data/message/RegularChat.java b/xabber/src/main/java/com/xabber/android/data/message/RegularChat.java
index 59b44a7ba4..d528aa03c1 100644
--- a/xabber/src/main/java/com/xabber/android/data/message/RegularChat.java
+++ b/xabber/src/main/java/com/xabber/android/data/message/RegularChat.java
@@ -30,6 +30,7 @@
 import com.xabber.android.data.extension.otr.OTRUnencryptedException;
 import com.xabber.android.data.extension.otr.SecurityLevel;
 import com.xabber.android.data.log.LogManager;
+import com.xabber.android.data.xaccount.XMPPAuthManager;
 
 import net.java.otr4j.OtrException;
 
@@ -173,6 +174,12 @@ protected boolean onPacket(UserJid bareAddress, Stanza packet, boolean isCarbons
             if (text == null)
                 return true;
 
+            // Xabber service message received
+            if (message.getType() == Type.headline) {
+                if (XMPPAuthManager.getInstance().isXabberServiceMessage(message.getStanzaId()))
+                    return true;
+            }
+
             String thread = message.getThread();
             updateThreadId(thread);
 
diff --git a/xabber/src/main/java/com/xabber/android/data/xaccount/XMPPAuthManager.java b/xabber/src/main/java/com/xabber/android/data/xaccount/XMPPAuthManager.java
index 38c0fe3d14..59d7422892 100644
--- a/xabber/src/main/java/com/xabber/android/data/xaccount/XMPPAuthManager.java
+++ b/xabber/src/main/java/com/xabber/android/data/xaccount/XMPPAuthManager.java
@@ -55,9 +55,16 @@ public void addAccountForCheck(AccountJid accountJid) {
         accountsForCheck.add(accountJid);
     }
 
+    /**
+     *  StanzaId is RequestId
+     * */
+    public boolean isXabberServiceMessage(String stanzaId) {
+        return requests.containsKey(stanzaId);
+    }
+
     @Override
     public void onStanza(ConnectionItem connection, Stanza packet) {
-        if (packet instanceof Message) {
+        if (packet instanceof Message && ((Message) packet).getType() == Message.Type.headline) {
             Message message = (Message) packet;
 
             String apiJid = message.getFrom().toString();

From c13b357cffe9509a02b082400b58f3643b2f6bc5 Mon Sep 17 00:00:00 2001
From: Valery Miller <valera_miller94@mail.ru>
Date: Mon, 24 Sep 2018 18:34:43 +0500
Subject: [PATCH 138/251] Up version to 515

---
 xabber/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/xabber/build.gradle b/xabber/build.gradle
index 864c3211f4..19223794ee 100644
--- a/xabber/build.gradle
+++ b/xabber/build.gradle
@@ -10,8 +10,8 @@ android {
     defaultConfig {
         minSdkVersion 15
         targetSdkVersion 27
-        versionCode 514
-        versionName '2.4.2(514)'
+        versionCode 515
+        versionName '2.4.2(515)'
     }
 
     lintOptions {

From 1db83dbfe46bc309df025e37e736329683bd5216 Mon Sep 17 00:00:00 2001
From: Valery Miller <valera_miller94@mail.ru>
Date: Tue, 25 Sep 2018 12:32:38 +0500
Subject: [PATCH 139/251] Update dependencies and gradle

---
 build.gradle                             | 4 ++--
 gradle/wrapper/gradle-wrapper.properties | 4 ++--
 xabber/build.gradle                      | 8 +++-----
 xabber/src/main/AndroidManifest.xml      | 2 ++
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/build.gradle b/build.gradle
index 5120442f18..a7c2ad0e3d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -6,11 +6,11 @@ buildscript {
         maven { url 'https://maven.fabric.io/public' }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.1.4'
+        classpath 'com.android.tools.build:gradle:3.2.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'
-        classpath 'io.fabric.tools:gradle:1.+'
+        classpath 'io.fabric.tools:gradle:1.25.4'
         classpath 'com.google.gms:google-services:3.1.1'
     }
 }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 7349c222f7..012557694c 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Tue Aug 07 09:41:05 YEKT 2018
+#Tue Sep 25 11:30:28 YEKT 2018
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
diff --git a/xabber/build.gradle b/xabber/build.gradle
index 19223794ee..ab8dddfa85 100644
--- a/xabber/build.gradle
+++ b/xabber/build.gradle
@@ -5,7 +5,7 @@ apply plugin: 'io.fabric'
 
 android {
     compileSdkVersion 27
-    buildToolsVersion '27.0.3'
+    buildToolsVersion '28.0.2'
 
     defaultConfig {
         minSdkVersion 15
@@ -83,12 +83,10 @@ android {
                     'proguard-rules.pro'
             // enable crashlytics
             buildConfigField "boolean", "USE_CRASHLYTICS", "true"
-            ext.enableCrashlytics = true
         }
         debug {
             // disable crashlytics
             buildConfigField "boolean", "USE_CRASHLYTICS", "false"
-            ext.enableCrashlytics = false
         }
     }
 
@@ -191,8 +189,8 @@ dependencies {
     implementation 'de.hdodenhof:circleimageview:2.2.0'
     implementation 'com.melnykov:floatingactionbutton:1.3.0'
 
-    implementation('com.crashlytics.sdk.android:crashlytics:2.6.8@aar') {
-        transitive = true;
+    implementation('com.crashlytics.sdk.android:crashlytics:2.9.5@aar') {
+        transitive = true
     }
 
     implementation group: 'org.bouncycastle', name: 'bcpkix-jdk15on', version: '1.58'
diff --git a/xabber/src/main/AndroidManifest.xml b/xabber/src/main/AndroidManifest.xml
index 1b2f398970..6574af4cde 100644
--- a/xabber/src/main/AndroidManifest.xml
+++ b/xabber/src/main/AndroidManifest.xml
@@ -16,6 +16,8 @@
     xmlns:tools="http://schemas.android.com/tools"
     package="com.xabber.android">
 
+    <meta-data android:name="firebase_crashlytics_collection_enabled" android:value="false" />
+
     <uses-feature
         android:name="android.hardware.touchscreen"
         android:required="false" />

From 3240b1a5ab92b7384f8cec5fb17a15ecdaa6f285 Mon Sep 17 00:00:00 2001
From: Valery Miller <valera_miller94@mail.ru>
Date: Tue, 25 Sep 2018 12:33:10 +0500
Subject: [PATCH 140/251] Update dependencies

---
 xabber/emojicon/build.gradle                 | 8 ++++----
 xabber/emojicon/src/main/AndroidManifest.xml | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/xabber/emojicon/build.gradle b/xabber/emojicon/build.gradle
index 6c3370e61c..cead832326 100644
--- a/xabber/emojicon/build.gradle
+++ b/xabber/emojicon/build.gradle
@@ -1,12 +1,12 @@
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 25
-    buildToolsVersion '26.0.2'
+    compileSdkVersion 27
+    buildToolsVersion '28.0.2'
 
     defaultConfig {
         minSdkVersion 14
-        targetSdkVersion 25
+        targetSdkVersion 27
     }
 
     buildTypes {
@@ -18,5 +18,5 @@ android {
 }
 
 dependencies {
-    compile "com.android.support:support-v13:25.3.0"
+    implementation "com.android.support:support-v13:27.1.1"
 }
diff --git a/xabber/emojicon/src/main/AndroidManifest.xml b/xabber/emojicon/src/main/AndroidManifest.xml
index a07b8e21bf..f44dcdda55 100644
--- a/xabber/emojicon/src/main/AndroidManifest.xml
+++ b/xabber/emojicon/src/main/AndroidManifest.xml
@@ -1,7 +1,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="github.ankushsachdeva.emojicon">
 
-    <uses-sdk android:minSdkVersion="8" android:targetSdkVersion="19"/>
+    <uses-sdk android:targetSdkVersion="19"/>
 
     <application android:allowBackup="true"
         android:label="@string/app_name"

From 16d7fbe87a4a633117bd1156fe3ab7d116a52e19 Mon Sep 17 00:00:00 2001
From: Valery Miller <valera_miller94@mail.ru>
Date: Tue, 25 Sep 2018 13:08:40 +0500
Subject: [PATCH 141/251] Changes in email field property Fixed attaching
 listener do email dialogs

---
 .../ui/activity/BaseLoginActivity.java        | 12 ++++++++--
 .../ui/dialog/AddEmailDialogFragment.java     | 20 +++++++++++++---
 .../ui/dialog/ConfirmEmailDialogFragment.java | 22 +++++++++++++----
 .../ui/fragment/XAccountLinksFragment.java    | 24 +++----------------
 .../src/main/res/layout/dialog_add_email.xml  |  2 ++
 5 files changed, 50 insertions(+), 30 deletions(-)

diff --git a/xabber/src/main/java/com/xabber/android/ui/activity/BaseLoginActivity.java b/xabber/src/main/java/com/xabber/android/ui/activity/BaseLoginActivity.java
index a0cd3fbd6c..c5fb5fcf2d 100644
--- a/xabber/src/main/java/com/xabber/android/ui/activity/BaseLoginActivity.java
+++ b/xabber/src/main/java/com/xabber/android/ui/activity/BaseLoginActivity.java
@@ -39,6 +39,8 @@
 import com.xabber.android.data.xaccount.XMPPAccountSettings;
 import com.xabber.android.data.xaccount.XabberAccount;
 import com.xabber.android.data.xaccount.XabberAccountManager;
+import com.xabber.android.ui.dialog.AddEmailDialogFragment;
+import com.xabber.android.ui.dialog.ConfirmEmailDialogFragment;
 import com.xabber.android.ui.fragment.XAccountLinksFragment;
 import com.xabber.android.utils.RetrofitErrorConverter;
 
@@ -58,7 +60,8 @@
  */
 
 public abstract class BaseLoginActivity extends ManagedActivity implements
-        GoogleApiClient.OnConnectionFailedListener, XAccountLinksFragment.Listener  {
+        GoogleApiClient.OnConnectionFailedListener, XAccountLinksFragment.Listener,
+        AddEmailDialogFragment.Listener, ConfirmEmailDialogFragment.Listener {
 
     private final static String LOG_TAG = BaseLoginActivity.class.getSimpleName();
 
@@ -528,7 +531,12 @@ public void onDeleteEmailClick(int emailId) {
     }
 
     @Override
-    public void onConfirmEmailClick(String email, String code) {
+    public void onResendCodeClick(String email) {
+        resendConfirmEmail(email);
+    }
+
+    @Override
+    public void onConfirmClick(String email, String code) {
         confirmEmail(code);
     }
 }
diff --git a/xabber/src/main/java/com/xabber/android/ui/dialog/AddEmailDialogFragment.java b/xabber/src/main/java/com/xabber/android/ui/dialog/AddEmailDialogFragment.java
index a232599a1f..37f0904ff0 100644
--- a/xabber/src/main/java/com/xabber/android/ui/dialog/AddEmailDialogFragment.java
+++ b/xabber/src/main/java/com/xabber/android/ui/dialog/AddEmailDialogFragment.java
@@ -3,6 +3,7 @@
 import android.app.AlertDialog;
 import android.app.Dialog;
 import android.app.DialogFragment;
+import android.content.Context;
 import android.content.DialogInterface;
 import android.os.Bundle;
 import android.view.LayoutInflater;
@@ -20,9 +21,8 @@ public interface Listener {
         void onAddEmailClick(String email);
     }
 
-    public static AddEmailDialogFragment newInstance(Listener listener) {
+    public static AddEmailDialogFragment newInstance() {
         AddEmailDialogFragment fragment = new AddEmailDialogFragment();
-        fragment.listener = listener;
         return fragment;
     }
 
@@ -40,13 +40,27 @@ public void onClick(DialogInterface dialog, int which) {
                 .setPositiveButton(R.string.complete_register_add, new DialogInterface.OnClickListener() {
                     @Override
                     public void onClick(DialogInterface dialog, int which) {
-                        listener.onAddEmailClick(edtEmail.getText().toString());
+                        if (listener != null) listener.onAddEmailClick(edtEmail.getText().toString());
                     }
                 });
 
         return builder.create();
     }
 
+    @Override
+    public void onAttach(Context context) {
+        super.onAttach(context);
+        if (context instanceof Listener) listener = (Listener) context;
+        else throw new RuntimeException(context.toString()
+                + " must implement AddEmailDialogFragment.Listener");
+    }
+
+    @Override
+    public void onDetach() {
+        super.onDetach();
+        listener = null;
+    }
+
     public View setupView() {
         LayoutInflater inflater = getActivity().getLayoutInflater();
         View view = inflater.inflate(R.layout.dialog_add_email, null);
diff --git a/xabber/src/main/java/com/xabber/android/ui/dialog/ConfirmEmailDialogFragment.java b/xabber/src/main/java/com/xabber/android/ui/dialog/ConfirmEmailDialogFragment.java
index f9d5cef011..a0a97d3c1e 100644
--- a/xabber/src/main/java/com/xabber/android/ui/dialog/ConfirmEmailDialogFragment.java
+++ b/xabber/src/main/java/com/xabber/android/ui/dialog/ConfirmEmailDialogFragment.java
@@ -3,6 +3,7 @@
 import android.app.AlertDialog;
 import android.app.Dialog;
 import android.app.DialogFragment;
+import android.content.Context;
 import android.content.DialogInterface;
 import android.os.Bundle;
 import android.view.LayoutInflater;
@@ -24,10 +25,9 @@ public interface Listener {
         void onConfirmClick(String email, String code);
     }
 
-    public static ConfirmEmailDialogFragment newInstance(Listener listener, String email) {
+    public static ConfirmEmailDialogFragment newInstance(String email) {
         ConfirmEmailDialogFragment fragment = new ConfirmEmailDialogFragment();
         fragment.email = email;
-        fragment.listener = listener;
         return fragment;
     }
 
@@ -40,19 +40,33 @@ public Dialog onCreateDialog(Bundle savedInstanceState) {
                 .setNeutralButton(R.string.button_resend_link, new DialogInterface.OnClickListener() {
                     @Override
                     public void onClick(DialogInterface dialog, int which) {
-                        listener.onResendCodeClick(email);
+                        if (listener != null) listener.onResendCodeClick(email);
                     }
                 })
                 .setPositiveButton(R.string.button_confirm, new DialogInterface.OnClickListener() {
                     @Override
                     public void onClick(DialogInterface dialog, int which) {
-                        listener.onConfirmClick(email, edtCode.getText().toString());
+                        if (listener != null) listener.onConfirmClick(email, edtCode.getText().toString());
                     }
                 });
 
         return builder.create();
     }
 
+    @Override
+    public void onAttach(Context context) {
+        super.onAttach(context);
+        if (context instanceof Listener) listener = (Listener) context;
+        else throw new RuntimeException(context.toString()
+                + " must implement ConfirmEmailDialogFragment.Listener");
+    }
+
+    @Override
+    public void onDetach() {
+        super.onDetach();
+        listener = null;
+    }
+
     public View setupView() {
         LayoutInflater inflater = getActivity().getLayoutInflater();
         View view = inflater.inflate(R.layout.dialog_confirm_email, null);
diff --git a/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountLinksFragment.java b/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountLinksFragment.java
index 15efbf501b..aa872579dc 100644
--- a/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountLinksFragment.java
+++ b/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountLinksFragment.java
@@ -31,8 +31,7 @@
 import rx.schedulers.Schedulers;
 import rx.subscriptions.CompositeSubscription;
 
-public class XAccountLinksFragment  extends Fragment implements AddEmailDialogFragment.Listener,
-        EmailAdapter.Listener, ConfirmEmailDialogFragment.Listener {
+public class XAccountLinksFragment  extends Fragment implements EmailAdapter.Listener {
 
     private ImageView ivGoogle;
     private TextView tvNameGoogle;
@@ -60,9 +59,7 @@ public class XAccountLinksFragment  extends Fragment implements AddEmailDialogFr
     public interface Listener {
         void onSocialBindClick(String provider);
         void onSocialUnbindClick(String provider);
-        void onAddEmailClick(String email);
         void onDeleteEmailClick(int emailId);
-        void onConfirmEmailClick(String email, String code);
     }
 
     public static XAccountLinksFragment newInstance() {
@@ -130,7 +127,7 @@ public void onClick(View v) {
         viewAddEmail.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                AddEmailDialogFragment.newInstance(XAccountLinksFragment.this)
+                AddEmailDialogFragment.newInstance()
                         .show(getFragmentManager(), AccountSyncDialogFragment.class.getSimpleName());
             }
         });
@@ -167,7 +164,7 @@ public void onResume() {
 
     @Override
     public void onEmailVerifyClick(String email) {
-        ConfirmEmailDialogFragment.newInstance(this, email)
+        ConfirmEmailDialogFragment.newInstance(email)
                 .show(getFragmentManager(), AccountSyncDialogFragment.class.getSimpleName());
     }
 
@@ -176,21 +173,6 @@ public void onEmailDeleteClick(int id) {
         listener.onDeleteEmailClick(id);
     }
 
-    @Override
-    public void onAddEmailClick(String email) {
-        listener.onAddEmailClick(email);
-    }
-
-    @Override
-    public void onResendCodeClick(String email) {
-        listener.onAddEmailClick(email);
-    }
-
-    @Override
-    public void onConfirmClick(String email, String code) {
-        listener.onConfirmEmailClick(email, code);
-    }
-
     private void setupSocial(List<SocialBindingDTO> socialBindings) {
         clearSocial();
         for (SocialBindingDTO socialBinding : socialBindings) {
diff --git a/xabber/src/main/res/layout/dialog_add_email.xml b/xabber/src/main/res/layout/dialog_add_email.xml
index a0f9fdc01f..b73b57e2cd 100644
--- a/xabber/src/main/res/layout/dialog_add_email.xml
+++ b/xabber/src/main/res/layout/dialog_add_email.xml
@@ -18,6 +18,8 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:hint="email"
+        android:singleLine="true"
+        android:inputType="textEmailAddress"
         />
 
 </LinearLayout>
\ No newline at end of file

From dbd249845d86a152721e4f94260d9f4ad5ba9c51 Mon Sep 17 00:00:00 2001
From: Valery Miller <valera_miller94@mail.ru>
Date: Tue, 25 Sep 2018 14:37:03 +0500
Subject: [PATCH 142/251] Fixed bug with saving email in confirm email dialog

---
 .../ui/dialog/ConfirmEmailDialogFragment.java     | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/xabber/src/main/java/com/xabber/android/ui/dialog/ConfirmEmailDialogFragment.java b/xabber/src/main/java/com/xabber/android/ui/dialog/ConfirmEmailDialogFragment.java
index a0a97d3c1e..af37229339 100644
--- a/xabber/src/main/java/com/xabber/android/ui/dialog/ConfirmEmailDialogFragment.java
+++ b/xabber/src/main/java/com/xabber/android/ui/dialog/ConfirmEmailDialogFragment.java
@@ -15,6 +15,8 @@
 
 public class ConfirmEmailDialogFragment extends DialogFragment {
 
+    private static final String KEY_EMAIL = "KEY_EMAIL";
+
     private String email;
     private Listener listener;
 
@@ -67,6 +69,19 @@ public void onDetach() {
         listener = null;
     }
 
+    @Override
+    public void onSaveInstanceState(Bundle outState) {
+        super.onSaveInstanceState(outState);
+        outState.putString(KEY_EMAIL, email);
+    }
+
+    @Override
+    public void onActivityCreated(Bundle savedInstanceState) {
+        super.onActivityCreated(savedInstanceState);
+        if (savedInstanceState != null)
+            email = savedInstanceState.getString(KEY_EMAIL);
+    }
+
     public View setupView() {
         LayoutInflater inflater = getActivity().getLayoutInflater();
         View view = inflater.inflate(R.layout.dialog_confirm_email, null);

From 8df2f901857610d079f4c8fabdd01d94468fc63f Mon Sep 17 00:00:00 2001
From: Valery Miller <valera_miller94@mail.ru>
Date: Tue, 25 Sep 2018 14:39:51 +0500
Subject: [PATCH 143/251] Changes in strings

---
 xabber/src/main/res/values/xabber_account.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/xabber/src/main/res/values/xabber_account.xml b/xabber/src/main/res/values/xabber_account.xml
index 1c298875f4..dbbcccfe6e 100644
--- a/xabber/src/main/res/values/xabber_account.xml
+++ b/xabber/src/main/res/values/xabber_account.xml
@@ -27,7 +27,7 @@
     <string name="set_phone_success">Confirmation code sent</string>
 
     <string name="social_bind_success">Social network bind successfully</string>
-    <string name="social_bind_fail">Social network bind failed</string>
+    <string name="social_bind_fail">Can\'t link this social account</string>
     <string name="social_unbind_success">Social network unbind successfully</string>
     <string name="social_unbind_fail">Social network unbind failed</string>
 
@@ -49,7 +49,7 @@
     <string name="progress_title_delete_settings">Delete settings</string>
     <string name="progress_title_request_xmpp_auth">Request XMPP auth-code</string>
     <string name="progress_title_confirm_xmpp">Confirm XMPP-account with code</string>
-    <string name="progress_title_bind_social">Bind social network</string>
+    <string name="progress_title_bind_social">Authenticating..</string>
     <string name="progress_title_unbind_social">Unbind social network</string>
     <string name="progress_title_account_list">Loading list of accounts..</string>
     <string name="progress_title_connect">Connecting to Xabber Account via %1$s</string>

From 4e5c5647c2d6e8c3945a433aa187b38f24fd91a0 Mon Sep 17 00:00:00 2001
From: Valery Miller <valera_miller94@mail.ru>
Date: Tue, 25 Sep 2018 14:51:35 +0500
Subject: [PATCH 144/251] Fixed some visual bugs

---
 .../main/java/com/xabber/android/ui/adapter/EmailAdapter.java | 4 ++++
 .../com/xabber/android/ui/fragment/XAccountLinksFragment.java | 3 +++
 2 files changed, 7 insertions(+)

diff --git a/xabber/src/main/java/com/xabber/android/ui/adapter/EmailAdapter.java b/xabber/src/main/java/com/xabber/android/ui/adapter/EmailAdapter.java
index d1ef697442..b9b159e8e2 100644
--- a/xabber/src/main/java/com/xabber/android/ui/adapter/EmailAdapter.java
+++ b/xabber/src/main/java/com/xabber/android/ui/adapter/EmailAdapter.java
@@ -1,5 +1,6 @@
 package com.xabber.android.ui.adapter;
 
+import android.content.res.Resources;
 import android.support.v7.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -8,6 +9,7 @@
 import android.widget.TextView;
 
 import com.xabber.android.R;
+import com.xabber.android.data.Application;
 import com.xabber.android.data.xaccount.EmailDTO;
 
 import java.util.ArrayList;
@@ -42,8 +44,10 @@ public EmailViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
     public void onBindViewHolder(EmailViewHolder holder, final int position) {
         final EmailDTO emailDTO = emails.get(position);
 
+        Resources res = Application.getInstance().getResources();
         holder.tvEmail.setText(emailDTO.getEmail());
         holder.tvStatus.setText(emailDTO.isVerified() ? R.string.title_verified_email : R.string.title_unverified_email);
+        holder.tvStatus.setTextColor(emailDTO.isVerified() ? res.getColor(R.color.grey_500) : res.getColor(R.color.red_500));
         holder.tvAction.setText(emailDTO.isVerified() ? R.string.action_disconnect : R.string.action_verify);
         holder.ivEmail.setImageResource(emailDTO.isVerified() ? R.drawable.ic_confirmed_email_circle : R.drawable.ic_email_circle);
 
diff --git a/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountLinksFragment.java b/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountLinksFragment.java
index aa872579dc..ca1a56d4d8 100644
--- a/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountLinksFragment.java
+++ b/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountLinksFragment.java
@@ -206,16 +206,19 @@ private void clearSocial() {
         tvNameGoogle.setVisibility(View.GONE);
         tvStatusGoogle.setText(R.string.title_not_linked_account);
         tvActionGoogle.setText(R.string.action_connect);
+        tvActionGoogle.setTextColor(getActivity().getResources().getColor(R.color.grey_500));
 
         ivFacebook.setImageResource(R.drawable.ic_facebook_disabled);
         tvNameFacebook.setVisibility(View.GONE);
         tvStatusFacebook.setText(R.string.title_not_linked_account);
         tvActionFacebook.setText(R.string.action_connect);
+        tvActionFacebook.setTextColor(getActivity().getResources().getColor(R.color.grey_500));
 
         ivTwitter.setImageResource(R.drawable.ic_twitter_disabled);
         tvNameTwitter.setVisibility(View.GONE);
         tvStatusTwitter.setText(R.string.title_not_linked_account);
         tvActionTwitter.setText(R.string.action_connect);
+        tvActionTwitter.setTextColor(getActivity().getResources().getColor(R.color.grey_500));
     }
 
     private void setupEmailList(List<EmailDTO> emails) {

From 4ae1617cb69fe81caaa922e105eb06358e7148fd Mon Sep 17 00:00:00 2001
From: Valery Miller <valera_miller94@mail.ru>
Date: Tue, 25 Sep 2018 17:01:43 +0500
Subject: [PATCH 145/251] Increased delay for xmpp-auth in xabber account

---
 .../com/xabber/android/data/xaccount/XMPPAuthManager.java     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/xabber/src/main/java/com/xabber/android/data/xaccount/XMPPAuthManager.java b/xabber/src/main/java/com/xabber/android/data/xaccount/XMPPAuthManager.java
index 59d7422892..5d983ea67d 100644
--- a/xabber/src/main/java/com/xabber/android/data/xaccount/XMPPAuthManager.java
+++ b/xabber/src/main/java/com/xabber/android/data/xaccount/XMPPAuthManager.java
@@ -91,7 +91,7 @@ public void run() {
                 if (xabberAccount == null) {
                     if (accountsForCheck.contains(accountJid)) {
                         try {
-                            Thread.sleep(500);
+                            Thread.sleep(1000);
                         } catch (InterruptedException e) {
                             e.printStackTrace();
                         }
@@ -102,7 +102,7 @@ public void run() {
                 } else if (xabberAccount.getFullUsername()
                         .equals(AccountManager.getInstance().getVerboseName(accountJid))) {
                     try {
-                        Thread.sleep(500);
+                        Thread.sleep(1000);
                     } catch (InterruptedException e) {
                         e.printStackTrace();
                     }

From a14902b157fa063cbbd48052cac91566cdcc6a2b Mon Sep 17 00:00:00 2001
From: Valery Miller <valera_miller94@mail.ru>
Date: Tue, 25 Sep 2018 17:41:59 +0500
Subject: [PATCH 146/251] Changes in login flow

---
 .../data/xaccount/XMPPAuthManager.java        | 41 +++++++++++++++++++
 .../ui/fragment/XAccountLoginFragment.java    |  6 +--
 2 files changed, 43 insertions(+), 4 deletions(-)

diff --git a/xabber/src/main/java/com/xabber/android/data/xaccount/XMPPAuthManager.java b/xabber/src/main/java/com/xabber/android/data/xaccount/XMPPAuthManager.java
index 5d983ea67d..9faa390869 100644
--- a/xabber/src/main/java/com/xabber/android/data/xaccount/XMPPAuthManager.java
+++ b/xabber/src/main/java/com/xabber/android/data/xaccount/XMPPAuthManager.java
@@ -2,8 +2,10 @@
 
 import android.util.Log;
 
+import com.xabber.android.R;
 import com.xabber.android.data.Application;
 import com.xabber.android.data.NetworkException;
+import com.xabber.android.data.SettingsManager;
 import com.xabber.android.data.account.AccountManager;
 import com.xabber.android.data.connection.ConnectionItem;
 import com.xabber.android.data.connection.listeners.OnConnectedListener;
@@ -28,6 +30,7 @@
 import java.util.List;
 import java.util.Map;
 
+import rx.Subscription;
 import rx.android.schedulers.AndroidSchedulers;
 import rx.functions.Action1;
 import rx.schedulers.Schedulers;
@@ -139,6 +142,7 @@ private void confirmXMPP(Request request) {
                 @Override
                 public void call(XabberAccount account) {
                     Log.d(XMPPAuthManager.class.toString(), "xabber account authorized successfully");
+                    handleSuccessConfirmXMPP();
                 }
             }, new Action1<Throwable>() {
                 @Override
@@ -148,6 +152,43 @@ public void call(Throwable throwable) {
             });
     }
 
+    private void handleSuccessConfirmXMPP() {
+        if (AccountManager.getInstance().getAllAccountItems().size() > 0)
+            updateSettings();
+        else getSettings();
+    }
+
+    protected void updateSettings() {
+        AuthManager.patchClientSettings(XabberAccountManager.getInstance().createSettingsList())
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(new Action1<List<XMPPAccountSettings>>() {
+                    @Override
+                    public void call(List<XMPPAccountSettings> s) { }
+                }, new Action1<Throwable>() {
+                    @Override
+                    public void call(Throwable throwable) {
+                    }
+                });
+    }
+
+    protected void getSettings() {
+        AuthManager.getClientSettings()
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(new Action1<List<XMPPAccountSettings>>() {
+                    @Override
+                    public void call(List<XMPPAccountSettings> settings) {
+                        XabberAccountManager.getInstance().setXmppAccountsForCreate(settings);
+                        SettingsManager.setLastSyncDate(XabberAccountManager.getCurrentTimeString());
+                    }
+                }, new Action1<Throwable>() {
+                    @Override
+                    public void call(Throwable throwable) {
+                    }
+                });
+    }
+
     private void onRequestReceived(Request request) {
         if (requests.containsKey(request.id)) {
             if (request.code == null) request.code = requests.get(request.id).code;
diff --git a/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountLoginFragment.java b/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountLoginFragment.java
index 6d0a21f917..e21edc985f 100644
--- a/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountLoginFragment.java
+++ b/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountLoginFragment.java
@@ -20,6 +20,7 @@
 import com.xabber.android.data.entity.AccountJid;
 import com.xabber.android.data.xaccount.XabberAccountManager;
 import com.xabber.android.ui.activity.AccountActivity;
+import com.xabber.android.ui.activity.ContactListActivity;
 import com.xabber.android.ui.dialog.OrbotInstallerDialog;
 import com.xabber.android.ui.helper.OrbotHelper;
 
@@ -132,10 +133,7 @@ private void addAccount() {
             return;
         }
 
-        // update remote settings
-        if (chkSync.isChecked()) XabberAccountManager.getInstance().updateSettingsWithSaveLastAccount(account);
-
-        startActivity(AccountActivity.createIntent(getActivity(), account));
+        startActivity(ContactListActivity.createIntent(getActivity()));
         getActivity().finish();
     }
 

From e22eb5211e5fe759172d195f073c9c1dcd840f9c Mon Sep 17 00:00:00 2001
From: Valery Miller <valera_miller94@mail.ru>
Date: Tue, 25 Sep 2018 18:04:20 +0500
Subject: [PATCH 147/251] Changes in login flow

---
 .../com/xabber/android/ui/activity/BaseLoginActivity.java   | 6 +++---
 .../com/xabber/android/ui/activity/XabberLoginActivity.java | 4 +---
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/xabber/src/main/java/com/xabber/android/ui/activity/BaseLoginActivity.java b/xabber/src/main/java/com/xabber/android/ui/activity/BaseLoginActivity.java
index c5fb5fcf2d..8c40af147a 100644
--- a/xabber/src/main/java/com/xabber/android/ui/activity/BaseLoginActivity.java
+++ b/xabber/src/main/java/com/xabber/android/ui/activity/BaseLoginActivity.java
@@ -272,7 +272,7 @@ public void call(XabberAccount s) {
                         // if exist local accounts
                         if (AccountManager.getInstance().getAllAccountItems().size() > 0)
                             updateSettings(needGoToMainActivity);
-                        else getSettings();
+                        else getSettings(needGoToMainActivity);
 
                     }
                 }, new Action1<Throwable>() {
@@ -316,7 +316,7 @@ public void call(Throwable throwable) {
         compositeSubscription.add(getSettingsSubscription);
     }
 
-    protected void getSettings() {
+    protected void getSettings(final boolean needGoToMainActivity) {
         Subscription getSettingsSubscription = AuthManager.getClientSettings()
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
@@ -329,7 +329,7 @@ public void call(List<XMPPAccountSettings> settings) {
                         // update last synchronization time
                         SettingsManager.setLastSyncDate(XabberAccountManager.getCurrentTimeString());
                         Toast.makeText(BaseLoginActivity.this, R.string.sync_success, Toast.LENGTH_SHORT).show();
-                        //goToMainActivity();
+                        if (needGoToMainActivity) goToMainActivity();
                     }
                 }, new Action1<Throwable>() {
                     @Override
diff --git a/xabber/src/main/java/com/xabber/android/ui/activity/XabberLoginActivity.java b/xabber/src/main/java/com/xabber/android/ui/activity/XabberLoginActivity.java
index b91950216f..c7f08717cd 100644
--- a/xabber/src/main/java/com/xabber/android/ui/activity/XabberLoginActivity.java
+++ b/xabber/src/main/java/com/xabber/android/ui/activity/XabberLoginActivity.java
@@ -474,9 +474,7 @@ public void call(Throwable throwable) {
 
     private void handleSuccessGetAccount(@NonNull XabberAccount xabberAccount) {
         hideProgress();
-        Intent intent = XabberAccountActivity.createIntent(this);
-        finish();
-        startActivity(intent);
+        synchronize(true);
     }
 
     private void handleErrorGetAccount(Throwable throwable) {

From 4a11f47133ab9d141d338bd2394bbba41c52172d Mon Sep 17 00:00:00 2001
From: Valery Miller <valera_miller94@mail.ru>
Date: Tue, 25 Sep 2018 18:51:39 +0500
Subject: [PATCH 148/251] Up version to 516

---
 xabber/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/xabber/build.gradle b/xabber/build.gradle
index ab8dddfa85..9f2fb2bdb8 100644
--- a/xabber/build.gradle
+++ b/xabber/build.gradle
@@ -10,8 +10,8 @@ android {
     defaultConfig {
         minSdkVersion 15
         targetSdkVersion 27
-        versionCode 515
-        versionName '2.4.2(515)'
+        versionCode 516
+        versionName '2.4.2(516)'
     }
 
     lintOptions {

From c8f0a9d23d1da914d6b0c8f04a3d68f913483f76 Mon Sep 17 00:00:00 2001
From: Valery Miller <valera_miller94@mail.ru>
Date: Wed, 26 Sep 2018 11:35:36 +0500
Subject: [PATCH 149/251] Changed size of text in xabber account item

---
 xabber/src/main/res/layout/item_xabber_account.xml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/xabber/src/main/res/layout/item_xabber_account.xml b/xabber/src/main/res/layout/item_xabber_account.xml
index d49c587d34..ce190c99e1 100644
--- a/xabber/src/main/res/layout/item_xabber_account.xml
+++ b/xabber/src/main/res/layout/item_xabber_account.xml
@@ -18,7 +18,6 @@
             android:layout_height="wrap_content"
             android:textStyle="bold"
             android:textColor="@color/white_text"
-            android:textSize="16sp"
             android:shadowColor="@color/black"
             android:shadowDy="2"
             android:shadowDx="2"
@@ -33,7 +32,6 @@
             android:ellipsize="marquee"
             android:singleLine="true"
             android:textColor="@color/white_text"
-            android:textSize="16sp"
             android:shadowColor="@color/black"
             android:shadowDy="2"
             android:shadowDx="2"

From a33922ad4885c5affd7ac38f1b0411f5ecc75fd2 Mon Sep 17 00:00:00 2001
From: Valery Miller <valera_miller94@mail.ru>
Date: Wed, 26 Sep 2018 12:23:24 +0500
Subject: [PATCH 150/251] Added dialog for email delete

---
 .../ui/fragment/XAccountLinksFragment.java    | 20 +++++++++++++++++--
 xabber/src/main/res/values/xabber_account.xml |  1 +
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountLinksFragment.java b/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountLinksFragment.java
index ca1a56d4d8..222c7beb2b 100644
--- a/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountLinksFragment.java
+++ b/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountLinksFragment.java
@@ -1,7 +1,9 @@
 package com.xabber.android.ui.fragment;
 
+import android.app.AlertDialog;
 import android.app.Fragment;
 import android.content.Context;
+import android.content.DialogInterface;
 import android.os.Bundle;
 import android.support.annotation.Nullable;
 import android.support.v7.widget.LinearLayoutManager;
@@ -169,8 +171,22 @@ public void onEmailVerifyClick(String email) {
     }
 
     @Override
-    public void onEmailDeleteClick(int id) {
-        listener.onDeleteEmailClick(id);
+    public void onEmailDeleteClick(final int id) {
+        AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
+        builder.setMessage(R.string.title_delete_email)
+                .setPositiveButton(R.string.ok, new DialogInterface.OnClickListener() {
+                    @Override
+                    public void onClick(DialogInterface dialog, int which) {
+                        listener.onDeleteEmailClick(id);
+                    }
+                })
+                .setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() {
+                    @Override
+                    public void onClick(DialogInterface dialog, int which) {
+                        dialog.dismiss();
+                    }
+                });
+        builder.create().show();
     }
 
     private void setupSocial(List<SocialBindingDTO> socialBindings) {
diff --git a/xabber/src/main/res/values/xabber_account.xml b/xabber/src/main/res/values/xabber_account.xml
index dbbcccfe6e..fd0086311e 100644
--- a/xabber/src/main/res/values/xabber_account.xml
+++ b/xabber/src/main/res/values/xabber_account.xml
@@ -91,6 +91,7 @@
     <string name="title_no_linked_accounts">No linked social accounts or emails</string>
     <string name="title_linked_accounts">Linked social accounts and emails</string>
     <string name="title_select_xmpp_account">Select XMPP account to proceed</string>
+    <string name="title_delete_email">Do you want to unlink this email from Xabber-account</string>
 
     <string name="title_login_xabber_account">Sign In</string>
     <string name="title_register_xabber_account">Sign Up</string>

From 384515accfcc96a0fffb93049e0c6b6db4678594 Mon Sep 17 00:00:00 2001
From: Valery Miller <valera_miller94@mail.ru>
Date: Wed, 26 Sep 2018 12:41:11 +0500
Subject: [PATCH 151/251] Visual changes in login screen

---
 .../ui/fragment/XAccountSignUpFragment.java   | 251 ------------------
 .../res/layout/fragment_xaccount_signup.xml   | 180 -------------
 xabber/src/main/res/values/dimens.xml         |   2 +-
 3 files changed, 1 insertion(+), 432 deletions(-)
 delete mode 100644 xabber/src/main/java/com/xabber/android/ui/fragment/XAccountSignUpFragment.java
 delete mode 100644 xabber/src/main/res/layout/fragment_xaccount_signup.xml

diff --git a/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountSignUpFragment.java b/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountSignUpFragment.java
deleted file mode 100644
index ada54340d6..0000000000
--- a/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountSignUpFragment.java
+++ /dev/null
@@ -1,251 +0,0 @@
-package com.xabber.android.ui.fragment;
-
-import android.app.Fragment;
-import android.graphics.drawable.Drawable;
-import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.util.Log;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.Button;
-import android.widget.EditText;
-import android.widget.ProgressBar;
-import android.widget.Spinner;
-import android.widget.TextView;
-
-import com.google.android.gms.common.api.ApiException;
-import com.google.android.gms.common.api.CommonStatusCodes;
-import com.google.android.gms.safetynet.SafetyNet;
-import com.google.android.gms.safetynet.SafetyNetApi;
-import com.google.android.gms.tasks.OnFailureListener;
-import com.google.android.gms.tasks.OnSuccessListener;
-import com.xabber.android.R;
-import com.xabber.android.data.xaccount.AuthManager;
-import com.xabber.android.ui.adapter.HostSpinnerAdapter;
-
-import java.util.List;
-
-public class XAccountSignUpFragment extends Fragment implements View.OnClickListener {
-
-    private static final String CAPTCHA_TOKEN = "RECAPTCHA";
-    private static final String SOCIAL_CREDENTIALS = "SOCIAL_CREDENTIALS";
-    private static final String SOCIAL_PROVIDER = "SOCIAL_PROVIDER";
-
-    private EditText edtUsername;
-    private EditText edtPass;
-    private Spinner spinnerDomain;
-    private View spinnerBorder;
-    private TextView tvSocialProvider;
-    private ProgressBar pbHosts;
-    private Button btnSignUp;
-
-    private Listener listener;
-    private String credentials;
-    private String socialProvider;
-
-    public interface Listener {
-        void onGetHosts();
-        void onSignupClick(String username, String host, String pass, String captchaToken);
-        void onSignupClick(String username, String host, String pass,
-                           String credentials, String socialProvider);
-        void onGoogleClick();
-        void onFacebookClick();
-        void onTwitterClick();
-    }
-
-    public static XAccountSignUpFragment newInstance(Listener listener, String credentials, String socialProvider) {
-        XAccountSignUpFragment fragment = new XAccountSignUpFragment();
-        Bundle args = new Bundle();
-        args.putString(SOCIAL_CREDENTIALS, credentials);
-        args.putString(SOCIAL_PROVIDER, socialProvider);
-        fragment.setArguments(args);
-        fragment.listener = listener;
-        return fragment;
-    }
-
-    @Override
-    public void onCreate(@Nullable Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        this.credentials = getArguments().getString(SOCIAL_CREDENTIALS);
-        this.socialProvider = getArguments().getString(SOCIAL_PROVIDER);
-    }
-
-    @Nullable
-    @Override
-    public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, Bundle savedInstanceState) {
-        return inflater.inflate(R.layout.fragment_xaccount_signup, container, false);
-    }
-
-    @Override
-    public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
-        super.onViewCreated(view, savedInstanceState);
-
-        edtUsername = view.findViewById(R.id.edtUsername);
-        edtPass = view.findViewById(R.id.edtPass);
-        spinnerDomain = view.findViewById(R.id.spinnerDomain);
-        spinnerBorder = view.findViewById(R.id.spinnerBorder);
-
-        tvSocialProvider = view.findViewById(R.id.tvSocialProvider);
-        pbHosts = view.findViewById(R.id.pbHosts);
-
-        btnSignUp = view.findViewById(R.id.btnSignUp);
-        btnSignUp.setOnClickListener(this);
-    }
-
-    @Override
-    public void onResume() {
-        super.onResume();
-        if (listener != null) listener.onGetHosts();
-        setupSocial();
-    }
-
-    @Override
-    public void onClick(View v) {
-        switch (v.getId()) {
-            case R.id.btnSignUp:
-                onSignUpClick();
-                break;
-            case R.id.ivFacebook:
-                if (listener != null) listener.onFacebookClick();
-                break;
-            case R.id.ivGoogle:
-                if (listener != null) listener.onGoogleClick();
-                break;
-            case R.id.ivTwitter:
-                if (listener != null) listener.onTwitterClick();
-                break;
-        }
-    }
-
-    public void setSocialProviderCredentials(String socialProvider, String credentials) {
-        this.socialProvider = socialProvider;
-        this.credentials = credentials;
-        setupSocial();
-    }
-
-    public void showHostsProgress(boolean visible) {
-        pbHosts.setVisibility(visible ? View.VISIBLE : View.GONE);
-        spinnerDomain.setVisibility(visible ? View.GONE : View.VISIBLE);
-        spinnerBorder.setVisibility(visible ? View.GONE : View.VISIBLE);
-        btnSignUp.setEnabled(!visible);
-    }
-
-    private void setupSocial() {
-        if (credentials != null && socialProvider != null) {
-            if (tvSocialProvider != null) {
-                tvSocialProvider.setVisibility(View.VISIBLE);
-                tvSocialProvider.setText(getString(R.string.signup_with_social, socialProvider));
-
-                Drawable drawable;
-                switch (socialProvider) {
-                    case AuthManager.PROVIDER_TWITTER:
-                        drawable = getResources().getDrawable(R.drawable.ic_twitter);
-                        break;
-                    case AuthManager.PROVIDER_FACEBOOK:
-                        drawable = getResources().getDrawable(R.drawable.ic_facebook);
-                        break;
-                    default:
-                        drawable = getResources().getDrawable(R.drawable.ic_google_plus);
-                }
-                tvSocialProvider.setCompoundDrawablesWithIntrinsicBounds(drawable, null, null, null);
-            }
-        } else if (tvSocialProvider != null) tvSocialProvider.setVisibility(View.GONE);
-    }
-
-    private void onSignUpClick() {
-        String username = edtUsername.getText().toString().trim();
-        String pass = edtPass.getText().toString().trim();
-
-        if (verifyFields(username, pass)) {
-            if (credentials != null && socialProvider != null) {
-                if (listener != null)
-                    listener.onSignupClick(username, spinnerDomain.getSelectedItem().toString(), pass,
-                            credentials, socialProvider);
-            } else getCaptchaToken(username, pass, spinnerDomain.getSelectedItem().toString());
-        }
-    }
-
-    private boolean verifyFields(String username, String pass) {
-
-        if (username.isEmpty()) {
-            edtUsername.setError(getString(R.string.empty_field));
-            return false;
-        }
-
-        // Username can contain only latin letters, numbers and dots
-        if (!username.matches("[a-z0-9.]+")) {
-            edtUsername.setError(getString(R.string.username_rules));
-            return false;
-        }
-
-        // Username must start with letter
-        if (!username.substring(0, 1).matches("[a-z]")) {
-            edtUsername.setError(getString(R.string.username_rules_first_symbol));
-            return false;
-        }
-
-        // Username cannot have two dots in a row
-        if (username.contains("..")) {
-            edtUsername.setError(getString(R.string.username_rules_dots));
-            return false;
-        }
-
-        if (pass.isEmpty()) {
-            edtPass.setError(getString(R.string.empty_field));
-            return false;
-        }
-
-        if (pass.length() < 4) {
-            edtPass.setError(getString(R.string.pass_too_short));
-            return false;
-        }
-
-        return true;
-    }
-
-    private void getCaptchaToken(final String username, final String pass, final String domain) {
-        SafetyNet.getClient(getActivity()).verifyWithRecaptcha(getActivity().getString(R.string.RECAPTCHA_KEY))
-            .addOnSuccessListener(getActivity(),
-                new OnSuccessListener<SafetyNetApi.RecaptchaTokenResponse>() {
-                    @Override
-                    public void onSuccess(SafetyNetApi.RecaptchaTokenResponse response) {
-                        // Indicates communication with reCAPTCHA service was
-                        // successful.
-                        String userResponseToken = response.getTokenResult();
-                        if (!userResponseToken.isEmpty()) {
-                            // Validate the user response token using the
-                            // reCAPTCHA siteverify API.
-                            Log.d(CAPTCHA_TOKEN, "Success: " + userResponseToken);
-                            if (listener != null) listener.onSignupClick(username, domain, pass, userResponseToken);
-                        }
-                    }
-                })
-            .addOnFailureListener(getActivity(),
-                new OnFailureListener() {
-                    @Override
-                    public void onFailure(@NonNull Exception e) {
-                        if (e instanceof ApiException) {
-                            // An error occurred when communicating with the
-                            // reCAPTCHA service. Refer to the status code to
-                            // handle the error appropriately.
-                            ApiException apiException = (ApiException) e;
-                            int statusCode = apiException.getStatusCode();
-                            Log.d(CAPTCHA_TOKEN, "Error: "
-                                    + CommonStatusCodes.getStatusCodeString(statusCode));
-                        } else {
-                            // A different, unknown type of error occurred.
-                            Log.d(CAPTCHA_TOKEN, "Error: " + e.getMessage());
-                        }
-                    }
-                });
-    }
-
-    public void setupSpinner(List<String> domains) {
-        if (spinnerDomain == null) return;
-//        HostSpinnerAdapter adapter = new HostSpinnerAdapter(getActivity(),
-//                android.R.layout.simple_spinner_item, domains);
-        //spinnerDomain.setAdapter(adapter);
-    }
-}
diff --git a/xabber/src/main/res/layout/fragment_xaccount_signup.xml b/xabber/src/main/res/layout/fragment_xaccount_signup.xml
deleted file mode 100644
index 1e7f794289..0000000000
--- a/xabber/src/main/res/layout/fragment_xaccount_signup.xml
+++ /dev/null
@@ -1,180 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical"
-        android:layout_centerInParent="true"
-        android:layout_marginLeft="@dimen/login_horizontal_margin"
-        android:layout_marginRight="@dimen/login_horizontal_margin"
-        >
-
-        <ImageView
-            android:layout_width="100dp"
-            android:layout_height="100dp"
-            android:src="@drawable/ic_logo_circle"
-            android:layout_gravity="center_horizontal"
-            android:layout_marginBottom="32dp"
-            />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content">
-
-            <LinearLayout
-                android:orientation="vertical"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_weight="1">
-
-                <TextView
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="16dp"
-                    android:paddingLeft="4dp"
-                    android:textColor="@color/black_text_secondary"
-                    android:text="@string/label_username"
-                    />
-
-                <EditText
-                    android:id="@+id/edtUsername"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:imeOptions="actionNext"
-                    android:nextFocusForward="@+id/edtPass"
-                    android:singleLine="true"
-                    android:hint="@string/hint_username"
-                    android:textSize="16sp"
-                    android:theme="@style/Theme"
-                    />
-
-            </LinearLayout>
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/host"
-                android:textColor="@color/black_text"
-                android:layout_gravity="bottom"
-                android:layout_marginBottom="6dp"
-                android:layout_marginLeft="4dp"
-                android:layout_marginRight="4dp"
-                />
-
-            <LinearLayout
-                android:orientation="vertical"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                >
-
-                <TextView
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="16dp"
-                    android:paddingLeft="8dp"
-                    android:textColor="@color/black_text_secondary"
-                    android:text="Select domain"
-                    />
-
-                <Spinner
-                    android:id="@+id/spinnerDomain"
-                    android:layout_marginTop="8dp"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    />
-
-                <View
-                    android:id="@+id/spinnerBorder"
-                    android:layout_width="match_parent"
-                    android:layout_height="1dp"
-                    android:background="#757575"
-                    android:layout_marginTop="2dp"
-                    android:layout_marginLeft="7dp"
-                    android:layout_marginRight="16dp"
-                    />
-
-                <ProgressBar
-                    android:id="@+id/pbHosts"
-                    android:layout_width="140dp"
-                    android:layout_height="30dp"
-                    android:layout_marginTop="8dp"
-                    android:visibility="gone"
-                    />
-
-            </LinearLayout>
-
-        </LinearLayout>
-
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:paddingLeft="4dp"
-            android:layout_marginTop="16dp"
-            android:textColor="@color/black_text_secondary"
-            android:text="@string/label_pass"
-            />
-
-        <EditText
-            android:id="@+id/edtPass"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:imeOptions="actionDone"
-            android:singleLine="true"
-            android:textSize="16sp"
-            android:theme="@style/Theme"
-            android:hint="@string/hint_pass"
-            android:inputType="textPassword"
-            />
-
-        <RelativeLayout
-            android:layout_marginTop="8dp"
-            android:layout_marginBottom="16dp"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content">
-
-            <Button
-                android:id="@+id/btnOptions"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                style="@style/Widget.AppCompat.Button.Borderless"
-                android:theme="@style/BlueButton"
-                android:textColor="@color/grey_500"
-                android:text="@string/button_terms_of_service"
-                android:layout_centerVertical="true"
-                />
-
-            <Button
-                android:id="@+id/btnSignUp"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                style="@style/Widget.AppCompat.Button.Colored"
-                android:theme="@style/BlueButton"
-                android:paddingRight="18dp"
-                android:paddingLeft="18dp"
-                android:layout_centerVertical="true"
-                android:layout_alignParentEnd="true"
-                android:layout_alignParentRight="true"
-                android:textColor="@color/white"
-                android:text="@string/button_registration"
-                />
-
-        </RelativeLayout>
-
-        <TextView
-            android:id="@+id/tvSocialProvider"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:textColor="@color/black_text_secondary"
-            android:drawablePadding="8dp"
-            android:visibility="gone"
-            android:layout_gravity="center_horizontal"
-            />
-
-    </LinearLayout>
-
-
-</RelativeLayout>
\ No newline at end of file
diff --git a/xabber/src/main/res/values/dimens.xml b/xabber/src/main/res/values/dimens.xml
index 0c9189f17e..0f1f0e5d50 100644
--- a/xabber/src/main/res/values/dimens.xml
+++ b/xabber/src/main/res/values/dimens.xml
@@ -31,7 +31,7 @@
 
     <dimen name="intro_screen_bottom_space_height">48dp</dimen>
     <dimen name="intro_screen_right_space_wight">0dp</dimen>
-    <dimen name="login_horizontal_margin">8dp</dimen>
+    <dimen name="login_horizontal_margin">32dp</dimen>
 
     <dimen name="vcard_main_text">16sp</dimen>
     <dimen name="vcard_secondary_text">14sp</dimen>

From b813b88c05903b098dc9935f30c013745b053b6b Mon Sep 17 00:00:00 2001
From: Valery Miller <valera_miller94@mail.ru>
Date: Wed, 26 Sep 2018 16:33:56 +0500
Subject: [PATCH 152/251] Visual changes in signup screen

---
 .../android/ui/fragment/XAccountSignUpFragment1.java      | 8 ++++----
 xabber/src/main/res/layout/fragment_xaccount_signup_1.xml | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountSignUpFragment1.java b/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountSignUpFragment1.java
index 87158ae215..d8106bea0a 100644
--- a/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountSignUpFragment1.java
+++ b/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountSignUpFragment1.java
@@ -4,10 +4,10 @@
 import android.graphics.drawable.Drawable;
 import android.os.Bundle;
 import android.support.annotation.Nullable;
-import android.text.Html;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.webkit.WebView;
 import android.widget.AdapterView;
 import android.widget.Button;
 import android.widget.EditText;
@@ -31,7 +31,7 @@ public class XAccountSignUpFragment1 extends Fragment implements View.OnClickLis
     private TextView tvSocialProvider;
     private ProgressBar pbHosts;
     private Button btnNext;
-    private TextView tvDescription;
+    private WebView webViewDescription;
 
     private XAccountSignUpFragment1.Listener listener;
 
@@ -64,7 +64,7 @@ public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
         spinnerDomain.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
             @Override
             public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
-                tvDescription.setText(Html.fromHtml(hosts.get(position).getDescription()));
+                webViewDescription.loadData(hosts.get(position).getDescription(), null, null);
                 if (adapter != null) adapter.setCurrentPosition(position);
             }
 
@@ -81,7 +81,7 @@ public void onNothingSelected(AdapterView<?> parent) {
         btnNext = view.findViewById(R.id.btnNext);
         btnNext.setOnClickListener(this);
 
-        tvDescription = view.findViewById(R.id.tvDescription);
+        webViewDescription = view.findViewById(R.id.webViewDescription);
 
         if (listener != null) listener.onGetHosts();
     }
diff --git a/xabber/src/main/res/layout/fragment_xaccount_signup_1.xml b/xabber/src/main/res/layout/fragment_xaccount_signup_1.xml
index 64e968311b..bc6d12e7fd 100644
--- a/xabber/src/main/res/layout/fragment_xaccount_signup_1.xml
+++ b/xabber/src/main/res/layout/fragment_xaccount_signup_1.xml
@@ -32,7 +32,7 @@
     <LinearLayout
         android:orientation="vertical"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
+        android:layout_height="match_parent"
         android:layout_marginTop="24dp"
         android:layout_marginLeft="24dp"
         android:layout_marginRight="24dp"
@@ -113,9 +113,9 @@
 
         </LinearLayout>
 
-        <TextView
-            android:id="@+id/tvDescription"
-            android:layout_width="wrap_content"
+        <WebView
+            android:id="@+id/webViewDescription"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:paddingLeft="4dp"
             android:layout_marginTop="8dp"

From f81b576b464127f8022da1e3b7137ce795c142bf Mon Sep 17 00:00:00 2001
From: Valery Miller <valera_miller94@mail.ru>
Date: Wed, 26 Sep 2018 17:50:59 +0500
Subject: [PATCH 153/251] Fixed dialog leak in xabberAccountActivity

---
 .../android/ui/activity/XabberAccountActivity.java   | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/xabber/src/main/java/com/xabber/android/ui/activity/XabberAccountActivity.java b/xabber/src/main/java/com/xabber/android/ui/activity/XabberAccountActivity.java
index 6beaf130cb..4d6c5caa86 100644
--- a/xabber/src/main/java/com/xabber/android/ui/activity/XabberAccountActivity.java
+++ b/xabber/src/main/java/com/xabber/android/ui/activity/XabberAccountActivity.java
@@ -51,6 +51,7 @@ public class XabberAccountActivity extends BaseLoginActivity
     private BarPainter barPainter;
     private ProgressDialog progressDialog;
 
+    private Dialog logoutDialog;
     private boolean dialogShowed;
 
     @NonNull
@@ -86,6 +87,13 @@ protected void onResume() {
         subscribeForXabberAccount();
     }
 
+    @Override
+    protected void onPause() {
+        super.onPause();
+        if (logoutDialog != null)
+            logoutDialog.dismiss();
+    }
+
     @Override
     protected void onDestroy() {
         super.onDestroy();
@@ -277,8 +285,8 @@ public void onClick(DialogInterface dialog, int which) {
                     }
                 })
                 .setNegativeButton(R.string.cancel, null);
-        Dialog dialog = builder.create();
-        dialog.show();
+        logoutDialog = builder.create();
+        logoutDialog.show();
         dialogShowed = false;
     }
 

From f10d75e3d4bf5ee1a7a532a921acac6ea59cc4c8 Mon Sep 17 00:00:00 2001
From: Valery Miller <valera_miller94@mail.ru>
Date: Wed, 26 Sep 2018 18:09:30 +0500
Subject: [PATCH 154/251] Up version to 517

---
 xabber/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/xabber/build.gradle b/xabber/build.gradle
index 9f2fb2bdb8..a6ce763ae1 100644
--- a/xabber/build.gradle
+++ b/xabber/build.gradle
@@ -10,8 +10,8 @@ android {
     defaultConfig {
         minSdkVersion 15
         targetSdkVersion 27
-        versionCode 516
-        versionName '2.4.2(516)'
+        versionCode 517
+        versionName '2.4.2(517)'
     }
 
     lintOptions {

From d8219de94daf4887a8380bb62660d7619120cd14 Mon Sep 17 00:00:00 2001
From: Valery Miller <valera_miller94@mail.ru>
Date: Thu, 27 Sep 2018 10:39:13 +0500
Subject: [PATCH 155/251] Added update sync list after successful sync

---
 .../com/xabber/android/ui/activity/BaseLoginActivity.java  | 4 ++++
 .../xabber/android/ui/activity/XabberAccountActivity.java  | 7 +++++++
 .../xabber/android/ui/activity/XabberLoginActivity.java    | 3 +++
 .../android/ui/fragment/XabberAccountInfoFragment.java     | 2 +-
 4 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/xabber/src/main/java/com/xabber/android/ui/activity/BaseLoginActivity.java b/xabber/src/main/java/com/xabber/android/ui/activity/BaseLoginActivity.java
index 8c40af147a..29c104c780 100644
--- a/xabber/src/main/java/com/xabber/android/ui/activity/BaseLoginActivity.java
+++ b/xabber/src/main/java/com/xabber/android/ui/activity/BaseLoginActivity.java
@@ -302,6 +302,7 @@ public void call(List<XMPPAccountSettings> s) {
                         Log.d(LOG_TAG, "XMPP accounts loading from net: successfully");
                         hideProgress();
                         updateLastSyncTime();
+                        onSynchronized();
                         Toast.makeText(BaseLoginActivity.this, R.string.sync_success, Toast.LENGTH_SHORT).show();
                         if (needGoToMainActivity) goToMainActivity();
                     }
@@ -328,6 +329,7 @@ public void call(List<XMPPAccountSettings> settings) {
                         hideProgress();
                         // update last synchronization time
                         SettingsManager.setLastSyncDate(XabberAccountManager.getCurrentTimeString());
+                        onSynchronized();
                         Toast.makeText(BaseLoginActivity.this, R.string.sync_success, Toast.LENGTH_SHORT).show();
                         if (needGoToMainActivity) goToMainActivity();
                     }
@@ -352,6 +354,8 @@ protected void goToMainActivity() {
         startActivity(intent);
     }
 
+    protected abstract void onSynchronized();
+
     /** ADD EMAIL */
 
     protected void resendConfirmEmail(String email) {
diff --git a/xabber/src/main/java/com/xabber/android/ui/activity/XabberAccountActivity.java b/xabber/src/main/java/com/xabber/android/ui/activity/XabberAccountActivity.java
index 4d6c5caa86..f83728b6f7 100644
--- a/xabber/src/main/java/com/xabber/android/ui/activity/XabberAccountActivity.java
+++ b/xabber/src/main/java/com/xabber/android/ui/activity/XabberAccountActivity.java
@@ -148,6 +148,13 @@ public void call(XabberAccount account) {
             }).subscribe());
     }
 
+    @Override
+    protected void onSynchronized() {
+        XabberAccountInfoFragment fragment = (XabberAccountInfoFragment) getFragmentManager().findFragmentByTag(FRAGMENT_INFO);
+        if (fragment != null && fragment.isVisible())
+            ((XabberAccountInfoFragment) fragmentInfo).getSettings();
+    }
+
     /** Social Auth */
 
     @Override
diff --git a/xabber/src/main/java/com/xabber/android/ui/activity/XabberLoginActivity.java b/xabber/src/main/java/com/xabber/android/ui/activity/XabberLoginActivity.java
index c7f08717cd..b8a6ba163f 100644
--- a/xabber/src/main/java/com/xabber/android/ui/activity/XabberLoginActivity.java
+++ b/xabber/src/main/java/com/xabber/android/ui/activity/XabberLoginActivity.java
@@ -312,6 +312,9 @@ public void onTwitterClick() {
         loginTwitter();
     }
 
+    @Override
+    protected void onSynchronized() { }
+
     /** GET HOSTS */
 
     private void getHosts() {
diff --git a/xabber/src/main/java/com/xabber/android/ui/fragment/XabberAccountInfoFragment.java b/xabber/src/main/java/com/xabber/android/ui/fragment/XabberAccountInfoFragment.java
index 23857dea53..0125a560e0 100644
--- a/xabber/src/main/java/com/xabber/android/ui/fragment/XabberAccountInfoFragment.java
+++ b/xabber/src/main/java/com/xabber/android/ui/fragment/XabberAccountInfoFragment.java
@@ -149,7 +149,7 @@ public void call(XabberAccount account) {
 
     /** GET SETTINGS */
 
-    private void getSettings() {
+    public void getSettings() {
         showProgressView(true);
         Subscription getSettingsSubscription = AuthManager.getClientSettings()
                 .subscribeOn(Schedulers.io())

From 7638b27239e45ace8b2fbc701fbee4627f1af7ec Mon Sep 17 00:00:00 2001
From: Valery Miller <valera_miller94@mail.ru>
Date: Thu, 27 Sep 2018 11:19:38 +0500
Subject: [PATCH 156/251] Changed progress-view in xabber account screen from
 dialog to progress in toolbar

---
 .../ui/activity/XabberAccountActivity.java    | 17 ++++--------
 .../layout/activity_xabber_account_info.xml   |  2 +-
 .../main/res/layout/toolbar_with_progress.xml | 27 +++++++++++++++++++
 3 files changed, 33 insertions(+), 13 deletions(-)
 create mode 100644 xabber/src/main/res/layout/toolbar_with_progress.xml

diff --git a/xabber/src/main/java/com/xabber/android/ui/activity/XabberAccountActivity.java b/xabber/src/main/java/com/xabber/android/ui/activity/XabberAccountActivity.java
index f83728b6f7..dbaf3e143c 100644
--- a/xabber/src/main/java/com/xabber/android/ui/activity/XabberAccountActivity.java
+++ b/xabber/src/main/java/com/xabber/android/ui/activity/XabberAccountActivity.java
@@ -4,7 +4,6 @@
 import android.app.Dialog;
 import android.app.Fragment;
 import android.app.FragmentTransaction;
-import android.app.ProgressDialog;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
@@ -17,6 +16,7 @@
 import android.view.MenuItem;
 import android.view.View;
 import android.widget.CheckBox;
+import android.widget.ProgressBar;
 import android.widget.Toast;
 
 import com.xabber.android.R;
@@ -49,7 +49,7 @@ public class XabberAccountActivity extends BaseLoginActivity
 
     private Toolbar toolbar;
     private BarPainter barPainter;
-    private ProgressDialog progressDialog;
+    private ProgressBar toolbarProgress;
 
     private Dialog logoutDialog;
     private boolean dialogShowed;
@@ -78,6 +78,7 @@ public void onClick(View v) {
         toolbar.inflateMenu(R.menu.toolbar_xabber_account_info);
         toolbar.setTitleTextColor(getResources().getColor(R.color.black_text));
         barPainter = new BarPainter(this, toolbar);
+        toolbarProgress = findViewById(R.id.toolbarProgress);
     }
 
     @Override
@@ -119,20 +120,12 @@ public boolean onMenuItemClick(MenuItem item) {
 
     @Override
     protected void showProgress(String title) {
-        if (!isFinishing()) {
-            progressDialog = new ProgressDialog(this);
-            progressDialog.setTitle(title);
-            progressDialog.setMessage(getResources().getString(R.string.progress_message));
-            progressDialog.show();
-        }
+        toolbarProgress.setVisibility(View.VISIBLE);
     }
 
     @Override
     protected void hideProgress() {
-        if (progressDialog != null) {
-            progressDialog.dismiss();
-            progressDialog = null;
-        }
+        toolbarProgress.setVisibility(View.GONE);
     }
 
     private void subscribeForXabberAccount() {
diff --git a/xabber/src/main/res/layout/activity_xabber_account_info.xml b/xabber/src/main/res/layout/activity_xabber_account_info.xml
index 9a43094628..b48afdbf10 100644
--- a/xabber/src/main/res/layout/activity_xabber_account_info.xml
+++ b/xabber/src/main/res/layout/activity_xabber_account_info.xml
@@ -5,7 +5,7 @@
     android:background="?attr/settings_background_color"
     android:focusableInTouchMode="true">
 
-    <include layout="@layout/toolbar_default" />
+    <include layout="@layout/toolbar_with_progress" />
 
     <android.support.v4.widget.NestedScrollView
         android:id="@+id/scrollView"
diff --git a/xabber/src/main/res/layout/toolbar_with_progress.xml b/xabber/src/main/res/layout/toolbar_with_progress.xml
new file mode 100644
index 0000000000..00963690db
--- /dev/null
+++ b/xabber/src/main/res/layout/toolbar_with_progress.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<android.support.v7.widget.Toolbar xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/toolbar_default"
+    android:layout_width="match_parent"
+    android:layout_height="?attr/actionBarSize"
+
+    app:titleTextAppearance="@style/ToolbarTitle"
+    android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
+    app:popupTheme="?attr/toolbar_popup_theme"
+    android:elevation="8dp"
+    app:contentInsetStartWithNavigation="0dp"
+    >
+
+    <ProgressBar
+        android:id="@+id/toolbarProgress"
+        android:layout_width="18dp"
+        android:layout_height="18dp"
+        android:indeterminateTint="@color/black"
+        android:indeterminateTintMode="src_in"
+        android:layout_gravity="left"
+        android:layout_marginLeft="8dp"
+        android:visibility="gone"
+        />
+
+</android.support.v7.widget.Toolbar>

From 0f52589a427e3346cf3e2300b7b30bb67d69c319 Mon Sep 17 00:00:00 2001
From: Valery Miller <valera_miller94@mail.ru>
Date: Thu, 27 Sep 2018 11:41:46 +0500
Subject: [PATCH 157/251] Show progress for synclist only if sync list not
 exist

---
 .../xabber/android/ui/fragment/XabberAccountInfoFragment.java    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/xabber/src/main/java/com/xabber/android/ui/fragment/XabberAccountInfoFragment.java b/xabber/src/main/java/com/xabber/android/ui/fragment/XabberAccountInfoFragment.java
index 0125a560e0..861b7dcf76 100644
--- a/xabber/src/main/java/com/xabber/android/ui/fragment/XabberAccountInfoFragment.java
+++ b/xabber/src/main/java/com/xabber/android/ui/fragment/XabberAccountInfoFragment.java
@@ -184,6 +184,7 @@ private void showSyncFragment() {
     }
 
     private void showProgressView(boolean show) {
+        if (fragmentSync != null && fragmentSync.isVisible() && show) return;
         progressView.setVisibility(show ? View.VISIBLE : View.GONE);
     }
 

From 5e7b59de3d64d9c960c2134489bfa57b9143007c Mon Sep 17 00:00:00 2001
From: Valery Miller <valera_miller94@mail.ru>
Date: Thu, 27 Sep 2018 12:06:28 +0500
Subject: [PATCH 158/251] Added default style for domain description webview

---
 xabber/src/main/assets/style.css                   | 14 ++++++++++++++
 .../ui/fragment/XAccountSignUpFragment1.java       |  6 +++++-
 2 files changed, 19 insertions(+), 1 deletion(-)
 create mode 100644 xabber/src/main/assets/style.css

diff --git a/xabber/src/main/assets/style.css b/xabber/src/main/assets/style.css
new file mode 100644
index 0000000000..22e70f2ec9
--- /dev/null
+++ b/xabber/src/main/assets/style.css
@@ -0,0 +1,14 @@
+li {
+    padding-left: 6px;
+    padding-right: 6px;
+}
+
+ul {
+    margin-top: 0px;
+    margin-bottom: 0px;
+}
+
+p {
+    margin-top: 8px;
+    margin-bottom: 4px;
+}
diff --git a/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountSignUpFragment1.java b/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountSignUpFragment1.java
index d8106bea0a..81e4e209b8 100644
--- a/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountSignUpFragment1.java
+++ b/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountSignUpFragment1.java
@@ -64,7 +64,11 @@ public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
         spinnerDomain.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
             @Override
             public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
-                webViewDescription.loadData(hosts.get(position).getDescription(), null, null);
+                String htmlData = "<link rel=\"stylesheet\" type=\"text/css\" href=\"style.css\" />"
+                        + hosts.get(position).getDescription();
+                webViewDescription.loadDataWithBaseURL("file:///android_asset/",
+                        htmlData, "text/html", "UTF-8", null);
+
                 if (adapter != null) adapter.setCurrentPosition(position);
             }
 

From 3dfbbdb2351cdb53c09d2d605263d69650f330b8 Mon Sep 17 00:00:00 2001
From: Valery Miller <valera_miller94@mail.ru>
Date: Thu, 27 Sep 2018 13:28:11 +0500
Subject: [PATCH 159/251] Visual changes in login/signup screen

---
 xabber/src/main/AndroidManifest.xml           |   1 -
 .../main/res/layout/activity_xabber_login.xml |   2 +-
 .../res/layout/fragment_xaccount_login.xml    | 103 +++++++++++-------
 .../res/layout/fragment_xaccount_signup_1.xml |   1 +
 .../res/layout/fragment_xaccount_signup_2.xml |   1 +
 .../src/main/res/layout/toolbar_with_logo.xml |  24 ++++
 6 files changed, 88 insertions(+), 44 deletions(-)
 create mode 100644 xabber/src/main/res/layout/toolbar_with_logo.xml

diff --git a/xabber/src/main/AndroidManifest.xml b/xabber/src/main/AndroidManifest.xml
index 6574af4cde..618fd1d930 100644
--- a/xabber/src/main/AndroidManifest.xml
+++ b/xabber/src/main/AndroidManifest.xml
@@ -519,7 +519,6 @@
         <activity android:name=".ui.activity.TutorialActivity"
             android:theme="@style/ThemeDark"/>
         <activity android:name=".ui.activity.XabberLoginActivity"
-            android:windowSoftInputMode="adjustResize"
             android:screenOrientation="portrait"
             android:theme="@style/Theme.Design.Light"/>
         <activity android:name=".ui.activity.XabberAccountActivity"
diff --git a/xabber/src/main/res/layout/activity_xabber_login.xml b/xabber/src/main/res/layout/activity_xabber_login.xml
index 8b7a352aea..f00506503d 100644
--- a/xabber/src/main/res/layout/activity_xabber_login.xml
+++ b/xabber/src/main/res/layout/activity_xabber_login.xml
@@ -4,7 +4,7 @@
     android:layout_height="match_parent"
     android:background="@color/cardview_light_background">
 
-    <include layout="@layout/toolbar_default"
+    <include layout="@layout/toolbar_with_logo"
         android:id="@+id/toolbar_default" />
 
     <FrameLayout
diff --git a/xabber/src/main/res/layout/fragment_xaccount_login.xml b/xabber/src/main/res/layout/fragment_xaccount_login.xml
index 4bdc824aa3..67000633e6 100644
--- a/xabber/src/main/res/layout/fragment_xaccount_login.xml
+++ b/xabber/src/main/res/layout/fragment_xaccount_login.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -10,56 +11,74 @@
         android:layout_centerInParent="true"
         android:layout_marginLeft="@dimen/login_horizontal_margin"
         android:layout_marginRight="@dimen/login_horizontal_margin"
+        android:focusableInTouchMode="true"
         >
 
-        <ImageView
-            android:layout_width="100dp"
-            android:layout_height="100dp"
-            android:src="@drawable/ic_logo_circle"
-            android:layout_gravity="center_horizontal"
-            />
-
-        <TextView
+        <!--<ImageView-->
+            <!--android:layout_width="100dp"-->
+            <!--android:layout_height="100dp"-->
+            <!--android:src="@drawable/ic_logo_circle"-->
+            <!--android:layout_gravity="center_horizontal"-->
+            <!--/>-->
+
+        <!--<TextView-->
+            <!--android:layout_width="match_parent"-->
+            <!--android:layout_height="wrap_content"-->
+            <!--android:layout_marginTop="16dp"-->
+            <!--android:paddingLeft="4dp"-->
+            <!--android:textColor="@color/black_text_secondary"-->
+            <!--android:text="@string/label_xmpp_id"-->
+            <!--/>-->
+
+        <android.support.design.widget.TextInputLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="16dp"
-            android:paddingLeft="4dp"
-            android:textColor="@color/black_text_secondary"
-            android:text="@string/label_xmpp_id"
-            />
+            >
 
-        <EditText
-            android:id="@+id/edtUsername"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:imeOptions="actionNext"
-            android:nextFocusForward="@+id/edtPass"
-            android:singleLine="true"
-            android:hint="@string/name_example_com"
-            android:textSize="16sp"
-            android:theme="@style/Theme"
-            />
-
-        <TextView
+            <android.support.design.widget.TextInputEditText
+                android:id="@+id/edtUsername"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:imeOptions="actionNext"
+                android:nextFocusForward="@+id/edtPass"
+                android:singleLine="true"
+                android:hint="@string/label_xmpp_id"
+                android:textSize="16sp"
+                android:theme="@style/Theme"
+                />
+
+        </android.support.design.widget.TextInputLayout>
+
+        <!--<TextView-->
+            <!--android:layout_width="match_parent"-->
+            <!--android:layout_height="wrap_content"-->
+            <!--android:paddingLeft="4dp"-->
+            <!--android:layout_marginTop="16dp"-->
+            <!--android:textColor="@color/black_text_secondary"-->
+            <!--android:text="@string/label_pass"-->
+            <!--/>-->
+
+        <android.support.design.widget.TextInputLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:paddingLeft="4dp"
+            app:passwordToggleEnabled="true"
             android:layout_marginTop="16dp"
-            android:textColor="@color/black_text_secondary"
-            android:text="@string/label_pass"
-            />
+            android:layout_marginBottom="16dp"
+            >
 
-        <EditText
-            android:id="@+id/edtPass"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:imeOptions="actionDone"
-            android:singleLine="true"
-            android:textSize="16sp"
-            android:theme="@style/Theme"
-            android:hint="@string/hint_pass"
-            android:inputType="textPassword"
-            />
+            <android.support.design.widget.TextInputEditText
+                android:id="@+id/edtPass"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:imeOptions="actionDone"
+                android:singleLine="true"
+                android:textSize="16sp"
+                android:theme="@style/Theme"
+                android:hint="@string/hint_pass"
+                android:inputType="textPassword"
+                />
+
+        </android.support.design.widget.TextInputLayout>
 
         <LinearLayout
             android:id="@+id/optionsView"
diff --git a/xabber/src/main/res/layout/fragment_xaccount_signup_1.xml b/xabber/src/main/res/layout/fragment_xaccount_signup_1.xml
index bc6d12e7fd..9dcbea0313 100644
--- a/xabber/src/main/res/layout/fragment_xaccount_signup_1.xml
+++ b/xabber/src/main/res/layout/fragment_xaccount_signup_1.xml
@@ -5,6 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/white"
+    android:focusableInTouchMode="true"
     >
 
     <LinearLayout
diff --git a/xabber/src/main/res/layout/fragment_xaccount_signup_2.xml b/xabber/src/main/res/layout/fragment_xaccount_signup_2.xml
index c5dc25b09e..11b69c1ffc 100644
--- a/xabber/src/main/res/layout/fragment_xaccount_signup_2.xml
+++ b/xabber/src/main/res/layout/fragment_xaccount_signup_2.xml
@@ -30,6 +30,7 @@
         android:layout_marginTop="24dp"
         android:layout_marginLeft="24dp"
         android:layout_marginRight="24dp"
+        android:focusableInTouchMode="true"
         >
 
         <android.support.design.widget.TextInputLayout
diff --git a/xabber/src/main/res/layout/toolbar_with_logo.xml b/xabber/src/main/res/layout/toolbar_with_logo.xml
new file mode 100644
index 0000000000..506cef6792
--- /dev/null
+++ b/xabber/src/main/res/layout/toolbar_with_logo.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<android.support.v7.widget.Toolbar xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/toolbar_default"
+    android:layout_width="match_parent"
+    android:layout_height="?attr/actionBarSize"
+
+    app:titleTextAppearance="@style/ToolbarTitle"
+    android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
+    app:popupTheme="?attr/toolbar_popup_theme"
+    android:elevation="8dp"
+    app:contentInsetStartWithNavigation="0dp"
+    >
+
+    <ImageView
+        android:layout_width="32dp"
+        android:layout_height="32dp"
+        android:src="@mipmap/ic_launcher"
+        android:layout_gravity="right"
+        android:layout_marginRight="16dp"
+        />
+
+</android.support.v7.widget.Toolbar>

From 01abea32f6331ae6106915da1e3ec9350d777f04 Mon Sep 17 00:00:00 2001
From: Valery Miller <valera_miller94@mail.ru>
Date: Thu, 27 Sep 2018 14:57:49 +0500
Subject: [PATCH 160/251] Fixed deleting account settings with deleting account

---
 .../data/xaccount/XabberAccountManager.java   | 34 +++++++++++
 .../ui/dialog/AccountDeleteDialog.java        | 16 ++----
 .../ui/preferences/PreferenceEditor.java      | 56 -------------------
 3 files changed, 38 insertions(+), 68 deletions(-)

diff --git a/xabber/src/main/java/com/xabber/android/data/xaccount/XabberAccountManager.java b/xabber/src/main/java/com/xabber/android/data/xaccount/XabberAccountManager.java
index 8f76b253e4..346d6589ca 100644
--- a/xabber/src/main/java/com/xabber/android/data/xaccount/XabberAccountManager.java
+++ b/xabber/src/main/java/com/xabber/android/data/xaccount/XabberAccountManager.java
@@ -275,6 +275,40 @@ private void handleErrorGetAccount(Throwable throwable) {
         }
     }
 
+    public void deleteAccountSettings(String jid) {
+        if (XabberAccountManager.getInstance().getAccountSyncState(jid) != null) {
+
+            Subscription deleteSubscription = AuthManager.deleteClientSettings(jid)
+                    .subscribeOn(Schedulers.io())
+                    .observeOn(AndroidSchedulers.mainThread())
+                    .subscribe(new Action1<List<XMPPAccountSettings>>() {
+                        @Override
+                        public void call(List<XMPPAccountSettings> settings) {
+                            handleSuccessDelete(settings);
+                        }
+                    }, new Action1<Throwable>() {
+                        @Override
+                        public void call(Throwable throwable) {
+                            handleErrorDelete(throwable);
+                        }
+                    });
+            compositeSubscription.add(deleteSubscription);
+        }
+    }
+
+    private void handleSuccessDelete(List<XMPPAccountSettings> settings) {
+        Log.d(LOG_TAG, "Settings deleted successfuly");
+    }
+
+    private void handleErrorDelete(Throwable throwable) {
+        String message = RetrofitErrorConverter.throwableToHttpError(throwable);
+        if (message != null) {
+            if (message.equals("Invalid token"))
+                XabberAccountManager.getInstance().onInvalidToken();
+            else Log.d(LOG_TAG, "Error while deleting settings: " + message);
+        } else Log.d(LOG_TAG, "Error while deleting settings: " + throwable.toString());
+    }
+
     @Nullable
     public XabberAccount getAccount() {
         return account;
diff --git a/xabber/src/main/java/com/xabber/android/ui/dialog/AccountDeleteDialog.java b/xabber/src/main/java/com/xabber/android/ui/dialog/AccountDeleteDialog.java
index 862f86dd00..dbd3185031 100644
--- a/xabber/src/main/java/com/xabber/android/ui/dialog/AccountDeleteDialog.java
+++ b/xabber/src/main/java/com/xabber/android/ui/dialog/AccountDeleteDialog.java
@@ -1,11 +1,10 @@
 package com.xabber.android.ui.dialog;
 
-import android.app.Activity;
 import android.app.AlertDialog;
 import android.app.Dialog;
-import android.support.v4.app.DialogFragment;
 import android.content.DialogInterface;
 import android.os.Bundle;
+import android.support.v4.app.DialogFragment;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.CheckBox;
@@ -14,7 +13,6 @@
 import com.xabber.android.data.account.AccountManager;
 import com.xabber.android.data.entity.AccountJid;
 import com.xabber.android.data.xaccount.XabberAccountManager;
-import com.xabber.android.ui.preferences.PreferenceEditor;
 
 
 public class AccountDeleteDialog extends DialogFragment implements DialogInterface.OnClickListener {
@@ -60,16 +58,10 @@ public Dialog onCreateDialog(Bundle savedInstanceState) {
 
     @Override
     public void onClick(DialogInterface dialog, int which) {
-        if (which != Dialog.BUTTON_POSITIVE) {
-            return;
-        }
+        if (which != Dialog.BUTTON_POSITIVE) return;
 
         AccountManager.getInstance().removeAccount(account);
-
-        if (chbDeleteSettings != null && chbDeleteSettings.isChecked()) {
-            Activity activity = getActivity();
-            if (activity instanceof PreferenceEditor)
-                ((PreferenceEditor)activity).onDeleteAccountSettings(jid);
-        }
+        if (chbDeleteSettings != null && chbDeleteSettings.isChecked())
+            XabberAccountManager.getInstance().deleteAccountSettings(jid);
     }
 }
diff --git a/xabber/src/main/java/com/xabber/android/ui/preferences/PreferenceEditor.java b/xabber/src/main/java/com/xabber/android/ui/preferences/PreferenceEditor.java
index 8131d355c5..1b9d97e7a7 100644
--- a/xabber/src/main/java/com/xabber/android/ui/preferences/PreferenceEditor.java
+++ b/xabber/src/main/java/com/xabber/android/ui/preferences/PreferenceEditor.java
@@ -20,8 +20,6 @@
 import android.content.pm.PackageManager;
 import android.os.Bundle;
 import android.support.v7.widget.Toolbar;
-import android.util.Log;
-import android.widget.Toast;
 
 import com.xabber.android.R;
 import com.xabber.android.data.ActivityManager;
@@ -29,9 +27,6 @@
 import com.xabber.android.data.account.AccountItem;
 import com.xabber.android.data.entity.AccountJid;
 import com.xabber.android.data.log.LogManager;
-import com.xabber.android.data.xaccount.AuthManager;
-import com.xabber.android.data.xaccount.XMPPAccountSettings;
-import com.xabber.android.data.xaccount.XabberAccountManager;
 import com.xabber.android.ui.activity.AccountActivity;
 import com.xabber.android.ui.activity.AccountAddActivity;
 import com.xabber.android.ui.activity.AccountListActivity;
@@ -43,17 +38,10 @@
 import com.xabber.android.ui.dialog.AccountDeleteDialog;
 import com.xabber.android.ui.helper.ToolbarHelper;
 import com.xabber.android.ui.widget.XMPPListPreference;
-import com.xabber.android.utils.RetrofitErrorConverter;
 
 import org.greenrobot.eventbus.Subscribe;
 import org.greenrobot.eventbus.ThreadMode;
 
-import java.util.List;
-
-import rx.Subscription;
-import rx.android.schedulers.AndroidSchedulers;
-import rx.functions.Action1;
-import rx.schedulers.Schedulers;
 import rx.subscriptions.CompositeSubscription;
 
 public class PreferenceEditor extends ManagedActivity
@@ -164,48 +152,4 @@ public void onDeleteAccount(AccountItem accountItem) {
         AccountDeleteDialog.newInstance(accountItem.getAccount()).show(getSupportFragmentManager(),
                 AccountDeleteDialog.class.getName());
     }
-
-    public void onDeleteAccountSettings(String jid) {
-        showProgress(getResources().getString(R.string.progress_title_delete_settings));
-
-        if (XabberAccountManager.getInstance().getAccountSyncState(jid) != null) {
-
-            Subscription deleteSubscription = AuthManager.deleteClientSettings(jid)
-                    .subscribeOn(Schedulers.io())
-                    .observeOn(AndroidSchedulers.mainThread())
-                    .subscribe(new Action1<List<XMPPAccountSettings>>() {
-                        @Override
-                        public void call(List<XMPPAccountSettings> settings) {
-                            handleSuccessDelete(settings);
-                        }
-                    }, new Action1<Throwable>() {
-                        @Override
-                        public void call(Throwable throwable) {
-                            handleErrorDelete(throwable);
-                        }
-                    });
-            compositeSubscription.add(deleteSubscription);
-        }
-    }
-
-    private void handleSuccessDelete(List<XMPPAccountSettings> settings) {
-        hideProgress();
-        Toast.makeText(this, R.string.settings_delete_success, Toast.LENGTH_SHORT).show();
-    }
-
-    private void handleErrorDelete(Throwable throwable) {
-        String message = RetrofitErrorConverter.throwableToHttpError(throwable);
-        if (message != null) {
-            if (message.equals("Invalid token")) {
-                XabberAccountManager.getInstance().onInvalidToken();
-            } else {
-                Log.d(LOG_TAG, "Error while deleting settings: " + message);
-                Toast.makeText(this, message, Toast.LENGTH_SHORT).show();
-            }
-        } else {
-            Log.d(LOG_TAG, "Error while deleting settings: " + throwable.toString());
-            Toast.makeText(this, "Error while deleting settings: " + throwable.toString(), Toast.LENGTH_LONG).show();
-        }
-        hideProgress();
-    }
 }

From 407c66351640555b088fcef72f7be4c95b82618a Mon Sep 17 00:00:00 2001
From: Valery Miller <valera_miller94@mail.ru>
Date: Thu, 27 Sep 2018 15:19:13 +0500
Subject: [PATCH 161/251] Deleted unused API methods

---
 .../android/data/xaccount/AuthManager.java    | 34 +------------------
 .../android/data/xaccount/IXabberApi.java     |  9 -----
 .../ui/activity/XabberAccountActivity.java    |  2 +-
 3 files changed, 2 insertions(+), 43 deletions(-)

diff --git a/xabber/src/main/java/com/xabber/android/data/xaccount/AuthManager.java b/xabber/src/main/java/com/xabber/android/data/xaccount/AuthManager.java
index 4ba905988e..499b602ead 100644
--- a/xabber/src/main/java/com/xabber/android/data/xaccount/AuthManager.java
+++ b/xabber/src/main/java/com/xabber/android/data/xaccount/AuthManager.java
@@ -2,7 +2,6 @@
 
 import android.util.Base64;
 
-import com.google.gson.Gson;
 import com.xabber.android.BuildConfig;
 import com.xabber.android.data.SettingsManager;
 import com.xabber.android.data.entity.AccountJid;
@@ -28,7 +27,6 @@ public class AuthManager {
 
     public static final String PROVIDER_FACEBOOK = "facebook";
     public static final String PROVIDER_TWITTER = "twitter";
-    public static final String PROVIDER_GITHUB = "github";
     public static final String PROVIDER_GOOGLE = "google";
 
     private static final String SOURCE_NAME = "Xabber Android";
@@ -43,7 +41,7 @@ public static Single<XAccountTokenDTO> login(String login, String pass) {
         return HttpApiManager.getXabberApi().login("Basic " + encodedCredentials, new Source(getSource()));
     }
 
-    public static Single<ResponseBody> logout(final boolean deleteAccounts) {
+    public static Single<ResponseBody> logout() {
 
         return HttpApiManager.getXabberApi().logout(getXabberTokenHeader())
                 .flatMap(new Func1<ResponseBody, Single<? extends ResponseBody>>() {
@@ -229,19 +227,6 @@ public Single<? extends XabberAccount> call(XabberAccountDTO xabberAccountDTO) {
                 });
     }
 
-    public static Single<XabberAccount> completeRegister(String username, String pass, String confirmPass,
-                                                         String firstName, String lastName,
-                                                         String host, String language, boolean createToken) {
-        return HttpApiManager.getXabberApi().completeRegister(getXabberTokenHeader(),
-                new CompleteRegister(username, pass, confirmPass, firstName, lastName, host, language, createToken))
-                .flatMap(new Func1<XabberAccountDTO, Single<? extends XabberAccount>>() {
-                    @Override
-                    public Single<? extends XabberAccount> call(XabberAccountDTO xabberAccountDTO) {
-                        return XabberAccountManager.getInstance().saveOrUpdateXabberAccountToRealm(xabberAccountDTO, getXabberToken());
-                    }
-                });
-    }
-
     public static Single<ResponseBody> addEmail(String email) {
         return HttpApiManager.getXabberApi().addEmail(getXabberTokenHeader(), new Email(email, getSource()));
     }
@@ -250,14 +235,6 @@ public static Single<ResponseBody> deleteEmail(int emailId) {
         return HttpApiManager.getXabberApi().deleteEmail(getXabberTokenHeader(), emailId);
     }
 
-    public static Single<ResponseBody> setPhoneNumber(String phoneNumber) {
-        return HttpApiManager.getXabberApi().setPhoneNumber(getXabberTokenHeader(), new SetPhoneNumber("set", phoneNumber));
-    }
-
-    public static Single<ResponseBody> confirmPhoneNumber(String code) {
-        return HttpApiManager.getXabberApi().confirmPhoneNumber(getXabberTokenHeader(), new ConfirmPhoneNumber("verify", code));
-    }
-
     // API v2
 
     public static Single<XMPPCode> requestXMPPCode(String jid) {
@@ -319,15 +296,6 @@ public static Single<ResponseBody> bindSocial(String provider, String credential
                 new SocialAuthRequest(provider, credentials, getSource()));
     }
 
-    public static Single<ResponseBody> bindSocial(String socialToken, String twitterTokenSecret,
-                                                  String secret, String key) {
-        Gson gson = new Gson();
-        String credentials = gson.toJson(new TwitterAccessToken(
-                new TwitterTokens(twitterTokenSecret, socialToken), secret, key));
-        return HttpApiManager.getXabberApi().bindSocial(getXabberTokenHeader(),
-                new SocialAuthRequest(PROVIDER_TWITTER, credentials, getSource()));
-    }
-
     public static Single<ResponseBody> unbindSocial(String provider) {
         return HttpApiManager.getXabberApi().unbindSocial(getXabberTokenHeader(), new Provider(provider));
     }
diff --git a/xabber/src/main/java/com/xabber/android/data/xaccount/IXabberApi.java b/xabber/src/main/java/com/xabber/android/data/xaccount/IXabberApi.java
index 44351f69dd..3a385bf39c 100644
--- a/xabber/src/main/java/com/xabber/android/data/xaccount/IXabberApi.java
+++ b/xabber/src/main/java/com/xabber/android/data/xaccount/IXabberApi.java
@@ -35,12 +35,6 @@ public interface IXabberApi {
     @PATCH("accounts/current/")
     Single<XabberAccountDTO> updateAccount(@Header("Authorization") String token, @Body AuthManager.Account account);
 
-    @POST("accounts/current/phone/")
-    Single<ResponseBody> setPhoneNumber(@Header("Authorization") String token, @Body AuthManager.SetPhoneNumber setPhoneNumber);
-
-    @POST("accounts/current/phone/")
-    Single<ResponseBody> confirmPhoneNumber(@Header("Authorization") String token, @Body AuthManager.ConfirmPhoneNumber confirmPhoneNumber);
-
     @GET("accounts/current/client-settings/")
     Single<AuthManager.ListClientSettingsDTO> getClientSettings(@Header("Authorization") String token);
 
@@ -59,9 +53,6 @@ public interface IXabberApi {
     @POST("accounts/email_confirmation/")
     Single<XabberAccountDTO> confirmEmail(@Body AuthManager.Key key);
 
-    @POST("accounts/current/complete_registration/")
-    Single<XabberAccountDTO> completeRegister(@Header("Authorization") String token, @Body AuthManager.CompleteRegister register);
-
     @POST("accounts/current/email_list/")
     Single<ResponseBody> addEmail(@Header("Authorization") String token, @Body AuthManager.Email email);
 
diff --git a/xabber/src/main/java/com/xabber/android/ui/activity/XabberAccountActivity.java b/xabber/src/main/java/com/xabber/android/ui/activity/XabberAccountActivity.java
index dbaf3e143c..4cf49a4d44 100644
--- a/xabber/src/main/java/com/xabber/android/ui/activity/XabberAccountActivity.java
+++ b/xabber/src/main/java/com/xabber/android/ui/activity/XabberAccountActivity.java
@@ -292,7 +292,7 @@ public void onClick(DialogInterface dialog, int which) {
 
     private void logout(final boolean deleteAccounts) {
         showProgress(getResources().getString(R.string.progress_title_quit));
-        Subscription logoutSubscription = AuthManager.logout(deleteAccounts)
+        Subscription logoutSubscription = AuthManager.logout()
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribe(new Action1<ResponseBody>() {

From f589425f07808598e9cd13b25aa69814e89b6d82 Mon Sep 17 00:00:00 2001
From: Valery Miller <valera_miller94@mail.ru>
Date: Thu, 27 Sep 2018 16:24:50 +0500
Subject: [PATCH 162/251] Visual changes in progress in login screen

---
 .../com/xabber/android/ui/activity/XabberLoginActivity.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/xabber/src/main/java/com/xabber/android/ui/activity/XabberLoginActivity.java b/xabber/src/main/java/com/xabber/android/ui/activity/XabberLoginActivity.java
index b8a6ba163f..8f5397a702 100644
--- a/xabber/src/main/java/com/xabber/android/ui/activity/XabberLoginActivity.java
+++ b/xabber/src/main/java/com/xabber/android/ui/activity/XabberLoginActivity.java
@@ -233,7 +233,7 @@ public void hideKeyboard() {
 
     @Override
     protected void showProgress(String title) {
-        if (!isFinishing()) {
+        if (!isFinishing() && !getString(R.string.progress_title_sync).equals(title)) {
             progressDialog = new ProgressDialog(this);
             progressDialog.setTitle(title);
             progressDialog.setMessage(getResources().getString(R.string.progress_message));
@@ -476,7 +476,7 @@ public void call(Throwable throwable) {
     }
 
     private void handleSuccessGetAccount(@NonNull XabberAccount xabberAccount) {
-        hideProgress();
+        //hideProgress();
         synchronize(true);
     }
 

From bd54424f4b7451918e51682ecf7601672c3193a0 Mon Sep 17 00:00:00 2001
From: Valery Miller <valera_miller94@mail.ru>
Date: Thu, 27 Sep 2018 16:46:41 +0500
Subject: [PATCH 163/251] Changes interface for social bind

---
 .../ui/activity/BaseLoginActivity.java        |  5 +--
 .../ui/activity/XabberLoginActivity.java      | 22 ++----------
 .../ui/fragment/XAccountLinksFragment.java    | 23 ++++++------
 .../ui/fragment/XAccountLoginFragment.java    | 36 ++++++++++++-------
 .../ui/helper/OnSocialBindListener.java       |  5 +++
 5 files changed, 47 insertions(+), 44 deletions(-)
 create mode 100644 xabber/src/main/java/com/xabber/android/ui/helper/OnSocialBindListener.java

diff --git a/xabber/src/main/java/com/xabber/android/ui/activity/BaseLoginActivity.java b/xabber/src/main/java/com/xabber/android/ui/activity/BaseLoginActivity.java
index 29c104c780..d2d421bdc8 100644
--- a/xabber/src/main/java/com/xabber/android/ui/activity/BaseLoginActivity.java
+++ b/xabber/src/main/java/com/xabber/android/ui/activity/BaseLoginActivity.java
@@ -42,6 +42,7 @@
 import com.xabber.android.ui.dialog.AddEmailDialogFragment;
 import com.xabber.android.ui.dialog.ConfirmEmailDialogFragment;
 import com.xabber.android.ui.fragment.XAccountLinksFragment;
+import com.xabber.android.ui.helper.OnSocialBindListener;
 import com.xabber.android.utils.RetrofitErrorConverter;
 
 import java.io.IOException;
@@ -61,7 +62,7 @@
 
 public abstract class BaseLoginActivity extends ManagedActivity implements
         GoogleApiClient.OnConnectionFailedListener, XAccountLinksFragment.Listener,
-        AddEmailDialogFragment.Listener, ConfirmEmailDialogFragment.Listener {
+        AddEmailDialogFragment.Listener, ConfirmEmailDialogFragment.Listener, OnSocialBindListener {
 
     private final static String LOG_TAG = BaseLoginActivity.class.getSimpleName();
 
@@ -505,7 +506,7 @@ public void call(Throwable throwable) {
     /** XABBER ACCOUNT LINKS LISTENER */
 
     @Override
-    public void onSocialBindClick(String provider) {
+    public void onBindClick(String provider) {
         switch (provider) {
             case AuthManager.PROVIDER_GOOGLE:
                 loginGoogle();
diff --git a/xabber/src/main/java/com/xabber/android/ui/activity/XabberLoginActivity.java b/xabber/src/main/java/com/xabber/android/ui/activity/XabberLoginActivity.java
index 8f5397a702..26e96341ed 100644
--- a/xabber/src/main/java/com/xabber/android/ui/activity/XabberLoginActivity.java
+++ b/xabber/src/main/java/com/xabber/android/ui/activity/XabberLoginActivity.java
@@ -1,6 +1,5 @@
 package com.xabber.android.ui.activity;
 
-import android.app.Activity;
 import android.app.Fragment;
 import android.app.FragmentTransaction;
 import android.app.ProgressDialog;
@@ -52,8 +51,8 @@
  */
 
 public class XabberLoginActivity extends BaseLoginActivity implements XAccountSignUpFragment1.Listener,
-        XAccountSignUpFragment2.Listener, XAccountLoginFragment.Listener,
-        XAccountSignUpFragment3.Listener, XAccountSignUpFragment4.Listener {
+        XAccountSignUpFragment2.Listener, XAccountSignUpFragment3.Listener,
+        XAccountSignUpFragment4.Listener {
 
     private final static String LOG_TAG = XabberLoginActivity.class.getSimpleName();
     public final static String CURRENT_FRAGMENT = "current_fragment";
@@ -127,7 +126,7 @@ private void setupToolbar(boolean signIn) {
 
     public void showLoginFragment() {
         if (fragmentLogin == null)
-            fragmentLogin = XAccountLoginFragment.newInstance(this);
+            fragmentLogin = XAccountLoginFragment.newInstance();
 
         fTrans = getFragmentManager().beginTransaction();
         fTrans.replace(R.id.container, fragmentLogin);
@@ -297,21 +296,6 @@ public void onStep4Completed() {
         goToMainActivity();
     }
 
-    @Override
-    public void onGoogleClick() {
-        loginGoogle();
-    }
-
-    @Override
-    public void onFacebookClick() {
-        loginFacebook();
-    }
-
-    @Override
-    public void onTwitterClick() {
-        loginTwitter();
-    }
-
     @Override
     protected void onSynchronized() { }
 
diff --git a/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountLinksFragment.java b/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountLinksFragment.java
index 222c7beb2b..6ff3dd1ba7 100644
--- a/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountLinksFragment.java
+++ b/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountLinksFragment.java
@@ -25,6 +25,7 @@
 import com.xabber.android.ui.dialog.AccountSyncDialogFragment;
 import com.xabber.android.ui.dialog.AddEmailDialogFragment;
 import com.xabber.android.ui.dialog.ConfirmEmailDialogFragment;
+import com.xabber.android.ui.helper.OnSocialBindListener;
 
 import java.util.List;
 
@@ -57,9 +58,9 @@ public class XAccountLinksFragment  extends Fragment implements EmailAdapter.Lis
 
     private CompositeSubscription compositeSubscription = new CompositeSubscription();
     private Listener listener;
+    private OnSocialBindListener bindListener;
 
     public interface Listener {
-        void onSocialBindClick(String provider);
         void onSocialUnbindClick(String provider);
         void onDeleteEmailClick(int emailId);
     }
@@ -88,7 +89,7 @@ public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
             @Override
             public void onClick(View v) {
                 if (tvActionGoogle.getText().equals(getString(R.string.action_connect)))
-                    listener.onSocialBindClick(AuthManager.PROVIDER_GOOGLE);
+                    bindListener.onBindClick(AuthManager.PROVIDER_GOOGLE);
                 else listener.onSocialUnbindClick(AuthManager.PROVIDER_GOOGLE);
             }
         });
@@ -102,7 +103,7 @@ public void onClick(View v) {
             @Override
             public void onClick(View v) {
                 if (tvActionFacebook.getText().equals(getString(R.string.action_connect)))
-                    listener.onSocialBindClick(AuthManager.PROVIDER_FACEBOOK);
+                    bindListener.onBindClick(AuthManager.PROVIDER_FACEBOOK);
                 else listener.onSocialUnbindClick(AuthManager.PROVIDER_FACEBOOK);
             }
         });
@@ -116,7 +117,7 @@ public void onClick(View v) {
             @Override
             public void onClick(View v) {
                 if (tvActionTwitter.getText().equals(getString(R.string.action_connect)))
-                    listener.onSocialBindClick(AuthManager.PROVIDER_TWITTER);
+                    bindListener.onBindClick(AuthManager.PROVIDER_TWITTER);
                 else listener.onSocialUnbindClick(AuthManager.PROVIDER_TWITTER);
             }
         });
@@ -138,18 +139,20 @@ public void onClick(View v) {
     @Override
     public void onAttach(Context context) {
         super.onAttach(context);
-        if (context instanceof Listener) {
-            listener = (Listener) context;
-        } else {
-            throw new RuntimeException(context.toString()
-                    + " must implement XAccountLinksFragment.Listener");
-        }
+        if (context instanceof Listener) listener = (Listener) context;
+        else throw new RuntimeException(context.toString()
+                + " must implement XAccountLinksFragment.Listener");
+
+        if (context instanceof OnSocialBindListener) bindListener = (OnSocialBindListener) context;
+        else throw new RuntimeException(context.toString()
+                + " must implement OnSocialBindListener");
     }
 
     @Override
     public void onDetach() {
         super.onDetach();
         listener = null;
+        bindListener = null;
     }
 
     @Override
diff --git a/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountLoginFragment.java b/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountLoginFragment.java
index e21edc985f..0f3b3025ff 100644
--- a/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountLoginFragment.java
+++ b/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountLoginFragment.java
@@ -1,6 +1,7 @@
 package com.xabber.android.ui.fragment;
 
 import android.app.Fragment;
+import android.content.Context;
 import android.os.Bundle;
 import android.support.annotation.Nullable;
 import android.text.method.LinkMovementMethod;
@@ -18,10 +19,11 @@
 import com.xabber.android.data.NetworkException;
 import com.xabber.android.data.account.AccountManager;
 import com.xabber.android.data.entity.AccountJid;
+import com.xabber.android.data.xaccount.AuthManager;
 import com.xabber.android.data.xaccount.XabberAccountManager;
-import com.xabber.android.ui.activity.AccountActivity;
 import com.xabber.android.ui.activity.ContactListActivity;
 import com.xabber.android.ui.dialog.OrbotInstallerDialog;
+import com.xabber.android.ui.helper.OnSocialBindListener;
 import com.xabber.android.ui.helper.OrbotHelper;
 
 public class XAccountLoginFragment extends Fragment implements View.OnClickListener {
@@ -37,17 +39,10 @@ public class XAccountLoginFragment extends Fragment implements View.OnClickListe
     private View optionsView;
     private View socialView;
 
-    private Listener listener;
+    private OnSocialBindListener listener;
 
-    public interface Listener {
-        void onGoogleClick();
-        void onFacebookClick();
-        void onTwitterClick();
-    }
-
-    public static XAccountLoginFragment newInstance(Listener listener) {
+    public static XAccountLoginFragment newInstance() {
         XAccountLoginFragment fragment = new XAccountLoginFragment();
-        fragment.listener = listener;
         return fragment;
     }
 
@@ -89,6 +84,21 @@ public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container,
         return view;
     }
 
+    @Override
+    public void onAttach(Context context) {
+        super.onAttach(context);
+
+        if (context instanceof OnSocialBindListener) listener = (OnSocialBindListener) context;
+        else throw new RuntimeException(context.toString()
+                + " must implement OnSocialBindListener");
+    }
+
+    @Override
+    public void onDetach() {
+        super.onDetach();
+        listener = null;
+    }
+
     @Override
     public void onClick(View v) {
         switch (v.getId()) {
@@ -96,13 +106,13 @@ public void onClick(View v) {
                 addAccount();
                 break;
             case R.id.ivFacebook:
-                listener.onFacebookClick();
+                listener.onBindClick(AuthManager.PROVIDER_FACEBOOK);
                 break;
             case R.id.ivGoogle:
-                listener.onGoogleClick();
+                listener.onBindClick(AuthManager.PROVIDER_GOOGLE);
                 break;
             case R.id.ivTwitter:
-                listener.onTwitterClick();
+                listener.onBindClick(AuthManager.PROVIDER_TWITTER);
                 break;
             case R.id.btnOptions:
                 showOptions();
diff --git a/xabber/src/main/java/com/xabber/android/ui/helper/OnSocialBindListener.java b/xabber/src/main/java/com/xabber/android/ui/helper/OnSocialBindListener.java
new file mode 100644
index 0000000000..3d322fbce4
--- /dev/null
+++ b/xabber/src/main/java/com/xabber/android/ui/helper/OnSocialBindListener.java
@@ -0,0 +1,5 @@
+package com.xabber.android.ui.helper;
+
+public interface OnSocialBindListener {
+    void onBindClick(String provider);
+}

From c6db868509238fb58c60599de421ae7a67081d08 Mon Sep 17 00:00:00 2001
From: Valery Miller <valera_miller94@mail.ru>
Date: Thu, 27 Sep 2018 17:04:46 +0500
Subject: [PATCH 164/251] Deleted unused layouts

---
 ...gment_xabber_account_complete_register.xml | 383 ----------------
 .../fragment_xabber_account_confirmation.xml  | 238 ----------
 .../layout/fragment_xabber_account_info.xml   | 424 ------------------
 .../layout/fragment_xabber_account_login.xml  | 275 ------------
 ...nt_xabber_account_phone_number_confirm.xml | 302 -------------
 .../fragment_xabber_account_register_last.xml | 244 ----------
 .../layout/fragment_xaccount_xmpp_confirm.xml |  68 ---
 7 files changed, 1934 deletions(-)
 delete mode 100644 xabber/src/main/res/layout/fragment_xabber_account_complete_register.xml
 delete mode 100644 xabber/src/main/res/layout/fragment_xabber_account_confirmation.xml
 delete mode 100644 xabber/src/main/res/layout/fragment_xabber_account_info.xml
 delete mode 100644 xabber/src/main/res/layout/fragment_xabber_account_login.xml
 delete mode 100644 xabber/src/main/res/layout/fragment_xabber_account_phone_number_confirm.xml
 delete mode 100644 xabber/src/main/res/layout/fragment_xabber_account_register_last.xml
 delete mode 100644 xabber/src/main/res/layout/fragment_xaccount_xmpp_confirm.xml

diff --git a/xabber/src/main/res/layout/fragment_xabber_account_complete_register.xml b/xabber/src/main/res/layout/fragment_xabber_account_complete_register.xml
deleted file mode 100644
index 89607527fe..0000000000
--- a/xabber/src/main/res/layout/fragment_xabber_account_complete_register.xml
+++ /dev/null
@@ -1,383 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:paddingTop="16dp"
-    android:paddingBottom="16dp"
-    android:paddingLeft="16dp"
-    android:paddingRight="16dp"
-    android:background="@color/cardview_light_background"
-    >
-
-
-    <LinearLayout
-        android:id="@+id/stepOne"
-        android:orientation="horizontal"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        >
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginRight="8dp"
-            android:paddingTop="2dp"
-            android:paddingBottom="2dp"
-            android:paddingRight="7dp"
-            android:paddingLeft="7dp"
-            android:background="@drawable/rounded_background"
-            android:textColor="@color/white"
-            android:textStyle="bold"
-            android:text="1"
-            />
-
-        <TextView
-            android:id="@+id/tvSignType"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:textColor="@color/black"
-            android:text="@string/signed_up_email"
-            />
-
-    </LinearLayout>
-
-    <TextView
-        android:id="@+id/tvAccountName"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_below="@+id/stepOne"
-        android:textColor="@color/black_text_secondary"
-        android:text="@string/no_email"
-        android:layout_toRightOf="@+id/lineOne"
-        android:layout_marginLeft="18dp"
-        />
-
-    <LinearLayout
-        android:id="@+id/lineOne"
-        android:orientation="vertical"
-        android:layout_width="1dp"
-        android:layout_height="20dp"
-        android:layout_marginLeft="11dp"
-        android:layout_marginTop="8dp"
-        android:layout_marginBottom="8dp"
-        android:layout_below="@+id/stepOne"
-        android:background="#50616161"
-        />
-
-    <LinearLayout
-        android:id="@+id/stepTwo"
-        android:orientation="horizontal"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_below="@+id/lineOne"
-        >
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginRight="8dp"
-            android:paddingTop="2dp"
-            android:paddingBottom="2dp"
-            android:paddingRight="7dp"
-            android:paddingLeft="7dp"
-            android:background="@drawable/rounded_background"
-            android:textColor="@color/white"
-            android:textStyle="bold"
-            android:text="2"
-            />
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:textColor="@color/black"
-            android:text="@string/title_email_confirmed"
-            />
-
-    </LinearLayout>
-
-    <LinearLayout
-        android:id="@+id/lineTwo"
-        android:orientation="vertical"
-        android:layout_width="1dp"
-        android:layout_height="20dp"
-        android:layout_marginLeft="11dp"
-        android:layout_marginTop="8dp"
-        android:layout_marginBottom="8dp"
-        android:layout_below="@+id/stepTwo"
-        android:background="#50616161"
-        />
-
-    <LinearLayout
-        android:id="@+id/stepThree"
-        android:orientation="horizontal"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_below="@+id/lineTwo"
-        >
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginRight="8dp"
-            android:paddingTop="2dp"
-            android:paddingBottom="2dp"
-            android:paddingRight="7dp"
-            android:paddingLeft="7dp"
-            android:background="@drawable/rounded_background"
-            android:textColor="@color/white"
-            android:textStyle="bold"
-            android:text="3"
-            />
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:textColor="@color/black"
-            android:textStyle="bold"
-            android:text="@string/title_complete_register"
-            />
-
-    </LinearLayout>
-
-    <LinearLayout
-        android:id="@+id/rlContent"
-        android:orientation="vertical"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_below="@+id/stepThree"
-        android:layout_toRightOf="@+id/lineThree"
-        android:layout_marginLeft="18dp"
-        android:layout_marginBottom="16dp"
-        >
-
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="16dp"
-            android:paddingLeft="4dp"
-            android:textColor="@color/black_text_secondary"
-            android:text="@string/label_username"
-            />
-
-        <LinearLayout
-            android:id="@+id/llUsername"
-            android:orientation="horizontal"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            >
-
-            <EditText
-                android:id="@+id/edtUsername"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:imeOptions="actionNext"
-                android:nextFocusForward="@+id/edtPass"
-                android:singleLine="true"
-                android:hint="@string/hint_username"
-                android:textSize="16sp"
-                android:theme="@style/Theme"
-                android:layout_weight="1"
-
-                />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/default_host"
-                android:textColor="@color/black_text"
-                android:textSize="16sp"
-                />
-
-        </LinearLayout>
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:paddingLeft="4dp"
-            android:textSize="12sp"
-            android:textColor="@color/black_text_secondary"
-            android:text="@string/summary_username"
-            />
-
-        <LinearLayout
-            android:orientation="horizontal"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="16dp"
-            >
-            <LinearLayout
-                android:orientation="vertical"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_weight="1">
-
-                <TextView
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:paddingLeft="4dp"
-                    android:textColor="@color/black_text_secondary"
-                    android:text="@string/label_pass"
-                    />
-
-                <EditText
-                    android:id="@+id/edtPass"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:imeOptions="actionNext"
-                    android:nextFocusForward="@+id/edtPass2"
-                    android:singleLine="true"
-                    android:textSize="16sp"
-                    android:theme="@style/Theme"
-                    android:inputType="textPassword"
-                    />
-
-            </LinearLayout>
-            <LinearLayout
-                android:orientation="vertical"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginLeft="10dp"
-                android:layout_weight="1">
-
-                <TextView
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:paddingLeft="4dp"
-                    android:textColor="@color/black_text_secondary"
-                    android:lines="1"
-                    android:text="@string/label_conf_pass"
-                    />
-
-                <EditText
-                    android:id="@+id/edtPass2"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:imeOptions="actionNext"
-                    android:nextFocusForward="@+id/edtFirstName"
-                    android:singleLine="true"
-                    android:textSize="16sp"
-                    android:theme="@style/Theme"
-                    android:inputType="textPassword"
-                    />
-
-            </LinearLayout>
-        </LinearLayout>
-        <LinearLayout
-            android:orientation="horizontal"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="16dp">
-            <LinearLayout
-                android:orientation="vertical"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_weight="1">
-
-                <TextView
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:paddingLeft="4dp"
-                    android:textColor="@color/black_text_secondary"
-                    android:text="@string/label_first_name"
-                    />
-
-                <EditText
-                    android:id="@+id/edtFirstName"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:imeOptions="actionNext"
-                    android:singleLine="true"
-                    android:textSize="16sp"
-                    android:theme="@style/Theme"
-                    android:hint="@string/hint_first_name"
-                    />
-
-            </LinearLayout>
-            <LinearLayout
-                android:orientation="vertical"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginLeft="10dp"
-                android:layout_weight="1">
-
-                <TextView
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:paddingLeft="4dp"
-                    android:textColor="@color/black_text_secondary"
-                    android:text="@string/label_last_name"
-                    />
-
-                <EditText
-                    android:id="@+id/edtLastName"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:imeOptions="actionDone"
-                    android:singleLine="true"
-                    android:textSize="16sp"
-                    android:theme="@style/Theme"
-                    android:hint="@string/hint_last_name"
-                    />
-
-            </LinearLayout>
-        </LinearLayout>
-
-        <Button
-            android:id="@+id/btnRegister"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="8dp"
-            style="@style/Widget.AppCompat.Button.Colored"
-            android:theme="@style/BlueButton"
-            android:paddingRight="18dp"
-            android:paddingLeft="18dp"
-            android:textColor="@color/white"
-            android:text="@string/button_complete_registration"
-            />
-
-    </LinearLayout>
-
-    <LinearLayout
-        android:id="@+id/lineThree"
-        android:orientation="vertical"
-        android:layout_width="1dp"
-        android:layout_height="20dp"
-        android:layout_marginLeft="11dp"
-        android:layout_marginTop="8dp"
-        android:layout_marginBottom="8dp"
-        android:layout_below="@+id/stepThree"
-        android:layout_above="@+id/stepFour"
-        android:background="#50616161"
-        />
-
-    <LinearLayout
-        android:id="@+id/stepFour"
-        android:orientation="horizontal"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_below="@+id/rlContent"
-        >
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginRight="8dp"
-            android:paddingTop="2dp"
-            android:paddingBottom="2dp"
-            android:paddingRight="7dp"
-            android:paddingLeft="7dp"
-            android:background="@drawable/rounded_background_grey"
-            android:textColor="@color/white"
-            android:textStyle="bold"
-            android:text="4"
-            />
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:textColor="@color/black"
-            android:text="@string/title_start_messaging"
-            />
-
-    </LinearLayout>
-
-</RelativeLayout>
\ No newline at end of file
diff --git a/xabber/src/main/res/layout/fragment_xabber_account_confirmation.xml b/xabber/src/main/res/layout/fragment_xabber_account_confirmation.xml
deleted file mode 100644
index 10c5292572..0000000000
--- a/xabber/src/main/res/layout/fragment_xabber_account_confirmation.xml
+++ /dev/null
@@ -1,238 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:paddingTop="16dp"
-    android:paddingBottom="16dp"
-    android:paddingLeft="16dp"
-    android:paddingRight="16dp"
-    android:background="@color/cardview_light_background"
-    >
-
-
-    <LinearLayout
-        android:id="@+id/stepOne"
-        android:orientation="horizontal"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        >
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginRight="8dp"
-            android:paddingTop="2dp"
-            android:paddingBottom="2dp"
-            android:paddingRight="7dp"
-            android:paddingLeft="7dp"
-            android:background="@drawable/rounded_background"
-            android:textColor="@color/white"
-            android:textStyle="bold"
-            android:text="1"
-            />
-
-        <TextView
-            android:id="@+id/tvSignType"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:textColor="@color/black"
-            android:text="@string/signed_up_email"
-            />
-
-    </LinearLayout>
-
-    <TextView
-        android:id="@+id/tvAccountName"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_below="@+id/stepOne"
-        android:textColor="@color/black_text_secondary"
-        android:text="@string/no_email"
-        android:layout_toRightOf="@+id/lineOne"
-        android:layout_marginLeft="18dp"
-        />
-
-    <LinearLayout
-        android:id="@+id/lineOne"
-        android:orientation="vertical"
-        android:layout_width="1dp"
-        android:layout_height="20dp"
-        android:layout_marginLeft="11dp"
-        android:layout_marginTop="8dp"
-        android:layout_marginBottom="8dp"
-        android:layout_below="@+id/stepOne"
-        android:background="#50616161"
-        />
-
-    <LinearLayout
-        android:id="@+id/stepTwo"
-        android:orientation="horizontal"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_below="@+id/lineOne"
-        >
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginRight="8dp"
-            android:paddingTop="2dp"
-            android:paddingBottom="2dp"
-            android:paddingRight="7dp"
-            android:paddingLeft="7dp"
-            android:background="@drawable/rounded_background"
-            android:textColor="@color/white"
-            android:textStyle="bold"
-            android:text="2"
-            />
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:textColor="@color/black"
-            android:textStyle="bold"
-            android:text="@string/title_email_confirm"
-            />
-
-    </LinearLayout>
-
-    <RelativeLayout
-        android:id="@+id/rlContent"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_below="@+id/stepTwo"
-        android:layout_toRightOf="@+id/lineTwo"
-        android:layout_marginLeft="18dp"
-        android:layout_marginBottom="16dp"
-        >
-
-        <EditText
-            android:id="@+id/edtCode"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="8dp"
-            android:theme="@style/Theme"
-            android:inputType="number"
-            android:hint="@string/hint_code"
-            />
-
-        <Button
-            android:id="@+id/btnConfirm"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_below="@id/edtCode"
-            android:layout_marginTop="8dp"
-            style="@style/Widget.AppCompat.Button.Colored"
-            android:theme="@style/BlueButton"
-            android:paddingRight="18dp"
-            android:paddingLeft="18dp"
-            android:textColor="@color/white"
-            android:text="@string/button_confirm"
-            />
-
-        <Button
-            android:id="@+id/btnResend"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_below="@id/edtCode"
-            android:layout_toRightOf="@id/btnConfirm"
-            android:layout_marginTop="8dp"
-            android:layout_marginLeft="16dp"
-            style="@style/Widget.AppCompat.Button.Borderless"
-            android:theme="@style/BlueButton"
-            android:paddingRight="18dp"
-            android:paddingLeft="18dp"
-            android:textColor="@color/account_register_blue"
-            android:text="@string/button_resend_link"
-            />
-
-    </RelativeLayout>
-
-    <LinearLayout
-        android:id="@+id/lineTwo"
-        android:orientation="vertical"
-        android:layout_width="1dp"
-        android:layout_height="20dp"
-        android:layout_marginLeft="11dp"
-        android:layout_marginTop="8dp"
-        android:layout_marginBottom="8dp"
-        android:layout_below="@+id/stepTwo"
-        android:layout_above="@+id/stepThree"
-        android:background="#50616161"
-        />
-
-    <LinearLayout
-        android:id="@+id/stepThree"
-        android:orientation="horizontal"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_below="@+id/rlContent"
-        >
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginRight="8dp"
-            android:paddingTop="2dp"
-            android:paddingBottom="2dp"
-            android:paddingRight="7dp"
-            android:paddingLeft="7dp"
-            android:background="@drawable/rounded_background_grey"
-            android:textColor="@color/white"
-            android:textStyle="bold"
-            android:text="3"
-            />
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:textColor="@color/black"
-            android:text="@string/title_complete_register"
-            />
-
-    </LinearLayout>
-
-    <LinearLayout
-        android:id="@+id/lineThree"
-        android:orientation="vertical"
-        android:layout_width="1dp"
-        android:layout_height="20dp"
-        android:layout_marginLeft="11dp"
-        android:layout_marginTop="8dp"
-        android:layout_marginBottom="8dp"
-        android:layout_below="@+id/stepThree"
-        android:background="#50616161"
-        />
-
-    <LinearLayout
-        android:id="@+id/stepFour"
-        android:orientation="horizontal"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_below="@+id/lineThree"
-        >
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginRight="8dp"
-            android:paddingTop="2dp"
-            android:paddingBottom="2dp"
-            android:paddingRight="7dp"
-            android:paddingLeft="7dp"
-            android:background="@drawable/rounded_background_grey"
-            android:textColor="@color/white"
-            android:textStyle="bold"
-            android:text="4"
-            />
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:textColor="@color/black"
-            android:text="@string/title_start_messaging"
-            />
-
-    </LinearLayout>
-
-</RelativeLayout>
\ No newline at end of file
diff --git a/xabber/src/main/res/layout/fragment_xabber_account_info.xml b/xabber/src/main/res/layout/fragment_xabber_account_info.xml
deleted file mode 100644
index 5d85d430c8..0000000000
--- a/xabber/src/main/res/layout/fragment_xabber_account_info.xml
+++ /dev/null
@@ -1,424 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:background="?attr/settings_background_color">
-
-    <android.support.v7.widget.CardView
-        android:id="@+id/cardInfo"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        >
-
-        <LinearLayout
-            android:orientation="vertical"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            >
-
-            <LinearLayout
-                android:id="@+id/llAccount"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:paddingLeft="16dp"
-                android:paddingRight="16dp"
-                android:paddingTop="16dp"
-                android:paddingBottom="16dp"
-                >
-
-                <FrameLayout
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center_vertical">
-
-                    <de.hdodenhof.circleimageview.CircleImageView
-                        android:id="@+id/color"
-                        android:layout_width="40dp"
-                        android:layout_height="40dp"
-                        android:src="@color/green_500" />
-
-                    <de.hdodenhof.circleimageview.CircleImageView
-                        android:id="@+id/avatar"
-                        android:layout_width="30dp"
-                        android:layout_height="30dp"
-                        android:layout_gravity="center"
-                        android:src="@drawable/ic_stat_online"
-                        app:civ_border_color="@android:color/transparent"
-                        app:civ_border_width="3dp" />
-
-                </FrameLayout>
-
-                <LinearLayout
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center_vertical"
-                    android:layout_weight="1"
-                    android:orientation="vertical"
-                    android:paddingLeft="16dp">
-
-                    <LinearLayout
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:orientation="horizontal"
-                        >
-
-                        <TextView
-                            android:id="@+id/tvAccountName"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_weight="1"
-                            android:singleLine="true"
-                            android:textColor="@color/green_700"
-                            android:textSize="18sp"
-                            />
-
-                        <TextView
-                            android:id="@+id/tvLanguage"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_marginLeft="8dp"
-                            android:paddingTop="0dp"
-                            android:paddingBottom="0dp"
-                            android:paddingLeft="6dp"
-                            android:paddingRight="6dp"
-                            android:singleLine="true"
-                            android:textColor="@color/white"
-                            android:textStyle="bold"
-                            android:textAllCaps="true"
-                            android:background="@drawable/rounded_background_grey"
-                            />
-
-                    </LinearLayout>
-
-                    <TextView
-                        android:id="@+id/tvAccountUsername"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="1"
-                        android:singleLine="true"
-                        android:text="@string/no_username"
-                        android:textColor="@color/grey_500"
-                        android:textSize="14sp" />
-
-                    <TextView
-                        android:id="@+id/tvPhoneNumber"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="1"
-                        android:singleLine="true"
-                        android:text="@string/no_phone"
-                        android:textColor="@color/grey_500"
-                        android:textSize="14sp" />
-
-                </LinearLayout>
-            </LinearLayout>
-
-            <RelativeLayout
-                android:id="@+id/rlSync"
-                android:layout_width="match_parent"
-                android:layout_height="52dp"
-                android:layout_below="@id/llAccount"
-                >
-
-                <View
-                    android:layout_width="match_parent"
-                    android:layout_height="1dp"
-                    android:background="?attr/settings_separator_background_color"
-                    />
-
-                <RelativeLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:paddingLeft="24dp"
-                    android:paddingRight="16dp"
-                    android:paddingTop="8dp"
-                    android:paddingBottom="8dp"
-                    android:background="?android:attr/selectableItemBackground"
-                    >
-
-                    <ImageView
-                        android:id="@+id/ivSync"
-                        android:layout_width="24dp"
-                        android:layout_height="24dp"
-                        android:src="@drawable/ic_sync"
-                        android:layout_centerVertical="true"
-                        android:tint="@color/grey_600"
-                        />
-
-                    <LinearLayout
-                        android:orientation="vertical"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_centerVertical="true"
-                        android:layout_toRightOf="@+id/ivSync"
-                        android:layout_marginLeft="24dp"
-                        >
-
-                        <TextView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:textColor="?android:attr/textColorPrimary"
-                            android:text="@string/button_sync"
-                            />
-
-                        <TextView
-                            android:id="@+id/tvLastSyncDate"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:singleLine="true"
-                            android:text="@string/last_sync_date"
-                            android:textColor="@color/grey_500"
-                            android:textSize="14sp" />
-
-                    </LinearLayout>
-
-                </RelativeLayout>
-
-                <View
-                    android:layout_width="match_parent"
-                    android:layout_height="1dp"
-                    android:background="?attr/settings_separator_background_color"
-                    android:layout_alignParentBottom="true"
-                    />
-            </RelativeLayout>
-
-            <TextView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:text="Social bindings:"
-                android:paddingLeft="24dp"
-                android:paddingBottom="8dp"
-                android:paddingTop="12dp"
-                android:textColor="@color/green_700"
-                />
-
-            <LinearLayout
-                android:id="@+id/itemGoogle"
-                android:layout_width="match_parent"
-                android:layout_height="48dp"
-                android:paddingLeft="24dp"
-                android:paddingRight="16dp"
-                android:paddingTop="8dp"
-                android:paddingBottom="8dp"
-                android:clickable="true"
-                android:background="?android:attr/selectableItemBackground"
-                >
-
-                <ImageView
-                    android:layout_width="24dp"
-                    android:layout_height="24dp"
-                    android:src="@drawable/ic_google_plus"
-                    android:layout_gravity="center_vertical"
-                    />
-
-                <TextView
-                    android:id="@+id/tvStatusGoogle"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center_vertical"
-                    android:layout_marginLeft="24dp"
-                    android:textColor="@color/grey_500"
-                    android:text="Not connected"
-                    />
-
-                <TextView
-                    android:id="@+id/tvActionGoogle"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginLeft="24dp"
-                    android:gravity="right"
-                    android:layout_gravity="center_vertical"
-                    android:textColor="@color/grey_500"
-                    android:text="@string/action_connect"
-                    />
-
-            </LinearLayout>
-
-            <View
-                android:layout_width="match_parent"
-                android:layout_height="1dp"
-                android:background="?attr/settings_separator_background_color"
-                />
-
-            <LinearLayout
-                android:id="@+id/itemFacebook"
-                android:layout_width="match_parent"
-                android:layout_height="48dp"
-                android:paddingLeft="24dp"
-                android:paddingRight="16dp"
-                android:paddingTop="8dp"
-                android:paddingBottom="8dp"
-                android:clickable="true"
-                android:background="?android:attr/selectableItemBackground"
-                >
-
-                <ImageView
-                    android:layout_width="24dp"
-                    android:layout_height="24dp"
-                    android:src="@drawable/ic_facebook"
-                    android:layout_gravity="center_vertical"
-                    />
-
-                <TextView
-                    android:id="@+id/tvStatusFacebook"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center_vertical"
-                    android:layout_marginLeft="24dp"
-                    android:textColor="@color/grey_500"
-                    android:text="Not connected"
-                    />
-
-                <TextView
-                    android:id="@+id/tvActionFacebook"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginLeft="24dp"
-                    android:layout_gravity="center_vertical"
-                    android:gravity="right"
-                    android:textColor="@color/grey_500"
-                    android:text="@string/action_connect"
-                    />
-
-            </LinearLayout>
-
-            <View
-                android:layout_width="match_parent"
-                android:layout_height="1dp"
-                android:background="?attr/settings_separator_background_color"
-                />
-
-            <LinearLayout
-                android:id="@+id/itemTwitter"
-                android:layout_width="match_parent"
-                android:layout_height="48dp"
-                android:paddingLeft="24dp"
-                android:paddingRight="16dp"
-                android:paddingTop="8dp"
-                android:paddingBottom="8dp"
-                android:clickable="true"
-                android:background="?android:attr/selectableItemBackground"
-                >
-
-                <ImageView
-                    android:layout_width="24dp"
-                    android:layout_height="24dp"
-                    android:src="@drawable/ic_twitter"
-                    android:layout_gravity="center_vertical"
-                    />
-
-                <TextView
-                    android:id="@+id/tvStatusTwitter"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center_vertical"
-                    android:layout_marginLeft="24dp"
-                    android:textColor="@color/grey_500"
-                    android:text="Not connected"
-                    />
-
-                <TextView
-                    android:id="@+id/tvActionTwitter"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center_vertical"
-                    android:gravity="right"
-                    android:layout_marginLeft="24dp"
-                    android:textColor="@color/grey_500"
-                    android:text="@string/action_connect"
-                    />
-
-            </LinearLayout>
-
-            <View
-                android:layout_width="match_parent"
-                android:layout_height="1dp"
-                android:background="?attr/settings_separator_background_color"
-                />
-
-            <TextView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:text="Binded emails:"
-                android:paddingLeft="24dp"
-                android:paddingBottom="8dp"
-                android:paddingTop="12dp"
-                android:textColor="@color/green_700"
-                />
-
-            <LinearLayout
-                android:orientation="vertical"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent">
-
-                <android.support.v7.widget.RecyclerView
-                    android:id="@+id/rvEmails"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:nestedScrollingEnabled="false"
-                    tools:listitem="@layout/item_email"
-                    />
-
-                <Button
-                    android:id="@+id/btnAddEmail"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:text="bind email"
-                    android:textColor="@color/teal_500"
-                    style="@style/Widget.AppCompat.Button.Borderless"
-                    />
-
-            </LinearLayout>
-
-            <RelativeLayout
-                android:id="@+id/rlLogout"
-                android:layout_width="match_parent"
-                android:layout_height="48dp"
-                android:layout_below="@id/rlSync"
-                >
-
-                <View
-                    android:layout_width="match_parent"
-                    android:layout_height="1dp"
-                    android:background="?attr/settings_separator_background_color"
-                    />
-
-                <RelativeLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="48dp"
-                    android:paddingLeft="24dp"
-                    android:paddingRight="16dp"
-                    android:paddingTop="8dp"
-                    android:paddingBottom="8dp"
-                    android:background="?android:attr/selectableItemBackground"
-                    >
-
-                    <ImageView
-                        android:id="@+id/ivLogout"
-                        android:layout_width="24dp"
-                        android:layout_height="24dp"
-                        android:src="@drawable/ic_exit_grey600_24dp"
-                        android:layout_centerVertical="true"
-                        android:tint="@color/grey_600"
-                        />
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_centerVertical="true"
-                        android:layout_toRightOf="@+id/ivLogout"
-                        android:layout_marginLeft="24dp"
-                        android:textColor="?android:attr/textColorPrimary"
-                        android:text="@string/button_quit"
-                        />
-
-                </RelativeLayout>
-
-            </RelativeLayout>
-
-        </LinearLayout>
-    </android.support.v7.widget.CardView>
-
-</RelativeLayout>
\ No newline at end of file
diff --git a/xabber/src/main/res/layout/fragment_xabber_account_login.xml b/xabber/src/main/res/layout/fragment_xabber_account_login.xml
deleted file mode 100644
index 32b8cd07d6..0000000000
--- a/xabber/src/main/res/layout/fragment_xabber_account_login.xml
+++ /dev/null
@@ -1,275 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:paddingTop="16dp"
-    android:paddingBottom="16dp"
-    android:paddingLeft="16dp"
-    android:paddingRight="16dp"
-    android:background="@color/cardview_light_background"
-    >
-
-    <TextView
-        android:id="@+id/tvStepOne"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginRight="8dp"
-        android:layout_marginBottom="8dp"
-        android:paddingTop="2dp"
-        android:paddingBottom="2dp"
-        android:paddingRight="7dp"
-        android:paddingLeft="7dp"
-        android:background="@drawable/rounded_background"
-        android:textColor="@color/white"
-        android:textStyle="bold"
-        android:text="1"
-        />
-
-    <RelativeLayout
-        android:id="@+id/rlContent"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_toRightOf="@id/tvStepOne"
-        android:layout_marginTop="2dp"
-        android:layout_marginBottom="16dp"
-        >
-
-        <TextView
-            android:id="@+id/stepOneTitle"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:textColor="@color/black"
-            android:text="@string/sign_up_email_social"
-            />
-
-        <!--<TextView-->
-            <!--android:id="@+id/titleSocial"-->
-            <!--android:layout_width="wrap_content"-->
-            <!--android:layout_height="wrap_content"-->
-            <!--android:layout_below="@id/stepOneTitle"-->
-            <!--android:layout_marginTop="16dp"-->
-            <!--android:textColor="@color/black_text_secondary"-->
-            <!--android:text="@string/sign_up_social"-->
-            <!--/>-->
-
-        <LinearLayout
-            android:id="@+id/llSocialLogos"
-            android:orientation="horizontal"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_below="@+id/stepOneTitle"
-            android:layout_marginTop="16dp"
-            >
-
-            <ImageView
-                android:id="@+id/ivGoogle"
-                android:layout_width="48dp"
-                android:layout_height="48dp"
-                android:src="@drawable/ic_google_plus"
-                />
-
-            <ImageView
-                android:id="@+id/ivFacebook"
-                android:layout_width="48dp"
-                android:layout_height="48dp"
-                android:layout_marginLeft="32dp"
-                android:src="@drawable/ic_facebook"
-                />
-
-            <ImageView
-                android:id="@+id/ivTwitter"
-                android:layout_width="48dp"
-                android:layout_height="48dp"
-                android:layout_marginLeft="32dp"
-                android:src="@drawable/ic_twitter"
-                />
-
-            <ImageView
-                android:id="@+id/ivGithub"
-                android:layout_width="48dp"
-                android:layout_height="48dp"
-                android:layout_marginLeft="16dp"
-                android:src="@drawable/ic_github_logo_black"
-                android:visibility="gone"
-                />
-
-        </LinearLayout>
-
-        <!--<TextView-->
-            <!--android:id="@+id/titleEmail"-->
-            <!--android:layout_width="wrap_content"-->
-            <!--android:layout_height="wrap_content"-->
-            <!--android:layout_below="@id/llSocialLogos"-->
-            <!--android:layout_marginTop="20dp"-->
-            <!--android:textColor="@color/black_text_secondary"-->
-            <!--android:text="@string/sign_up_email"-->
-            <!--/>-->
-
-        <EditText
-            android:id="@+id/edtEmail"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_below="@id/llSocialLogos"
-            android:layout_marginTop="12dp"
-            android:inputType="textEmailAddress"
-            android:theme="@style/Theme"
-            android:hint="@string/email_hint"
-            />
-
-        <android.support.v7.widget.AppCompatCheckBox
-            android:id="@+id/chbAgrees"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_below="@id/edtEmail"
-            android:padding="8dp"
-            android:text="@string/agrees"
-            android:textColor="@color/black_text_secondary"
-            android:theme="@style/BlueCheckBox"
-            />
-
-        <Button
-            android:id="@+id/btnContinue"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_below="@id/chbAgrees"
-            android:layout_marginTop="8dp"
-            style="@style/Widget.AppCompat.Button.Colored"
-            android:theme="@style/BlueButton"
-            android:paddingRight="18dp"
-            android:paddingLeft="18dp"
-            android:textColor="@color/white"
-            android:text="@string/button_continue"
-            android:enabled="false"
-            />
-
-    </RelativeLayout>
-
-    <LinearLayout
-        android:orientation="vertical"
-        android:layout_width="1dp"
-        android:layout_height="match_parent"
-        android:layout_marginLeft="11dp"
-        android:layout_marginBottom="8dp"
-        android:layout_below="@+id/tvStepOne"
-        android:layout_above="@+id/stepTwo"
-        android:background="#50616161"
-        />
-
-    <LinearLayout
-        android:id="@+id/stepTwo"
-        android:orientation="horizontal"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_below="@+id/rlContent"
-        >
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginRight="8dp"
-            android:paddingTop="2dp"
-            android:paddingBottom="2dp"
-            android:paddingRight="7dp"
-            android:paddingLeft="7dp"
-            android:background="@drawable/rounded_background_grey"
-            android:textColor="@color/white"
-            android:textStyle="bold"
-            android:text="2"
-            />
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:textColor="@color/black"
-            android:text="@string/title_email_confirm"
-            />
-
-    </LinearLayout>
-
-    <LinearLayout
-        android:id="@+id/lineTwo"
-        android:orientation="vertical"
-        android:layout_width="1dp"
-        android:layout_height="20dp"
-        android:layout_marginLeft="11dp"
-        android:layout_marginTop="8dp"
-        android:layout_marginBottom="8dp"
-        android:layout_below="@+id/stepTwo"
-        android:background="#50616161"
-        />
-
-    <LinearLayout
-        android:id="@+id/stepThree"
-        android:orientation="horizontal"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_below="@+id/lineTwo"
-        >
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginRight="8dp"
-            android:paddingTop="2dp"
-            android:paddingBottom="2dp"
-            android:paddingRight="7dp"
-            android:paddingLeft="7dp"
-            android:background="@drawable/rounded_background_grey"
-            android:textColor="@color/white"
-            android:textStyle="bold"
-            android:text="3"
-            />
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:textColor="@color/black"
-            android:text="@string/title_complete_register"
-            />
-
-    </LinearLayout>
-
-    <LinearLayout
-        android:id="@+id/lineThree"
-        android:orientation="vertical"
-        android:layout_width="1dp"
-        android:layout_height="20dp"
-        android:layout_marginLeft="11dp"
-        android:layout_marginTop="8dp"
-        android:layout_marginBottom="8dp"
-        android:layout_below="@+id/stepThree"
-        android:background="#50616161"
-        />
-
-    <LinearLayout
-        android:id="@+id/stepFour"
-        android:orientation="horizontal"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_below="@+id/lineThree"
-        >
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginRight="8dp"
-            android:paddingTop="2dp"
-            android:paddingBottom="2dp"
-            android:paddingRight="7dp"
-            android:paddingLeft="7dp"
-            android:background="@drawable/rounded_background_grey"
-            android:textColor="@color/white"
-            android:textStyle="bold"
-            android:text="4"
-            />
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:textColor="@color/black"
-            android:text="@string/title_start_messaging"
-            />
-
-    </LinearLayout>
-
-</RelativeLayout>
\ No newline at end of file
diff --git a/xabber/src/main/res/layout/fragment_xabber_account_phone_number_confirm.xml b/xabber/src/main/res/layout/fragment_xabber_account_phone_number_confirm.xml
deleted file mode 100644
index 968531314a..0000000000
--- a/xabber/src/main/res/layout/fragment_xabber_account_phone_number_confirm.xml
+++ /dev/null
@@ -1,302 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:mask="http://schemas.android.com/apk/res-auto"
-    android:orientation="vertical"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:paddingTop="16dp"
-    android:paddingBottom="16dp"
-    android:paddingLeft="16dp"
-    android:paddingRight="16dp"
-    android:background="@color/cardview_light_background">
-
-    <LinearLayout
-        android:orientation="horizontal"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        >
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginRight="8dp"
-            android:paddingTop="2dp"
-            android:paddingBottom="2dp"
-            android:paddingRight="7dp"
-            android:paddingLeft="7dp"
-            android:background="@drawable/rounded_background"
-            android:textColor="@color/white"
-            android:textStyle="bold"
-            android:text="1"
-            />
-
-        <TextView
-            android:id="@+id/tvSignType"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:textColor="@color/black"
-            android:text="@string/signed_up_email"
-            />
-
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        >
-
-        <LinearLayout
-            android:orientation="vertical"
-            android:layout_width="1dp"
-            android:layout_height="20dp"
-            android:layout_marginLeft="11dp"
-            android:layout_marginTop="8dp"
-            android:layout_marginBottom="8dp"
-            android:background="#50616161"
-            />
-
-        <TextView
-            android:id="@+id/tvAccountName"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:textColor="@color/black_text_secondary"
-            android:text="@string/no_email"
-            android:layout_marginLeft="18dp"
-            />
-
-    </LinearLayout>
-
-    <LinearLayout
-        android:orientation="horizontal"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        >
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginRight="8dp"
-            android:paddingTop="2dp"
-            android:paddingBottom="2dp"
-            android:paddingRight="7dp"
-            android:paddingLeft="7dp"
-            android:background="@drawable/rounded_background"
-            android:textColor="@color/white"
-            android:textStyle="bold"
-            android:text="2"
-            />
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:textColor="@color/black"
-            android:text="@string/title_email_confirmed"
-            />
-
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        >
-
-        <LinearLayout
-            android:orientation="vertical"
-            android:layout_width="1dp"
-            android:layout_height="20dp"
-            android:layout_marginLeft="11dp"
-            android:layout_marginTop="8dp"
-            android:layout_marginBottom="8dp"
-            android:background="#50616161"
-            />
-
-    </LinearLayout>
-
-    <LinearLayout
-        android:orientation="horizontal"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        >
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginRight="8dp"
-            android:paddingTop="2dp"
-            android:paddingBottom="2dp"
-            android:paddingRight="7dp"
-            android:paddingLeft="7dp"
-            android:background="@drawable/rounded_background"
-            android:textColor="@color/white"
-            android:textStyle="bold"
-            android:text="3"
-            />
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:textColor="@color/black"
-            android:textStyle="bold"
-            android:text="@string/title_phone_confirm"
-            />
-
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal">
-
-        <LinearLayout
-            android:id="@+id/lineTwo"
-            android:orientation="vertical"
-            android:layout_width="1dp"
-            android:layout_height="match_parent"
-            android:layout_marginLeft="11dp"
-            android:layout_marginTop="8dp"
-            android:layout_marginBottom="8dp"
-            android:background="#50616161"
-            />
-
-        <LinearLayout
-            android:id="@+id/rlContent"
-            android:orientation="vertical"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="18dp"
-            android:layout_marginBottom="16dp"
-            >
-
-            <br.com.sapereaude.maskedEditText.MaskedEditText
-                android:id="@+id/edtPhone"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="8dp"
-                android:theme="@style/Theme"
-                android:inputType="number"
-                mask:mask="+7 ### ### ####"
-                />
-
-            <Button
-                android:id="@+id/btnSetPhone"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="8dp"
-                style="@style/Widget.AppCompat.Button.Colored"
-                android:theme="@style/BlueButton"
-                android:paddingRight="18dp"
-                android:paddingLeft="18dp"
-                android:textColor="@color/white"
-                android:text="@string/button_resend_link"
-                />
-
-            <EditText
-                android:id="@+id/edtCode"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_below="@id/edtPhone"
-                android:layout_marginTop="8dp"
-                android:theme="@style/Theme"
-                android:inputType="number"
-                android:hint="@string/hint_code"
-                />
-
-            <Button
-                android:id="@+id/btnConfirm"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="8dp"
-                style="@style/Widget.AppCompat.Button.Colored"
-                android:theme="@style/BlueButton"
-                android:paddingRight="18dp"
-                android:paddingLeft="18dp"
-                android:textColor="@color/white"
-                android:text="@string/button_confirm"
-                />
-
-
-
-        </LinearLayout>
-
-    </LinearLayout>
-
-    <LinearLayout
-        android:orientation="horizontal"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        >
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginRight="8dp"
-            android:paddingTop="2dp"
-            android:paddingBottom="2dp"
-            android:paddingRight="7dp"
-            android:paddingLeft="7dp"
-            android:background="@drawable/rounded_background_grey"
-            android:textColor="@color/white"
-            android:textStyle="bold"
-            android:text="4"
-            />
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:textColor="@color/black"
-            android:text="@string/title_complete_register"
-            />
-
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        >
-
-        <LinearLayout
-            android:orientation="vertical"
-            android:layout_width="1dp"
-            android:layout_height="20dp"
-            android:layout_marginLeft="11dp"
-            android:layout_marginTop="8dp"
-            android:layout_marginBottom="8dp"
-            android:background="#50616161"
-            />
-
-    </LinearLayout>
-
-    <LinearLayout
-        android:id="@+id/stepFour"
-        android:orientation="horizontal"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        >
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginRight="8dp"
-            android:paddingTop="2dp"
-            android:paddingBottom="2dp"
-            android:paddingRight="7dp"
-            android:paddingLeft="7dp"
-            android:background="@drawable/rounded_background_grey"
-            android:textColor="@color/white"
-            android:textStyle="bold"
-            android:text="5"
-            />
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:textColor="@color/black"
-            android:text="@string/title_start_messaging"
-            />
-
-    </LinearLayout>
-
-</LinearLayout>
\ No newline at end of file
diff --git a/xabber/src/main/res/layout/fragment_xabber_account_register_last.xml b/xabber/src/main/res/layout/fragment_xabber_account_register_last.xml
deleted file mode 100644
index 4114ab1c5e..0000000000
--- a/xabber/src/main/res/layout/fragment_xabber_account_register_last.xml
+++ /dev/null
@@ -1,244 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:paddingTop="16dp"
-    android:paddingBottom="16dp"
-    android:paddingLeft="16dp"
-    android:paddingRight="16dp"
-    android:background="@color/cardview_light_background"
-    >
-
-
-    <LinearLayout
-        android:id="@+id/stepOne"
-        android:orientation="horizontal"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        >
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginRight="8dp"
-            android:paddingTop="2dp"
-            android:paddingBottom="2dp"
-            android:paddingRight="7dp"
-            android:paddingLeft="7dp"
-            android:background="@drawable/rounded_background"
-            android:textColor="@color/white"
-            android:textStyle="bold"
-            android:text="1"
-            />
-
-        <TextView
-            android:id="@+id/tvSignType"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:textColor="@color/black"
-            android:text="@string/signed_up_email"
-            />
-
-    </LinearLayout>
-
-    <TextView
-        android:id="@+id/tvAccountName"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_below="@+id/stepOne"
-        android:textColor="@color/black_text_secondary"
-        android:text="@string/no_email"
-        android:layout_toRightOf="@+id/lineOne"
-        android:layout_marginLeft="18dp"
-        />
-
-    <LinearLayout
-        android:id="@+id/lineOne"
-        android:orientation="vertical"
-        android:layout_width="1dp"
-        android:layout_height="20dp"
-        android:layout_marginLeft="11dp"
-        android:layout_marginTop="8dp"
-        android:layout_marginBottom="8dp"
-        android:layout_below="@+id/stepOne"
-        android:background="#50616161"
-        />
-
-    <LinearLayout
-        android:id="@+id/stepTwo"
-        android:orientation="horizontal"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_below="@+id/lineOne"
-        >
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginRight="8dp"
-            android:paddingTop="2dp"
-            android:paddingBottom="2dp"
-            android:paddingRight="7dp"
-            android:paddingLeft="7dp"
-            android:background="@drawable/rounded_background"
-            android:textColor="@color/white"
-            android:textStyle="bold"
-            android:text="2"
-            />
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:textColor="@color/black"
-            android:text="@string/title_email_confirmed"
-            />
-
-    </LinearLayout>
-
-    <LinearLayout
-        android:id="@+id/lineTwo"
-        android:orientation="vertical"
-        android:layout_width="1dp"
-        android:layout_height="20dp"
-        android:layout_marginLeft="11dp"
-        android:layout_marginTop="8dp"
-        android:layout_marginBottom="8dp"
-        android:layout_below="@+id/stepTwo"
-        android:background="#50616161"
-        />
-
-    <LinearLayout
-        android:id="@+id/stepThree"
-        android:orientation="horizontal"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_below="@+id/lineTwo"
-        >
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginRight="8dp"
-            android:paddingTop="2dp"
-            android:paddingBottom="2dp"
-            android:paddingRight="7dp"
-            android:paddingLeft="7dp"
-            android:background="@drawable/rounded_background"
-            android:textColor="@color/white"
-            android:textStyle="bold"
-            android:text="3"
-            />
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:textColor="@color/black"
-            android:text="@string/title_completed_register"
-            />
-
-    </LinearLayout>
-
-
-    <LinearLayout
-        android:id="@+id/lineThree"
-        android:orientation="vertical"
-        android:layout_width="1dp"
-        android:layout_height="20dp"
-        android:layout_marginLeft="11dp"
-        android:layout_marginTop="8dp"
-        android:layout_marginBottom="8dp"
-        android:layout_below="@+id/stepThree"
-        android:background="#50616161"
-        />
-
-    <LinearLayout
-        android:id="@+id/stepFour"
-        android:orientation="horizontal"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_below="@+id/lineThree"
-        >
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginRight="8dp"
-            android:paddingTop="2dp"
-            android:paddingBottom="2dp"
-            android:paddingRight="7dp"
-            android:paddingLeft="7dp"
-            android:background="@drawable/rounded_background"
-            android:textColor="@color/white"
-            android:textStyle="bold"
-            android:text="4"
-            />
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:textColor="@color/black"
-            android:textStyle="bold"
-            android:text="@string/title_start_messaging"
-            />
-
-    </LinearLayout>
-
-    <RelativeLayout
-        android:id="@+id/rlContent"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_below="@+id/stepFour"
-        android:layout_toRightOf="@+id/lineThree"
-        android:layout_marginLeft="18dp"
-        android:layout_marginBottom="16dp"
-        >
-
-        <TextView
-            android:id="@+id/tvDescription"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="8dp"
-            android:text="@string/complete_register_summary"
-            />
-
-        <LinearLayout
-            android:orientation="horizontal"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_below="@id/tvDescription"
-            >
-
-            <Button
-                android:id="@+id/btnYes"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="8dp"
-                android:layout_marginRight="16dp"
-                style="@style/Widget.AppCompat.Button.Colored"
-                android:theme="@style/BlueButton"
-                android:paddingRight="18dp"
-                android:paddingLeft="18dp"
-                android:textColor="@color/white"
-                android:text="@string/complete_register_add"
-                android:layout_weight="1"
-                />
-
-            <Button
-                android:id="@+id/btnNo"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="8dp"
-                style="@style/Widget.AppCompat.Button.Borderless"
-                android:theme="@style/BlueButton"
-                android:paddingRight="18dp"
-                android:paddingLeft="18dp"
-                android:textColor="@color/account_register_blue"
-                android:text="@string/complete_register_no"
-                android:layout_weight="1"
-                />
-
-        </LinearLayout>
-
-    </RelativeLayout>
-
-</RelativeLayout>
\ No newline at end of file
diff --git a/xabber/src/main/res/layout/fragment_xaccount_xmpp_confirm.xml b/xabber/src/main/res/layout/fragment_xaccount_xmpp_confirm.xml
deleted file mode 100644
index 48c7f49abc..0000000000
--- a/xabber/src/main/res/layout/fragment_xaccount_xmpp_confirm.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical"
-        android:layout_centerInParent="true"
-        android:layout_marginLeft="32dp"
-        android:layout_marginRight="32dp"
-        >
-
-        <TextView
-            android:id="@+id/tvTitle"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_margin="8dp"
-            android:text="@string/xmpp_confirm_title"
-            android:textSize="18sp"
-            android:gravity="center"
-            />
-
-        <EditText
-            android:id="@+id/edtCode"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="8dp"
-            android:layout_marginRight="12dp"
-            android:layout_marginLeft="12dp"
-            android:theme="@style/Theme"
-            android:inputType="number"
-            android:hint="@string/hint_code"
-            />
-
-        <LinearLayout
-            android:layout_marginTop="12dp"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal"
-            >
-
-            <Button
-                android:id="@+id/btnResend"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                style="@style/Widget.AppCompat.Button.Borderless"
-                android:theme="@style/BlueButton"
-                android:textColor="@color/account_register_blue"
-                android:text="@string/button_resend_link"
-                android:layout_weight="1"
-                />
-
-            <Button
-                android:id="@+id/btnConfirm"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                style="@style/Widget.AppCompat.Button.Colored"
-                android:theme="@style/BlueButton"
-                android:textColor="@color/white"
-                android:text="@string/button_confirm"
-                android:layout_weight="1"
-                />
-
-        </LinearLayout>
-    </LinearLayout>
-</RelativeLayout>
\ No newline at end of file

From 7bb71c8c2818944dd31014bfff8fc887577a6f93 Mon Sep 17 00:00:00 2001
From: Valery Miller <valera_miller94@mail.ru>
Date: Thu, 27 Sep 2018 17:16:53 +0500
Subject: [PATCH 165/251] Visual fixes in links fragment

---
 xabber/src/main/res/layout/fragment_xaccount_links.xml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/xabber/src/main/res/layout/fragment_xaccount_links.xml b/xabber/src/main/res/layout/fragment_xaccount_links.xml
index eaf9d5a8be..a9711b0440 100644
--- a/xabber/src/main/res/layout/fragment_xaccount_links.xml
+++ b/xabber/src/main/res/layout/fragment_xaccount_links.xml
@@ -39,6 +39,7 @@
                 android:textColor="@color/black_text"
                 tools:text="@tools:sample/full_names"
                 android:visibility="gone"
+                android:singleLine="true"
                 />
 
             <TextView
@@ -61,6 +62,7 @@
             android:layout_gravity="center_vertical"
             android:textColor="@color/grey_500"
             android:text="@string/action_connect"
+            android:singleLine="true"
             />
 
     </LinearLayout>
@@ -99,6 +101,7 @@
                 android:textColor="@color/black_text"
                 tools:text="@tools:sample/full_names"
                 android:visibility="gone"
+                android:singleLine="true"
                 />
 
             <TextView
@@ -121,6 +124,7 @@
             android:gravity="right"
             android:textColor="@color/grey_500"
             android:text="@string/action_connect"
+            android:singleLine="true"
             />
 
     </LinearLayout>
@@ -159,6 +163,7 @@
                 android:textColor="@color/black_text"
                 tools:text="@tools:sample/full_names"
                 android:visibility="gone"
+                android:singleLine="true"
                 />
 
             <TextView
@@ -181,6 +186,7 @@
             android:layout_marginLeft="24dp"
             android:textColor="@color/grey_500"
             android:text="@string/action_connect"
+            android:singleLine="true"
             />
 
     </LinearLayout>

From f37fe7b7b12af8d6af483e2c7ff6b78a73d31ad2 Mon Sep 17 00:00:00 2001
From: Valery Miller <valera_miller94@mail.ru>
Date: Thu, 27 Sep 2018 18:11:06 +0500
Subject: [PATCH 166/251] Visual changes in signup

---
 .../ui/fragment/XAccountSignUpFragment1.java        | 13 ++++++++++++-
 xabber/src/main/res/values/xabber_account.xml       |  2 +-
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountSignUpFragment1.java b/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountSignUpFragment1.java
index 81e4e209b8..6d8e93e7c4 100644
--- a/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountSignUpFragment1.java
+++ b/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountSignUpFragment1.java
@@ -124,7 +124,7 @@ private void setupSocial() {
         if (credentials != null && provider != null) {
             if (tvSocialProvider != null) {
                 tvSocialProvider.setVisibility(View.VISIBLE);
-                tvSocialProvider.setText(getString(R.string.signup_with_social, provider));
+                tvSocialProvider.setText(getString(R.string.signup_with_social, getProviderName(provider)));
 
                 Drawable drawable;
                 switch (provider) {
@@ -142,6 +142,17 @@ private void setupSocial() {
         } else if (tvSocialProvider != null) tvSocialProvider.setVisibility(View.GONE);
     }
 
+    private String getProviderName(String provider) {
+        switch (provider) {
+            case AuthManager.PROVIDER_TWITTER:
+                return "Twitter";
+            case AuthManager.PROVIDER_FACEBOOK:
+                return "Facebook";
+            default:
+                return "Google+";
+        }
+    }
+
     private void onNextClick() {
         String username = edtUsername.getText().toString().trim();
 
diff --git a/xabber/src/main/res/values/xabber_account.xml b/xabber/src/main/res/values/xabber_account.xml
index fd0086311e..058d582222 100644
--- a/xabber/src/main/res/values/xabber_account.xml
+++ b/xabber/src/main/res/values/xabber_account.xml
@@ -150,7 +150,7 @@
     <string name="signed_up_facebook">Signed up with Facebook</string>
     <string name="signed_up_github">Signed up with GitHub</string>
     <string name="signed_up_twitter">Signed up with Twitter</string>
-    <string name="signup_with_social">Your %1$s account will be bound to new Xabber Account</string>
+    <string name="signup_with_social">Your %1$s account will be linked to create account</string>
 
     <string name="auth_google_error">Authorization via Google failed</string>
     <string name="auth_facebook_error">Authorization via Facebook failed</string>

From a0f9245262c7ef7dd993b3279b5d4241f05d2838 Mon Sep 17 00:00:00 2001
From: Valery Miller <valera_miller94@mail.ru>
Date: Thu, 27 Sep 2018 18:29:02 +0500
Subject: [PATCH 167/251] Changed default style for domain description

---
 xabber/src/main/assets/style.css | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/xabber/src/main/assets/style.css b/xabber/src/main/assets/style.css
index 22e70f2ec9..932affe795 100644
--- a/xabber/src/main/assets/style.css
+++ b/xabber/src/main/assets/style.css
@@ -1,6 +1,8 @@
 li {
     padding-left: 6px;
     padding-right: 6px;
+    line-height: 1.5;
+    color: #616161;
 }
 
 ul {
@@ -11,4 +13,6 @@ ul {
 p {
     margin-top: 8px;
     margin-bottom: 4px;
+    line-height: 1.5;
+    color: #616161;
 }

From 9de9f46d5d9a604179b34af5276fca985b9f80a7 Mon Sep 17 00:00:00 2001
From: Valery Miller <valera_miller94@mail.ru>
Date: Thu, 27 Sep 2018 18:29:42 +0500
Subject: [PATCH 168/251] Up version to 518

---
 xabber/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/xabber/build.gradle b/xabber/build.gradle
index a6ce763ae1..f1a7825806 100644
--- a/xabber/build.gradle
+++ b/xabber/build.gradle
@@ -10,8 +10,8 @@ android {
     defaultConfig {
         minSdkVersion 15
         targetSdkVersion 27
-        versionCode 517
-        versionName '2.4.2(517)'
+        versionCode 518
+        versionName '2.4.2(518)'
     }
 
     lintOptions {

From 50f8a5dbc7827fcc157c75f0c1146c94c5b890ba Mon Sep 17 00:00:00 2001
From: Valery Miller <valera_miller94@mail.ru>
Date: Fri, 28 Sep 2018 15:02:21 +0500
Subject: [PATCH 169/251] Moved progress from toolbar to Xabber Account item

---
 .../ui/activity/XabberAccountActivity.java    |  9 ++++----
 .../fragment/XabberAccountInfoFragment.java   |  7 ++++++
 .../layout/activity_xabber_account_info.xml   |  2 +-
 .../res/layout/fragment_xaccount_info.xml     | 23 +++++++++++++++----
 4 files changed, 30 insertions(+), 11 deletions(-)

diff --git a/xabber/src/main/java/com/xabber/android/ui/activity/XabberAccountActivity.java b/xabber/src/main/java/com/xabber/android/ui/activity/XabberAccountActivity.java
index 4cf49a4d44..c8ce70dcaf 100644
--- a/xabber/src/main/java/com/xabber/android/ui/activity/XabberAccountActivity.java
+++ b/xabber/src/main/java/com/xabber/android/ui/activity/XabberAccountActivity.java
@@ -16,7 +16,6 @@
 import android.view.MenuItem;
 import android.view.View;
 import android.widget.CheckBox;
-import android.widget.ProgressBar;
 import android.widget.Toast;
 
 import com.xabber.android.R;
@@ -49,7 +48,6 @@ public class XabberAccountActivity extends BaseLoginActivity
 
     private Toolbar toolbar;
     private BarPainter barPainter;
-    private ProgressBar toolbarProgress;
 
     private Dialog logoutDialog;
     private boolean dialogShowed;
@@ -78,7 +76,6 @@ public void onClick(View v) {
         toolbar.inflateMenu(R.menu.toolbar_xabber_account_info);
         toolbar.setTitleTextColor(getResources().getColor(R.color.black_text));
         barPainter = new BarPainter(this, toolbar);
-        toolbarProgress = findViewById(R.id.toolbarProgress);
     }
 
     @Override
@@ -120,12 +117,14 @@ public boolean onMenuItemClick(MenuItem item) {
 
     @Override
     protected void showProgress(String title) {
-        toolbarProgress.setVisibility(View.VISIBLE);
+        if (fragmentInfo != null)
+            ((XabberAccountInfoFragment)fragmentInfo).showProgressInAccount(true);
     }
 
     @Override
     protected void hideProgress() {
-        toolbarProgress.setVisibility(View.GONE);
+        if (fragmentInfo != null)
+            ((XabberAccountInfoFragment)fragmentInfo).showProgressInAccount(false);
     }
 
     private void subscribeForXabberAccount() {
diff --git a/xabber/src/main/java/com/xabber/android/ui/fragment/XabberAccountInfoFragment.java b/xabber/src/main/java/com/xabber/android/ui/fragment/XabberAccountInfoFragment.java
index 861b7dcf76..9e07fa39f7 100644
--- a/xabber/src/main/java/com/xabber/android/ui/fragment/XabberAccountInfoFragment.java
+++ b/xabber/src/main/java/com/xabber/android/ui/fragment/XabberAccountInfoFragment.java
@@ -9,6 +9,7 @@
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ImageView;
+import android.widget.ProgressBar;
 import android.widget.TextView;
 import android.widget.Toast;
 
@@ -46,6 +47,7 @@ public class XabberAccountInfoFragment extends Fragment {
     private View viewLinks;
     private ImageView ivChevron;
 
+    private ProgressBar progressBar;
     private View progressView;
     private Fragment fragmentSync;
     private FragmentTransaction fTrans;
@@ -67,6 +69,7 @@ public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container,
     public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
 
+        progressBar = view.findViewById(R.id.toolbarProgress);
         tvPhone = (TextView) view.findViewById(R.id.tvPhoneNumber);
         tvAccountName = (TextView) view.findViewById(R.id.tvAccountName);
         tvAccountUsername = (TextView) view.findViewById(R.id.tvAccountUsername);
@@ -147,6 +150,10 @@ public void call(XabberAccount account) {
                 }).subscribe());
     }
 
+    public void showProgressInAccount(boolean show) {
+        progressBar.setVisibility(show ? View.VISIBLE : View.INVISIBLE);
+    }
+
     /** GET SETTINGS */
 
     public void getSettings() {
diff --git a/xabber/src/main/res/layout/activity_xabber_account_info.xml b/xabber/src/main/res/layout/activity_xabber_account_info.xml
index b48afdbf10..9a43094628 100644
--- a/xabber/src/main/res/layout/activity_xabber_account_info.xml
+++ b/xabber/src/main/res/layout/activity_xabber_account_info.xml
@@ -5,7 +5,7 @@
     android:background="?attr/settings_background_color"
     android:focusableInTouchMode="true">
 
-    <include layout="@layout/toolbar_with_progress" />
+    <include layout="@layout/toolbar_default" />
 
     <android.support.v4.widget.NestedScrollView
         android:id="@+id/scrollView"
diff --git a/xabber/src/main/res/layout/fragment_xaccount_info.xml b/xabber/src/main/res/layout/fragment_xaccount_info.xml
index 1f89cb4898..a476b321f0 100644
--- a/xabber/src/main/res/layout/fragment_xaccount_info.xml
+++ b/xabber/src/main/res/layout/fragment_xaccount_info.xml
@@ -18,7 +18,7 @@
             android:layout_height="match_parent"
             >
 
-            <LinearLayout
+            <RelativeLayout
                 android:id="@+id/llAccount"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -29,6 +29,7 @@
                 >
 
                 <FrameLayout
+                    android:id="@+id/avatarView"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="center_vertical">
@@ -51,12 +52,14 @@
                 </FrameLayout>
 
                 <LinearLayout
-                    android:layout_width="0dp"
+                    android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_gravity="center_vertical"
-                    android:layout_weight="1"
                     android:orientation="vertical"
-                    android:paddingLeft="16dp">
+                    android:layout_toRightOf="@id/avatarView"
+                    android:layout_toLeftOf="@id/toolbarProgress"
+                    android:paddingLeft="16dp"
+                    android:paddingRight="16dp">
 
                     <LinearLayout
                         android:layout_width="wrap_content"
@@ -113,7 +116,17 @@
                         android:textSize="14sp" />
 
                 </LinearLayout>
-            </LinearLayout>
+
+                <ProgressBar
+                    android:id="@+id/toolbarProgress"
+                    android:layout_width="32dp"
+                    android:layout_height="32dp"
+                    android:layout_alignParentRight="true"
+                    android:layout_centerVertical="true"
+                    android:indeterminateTint="@color/account_register_blue"
+                    android:visibility="invisible"
+                    />
+            </RelativeLayout>
 
             <View
                 android:layout_width="match_parent"

From ff5a0eaabc5282d8b371548908a70fee9f79a2cf Mon Sep 17 00:00:00 2001
From: Valery Miller <valera_miller94@mail.ru>
Date: Fri, 28 Sep 2018 15:32:56 +0500
Subject: [PATCH 170/251] Fixed saving current position in chat

---
 .../main/java/com/xabber/android/ui/activity/ChatActivity.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/xabber/src/main/java/com/xabber/android/ui/activity/ChatActivity.java b/xabber/src/main/java/com/xabber/android/ui/activity/ChatActivity.java
index cd1fc17255..cea45b9a5a 100644
--- a/xabber/src/main/java/com/xabber/android/ui/activity/ChatActivity.java
+++ b/xabber/src/main/java/com/xabber/android/ui/activity/ChatActivity.java
@@ -519,7 +519,6 @@ private void selectChatPage(BaseEntity chat, boolean smoothScroll) {
 
         if (chatFragment != null) {
             chatFragment.saveInputState();
-            chatFragment.saveScrollState();
             chatFragment.setChat(chat.getAccount(), chat.getUser());
         }
 
@@ -645,6 +644,8 @@ private void insertExtraText() {
 
     @Override
     public void onChatSelected(AccountJid accountJid, UserJid userJid) {
+        if (chatFragment != null)
+            chatFragment.saveScrollState();
         selectChat(accountJid, userJid);
     }
 

From 5a7f42dfcf35a8d2678fddf999a7a3ec2dafd6be Mon Sep 17 00:00:00 2001
From: Valery Miller <valera_miller94@mail.ru>
Date: Fri, 28 Sep 2018 16:09:41 +0500
Subject: [PATCH 171/251] Visual changes in signup screen

---
 .../res/layout/fragment_xaccount_signup_1.xml | 42 +++++++++----------
 .../res/layout/fragment_xaccount_signup_2.xml |  1 +
 .../res/layout/fragment_xaccount_signup_3.xml |  1 +
 .../res/layout/fragment_xaccount_signup_4.xml |  1 +
 xabber/src/main/res/values/xabber_account.xml | 10 ++---
 5 files changed, 29 insertions(+), 26 deletions(-)

diff --git a/xabber/src/main/res/layout/fragment_xaccount_signup_1.xml b/xabber/src/main/res/layout/fragment_xaccount_signup_1.xml
index 9dcbea0313..5bed8acf3e 100644
--- a/xabber/src/main/res/layout/fragment_xaccount_signup_1.xml
+++ b/xabber/src/main/res/layout/fragment_xaccount_signup_1.xml
@@ -20,6 +20,7 @@
             android:layout_height="wrap_content"
             android:text="@string/title_signup_step_1"
             android:textStyle="bold"
+            android:textSize="18sp"
             android:layout_marginLeft="16dp"
             android:layout_gravity="center_vertical"
             />
@@ -39,32 +40,30 @@
         android:layout_marginRight="24dp"
         >
 
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/label_username"
-            android:textSize="12sp"
-            android:paddingLeft="4dp"
-            android:textColor="@color/contact_item_text_second"
-            />
-
         <LinearLayout
             android:orientation="horizontal"
             android:layout_width="match_parent"
             android:layout_height="wrap_content">
 
-            <EditText
-                android:id="@+id/edtUsername"
+            <android.support.design.widget.TextInputLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:imeOptions="actionNext"
-                android:nextFocusForward="@+id/edtPass"
-                android:singleLine="true"
-                android:hint="@string/hint_username"
-                android:textSize="16sp"
-                android:theme="@style/Theme"
                 android:layout_weight="1"
-                />
+                >
+
+                <EditText
+                    android:id="@+id/edtUsername"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:imeOptions="actionNext"
+                    android:nextFocusForward="@+id/edtPass"
+                    android:singleLine="true"
+                    android:hint="@string/hint_username"
+                    android:textSize="16sp"
+                    android:theme="@style/Theme"
+                    />
+
+            </android.support.design.widget.TextInputLayout>
 
             <TextView
                 android:layout_width="wrap_content"
@@ -83,6 +82,8 @@
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
                 android:paddingRight="-12dp"
+                android:layout_gravity="bottom"
+                android:paddingBottom="6dp"
                 >
 
                 <Spinner
@@ -96,7 +97,7 @@
                     android:id="@+id/spinnerBorder"
                     android:layout_width="match_parent"
                     android:layout_height="2dp"
-                    android:background="@color/android_default_accent_color"
+                    android:background="@color/grey_400"
                     android:layout_marginTop="1dp"
                     android:layout_marginLeft="7dp"
                     android:layout_marginRight="16dp"
@@ -119,11 +120,10 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:paddingLeft="4dp"
-            android:layout_marginTop="8dp"
             />
 
         <RelativeLayout
-            android:layout_marginTop="16dp"
+            android:layout_marginTop="8dp"
             android:layout_marginBottom="16dp"
             android:layout_width="match_parent"
             android:layout_height="wrap_content">
diff --git a/xabber/src/main/res/layout/fragment_xaccount_signup_2.xml b/xabber/src/main/res/layout/fragment_xaccount_signup_2.xml
index 11b69c1ffc..c8acd90896 100644
--- a/xabber/src/main/res/layout/fragment_xaccount_signup_2.xml
+++ b/xabber/src/main/res/layout/fragment_xaccount_signup_2.xml
@@ -17,6 +17,7 @@
             android:layout_height="wrap_content"
             android:text="@string/title_signup_step_2"
             android:textStyle="bold"
+            android:textSize="18sp"
             android:layout_marginLeft="16dp"
             android:layout_gravity="center_vertical"
             />
diff --git a/xabber/src/main/res/layout/fragment_xaccount_signup_3.xml b/xabber/src/main/res/layout/fragment_xaccount_signup_3.xml
index 58fd4fcc5b..df75294039 100644
--- a/xabber/src/main/res/layout/fragment_xaccount_signup_3.xml
+++ b/xabber/src/main/res/layout/fragment_xaccount_signup_3.xml
@@ -16,6 +16,7 @@
             android:layout_height="wrap_content"
             android:text="@string/title_signup_step_3"
             android:textStyle="bold"
+            android:textSize="18sp"
             android:layout_marginLeft="16dp"
             android:layout_gravity="center_vertical"
             />
diff --git a/xabber/src/main/res/layout/fragment_xaccount_signup_4.xml b/xabber/src/main/res/layout/fragment_xaccount_signup_4.xml
index 13b6d01981..8614372453 100644
--- a/xabber/src/main/res/layout/fragment_xaccount_signup_4.xml
+++ b/xabber/src/main/res/layout/fragment_xaccount_signup_4.xml
@@ -16,6 +16,7 @@
             android:layout_height="wrap_content"
             android:text="@string/title_signup_step_4"
             android:textStyle="bold"
+            android:textSize="18sp"
             android:layout_marginLeft="16dp"
             android:layout_gravity="center_vertical"
             />
diff --git a/xabber/src/main/res/values/xabber_account.xml b/xabber/src/main/res/values/xabber_account.xml
index 058d582222..907b1accfd 100644
--- a/xabber/src/main/res/values/xabber_account.xml
+++ b/xabber/src/main/res/values/xabber_account.xml
@@ -55,7 +55,7 @@
     <string name="progress_title_connect">Connecting to Xabber Account via %1$s</string>
 
     <string name="label_username">Pick your username and host</string>
-    <string name="hint_username">username</string>
+    <string name="hint_username">Username</string>
     <string name="label_pass">Choose password</string>
     <string name="hint_pass">Enter password</string>
     <string name="label_conf_pass">Confirm password*</string>
@@ -220,10 +220,10 @@
     <string name="xaccount_not_exist">Will create new account</string>
     <string name="xaccount_exist">Xabber Account exists</string>
 
-    <string name="title_signup_step_1">Step 1 of 4</string>
-    <string name="title_signup_step_2">Step 2 of 4</string>
-    <string name="title_signup_step_3">Step 3 of 4</string>
-    <string name="title_signup_step_4">Step 4 of 4</string>
+    <string name="title_signup_step_1">Step 1 of 4. Pick username and host</string>
+    <string name="title_signup_step_2">Step 2 of 4. Set password</string>
+    <string name="title_signup_step_3">Step 3 of 4. Accept privacy policy</string>
+    <string name="title_signup_step_4">Step 4 of 4. Set social links</string>
 
     <string name="license_url" translatable="false">https://www.xabber.com/policy/</string>
     <string name="accept_license">Accept privacy policy</string>

From f5141e1821e18dbc13e3a7cac224b3bbe251fce4 Mon Sep 17 00:00:00 2001
From: Valery Miller <valera_miller94@mail.ru>
Date: Fri, 28 Sep 2018 17:24:14 +0500
Subject: [PATCH 172/251] Fixed notification sound in opened chat

---
 .../xabber/android/ui/fragment/ChatFragment.java  | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

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
index ddecb45c72..ba5d12de24 100644
--- a/xabber/src/main/java/com/xabber/android/ui/fragment/ChatFragment.java
+++ b/xabber/src/main/java/com/xabber/android/ui/fragment/ChatFragment.java
@@ -8,6 +8,8 @@
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
+import android.media.AudioAttributes;
+import android.media.AudioManager;
 import android.media.MediaPlayer;
 import android.net.Uri;
 import android.os.Bundle;
@@ -1551,7 +1553,18 @@ public void onImageClick(int messagePosition, int attachmentPosition) {
 
     public void playIncomingSound() {
         if (SettingsManager.eventsInChatSounds()) {
-            final MediaPlayer mp = MediaPlayer.create(getActivity(), SettingsManager.eventsSound());
+            final MediaPlayer mp;
+            if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.LOLLIPOP) {
+                AudioAttributes attr = new AudioAttributes.Builder()
+                        .setContentType(AudioAttributes.CONTENT_TYPE_UNKNOWN)
+                        .setUsage(AudioAttributes.USAGE_NOTIFICATION_EVENT).build();
+                mp = MediaPlayer.create(getActivity(), SettingsManager.eventsSound(),
+                        null, attr, AudioManager.AUDIO_SESSION_ID_GENERATE);
+            } else {
+                mp = MediaPlayer.create(getActivity(), SettingsManager.eventsSound());
+                mp.setAudioStreamType(AudioManager.STREAM_NOTIFICATION);
+            }
+
             mp.start();
             mp.setOnCompletionListener(new MediaPlayer.OnCompletionListener() {
                 @Override

From 783355b7698a4ad66a422a235f7acdec5a5b229b Mon Sep 17 00:00:00 2001
From: Valery Miller <valera_miller94@mail.ru>
Date: Fri, 28 Sep 2018 17:52:45 +0500
Subject: [PATCH 173/251] Up version to 519

---
 xabber/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/xabber/build.gradle b/xabber/build.gradle
index f1a7825806..1ef8f2c6f0 100644
--- a/xabber/build.gradle
+++ b/xabber/build.gradle
@@ -10,8 +10,8 @@ android {
     defaultConfig {
         minSdkVersion 15
         targetSdkVersion 27
-        versionCode 518
-        versionName '2.4.2(518)'
+        versionCode 519
+        versionName '2.4.2(519)'
     }
 
     lintOptions {

From 2e791e2ea95aef376dea6821ad45865534d2278c Mon Sep 17 00:00:00 2001
From: Valery Miller <valera_miller94@mail.ru>
Date: Mon, 1 Oct 2018 12:18:45 +0500
Subject: [PATCH 174/251] Changed font size in 2nd titles in signup screen

---
 xabber/src/main/res/layout/fragment_xaccount_signup_1.xml | 1 -
 xabber/src/main/res/layout/fragment_xaccount_signup_2.xml | 1 -
 xabber/src/main/res/layout/fragment_xaccount_signup_3.xml | 1 -
 xabber/src/main/res/layout/fragment_xaccount_signup_4.xml | 1 -
 4 files changed, 4 deletions(-)

diff --git a/xabber/src/main/res/layout/fragment_xaccount_signup_1.xml b/xabber/src/main/res/layout/fragment_xaccount_signup_1.xml
index 5bed8acf3e..4a1da9c892 100644
--- a/xabber/src/main/res/layout/fragment_xaccount_signup_1.xml
+++ b/xabber/src/main/res/layout/fragment_xaccount_signup_1.xml
@@ -20,7 +20,6 @@
             android:layout_height="wrap_content"
             android:text="@string/title_signup_step_1"
             android:textStyle="bold"
-            android:textSize="18sp"
             android:layout_marginLeft="16dp"
             android:layout_gravity="center_vertical"
             />
diff --git a/xabber/src/main/res/layout/fragment_xaccount_signup_2.xml b/xabber/src/main/res/layout/fragment_xaccount_signup_2.xml
index c8acd90896..11b69c1ffc 100644
--- a/xabber/src/main/res/layout/fragment_xaccount_signup_2.xml
+++ b/xabber/src/main/res/layout/fragment_xaccount_signup_2.xml
@@ -17,7 +17,6 @@
             android:layout_height="wrap_content"
             android:text="@string/title_signup_step_2"
             android:textStyle="bold"
-            android:textSize="18sp"
             android:layout_marginLeft="16dp"
             android:layout_gravity="center_vertical"
             />
diff --git a/xabber/src/main/res/layout/fragment_xaccount_signup_3.xml b/xabber/src/main/res/layout/fragment_xaccount_signup_3.xml
index df75294039..58fd4fcc5b 100644
--- a/xabber/src/main/res/layout/fragment_xaccount_signup_3.xml
+++ b/xabber/src/main/res/layout/fragment_xaccount_signup_3.xml
@@ -16,7 +16,6 @@
             android:layout_height="wrap_content"
             android:text="@string/title_signup_step_3"
             android:textStyle="bold"
-            android:textSize="18sp"
             android:layout_marginLeft="16dp"
             android:layout_gravity="center_vertical"
             />
diff --git a/xabber/src/main/res/layout/fragment_xaccount_signup_4.xml b/xabber/src/main/res/layout/fragment_xaccount_signup_4.xml
index 8614372453..13b6d01981 100644
--- a/xabber/src/main/res/layout/fragment_xaccount_signup_4.xml
+++ b/xabber/src/main/res/layout/fragment_xaccount_signup_4.xml
@@ -16,7 +16,6 @@
             android:layout_height="wrap_content"
             android:text="@string/title_signup_step_4"
             android:textStyle="bold"
-            android:textSize="18sp"
             android:layout_marginLeft="16dp"
             android:layout_gravity="center_vertical"
             />

From 3e9150b68e5283358e5bff8979eb724af7d2f60d Mon Sep 17 00:00:00 2001
From: Valery Miller <valera_miller94@mail.ru>
Date: Mon, 1 Oct 2018 12:21:42 +0500
Subject: [PATCH 175/251] Set input type - email in login field Remove unused
 login layout

---
 .../res/layout/fragment_xaccount_login.xml    |   1 +
 .../layout/fragment_xabber_account_login.xml  | 318 ------------------
 2 files changed, 1 insertion(+), 318 deletions(-)
 delete mode 100644 xabber/src/ru/res/layout/fragment_xabber_account_login.xml

diff --git a/xabber/src/main/res/layout/fragment_xaccount_login.xml b/xabber/src/main/res/layout/fragment_xaccount_login.xml
index 67000633e6..d7caaf9c60 100644
--- a/xabber/src/main/res/layout/fragment_xaccount_login.xml
+++ b/xabber/src/main/res/layout/fragment_xaccount_login.xml
@@ -40,6 +40,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:imeOptions="actionNext"
+                android:inputType="textEmailAddress"
                 android:nextFocusForward="@+id/edtPass"
                 android:singleLine="true"
                 android:hint="@string/label_xmpp_id"
diff --git a/xabber/src/ru/res/layout/fragment_xabber_account_login.xml b/xabber/src/ru/res/layout/fragment_xabber_account_login.xml
deleted file mode 100644
index f77b58794c..0000000000
--- a/xabber/src/ru/res/layout/fragment_xabber_account_login.xml
+++ /dev/null
@@ -1,318 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:paddingTop="16dp"
-    android:paddingBottom="16dp"
-    android:paddingLeft="16dp"
-    android:paddingRight="16dp"
-    android:background="@color/cardview_light_background"
-    >
-
-    <TextView
-        android:id="@+id/tvStepOne"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginRight="8dp"
-        android:layout_marginBottom="8dp"
-        android:paddingTop="2dp"
-        android:paddingBottom="2dp"
-        android:paddingRight="7dp"
-        android:paddingLeft="7dp"
-        android:background="@drawable/rounded_background"
-        android:textColor="@color/white"
-        android:textStyle="bold"
-        android:text="1"
-        />
-
-    <RelativeLayout
-        android:id="@+id/rlContent"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_toRightOf="@id/tvStepOne"
-        android:layout_marginTop="2dp"
-        android:layout_marginBottom="16dp"
-        >
-
-        <TextView
-            android:id="@+id/stepOneTitle"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:textColor="@color/black"
-            android:text="@string/sign_up_email_social"
-            />
-
-        <!--<TextView-->
-            <!--android:id="@+id/titleSocial"-->
-            <!--android:layout_width="wrap_content"-->
-            <!--android:layout_height="wrap_content"-->
-            <!--android:layout_below="@id/stepOneTitle"-->
-            <!--android:layout_marginTop="16dp"-->
-            <!--android:textColor="@color/black_text_secondary"-->
-            <!--android:text="@string/sign_up_social"-->
-            <!--/>-->
-
-        <LinearLayout
-            android:id="@+id/llSocialLogos"
-            android:orientation="horizontal"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_below="@+id/stepOneTitle"
-            android:layout_marginTop="16dp"
-            >
-
-            <ImageView
-                android:id="@+id/ivGoogle"
-                android:layout_width="48dp"
-                android:layout_height="48dp"
-                android:src="@drawable/ic_google_plus"
-                />
-
-            <ImageView
-                android:id="@+id/ivFacebook"
-                android:layout_width="48dp"
-                android:layout_height="48dp"
-                android:layout_marginLeft="32dp"
-                android:src="@drawable/ic_facebook"
-                />
-
-            <ImageView
-                android:id="@+id/ivTwitter"
-                android:layout_width="48dp"
-                android:layout_height="48dp"
-                android:layout_marginLeft="32dp"
-                android:src="@drawable/ic_twitter"
-                />
-
-            <ImageView
-                android:id="@+id/ivGithub"
-                android:layout_width="48dp"
-                android:layout_height="48dp"
-                android:layout_marginLeft="16dp"
-                android:src="@drawable/ic_github_logo_black"
-                android:visibility="gone"
-                />
-
-        </LinearLayout>
-
-        <!--<TextView-->
-            <!--android:id="@+id/titleEmail"-->
-            <!--android:layout_width="wrap_content"-->
-            <!--android:layout_height="wrap_content"-->
-            <!--android:layout_below="@id/llSocialLogos"-->
-            <!--android:layout_marginTop="20dp"-->
-            <!--android:textColor="@color/black_text_secondary"-->
-            <!--android:text="@string/sign_up_email"-->
-            <!--/>-->
-
-        <EditText
-            android:id="@+id/edtEmail"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_below="@id/llSocialLogos"
-            android:layout_marginTop="12dp"
-            android:inputType="textEmailAddress"
-            android:theme="@style/Theme"
-            android:hint="@string/email_hint"
-            />
-
-        <android.support.v7.widget.AppCompatCheckBox
-            android:id="@+id/chbAgrees"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_below="@id/edtEmail"
-            android:padding="8dp"
-            android:text="@string/agrees"
-            android:textColor="@color/black_text_secondary"
-            android:theme="@style/BlueCheckBox"
-            />
-
-        <Button
-            android:id="@+id/btnContinue"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_below="@id/chbAgrees"
-            android:layout_marginTop="8dp"
-            style="@style/Widget.AppCompat.Button.Colored"
-            android:theme="@style/BlueButton"
-            android:paddingRight="18dp"
-            android:paddingLeft="18dp"
-            android:textColor="@color/white"
-            android:text="@string/button_continue"
-            android:enabled="false"
-            />
-
-    </RelativeLayout>
-
-    <LinearLayout
-        android:orientation="vertical"
-        android:layout_width="1dp"
-        android:layout_height="match_parent"
-        android:layout_marginLeft="11dp"
-        android:layout_marginBottom="8dp"
-        android:layout_below="@+id/tvStepOne"
-        android:layout_above="@+id/stepTwo"
-        android:background="#50616161"
-        />
-
-    <LinearLayout
-        android:id="@+id/stepTwo"
-        android:orientation="horizontal"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_below="@+id/rlContent"
-        >
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginRight="8dp"
-            android:paddingTop="2dp"
-            android:paddingBottom="2dp"
-            android:paddingRight="7dp"
-            android:paddingLeft="7dp"
-            android:background="@drawable/rounded_background_grey"
-            android:textColor="@color/white"
-            android:textStyle="bold"
-            android:text="2"
-            />
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:textColor="@color/black"
-            android:text="@string/title_email_confirm"
-            />
-
-    </LinearLayout>
-
-    <LinearLayout
-        android:id="@+id/lineTwo"
-        android:orientation="vertical"
-        android:layout_width="1dp"
-        android:layout_height="20dp"
-        android:layout_marginLeft="11dp"
-        android:layout_marginTop="8dp"
-        android:layout_marginBottom="8dp"
-        android:layout_below="@+id/stepTwo"
-        android:background="#50616161"
-        />
-
-    <LinearLayout
-        android:id="@+id/stepConfirmNumber"
-        android:orientation="horizontal"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_below="@+id/lineTwo"
-        >
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginRight="8dp"
-            android:paddingTop="2dp"
-            android:paddingBottom="2dp"
-            android:paddingRight="7dp"
-            android:paddingLeft="7dp"
-            android:background="@drawable/rounded_background_grey"
-            android:textColor="@color/white"
-            android:textStyle="bold"
-            android:text="3"
-            />
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:textColor="@color/black"
-            android:text="@string/title_phone_confirm"
-            />
-
-    </LinearLayout>
-
-    <LinearLayout
-        android:id="@+id/lineConfirmNumber"
-        android:orientation="vertical"
-        android:layout_width="1dp"
-        android:layout_height="20dp"
-        android:layout_marginLeft="11dp"
-        android:layout_marginTop="8dp"
-        android:layout_marginBottom="8dp"
-        android:layout_below="@+id/stepConfirmNumber"
-        android:background="#50616161"
-        />
-
-    <LinearLayout
-        android:id="@+id/stepThree"
-        android:orientation="horizontal"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_below="@+id/lineConfirmNumber"
-        >
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginRight="8dp"
-            android:paddingTop="2dp"
-            android:paddingBottom="2dp"
-            android:paddingRight="7dp"
-            android:paddingLeft="7dp"
-            android:background="@drawable/rounded_background_grey"
-            android:textColor="@color/white"
-            android:textStyle="bold"
-            android:text="4"
-            />
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:textColor="@color/black"
-            android:text="@string/title_complete_register"
-            />
-
-    </LinearLayout>
-
-    <LinearLayout
-        android:id="@+id/lineThree"
-        android:orientation="vertical"
-        android:layout_width="1dp"
-        android:layout_height="20dp"
-        android:layout_marginLeft="11dp"
-        android:layout_marginTop="8dp"
-        android:layout_marginBottom="8dp"
-        android:layout_below="@+id/stepThree"
-        android:background="#50616161"
-        />
-
-    <LinearLayout
-        android:id="@+id/stepFour"
-        android:orientation="horizontal"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_below="@+id/lineThree"
-        >
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginRight="8dp"
-            android:paddingTop="2dp"
-            android:paddingBottom="2dp"
-            android:paddingRight="7dp"
-            android:paddingLeft="7dp"
-            android:background="@drawable/rounded_background_grey"
-            android:textColor="@color/white"
-            android:textStyle="bold"
-            android:text="5"
-            />
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:textColor="@color/black"
-            android:text="@string/title_start_messaging"
-            />
-
-    </LinearLayout>
-
-</RelativeLayout>
\ No newline at end of file

From 1e5c0f56347ba40da32bac97e16952824dba0b42 Mon Sep 17 00:00:00 2001
From: Valery Miller <valera_miller94@mail.ru>
Date: Mon, 1 Oct 2018 14:16:54 +0500
Subject: [PATCH 176/251] Added screen for email login

---
 .../ui/activity/XabberLoginActivity.java      | 52 ++++++++++-
 .../fragment/XAccountEmailLoginFragment.java  | 81 ++++++++++++++++
 .../ui/fragment/XAccountLoginFragment.java    | 15 +++
 .../layout/fragment_xaccount_email_login.xml  | 92 +++++++++++++++++++
 xabber/src/main/res/layout/include_social.xml |  2 +-
 xabber/src/main/res/values/xabber_account.xml |  1 +
 6 files changed, 241 insertions(+), 2 deletions(-)
 create mode 100644 xabber/src/main/java/com/xabber/android/ui/fragment/XAccountEmailLoginFragment.java
 create mode 100644 xabber/src/main/res/layout/fragment_xaccount_email_login.xml

diff --git a/xabber/src/main/java/com/xabber/android/ui/activity/XabberLoginActivity.java b/xabber/src/main/java/com/xabber/android/ui/activity/XabberLoginActivity.java
index 26e96341ed..7f609b7a54 100644
--- a/xabber/src/main/java/com/xabber/android/ui/activity/XabberLoginActivity.java
+++ b/xabber/src/main/java/com/xabber/android/ui/activity/XabberLoginActivity.java
@@ -29,6 +29,7 @@
 import com.xabber.android.data.xaccount.XabberAccountManager;
 import com.xabber.android.presentation.mvp.signup.SignUpRepo;
 import com.xabber.android.ui.color.BarPainter;
+import com.xabber.android.ui.fragment.XAccountEmailLoginFragment;
 import com.xabber.android.ui.fragment.XAccountLoginFragment;
 import com.xabber.android.ui.fragment.XAccountSignUpFragment1;
 import com.xabber.android.ui.fragment.XAccountSignUpFragment2;
@@ -52,11 +53,13 @@
 
 public class XabberLoginActivity extends BaseLoginActivity implements XAccountSignUpFragment1.Listener,
         XAccountSignUpFragment2.Listener, XAccountSignUpFragment3.Listener,
-        XAccountSignUpFragment4.Listener {
+        XAccountSignUpFragment4.Listener, XAccountLoginFragment.EmailClickListener,
+        XAccountEmailLoginFragment.Listener {
 
     private final static String LOG_TAG = XabberLoginActivity.class.getSimpleName();
     public final static String CURRENT_FRAGMENT = "current_fragment";
     public final static String FRAGMENT_LOGIN = "fragment_login";
+    public final static String FRAGMENT_EMAIL_LOGIN = "fragment_email_login";
     public final static String FRAGMENT_SIGNUP_STEP1 = "fragment_signup_step1";
     public final static String FRAGMENT_SIGNUP_STEP2 = "fragment_signup_step2";
     public final static String FRAGMENT_SIGNUP_STEP3 = "fragment_signup_step3";
@@ -67,6 +70,7 @@ public class XabberLoginActivity extends BaseLoginActivity implements XAccountSi
 
     private FragmentTransaction fTrans;
     private Fragment fragmentLogin;
+    private Fragment fragmentEmailLogin;
     private Fragment fragmentSignUpStep1;
     private Fragment fragmentSignUpStep2;
     private Fragment fragmentSignUpStep3;
@@ -136,6 +140,18 @@ public void showLoginFragment() {
         setupToolbar(true);
     }
 
+    public void showEmailLoginFragment() {
+        if (fragmentEmailLogin == null)
+            fragmentEmailLogin = XAccountEmailLoginFragment.newInstance();
+
+        fTrans = getFragmentManager().beginTransaction();
+        fTrans.replace(R.id.container, fragmentEmailLogin);
+        fTrans.commit();
+        currentFragment = FRAGMENT_EMAIL_LOGIN;
+
+        setupToolbar(true);
+    }
+
     public void showSignUpStep1Fragment() {
         if (fragmentSignUpStep1 == null)
             fragmentSignUpStep1 = XAccountSignUpFragment1.newInstance(this);
@@ -202,6 +218,9 @@ protected void onResume() {
                 case FRAGMENT_SIGNUP_STEP4:
                     showSignUpStep4Fragment();
                     break;
+                case FRAGMENT_EMAIL_LOGIN:
+                    showEmailLoginFragment();
+                    break;
                 default:
                     showLoginFragment();
             }
@@ -299,6 +318,37 @@ public void onStep4Completed() {
     @Override
     protected void onSynchronized() { }
 
+    @Override
+    public void onEmailClick() {
+        showEmailLoginFragment();
+    }
+
+    @Override
+    public void onLoginClick(String email, String pass) {
+        emailLogin(email, pass);
+    }
+
+    /** EMAIL LOGIN */
+
+    private void emailLogin(String email, String pass) {
+        showProgress(getString(R.string.progress_title_login));
+        Subscription emailLoginSubscription = AuthManager.login(email, pass)
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(new Action1<XAccountTokenDTO>() {
+                    @Override
+                    public void call(XAccountTokenDTO xAccountTokenDTO) {
+                        handleSuccessSocialLogin(xAccountTokenDTO);
+                    }
+                }, new Action1<Throwable>() {
+                    @Override
+                    public void call(Throwable throwable) {
+                        handleErrorGetAccount(throwable);
+                    }
+                });
+        compositeSubscription.add(emailLoginSubscription);
+    }
+
     /** GET HOSTS */
 
     private void getHosts() {
diff --git a/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountEmailLoginFragment.java b/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountEmailLoginFragment.java
new file mode 100644
index 0000000000..6b5176c6c2
--- /dev/null
+++ b/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountEmailLoginFragment.java
@@ -0,0 +1,81 @@
+package com.xabber.android.ui.fragment;
+
+import android.app.Fragment;
+import android.content.Context;
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Button;
+import android.widget.EditText;
+
+import com.xabber.android.R;
+
+public class XAccountEmailLoginFragment extends Fragment {
+
+    private EditText edtEmail;
+    private EditText edtPass;
+    private Button btnLogin;
+
+    private Listener listener;
+
+    public interface Listener {
+        void onLoginClick(String email, String pass);
+    }
+
+    public static XAccountEmailLoginFragment newInstance() {
+        return new XAccountEmailLoginFragment();
+    }
+
+    @Nullable
+    @Override
+    public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, Bundle savedInstanceState) {
+        return inflater.inflate(R.layout.fragment_xaccount_email_login, container, false);
+    }
+
+    @Override
+    public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+
+        edtEmail = view.findViewById(R.id.edtEmail);
+        edtPass = view.findViewById(R.id.edtPass);
+        btnLogin = view.findViewById(R.id.btnLogin);
+        btnLogin.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                String email = edtEmail.getText().toString().trim();
+                String pass = edtPass.getText().toString().trim();
+                if (verifyFields(email, pass)) listener.onLoginClick(email, pass);
+            }
+        });
+    }
+
+    @Override
+    public void onAttach(Context context) {
+        super.onAttach(context);
+        if (context instanceof Listener) listener = (Listener) context;
+        else throw new RuntimeException(context.toString()
+                + " must implement XAccountEmailLoginFragment.Listener");
+    }
+
+    @Override
+    public void onDetach() {
+        super.onDetach();
+        listener = null;
+    }
+
+    private boolean verifyFields(String email, String pass) {
+        if (email.isEmpty()) {
+            edtEmail.setError(getString(R.string.empty_field));
+            return false;
+        }
+
+        if (pass.isEmpty()) {
+            edtPass.setError(getString(R.string.empty_field));
+            return false;
+        }
+
+        return true;
+    }
+}
diff --git a/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountLoginFragment.java b/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountLoginFragment.java
index 0f3b3025ff..1805e43e1d 100644
--- a/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountLoginFragment.java
+++ b/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountLoginFragment.java
@@ -40,6 +40,11 @@ public class XAccountLoginFragment extends Fragment implements View.OnClickListe
     private View socialView;
 
     private OnSocialBindListener listener;
+    private EmailClickListener emailListener;
+
+    public interface EmailClickListener {
+        void onEmailClick();
+    }
 
     public static XAccountLoginFragment newInstance() {
         XAccountLoginFragment fragment = new XAccountLoginFragment();
@@ -76,10 +81,12 @@ public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container,
         ImageView ivFacebook = view.findViewById(R.id.ivFacebook);
         ImageView ivGoogle = view.findViewById(R.id.ivGoogle);
         ImageView ivTwitter = view.findViewById(R.id.ivTwitter);
+        ImageView ivEmail = view.findViewById(R.id.ivEmail);
 
         ivFacebook.setOnClickListener(this);
         ivGoogle.setOnClickListener(this);
         ivTwitter.setOnClickListener(this);
+        ivEmail.setOnClickListener(this);
 
         return view;
     }
@@ -91,12 +98,17 @@ public void onAttach(Context context) {
         if (context instanceof OnSocialBindListener) listener = (OnSocialBindListener) context;
         else throw new RuntimeException(context.toString()
                 + " must implement OnSocialBindListener");
+
+        if (context instanceof EmailClickListener) emailListener = (EmailClickListener) context;
+        else throw new RuntimeException(context.toString()
+                + " must implement EmailClickListener");
     }
 
     @Override
     public void onDetach() {
         super.onDetach();
         listener = null;
+        emailListener = null;
     }
 
     @Override
@@ -114,6 +126,9 @@ public void onClick(View v) {
             case R.id.ivTwitter:
                 listener.onBindClick(AuthManager.PROVIDER_TWITTER);
                 break;
+            case R.id.ivEmail:
+                emailListener.onEmailClick();
+                break;
             case R.id.btnOptions:
                 showOptions();
                 break;
diff --git a/xabber/src/main/res/layout/fragment_xaccount_email_login.xml b/xabber/src/main/res/layout/fragment_xaccount_email_login.xml
new file mode 100644
index 0000000000..ed76c2e458
--- /dev/null
+++ b/xabber/src/main/res/layout/fragment_xaccount_email_login.xml
@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="48dp"
+        android:background="#F5F5F5"
+        android:elevation="8dp"
+        >
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/title_login_email"
+            android:textStyle="bold"
+            android:layout_marginLeft="16dp"
+            android:layout_gravity="center_vertical"
+            />
+
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        android:layout_centerInParent="true"
+        android:layout_marginLeft="@dimen/login_horizontal_margin"
+        android:layout_marginRight="@dimen/login_horizontal_margin"
+        android:focusableInTouchMode="true"
+        >
+
+        <android.support.design.widget.TextInputLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            >
+
+            <android.support.design.widget.TextInputEditText
+                android:id="@+id/edtEmail"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:imeOptions="actionNext"
+                android:inputType="textEmailAddress"
+                android:nextFocusForward="@+id/edtPass"
+                android:singleLine="true"
+                android:hint="@string/email_hint"
+                android:textSize="16sp"
+                android:theme="@style/Theme"
+                />
+
+        </android.support.design.widget.TextInputLayout>
+
+        <android.support.design.widget.TextInputLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:passwordToggleEnabled="true"
+            android:layout_marginTop="16dp"
+            android:layout_marginBottom="16dp"
+            >
+
+            <android.support.design.widget.TextInputEditText
+                android:id="@+id/edtPass"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:imeOptions="actionDone"
+                android:singleLine="true"
+                android:textSize="16sp"
+                android:theme="@style/Theme"
+                android:hint="@string/hint_pass"
+                android:inputType="textPassword"
+                />
+
+        </android.support.design.widget.TextInputLayout>
+
+        <Button
+            android:id="@+id/btnLogin"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            style="@style/Widget.AppCompat.Button.Colored"
+            android:theme="@style/BlueButton"
+            android:paddingRight="18dp"
+            android:paddingLeft="18dp"
+            android:layout_gravity="right"
+            android:textColor="@color/white"
+            android:text="@string/button_connect"
+            />
+
+    </LinearLayout>
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/xabber/src/main/res/layout/include_social.xml b/xabber/src/main/res/layout/include_social.xml
index 853b824ee2..428fa51b4d 100644
--- a/xabber/src/main/res/layout/include_social.xml
+++ b/xabber/src/main/res/layout/include_social.xml
@@ -66,7 +66,7 @@
             />
 
         <ImageView
-            android:id="@+id/ivGithub"
+            android:id="@+id/ivEmail"
             android:layout_width="48dp"
             android:layout_height="48dp"
             android:src="@drawable/ic_email_circle"
diff --git a/xabber/src/main/res/values/xabber_account.xml b/xabber/src/main/res/values/xabber_account.xml
index 907b1accfd..3aa3c22cfa 100644
--- a/xabber/src/main/res/values/xabber_account.xml
+++ b/xabber/src/main/res/values/xabber_account.xml
@@ -224,6 +224,7 @@
     <string name="title_signup_step_2">Step 2 of 4. Set password</string>
     <string name="title_signup_step_3">Step 3 of 4. Accept privacy policy</string>
     <string name="title_signup_step_4">Step 4 of 4. Set social links</string>
+    <string name="title_login_email">Login via email</string>
 
     <string name="license_url" translatable="false">https://www.xabber.com/policy/</string>
     <string name="accept_license">Accept privacy policy</string>

From c96e8311022b6886164309e892859a58e4448de2 Mon Sep 17 00:00:00 2001
From: Valery Miller <valera_miller94@mail.ru>
Date: Mon, 1 Oct 2018 14:49:07 +0500
Subject: [PATCH 177/251] Added check that account already exist Not allowed to
 add account with same name as existed

---
 .../android/data/account/AccountManager.java  | 20 +++++++++++--------
 xabber/src/main/res/values/account_editor.xml |  1 +
 2 files changed, 13 insertions(+), 8 deletions(-)

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
index 9d3601ca2a..c5079e2ddb 100644
--- a/xabber/src/main/java/com/xabber/android/data/account/AccountManager.java
+++ b/xabber/src/main/java/com/xabber/android/data/account/AccountManager.java
@@ -317,6 +317,15 @@ public AccountItem getAccount(AccountJid account) {
         return accountItems.get(account);
     }
 
+    public boolean isAccountExist(String user) {
+        Collection<AccountJid> accounts = getAllAccounts();
+        for (AccountJid account : accounts) {
+            if (account.getFullJid().asBareJid().equals(user))
+                return true;
+        }
+        return false;
+    }
+
     /**
      * Save account item to database.
      */
@@ -381,6 +390,9 @@ public AccountJid addAccount(String user, String password, String token, boolean
             throw new NetworkException(R.string.INCORRECT_USER_NAME);
         }
 
+        if (isAccountExist(user))
+            throw new NetworkException(R.string.ACCOUNT_EXIST);
+
         Resourcepart resource = null;
         String resourceString = XmppStringUtils.parseResource(user).trim();
         if (!TextUtils.isEmpty(resourceString)) {
@@ -398,14 +410,6 @@ public AccountJid addAccount(String user, String password, String token, boolean
         }
 
         AccountItem accountItem;
-        while(true) {
-
-            if (getAccount(AccountJid.from(userName, serverName, resource)) == null) {
-                break;
-            }
-            resource = generateResource();
-        }
-
 
         boolean useCustomHost = application.getResources().getBoolean(R.bool.account_use_custom_host_default);
 
diff --git a/xabber/src/main/res/values/account_editor.xml b/xabber/src/main/res/values/account_editor.xml
index 6be666d98d..851e8ad6d8 100644
--- a/xabber/src/main/res/values/account_editor.xml
+++ b/xabber/src/main/res/values/account_editor.xml
@@ -18,6 +18,7 @@
     <string name="EMPTY_SERVER_NAME">Server name is not specified</string>
     <string name="EMPTY_USER_NAME">Username is not specified</string>
     <string name="CONFIRM_PASSWORD">Passwords do not match</string>
+    <string name="ACCOUNT_EXIST">This account already exist</string>
     <string name="account_archive_mode">Store message history</string>
     <string name="account_archive_mode_available">On server if available</string>
     <string name="account_archive_mode_dont_store">Don\'t store</string>

From bf98312ff28e499775d539bdcc7306696f14a6b9 Mon Sep 17 00:00:00 2001
From: Valery Miller <valera_miller94@mail.ru>
Date: Mon, 1 Oct 2018 14:59:26 +0500
Subject: [PATCH 178/251] Removed unused class Changed translation

---
 .../ui/dialog/AccountSyncDialogFragment.java  | 176 ------------------
 .../ui/fragment/XAccountLinksFragment.java    |   5 +-
 xabber/src/main/res/values/xabber_account.xml |   2 +-
 3 files changed, 3 insertions(+), 180 deletions(-)
 delete mode 100644 xabber/src/main/java/com/xabber/android/ui/dialog/AccountSyncDialogFragment.java

diff --git a/xabber/src/main/java/com/xabber/android/ui/dialog/AccountSyncDialogFragment.java b/xabber/src/main/java/com/xabber/android/ui/dialog/AccountSyncDialogFragment.java
deleted file mode 100644
index 0dff2e37a0..0000000000
--- a/xabber/src/main/java/com/xabber/android/ui/dialog/AccountSyncDialogFragment.java
+++ /dev/null
@@ -1,176 +0,0 @@
-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 android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.widget.CompoundButton;
-import android.widget.Switch;
-
-import com.xabber.android.R;
-import com.xabber.android.data.SettingsManager;
-import com.xabber.android.data.account.AccountManager;
-import com.xabber.android.data.entity.AccountJid;
-import com.xabber.android.data.xaccount.XMPPAccountSettings;
-import com.xabber.android.data.xaccount.XabberAccountManager;
-import com.xabber.android.ui.adapter.XMPPAccountAdapter;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-
-/**
- * Created by valery.miller on 02.08.17.
- */
-
-public class AccountSyncDialogFragment extends DialogFragment {
-
-    private static final String NO_CANCEL = "NO_CANCEL";
-
-    private List<XMPPAccountSettings> xmppAccounts;
-    private Switch switchSyncAll;
-    private XMPPAccountAdapter adapter;
-    private boolean noCancel = false;
-    private Listener listener;
-
-    public interface Listener {
-        void onSyncClick(boolean needGoToMainActivity);
-    }
-
-    public static AccountSyncDialogFragment newInstance(Listener listener, boolean noCancel) {
-        AccountSyncDialogFragment fragment = new AccountSyncDialogFragment();
-        Bundle args = new Bundle();
-        args.putBoolean(NO_CANCEL, noCancel);
-        fragment.setArguments(args);
-        fragment.listener = listener;
-        return fragment;
-    }
-
-    @Override
-    public Dialog onCreateDialog(Bundle savedInstanceState) {
-
-        Bundle args = getArguments();
-        boolean noCancel = args.getBoolean(NO_CANCEL, false);
-
-        AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
-        builder.setView(setupView())
-                .setTitle(R.string.title_sync);
-
-
-        if (!noCancel) {
-            builder.setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() {
-                @Override
-                public void onClick(DialogInterface dialog, int which) {
-                    AccountSyncDialogFragment.this.getDialog().cancel();
-                }
-            }).setPositiveButton(R.string.button_sync, new DialogInterface.OnClickListener() {
-                @Override
-                public void onClick(DialogInterface dialog, int which) {
-                    onPositiveClick(false);
-                }
-            });
-        } else {
-            builder.setPositiveButton(R.string.button_sync, new DialogInterface.OnClickListener() {
-                @Override
-                public void onClick(DialogInterface dialog, int which) {
-                    onPositiveClick(true);
-                }
-            });
-        }
-        this.noCancel = noCancel;
-
-        return builder.create();
-    }
-
-    public View setupView() {
-        LayoutInflater inflater = getActivity().getLayoutInflater();
-        View view = inflater.inflate(R.layout.dialog_account_sync, null);
-
-        switchSyncAll = (Switch) view.findViewById(R.id.switchSyncAll);
-        switchSyncAll.setChecked(SettingsManager.isSyncAllAccounts());
-        switchSyncAll.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
-            @Override
-            public void onCheckedChanged(CompoundButton compoundButton, boolean b) {
-                if (adapter != null)
-                    adapter.setAllChecked(b);
-            }
-        });
-        if (AccountManager.getInstance().haveNotAllowedSyncAccounts()) switchSyncAll.setEnabled(false);
-
-        setXmppAccounts(XabberAccountManager.getInstance().getXmppAccountsForSync());
-
-        //adapter = new XMPPAccountAdapter(getActivity());
-        adapter.setItems(xmppAccounts);
-
-        if (adapter != null && SettingsManager.isSyncAllAccounts())
-            adapter.setAllChecked(true);
-
-        RecyclerView recyclerView = (RecyclerView) view.findViewById(R.id.list);
-        recyclerView.setLayoutManager(new LinearLayoutManager(getActivity()));
-        recyclerView.setAdapter(adapter);
-
-        return view;
-    }
-
-    public void setXmppAccounts(List<XMPPAccountSettings> items) {
-        this.xmppAccounts = new ArrayList<>();
-        for (XMPPAccountSettings account : items) {
-            XMPPAccountSettings newAccount = new XMPPAccountSettings(
-                    account.getJid(),
-                    account.isSynchronization(),
-                    account.getTimestamp());
-            newAccount.setUsername(account.getUsername());
-            newAccount.setColor(account.getColor());
-            newAccount.setOrder(account.getOrder());
-            newAccount.setStatus(account.getStatus());
-            newAccount.setDeleted(account.isDeleted());
-            newAccount.setSyncNotAllowed(account.isSyncNotAllowed());
-
-            this.xmppAccounts.add(newAccount);
-        }
-        Collections.sort(xmppAccounts);
-    }
-
-    @Override
-    public void onCancel(DialogInterface dialog) {
-        super.onCancel(dialog);
-        if (noCancel) listener.onSyncClick(true);
-    }
-
-    private void onPositiveClick(boolean needGoToMainActivity) {
-        // set accounts to sync map
-        if (!switchSyncAll.isChecked()) {
-            Map<String, Boolean> syncState = new HashMap<>();
-            for (XMPPAccountSettings account : xmppAccounts) {
-                if (account.getStatus() != XMPPAccountSettings.SyncStatus.local) {
-                    syncState.put(account.getJid(), account.isSynchronization());
-                } else if (account.isSynchronization() || XabberAccountManager.getInstance()
-                        .getAccountSyncState(account.getJid()) != null) {
-                    syncState.put(account.getJid(), account.isSynchronization());
-                }
-            }
-            XabberAccountManager.getInstance().setAccountSyncState(syncState);
-        }
-
-        // update timestamp in accounts if timestamp was changed in dialog
-        for (XMPPAccountSettings account : xmppAccounts) {
-            AccountJid accountJid = XabberAccountManager.getInstance().getExistingAccount(account.getJid());
-            if (accountJid != null)
-                AccountManager.getInstance().setTimestamp(accountJid, account.getTimestamp());
-        }
-
-        // set sync all
-        SettingsManager.setSyncAllAccounts(switchSyncAll.isChecked());
-
-        // callback to sync-request
-        listener.onSyncClick(needGoToMainActivity);
-    }
-}
diff --git a/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountLinksFragment.java b/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountLinksFragment.java
index 6ff3dd1ba7..a3edac054a 100644
--- a/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountLinksFragment.java
+++ b/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountLinksFragment.java
@@ -22,7 +22,6 @@
 import com.xabber.android.data.xaccount.XabberAccount;
 import com.xabber.android.data.xaccount.XabberAccountManager;
 import com.xabber.android.ui.adapter.EmailAdapter;
-import com.xabber.android.ui.dialog.AccountSyncDialogFragment;
 import com.xabber.android.ui.dialog.AddEmailDialogFragment;
 import com.xabber.android.ui.dialog.ConfirmEmailDialogFragment;
 import com.xabber.android.ui.helper.OnSocialBindListener;
@@ -131,7 +130,7 @@ public void onClick(View v) {
             @Override
             public void onClick(View v) {
                 AddEmailDialogFragment.newInstance()
-                        .show(getFragmentManager(), AccountSyncDialogFragment.class.getSimpleName());
+                        .show(getFragmentManager(), AddEmailDialogFragment.class.getSimpleName());
             }
         });
     }
@@ -170,7 +169,7 @@ public void onResume() {
     @Override
     public void onEmailVerifyClick(String email) {
         ConfirmEmailDialogFragment.newInstance(email)
-                .show(getFragmentManager(), AccountSyncDialogFragment.class.getSimpleName());
+                .show(getFragmentManager(), ConfirmEmailDialogFragment.class.getSimpleName());
     }
 
     @Override
diff --git a/xabber/src/main/res/values/xabber_account.xml b/xabber/src/main/res/values/xabber_account.xml
index 3aa3c22cfa..6e0e697f03 100644
--- a/xabber/src/main/res/values/xabber_account.xml
+++ b/xabber/src/main/res/values/xabber_account.xml
@@ -175,7 +175,7 @@
     <string name="sync_status_local">Local settings will be uploaded to server</string>
     <string name="sync_status_remote">Remote settings will be downloaded from server</string>
     <string name="sync_status_ok">Synchronized</string>
-    <string name="sync_status_deleted">Remote settings were deleted</string>
+    <string name="sync_status_deleted">Local settings will be deleted</string>
     <string name="sync_status_not_allowed">Synchronization not available</string>
     <string name="sync_status_enabled">Synchronization enabled</string>
     <string name="sync_status_disabled">Synchronization disabled</string>

From 67dbed527ad21538863d51244ff63a4ab62aef72 Mon Sep 17 00:00:00 2001
From: Valery Miller <valera_miller94@mail.ru>
Date: Mon, 1 Oct 2018 15:17:06 +0500
Subject: [PATCH 179/251] Changed description of social bind fail

---
 xabber/src/main/res/values/xabber_account.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/xabber/src/main/res/values/xabber_account.xml b/xabber/src/main/res/values/xabber_account.xml
index 6e0e697f03..7a744113b2 100644
--- a/xabber/src/main/res/values/xabber_account.xml
+++ b/xabber/src/main/res/values/xabber_account.xml
@@ -27,7 +27,7 @@
     <string name="set_phone_success">Confirmation code sent</string>
 
     <string name="social_bind_success">Social network bind successfully</string>
-    <string name="social_bind_fail">Can\'t link this social account</string>
+    <string name="social_bind_fail">Can\'t link this social account. Perhaps it is already using by another Xabber-account</string>
     <string name="social_unbind_success">Social network unbind successfully</string>
     <string name="social_unbind_fail">Social network unbind failed</string>
 

From 938d5a707ad69e254d77dfa6c8281c149aed4820 Mon Sep 17 00:00:00 2001
From: Valery Miller <valera_miller94@mail.ru>
Date: Mon, 1 Oct 2018 15:48:15 +0500
Subject: [PATCH 180/251] Added forgot password button

---
 .../ui/activity/XabberLoginActivity.java      |  3 +-
 .../fragment/XAccountEmailLoginFragment.java  | 15 +++++++
 .../ui/fragment/XAccountLoginFragment.java    | 17 +++++++
 .../layout/fragment_xaccount_email_login.xml  | 44 ++++++++++++++-----
 .../res/layout/fragment_xaccount_login.xml    | 12 +++++
 5 files changed, 78 insertions(+), 13 deletions(-)

diff --git a/xabber/src/main/java/com/xabber/android/ui/activity/XabberLoginActivity.java b/xabber/src/main/java/com/xabber/android/ui/activity/XabberLoginActivity.java
index 7f609b7a54..22ec03fbec 100644
--- a/xabber/src/main/java/com/xabber/android/ui/activity/XabberLoginActivity.java
+++ b/xabber/src/main/java/com/xabber/android/ui/activity/XabberLoginActivity.java
@@ -54,7 +54,7 @@
 public class XabberLoginActivity extends BaseLoginActivity implements XAccountSignUpFragment1.Listener,
         XAccountSignUpFragment2.Listener, XAccountSignUpFragment3.Listener,
         XAccountSignUpFragment4.Listener, XAccountLoginFragment.EmailClickListener,
-        XAccountEmailLoginFragment.Listener {
+        XAccountEmailLoginFragment.Listener, XAccountLoginFragment.ForgotPassClickListener {
 
     private final static String LOG_TAG = XabberLoginActivity.class.getSimpleName();
     public final static String CURRENT_FRAGMENT = "current_fragment";
@@ -233,6 +233,7 @@ protected void onSaveInstanceState(Bundle outState) {
         outState.putString(CURRENT_FRAGMENT, currentFragment);
     }
 
+    @Override
     public void onForgotPassClick() {
         String url = HttpApiManager.XABBER_FORGOT_PASS_URL;
         Intent intent = new Intent(Intent.ACTION_VIEW);
diff --git a/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountEmailLoginFragment.java b/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountEmailLoginFragment.java
index 6b5176c6c2..1c481933c2 100644
--- a/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountEmailLoginFragment.java
+++ b/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountEmailLoginFragment.java
@@ -17,8 +17,10 @@ public class XAccountEmailLoginFragment extends Fragment {
     private EditText edtEmail;
     private EditText edtPass;
     private Button btnLogin;
+    private Button btnForgotPass;
 
     private Listener listener;
+    private XAccountLoginFragment.ForgotPassClickListener forgotPassListener;
 
     public interface Listener {
         void onLoginClick(String email, String pass);
@@ -49,6 +51,13 @@ public void onClick(View v) {
                 if (verifyFields(email, pass)) listener.onLoginClick(email, pass);
             }
         });
+        btnForgotPass = view.findViewById(R.id.btnForgotPass);
+        btnForgotPass.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                forgotPassListener.onForgotPassClick();
+            }
+        });
     }
 
     @Override
@@ -57,12 +66,18 @@ public void onAttach(Context context) {
         if (context instanceof Listener) listener = (Listener) context;
         else throw new RuntimeException(context.toString()
                 + " must implement XAccountEmailLoginFragment.Listener");
+
+        if (context instanceof XAccountLoginFragment.ForgotPassClickListener)
+            forgotPassListener = (XAccountLoginFragment.ForgotPassClickListener) context;
+        else throw new RuntimeException(context.toString()
+                + " must implement ForgotPassClickListener");
     }
 
     @Override
     public void onDetach() {
         super.onDetach();
         listener = null;
+        forgotPassListener = null;
     }
 
     private boolean verifyFields(String email, String pass) {
diff --git a/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountLoginFragment.java b/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountLoginFragment.java
index 1805e43e1d..4640d83207 100644
--- a/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountLoginFragment.java
+++ b/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountLoginFragment.java
@@ -36,16 +36,22 @@ public class XAccountLoginFragment extends Fragment implements View.OnClickListe
     private EditText edtPassword;
     private Button btnLogin;
     private Button btnOptions;
+    private Button btnForgotPass;
     private View optionsView;
     private View socialView;
 
     private OnSocialBindListener listener;
     private EmailClickListener emailListener;
+    private ForgotPassClickListener forgotPassListener;
 
     public interface EmailClickListener {
         void onEmailClick();
     }
 
+    public interface ForgotPassClickListener {
+        void onForgotPassClick();
+    }
+
     public static XAccountLoginFragment newInstance() {
         XAccountLoginFragment fragment = new XAccountLoginFragment();
         return fragment;
@@ -74,6 +80,8 @@ public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container,
         btnLogin.setOnClickListener(this);
         btnOptions = view.findViewById(R.id.btnOptions);
         btnOptions.setOnClickListener(this);
+        btnForgotPass = view.findViewById(R.id.btnForgotPass);
+        btnForgotPass.setOnClickListener(this);
 
         ((TextView) view.findViewById(R.id.account_help))
                 .setMovementMethod(LinkMovementMethod.getInstance());
@@ -102,6 +110,11 @@ else throw new RuntimeException(context.toString()
         if (context instanceof EmailClickListener) emailListener = (EmailClickListener) context;
         else throw new RuntimeException(context.toString()
                 + " must implement EmailClickListener");
+
+        if (context instanceof ForgotPassClickListener)
+            forgotPassListener = (ForgotPassClickListener) context;
+        else throw new RuntimeException(context.toString()
+                + " must implement ForgotPassClickListener");
     }
 
     @Override
@@ -109,6 +122,7 @@ public void onDetach() {
         super.onDetach();
         listener = null;
         emailListener = null;
+        forgotPassListener = null;
     }
 
     @Override
@@ -132,6 +146,9 @@ public void onClick(View v) {
             case R.id.btnOptions:
                 showOptions();
                 break;
+            case R.id.btnForgotPass:
+                forgotPassListener.onForgotPassClick();
+                break;
         }
     }
 
diff --git a/xabber/src/main/res/layout/fragment_xaccount_email_login.xml b/xabber/src/main/res/layout/fragment_xaccount_email_login.xml
index ed76c2e458..2fc99409ae 100644
--- a/xabber/src/main/res/layout/fragment_xaccount_email_login.xml
+++ b/xabber/src/main/res/layout/fragment_xaccount_email_login.xml
@@ -74,18 +74,38 @@
 
         </android.support.design.widget.TextInputLayout>
 
-        <Button
-            android:id="@+id/btnLogin"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            style="@style/Widget.AppCompat.Button.Colored"
-            android:theme="@style/BlueButton"
-            android:paddingRight="18dp"
-            android:paddingLeft="18dp"
-            android:layout_gravity="right"
-            android:textColor="@color/white"
-            android:text="@string/button_connect"
-            />
+        <RelativeLayout
+            android:layout_marginTop="8dp"
+            android:layout_marginBottom="16dp"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+            <Button
+                android:id="@+id/btnLogin"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                style="@style/Widget.AppCompat.Button.Colored"
+                android:theme="@style/BlueButton"
+                android:paddingRight="18dp"
+                android:paddingLeft="18dp"
+                android:layout_gravity="right"
+                android:textColor="@color/white"
+                android:text="@string/button_connect"
+                android:layout_alignParentRight="true"
+                />
+
+            <Button
+                android:id="@+id/btnForgotPass"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                style="@style/Widget.AppCompat.Button.Borderless"
+                android:theme="@style/BlueButton"
+                android:textColor="@color/grey_500"
+                android:text="@string/forgot_pass"
+                android:layout_centerVertical="true"
+                />
+
+        </RelativeLayout>
 
     </LinearLayout>
 
diff --git a/xabber/src/main/res/layout/fragment_xaccount_login.xml b/xabber/src/main/res/layout/fragment_xaccount_login.xml
index d7caaf9c60..28230d72ec 100644
--- a/xabber/src/main/res/layout/fragment_xaccount_login.xml
+++ b/xabber/src/main/res/layout/fragment_xaccount_login.xml
@@ -182,6 +182,18 @@
 
         <include layout="@layout/include_social"/>
 
+        <Button
+            android:id="@+id/btnForgotPass"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            style="@style/Widget.AppCompat.Button.Borderless"
+            android:theme="@style/BlueButton"
+            android:textColor="@color/grey_500"
+            android:text="@string/forgot_pass"
+            android:layout_gravity="center_horizontal"
+            android:layout_centerVertical="true"
+            />
+
     </LinearLayout>
 
 

From 2687e2486348aa51630ff1931fd1ddccc606b1a2 Mon Sep 17 00:00:00 2001
From: Valery Miller <valera_miller94@mail.ru>
Date: Mon, 1 Oct 2018 15:57:48 +0500
Subject: [PATCH 181/251] Changed font size in 2nd titles in signup screen

---
 xabber/src/main/res/layout/fragment_xaccount_email_login.xml | 1 +
 xabber/src/main/res/layout/fragment_xaccount_signup_1.xml    | 1 +
 xabber/src/main/res/layout/fragment_xaccount_signup_2.xml    | 1 +
 xabber/src/main/res/layout/fragment_xaccount_signup_3.xml    | 1 +
 xabber/src/main/res/layout/fragment_xaccount_signup_4.xml    | 1 +
 5 files changed, 5 insertions(+)

diff --git a/xabber/src/main/res/layout/fragment_xaccount_email_login.xml b/xabber/src/main/res/layout/fragment_xaccount_email_login.xml
index 2fc99409ae..aca14ad21e 100644
--- a/xabber/src/main/res/layout/fragment_xaccount_email_login.xml
+++ b/xabber/src/main/res/layout/fragment_xaccount_email_login.xml
@@ -16,6 +16,7 @@
             android:layout_height="wrap_content"
             android:text="@string/title_login_email"
             android:textStyle="bold"
+            android:textSize="16sp"
             android:layout_marginLeft="16dp"
             android:layout_gravity="center_vertical"
             />
diff --git a/xabber/src/main/res/layout/fragment_xaccount_signup_1.xml b/xabber/src/main/res/layout/fragment_xaccount_signup_1.xml
index 4a1da9c892..01e4e3ac63 100644
--- a/xabber/src/main/res/layout/fragment_xaccount_signup_1.xml
+++ b/xabber/src/main/res/layout/fragment_xaccount_signup_1.xml
@@ -20,6 +20,7 @@
             android:layout_height="wrap_content"
             android:text="@string/title_signup_step_1"
             android:textStyle="bold"
+            android:textSize="16sp"
             android:layout_marginLeft="16dp"
             android:layout_gravity="center_vertical"
             />
diff --git a/xabber/src/main/res/layout/fragment_xaccount_signup_2.xml b/xabber/src/main/res/layout/fragment_xaccount_signup_2.xml
index 11b69c1ffc..9f14fdf2d6 100644
--- a/xabber/src/main/res/layout/fragment_xaccount_signup_2.xml
+++ b/xabber/src/main/res/layout/fragment_xaccount_signup_2.xml
@@ -16,6 +16,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="@string/title_signup_step_2"
+            android:textSize="16sp"
             android:textStyle="bold"
             android:layout_marginLeft="16dp"
             android:layout_gravity="center_vertical"
diff --git a/xabber/src/main/res/layout/fragment_xaccount_signup_3.xml b/xabber/src/main/res/layout/fragment_xaccount_signup_3.xml
index 58fd4fcc5b..36864a9c85 100644
--- a/xabber/src/main/res/layout/fragment_xaccount_signup_3.xml
+++ b/xabber/src/main/res/layout/fragment_xaccount_signup_3.xml
@@ -15,6 +15,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="@string/title_signup_step_3"
+            android:textSize="16sp"
             android:textStyle="bold"
             android:layout_marginLeft="16dp"
             android:layout_gravity="center_vertical"
diff --git a/xabber/src/main/res/layout/fragment_xaccount_signup_4.xml b/xabber/src/main/res/layout/fragment_xaccount_signup_4.xml
index 13b6d01981..1b46771168 100644
--- a/xabber/src/main/res/layout/fragment_xaccount_signup_4.xml
+++ b/xabber/src/main/res/layout/fragment_xaccount_signup_4.xml
@@ -15,6 +15,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="@string/title_signup_step_4"
+            android:textSize="16sp"
             android:textStyle="bold"
             android:layout_marginLeft="16dp"
             android:layout_gravity="center_vertical"

From be03a477d860f12acf2d4e6d639c8d779da57e4f Mon Sep 17 00:00:00 2001
From: Valery Miller <valera_miller94@mail.ru>
Date: Mon, 1 Oct 2018 16:15:14 +0500
Subject: [PATCH 182/251] Up version to 520

---
 xabber/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/xabber/build.gradle b/xabber/build.gradle
index 1ef8f2c6f0..ad59d01a19 100644
--- a/xabber/build.gradle
+++ b/xabber/build.gradle
@@ -10,8 +10,8 @@ android {
     defaultConfig {
         minSdkVersion 15
         targetSdkVersion 27
-        versionCode 519
-        versionName '2.4.2(519)'
+        versionCode 520
+        versionName '2.4.2(520)'
     }
 
     lintOptions {

From 712ff37a09d28b5e65ac4b4e51eb5513c68b3f68 Mon Sep 17 00:00:00 2001
From: Valery Miller <valera_miller94@mail.ru>
Date: Mon, 1 Oct 2018 16:54:35 +0500
Subject: [PATCH 183/251] Added scroll view to step4 of signin

---
 xabber/src/main/res/layout/fragment_xaccount_links.xml    | 1 +
 xabber/src/main/res/layout/fragment_xaccount_signup_3.xml | 2 +-
 xabber/src/main/res/layout/fragment_xaccount_signup_4.xml | 8 +++++++-
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/xabber/src/main/res/layout/fragment_xaccount_links.xml b/xabber/src/main/res/layout/fragment_xaccount_links.xml
index a9711b0440..4cc863e4f8 100644
--- a/xabber/src/main/res/layout/fragment_xaccount_links.xml
+++ b/xabber/src/main/res/layout/fragment_xaccount_links.xml
@@ -202,6 +202,7 @@
             android:layout_height="wrap_content"
             android:nestedScrollingEnabled="false"
             tools:listitem="@layout/item_email"
+            android:overScrollMode="never"
             />
 
         <LinearLayout
diff --git a/xabber/src/main/res/layout/fragment_xaccount_signup_3.xml b/xabber/src/main/res/layout/fragment_xaccount_signup_3.xml
index 36864a9c85..e3e6869f26 100644
--- a/xabber/src/main/res/layout/fragment_xaccount_signup_3.xml
+++ b/xabber/src/main/res/layout/fragment_xaccount_signup_3.xml
@@ -27,7 +27,7 @@
         android:orientation="vertical"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_marginTop="24dp"
+        android:layout_marginTop="16dp"
         android:layout_marginLeft="24dp"
         android:layout_marginRight="24dp"
         >
diff --git a/xabber/src/main/res/layout/fragment_xaccount_signup_4.xml b/xabber/src/main/res/layout/fragment_xaccount_signup_4.xml
index 1b46771168..2d650b042a 100644
--- a/xabber/src/main/res/layout/fragment_xaccount_signup_4.xml
+++ b/xabber/src/main/res/layout/fragment_xaccount_signup_4.xml
@@ -23,11 +23,15 @@
 
     </LinearLayout>
 
+    <ScrollView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
     <LinearLayout
         android:orientation="vertical"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginTop="24dp"
+        android:layout_marginTop="16dp"
         android:layout_marginLeft="24dp"
         android:layout_marginRight="24dp"
         >
@@ -73,5 +77,7 @@
 
     </LinearLayout>
 
+    </ScrollView>
+
 
 </LinearLayout>
\ No newline at end of file

From 8b010ec6680feea35ec6b679ed04d4dfcf34af60 Mon Sep 17 00:00:00 2001
From: Valery Miller <valera_miller94@mail.ru>
Date: Mon, 1 Oct 2018 17:14:57 +0500
Subject: [PATCH 184/251] Added dialog for unlink social account

---
 .../ui/dialog/AddEmailDialogFragment.java     |  2 +-
 .../ui/fragment/XAccountLinksFragment.java    | 26 ++++++++++++++++---
 xabber/src/main/res/values/xabber_account.xml |  3 ++-
 3 files changed, 25 insertions(+), 6 deletions(-)

diff --git a/xabber/src/main/java/com/xabber/android/ui/dialog/AddEmailDialogFragment.java b/xabber/src/main/java/com/xabber/android/ui/dialog/AddEmailDialogFragment.java
index 37f0904ff0..086b3bc065 100644
--- a/xabber/src/main/java/com/xabber/android/ui/dialog/AddEmailDialogFragment.java
+++ b/xabber/src/main/java/com/xabber/android/ui/dialog/AddEmailDialogFragment.java
@@ -37,7 +37,7 @@ public void onClick(DialogInterface dialog, int which) {
 
                     }
                 })
-                .setPositiveButton(R.string.complete_register_add, new DialogInterface.OnClickListener() {
+                .setPositiveButton(R.string.action_connect, new DialogInterface.OnClickListener() {
                     @Override
                     public void onClick(DialogInterface dialog, int which) {
                         if (listener != null) listener.onAddEmailClick(edtEmail.getText().toString());
diff --git a/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountLinksFragment.java b/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountLinksFragment.java
index a3edac054a..fb0de68ea6 100644
--- a/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountLinksFragment.java
+++ b/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountLinksFragment.java
@@ -89,7 +89,7 @@ public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
             public void onClick(View v) {
                 if (tvActionGoogle.getText().equals(getString(R.string.action_connect)))
                     bindListener.onBindClick(AuthManager.PROVIDER_GOOGLE);
-                else listener.onSocialUnbindClick(AuthManager.PROVIDER_GOOGLE);
+                else onSocialUnlinkClick(AuthManager.PROVIDER_GOOGLE);
             }
         });
 
@@ -103,7 +103,7 @@ public void onClick(View v) {
             public void onClick(View v) {
                 if (tvActionFacebook.getText().equals(getString(R.string.action_connect)))
                     bindListener.onBindClick(AuthManager.PROVIDER_FACEBOOK);
-                else listener.onSocialUnbindClick(AuthManager.PROVIDER_FACEBOOK);
+                else onSocialUnlinkClick(AuthManager.PROVIDER_FACEBOOK);
             }
         });
 
@@ -117,7 +117,7 @@ public void onClick(View v) {
             public void onClick(View v) {
                 if (tvActionTwitter.getText().equals(getString(R.string.action_connect)))
                     bindListener.onBindClick(AuthManager.PROVIDER_TWITTER);
-                else listener.onSocialUnbindClick(AuthManager.PROVIDER_TWITTER);
+                else onSocialUnlinkClick(AuthManager.PROVIDER_TWITTER);
             }
         });
 
@@ -172,11 +172,29 @@ public void onEmailVerifyClick(String email) {
                 .show(getFragmentManager(), ConfirmEmailDialogFragment.class.getSimpleName());
     }
 
+    private void onSocialUnlinkClick(final String provider) {
+        AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
+        builder.setMessage(getString(R.string.title_delete_social, provider))
+                .setPositiveButton(R.string.action_disconnect, new DialogInterface.OnClickListener() {
+                    @Override
+                    public void onClick(DialogInterface dialog, int which) {
+                        listener.onSocialUnbindClick(provider);
+                    }
+                })
+                .setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() {
+                    @Override
+                    public void onClick(DialogInterface dialog, int which) {
+                        dialog.dismiss();
+                    }
+                });
+        builder.create().show();
+    }
+
     @Override
     public void onEmailDeleteClick(final int id) {
         AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
         builder.setMessage(R.string.title_delete_email)
-                .setPositiveButton(R.string.ok, new DialogInterface.OnClickListener() {
+                .setPositiveButton(R.string.action_disconnect, new DialogInterface.OnClickListener() {
                     @Override
                     public void onClick(DialogInterface dialog, int which) {
                         listener.onDeleteEmailClick(id);
diff --git a/xabber/src/main/res/values/xabber_account.xml b/xabber/src/main/res/values/xabber_account.xml
index 7a744113b2..62388bcca7 100644
--- a/xabber/src/main/res/values/xabber_account.xml
+++ b/xabber/src/main/res/values/xabber_account.xml
@@ -91,7 +91,8 @@
     <string name="title_no_linked_accounts">No linked social accounts or emails</string>
     <string name="title_linked_accounts">Linked social accounts and emails</string>
     <string name="title_select_xmpp_account">Select XMPP account to proceed</string>
-    <string name="title_delete_email">Do you want to unlink this email from Xabber-account</string>
+    <string name="title_delete_email">Do you want to unlink this email from Xabber-account?</string>
+    <string name="title_delete_social">Do you want to unlink this %1$s account from Xabber-account?</string>
 
     <string name="title_login_xabber_account">Sign In</string>
     <string name="title_register_xabber_account">Sign Up</string>

From ffa66881e6057bab10c0f2f641eaac4e79447232 Mon Sep 17 00:00:00 2001
From: Valery Miller <valera_miller94@mail.ru>
Date: Mon, 1 Oct 2018 17:41:31 +0500
Subject: [PATCH 185/251] Changed email and social items in links list

---
 .../java/com/xabber/android/ui/adapter/EmailAdapter.java    | 2 +-
 .../xabber/android/ui/fragment/XAccountLinksFragment.java   | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/xabber/src/main/java/com/xabber/android/ui/adapter/EmailAdapter.java b/xabber/src/main/java/com/xabber/android/ui/adapter/EmailAdapter.java
index b9b159e8e2..c96c193a9d 100644
--- a/xabber/src/main/java/com/xabber/android/ui/adapter/EmailAdapter.java
+++ b/xabber/src/main/java/com/xabber/android/ui/adapter/EmailAdapter.java
@@ -48,7 +48,7 @@ public void onBindViewHolder(EmailViewHolder holder, final int position) {
         holder.tvEmail.setText(emailDTO.getEmail());
         holder.tvStatus.setText(emailDTO.isVerified() ? R.string.title_verified_email : R.string.title_unverified_email);
         holder.tvStatus.setTextColor(emailDTO.isVerified() ? res.getColor(R.color.grey_500) : res.getColor(R.color.red_500));
-        holder.tvAction.setText(emailDTO.isVerified() ? R.string.action_disconnect : R.string.action_verify);
+        holder.tvAction.setVisibility(emailDTO.isVerified() ? View.GONE : View.VISIBLE);
         holder.ivEmail.setImageResource(emailDTO.isVerified() ? R.drawable.ic_confirmed_email_circle : R.drawable.ic_email_circle);
 
         holder.itemView.setOnClickListener(new View.OnClickListener() {
diff --git a/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountLinksFragment.java b/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountLinksFragment.java
index fb0de68ea6..9d04358a96 100644
--- a/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountLinksFragment.java
+++ b/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountLinksFragment.java
@@ -218,6 +218,7 @@ private void setupSocial(List<SocialBindingDTO> socialBindings) {
                 tvNameGoogle.setVisibility(View.VISIBLE);
                 tvStatusGoogle.setText(getResources().getString(R.string.title_linked_account, "Google +"));
                 tvActionGoogle.setText(R.string.action_disconnect);
+                tvActionGoogle.setVisibility(View.GONE);
                 tvActionGoogle.setTextColor(getActivity().getResources().getColor(R.color.account_register_blue));
             } else if ("facebook".equals(socialBinding.getProvider())) {
                 ivFacebook.setImageResource(R.drawable.ic_facebook);
@@ -225,6 +226,7 @@ private void setupSocial(List<SocialBindingDTO> socialBindings) {
                 tvNameFacebook.setVisibility(View.VISIBLE);
                 tvStatusFacebook.setText(getResources().getString(R.string.title_linked_account, "Facebook"));
                 tvActionFacebook.setText(R.string.action_disconnect);
+                tvActionFacebook.setVisibility(View.GONE);
                 tvActionFacebook.setTextColor(getActivity().getResources().getColor(R.color.account_register_blue));
             } else if ("twitter".equals(socialBinding.getProvider())) {
                 ivTwitter.setImageResource(R.drawable.ic_twitter);
@@ -232,6 +234,7 @@ private void setupSocial(List<SocialBindingDTO> socialBindings) {
                 tvNameTwitter.setVisibility(View.VISIBLE);
                 tvStatusTwitter.setText(getResources().getString(R.string.title_linked_account, "Twitter"));
                 tvActionTwitter.setText(R.string.action_disconnect);
+                tvActionTwitter.setVisibility(View.GONE);
                 tvActionTwitter.setTextColor(getActivity().getResources().getColor(R.color.account_register_blue));
             }
         }
@@ -242,18 +245,21 @@ private void clearSocial() {
         tvNameGoogle.setVisibility(View.GONE);
         tvStatusGoogle.setText(R.string.title_not_linked_account);
         tvActionGoogle.setText(R.string.action_connect);
+        tvActionGoogle.setVisibility(View.VISIBLE);
         tvActionGoogle.setTextColor(getActivity().getResources().getColor(R.color.grey_500));
 
         ivFacebook.setImageResource(R.drawable.ic_facebook_disabled);
         tvNameFacebook.setVisibility(View.GONE);
         tvStatusFacebook.setText(R.string.title_not_linked_account);
         tvActionFacebook.setText(R.string.action_connect);
+        tvActionFacebook.setVisibility(View.VISIBLE);
         tvActionFacebook.setTextColor(getActivity().getResources().getColor(R.color.grey_500));
 
         ivTwitter.setImageResource(R.drawable.ic_twitter_disabled);
         tvNameTwitter.setVisibility(View.GONE);
         tvStatusTwitter.setText(R.string.title_not_linked_account);
         tvActionTwitter.setText(R.string.action_connect);
+        tvActionTwitter.setVisibility(View.VISIBLE);
         tvActionTwitter.setTextColor(getActivity().getResources().getColor(R.color.grey_500));
     }
 

From 6eac4e2a9d5f2095cc24c3d6bc35f5814dd1c496 Mon Sep 17 00:00:00 2001
From: Valery Miller <valera_miller94@mail.ru>
Date: Mon, 1 Oct 2018 17:46:17 +0500
Subject: [PATCH 186/251] Changed translations

---
 .../ui/fragment/XAccountLinksFragment.java    |  2 +-
 xabber/src/main/res/values/xabber_account.xml | 26 +++++++++----------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountLinksFragment.java b/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountLinksFragment.java
index 9d04358a96..5b17e551e5 100644
--- a/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountLinksFragment.java
+++ b/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountLinksFragment.java
@@ -216,7 +216,7 @@ private void setupSocial(List<SocialBindingDTO> socialBindings) {
                 ivGoogle.setImageResource(R.drawable.ic_google_plus);
                 tvNameGoogle.setText(socialBinding.getFirstName() + " " + socialBinding.getLastName());
                 tvNameGoogle.setVisibility(View.VISIBLE);
-                tvStatusGoogle.setText(getResources().getString(R.string.title_linked_account, "Google +"));
+                tvStatusGoogle.setText(getResources().getString(R.string.title_linked_account, "Google+"));
                 tvActionGoogle.setText(R.string.action_disconnect);
                 tvActionGoogle.setVisibility(View.GONE);
                 tvActionGoogle.setTextColor(getActivity().getResources().getColor(R.color.account_register_blue));
diff --git a/xabber/src/main/res/values/xabber_account.xml b/xabber/src/main/res/values/xabber_account.xml
index 62388bcca7..f147caac05 100644
--- a/xabber/src/main/res/values/xabber_account.xml
+++ b/xabber/src/main/res/values/xabber_account.xml
@@ -14,8 +14,8 @@
     <string name="sync_fail">Synchronization failed</string>
     <string name="quit_success">Quit successful</string>
     <string name="quit_fail">Quit failed</string>
-    <string name="confirm_success">Email confirmed</string>
-    <string name="confirm_fail">Email confirmation failed</string>
+    <string name="confirm_success">Email verified</string>
+    <string name="confirm_fail">Email verification failed</string>
     <string name="delete_success">Email deleted</string>
     <string name="complete_success">Registration completed</string>
     <string name="complete_fail">Registration failed</string>
@@ -26,12 +26,12 @@
     <string name="confirm_phone_success">Phone number successfully confirmed</string>
     <string name="set_phone_success">Confirmation code sent</string>
 
-    <string name="social_bind_success">Social network bind successfully</string>
+    <string name="social_bind_success">Social network linked successfully</string>
     <string name="social_bind_fail">Can\'t link this social account. Perhaps it is already using by another Xabber-account</string>
-    <string name="social_unbind_success">Social network unbind successfully</string>
-    <string name="social_unbind_fail">Social network unbind failed</string>
+    <string name="social_unbind_success">Social network unlink successfully</string>
+    <string name="social_unbind_fail">Social network unlink failed</string>
 
-    <string name="toast_email_already_confirm">Email already confirmed</string>
+    <string name="toast_email_already_confirm">Email already verified</string>
     <string name="toast_not_authorized">You are not authorized</string>
     <string name="toast_no_internet">No internet connection</string>
 
@@ -40,7 +40,7 @@
     <string name="progress_title_quit">Quit</string>
     <string name="progress_title_login">Login</string>
     <string name="progress_title_signup">Registration</string>
-    <string name="progress_title_confirm">Confirmation</string>
+    <string name="progress_title_confirm">Verification</string>
     <string name="progress_title_complete">Registration completion</string>
     <string name="progress_title_resend">Resending email</string>
     <string name="progress_title_delete">Deleting email</string>
@@ -48,9 +48,9 @@
     <string name="progress_title_confirm_phone">Confirming phone number</string>
     <string name="progress_title_delete_settings">Delete settings</string>
     <string name="progress_title_request_xmpp_auth">Request XMPP auth-code</string>
-    <string name="progress_title_confirm_xmpp">Confirm XMPP-account with code</string>
+    <string name="progress_title_confirm_xmpp">Verify XMPP-account with code</string>
     <string name="progress_title_bind_social">Authenticating..</string>
-    <string name="progress_title_unbind_social">Unbind social network</string>
+    <string name="progress_title_unbind_social">Unlink social network</string>
     <string name="progress_title_account_list">Loading list of accounts..</string>
     <string name="progress_title_connect">Connecting to Xabber Account via %1$s</string>
 
@@ -74,8 +74,8 @@
 
     <string name="title_xabber_account">Xabber Account</string>
     <string name="title_xmpp_account">XMPP Accounts</string>
-    <string name="title_email_confirm">Confirm email address</string>
-    <string name="title_email_confirmed">Email address confirmed</string>
+    <string name="title_email_confirm">Verify email address</string>
+    <string name="title_email_confirmed">Email address verified</string>
     <string name="title_phone_confirm">Confirm phone number</string>
     <string name="title_phone_confirmed">Phone number confirmed</string>
     <string name="title_complete_register">Complete registration</string>
@@ -109,7 +109,7 @@
     <string name="button_registration">SIGN UP</string>
     <string name="button_resend_link">RESEND CODE</string>
     <string name="button_complete_registration">REGISTER</string>
-    <string name="button_confirm">confirm</string>
+    <string name="button_confirm">verify</string>
     <string name="button_cancel_registration">Cancel registration</string>
     <string name="button_continue">continue</string>
     <string name="button_sync">Sync now</string>
@@ -217,7 +217,7 @@
     <string name="patreon_current_goal" translatable="false">Goal: %1$s</string>
     <string name="patreon_appeal_url" translatable="false">https://www.xabber.com/appeal/</string>
 
-    <string name="xmpp_confirm_title">Enter confirmation code that was send to %1$s</string>
+    <string name="xmpp_confirm_title">Enter verification code that was send to %1$s</string>
     <string name="xaccount_not_exist">Will create new account</string>
     <string name="xaccount_exist">Xabber Account exists</string>
 

From 00fbafca2c93479ae0fe47ce7bcdef5f8c1c6ca9 Mon Sep 17 00:00:00 2001
From: Valery Miller <valera_miller94@mail.ru>
Date: Mon, 1 Oct 2018 17:51:40 +0500
Subject: [PATCH 187/251] Changed in translation

---
 .../xabber/android/data/xaccount/AuthManager.java   | 11 +++++++++++
 .../android/ui/fragment/XAccountLinksFragment.java  | 11 +++++++----
 .../ui/fragment/XAccountSignUpFragment1.java        | 13 +------------
 3 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/xabber/src/main/java/com/xabber/android/data/xaccount/AuthManager.java b/xabber/src/main/java/com/xabber/android/data/xaccount/AuthManager.java
index 499b602ead..e36805af64 100644
--- a/xabber/src/main/java/com/xabber/android/data/xaccount/AuthManager.java
+++ b/xabber/src/main/java/com/xabber/android/data/xaccount/AuthManager.java
@@ -317,6 +317,17 @@ private static String getSource() {
         return SOURCE_NAME + " " + BuildConfig.FLAVOR + " " + BuildConfig.VERSION_NAME;
     }
 
+    public static String getProviderName(String provider) {
+        switch (provider) {
+            case AuthManager.PROVIDER_TWITTER:
+                return "Twitter";
+            case AuthManager.PROVIDER_FACEBOOK:
+                return "Facebook";
+            default:
+                return "Google+";
+        }
+    }
+
     // models
 
     public static class SignUpFields {
diff --git a/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountLinksFragment.java b/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountLinksFragment.java
index 5b17e551e5..f31c3511d8 100644
--- a/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountLinksFragment.java
+++ b/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountLinksFragment.java
@@ -174,7 +174,7 @@ public void onEmailVerifyClick(String email) {
 
     private void onSocialUnlinkClick(final String provider) {
         AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
-        builder.setMessage(getString(R.string.title_delete_social, provider))
+        builder.setMessage(getString(R.string.title_delete_social, AuthManager.getProviderName(provider)))
                 .setPositiveButton(R.string.action_disconnect, new DialogInterface.OnClickListener() {
                     @Override
                     public void onClick(DialogInterface dialog, int which) {
@@ -216,7 +216,8 @@ private void setupSocial(List<SocialBindingDTO> socialBindings) {
                 ivGoogle.setImageResource(R.drawable.ic_google_plus);
                 tvNameGoogle.setText(socialBinding.getFirstName() + " " + socialBinding.getLastName());
                 tvNameGoogle.setVisibility(View.VISIBLE);
-                tvStatusGoogle.setText(getResources().getString(R.string.title_linked_account, "Google+"));
+                tvStatusGoogle.setText(getResources().getString(R.string.title_linked_account,
+                        AuthManager.getProviderName(socialBinding.getProvider())));
                 tvActionGoogle.setText(R.string.action_disconnect);
                 tvActionGoogle.setVisibility(View.GONE);
                 tvActionGoogle.setTextColor(getActivity().getResources().getColor(R.color.account_register_blue));
@@ -224,7 +225,8 @@ private void setupSocial(List<SocialBindingDTO> socialBindings) {
                 ivFacebook.setImageResource(R.drawable.ic_facebook);
                 tvNameFacebook.setText(socialBinding.getFirstName() + " " + socialBinding.getLastName());
                 tvNameFacebook.setVisibility(View.VISIBLE);
-                tvStatusFacebook.setText(getResources().getString(R.string.title_linked_account, "Facebook"));
+                tvStatusFacebook.setText(getResources().getString(R.string.title_linked_account,
+                        AuthManager.getProviderName(socialBinding.getProvider())));
                 tvActionFacebook.setText(R.string.action_disconnect);
                 tvActionFacebook.setVisibility(View.GONE);
                 tvActionFacebook.setTextColor(getActivity().getResources().getColor(R.color.account_register_blue));
@@ -232,7 +234,8 @@ private void setupSocial(List<SocialBindingDTO> socialBindings) {
                 ivTwitter.setImageResource(R.drawable.ic_twitter);
                 tvNameTwitter.setText(socialBinding.getFirstName() + " " + socialBinding.getLastName());
                 tvNameTwitter.setVisibility(View.VISIBLE);
-                tvStatusTwitter.setText(getResources().getString(R.string.title_linked_account, "Twitter"));
+                tvStatusTwitter.setText(getResources().getString(R.string.title_linked_account,
+                        AuthManager.getProviderName(socialBinding.getProvider())));
                 tvActionTwitter.setText(R.string.action_disconnect);
                 tvActionTwitter.setVisibility(View.GONE);
                 tvActionTwitter.setTextColor(getActivity().getResources().getColor(R.color.account_register_blue));
diff --git a/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountSignUpFragment1.java b/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountSignUpFragment1.java
index 6d8e93e7c4..900fc76f2b 100644
--- a/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountSignUpFragment1.java
+++ b/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountSignUpFragment1.java
@@ -124,7 +124,7 @@ private void setupSocial() {
         if (credentials != null && provider != null) {
             if (tvSocialProvider != null) {
                 tvSocialProvider.setVisibility(View.VISIBLE);
-                tvSocialProvider.setText(getString(R.string.signup_with_social, getProviderName(provider)));
+                tvSocialProvider.setText(getString(R.string.signup_with_social, AuthManager.getProviderName(provider)));
 
                 Drawable drawable;
                 switch (provider) {
@@ -142,17 +142,6 @@ private void setupSocial() {
         } else if (tvSocialProvider != null) tvSocialProvider.setVisibility(View.GONE);
     }
 
-    private String getProviderName(String provider) {
-        switch (provider) {
-            case AuthManager.PROVIDER_TWITTER:
-                return "Twitter";
-            case AuthManager.PROVIDER_FACEBOOK:
-                return "Facebook";
-            default:
-                return "Google+";
-        }
-    }
-
     private void onNextClick() {
         String username = edtUsername.getText().toString().trim();
 

From 3730ad806ad2102f516b175e77d71e44680ad719 Mon Sep 17 00:00:00 2001
From: Valery Miller <valera_miller94@mail.ru>
Date: Mon, 1 Oct 2018 17:52:25 +0500
Subject: [PATCH 188/251] Up version to 521

---
 xabber/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/xabber/build.gradle b/xabber/build.gradle
index ad59d01a19..3c399651b9 100644
--- a/xabber/build.gradle
+++ b/xabber/build.gradle
@@ -10,8 +10,8 @@ android {
     defaultConfig {
         minSdkVersion 15
         targetSdkVersion 27
-        versionCode 520
-        versionName '2.4.2(520)'
+        versionCode 521
+        versionName '2.4.2(521)'
     }
 
     lintOptions {

From 41743b093308c86ff12faec3e18d881acbb32aa6 Mon Sep 17 00:00:00 2001
From: Valery Miller <valera_miller94@mail.ru>
Date: Tue, 2 Oct 2018 12:02:16 +0500
Subject: [PATCH 189/251] Update dependencies Added foreground service
 permission

---
 xabber/build.gradle                 | 11 ++++++-----
 xabber/emojicon/build.gradle        | 10 +++++-----
 xabber/src/main/AndroidManifest.xml |  1 +
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/xabber/build.gradle b/xabber/build.gradle
index 3c399651b9..ce0b93ad6a 100644
--- a/xabber/build.gradle
+++ b/xabber/build.gradle
@@ -4,12 +4,12 @@ apply plugin: 'com.frogermcs.androiddevmetrics'
 apply plugin: 'io.fabric'
 
 android {
-    compileSdkVersion 27
-    buildToolsVersion '28.0.2'
+    compileSdkVersion 28
+    buildToolsVersion '28.0.3'
 
     defaultConfig {
         minSdkVersion 15
-        targetSdkVersion 27
+        targetSdkVersion 28
         versionCode 521
         versionName '2.4.2(521)'
     }
@@ -137,7 +137,7 @@ if (build_param == "dev") {
 
 ext {
     smackVersion = '4.2.1-SNAPSHOT'
-    supportVersion = '27.0.2'
+    supportVersion = '28.0.0'
 }
 
 dependencies {
@@ -151,7 +151,8 @@ dependencies {
 
     implementation "com.android.support:design:$supportVersion"
     implementation "com.android.support:support-v13:$supportVersion"
-    implementation 'com.android.support:multidex:1.0.1'
+    implementation "com.android.support:customtabs:$supportVersion"
+    implementation 'com.android.support:multidex:1.0.3'
 
     implementation 'com.github.Str4tocaster:otr4j:custom-SNAPSHOT'
     implementation 'com.google.zxing:android-integration:3.3.0'
diff --git a/xabber/emojicon/build.gradle b/xabber/emojicon/build.gradle
index cead832326..9eec85e2ef 100644
--- a/xabber/emojicon/build.gradle
+++ b/xabber/emojicon/build.gradle
@@ -1,12 +1,12 @@
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 27
-    buildToolsVersion '28.0.2'
+    compileSdkVersion 28
+    buildToolsVersion '28.0.3'
 
     defaultConfig {
-        minSdkVersion 14
-        targetSdkVersion 27
+        minSdkVersion 15
+        targetSdkVersion 28
     }
 
     buildTypes {
@@ -18,5 +18,5 @@ android {
 }
 
 dependencies {
-    implementation "com.android.support:support-v13:27.1.1"
+    implementation "com.android.support:support-v13:28.0.0"
 }
diff --git a/xabber/src/main/AndroidManifest.xml b/xabber/src/main/AndroidManifest.xml
index 618fd1d930..7e901d5aa8 100644
--- a/xabber/src/main/AndroidManifest.xml
+++ b/xabber/src/main/AndroidManifest.xml
@@ -40,6 +40,7 @@
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS" />
     <uses-permission android:name="android.permission.CAMERA" />
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
 
     <application
         android:name=".data.Application"

From 0c5866e70a5181b1cab513d1eda16a819be7c376 Mon Sep 17 00:00:00 2001
From: Valery Miller <valera_miller94@mail.ru>
Date: Tue, 2 Oct 2018 17:57:30 +0500
Subject: [PATCH 190/251] Started work on updating account-settings on push
 receiving

---
 xabber/build.gradle                           |  3 +
 xabber/src/main/AndroidManifest.xml           |  6 ++
 .../android/data/xaccount/AuthManager.java    | 12 +++
 .../android/data/xaccount/IXabberApi.java     |  3 +
 .../xabber/android/service/PushService.java   | 98 +++++++++++++++++++
 5 files changed, 122 insertions(+)
 create mode 100644 xabber/src/main/java/com/xabber/android/service/PushService.java

diff --git a/xabber/build.gradle b/xabber/build.gradle
index ce0b93ad6a..79e8958be5 100644
--- a/xabber/build.gradle
+++ b/xabber/build.gradle
@@ -154,6 +154,9 @@ dependencies {
     implementation "com.android.support:customtabs:$supportVersion"
     implementation 'com.android.support:multidex:1.0.3'
 
+    // firebase
+    compile 'com.google.firebase:firebase-messaging:11.4.0'
+
     implementation 'com.github.Str4tocaster:otr4j:custom-SNAPSHOT'
     implementation 'com.google.zxing:android-integration:3.3.0'
 
diff --git a/xabber/src/main/AndroidManifest.xml b/xabber/src/main/AndroidManifest.xml
index 7e901d5aa8..b2c0101908 100644
--- a/xabber/src/main/AndroidManifest.xml
+++ b/xabber/src/main/AndroidManifest.xml
@@ -425,6 +425,12 @@
         <service android:name=".service.XabberService" />
         <service android:name=".service.DownloadService" />
         <service android:name=".service.UploadService" />
+        <service
+            android:name=".service.PushService">
+            <intent-filter>
+                <action android:name="com.google.firebase.MESSAGING_EVENT"/>
+            </intent-filter>
+        </service>
 
         <receiver android:name=".receiver.BootReceiver">
             <intent-filter>
diff --git a/xabber/src/main/java/com/xabber/android/data/xaccount/AuthManager.java b/xabber/src/main/java/com/xabber/android/data/xaccount/AuthManager.java
index e36805af64..ffac0fa2fd 100644
--- a/xabber/src/main/java/com/xabber/android/data/xaccount/AuthManager.java
+++ b/xabber/src/main/java/com/xabber/android/data/xaccount/AuthManager.java
@@ -300,6 +300,10 @@ public static Single<ResponseBody> unbindSocial(String provider) {
         return HttpApiManager.getXabberApi().unbindSocial(getXabberTokenHeader(), new Provider(provider));
     }
 
+    public static Single<ResponseBody> registerFCMEndpoint(String endpoint) {
+        return HttpApiManager.getXabberApi().registerFCMEndpoint(getXabberTokenHeader(), new Endpoint(endpoint));
+    }
+
     // support
 
     private static String getXabberTokenHeader() {
@@ -330,6 +334,14 @@ public static String getProviderName(String provider) {
 
     // models
 
+    public static class Endpoint {
+        final String endpoint_key;
+
+        public Endpoint(String endpoint_key) {
+            this.endpoint_key = endpoint_key;
+        }
+    }
+
     public static class SignUpFields {
         final String username;
         final String host;
diff --git a/xabber/src/main/java/com/xabber/android/data/xaccount/IXabberApi.java b/xabber/src/main/java/com/xabber/android/data/xaccount/IXabberApi.java
index 3a385bf39c..860ce6523a 100644
--- a/xabber/src/main/java/com/xabber/android/data/xaccount/IXabberApi.java
+++ b/xabber/src/main/java/com/xabber/android/data/xaccount/IXabberApi.java
@@ -59,6 +59,9 @@ public interface IXabberApi {
     @DELETE("accounts/current/email_list/{email_id}/")
     Single<ResponseBody> deleteEmail(@Header("Authorization") String token, @Path(value = "email_id", encoded = true) int emailId);
 
+    @POST("fcm/subscription/")
+    Single<ResponseBody> registerFCMEndpoint(@Header("Authorization") String token, @Body AuthManager.Endpoint endpoint);
+
     /* Xabber API v2 */
 
     @POST("accounts/xmpp_code_request/")
diff --git a/xabber/src/main/java/com/xabber/android/service/PushService.java b/xabber/src/main/java/com/xabber/android/service/PushService.java
new file mode 100644
index 0000000000..f8641523b1
--- /dev/null
+++ b/xabber/src/main/java/com/xabber/android/service/PushService.java
@@ -0,0 +1,98 @@
+package com.xabber.android.service;
+
+import android.util.Base64;
+import android.util.Log;
+
+import com.google.firebase.messaging.FirebaseMessagingService;
+import com.google.firebase.messaging.RemoteMessage;
+import com.google.gson.Gson;
+import com.xabber.android.data.xaccount.XabberAccount;
+import com.xabber.android.data.xaccount.XabberAccountManager;
+
+import java.util.Map;
+
+public class PushService extends FirebaseMessagingService {
+
+    private static final String FIELD_TARGET_TYPE = "target_type";
+    private static final String FIELD_TARGET = "target";
+    private static final String FIELD_BODY = "body";
+
+    private static final String ACTION_SETTINGS_UPDATED = "settings_updated";
+    private static final String TARGET_TYPE_XACCOUNT = "xaccount";
+    private static final String TARGET_TYPE_NODE = "node";
+
+    Gson gson = new Gson();
+
+    @Override
+    public void onMessageReceived(RemoteMessage remoteMessage) {
+
+        // Check if message contains a data payload.
+        if (remoteMessage.getData().size() > 0) {
+            Map<String, String> data = remoteMessage.getData();
+            String targetType = data.get(FIELD_TARGET_TYPE);
+            String target = data.get(FIELD_TARGET);
+            String encodedBody = data.get(FIELD_BODY);
+
+            if (targetType != null && target != null && encodedBody != null) {
+                String decodedBody = new String(Base64.decode(encodedBody, Base64.NO_WRAP));
+
+                switch (targetType) {
+                    case TARGET_TYPE_XACCOUNT:
+                        onXAccountPushReceived(target, decodedBody);
+                        break;
+                    case TARGET_TYPE_NODE:
+                        onXMPPPushReceived(target, decodedBody);
+                        break;
+                    default:
+                        Log.d(PushService.class.getSimpleName(), "Unexpected target type - " + targetType);
+                }
+            }
+        }
+    }
+
+    private void onXAccountPushReceived(String target, String body) {
+        XabberAccount xabberAccount = XabberAccountManager.getInstance().getAccount();
+        if (xabberAccount != null && xabberAccount.getFullUsername().equals(target)) {
+            XAccountPushData data = gson.fromJson(body, XAccountPushData.class);
+
+            if (data != null && xabberAccount.getFullUsername().equals(data.getUsername())) {
+                switch (data.getAction()) {
+                    case ACTION_SETTINGS_UPDATED:
+                        XabberAccountManager.getInstance().updateAccountSettings();
+                        break;
+                    default:
+                        Log.d(PushService.class.getSimpleName(),
+                                "Unexpected action in Xabber Account push - " + data.getAction());
+                }
+            }
+        }
+    }
+
+    private void onXMPPPushReceived(String target, String body) {
+        /** Will be used for XMPP pushes */
+    }
+
+    private static class XAccountPushData {
+        private final String action;
+        private final String username;
+        private final String from_token;
+
+        public XAccountPushData(String action, String username, String from_token) {
+            this.action = action;
+            this.username = username;
+            this.from_token = from_token;
+        }
+
+        public String getAction() {
+            return action;
+        }
+
+        public String getUsername() {
+            return username;
+        }
+
+        public String getFromToken() {
+            return from_token;
+        }
+    }
+}

From 716b75c7a90c6167094058112e7ae5b460a9580b Mon Sep 17 00:00:00 2001
From: Valery Miller <valera_miller94@mail.ru>
Date: Wed, 3 Oct 2018 12:17:29 +0500
Subject: [PATCH 191/251] Changes in endpoint register on XMPP-auth

---
 .../data/xaccount/XMPPAuthManager.java        | 59 +++++++------------
 .../data/xaccount/XabberAccountManager.java   | 20 +++++++
 2 files changed, 40 insertions(+), 39 deletions(-)

diff --git a/xabber/src/main/java/com/xabber/android/data/xaccount/XMPPAuthManager.java b/xabber/src/main/java/com/xabber/android/data/xaccount/XMPPAuthManager.java
index 9faa390869..f26fefec7a 100644
--- a/xabber/src/main/java/com/xabber/android/data/xaccount/XMPPAuthManager.java
+++ b/xabber/src/main/java/com/xabber/android/data/xaccount/XMPPAuthManager.java
@@ -2,10 +2,8 @@
 
 import android.util.Log;
 
-import com.xabber.android.R;
 import com.xabber.android.data.Application;
 import com.xabber.android.data.NetworkException;
-import com.xabber.android.data.SettingsManager;
 import com.xabber.android.data.account.AccountManager;
 import com.xabber.android.data.connection.ConnectionItem;
 import com.xabber.android.data.connection.listeners.OnConnectedListener;
@@ -30,13 +28,13 @@
 import java.util.List;
 import java.util.Map;
 
-import rx.Subscription;
 import rx.android.schedulers.AndroidSchedulers;
 import rx.functions.Action1;
 import rx.schedulers.Schedulers;
 
 public class XMPPAuthManager implements OnPacketListener, OnConnectedListener {
 
+    private static final String LOG_TAG = XMPPAuthManager.class.getSimpleName();
     private static final String EXTENSION_NAMESPACE = "http://jabber.org/protocol/http-auth";
     private static final String ATTRIBUTE_ID = "id";
 
@@ -116,7 +114,7 @@ public void run() {
     }
 
     private void requestXMPPAuthCode(final AccountJid accountJid) {
-        Log.d(XMPPAuthManager.class.toString(), "request XMPP code for account: "
+        Log.d(LOG_TAG, "request XMPP code for account: "
                 + accountJid.getFullJid().toString());
         AuthManager.requestXMPPCode(accountJid.getFullJid().toString())
             .subscribe(new Action1<AuthManager.XMPPCode>() {
@@ -134,7 +132,7 @@ public void call(Throwable throwable) {
     }
 
     private void confirmXMPP(Request request) {
-        Log.d(XMPPAuthManager.class.toString(), "confirm account: " + request.clientJid);
+        Log.d(LOG_TAG, "confirm account: " + request.clientJid);
         AuthManager.confirmXMPP(request.clientJid, request.code)
             .subscribeOn(Schedulers.io())
             .observeOn(AndroidSchedulers.mainThread())
@@ -142,7 +140,7 @@ private void confirmXMPP(Request request) {
                 @Override
                 public void call(XabberAccount account) {
                     Log.d(XMPPAuthManager.class.toString(), "xabber account authorized successfully");
-                    handleSuccessConfirmXMPP();
+                    updateSettings();
                 }
             }, new Action1<Throwable>() {
                 @Override
@@ -152,41 +150,24 @@ public void call(Throwable throwable) {
             });
     }
 
-    private void handleSuccessConfirmXMPP() {
-        if (AccountManager.getInstance().getAllAccountItems().size() > 0)
-            updateSettings();
-        else getSettings();
-    }
-
     protected void updateSettings() {
         AuthManager.patchClientSettings(XabberAccountManager.getInstance().createSettingsList())
-                .subscribeOn(Schedulers.io())
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(new Action1<List<XMPPAccountSettings>>() {
-                    @Override
-                    public void call(List<XMPPAccountSettings> s) { }
-                }, new Action1<Throwable>() {
-                    @Override
-                    public void call(Throwable throwable) {
-                    }
-                });
-    }
-
-    protected void getSettings() {
-        AuthManager.getClientSettings()
-                .subscribeOn(Schedulers.io())
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(new Action1<List<XMPPAccountSettings>>() {
-                    @Override
-                    public void call(List<XMPPAccountSettings> settings) {
-                        XabberAccountManager.getInstance().setXmppAccountsForCreate(settings);
-                        SettingsManager.setLastSyncDate(XabberAccountManager.getCurrentTimeString());
-                    }
-                }, new Action1<Throwable>() {
-                    @Override
-                    public void call(Throwable throwable) {
-                    }
-                });
+            .subscribeOn(Schedulers.io())
+            .observeOn(AndroidSchedulers.mainThread())
+            .subscribe(new Action1<List<XMPPAccountSettings>>() {
+                @Override
+                public void call(List<XMPPAccountSettings> s) {
+                    Log.d(XMPPAuthManager.class.toString(),
+                            "xabber account settings updated successfully");
+                    XabberAccountManager.getInstance().registerEndpoint();
+                }
+            }, new Action1<Throwable>() {
+                @Override
+                public void call(Throwable throwable) {
+                    Log.d(XMPPAuthManager.class.toString(),
+                            "xabber account settings update failed: " + throwable.toString());
+                }
+            });
     }
 
     private void onRequestReceived(Request request) {
diff --git a/xabber/src/main/java/com/xabber/android/data/xaccount/XabberAccountManager.java b/xabber/src/main/java/com/xabber/android/data/xaccount/XabberAccountManager.java
index 346d6589ca..a75105a4c3 100644
--- a/xabber/src/main/java/com/xabber/android/data/xaccount/XabberAccountManager.java
+++ b/xabber/src/main/java/com/xabber/android/data/xaccount/XabberAccountManager.java
@@ -4,6 +4,7 @@
 import android.support.annotation.Nullable;
 import android.util.Log;
 
+import com.google.firebase.iid.FirebaseInstanceId;
 import com.xabber.android.data.Application;
 import com.xabber.android.data.NetworkException;
 import com.xabber.android.data.OnLoadListener;
@@ -36,6 +37,7 @@
 import io.realm.Realm;
 import io.realm.RealmList;
 import io.realm.RealmResults;
+import okhttp3.ResponseBody;
 import rx.Single;
 import rx.Subscription;
 import rx.android.schedulers.AndroidSchedulers;
@@ -772,5 +774,23 @@ else if (remoteItem.getTimestamp() > localItem.getTimestamp())
 
         return resultList;
     }
+
+    public void registerEndpoint() {
+        compositeSubscription.add(
+            AuthManager.registerFCMEndpoint(FirebaseInstanceId.getInstance().getToken())
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(new Action1<ResponseBody>() {
+                    @Override
+                    public void call(ResponseBody responseBody) {
+                        Log.d(LOG_TAG, "Endpoint successfully registered");
+                    }
+                }, new Action1<Throwable>() {
+                    @Override
+                    public void call(Throwable throwable) {
+                        Log.d(LOG_TAG, "Endpoint register failed: " + throwable.toString());
+                    }
+                }));
+    }
 }
 

From 468c7308000f2d0cd814a14e727403946ff497d5 Mon Sep 17 00:00:00 2001
From: Valery Miller <valera_miller94@mail.ru>
Date: Wed, 3 Oct 2018 12:21:29 +0500
Subject: [PATCH 192/251] Added endpoint registration on social login, email
 login and register

---
 .../com/xabber/android/ui/activity/XabberLoginActivity.java    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/xabber/src/main/java/com/xabber/android/ui/activity/XabberLoginActivity.java b/xabber/src/main/java/com/xabber/android/ui/activity/XabberLoginActivity.java
index 22ec03fbec..411418f372 100644
--- a/xabber/src/main/java/com/xabber/android/ui/activity/XabberLoginActivity.java
+++ b/xabber/src/main/java/com/xabber/android/ui/activity/XabberLoginActivity.java
@@ -430,6 +430,7 @@ public void call(Throwable throwable) {
     private void handleSuccessSignUp() {
         SignUpRepo.getInstance().clearRepo();
         hideProgress();
+        XabberAccountManager.getInstance().registerEndpoint();
         synchronize(false);
         showSignUpStep4Fragment();
     }
@@ -511,7 +512,7 @@ public void call(Throwable throwable) {
     }
 
     private void handleSuccessGetAccount(@NonNull XabberAccount xabberAccount) {
-        //hideProgress();
+        XabberAccountManager.getInstance().registerEndpoint();
         synchronize(true);
     }
 

From f24f3e07121d16c461db599b2949bb3c33b0ec07 Mon Sep 17 00:00:00 2001
From: Valery Miller <valera_miller94@mail.ru>
Date: Wed, 3 Oct 2018 12:32:55 +0500
Subject: [PATCH 193/251] Added unregister endpoint on logout and invalid token

---
 .../android/data/xaccount/AuthManager.java    |  4 ++++
 .../android/data/xaccount/IXabberApi.java     |  3 +++
 .../data/xaccount/XabberAccountManager.java   | 19 +++++++++++++++++++
 .../ui/activity/XabberAccountActivity.java    |  2 +-
 4 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/xabber/src/main/java/com/xabber/android/data/xaccount/AuthManager.java b/xabber/src/main/java/com/xabber/android/data/xaccount/AuthManager.java
index ffac0fa2fd..804a7bef77 100644
--- a/xabber/src/main/java/com/xabber/android/data/xaccount/AuthManager.java
+++ b/xabber/src/main/java/com/xabber/android/data/xaccount/AuthManager.java
@@ -304,6 +304,10 @@ public static Single<ResponseBody> registerFCMEndpoint(String endpoint) {
         return HttpApiManager.getXabberApi().registerFCMEndpoint(getXabberTokenHeader(), new Endpoint(endpoint));
     }
 
+    public static Single<ResponseBody> unregisterFCMEndpoint(String endpoint) {
+        return HttpApiManager.getXabberApi().unregisterFCMEndpoint(new Endpoint(endpoint));
+    }
+
     // support
 
     private static String getXabberTokenHeader() {
diff --git a/xabber/src/main/java/com/xabber/android/data/xaccount/IXabberApi.java b/xabber/src/main/java/com/xabber/android/data/xaccount/IXabberApi.java
index 860ce6523a..9f85c79afa 100644
--- a/xabber/src/main/java/com/xabber/android/data/xaccount/IXabberApi.java
+++ b/xabber/src/main/java/com/xabber/android/data/xaccount/IXabberApi.java
@@ -62,6 +62,9 @@ public interface IXabberApi {
     @POST("fcm/subscription/")
     Single<ResponseBody> registerFCMEndpoint(@Header("Authorization") String token, @Body AuthManager.Endpoint endpoint);
 
+    @DELETE("fcm/subscription/")
+    Single<ResponseBody> unregisterFCMEndpoint(@Body AuthManager.Endpoint endpoint);
+
     /* Xabber API v2 */
 
     @POST("accounts/xmpp_code_request/")
diff --git a/xabber/src/main/java/com/xabber/android/data/xaccount/XabberAccountManager.java b/xabber/src/main/java/com/xabber/android/data/xaccount/XabberAccountManager.java
index a75105a4c3..a0aa14e1c1 100644
--- a/xabber/src/main/java/com/xabber/android/data/xaccount/XabberAccountManager.java
+++ b/xabber/src/main/java/com/xabber/android/data/xaccount/XabberAccountManager.java
@@ -584,6 +584,7 @@ public void run() {
                 removeAccount();
             }
         });
+        unregisterEndpoint();
     }
 
     public static class XabberAccountDeletedEvent {}
@@ -792,5 +793,23 @@ public void call(Throwable throwable) {
                     }
                 }));
     }
+
+    public void unregisterEndpoint() {
+        compositeSubscription.add(
+            AuthManager.unregisterFCMEndpoint(FirebaseInstanceId.getInstance().getToken())
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(new Action1<ResponseBody>() {
+                    @Override
+                    public void call(ResponseBody responseBody) {
+                        Log.d(LOG_TAG, "Endpoint successfully unregistered");
+                    }
+                }, new Action1<Throwable>() {
+                    @Override
+                    public void call(Throwable throwable) {
+                        Log.d(LOG_TAG, "Endpoint unregister failed: " + throwable.toString());
+                    }
+                }));
+    }
 }
 
diff --git a/xabber/src/main/java/com/xabber/android/ui/activity/XabberAccountActivity.java b/xabber/src/main/java/com/xabber/android/ui/activity/XabberAccountActivity.java
index c8ce70dcaf..c0c0ae5c17 100644
--- a/xabber/src/main/java/com/xabber/android/ui/activity/XabberAccountActivity.java
+++ b/xabber/src/main/java/com/xabber/android/ui/activity/XabberAccountActivity.java
@@ -311,7 +311,7 @@ public void call(Throwable throwable) {
     private void handleSuccessLogout(ResponseBody s, boolean deleteAccounts) {
         if (deleteAccounts) XabberAccountManager.getInstance().deleteSyncedLocalAccounts();
         XabberAccountManager.getInstance().removeAccount();
-        //showLoginFragment();
+        XabberAccountManager.getInstance().unregisterEndpoint();
         hideProgress();
         Toast.makeText(this, R.string.quit_success, Toast.LENGTH_SHORT).show();
         Intent intent = ContactListActivity.createIntent(XabberAccountActivity.this);

From 11c5ee8000bb78012f9d00b7f55a082ac6f1e9f3 Mon Sep 17 00:00:00 2001
From: Valery Miller <valera_miller94@mail.ru>
Date: Wed, 3 Oct 2018 14:37:38 +0500
Subject: [PATCH 194/251] Set timestamp to 0 on account create. This fix for
 sync on login to Xabber account

---
 .../java/com/xabber/android/data/account/AccountManager.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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
index c5079e2ddb..d14eceeb96 100644
--- a/xabber/src/main/java/com/xabber/android/data/account/AccountManager.java
+++ b/xabber/src/main/java/com/xabber/android/data/account/AccountManager.java
@@ -419,7 +419,7 @@ public AccountJid addAccount(String user, String password, String token, boolean
 
         accountItem = addAccount(useCustomHost, host, port, serverName, userName,
                 storePassword, password, token, resource, getNextColorIndex(), getNextOrder(), false,
-                XabberAccountManager.getInstance().getCurrentTime(), 0, StatusMode.available,
+                0, 0, StatusMode.available,
                 SettingsManager.statusText(), enabled, true, tlsRequired ? TLSMode.required : TLSMode.enabled,
                 useCompression, useOrbot ? ProxyType.orbot : ProxyType.none, "localhost", 8080,
                 "", "", syncable, null, null, archiveMode, registerNewAccount);

From 16aa3afeb8f28ca72aa574d0ff6d0dde08f18208 Mon Sep 17 00:00:00 2001
From: Valery Miller <valera_miller94@mail.ru>
Date: Wed, 3 Oct 2018 14:41:54 +0500
Subject: [PATCH 195/251] Fixed xmpp-auth to Xabber account on XMPP-account
 connected

---
 .../android/data/account/AccountManager.java  | 20 +++++++---------
 .../data/xaccount/XMPPAuthManager.java        | 23 +++++++------------
 2 files changed, 16 insertions(+), 27 deletions(-)

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
index d14eceeb96..d00c7abbaa 100644
--- a/xabber/src/main/java/com/xabber/android/data/account/AccountManager.java
+++ b/xabber/src/main/java/com/xabber/android/data/account/AccountManager.java
@@ -21,16 +21,9 @@
 
 import com.xabber.android.R;
 import com.xabber.android.data.Application;
-import com.xabber.android.data.OnUnloadListener;
-import com.xabber.android.data.connection.ConnectionSettings;
-import com.xabber.android.data.database.MessageDatabaseManager;
-import com.xabber.android.data.database.RealmManager;
-import com.xabber.android.data.database.realm.AccountRealm;
-import com.xabber.android.data.extension.mam.LoadHistorySettings;
-import com.xabber.android.data.extension.mam.MamManager;
-import com.xabber.android.data.log.LogManager;
 import com.xabber.android.data.NetworkException;
 import com.xabber.android.data.OnLoadListener;
+import com.xabber.android.data.OnUnloadListener;
 import com.xabber.android.data.OnWipeListener;
 import com.xabber.android.data.SettingsManager;
 import com.xabber.android.data.account.listeners.OnAccountAddedListener;
@@ -41,19 +34,25 @@
 import com.xabber.android.data.account.listeners.OnAccountOnlineListener;
 import com.xabber.android.data.account.listeners.OnAccountRemovedListener;
 import com.xabber.android.data.account.listeners.OnAccountSyncableChangedListener;
+import com.xabber.android.data.connection.ConnectionSettings;
 import com.xabber.android.data.connection.ConnectionState;
 import com.xabber.android.data.connection.ProxyType;
 import com.xabber.android.data.connection.ReconnectionManager;
 import com.xabber.android.data.connection.TLSMode;
+import com.xabber.android.data.database.MessageDatabaseManager;
+import com.xabber.android.data.database.RealmManager;
+import com.xabber.android.data.database.realm.AccountRealm;
 import com.xabber.android.data.database.sqlite.AccountTable;
 import com.xabber.android.data.database.sqlite.StatusTable;
 import com.xabber.android.data.entity.AccountJid;
+import com.xabber.android.data.extension.mam.LoadHistorySettings;
+import com.xabber.android.data.extension.mam.MamManager;
 import com.xabber.android.data.extension.vcard.VCardManager;
+import com.xabber.android.data.log.LogManager;
 import com.xabber.android.data.notification.BaseAccountNotificationProvider;
 import com.xabber.android.data.notification.NotificationManager;
 import com.xabber.android.data.roster.PresenceManager;
 import com.xabber.android.data.roster.RosterManager;
-import com.xabber.android.data.xaccount.XMPPAuthManager;
 import com.xabber.android.data.xaccount.XabberAccountManager;
 
 import org.jivesoftware.smack.util.StringUtils;
@@ -437,9 +436,6 @@ storePassword, password, token, resource, getNextColorIndex(), getNextOrder(), f
                 .addAccountSyncState(accountItem.getAccount().getFullJid().asBareJid().toString(), true);
         else SettingsManager.setSyncAllAccounts(false);
 
-        // add account to check-list for Xabber Account auth
-        XMPPAuthManager.getInstance().addAccountForCheck(accountItem.getAccount());
-
         return accountItem.getAccount();
     }
 
diff --git a/xabber/src/main/java/com/xabber/android/data/xaccount/XMPPAuthManager.java b/xabber/src/main/java/com/xabber/android/data/xaccount/XMPPAuthManager.java
index f26fefec7a..b2ef14a176 100644
--- a/xabber/src/main/java/com/xabber/android/data/xaccount/XMPPAuthManager.java
+++ b/xabber/src/main/java/com/xabber/android/data/xaccount/XMPPAuthManager.java
@@ -22,7 +22,6 @@
 import org.jivesoftware.smack.packet.Stanza;
 import org.jxmpp.stringprep.XmppStringprepException;
 
-import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
@@ -39,7 +38,7 @@ public class XMPPAuthManager implements OnPacketListener, OnConnectedListener {
     private static final String ATTRIBUTE_ID = "id";
 
     private static XMPPAuthManager instance;
-    private List<AccountJid> accountsForCheck = new ArrayList<>();
+
     private Map<String, Request> requests = new HashMap<>();
 
     public static XMPPAuthManager getInstance() {
@@ -52,10 +51,6 @@ public void addRequest(String requestId, String apiJid, String clientJid) {
         addContactToRoster(apiJid, clientJid);
     }
 
-    public void addAccountForCheck(AccountJid accountJid) {
-        accountsForCheck.add(accountJid);
-    }
-
     /**
      *  StanzaId is RequestId
      * */
@@ -90,16 +85,14 @@ public void run() {
                 XabberAccount xabberAccount = XabberAccountManager.getInstance().getAccount();
                 AccountJid accountJid = connection.getAccount();
                 if (xabberAccount == null) {
-                    if (accountsForCheck.contains(accountJid)) {
-                        try {
-                            Thread.sleep(1000);
-                        } catch (InterruptedException e) {
-                            e.printStackTrace();
-                        }
-                        if (PrivateStorageManager.getInstance().haveXabberAccountBinding(accountJid))
-                            requestXMPPAuthCode(accountJid);
-                        accountsForCheck.remove(accountJid);
+                    try {
+                        Thread.sleep(1000);
+                    } catch (InterruptedException e) {
+                        e.printStackTrace();
                     }
+                    if (PrivateStorageManager.getInstance().haveXabberAccountBinding(accountJid))
+                        requestXMPPAuthCode(accountJid);
+
                 } else if (xabberAccount.getFullUsername()
                         .equals(AccountManager.getInstance().getVerboseName(accountJid))) {
                     try {

From d42119bc18266d224e96c0aa960d46e2f62bf65a Mon Sep 17 00:00:00 2001
From: Valery Miller <valera_miller94@mail.ru>
Date: Wed, 3 Oct 2018 15:19:17 +0500
Subject: [PATCH 196/251] Fixed unregister endpoint function

---
 .../java/com/xabber/android/data/xaccount/AuthManager.java | 7 +++++++
 .../java/com/xabber/android/data/xaccount/IXabberApi.java  | 2 +-
 .../xabber/android/ui/activity/XabberAccountActivity.java  | 1 -
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/xabber/src/main/java/com/xabber/android/data/xaccount/AuthManager.java b/xabber/src/main/java/com/xabber/android/data/xaccount/AuthManager.java
index 804a7bef77..6550861d3c 100644
--- a/xabber/src/main/java/com/xabber/android/data/xaccount/AuthManager.java
+++ b/xabber/src/main/java/com/xabber/android/data/xaccount/AuthManager.java
@@ -2,6 +2,7 @@
 
 import android.util.Base64;
 
+import com.google.firebase.iid.FirebaseInstanceId;
 import com.xabber.android.BuildConfig;
 import com.xabber.android.data.SettingsManager;
 import com.xabber.android.data.entity.AccountJid;
@@ -61,6 +62,12 @@ public Single<? extends ResponseBody> call(ResponseBody responseBody) {
                         else
                             return Single.error(new Throwable("Realm: xabber account deletion error"));
                     }
+                })
+                .flatMap(new Func1<ResponseBody, Single<? extends ResponseBody>>() {
+                    @Override
+                    public Single<? extends ResponseBody> call(ResponseBody responseBody) {
+                        return unregisterFCMEndpoint(FirebaseInstanceId.getInstance().getToken());
+                    }
                 });
     }
 
diff --git a/xabber/src/main/java/com/xabber/android/data/xaccount/IXabberApi.java b/xabber/src/main/java/com/xabber/android/data/xaccount/IXabberApi.java
index 9f85c79afa..ad61ddcd2c 100644
--- a/xabber/src/main/java/com/xabber/android/data/xaccount/IXabberApi.java
+++ b/xabber/src/main/java/com/xabber/android/data/xaccount/IXabberApi.java
@@ -62,7 +62,7 @@ public interface IXabberApi {
     @POST("fcm/subscription/")
     Single<ResponseBody> registerFCMEndpoint(@Header("Authorization") String token, @Body AuthManager.Endpoint endpoint);
 
-    @DELETE("fcm/subscription/")
+    @HTTP(method = "DELETE", path = "fcm/subscription/", hasBody = true)
     Single<ResponseBody> unregisterFCMEndpoint(@Body AuthManager.Endpoint endpoint);
 
     /* Xabber API v2 */
diff --git a/xabber/src/main/java/com/xabber/android/ui/activity/XabberAccountActivity.java b/xabber/src/main/java/com/xabber/android/ui/activity/XabberAccountActivity.java
index c0c0ae5c17..6347a228c8 100644
--- a/xabber/src/main/java/com/xabber/android/ui/activity/XabberAccountActivity.java
+++ b/xabber/src/main/java/com/xabber/android/ui/activity/XabberAccountActivity.java
@@ -311,7 +311,6 @@ public void call(Throwable throwable) {
     private void handleSuccessLogout(ResponseBody s, boolean deleteAccounts) {
         if (deleteAccounts) XabberAccountManager.getInstance().deleteSyncedLocalAccounts();
         XabberAccountManager.getInstance().removeAccount();
-        XabberAccountManager.getInstance().unregisterEndpoint();
         hideProgress();
         Toast.makeText(this, R.string.quit_success, Toast.LENGTH_SHORT).show();
         Intent intent = ContactListActivity.createIntent(XabberAccountActivity.this);

From 0449fcff1b8c82e797ea86ca7e3c5441a0fc21d2 Mon Sep 17 00:00:00 2001
From: Valery Miller <valera_miller94@mail.ru>
Date: Wed, 3 Oct 2018 15:59:43 +0500
Subject: [PATCH 197/251] Added new preference - auto login to Xabber Account
 via XMPP. On logout this preference set to false, on XMPP-login set to true;

---
 .../java/com/xabber/android/data/SettingsManager.java    | 9 +++++++++
 .../xabber/android/data/xaccount/XMPPAuthManager.java    | 4 ++++
 .../android/ui/activity/XabberAccountActivity.java       | 2 ++
 xabber/src/main/res/values/preference_editor.xml         | 1 +
 xabber/src/main/res/values/preferences.xml               | 3 +++
 xabber/src/main/res/xml/preference_editor.xml            | 6 +++++-
 6 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/xabber/src/main/java/com/xabber/android/data/SettingsManager.java b/xabber/src/main/java/com/xabber/android/data/SettingsManager.java
index 16f0979c70..ddfbad7016 100644
--- a/xabber/src/main/java/com/xabber/android/data/SettingsManager.java
+++ b/xabber/src/main/java/com/xabber/android/data/SettingsManager.java
@@ -468,6 +468,15 @@ public static boolean connectionWakeLock() {
                 R.bool.connection_wake_lock_default);
     }
 
+    public static boolean autoLoginToXabberAccount() {
+        return getBoolean(R.string.auto_login_to_xabber_account_key,
+                R.bool.auto_login_to_xabber_account_default);
+    }
+
+    public static void setAutoLoginToXabberAccount(boolean value) {
+        setBoolean(R.string.auto_login_to_xabber_account_key, value);
+    }
+
     public static boolean connectionStartAtBoot() {
         return getBoolean(R.string.connection_start_at_boot_key,
                 R.bool.connection_start_at_boot_default);
diff --git a/xabber/src/main/java/com/xabber/android/data/xaccount/XMPPAuthManager.java b/xabber/src/main/java/com/xabber/android/data/xaccount/XMPPAuthManager.java
index b2ef14a176..687f2f1d42 100644
--- a/xabber/src/main/java/com/xabber/android/data/xaccount/XMPPAuthManager.java
+++ b/xabber/src/main/java/com/xabber/android/data/xaccount/XMPPAuthManager.java
@@ -4,6 +4,7 @@
 
 import com.xabber.android.data.Application;
 import com.xabber.android.data.NetworkException;
+import com.xabber.android.data.SettingsManager;
 import com.xabber.android.data.account.AccountManager;
 import com.xabber.android.data.connection.ConnectionItem;
 import com.xabber.android.data.connection.listeners.OnConnectedListener;
@@ -79,6 +80,8 @@ public void onStanza(ConnectionItem connection, Stanza packet) {
 
     @Override
     public void onConnected(final ConnectionItem connection) {
+        if (!SettingsManager.autoLoginToXabberAccount()) return;
+
         Application.getInstance().runInBackground(new Runnable() {
             @Override
             public void run() {
@@ -133,6 +136,7 @@ private void confirmXMPP(Request request) {
                 @Override
                 public void call(XabberAccount account) {
                     Log.d(XMPPAuthManager.class.toString(), "xabber account authorized successfully");
+                    SettingsManager.setAutoLoginToXabberAccount(true);
                     updateSettings();
                 }
             }, new Action1<Throwable>() {
diff --git a/xabber/src/main/java/com/xabber/android/ui/activity/XabberAccountActivity.java b/xabber/src/main/java/com/xabber/android/ui/activity/XabberAccountActivity.java
index 6347a228c8..772436bfd1 100644
--- a/xabber/src/main/java/com/xabber/android/ui/activity/XabberAccountActivity.java
+++ b/xabber/src/main/java/com/xabber/android/ui/activity/XabberAccountActivity.java
@@ -19,6 +19,7 @@
 import android.widget.Toast;
 
 import com.xabber.android.R;
+import com.xabber.android.data.SettingsManager;
 import com.xabber.android.data.connection.NetworkManager;
 import com.xabber.android.data.xaccount.AuthManager;
 import com.xabber.android.data.xaccount.XMPPAuthManager;
@@ -310,6 +311,7 @@ public void call(Throwable throwable) {
 
     private void handleSuccessLogout(ResponseBody s, boolean deleteAccounts) {
         if (deleteAccounts) XabberAccountManager.getInstance().deleteSyncedLocalAccounts();
+        SettingsManager.setAutoLoginToXabberAccount(false);
         XabberAccountManager.getInstance().removeAccount();
         hideProgress();
         Toast.makeText(this, R.string.quit_success, Toast.LENGTH_SHORT).show();
diff --git a/xabber/src/main/res/values/preference_editor.xml b/xabber/src/main/res/values/preference_editor.xml
index 7c893864c9..d13344e226 100644
--- a/xabber/src/main/res/values/preference_editor.xml
+++ b/xabber/src/main/res/values/preference_editor.xml
@@ -87,6 +87,7 @@
     <string name="connection_start_at_boot">Start when Android boots\nStart the application when Android boots. This doesn\'t work when Xabber is installed on SD card.</string>
     <string name="connection_wake_lock">Prevent sleep mode\nPrevent the device from sleeping. This will increase battery usage.</string>
     <string name="connection_wifi_lock">Keep WiFi awake\nKeep WiFi active on standby. This will increase battery usage</string>
+    <string name="auto_login_to_xabber_account">Auto login to Xabber Account\nAuto login to Xabber account via XMPP-account</string>
 
     <string name="contacts_reset_offline">Reset offline settings\nClear individual settings for groups and accounts</string>
     <string name="contacts_reset_offline_warning">Do you really want to clear individual settings for groups and accounts?</string>
diff --git a/xabber/src/main/res/values/preferences.xml b/xabber/src/main/res/values/preferences.xml
index c1058b08c8..74c0e27f06 100644
--- a/xabber/src/main/res/values/preferences.xml
+++ b/xabber/src/main/res/values/preferences.xml
@@ -269,6 +269,9 @@
     <string name="chats_attention_sound_default">@string/default_sound</string>
 
 <!-- preference_connection -->
+    <string name="auto_login_to_xabber_account_key">auto_login_to_xabber_account</string>
+    <bool name="auto_login_to_xabber_account_default">true</bool>
+
     <string name="connection_start_at_boot_key">connection_start_at_boot</string>
     <bool name="connection_start_at_boot_default">false</bool>
 
diff --git a/xabber/src/main/res/xml/preference_editor.xml b/xabber/src/main/res/xml/preference_editor.xml
index 33dd34650a..14d508cc1a 100644
--- a/xabber/src/main/res/xml/preference_editor.xml
+++ b/xabber/src/main/res/xml/preference_editor.xml
@@ -50,7 +50,11 @@
 
     <PreferenceCategory
         android:title="@string/category_settings">
-
+    <CheckBoxPreference
+        android:title="@string/auto_login_to_xabber_account"
+        android:key="@string/auto_login_to_xabber_account_key"
+        android:defaultValue="@bool/auto_login_to_xabber_account_default"
+        />
     <CheckBoxPreference
         android:title="@string/connection_start_at_boot"
         android:key="@string/connection_start_at_boot_key"

From 667739ee6e687f41372d11b19151666479c86e04 Mon Sep 17 00:00:00 2001
From: Valery Miller <valera_miller94@mail.ru>
Date: Wed, 3 Oct 2018 16:19:06 +0500
Subject: [PATCH 198/251] Fixed updating color of ui elements on xmpp-account
 settings changed

---
 .../android/ui/activity/ContactListActivity.java    |  2 ++
 .../xabber/android/ui/fragment/ChatFragment.java    | 13 ++++++++++++-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/xabber/src/main/java/com/xabber/android/ui/activity/ContactListActivity.java b/xabber/src/main/java/com/xabber/android/ui/activity/ContactListActivity.java
index b372644528..e2324affc6 100644
--- a/xabber/src/main/java/com/xabber/android/ui/activity/ContactListActivity.java
+++ b/xabber/src/main/java/com/xabber/android/ui/activity/ContactListActivity.java
@@ -321,6 +321,7 @@ protected void onResume() {
         }
 
         rebuildAccountToggle();
+        setStatusBarColor();
         Application.getInstance().addUIListener(OnAccountChangedListener.class, this);
 
         if (action != null) {
@@ -682,6 +683,7 @@ private void createShortcut(AbstractContact abstractContact) {
     @Override
     public void onAccountsChanged(Collection<AccountJid> accounts) {
         rebuildAccountToggle();
+        setStatusBarColor();
     }
 
     @Override
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
index ba5d12de24..aa972608a3 100644
--- a/xabber/src/main/java/com/xabber/android/ui/fragment/ChatFragment.java
+++ b/xabber/src/main/java/com/xabber/android/ui/fragment/ChatFragment.java
@@ -51,6 +51,7 @@
 import com.xabber.android.data.SettingsManager;
 import com.xabber.android.data.account.AccountItem;
 import com.xabber.android.data.account.AccountManager;
+import com.xabber.android.data.account.listeners.OnAccountChangedListener;
 import com.xabber.android.data.database.messagerealm.Attachment;
 import com.xabber.android.data.database.messagerealm.MessageItem;
 import com.xabber.android.data.database.messagerealm.SyncInfo;
@@ -113,6 +114,7 @@
 import java.io.File;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
@@ -132,7 +134,7 @@ public class ChatFragment extends Fragment implements PopupMenu.OnMenuItemClickL
         View.OnClickListener, Toolbar.OnMenuItemClickListener,
         ChatMessageAdapter.Message.MessageClickListener, HttpUploadListener,
         ChatMessageAdapter.Listener, AdapterView.OnItemClickListener, PopupWindow.OnDismissListener,
-        AttachDialog.Listener {
+        AttachDialog.Listener, OnAccountChangedListener {
 
     public static final String ARGUMENT_ACCOUNT = "ARGUMENT_ACCOUNT";
     public static final String ARGUMENT_USER = "ARGUMENT_USER";
@@ -411,6 +413,8 @@ public void onResume() {
         showHideNotifyIfNeed();
 
         showJoinButtonIfNeed();
+
+        Application.getInstance().addUIListener(OnAccountChangedListener.class, this);
     }
 
     @Override
@@ -421,6 +425,8 @@ public void onPause() {
 
         saveInputState();
         saveScrollState();
+
+        Application.getInstance().removeUIListener(OnAccountChangedListener.class, this);
     }
 
     @Override
@@ -1448,6 +1454,11 @@ public boolean onMenuItemClick(MenuItem item) {
         popupMenu.show();
     }
 
+    @Override
+    public void onAccountsChanged(Collection<AccountJid> accounts) {
+        chatMessageAdapter.notifyDataSetChanged();
+    }
+
     private void onShareClick(Attachment attachment) {
         if (attachment == null) return;
         String path = attachment.getFilePath();

From 22c1c06b57f8c5ff6f6802d5ade60b62c7f3d0bb Mon Sep 17 00:00:00 2001
From: Valery Miller <valera_miller94@mail.ru>
Date: Wed, 3 Oct 2018 17:16:04 +0500
Subject: [PATCH 199/251] Translation changed

---
 xabber/src/main/res/values/xabber_account.xml | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/xabber/src/main/res/values/xabber_account.xml b/xabber/src/main/res/values/xabber_account.xml
index f147caac05..32160b0f4d 100644
--- a/xabber/src/main/res/values/xabber_account.xml
+++ b/xabber/src/main/res/values/xabber_account.xml
@@ -27,7 +27,7 @@
     <string name="set_phone_success">Confirmation code sent</string>
 
     <string name="social_bind_success">Social network linked successfully</string>
-    <string name="social_bind_fail">Can\'t link this social account. Perhaps it is already using by another Xabber-account</string>
+    <string name="social_bind_fail">This account is already linked with different Xabber Account</string>
     <string name="social_unbind_success">Social network unlink successfully</string>
     <string name="social_unbind_fail">Social network unlink failed</string>
 
@@ -54,7 +54,6 @@
     <string name="progress_title_account_list">Loading list of accounts..</string>
     <string name="progress_title_connect">Connecting to Xabber Account via %1$s</string>
 
-    <string name="label_username">Pick your username and host</string>
     <string name="hint_username">Username</string>
     <string name="label_pass">Choose password</string>
     <string name="hint_pass">Enter password</string>
@@ -134,7 +133,7 @@
     <string name="username_rules_first_symbol">Username must start with letter</string>
     <string name="username_rules_dots">Username must not contain two dots in a row</string>
     <string name="sync_security_description">Your passwords are never synchronized and are safe from theft. But you have to enter them on every device (unless you use tokens, which you should)</string>
-    <string name="xmpp_auth_description">Chosen XMPP account would be used to sign in to Xabber Account. By signing in you accept our privacy policy and terms of service.</string>
+    <string name="xmpp_auth_description">Selected XMPP account will be used to sign in to Xabber Account. By signing in you accept our privacy policy and terms of service.</string>
     <string name="xmpp_auth_no_account">All your XMPP accounts are disabled</string>
 
     <string name="sync_with_xabber_account">Synchronize with Xabber account</string>
@@ -217,14 +216,14 @@
     <string name="patreon_current_goal" translatable="false">Goal: %1$s</string>
     <string name="patreon_appeal_url" translatable="false">https://www.xabber.com/appeal/</string>
 
-    <string name="xmpp_confirm_title">Enter verification code that was send to %1$s</string>
+    <string name="xmpp_confirm_title">Enter verification code that was sent to %1$s</string>
     <string name="xaccount_not_exist">Will create new account</string>
     <string name="xaccount_exist">Xabber Account exists</string>
 
-    <string name="title_signup_step_1">Step 1 of 4. Pick username and host</string>
+    <string name="title_signup_step_1">Step 1 of 4. Pick username and domain</string>
     <string name="title_signup_step_2">Step 2 of 4. Set password</string>
     <string name="title_signup_step_3">Step 3 of 4. Accept privacy policy</string>
-    <string name="title_signup_step_4">Step 4 of 4. Set social links</string>
+    <string name="title_signup_step_4">Step 4 of 4. Secure your account</string>
     <string name="title_login_email">Login via email</string>
 
     <string name="license_url" translatable="false">https://www.xabber.com/policy/</string>

From 71473c0f735a343ecdcbd9bcf174ac168a4919a4 Mon Sep 17 00:00:00 2001
From: Valery Miller <valera_miller94@mail.ru>
Date: Wed, 3 Oct 2018 18:04:58 +0500
Subject: [PATCH 200/251] Changes in xmpp-auth ui

---
 .../ui/adapter/XMPPAccountAuthAdapter.java    |  5 +-
 .../fragment/XAccountXMPPLoginFragment.java   | 62 ++++++++++++++-----
 .../layout/fragment_xaccount_xmpp_auth.xml    | 23 ++++++-
 .../res/layout/item_xmpp_account_choose.xml   |  7 ++-
 xabber/src/main/res/values/xabber_account.xml |  2 +-
 5 files changed, 78 insertions(+), 21 deletions(-)

diff --git a/xabber/src/main/java/com/xabber/android/ui/adapter/XMPPAccountAuthAdapter.java b/xabber/src/main/java/com/xabber/android/ui/adapter/XMPPAccountAuthAdapter.java
index e45ea1f70a..22410b0c22 100644
--- a/xabber/src/main/java/com/xabber/android/ui/adapter/XMPPAccountAuthAdapter.java
+++ b/xabber/src/main/java/com/xabber/android/ui/adapter/XMPPAccountAuthAdapter.java
@@ -31,7 +31,7 @@ public XMPPAccountAuthAdapter(Listener listener) {
     }
 
     public interface Listener {
-        void onAccountClick(String accountJid);
+        void onAccountClick(AccountJid accountJid);
     }
 
     public void setItems(List<AccountView> items) {
@@ -60,7 +60,6 @@ public void onBindViewHolder(RecyclerView.ViewHolder holder, int position) {
 
         // set jid
         final String accountJid = account.getAccount().getFullJid().asBareJid().toString();
-        final String fullJid = account.getAccount().getFullJid().toString();
         viewHolder.jid.setText(accountJid);
 
         // set action
@@ -70,7 +69,7 @@ public void onBindViewHolder(RecyclerView.ViewHolder holder, int position) {
         viewHolder.itemView.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                listener.onAccountClick(fullJid);
+                listener.onAccountClick(account.getAccount());
             }
         });
     }
diff --git a/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountXMPPLoginFragment.java b/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountXMPPLoginFragment.java
index da830319e4..2dfe76c499 100644
--- a/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountXMPPLoginFragment.java
+++ b/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountXMPPLoginFragment.java
@@ -9,13 +9,16 @@
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.ImageView;
 import android.widget.TextView;
 
 import com.xabber.android.R;
 import com.xabber.android.data.account.AccountManager;
 import com.xabber.android.data.entity.AccountJid;
+import com.xabber.android.data.extension.avatar.AvatarManager;
 import com.xabber.android.data.extension.privatestorage.PrivateStorageManager;
 import com.xabber.android.ui.adapter.XMPPAccountAuthAdapter;
+import com.xabber.android.ui.color.ColorManager;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -28,8 +31,14 @@
 public class XAccountXMPPLoginFragment extends Fragment implements XMPPAccountAuthAdapter.Listener {
 
     private View progressView;
-    private TextView tvProgressTitle;
     private TextView tvError;
+    private TextView tvTitle;
+
+    private View loginProgressView;
+    private TextView tvAccountJidInLoginProgressView;
+    private TextView tvActionInLoginProgressView;
+    private ImageView ivAvatarInLoginProgressView;
+
     private XMPPAccountAuthAdapter adapter;
     private RecyclerView recyclerView;
 
@@ -55,8 +64,14 @@ public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container,
     public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
         progressView = view.findViewById(R.id.progressView);
-        tvProgressTitle = view.findViewById(R.id.tvProgressTitle);
+        tvTitle = view.findViewById(R.id.tvTitle);
         tvError = view.findViewById(R.id.tvError);
+
+        loginProgressView = view.findViewById(R.id.loginProgressView);
+        tvAccountJidInLoginProgressView = loginProgressView.findViewById(R.id.tvAccountJid);
+        tvActionInLoginProgressView = loginProgressView.findViewById(R.id.tvAction);
+        ivAvatarInLoginProgressView = loginProgressView.findViewById(R.id.avatar);
+
         recyclerView = view.findViewById(R.id.rlAccounts);
         adapter = new XMPPAccountAuthAdapter(this);
         recyclerView.setLayoutManager(new LinearLayoutManager(getActivity()));
@@ -90,47 +105,66 @@ public void onResume() {
     }
 
     @Override
-    public void onAccountClick(String accountJid) {
+    public void onAccountClick(AccountJid accountJid) {
         connectViaJid(accountJid);
     }
 
     private void loadData() {
         tvError.setVisibility(View.GONE);
         recyclerView.setVisibility(View.GONE);
+        tvTitle.setVisibility(View.GONE);
 
         ArrayList<AccountJid> accounts = new ArrayList<>(AccountManager.getInstance().getEnabledAccounts());
         if (accounts.size() < 1) tvError.setVisibility(View.VISIBLE);
         else if (accounts.size() > 1) loadBindings(accounts);
-        else connectViaJid(accounts.get(0).getFullJid().toString());
+        else connectViaJid(accounts.get(0));
     }
 
     private void loadBindings(ArrayList<AccountJid> accounts) {
-        showProgress(getActivity().getResources().getString(R.string.progress_title_account_list));
+        showProgress(true);
         compositeSubscription.add(PrivateStorageManager.getInstance().getAccountViewWithBindings(accounts)
             .subscribeOn(Schedulers.io())
             .observeOn(AndroidSchedulers.mainThread())
             .subscribe(new Action1<List<XMPPAccountAuthAdapter.AccountView>>() {
                 @Override
                 public void call(List<XMPPAccountAuthAdapter.AccountView> accountViews) {
-                    hideProgress();
+                    showProgress(false);
                     adapter.setItems(accountViews);
                     recyclerView.setVisibility(View.VISIBLE);
+                    tvTitle.setVisibility(View.VISIBLE);
                 }
             }));
     }
 
-    private void showProgress(String title) {
-        tvProgressTitle.setText(title);
-        progressView.setVisibility(View.VISIBLE);
+    private void showProgress(boolean show) {
+        progressView.setVisibility(show ? View.VISIBLE : View.GONE);
     }
 
-    private void hideProgress() {
-        progressView.setVisibility(View.GONE);
+    private void showLoginProgress(AccountJid account) {
+
+        // set color
+        tvAccountJidInLoginProgressView.setTextColor(ColorManager.getInstance().getAccountPainter().
+                getAccountMainColor(account));
+
+        // set avatar
+        ivAvatarInLoginProgressView.setImageDrawable(
+                AvatarManager.getInstance().getAccountAvatar(account));
+
+        // set jid
+        final String accountJid = account.getFullJid().asBareJid().toString();
+        tvAccountJidInLoginProgressView.setText(accountJid);
+
+        // set action
+        tvActionInLoginProgressView.setText(R.string.progress_title_connect);
+
+        // show view
+        loginProgressView.setVisibility(View.VISIBLE);
     }
 
-    private void connectViaJid(String jid) {
+    private void connectViaJid(AccountJid jid) {
         recyclerView.setVisibility(View.GONE);
-        showProgress(getActivity().getResources().getString(R.string.progress_title_connect, jid));
-        listener.onAccountClick(jid);
+        tvTitle.setVisibility(View.GONE);
+        showLoginProgress(jid);
+        listener.onAccountClick(jid.getFullJid().toString());
     }
 }
diff --git a/xabber/src/main/res/layout/fragment_xaccount_xmpp_auth.xml b/xabber/src/main/res/layout/fragment_xaccount_xmpp_auth.xml
index 2eb5a82af8..f323576a64 100644
--- a/xabber/src/main/res/layout/fragment_xaccount_xmpp_auth.xml
+++ b/xabber/src/main/res/layout/fragment_xaccount_xmpp_auth.xml
@@ -18,6 +18,7 @@
             android:layout_height="wrap_content">
 
             <TextView
+                android:id="@+id/tvTitle"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:textAppearance="?android:attr/textAppearanceMedium"
@@ -55,7 +56,6 @@
                     />
 
                 <TextView
-                    android:id="@+id/tvProgressTitle"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:text="@string/progress_title_account_list"
@@ -65,6 +65,27 @@
 
             </LinearLayout>
 
+            <LinearLayout
+                android:id="@+id/loginProgressView"
+                android:orientation="horizontal"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_horizontal"
+                android:visibility="gone"
+                android:padding="16dp"
+                >
+
+                <include layout="@layout/item_xmpp_account_choose"/>
+
+                <ProgressBar
+                    android:layout_width="32dp"
+                    android:layout_height="32dp"
+                    android:layout_gravity="center_vertical"
+                    android:layout_marginLeft="16dp"
+                    />
+
+            </LinearLayout>
+
             <android.support.v7.widget.RecyclerView
                 android:id="@+id/rlAccounts"
                 android:layout_width="match_parent"
diff --git a/xabber/src/main/res/layout/item_xmpp_account_choose.xml b/xabber/src/main/res/layout/item_xmpp_account_choose.xml
index ed3d04d828..4ac3a04999 100644
--- a/xabber/src/main/res/layout/item_xmpp_account_choose.xml
+++ b/xabber/src/main/res/layout/item_xmpp_account_choose.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:orientation="horizontal"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
@@ -26,14 +27,16 @@
             android:layout_height="wrap_content"
             android:singleLine="true"
             android:textColor="@color/black_text"
-            android:textSize="18sp" />
+            android:textSize="18sp"
+            tools:text="@tools:sample/full_names" />
 
         <TextView
             android:id="@+id/tvAction"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:textColor="@color/grey_500"
-            android:textSize="14sp" />
+            android:textSize="14sp"
+            tools:text="@tools:sample/lorem" />
     </LinearLayout>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/xabber/src/main/res/values/xabber_account.xml b/xabber/src/main/res/values/xabber_account.xml
index 32160b0f4d..cabcc0c800 100644
--- a/xabber/src/main/res/values/xabber_account.xml
+++ b/xabber/src/main/res/values/xabber_account.xml
@@ -52,7 +52,7 @@
     <string name="progress_title_bind_social">Authenticating..</string>
     <string name="progress_title_unbind_social">Unlink social network</string>
     <string name="progress_title_account_list">Loading list of accounts..</string>
-    <string name="progress_title_connect">Connecting to Xabber Account via %1$s</string>
+    <string name="progress_title_connect">Connecting to Xabber Account</string>
 
     <string name="hint_username">Username</string>
     <string name="label_pass">Choose password</string>

From 6f469cfd872de81718366025764cd5879e6a77f9 Mon Sep 17 00:00:00 2001
From: Valery Miller <valera_miller94@mail.ru>
Date: Wed, 3 Oct 2018 18:16:53 +0500
Subject: [PATCH 201/251] Changes in email verification dialog

---
 xabber/src/main/res/layout/dialog_confirm_email.xml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/xabber/src/main/res/layout/dialog_confirm_email.xml b/xabber/src/main/res/layout/dialog_confirm_email.xml
index 0e49dfb2f6..563fa2b2a3 100644
--- a/xabber/src/main/res/layout/dialog_confirm_email.xml
+++ b/xabber/src/main/res/layout/dialog_confirm_email.xml
@@ -17,7 +17,10 @@
         android:id="@+id/edtCode"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:hint="code"
+        android:inputType="number"
+        android:maxLength="6"
+        android:textSize="40sp"
+        android:gravity="center"
         />
 
 </LinearLayout>
\ No newline at end of file

From 070606f2fc180a644ce101427e0f8a659c260c86 Mon Sep 17 00:00:00 2001
From: Valery Miller <valera_miller94@mail.ru>
Date: Wed, 3 Oct 2018 18:36:49 +0500
Subject: [PATCH 202/251] Up version to 522

---
 xabber/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/xabber/build.gradle b/xabber/build.gradle
index 79e8958be5..02159ca675 100644
--- a/xabber/build.gradle
+++ b/xabber/build.gradle
@@ -10,8 +10,8 @@ android {
     defaultConfig {
         minSdkVersion 15
         targetSdkVersion 28
-        versionCode 521
-        versionName '2.4.2(521)'
+        versionCode 522
+        versionName '2.4.2(522)'
     }
 
     lintOptions {

From ed3e883c32a789605c3fb9367afc1b1c879d9854 Mon Sep 17 00:00:00 2001
From: Valery Miller <valera_miller94@mail.ru>
Date: Thu, 4 Oct 2018 17:51:17 +0500
Subject: [PATCH 203/251] Changes in email verification dialog

---
 .../android/ui/dialog/ConfirmEmailDialogFragment.java       | 6 ++++++
 xabber/src/main/res/layout/dialog_confirm_email.xml         | 3 ++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/xabber/src/main/java/com/xabber/android/ui/dialog/ConfirmEmailDialogFragment.java b/xabber/src/main/java/com/xabber/android/ui/dialog/ConfirmEmailDialogFragment.java
index af37229339..84b86ddd13 100644
--- a/xabber/src/main/java/com/xabber/android/ui/dialog/ConfirmEmailDialogFragment.java
+++ b/xabber/src/main/java/com/xabber/android/ui/dialog/ConfirmEmailDialogFragment.java
@@ -8,6 +8,8 @@
 import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.View;
+import android.view.Window;
+import android.view.WindowManager;
 import android.widget.EditText;
 import android.widget.TextView;
 
@@ -78,6 +80,10 @@ public void onSaveInstanceState(Bundle outState) {
     @Override
     public void onActivityCreated(Bundle savedInstanceState) {
         super.onActivityCreated(savedInstanceState);
+        Window window = getDialog().getWindow();
+        if (window != null)
+            window.setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_VISIBLE);
+
         if (savedInstanceState != null)
             email = savedInstanceState.getString(KEY_EMAIL);
     }
diff --git a/xabber/src/main/res/layout/dialog_confirm_email.xml b/xabber/src/main/res/layout/dialog_confirm_email.xml
index 563fa2b2a3..45c219d6c6 100644
--- a/xabber/src/main/res/layout/dialog_confirm_email.xml
+++ b/xabber/src/main/res/layout/dialog_confirm_email.xml
@@ -15,11 +15,12 @@
 
     <EditText
         android:id="@+id/edtCode"
-        android:layout_width="match_parent"
+        android:layout_width="150dp"
         android:layout_height="wrap_content"
         android:inputType="number"
         android:maxLength="6"
         android:textSize="40sp"
+        android:layout_gravity="center"
         android:gravity="center"
         />
 

From 0ce9c5aed973fc8c7a1193018bc88f61e1dcefee Mon Sep 17 00:00:00 2001
From: Valery Miller <valera_miller94@mail.ru>
Date: Thu, 4 Oct 2018 18:02:38 +0500
Subject: [PATCH 204/251] Removed synced toasts

---
 .../com/xabber/android/ui/activity/BaseLoginActivity.java     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/xabber/src/main/java/com/xabber/android/ui/activity/BaseLoginActivity.java b/xabber/src/main/java/com/xabber/android/ui/activity/BaseLoginActivity.java
index d2d421bdc8..e296686cc2 100644
--- a/xabber/src/main/java/com/xabber/android/ui/activity/BaseLoginActivity.java
+++ b/xabber/src/main/java/com/xabber/android/ui/activity/BaseLoginActivity.java
@@ -304,7 +304,7 @@ public void call(List<XMPPAccountSettings> s) {
                         hideProgress();
                         updateLastSyncTime();
                         onSynchronized();
-                        Toast.makeText(BaseLoginActivity.this, R.string.sync_success, Toast.LENGTH_SHORT).show();
+                        //Toast.makeText(BaseLoginActivity.this, R.string.sync_success, Toast.LENGTH_SHORT).show();
                         if (needGoToMainActivity) goToMainActivity();
                     }
                 }, new Action1<Throwable>() {
@@ -331,7 +331,7 @@ public void call(List<XMPPAccountSettings> settings) {
                         // update last synchronization time
                         SettingsManager.setLastSyncDate(XabberAccountManager.getCurrentTimeString());
                         onSynchronized();
-                        Toast.makeText(BaseLoginActivity.this, R.string.sync_success, Toast.LENGTH_SHORT).show();
+                        //Toast.makeText(BaseLoginActivity.this, R.string.sync_success, Toast.LENGTH_SHORT).show();
                         if (needGoToMainActivity) goToMainActivity();
                     }
                 }, new Action1<Throwable>() {

From 18ad29b400e2c3cb54f6d92dedf192fdb0cdf740 Mon Sep 17 00:00:00 2001
From: Valery Miller <valera_miller94@mail.ru>
Date: Thu, 4 Oct 2018 18:06:54 +0500
Subject: [PATCH 205/251] Changed email confirm dialog

---
 xabber/src/main/res/layout/dialog_confirm_email.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/xabber/src/main/res/layout/dialog_confirm_email.xml b/xabber/src/main/res/layout/dialog_confirm_email.xml
index 45c219d6c6..8fc262bb63 100644
--- a/xabber/src/main/res/layout/dialog_confirm_email.xml
+++ b/xabber/src/main/res/layout/dialog_confirm_email.xml
@@ -15,7 +15,7 @@
 
     <EditText
         android:id="@+id/edtCode"
-        android:layout_width="150dp"
+        android:layout_width="200dp"
         android:layout_height="wrap_content"
         android:inputType="number"
         android:maxLength="6"

From d10c2bf31b5bc32b80a4a39f8c5835383a6f0b36 Mon Sep 17 00:00:00 2001
From: Valery Miller <valera_miller94@mail.ru>
Date: Fri, 5 Oct 2018 15:07:37 +0500
Subject: [PATCH 206/251] Changes in signup step 4

---
 .../ui/fragment/XAccountSignUpFragment4.java  | 64 +++++++++++++++++--
 .../src/main/res/layout/skip_links_dialog.xml | 29 +++++++++
 xabber/src/main/res/values/words.xml          |  2 +
 xabber/src/main/res/values/xabber_account.xml |  1 +
 4 files changed, 92 insertions(+), 4 deletions(-)
 create mode 100644 xabber/src/main/res/layout/skip_links_dialog.xml

diff --git a/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountSignUpFragment4.java b/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountSignUpFragment4.java
index e2e0fa65f3..6d62c62901 100644
--- a/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountSignUpFragment4.java
+++ b/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountSignUpFragment4.java
@@ -1,10 +1,14 @@
 package com.xabber.android.ui.fragment;
 
+import android.app.AlertDialog;
+import android.app.Dialog;
 import android.app.Fragment;
 import android.app.FragmentTransaction;
 import android.content.Context;
+import android.graphics.PorterDuff;
 import android.os.Bundle;
 import android.support.annotation.Nullable;
+import android.support.v4.content.ContextCompat;
 import android.text.Html;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -26,6 +30,9 @@ public class XAccountSignUpFragment4 extends Fragment {
     private Button btnStart;
     private Listener listener;
     private TextView tvDescription;
+    private Dialog skipDialog;
+
+    private boolean haveLinks = false;
 
     public interface Listener {
         void onStep4Completed();
@@ -53,7 +60,7 @@ public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
         btnStart.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                listener.onStep4Completed();
+                onStartClick();
             }
         });
 
@@ -95,10 +102,59 @@ private void subscribeForXabberAccount() {
             .doOnNext(new Action1<XabberAccount>() {
                 @Override
                 public void call(XabberAccount account) {
-                    if (account.getSocialBindings().size() > 0 || account.getEmails().size() > 0)
-                        btnStart.setText(R.string.title_start_messaging);
-                    else btnStart.setText(R.string.skip);
+                    if (account != null) {
+                        if (account.getSocialBindings().size() > 0 || account.getEmails().size() > 0)
+                            haveLinks = true;
+                        else haveLinks = false;
+                        setupStartButton();
+                    }
                 }
             }).subscribe());
     }
+
+    private void setupStartButton() {
+        btnStart.setText(haveLinks ? R.string.title_start_messaging : R.string.skip);
+        btnStart.getBackground().setColorFilter(ContextCompat.getColor(getActivity(),
+                haveLinks ? R.color.account_register_blue : R.color.grey_400),
+                PorterDuff.Mode.MULTIPLY);
+    }
+
+    private void onStartClick() {
+        if (haveLinks) listener.onStep4Completed();
+        else {
+            AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
+            skipDialog = builder.setTitle(R.string.warning)
+                    .setMessage(R.string.account_secure_warning)
+                    .setView(setupDialogView()).create();
+            skipDialog.show();
+        }
+    }
+
+    private View setupDialogView() {
+        LayoutInflater inflater = getActivity().getLayoutInflater();
+        View view = inflater.inflate(R.layout.skip_links_dialog, null);
+
+        Button btnSkip = view.findViewById(R.id.btnSkip);
+        btnSkip.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                listener.onStep4Completed();
+            }
+        });
+
+        Button btnCancel = view.findViewById(R.id.btnCancel);
+        btnCancel.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                closeDialog();
+            }
+        });
+
+        return view;
+    }
+
+    private void closeDialog() {
+        if (skipDialog != null && skipDialog.isShowing())
+            skipDialog.dismiss();
+    }
 }
diff --git a/xabber/src/main/res/layout/skip_links_dialog.xml b/xabber/src/main/res/layout/skip_links_dialog.xml
new file mode 100644
index 0000000000..3453f82a39
--- /dev/null
+++ b/xabber/src/main/res/layout/skip_links_dialog.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="horizontal"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:gravity="right"
+    android:padding="8dp"
+    >
+
+    <Button
+        android:id="@+id/btnSkip"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/skip_anyway"
+        style="@style/Widget.AppCompat.Button.Borderless.Colored"
+        android:textColor="@color/grey_400"
+        />
+
+    <Button
+        android:id="@+id/btnCancel"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/cancel"
+        style="@style/Widget.AppCompat.Button.Borderless.Colored"
+        android:textColor="@color/account_register_blue"
+        />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/xabber/src/main/res/values/words.xml b/xabber/src/main/res/values/words.xml
index 4c19ebf1c3..bb1d5e7c7b 100644
--- a/xabber/src/main/res/values/words.xml
+++ b/xabber/src/main/res/values/words.xml
@@ -18,6 +18,8 @@
 
     <string name="cancel">Cancel</string>
     <string name="skip">Skip</string>
+    <string name="skip_anyway">Skip anyway</string>
+    <string name="warning">Warning!</string>
     <string name="settings">Settings</string>
     <string name="ok">OK</string>
     <string name="login">Login</string>
diff --git a/xabber/src/main/res/values/xabber_account.xml b/xabber/src/main/res/values/xabber_account.xml
index cabcc0c800..9f22e29e08 100644
--- a/xabber/src/main/res/values/xabber_account.xml
+++ b/xabber/src/main/res/values/xabber_account.xml
@@ -229,4 +229,5 @@
     <string name="license_url" translatable="false">https://www.xabber.com/policy/</string>
     <string name="accept_license">Accept privacy policy</string>
     <string name="account_secure_description"><![CDATA[Secure your account by linking it with <i>at least one</i> social network or email. If you don’t do that and lose your password, you’ll never be able to restore access to your account!]]></string>
+    <string name="account_secure_warning">If you don\'t link it with existing email or social account you might lose access to your XMPP account forever</string>
 </resources>
\ No newline at end of file

From c9ebd33e3011f6737c110d9e577ca26a8b874c8f Mon Sep 17 00:00:00 2001
From: Valery Miller <valera_miller94@mail.ru>
Date: Fri, 5 Oct 2018 17:52:53 +0500
Subject: [PATCH 207/251] Changes in signup step 1

---
 xabber/src/main/res/layout/fragment_xaccount_signup_1.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/xabber/src/main/res/layout/fragment_xaccount_signup_1.xml b/xabber/src/main/res/layout/fragment_xaccount_signup_1.xml
index 01e4e3ac63..f6468b55c5 100644
--- a/xabber/src/main/res/layout/fragment_xaccount_signup_1.xml
+++ b/xabber/src/main/res/layout/fragment_xaccount_signup_1.xml
@@ -83,7 +83,7 @@
                 android:layout_weight="1"
                 android:paddingRight="-12dp"
                 android:layout_gravity="bottom"
-                android:paddingBottom="6dp"
+                android:paddingBottom="7.8dp"
                 >
 
                 <Spinner
@@ -96,8 +96,8 @@
                 <View
                     android:id="@+id/spinnerBorder"
                     android:layout_width="match_parent"
-                    android:layout_height="2dp"
-                    android:background="@color/grey_400"
+                    android:layout_height="1dp"
+                    android:background="@color/grey_500"
                     android:layout_marginTop="1dp"
                     android:layout_marginLeft="7dp"
                     android:layout_marginRight="16dp"

From 956a818977f93d8ac4f96f61a0c599bc6222ad3e Mon Sep 17 00:00:00 2001
From: Valery Miller <valera_miller94@mail.ru>
Date: Fri, 5 Oct 2018 17:56:11 +0500
Subject: [PATCH 208/251] Changes in signup 3

---
 xabber/src/main/res/layout/fragment_xaccount_signup_3.xml | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/xabber/src/main/res/layout/fragment_xaccount_signup_3.xml b/xabber/src/main/res/layout/fragment_xaccount_signup_3.xml
index e3e6869f26..a5bdc7afd4 100644
--- a/xabber/src/main/res/layout/fragment_xaccount_signup_3.xml
+++ b/xabber/src/main/res/layout/fragment_xaccount_signup_3.xml
@@ -27,9 +27,6 @@
         android:orientation="vertical"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_marginTop="16dp"
-        android:layout_marginLeft="24dp"
-        android:layout_marginRight="24dp"
         >
 
         <WebView
@@ -41,11 +38,10 @@
 
         <RelativeLayout
             android:id="@+id/buttons"
-            android:layout_marginTop="16dp"
-            android:layout_marginBottom="16dp"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_alignParentBottom="true"
+            android:layout_margin="16dp"
             >
 
             <CheckBox

From 60d56d8b9d519deafa49a6c1b3c3ca280ad5ab98 Mon Sep 17 00:00:00 2001
From: Valery Miller <valera_miller94@mail.ru>
Date: Fri, 5 Oct 2018 18:04:05 +0500
Subject: [PATCH 209/251] Button Next now enabled only if password field
 contain not less than 4 symbols

---
 .../ui/fragment/XAccountSignUpFragment2.java    | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountSignUpFragment2.java b/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountSignUpFragment2.java
index 89ea1eee55..b7b8b3e052 100644
--- a/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountSignUpFragment2.java
+++ b/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountSignUpFragment2.java
@@ -4,10 +4,14 @@
 import android.os.Bundle;
 import android.support.annotation.Nullable;
 import android.support.design.widget.TextInputEditText;
+import android.text.Editable;
+import android.text.TextWatcher;
+import android.view.KeyEvent;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.Button;
+import android.widget.TextView;
 
 import com.xabber.android.R;
 
@@ -39,9 +43,22 @@ public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
 
         edtPass = view.findViewById(R.id.edtPass);
+        edtPass.addTextChangedListener(new TextWatcher() {
+            @Override
+            public void beforeTextChanged(CharSequence s, int start, int count, int after) { }
+
+            @Override
+            public void onTextChanged(CharSequence s, int start, int before, int count) {
+                btnNext.setEnabled(s.length() >= 4);
+            }
+
+            @Override
+            public void afterTextChanged(Editable s) { }
+        });
 
         btnNext = view.findViewById(R.id.btnNext);
         btnNext.setOnClickListener(this);
+        btnNext.setEnabled(false);
     }
 
     @Override

From 181a1e6d6bebc8cc0ba39fe46c0f3c887bd57c2d Mon Sep 17 00:00:00 2001
From: Valery Miller <valera_miller94@mail.ru>
Date: Fri, 5 Oct 2018 18:09:14 +0500
Subject: [PATCH 210/251] Up version to 523

---
 xabber/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/xabber/build.gradle b/xabber/build.gradle
index 02159ca675..349f6cf2ea 100644
--- a/xabber/build.gradle
+++ b/xabber/build.gradle
@@ -10,8 +10,8 @@ android {
     defaultConfig {
         minSdkVersion 15
         targetSdkVersion 28
-        versionCode 522
-        versionName '2.4.2(522)'
+        versionCode 523
+        versionName '2.4.2(523)'
     }
 
     lintOptions {

From f3467e44ad692f68f546391d7fb8efc3d5b2482d Mon Sep 17 00:00:00 2001
From: Valery Miller <valera_miller94@mail.ru>
Date: Mon, 8 Oct 2018 15:52:42 +0500
Subject: [PATCH 211/251] Removed auto-login preference

---
 .../java/com/xabber/android/data/SettingsManager.java    | 9 ---------
 .../xabber/android/data/xaccount/XMPPAuthManager.java    | 3 +--
 .../android/ui/activity/XabberAccountActivity.java       | 1 -
 xabber/src/main/res/values/preference_editor.xml         | 1 -
 xabber/src/main/res/values/preferences.xml               | 4 ----
 xabber/src/main/res/xml/preference_editor.xml            | 5 -----
 6 files changed, 1 insertion(+), 22 deletions(-)

diff --git a/xabber/src/main/java/com/xabber/android/data/SettingsManager.java b/xabber/src/main/java/com/xabber/android/data/SettingsManager.java
index ddfbad7016..16f0979c70 100644
--- a/xabber/src/main/java/com/xabber/android/data/SettingsManager.java
+++ b/xabber/src/main/java/com/xabber/android/data/SettingsManager.java
@@ -468,15 +468,6 @@ public static boolean connectionWakeLock() {
                 R.bool.connection_wake_lock_default);
     }
 
-    public static boolean autoLoginToXabberAccount() {
-        return getBoolean(R.string.auto_login_to_xabber_account_key,
-                R.bool.auto_login_to_xabber_account_default);
-    }
-
-    public static void setAutoLoginToXabberAccount(boolean value) {
-        setBoolean(R.string.auto_login_to_xabber_account_key, value);
-    }
-
     public static boolean connectionStartAtBoot() {
         return getBoolean(R.string.connection_start_at_boot_key,
                 R.bool.connection_start_at_boot_default);
diff --git a/xabber/src/main/java/com/xabber/android/data/xaccount/XMPPAuthManager.java b/xabber/src/main/java/com/xabber/android/data/xaccount/XMPPAuthManager.java
index 687f2f1d42..17874f2918 100644
--- a/xabber/src/main/java/com/xabber/android/data/xaccount/XMPPAuthManager.java
+++ b/xabber/src/main/java/com/xabber/android/data/xaccount/XMPPAuthManager.java
@@ -80,7 +80,7 @@ public void onStanza(ConnectionItem connection, Stanza packet) {
 
     @Override
     public void onConnected(final ConnectionItem connection) {
-        if (!SettingsManager.autoLoginToXabberAccount()) return;
+
 
         Application.getInstance().runInBackground(new Runnable() {
             @Override
@@ -136,7 +136,6 @@ private void confirmXMPP(Request request) {
                 @Override
                 public void call(XabberAccount account) {
                     Log.d(XMPPAuthManager.class.toString(), "xabber account authorized successfully");
-                    SettingsManager.setAutoLoginToXabberAccount(true);
                     updateSettings();
                 }
             }, new Action1<Throwable>() {
diff --git a/xabber/src/main/java/com/xabber/android/ui/activity/XabberAccountActivity.java b/xabber/src/main/java/com/xabber/android/ui/activity/XabberAccountActivity.java
index 772436bfd1..1aabbb6abe 100644
--- a/xabber/src/main/java/com/xabber/android/ui/activity/XabberAccountActivity.java
+++ b/xabber/src/main/java/com/xabber/android/ui/activity/XabberAccountActivity.java
@@ -311,7 +311,6 @@ public void call(Throwable throwable) {
 
     private void handleSuccessLogout(ResponseBody s, boolean deleteAccounts) {
         if (deleteAccounts) XabberAccountManager.getInstance().deleteSyncedLocalAccounts();
-        SettingsManager.setAutoLoginToXabberAccount(false);
         XabberAccountManager.getInstance().removeAccount();
         hideProgress();
         Toast.makeText(this, R.string.quit_success, Toast.LENGTH_SHORT).show();
diff --git a/xabber/src/main/res/values/preference_editor.xml b/xabber/src/main/res/values/preference_editor.xml
index d13344e226..7c893864c9 100644
--- a/xabber/src/main/res/values/preference_editor.xml
+++ b/xabber/src/main/res/values/preference_editor.xml
@@ -87,7 +87,6 @@
     <string name="connection_start_at_boot">Start when Android boots\nStart the application when Android boots. This doesn\'t work when Xabber is installed on SD card.</string>
     <string name="connection_wake_lock">Prevent sleep mode\nPrevent the device from sleeping. This will increase battery usage.</string>
     <string name="connection_wifi_lock">Keep WiFi awake\nKeep WiFi active on standby. This will increase battery usage</string>
-    <string name="auto_login_to_xabber_account">Auto login to Xabber Account\nAuto login to Xabber account via XMPP-account</string>
 
     <string name="contacts_reset_offline">Reset offline settings\nClear individual settings for groups and accounts</string>
     <string name="contacts_reset_offline_warning">Do you really want to clear individual settings for groups and accounts?</string>
diff --git a/xabber/src/main/res/values/preferences.xml b/xabber/src/main/res/values/preferences.xml
index 74c0e27f06..9aca6cb3c1 100644
--- a/xabber/src/main/res/values/preferences.xml
+++ b/xabber/src/main/res/values/preferences.xml
@@ -268,10 +268,6 @@
     <string name="chats_attention_sound_key">chats_attention_sound</string>
     <string name="chats_attention_sound_default">@string/default_sound</string>
 
-<!-- preference_connection -->
-    <string name="auto_login_to_xabber_account_key">auto_login_to_xabber_account</string>
-    <bool name="auto_login_to_xabber_account_default">true</bool>
-
     <string name="connection_start_at_boot_key">connection_start_at_boot</string>
     <bool name="connection_start_at_boot_default">false</bool>
 
diff --git a/xabber/src/main/res/xml/preference_editor.xml b/xabber/src/main/res/xml/preference_editor.xml
index 14d508cc1a..c8e5c61282 100644
--- a/xabber/src/main/res/xml/preference_editor.xml
+++ b/xabber/src/main/res/xml/preference_editor.xml
@@ -50,11 +50,6 @@
 
     <PreferenceCategory
         android:title="@string/category_settings">
-    <CheckBoxPreference
-        android:title="@string/auto_login_to_xabber_account"
-        android:key="@string/auto_login_to_xabber_account_key"
-        android:defaultValue="@bool/auto_login_to_xabber_account_default"
-        />
     <CheckBoxPreference
         android:title="@string/connection_start_at_boot"
         android:key="@string/connection_start_at_boot_key"

From 3c2f7f6a1ea1c0480c1efd1ee591323f5cb57f68 Mon Sep 17 00:00:00 2001
From: Valery Miller <valera_miller94@mail.ru>
Date: Mon, 8 Oct 2018 17:13:14 +0500
Subject: [PATCH 212/251] Added xabberAutoLoginEnabled field to account.

---
 .../android/data/account/AccountItem.java       | 12 +++++++++++-
 .../android/data/account/AccountManager.java    | 12 ++++++++++--
 .../android/data/database/RealmManager.java     | 11 ++++++++++-
 .../data/database/realm/AccountRealm.java       |  9 +++++++++
 .../data/database/sqlite/AccountTable.java      |  1 +
 .../android/data/xaccount/XMPPAuthManager.java  | 17 +++++++++++------
 .../ui/activity/XabberAccountActivity.java      |  4 +++-
 7 files changed, 55 insertions(+), 11 deletions(-)

diff --git a/xabber/src/main/java/com/xabber/android/data/account/AccountItem.java b/xabber/src/main/java/com/xabber/android/data/account/AccountItem.java
index e102b0d776..9d4013f864 100644
--- a/xabber/src/main/java/com/xabber/android/data/account/AccountItem.java
+++ b/xabber/src/main/java/com/xabber/android/data/account/AccountItem.java
@@ -55,6 +55,7 @@ public class AccountItem extends ConnectionItem implements Comparable<AccountIte
     private int order;
     private int timestamp;
     private boolean syncNotAllowed;
+    private boolean xabberAutoLoginEnabled;
 
     /**
      * Whether account is enabled.
@@ -121,7 +122,7 @@ public AccountItem(boolean custom, String host,
                        boolean compression, ProxyType proxyType, String proxyHost,
                        int proxyPort, String proxyUser, String proxyPassword,
                        boolean syncable, KeyPair keyPair, Date lastSync,
-                       ArchiveMode archiveMode) {
+                       ArchiveMode archiveMode, boolean xabberAutoLoginEnabled) {
         super(custom, host, port, serverName, userName, resource,
                 storePassword, password, token, saslEnabled, tlsMode, compression,
                 proxyType, proxyHost, proxyPort, proxyUser, proxyPassword);
@@ -130,6 +131,7 @@ public AccountItem(boolean custom, String host,
         this.order = order;
         this.timestamp = timestamp;
         this.syncNotAllowed = syncNotAllowed;
+        this.xabberAutoLoginEnabled = xabberAutoLoginEnabled;
 
         this.enabled = enabled;
         this.priority = getValidPriority(priority);
@@ -185,6 +187,14 @@ public void setSyncNotAllowed(boolean syncNotAllowed) {
         this.syncNotAllowed = syncNotAllowed;
     }
 
+    public boolean isXabberAutoLoginEnabled() {
+        return xabberAutoLoginEnabled;
+    }
+
+    public void setXabberAutoLoginEnabled(boolean xabberAutoLoginEnabled) {
+        this.xabberAutoLoginEnabled = xabberAutoLoginEnabled;
+    }
+
     /**
      * @return Assigned color.
      */
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
index d00c7abbaa..faac36a7bc 100644
--- a/xabber/src/main/java/com/xabber/android/data/account/AccountManager.java
+++ b/xabber/src/main/java/com/xabber/android/data/account/AccountManager.java
@@ -217,7 +217,8 @@ public void onLoad() {
                     accountRealm.isSyncable(),
                     accountRealm.getKeyPair(),
                     accountRealm.getLastSync(),
-                    accountRealm.getArchiveMode());
+                    accountRealm.getArchiveMode(),
+                    accountRealm.isXabberAutoLoginEnabled());
             accountItem.setId(accountRealm.getId());
             accountItem.setClearHistoryOnExit(accountRealm.isClearHistoryOnExit());
             if (accountRealm.getMamDefaultBehavior() != null) {
@@ -353,7 +354,7 @@ private AccountItem addAccount(boolean custom, String host, int port,
         AccountItem accountItem = new AccountItem(custom, host, port, serverName, userName,
                 resource, storePassword, password, token, color, order, syncNotAllowed, timestamp, priority, statusMode, statusText, enabled,
                 saslEnabled, tlsMode, compression, proxyType, proxyHost, proxyPort, proxyUser,
-                proxyPassword, syncable, keyPair, lastSync, archiveMode);
+                proxyPassword, syncable, keyPair, lastSync, archiveMode, true);
 
         requestToWriteAccount(accountItem);
         addAccount(accountItem);
@@ -1183,4 +1184,11 @@ private void removeHistoryOnExit() {
             }
         }
     }
+
+    public void setAllAccountAutoLoginToXabber(boolean autoLogin) {
+        for (AccountItem accountItem : getAllAccountItems()) {
+            accountItem.setXabberAutoLoginEnabled(autoLogin);
+        }
+    }
+
 }
diff --git a/xabber/src/main/java/com/xabber/android/data/database/RealmManager.java b/xabber/src/main/java/com/xabber/android/data/database/RealmManager.java
index 350439a672..730df814ef 100644
--- a/xabber/src/main/java/com/xabber/android/data/database/RealmManager.java
+++ b/xabber/src/main/java/com/xabber/android/data/database/RealmManager.java
@@ -29,7 +29,7 @@
 
 public class RealmManager {
     private static final String REALM_DATABASE_NAME = "realm_database.realm";
-    private static final int REALM_DATABASE_VERSION = 15;
+    private static final int REALM_DATABASE_VERSION = 16;
     private static final String LOG_TAG = RealmManager.class.getSimpleName();
     private final RealmConfiguration realmConfiguration;
 
@@ -222,6 +222,15 @@ public void migrate(DynamicRealm realm, long oldVersion, long newVersion) {
 
                             oldVersion++;
                         }
+
+                        if (oldVersion == 15) {
+                            RealmObjectSchema accountSchema =
+                                    schema.get(AccountRealm.class.getSimpleName());
+
+                            accountSchema.addField("xabberAutoLoginEnabled", boolean.class);
+
+                            oldVersion++;
+                        }
                     }
                 })
                 .modules(new RealmDatabaseModule())
diff --git a/xabber/src/main/java/com/xabber/android/data/database/realm/AccountRealm.java b/xabber/src/main/java/com/xabber/android/data/database/realm/AccountRealm.java
index 59a2b5c8d8..2fdf0bc842 100644
--- a/xabber/src/main/java/com/xabber/android/data/database/realm/AccountRealm.java
+++ b/xabber/src/main/java/com/xabber/android/data/database/realm/AccountRealm.java
@@ -59,6 +59,7 @@ public static class Fields {
     private int timestamp;
     private int order;
     private boolean syncNotAllowed;
+    private boolean xabberAutoLoginEnabled;
 
     private int priority;
     private String statusMode;
@@ -208,6 +209,14 @@ public void setSyncNotAllowed(boolean syncNotAllowed) {
         this.syncNotAllowed = syncNotAllowed;
     }
 
+    public boolean isXabberAutoLoginEnabled() {
+        return xabberAutoLoginEnabled;
+    }
+
+    public void setXabberAutoLoginEnabled(boolean xabberAutoLoginEnabled) {
+        this.xabberAutoLoginEnabled = xabberAutoLoginEnabled;
+    }
+
     public int getPriority() {
         return priority;
     }
diff --git a/xabber/src/main/java/com/xabber/android/data/database/sqlite/AccountTable.java b/xabber/src/main/java/com/xabber/android/data/database/sqlite/AccountTable.java
index a10b9d2993..fc34974e78 100644
--- a/xabber/src/main/java/com/xabber/android/data/database/sqlite/AccountTable.java
+++ b/xabber/src/main/java/com/xabber/android/data/database/sqlite/AccountTable.java
@@ -458,6 +458,7 @@ private void saveAccountRealm(String id, AccountItem accountItem) {
         accountRealm.setToken(connectionSettings.getToken());
         accountRealm.setOrder(accountItem.getOrder());
         accountRealm.setSyncNotAllowed(accountItem.isSyncNotAllowed());
+        accountRealm.setXabberAutoLoginEnabled(accountItem.isXabberAutoLoginEnabled());
         accountRealm.setTimestamp(accountItem.getTimestamp());
         accountRealm.setResource(connectionSettings.getResource().toString());
         accountRealm.setColorIndex(accountItem.getColorIndex());
diff --git a/xabber/src/main/java/com/xabber/android/data/xaccount/XMPPAuthManager.java b/xabber/src/main/java/com/xabber/android/data/xaccount/XMPPAuthManager.java
index 17874f2918..eb88a5e973 100644
--- a/xabber/src/main/java/com/xabber/android/data/xaccount/XMPPAuthManager.java
+++ b/xabber/src/main/java/com/xabber/android/data/xaccount/XMPPAuthManager.java
@@ -5,6 +5,7 @@
 import com.xabber.android.data.Application;
 import com.xabber.android.data.NetworkException;
 import com.xabber.android.data.SettingsManager;
+import com.xabber.android.data.account.AccountItem;
 import com.xabber.android.data.account.AccountManager;
 import com.xabber.android.data.connection.ConnectionItem;
 import com.xabber.android.data.connection.listeners.OnConnectedListener;
@@ -88,13 +89,16 @@ public void run() {
                 XabberAccount xabberAccount = XabberAccountManager.getInstance().getAccount();
                 AccountJid accountJid = connection.getAccount();
                 if (xabberAccount == null) {
-                    try {
-                        Thread.sleep(1000);
-                    } catch (InterruptedException e) {
-                        e.printStackTrace();
+                    AccountItem accountItem = AccountManager.getInstance().getAccount(accountJid);
+                    if (accountItem != null && accountItem.isXabberAutoLoginEnabled()) {
+                        try {
+                            Thread.sleep(1000);
+                        } catch (InterruptedException e) {
+                            e.printStackTrace();
+                        }
+                        if (PrivateStorageManager.getInstance().haveXabberAccountBinding(accountJid))
+                            requestXMPPAuthCode(accountJid);
                     }
-                    if (PrivateStorageManager.getInstance().haveXabberAccountBinding(accountJid))
-                        requestXMPPAuthCode(accountJid);
 
                 } else if (xabberAccount.getFullUsername()
                         .equals(AccountManager.getInstance().getVerboseName(accountJid))) {
@@ -137,6 +141,7 @@ private void confirmXMPP(Request request) {
                 public void call(XabberAccount account) {
                     Log.d(XMPPAuthManager.class.toString(), "xabber account authorized successfully");
                     updateSettings();
+                    AccountManager.getInstance().setAllAccountAutoLoginToXabber(true);
                 }
             }, new Action1<Throwable>() {
                 @Override
diff --git a/xabber/src/main/java/com/xabber/android/ui/activity/XabberAccountActivity.java b/xabber/src/main/java/com/xabber/android/ui/activity/XabberAccountActivity.java
index 1aabbb6abe..27d11d4764 100644
--- a/xabber/src/main/java/com/xabber/android/ui/activity/XabberAccountActivity.java
+++ b/xabber/src/main/java/com/xabber/android/ui/activity/XabberAccountActivity.java
@@ -19,7 +19,7 @@
 import android.widget.Toast;
 
 import com.xabber.android.R;
-import com.xabber.android.data.SettingsManager;
+import com.xabber.android.data.account.AccountManager;
 import com.xabber.android.data.connection.NetworkManager;
 import com.xabber.android.data.xaccount.AuthManager;
 import com.xabber.android.data.xaccount.XMPPAuthManager;
@@ -311,6 +311,8 @@ public void call(Throwable throwable) {
 
     private void handleSuccessLogout(ResponseBody s, boolean deleteAccounts) {
         if (deleteAccounts) XabberAccountManager.getInstance().deleteSyncedLocalAccounts();
+        else AccountManager.getInstance().setAllAccountAutoLoginToXabber(false);
+
         XabberAccountManager.getInstance().removeAccount();
         hideProgress();
         Toast.makeText(this, R.string.quit_success, Toast.LENGTH_SHORT).show();

From 22d359da779fa80638dc2a04e138204fd1fb2fb2 Mon Sep 17 00:00:00 2001
From: Valery Miller <valera_miller94@mail.ru>
Date: Mon, 8 Oct 2018 17:45:23 +0500
Subject: [PATCH 213/251] Up version to 524

---
 xabber/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/xabber/build.gradle b/xabber/build.gradle
index 349f6cf2ea..6db999fcbe 100644
--- a/xabber/build.gradle
+++ b/xabber/build.gradle
@@ -10,8 +10,8 @@ android {
     defaultConfig {
         minSdkVersion 15
         targetSdkVersion 28
-        versionCode 523
-        versionName '2.4.2(523)'
+        versionCode 524
+        versionName '2.4.2(524)'
     }
 
     lintOptions {

From 3a1aaa43a556d343a70d274fad093c393d7dc747 Mon Sep 17 00:00:00 2001
From: Valery Miller <valera_miller94@mail.ru>
Date: Mon, 8 Oct 2018 18:06:21 +0500
Subject: [PATCH 214/251] Fixed bug with saving account information to db Up
 version to 525

---
 xabber/build.gradle                                           | 4 ++--
 .../java/com/xabber/android/data/account/AccountManager.java  | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/xabber/build.gradle b/xabber/build.gradle
index 6db999fcbe..87325440f9 100644
--- a/xabber/build.gradle
+++ b/xabber/build.gradle
@@ -10,8 +10,8 @@ android {
     defaultConfig {
         minSdkVersion 15
         targetSdkVersion 28
-        versionCode 524
-        versionName '2.4.2(524)'
+        versionCode 525
+        versionName '2.4.2(525)'
     }
 
     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
index faac36a7bc..5be340dc11 100644
--- a/xabber/src/main/java/com/xabber/android/data/account/AccountManager.java
+++ b/xabber/src/main/java/com/xabber/android/data/account/AccountManager.java
@@ -1188,6 +1188,7 @@ private void removeHistoryOnExit() {
     public void setAllAccountAutoLoginToXabber(boolean autoLogin) {
         for (AccountItem accountItem : getAllAccountItems()) {
             accountItem.setXabberAutoLoginEnabled(autoLogin);
+            requestToWriteAccount(accountItem);
         }
     }
 

From d30be08d0163994c10254575cae63c3a79a0d311 Mon Sep 17 00:00:00 2001
From: Valery Miller <valera_miller94@mail.ru>
Date: Tue, 9 Oct 2018 17:27:45 +0500
Subject: [PATCH 215/251] Fixed work with private storage

---
 .../privatestorage/PrivateStorageManager.java |  16 +-
 .../XabberOptionsPrivateData.java             | 154 ++++++++++++++++++
 2 files changed, 164 insertions(+), 6 deletions(-)
 create mode 100644 xabber/src/main/java/com/xabber/android/data/extension/privatestorage/XabberOptionsPrivateData.java

diff --git a/xabber/src/main/java/com/xabber/android/data/extension/privatestorage/PrivateStorageManager.java b/xabber/src/main/java/com/xabber/android/data/extension/privatestorage/PrivateStorageManager.java
index 6dde5e6748..c31fe92a3a 100644
--- a/xabber/src/main/java/com/xabber/android/data/extension/privatestorage/PrivateStorageManager.java
+++ b/xabber/src/main/java/com/xabber/android/data/extension/privatestorage/PrivateStorageManager.java
@@ -11,7 +11,6 @@
 import org.jivesoftware.smack.XMPPException;
 import org.jivesoftware.smack.tcp.XMPPTCPConnection;
 import org.jivesoftware.smackx.iqprivate.PrivateDataManager;
-import org.jivesoftware.smackx.iqprivate.packet.DefaultPrivateData;
 import org.jivesoftware.smackx.iqprivate.packet.PrivateData;
 
 import java.util.ArrayList;
@@ -24,26 +23,31 @@ public class PrivateStorageManager {
 
     private static final String NAMESPACE = "xabber:options";
     private static final String ELEMENT_NAME = "storage";
-    private static final String VALUE_BIND = "bind";
+    private static final String TYPE_BIND = "bind";
     private static final String BIND_TRUE = "1";
     private static final String BIND_FALSE = "0";
 
     private static PrivateStorageManager instance;
 
+    static {
+        PrivateDataManager.addPrivateDataProvider(ELEMENT_NAME, NAMESPACE,
+                new XabberOptionsPrivateData.Provider());
+    }
+
     public static PrivateStorageManager getInstance() {
         if (instance == null) instance = new PrivateStorageManager();
         return instance;
     }
 
     public boolean haveXabberAccountBinding(AccountJid accountJid) {
-        DefaultPrivateData privateData = (DefaultPrivateData) getPrivateData(accountJid, NAMESPACE, ELEMENT_NAME);
+        XabberOptionsPrivateData privateData = (XabberOptionsPrivateData) getPrivateData(accountJid, NAMESPACE, ELEMENT_NAME);
         if (privateData == null) return false;
-        return BIND_TRUE.equals(privateData.getValue(VALUE_BIND));
+        return BIND_TRUE.equals(privateData.getValue(TYPE_BIND));
     }
 
     public void setXabberAccountBinding(AccountJid accountJid, boolean bind) {
-        DefaultPrivateData privateData = new DefaultPrivateData(ELEMENT_NAME, NAMESPACE);
-        privateData.setValue(VALUE_BIND, bind ? BIND_TRUE : BIND_FALSE);
+        XabberOptionsPrivateData privateData = new XabberOptionsPrivateData(ELEMENT_NAME, NAMESPACE);
+        privateData.setValue(TYPE_BIND, bind ? BIND_TRUE : BIND_FALSE);
         setPrivateData(accountJid, privateData);
     }
 
diff --git a/xabber/src/main/java/com/xabber/android/data/extension/privatestorage/XabberOptionsPrivateData.java b/xabber/src/main/java/com/xabber/android/data/extension/privatestorage/XabberOptionsPrivateData.java
new file mode 100644
index 0000000000..f714ba4022
--- /dev/null
+++ b/xabber/src/main/java/com/xabber/android/data/extension/privatestorage/XabberOptionsPrivateData.java
@@ -0,0 +1,154 @@
+package com.xabber.android.data.extension.privatestorage;
+
+import org.jivesoftware.smackx.iqprivate.packet.PrivateData;
+import org.jivesoftware.smackx.iqprivate.provider.PrivateDataProvider;
+import org.xmlpull.v1.XmlPullParser;
+import org.xmlpull.v1.XmlPullParserException;
+
+import java.io.IOException;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Set;
+
+public class XabberOptionsPrivateData implements PrivateData {
+
+    private String elementName;
+    private String namespace;
+    private Map<String, String> map;
+
+    /**
+     * Creates a new generic private data object.
+     *
+     * @param elementName the name of the element of the XML sub-document.
+     * @param namespace the namespace of the element.
+     */
+    public XabberOptionsPrivateData(String elementName, String namespace) {
+        this.elementName = elementName;
+        this.namespace = namespace;
+    }
+
+    /**
+     * Returns the XML element name of the private data sub-packet root element.
+     *
+     * @return the XML element name of the stanza(/packet) extension.
+     */
+    @Override
+    public String getElementName() {
+        return elementName;
+    }
+
+    /**
+     * Returns the XML namespace of the private data sub-packet root element.
+     *
+     * @return the XML namespace of the stanza(/packet) extension.
+     */
+    @Override
+    public String getNamespace() {
+        return namespace;
+    }
+
+    @Override
+    public String toXML() {
+        StringBuilder buf = new StringBuilder();
+        buf.append('<').append(elementName).append(" xmlns=\"").append(namespace).append("\">");
+        for (String name : getNames()) {
+            String value = getValue(name);
+            buf.append("<option type=\'").append(name).append("\'>");
+            buf.append(value);
+            buf.append("</option>");
+        }
+        buf.append("</").append(elementName).append('>');
+        return buf.toString();
+    }
+
+    /**
+     * Returns a Set of the names that can be used to get
+     * values of the private data.
+     *
+     * @return a Set of the names.
+     */
+    public synchronized Set<String> getNames() {
+        if (map == null) {
+            return Collections.<String>emptySet();
+        }
+        return Collections.unmodifiableSet(map.keySet());
+    }
+
+    /**
+     * Returns a value given a name.
+     *
+     * @param name the name.
+     * @return the value.
+     */
+    public synchronized String getValue(String name) {
+        if (map == null) {
+            return null;
+        }
+        return map.get(name);
+    }
+
+    /**
+     * Sets a value given the name.
+     *
+     * @param name the name.
+     * @param value the value.
+     */
+    public synchronized void setValue(String name, String value) {
+        if (map == null) {
+            map = new HashMap<String,String>();
+        }
+        map.put(name, value);
+    }
+
+    public static class Provider implements PrivateDataProvider {
+
+        public Provider() {
+            super();
+        }
+
+        @Override
+        public PrivateData parsePrivateData(XmlPullParser parser) throws XmlPullParserException, IOException {
+            String elementName = parser.getName();
+            String namespace = parser.getNamespace();
+
+            XabberOptionsPrivateData data = new XabberOptionsPrivateData(elementName, namespace);
+            boolean finished = false;
+            int position = 0;
+            while (!finished) {
+                int event = parser.next();
+                if (event == XmlPullParser.START_TAG) {
+
+                    // parse attributes of tag
+                    String type = "type" + position;
+                    if (parser.getAttributeCount() > 0) {
+                        type = parser.getAttributeValue("", "type");
+                    }
+
+                    // If an empty element, set the value with the empty string.
+                    if (parser.isEmptyElementTag()) {
+                        data.setValue(type,"");
+                    }
+
+                    // Otherwise, get the the element text.
+                    else {
+                        event = parser.next();
+                        if (event == XmlPullParser.TEXT) {
+                            String value = parser.getText();
+                            data.setValue(type, value);
+                        }
+                    }
+                }
+                else if (event == XmlPullParser.END_TAG) {
+                    if (parser.getName().equals(elementName)) {
+                        finished = true;
+                    }
+                }
+                position++;
+            }
+
+            return data;
+        }
+    }
+
+}

From 1f9abdfb471c6db288e495e412e8800fe774cf88 Mon Sep 17 00:00:00 2001
From: Valery Miller <valera_miller94@mail.ru>
Date: Tue, 9 Oct 2018 18:15:54 +0500
Subject: [PATCH 216/251] Changes in translation

---
 xabber/src/main/res/values/xabber_account.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/xabber/src/main/res/values/xabber_account.xml b/xabber/src/main/res/values/xabber_account.xml
index 9f22e29e08..76d73963ab 100644
--- a/xabber/src/main/res/values/xabber_account.xml
+++ b/xabber/src/main/res/values/xabber_account.xml
@@ -90,8 +90,8 @@
     <string name="title_no_linked_accounts">No linked social accounts or emails</string>
     <string name="title_linked_accounts">Linked social accounts and emails</string>
     <string name="title_select_xmpp_account">Select XMPP account to proceed</string>
-    <string name="title_delete_email">Do you want to unlink this email from Xabber-account?</string>
-    <string name="title_delete_social">Do you want to unlink this %1$s account from Xabber-account?</string>
+    <string name="title_delete_email">Do you want to unlink this email from Xabber Account?</string>
+    <string name="title_delete_social">Do you want to unlink this %1$s account from Xabber Account?</string>
 
     <string name="title_login_xabber_account">Sign In</string>
     <string name="title_register_xabber_account">Sign Up</string>

From 197888eeeb18f3b61f4806daa4dfa85a2bb10ea7 Mon Sep 17 00:00:00 2001
From: Valery Miller <valera_miller94@mail.ru>
Date: Tue, 9 Oct 2018 18:18:11 +0500
Subject: [PATCH 217/251] Up version to 526

---
 xabber/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/xabber/build.gradle b/xabber/build.gradle
index 87325440f9..8ec09b0627 100644
--- a/xabber/build.gradle
+++ b/xabber/build.gradle
@@ -10,8 +10,8 @@ android {
     defaultConfig {
         minSdkVersion 15
         targetSdkVersion 28
-        versionCode 525
-        versionName '2.4.2(525)'
+        versionCode 526
+        versionName '2.4.2(526)'
     }
 
     lintOptions {

From 7384264b7a869c924011549e77fff42e3d1803d9 Mon Sep 17 00:00:00 2001
From: Valery Miller <valera_miller94@mail.ru>
Date: Wed, 10 Oct 2018 16:03:13 +0500
Subject: [PATCH 218/251] Added new Xabber-API methods

---
 .../android/data/xaccount/AuthManager.java    | 31 +++++++++++++++++++
 .../android/data/xaccount/IXabberApi.java     |  6 ++++
 2 files changed, 37 insertions(+)

diff --git a/xabber/src/main/java/com/xabber/android/data/xaccount/AuthManager.java b/xabber/src/main/java/com/xabber/android/data/xaccount/AuthManager.java
index 6550861d3c..998c3aef56 100644
--- a/xabber/src/main/java/com/xabber/android/data/xaccount/AuthManager.java
+++ b/xabber/src/main/java/com/xabber/android/data/xaccount/AuthManager.java
@@ -315,6 +315,15 @@ public static Single<ResponseBody> unregisterFCMEndpoint(String endpoint) {
         return HttpApiManager.getXabberApi().unregisterFCMEndpoint(new Endpoint(endpoint));
     }
 
+    public static Single<ResponseBody> changePassword(String oldPass, String pass, String passConfirm) {
+        return HttpApiManager.getXabberApi().changePassword(getXabberTokenHeader(),
+                new ChangePassFields(oldPass, pass, passConfirm));
+    }
+
+    public static Single<ResponseBody> requestResetPassword(String email) {
+        return HttpApiManager.getXabberApi().requestResetPassword(new ResetPassFields(email, HttpApiManager.XABBER_RESET_PASS_URL));
+    }
+
     // support
 
     private static String getXabberTokenHeader() {
@@ -345,6 +354,28 @@ public static String getProviderName(String provider) {
 
     // models
 
+    public static class ChangePassFields {
+        final String old_password;
+        final String password;
+        final String confirm_password;
+
+        public ChangePassFields(String oldPassword, String password, String confirmPassword) {
+            this.old_password = oldPassword;
+            this.password = password;
+            this.confirm_password = confirmPassword;
+        }
+    }
+
+    public static class ResetPassFields {
+        final String email;
+        final String password_reset_url;
+
+        public ResetPassFields(String email, String resetPassUrl) {
+            this.email = email;
+            this.password_reset_url = resetPassUrl;
+        }
+    }
+
     public static class Endpoint {
         final String endpoint_key;
 
diff --git a/xabber/src/main/java/com/xabber/android/data/xaccount/IXabberApi.java b/xabber/src/main/java/com/xabber/android/data/xaccount/IXabberApi.java
index ad61ddcd2c..f3b38429e9 100644
--- a/xabber/src/main/java/com/xabber/android/data/xaccount/IXabberApi.java
+++ b/xabber/src/main/java/com/xabber/android/data/xaccount/IXabberApi.java
@@ -65,6 +65,12 @@ public interface IXabberApi {
     @HTTP(method = "DELETE", path = "fcm/subscription/", hasBody = true)
     Single<ResponseBody> unregisterFCMEndpoint(@Body AuthManager.Endpoint endpoint);
 
+    @POST("accounts/current/set_password/")
+    Single<ResponseBody> changePassword(@Header("Authorization") String token, @Body AuthManager.ChangePassFields fields);
+
+    @POST("accounts/password_reset_request/")
+    Single<ResponseBody> requestResetPassword(@Body AuthManager.ResetPassFields fields);
+
     /* Xabber API v2 */
 
     @POST("accounts/xmpp_code_request/")

From 22e5e687eda1329f2b9515a3348362b2bff89a21 Mon Sep 17 00:00:00 2001
From: Valery Miller <valera_miller94@mail.ru>
Date: Wed, 10 Oct 2018 16:03:59 +0500
Subject: [PATCH 219/251] Added Change Password Dialog

---
 .../main/res/layout/dialog_change_pass.xml    | 32 +++++++++++++++++++
 .../res/menu/toolbar_xabber_account_info.xml  |  5 +++
 .../main/res/values-ru-rRU/xabber_account.xml |  5 ---
 xabber/src/main/res/values/xabber_account.xml |  9 +++---
 4 files changed, 42 insertions(+), 9 deletions(-)
 create mode 100644 xabber/src/main/res/layout/dialog_change_pass.xml

diff --git a/xabber/src/main/res/layout/dialog_change_pass.xml b/xabber/src/main/res/layout/dialog_change_pass.xml
new file mode 100644
index 0000000000..11913a0d6f
--- /dev/null
+++ b/xabber/src/main/res/layout/dialog_change_pass.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:paddingTop="8dp"
+    android:paddingLeft="16dp"
+    android:paddingRight="16dp">
+
+    <EditText
+        android:id="@+id/edtOldPass"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:hint="@string/hint_old_pass"
+        />
+
+    <EditText
+        android:id="@+id/edtPass"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:hint="@string/hint_pass"
+        />
+
+    <EditText
+        android:id="@+id/edtConfirmPass"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:hint="@string/hint_confirm_pass"
+        />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/xabber/src/main/res/menu/toolbar_xabber_account_info.xml b/xabber/src/main/res/menu/toolbar_xabber_account_info.xml
index 637bae3d6f..99b3fb9c26 100644
--- a/xabber/src/main/res/menu/toolbar_xabber_account_info.xml
+++ b/xabber/src/main/res/menu/toolbar_xabber_account_info.xml
@@ -2,6 +2,11 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
+    <item android:id="@+id/action_change_pass"
+        android:title="@string/button_change_pass"
+        app:showAsAction="never"
+        />
+
     <item android:id="@+id/action_sync"
         android:title="@string/button_sync"
         app:showAsAction="never"
diff --git a/xabber/src/main/res/values-ru-rRU/xabber_account.xml b/xabber/src/main/res/values-ru-rRU/xabber_account.xml
index 7c8f74312e..599133d887 100644
--- a/xabber/src/main/res/values-ru-rRU/xabber_account.xml
+++ b/xabber/src/main/res/values-ru-rRU/xabber_account.xml
@@ -32,12 +32,7 @@
   <string name="progress_title_complete">Завершение регистрации</string>
   <string name="progress_title_resend">Повторная отправка email</string>
   <string name="progress_title_delete_settings">Удаление настроек</string>
-  <string name="label_username">Выберите имя пользователя и домен</string>
   <string name="hint_username">username</string>
-  <string name="label_pass">Пароль</string>
-  <string name="hint_pass">Введите пароль</string>
-  <string name="label_conf_pass">Подтвердите пароль*</string>
-  <string name="hint_conf_pass">Подтвердите пароль</string>
   <string name="label_first_name">Имя</string>
   <string name="hint_first_name">Иван</string>
   <string name="label_last_name">Фамилия</string>
diff --git a/xabber/src/main/res/values/xabber_account.xml b/xabber/src/main/res/values/xabber_account.xml
index 76d73963ab..7f658128dd 100644
--- a/xabber/src/main/res/values/xabber_account.xml
+++ b/xabber/src/main/res/values/xabber_account.xml
@@ -55,14 +55,14 @@
     <string name="progress_title_connect">Connecting to Xabber Account</string>
 
     <string name="hint_username">Username</string>
-    <string name="label_pass">Choose password</string>
-    <string name="hint_pass">Enter password</string>
-    <string name="label_conf_pass">Confirm password*</string>
-    <string name="hint_conf_pass">Confirm password</string>
+
     <string name="label_first_name">First name</string>
     <string name="hint_first_name">John</string>
     <string name="label_last_name">Last name</string>
     <string name="hint_last_name">Doe</string>
+    <string name="hint_old_pass">Old password</string>
+    <string name="hint_pass">New password</string>
+    <string name="hint_confirm_pass">Confirm password</string>
 
     <string name="label_xmpp_id">Existing XMPP ID</string>
 
@@ -112,6 +112,7 @@
     <string name="button_cancel_registration">Cancel registration</string>
     <string name="button_continue">continue</string>
     <string name="button_sync">Sync now</string>
+    <string name="button_change_pass">Change password</string>
 
     <string name="btn_done">done</string>
 

From 35f702a263a3d01a418a76303349049879da7c72 Mon Sep 17 00:00:00 2001
From: Valery Miller <valera_miller94@mail.ru>
Date: Wed, 10 Oct 2018 16:58:12 +0500
Subject: [PATCH 220/251] Added change pass dialog

---
 .../ui/activity/XabberAccountActivity.java    | 151 ++++++++++++++++--
 .../main/res/layout/dialog_change_pass.xml    |  33 ++++
 xabber/src/main/res/values/xabber_account.xml |   4 +
 3 files changed, 171 insertions(+), 17 deletions(-)

diff --git a/xabber/src/main/java/com/xabber/android/ui/activity/XabberAccountActivity.java b/xabber/src/main/java/com/xabber/android/ui/activity/XabberAccountActivity.java
index 27d11d4764..5353f830c0 100644
--- a/xabber/src/main/java/com/xabber/android/ui/activity/XabberAccountActivity.java
+++ b/xabber/src/main/java/com/xabber/android/ui/activity/XabberAccountActivity.java
@@ -15,7 +15,9 @@
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
+import android.widget.Button;
 import android.widget.CheckBox;
+import android.widget.EditText;
 import android.widget.Toast;
 
 import com.xabber.android.R;
@@ -50,7 +52,7 @@ public class XabberAccountActivity extends BaseLoginActivity
     private Toolbar toolbar;
     private BarPainter barPainter;
 
-    private Dialog logoutDialog;
+    private Dialog dialog;
     private boolean dialogShowed;
 
     @NonNull
@@ -89,8 +91,8 @@ protected void onResume() {
     @Override
     protected void onPause() {
         super.onPause();
-        if (logoutDialog != null)
-            logoutDialog.dismiss();
+        if (dialog != null)
+            dialog.dismiss();
     }
 
     @Override
@@ -102,6 +104,12 @@ protected void onDestroy() {
     @Override
     public boolean onMenuItemClick(MenuItem item) {
         switch (item.getItemId()) {
+            case R.id.action_change_pass:
+                if (!dialogShowed) {
+                    dialogShowed = true;
+                    showChangePassDialog();
+                }
+                return true;
             case R.id.action_quit:
                 if (!dialogShowed) {
                     dialogShowed = true;
@@ -128,6 +136,14 @@ protected void hideProgress() {
             ((XabberAccountInfoFragment)fragmentInfo).showProgressInAccount(false);
     }
 
+    private boolean checkInternetOrShowError() {
+        if (NetworkManager.isNetworkAvailable()) return true;
+        else {
+            Toast.makeText(this, R.string.toast_no_internet, Toast.LENGTH_LONG).show();
+            return false;
+        }
+    }
+
     private void subscribeForXabberAccount() {
         compositeSubscription.add(XabberAccountManager.getInstance().subscribeForAccount()
             .subscribeOn(Schedulers.io())
@@ -163,10 +179,7 @@ public void onAccountClick(String jid) {
     }
 
     public void loginXabberAccountViaXMPP(String accountJid) {
-        if (NetworkManager.isNetworkAvailable()) {
-            requestXMPPCode(accountJid);
-        } else
-            Toast.makeText(this, R.string.toast_no_internet, Toast.LENGTH_LONG).show();
+        if (checkInternetOrShowError()) requestXMPPCode(accountJid);
     }
 
     private void requestXMPPCode(final String jid) {
@@ -206,17 +219,11 @@ private void handleErrorRequestXMPPCode(Throwable throwable) {
     /** Xabber Account Info */
 
     public void onLogoutClick(boolean deleteAccounts) {
-        if (NetworkManager.isNetworkAvailable()) {
-            logout(deleteAccounts);
-        } else
-            Toast.makeText(this, R.string.toast_no_internet, Toast.LENGTH_LONG).show();
+        if (checkInternetOrShowError()) logout(deleteAccounts);
     }
 
     public void onSyncClick(boolean needGoToMainActivity) {
-        if (NetworkManager.isNetworkAvailable()) {
-            synchronize(needGoToMainActivity);
-        } else
-            Toast.makeText(this, R.string.toast_no_internet, Toast.LENGTH_LONG).show();
+        if (checkInternetOrShowError()) synchronize(needGoToMainActivity);
     }
 
     private void showInfoFragment() {
@@ -285,8 +292,8 @@ public void onClick(DialogInterface dialog, int which) {
                     }
                 })
                 .setNegativeButton(R.string.cancel, null);
-        logoutDialog = builder.create();
-        logoutDialog.show();
+        dialog = builder.create();
+        dialog.show();
         dialogShowed = false;
     }
 
@@ -338,4 +345,114 @@ private void handleErrorLogout(Throwable throwable) {
         hideProgress();
     }
 
+    /** CHANGE PASS */
+
+    private void showChangePassDialog() {
+        LayoutInflater inflater = getLayoutInflater();
+        View view = inflater.inflate(R.layout.dialog_change_pass, null);
+        final EditText edtOldPass = view.findViewById(R.id.edtOldPass);
+        final EditText edtPass = view.findViewById(R.id.edtPass);
+        final EditText edtConfirmPass = view.findViewById(R.id.edtConfirmPass);
+        Button btnOk = view.findViewById(R.id.btnOk);
+        Button btnResetPass = view.findViewById(R.id.btnResetPass);
+
+        btnOk.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                onChangePassClick(edtOldPass, edtPass, edtConfirmPass);
+            }
+        });
+
+        btnResetPass.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                dialog.dismiss();
+            }
+        });
+
+        AlertDialog.Builder builder = new AlertDialog.Builder(this);
+        builder.setTitle(R.string.button_change_pass).setView(view);
+        dialog = builder.create();
+        dialog.show();
+        dialogShowed = false;
+    }
+
+    public void onChangePassClick(EditText edtOldPass, EditText edtPass, EditText edtConfirmPass) {
+        String oldPass = edtOldPass.getText().toString();
+        oldPass = oldPass.trim();
+
+        String pass = edtPass.getText().toString();
+        pass = pass.trim();
+
+        String confirmPass = edtConfirmPass.getText().toString();
+        confirmPass = confirmPass.trim();
+
+        if (oldPass.isEmpty()) {
+            edtOldPass.setError(getString(R.string.empty_field));
+            return;
+        }
+
+        if (oldPass.length() < 4) {
+            edtOldPass.setError(getString(R.string.pass_too_short));
+            return;
+        }
+
+        if (pass.isEmpty()) {
+            edtPass.setError(getString(R.string.empty_field));
+            return;
+        }
+
+        if (pass.length() < 4) {
+            edtPass.setError(getString(R.string.pass_too_short));
+            return;
+        }
+
+        if (confirmPass.isEmpty()) {
+            edtConfirmPass.setError(getString(R.string.empty_field));
+            return;
+        }
+
+        if (confirmPass.length() < 4) {
+            edtConfirmPass.setError(getString(R.string.pass_too_short));
+            return;
+        }
+
+        if (!pass.equals(confirmPass)) {
+            edtConfirmPass.setError(getString(R.string.passwords_not_match));
+            return;
+        }
+
+        if (checkInternetOrShowError()) {
+            changePass(oldPass, pass, confirmPass);
+            dialog.dismiss();
+        }
+    }
+
+    private void changePass(String oldPass, String pass, String confirmPass) {
+        showProgress("");
+        compositeSubscription.add(AuthManager.changePassword(oldPass, pass, confirmPass)
+            .subscribeOn(Schedulers.io())
+            .observeOn(AndroidSchedulers.mainThread())
+            .subscribe(new Action1<ResponseBody>() {
+                @Override
+                public void call(ResponseBody s) {
+                    handleSuccessChangePass();
+                }
+            }, new Action1<Throwable>() {
+                @Override
+                public void call(Throwable throwable) {
+                    handleErrorChangePass();
+                }
+            }));
+    }
+
+    private void handleSuccessChangePass() {
+        Toast.makeText(this, R.string.password_changed_success, Toast.LENGTH_SHORT).show();
+        hideProgress();
+    }
+
+    private void handleErrorChangePass() {
+        Toast.makeText(this, R.string.password_changed_fail, Toast.LENGTH_SHORT).show();
+        hideProgress();
+    }
 }
diff --git a/xabber/src/main/res/layout/dialog_change_pass.xml b/xabber/src/main/res/layout/dialog_change_pass.xml
index 11913a0d6f..3fe77e09de 100644
--- a/xabber/src/main/res/layout/dialog_change_pass.xml
+++ b/xabber/src/main/res/layout/dialog_change_pass.xml
@@ -13,6 +13,8 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:hint="@string/hint_old_pass"
+        android:layout_marginLeft="8dp"
+        android:layout_marginRight="8dp"
         />
 
     <EditText
@@ -20,6 +22,8 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:hint="@string/hint_pass"
+        android:layout_marginLeft="8dp"
+        android:layout_marginRight="8dp"
         />
 
     <EditText
@@ -27,6 +31,35 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:hint="@string/hint_confirm_pass"
+        android:layout_marginLeft="8dp"
+        android:layout_marginRight="8dp"
         />
 
+    <LinearLayout
+        android:orientation="horizontal"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="right"
+        android:layout_marginTop="8dp"
+        android:layout_marginBottom="8dp"
+        >
+
+        <Button
+            android:id="@+id/btnResetPass"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/button_reset_pass"
+            style="@style/Widget.AppCompat.Button.Borderless.Colored"
+            />
+
+        <Button
+            android:id="@+id/btnOk"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/ok"
+            style="@style/Widget.AppCompat.Button.Borderless.Colored"
+            />
+
+    </LinearLayout>
+
 </LinearLayout>
\ No newline at end of file
diff --git a/xabber/src/main/res/values/xabber_account.xml b/xabber/src/main/res/values/xabber_account.xml
index 7f658128dd..61f952a551 100644
--- a/xabber/src/main/res/values/xabber_account.xml
+++ b/xabber/src/main/res/values/xabber_account.xml
@@ -113,6 +113,7 @@
     <string name="button_continue">continue</string>
     <string name="button_sync">Sync now</string>
     <string name="button_change_pass">Change password</string>
+    <string name="button_reset_pass">Reset password</string>
 
     <string name="btn_done">done</string>
 
@@ -231,4 +232,7 @@
     <string name="accept_license">Accept privacy policy</string>
     <string name="account_secure_description"><![CDATA[Secure your account by linking it with <i>at least one</i> social network or email. If you don’t do that and lose your password, you’ll never be able to restore access to your account!]]></string>
     <string name="account_secure_warning">If you don\'t link it with existing email or social account you might lose access to your XMPP account forever</string>
+
+    <string name="password_changed_success">Password changed</string>
+    <string name="password_changed_fail">Password change failed</string>
 </resources>
\ No newline at end of file

From e0b58bb4e0b0518be8ce34b01779d748203493a3 Mon Sep 17 00:00:00 2001
From: Valery Miller <valera_miller94@mail.ru>
Date: Wed, 10 Oct 2018 17:17:40 +0500
Subject: [PATCH 221/251] Added reset reset password function

---
 .../ui/activity/XabberAccountActivity.java    | 52 ++++++++++++++++++-
 xabber/src/main/res/values/xabber_account.xml |  4 ++
 2 files changed, 55 insertions(+), 1 deletion(-)

diff --git a/xabber/src/main/java/com/xabber/android/ui/activity/XabberAccountActivity.java b/xabber/src/main/java/com/xabber/android/ui/activity/XabberAccountActivity.java
index 5353f830c0..c3da6596b0 100644
--- a/xabber/src/main/java/com/xabber/android/ui/activity/XabberAccountActivity.java
+++ b/xabber/src/main/java/com/xabber/android/ui/activity/XabberAccountActivity.java
@@ -24,6 +24,7 @@
 import com.xabber.android.data.account.AccountManager;
 import com.xabber.android.data.connection.NetworkManager;
 import com.xabber.android.data.xaccount.AuthManager;
+import com.xabber.android.data.xaccount.EmailDTO;
 import com.xabber.android.data.xaccount.XMPPAuthManager;
 import com.xabber.android.data.xaccount.XabberAccount;
 import com.xabber.android.data.xaccount.XabberAccountManager;
@@ -345,7 +346,7 @@ private void handleErrorLogout(Throwable throwable) {
         hideProgress();
     }
 
-    /** CHANGE PASS */
+    /** CHANGE\RESET PASS DIALOG */
 
     private void showChangePassDialog() {
         LayoutInflater inflater = getLayoutInflater();
@@ -366,6 +367,7 @@ public void onClick(View v) {
         btnResetPass.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
+                requestResetPass();
                 dialog.dismiss();
             }
         });
@@ -428,6 +430,8 @@ public void onChangePassClick(EditText edtOldPass, EditText edtPass, EditText ed
         }
     }
 
+    /** CHANGE PASS */
+
     private void changePass(String oldPass, String pass, String confirmPass) {
         showProgress("");
         compositeSubscription.add(AuthManager.changePassword(oldPass, pass, confirmPass)
@@ -455,4 +459,50 @@ private void handleErrorChangePass() {
         Toast.makeText(this, R.string.password_changed_fail, Toast.LENGTH_SHORT).show();
         hideProgress();
     }
+
+    /** RESET PASS */
+
+    private void requestResetPass() {
+        String email = null;
+        XabberAccount account = XabberAccountManager.getInstance().getAccount();
+        if (account != null) {
+            for (EmailDTO emailDTO : account.getEmails()) {
+                if (emailDTO.isVerified()) {
+                    email = emailDTO.getEmail();
+                    break;
+                }
+            }
+        } else return;
+
+        if (email == null || email.isEmpty()) {
+            Toast.makeText(this, R.string.password_reset_need_email, Toast.LENGTH_SHORT).show();
+            return;
+        }
+
+        showProgress("");
+        compositeSubscription.add(AuthManager.requestResetPassword(email)
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(new Action1<ResponseBody>() {
+                    @Override
+                    public void call(ResponseBody s) {
+                        handleSuccessResetPass();
+                    }
+                }, new Action1<Throwable>() {
+                    @Override
+                    public void call(Throwable throwable) {
+                        handleErrorResetPass();
+                    }
+                }));
+    }
+
+    private void handleSuccessResetPass() {
+        Toast.makeText(this, R.string.password_reset_success, Toast.LENGTH_SHORT).show();
+        hideProgress();
+    }
+
+    private void handleErrorResetPass() {
+        Toast.makeText(this, R.string.password_reset_fail, Toast.LENGTH_SHORT).show();
+        hideProgress();
+    }
 }
diff --git a/xabber/src/main/res/values/xabber_account.xml b/xabber/src/main/res/values/xabber_account.xml
index 61f952a551..71ff73c5d6 100644
--- a/xabber/src/main/res/values/xabber_account.xml
+++ b/xabber/src/main/res/values/xabber_account.xml
@@ -235,4 +235,8 @@
 
     <string name="password_changed_success">Password changed</string>
     <string name="password_changed_fail">Password change failed</string>
+
+    <string name="password_reset_success">Request for reset password sent</string>
+    <string name="password_reset_fail">Request for reset password failed</string>
+    <string name="password_reset_need_email">For reset password need at least one confirmed email</string>
 </resources>
\ No newline at end of file

From 97152bccfd0304a927fa5ffc6527e8b88c271846 Mon Sep 17 00:00:00 2001
From: Valery Miller <valera_miller94@mail.ru>
Date: Wed, 10 Oct 2018 17:45:35 +0500
Subject: [PATCH 222/251] Added receiving push of account updates

---
 .../xabber/android/data/xaccount/XabberAccountManager.java    | 4 ++++
 .../src/main/java/com/xabber/android/service/PushService.java | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/xabber/src/main/java/com/xabber/android/data/xaccount/XabberAccountManager.java b/xabber/src/main/java/com/xabber/android/data/xaccount/XabberAccountManager.java
index a0aa14e1c1..8172f04717 100644
--- a/xabber/src/main/java/com/xabber/android/data/xaccount/XabberAccountManager.java
+++ b/xabber/src/main/java/com/xabber/android/data/xaccount/XabberAccountManager.java
@@ -233,6 +233,10 @@ public void call(Throwable throwable) {
         compositeSubscription.add(getAccountSubscription);
     }
 
+    public void updateAccountInfo() {
+        getAccountFromNet(account.getToken());
+    }
+
     public void updateAccountSettings() {
         List<XMPPAccountSettings> list = createSettingsList();
         if (list != null && list.size() > 0) {
diff --git a/xabber/src/main/java/com/xabber/android/service/PushService.java b/xabber/src/main/java/com/xabber/android/service/PushService.java
index f8641523b1..1719e6eca3 100644
--- a/xabber/src/main/java/com/xabber/android/service/PushService.java
+++ b/xabber/src/main/java/com/xabber/android/service/PushService.java
@@ -18,6 +18,7 @@ public class PushService extends FirebaseMessagingService {
     private static final String FIELD_BODY = "body";
 
     private static final String ACTION_SETTINGS_UPDATED = "settings_updated";
+    private static final String ACTION_ACCOUNT_UPDATED = "account_updated";
     private static final String TARGET_TYPE_XACCOUNT = "xaccount";
     private static final String TARGET_TYPE_NODE = "node";
 
@@ -60,6 +61,9 @@ private void onXAccountPushReceived(String target, String body) {
                     case ACTION_SETTINGS_UPDATED:
                         XabberAccountManager.getInstance().updateAccountSettings();
                         break;
+                    case ACTION_ACCOUNT_UPDATED:
+                        XabberAccountManager.getInstance().updateAccountInfo();
+                        break;
                     default:
                         Log.d(PushService.class.getSimpleName(),
                                 "Unexpected action in Xabber Account push - " + data.getAction());

From 9449f6fc2ead1b8910df32688a599c34c64b19ca Mon Sep 17 00:00:00 2001
From: Valery Miller <valera_miller94@mail.ru>
Date: Wed, 10 Oct 2018 17:59:18 +0500
Subject: [PATCH 223/251] Fixed reset pass method

---
 .../android/data/xaccount/AuthManager.java    | 50 +------------------
 1 file changed, 2 insertions(+), 48 deletions(-)

diff --git a/xabber/src/main/java/com/xabber/android/data/xaccount/AuthManager.java b/xabber/src/main/java/com/xabber/android/data/xaccount/AuthManager.java
index 998c3aef56..fed3231c25 100644
--- a/xabber/src/main/java/com/xabber/android/data/xaccount/AuthManager.java
+++ b/xabber/src/main/java/com/xabber/android/data/xaccount/AuthManager.java
@@ -321,7 +321,7 @@ public static Single<ResponseBody> changePassword(String oldPass, String pass, S
     }
 
     public static Single<ResponseBody> requestResetPassword(String email) {
-        return HttpApiManager.getXabberApi().requestResetPassword(new ResetPassFields(email, HttpApiManager.XABBER_RESET_PASS_URL));
+        return HttpApiManager.getXabberApi().requestResetPassword(new ResetPassFields(email));
     }
 
     // support
@@ -368,11 +368,9 @@ public ChangePassFields(String oldPassword, String password, String confirmPassw
 
     public static class ResetPassFields {
         final String email;
-        final String password_reset_url;
 
-        public ResetPassFields(String email, String resetPassUrl) {
+        public ResetPassFields(String email) {
             this.email = email;
-            this.password_reset_url = resetPassUrl;
         }
     }
 
@@ -490,50 +488,6 @@ public String getApiJid() {
         }
     }
 
-    public static class CompleteRegister {
-        final String username;
-        final String password;
-        final String confirm_password;
-        final String first_name;
-        final String last_name;
-        final String host;
-        final String language;
-        final boolean create_token;
-
-        public CompleteRegister(String username, String password, String confirm_password,
-                                String first_name, String last_name, String host, String language,
-                                boolean create_token) {
-            this.username = username;
-            this.password = password;
-            this.confirm_password = confirm_password;
-            this.first_name = first_name;
-            this.last_name = last_name;
-            this.host = host;
-            this.language = language;
-            this.create_token = create_token;
-        }
-    }
-
-    public static class SetPhoneNumber {
-        final String action;
-        final String phone;
-
-        public SetPhoneNumber(String action, String phone) {
-            this.action = action;
-            this.phone = phone;
-        }
-    }
-
-    public static class ConfirmPhoneNumber {
-        final String action;
-        final String code;
-
-        public ConfirmPhoneNumber(String action, String code) {
-            this.action = action;
-            this.code = code;
-        }
-    }
-
     public static class Account {
         final String first_name;
         final String last_name;

From 135e88ea79d4cd7bcdc48a5cce37427a347dbd0c Mon Sep 17 00:00:00 2001
From: Valery Miller <valera_miller94@mail.ru>
Date: Wed, 10 Oct 2018 18:49:34 +0500
Subject: [PATCH 224/251] Added field 'hasPassword' to XabberAccount

---
 .../xabber/android/data/database/RealmManager.java    | 11 ++++++++++-
 .../data/database/realm/XabberAccountRealm.java       |  9 +++++++++
 .../xabber/android/data/xaccount/XabberAccount.java   |  8 +++++++-
 .../android/data/xaccount/XabberAccountDTO.java       |  9 ++++++++-
 .../android/data/xaccount/XabberAccountManager.java   |  4 +++-
 5 files changed, 37 insertions(+), 4 deletions(-)

diff --git a/xabber/src/main/java/com/xabber/android/data/database/RealmManager.java b/xabber/src/main/java/com/xabber/android/data/database/RealmManager.java
index 730df814ef..82d0804ce1 100644
--- a/xabber/src/main/java/com/xabber/android/data/database/RealmManager.java
+++ b/xabber/src/main/java/com/xabber/android/data/database/RealmManager.java
@@ -29,7 +29,7 @@
 
 public class RealmManager {
     private static final String REALM_DATABASE_NAME = "realm_database.realm";
-    private static final int REALM_DATABASE_VERSION = 16;
+    private static final int REALM_DATABASE_VERSION = 17;
     private static final String LOG_TAG = RealmManager.class.getSimpleName();
     private final RealmConfiguration realmConfiguration;
 
@@ -231,6 +231,15 @@ public void migrate(DynamicRealm realm, long oldVersion, long newVersion) {
 
                             oldVersion++;
                         }
+
+                        if (oldVersion == 16) {
+                            RealmObjectSchema xabberAccountSchema =
+                                    schema.get(XabberAccountRealm.class.getSimpleName());
+
+                            xabberAccountSchema.addField("hasPassword", boolean.class);
+
+                            oldVersion++;
+                        }
                     }
                 })
                 .modules(new RealmDatabaseModule())
diff --git a/xabber/src/main/java/com/xabber/android/data/database/realm/XabberAccountRealm.java b/xabber/src/main/java/com/xabber/android/data/database/realm/XabberAccountRealm.java
index aefbe19dd8..c0f46f2203 100644
--- a/xabber/src/main/java/com/xabber/android/data/database/realm/XabberAccountRealm.java
+++ b/xabber/src/main/java/com/xabber/android/data/database/realm/XabberAccountRealm.java
@@ -26,6 +26,7 @@ public class XabberAccountRealm extends RealmObject {
     private String language;
     private String phone;
     private boolean needToVerifyPhone;
+    private boolean hasPassword;
     private RealmList<XMPPUserRealm> xmppUsers;
     private RealmList<EmailRealm> emails;
     private RealmList<SocialBindingRealm> socialBindings;
@@ -145,5 +146,13 @@ public String getPhone() {
     public void setPhone(String phone) {
         this.phone = phone;
     }
+
+    public boolean hasPassword() {
+        return hasPassword;
+    }
+
+    public void setHasPassword(boolean hasPassword) {
+        this.hasPassword = hasPassword;
+    }
 }
 
diff --git a/xabber/src/main/java/com/xabber/android/data/xaccount/XabberAccount.java b/xabber/src/main/java/com/xabber/android/data/xaccount/XabberAccount.java
index 4d53ccf4bf..712de8a0ae 100644
--- a/xabber/src/main/java/com/xabber/android/data/xaccount/XabberAccount.java
+++ b/xabber/src/main/java/com/xabber/android/data/xaccount/XabberAccount.java
@@ -26,11 +26,12 @@ public class XabberAccount {
     private String token;
     private String phone;
     private boolean needToVerifyPhone;
+    private boolean hasPassword;
 
     public XabberAccount(int id, String accountStatus, String username, String domain, String firstName,
                          String lastName, String registerDate, String language, List<XMPPUser> xmppUsers,
                          List<EmailDTO> emails, List<SocialBindingDTO> socialBindings, String token,
-                         boolean needToVerifyPhone, String phone) {
+                         boolean needToVerifyPhone, String phone, boolean hasPassword) {
         this.id = id;
         this.accountStatus = accountStatus;
         this.username = username;
@@ -45,6 +46,7 @@ public XabberAccount(int id, String accountStatus, String username, String domai
         this.token = token;
         this.needToVerifyPhone = needToVerifyPhone;
         this.phone = phone;
+        this.hasPassword = hasPassword;
     }
 
     public String getAccountStatus() {
@@ -106,4 +108,8 @@ public boolean isNeedToVerifyPhone() {
     public String getPhone() {
         return phone;
     }
+
+    public boolean hasPassword() {
+        return hasPassword;
+    }
 }
diff --git a/xabber/src/main/java/com/xabber/android/data/xaccount/XabberAccountDTO.java b/xabber/src/main/java/com/xabber/android/data/xaccount/XabberAccountDTO.java
index edccf77dd2..efdb753dca 100644
--- a/xabber/src/main/java/com/xabber/android/data/xaccount/XabberAccountDTO.java
+++ b/xabber/src/main/java/com/xabber/android/data/xaccount/XabberAccountDTO.java
@@ -19,13 +19,14 @@ public class XabberAccountDTO {
     private String phone;
     private boolean need_to_verify_phone;
     private String token;
+    private boolean has_password;
     private List<XMPPUserDTO> xmpp_users;
     private List<EmailDTO> email_list;
     private List<SocialBindingDTO> social_bindings;
 
     public XabberAccountDTO(int id, String account_status, String username, String domain, String first_name,
                             String last_name, String registration_date, String language, String phone,
-                            boolean need_to_verify_phone, String token, List<XMPPUserDTO> xmpp_users,
+                            boolean need_to_verify_phone, String token, boolean hasPassword, List<XMPPUserDTO> xmpp_users,
                             List<EmailDTO> email_list, List<SocialBindingDTO> social_bindings) {
         this.id = id;
         this.account_status = account_status;
@@ -40,6 +41,8 @@ public XabberAccountDTO(int id, String account_status, String username, String d
         this.xmpp_users = xmpp_users;
         this.email_list = email_list;
         this.social_bindings = social_bindings;
+        this.token = token;
+        this.has_password = hasPassword;
     }
 
     public String getAccountStatus() {
@@ -97,5 +100,9 @@ public String getPhone() {
     public String getToken() {
         return token;
     }
+
+    public boolean hasPassword() {
+        return has_password;
+    }
 }
 
diff --git a/xabber/src/main/java/com/xabber/android/data/xaccount/XabberAccountManager.java b/xabber/src/main/java/com/xabber/android/data/xaccount/XabberAccountManager.java
index 8172f04717..b308a0841f 100644
--- a/xabber/src/main/java/com/xabber/android/data/xaccount/XabberAccountManager.java
+++ b/xabber/src/main/java/com/xabber/android/data/xaccount/XabberAccountManager.java
@@ -348,6 +348,7 @@ public Single<XabberAccount> saveOrUpdateXabberAccountToRealm(XabberAccountDTO x
         xabberAccountRealm.setRegisterDate(xabberAccount.getRegistrationDate());
         xabberAccountRealm.setNeedToVerifyPhone(xabberAccount.isNeedToVerifyPhone());
         xabberAccountRealm.setPhone(xabberAccount.getPhone());
+        xabberAccountRealm.setHasPassword(xabberAccount.hasPassword());
 
         RealmList<XMPPUserRealm> realmUsers = new RealmList<>();
         for (XMPPUserDTO user : xabberAccount.getXmppUsers()) {
@@ -444,7 +445,8 @@ public static XabberAccount xabberAccountRealmToPOJO(XabberAccountRealm accountR
                 socials,
                 accountRealm.getToken(),
                 accountRealm.isNeedToVerifyPhone(),
-                accountRealm.getPhone()
+                accountRealm.getPhone(),
+                accountRealm.hasPassword()
         );
 
         return xabberAccount;

From 46153567f989850e6a74df1ca7cca9261c711510 Mon Sep 17 00:00:00 2001
From: Valery Miller <valera_miller94@mail.ru>
Date: Wed, 10 Oct 2018 18:53:35 +0500
Subject: [PATCH 225/251] Show 'Change password' function if xabber account
 have password, and show 'Set password' function if haven't.

---
 .../ui/activity/XabberAccountActivity.java    | 65 +++++++++++--------
 .../res/menu/toolbar_xabber_account_info.xml  | 31 +++++----
 xabber/src/main/res/values/xabber_account.xml |  1 +
 3 files changed, 58 insertions(+), 39 deletions(-)

diff --git a/xabber/src/main/java/com/xabber/android/ui/activity/XabberAccountActivity.java b/xabber/src/main/java/com/xabber/android/ui/activity/XabberAccountActivity.java
index c3da6596b0..9a141963b9 100644
--- a/xabber/src/main/java/com/xabber/android/ui/activity/XabberAccountActivity.java
+++ b/xabber/src/main/java/com/xabber/android/ui/activity/XabberAccountActivity.java
@@ -105,6 +105,9 @@ protected void onDestroy() {
     @Override
     public boolean onMenuItemClick(MenuItem item) {
         switch (item.getItemId()) {
+            case R.id.action_set_pass:
+                onResetPassClick();
+                return true;
             case R.id.action_change_pass:
                 if (!dialogShowed) {
                     dialogShowed = true;
@@ -255,8 +258,15 @@ private void showLoginFragment() {
 
     private void setupMenu(boolean show) {
         Menu menu = toolbar.getMenu();
-        menu.findItem(R.id.action_quit).setVisible(show);
-        menu.findItem(R.id.action_sync).setVisible(show);
+        menu.setGroupVisible(R.id.group1, show);
+
+        XabberAccount account = XabberAccountManager.getInstance().getAccount();
+        if (account != null) {
+            if (account.hasPassword())
+                menu.findItem(R.id.action_set_pass).setVisible(false);
+            else menu.findItem(R.id.action_change_pass).setVisible(false);
+
+        }
     }
 
     @Override
@@ -367,7 +377,7 @@ public void onClick(View v) {
         btnResetPass.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                requestResetPass();
+                onResetPassClick();
                 dialog.dismiss();
             }
         });
@@ -462,38 +472,39 @@ private void handleErrorChangePass() {
 
     /** RESET PASS */
 
-    private void requestResetPass() {
+    private void onResetPassClick() {
         String email = null;
         XabberAccount account = XabberAccountManager.getInstance().getAccount();
-        if (account != null) {
-            for (EmailDTO emailDTO : account.getEmails()) {
-                if (emailDTO.isVerified()) {
-                    email = emailDTO.getEmail();
-                    break;
-                }
+        if (account == null) return;
+
+        for (EmailDTO emailDTO : account.getEmails()) {
+            if (emailDTO.isVerified()) {
+                email = emailDTO.getEmail();
+                break;
             }
-        } else return;
+        }
 
-        if (email == null || email.isEmpty()) {
+        if (email == null || email.isEmpty())
             Toast.makeText(this, R.string.password_reset_need_email, Toast.LENGTH_SHORT).show();
-            return;
-        }
+        else if (checkInternetOrShowError()) requestResetPass(email);
+    }
 
+    private void requestResetPass(String email) {
         showProgress("");
         compositeSubscription.add(AuthManager.requestResetPassword(email)
-                .subscribeOn(Schedulers.io())
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(new Action1<ResponseBody>() {
-                    @Override
-                    public void call(ResponseBody s) {
-                        handleSuccessResetPass();
-                    }
-                }, new Action1<Throwable>() {
-                    @Override
-                    public void call(Throwable throwable) {
-                        handleErrorResetPass();
-                    }
-                }));
+            .subscribeOn(Schedulers.io())
+            .observeOn(AndroidSchedulers.mainThread())
+            .subscribe(new Action1<ResponseBody>() {
+                @Override
+                public void call(ResponseBody s) {
+                    handleSuccessResetPass();
+                }
+            }, new Action1<Throwable>() {
+                @Override
+                public void call(Throwable throwable) {
+                    handleErrorResetPass();
+                }
+            }));
     }
 
     private void handleSuccessResetPass() {
diff --git a/xabber/src/main/res/menu/toolbar_xabber_account_info.xml b/xabber/src/main/res/menu/toolbar_xabber_account_info.xml
index 99b3fb9c26..2b854a271e 100644
--- a/xabber/src/main/res/menu/toolbar_xabber_account_info.xml
+++ b/xabber/src/main/res/menu/toolbar_xabber_account_info.xml
@@ -2,19 +2,26 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
-    <item android:id="@+id/action_change_pass"
-        android:title="@string/button_change_pass"
-        app:showAsAction="never"
-        />
+    <group android:id="@+id/group1">
+        <item android:id="@+id/action_set_pass"
+            android:title="@string/button_set_pass"
+            app:showAsAction="never"
+            />
 
-    <item android:id="@+id/action_sync"
-        android:title="@string/button_sync"
-        app:showAsAction="never"
-        />
+        <item android:id="@+id/action_change_pass"
+            android:title="@string/button_change_pass"
+            app:showAsAction="never"
+            />
 
-    <item android:id="@+id/action_quit"
-        android:title="@string/button_quit"
-        app:showAsAction="never"
-        />
+        <item android:id="@+id/action_sync"
+            android:title="@string/button_sync"
+            app:showAsAction="never"
+            />
+
+        <item android:id="@+id/action_quit"
+            android:title="@string/button_quit"
+            app:showAsAction="never"
+            />
+    </group>
 
 </menu>
\ No newline at end of file
diff --git a/xabber/src/main/res/values/xabber_account.xml b/xabber/src/main/res/values/xabber_account.xml
index 71ff73c5d6..6856f705de 100644
--- a/xabber/src/main/res/values/xabber_account.xml
+++ b/xabber/src/main/res/values/xabber_account.xml
@@ -114,6 +114,7 @@
     <string name="button_sync">Sync now</string>
     <string name="button_change_pass">Change password</string>
     <string name="button_reset_pass">Reset password</string>
+    <string name="button_set_pass">Set password</string>
 
     <string name="btn_done">done</string>
 

From eed9dfcd5f64080a361bc103d4f99d0b108538cc Mon Sep 17 00:00:00 2001
From: Valery Miller <valera_miller94@mail.ru>
Date: Wed, 10 Oct 2018 18:57:12 +0500
Subject: [PATCH 226/251] Up version to 527

---
 xabber/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/xabber/build.gradle b/xabber/build.gradle
index 8ec09b0627..3af554556c 100644
--- a/xabber/build.gradle
+++ b/xabber/build.gradle
@@ -10,8 +10,8 @@ android {
     defaultConfig {
         minSdkVersion 15
         targetSdkVersion 28
-        versionCode 526
-        versionName '2.4.2(526)'
+        versionCode 527
+        versionName '2.4.2(527)'
     }
 
     lintOptions {

From 2994b92f8af4dcac30b21d2de2a50a1ba1ea2946 Mon Sep 17 00:00:00 2001
From: Valery Miller <valera_miller94@mail.ru>
Date: Thu, 11 Oct 2018 12:20:42 +0500
Subject: [PATCH 227/251] Changed policy URL

---
 xabber/src/main/res/values/xabber_account.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/xabber/src/main/res/values/xabber_account.xml b/xabber/src/main/res/values/xabber_account.xml
index 6856f705de..ac829b54ae 100644
--- a/xabber/src/main/res/values/xabber_account.xml
+++ b/xabber/src/main/res/values/xabber_account.xml
@@ -229,7 +229,7 @@
     <string name="title_signup_step_4">Step 4 of 4. Secure your account</string>
     <string name="title_login_email">Login via email</string>
 
-    <string name="license_url" translatable="false">https://www.xabber.com/policy/</string>
+    <string name="license_url" translatable="false">https://www.xabber.com/policy/mobile/</string>
     <string name="accept_license">Accept privacy policy</string>
     <string name="account_secure_description"><![CDATA[Secure your account by linking it with <i>at least one</i> social network or email. If you don’t do that and lose your password, you’ll never be able to restore access to your account!]]></string>
     <string name="account_secure_warning">If you don\'t link it with existing email or social account you might lose access to your XMPP account forever</string>

From 4af077dbfc730ee5510ec733000fce498e3bb7aa Mon Sep 17 00:00:00 2001
From: Valery Miller <valera_miller94@mail.ru>
Date: Thu, 11 Oct 2018 12:22:21 +0500
Subject: [PATCH 228/251] Changed resource template for xabber-android-xxxxxxxx

---
 .../java/com/xabber/android/data/account/AccountManager.java    | 2 +-
 xabber/src/main/res/values/preferences.xml                      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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
index 5be340dc11..0d3cf9702c 100644
--- a/xabber/src/main/java/com/xabber/android/data/account/AccountManager.java
+++ b/xabber/src/main/java/com/xabber/android/data/account/AccountManager.java
@@ -443,7 +443,7 @@ storePassword, password, token, resource, getNextColorIndex(), getNextOrder(), f
     @NonNull
     private Resourcepart generateResource() {
         try {
-            return Resourcepart.from(application.getString(R.string.account_resource_default) + "_" + StringUtils.randomString(8));
+            return Resourcepart.from(application.getString(R.string.account_resource_default) + "-" + StringUtils.randomString(8));
         } catch (XmppStringprepException e) {
             LogManager.exception(this, e);
             return Resourcepart.EMPTY;
diff --git a/xabber/src/main/res/values/preferences.xml b/xabber/src/main/res/values/preferences.xml
index 9aca6cb3c1..1c79267353 100644
--- a/xabber/src/main/res/values/preferences.xml
+++ b/xabber/src/main/res/values/preferences.xml
@@ -406,7 +406,7 @@
     <string name="account_port_key">account_port</string>
     <string name="account_server_key">account_server</string>
     <string name="account_resource_key">account_resource</string>
-    <string name="account_resource_default">@string/application_title_short</string>
+    <string name="account_resource_default">xabber-android</string>
     <string name="account_priority_key">account_priority</string>
     <string name="account_sasl_key">account_sasl</string>
     <string name="account_tls_mode_key">account_tls_mode</string>

From 2eeb4bf61cdec8e1e9ca89fe8edb8d445da1ab3f Mon Sep 17 00:00:00 2001
From: Valery Miller <valera_miller94@mail.ru>
Date: Thu, 11 Oct 2018 13:19:05 +0500
Subject: [PATCH 229/251] Removed unused resources

---
 .../keyboard_background_holo.9.png            | Bin 227 -> 0 bytes
 .../orca_attach_camera_normal.png             | Bin 2021 -> 0 bytes
 .../orca_attach_camera_pressed.png            | Bin 2008 -> 0 bytes
 .../orca_attach_location_normal.png           | Bin 1676 -> 0 bytes
 .../orca_attach_location_pressed.png          | Bin 1671 -> 0 bytes
 .../orca_attach_photo_normal.png              | Bin 1740 -> 0 bytes
 .../orca_attach_photo_pressed.png             | Bin 1707 -> 0 bytes
 .../drawable-hdpi/orca_attachments_arrow.png  | Bin 250 -> 0 bytes
 .../orca_attachments_arrow_reversed.png       | Bin 197 -> 0 bytes
 .../orca_composer_divider_horizontal.9.png    | Bin 98 -> 0 bytes
 .../orca_composer_divider_vertical.9.png      | Bin 94 -> 0 bytes
 .../orca_composer_popup_active_normal.png     | Bin 941 -> 0 bytes
 .../orca_composer_popup_active_pressed.png    | Bin 1430 -> 0 bytes
 .../orca_composer_popup_normal.png            | Bin 429 -> 0 bytes
 .../orca_composer_popup_pressed.png           | Bin 838 -> 0 bytes
 .../res/drawable-hdpi/orca_composer_tab.9.png | Bin 100 -> 0 bytes
 .../orca_composer_tab_active.9.png            | Bin 98 -> 0 bytes
 .../orca_composer_tab_dark.9.png              | Bin 100 -> 0 bytes
 .../orca_composer_tab_pressed.9.png           | Bin 105 -> 0 bytes
 .../orca_composer_top_divider.9.png           | Bin 105 -> 0 bytes
 .../orca_emoji_backspace_back_normal.png      | Bin 656 -> 0 bytes
 .../orca_emoji_backspace_front_normal.png     | Bin 1160 -> 0 bytes
 .../orca_emoji_backspace_front_pressed.png    | Bin 1044 -> 0 bytes
 .../orca_emoji_category_cars.png              | Bin 912 -> 0 bytes
 .../orca_emoji_category_nature.png            | Bin 1378 -> 0 bytes
 .../orca_emoji_category_objects.png           | Bin 1020 -> 0 bytes
 .../orca_emoji_category_people.png            | Bin 905 -> 0 bytes
 .../orca_emoji_category_punctuation.png       | Bin 759 -> 0 bytes
 .../orca_emoji_more_back_normal.png           | Bin 458 -> 0 bytes
 .../orca_emoji_more_front_normal.png          | Bin 936 -> 0 bytes
 .../orca_emoji_more_front_pressed.png         | Bin 828 -> 0 bytes
 .../keyboard_background_holo.9.png            | Bin 204 -> 0 bytes
 .../orca_attach_camera_normal.png             | Bin 1084 -> 0 bytes
 .../orca_attach_camera_pressed.png            | Bin 1080 -> 0 bytes
 .../orca_attach_location_normal.png           | Bin 945 -> 0 bytes
 .../orca_attach_location_pressed.png          | Bin 930 -> 0 bytes
 .../orca_attach_photo_normal.png              | Bin 972 -> 0 bytes
 .../orca_attach_photo_pressed.png             | Bin 969 -> 0 bytes
 .../drawable-mdpi/orca_attachments_arrow.png  | Bin 161 -> 0 bytes
 .../orca_attachments_arrow_reversed.png       | Bin 142 -> 0 bytes
 .../orca_composer_divider_horizontal.9.png    | Bin 92 -> 0 bytes
 .../orca_composer_divider_vertical.9.png      | Bin 90 -> 0 bytes
 .../orca_composer_popup_active_normal.png     | Bin 509 -> 0 bytes
 .../orca_composer_popup_active_pressed.png    | Bin 754 -> 0 bytes
 .../orca_composer_popup_normal.png            | Bin 238 -> 0 bytes
 .../orca_composer_popup_pressed.png           | Bin 455 -> 0 bytes
 .../res/drawable-mdpi/orca_composer_tab.9.png | Bin 92 -> 0 bytes
 .../orca_composer_tab_active.9.png            | Bin 94 -> 0 bytes
 .../orca_composer_tab_dark.9.png              | Bin 95 -> 0 bytes
 .../orca_composer_tab_pressed.9.png           | Bin 95 -> 0 bytes
 .../orca_composer_top_divider.9.png           | Bin 103 -> 0 bytes
 .../orca_emoji_backspace_back_normal.png      | Bin 342 -> 0 bytes
 .../orca_emoji_backspace_front_normal.png     | Bin 664 -> 0 bytes
 .../orca_emoji_backspace_front_pressed.png    | Bin 541 -> 0 bytes
 .../orca_emoji_category_cars.png              | Bin 499 -> 0 bytes
 .../orca_emoji_category_nature.png            | Bin 729 -> 0 bytes
 .../orca_emoji_category_objects.png           | Bin 540 -> 0 bytes
 .../orca_emoji_category_people.png            | Bin 498 -> 0 bytes
 .../orca_emoji_category_punctuation.png       | Bin 391 -> 0 bytes
 .../orca_emoji_more_back_normal.png           | Bin 276 -> 0 bytes
 .../orca_emoji_more_front_normal.png          | Bin 560 -> 0 bytes
 .../orca_emoji_more_front_pressed.png         | Bin 432 -> 0 bytes
 .../keyboard_background_holo.9.png            | Bin 267 -> 0 bytes
 .../orca_attach_camera_normal.png             | Bin 3384 -> 0 bytes
 .../orca_attach_camera_pressed.png            | Bin 3390 -> 0 bytes
 .../orca_attach_location_normal.png           | Bin 1882 -> 0 bytes
 .../orca_attach_location_pressed.png          | Bin 3078 -> 0 bytes
 .../orca_attach_photo_normal.png              | Bin 2956 -> 0 bytes
 .../orca_attach_photo_pressed.png             | Bin 2947 -> 0 bytes
 .../drawable-xhdpi/orca_attachments_arrow.png | Bin 1126 -> 0 bytes
 .../orca_attachments_arrow_reversed.png       | Bin 1076 -> 0 bytes
 .../orca_composer_divider_horizontal.9.png    | Bin 95 -> 0 bytes
 .../orca_composer_divider_vertical.9.png      | Bin 95 -> 0 bytes
 .../orca_composer_popup_active_normal.png     | Bin 687 -> 0 bytes
 .../orca_composer_popup_active_pressed.png    | Bin 1365 -> 0 bytes
 .../orca_composer_popup_normal.png            | Bin 441 -> 0 bytes
 .../orca_composer_popup_pressed.png           | Bin 1088 -> 0 bytes
 .../drawable-xhdpi/orca_composer_tab.9.png    | Bin 106 -> 0 bytes
 .../orca_composer_tab_active.9.png            | Bin 109 -> 0 bytes
 .../orca_composer_tab_dark.9.png              | Bin 110 -> 0 bytes
 .../orca_composer_tab_pressed.9.png           | Bin 116 -> 0 bytes
 .../orca_composer_top_divider.9.png           | Bin 113 -> 0 bytes
 .../orca_emoji_backspace_back_normal.png      | Bin 1659 -> 0 bytes
 .../orca_emoji_backspace_front_normal.png     | Bin 1174 -> 0 bytes
 .../orca_emoji_backspace_front_pressed.png    | Bin 2289 -> 0 bytes
 .../orca_emoji_category_cars.png              | Bin 1806 -> 0 bytes
 .../orca_emoji_category_nature.png            | Bin 2551 -> 0 bytes
 .../orca_emoji_category_objects.png           | Bin 2023 -> 0 bytes
 .../orca_emoji_category_people.png            | Bin 2011 -> 0 bytes
 .../orca_emoji_category_punctuation.png       | Bin 1490 -> 0 bytes
 .../orca_emoji_more_back_normal.png           | Bin 1383 -> 0 bytes
 .../orca_emoji_more_front_normal.png          | Bin 1028 -> 0 bytes
 .../orca_emoji_more_front_pressed.png         | Bin 1987 -> 0 bytes
 .../orca_composer_attach_camera_button.xml    |   6 -
 .../orca_composer_attach_location_button.xml  |  21 ---
 .../orca_composer_attach_photo_button.xml     |   6 -
 .../drawable/orca_composer_popup_button.xml   |   6 -
 .../orca_composer_popup_button_active.xml     |   6 -
 .../orca_emoji_backspace_front_button.xml     |   5 -
 .../drawable/orca_emoji_more_front_button.xml |   5 -
 .../drawable/orca_emoji_tab_background.xml    |   7 -
 .../orca_emoji_tab_dark_background.xml        |  22 ---
 xabber/emojicon/src/main/res/values/attrs.xml |  11 --
 .../src/beta/res/values/application_title.xml |   1 -
 .../android/data/xaccount/HttpApiManager.java |   3 +-
 .../ui/fragment/RecentChatFragment.java       |   8 +-
 .../ic_account_box_outline_white_24dp.png     | Bin 514 -> 0 bytes
 .../ic_account_multiple_white_24dp.png        | Bin 410 -> 0 bytes
 .../ic_account_remove_white_24dp.png          | Bin 455 -> 0 bytes
 .../res/drawable-hdpi/ic_alert_white_24dp.png | Bin 526 -> 0 bytes
 .../ic_attachment_grey600_24dp.png            | Bin 773 -> 0 bytes
 .../main/res/drawable-hdpi/ic_avatar_2.png    | Bin 1269 -> 0 bytes
 .../main/res/drawable-hdpi/ic_avatar_3.png    | Bin 1650 -> 0 bytes
 .../main/res/drawable-hdpi/ic_avatar_4.png    | Bin 1644 -> 0 bytes
 .../main/res/drawable-hdpi/ic_avatar_5.png    | Bin 1414 -> 0 bytes
 .../main/res/drawable-hdpi/ic_avatar_muc.png  | Bin 2029 -> 0 bytes
 .../res/drawable-hdpi/ic_chat_white_24dp.png  | Bin 339 -> 0 bytes
 .../res/drawable-hdpi/ic_edit_white_24dp.png  | Bin 339 -> 0 bytes
 .../ic_help_circle_grey600_24dp.png           | Bin 1078 -> 0 bytes
 .../res/drawable-hdpi/ic_list_white_24dp.png  | Bin 207 -> 0 bytes
 .../drawable-hdpi/ic_search_white_24dp.png    | Bin 504 -> 0 bytes
 .../ic_stat_play_circle_fill.png              | Bin 697 -> 0 bytes
 .../ic_status_available_18dp.png              | Bin 848 -> 0 bytes
 .../res/drawable-hdpi/ic_status_away_18dp.png | Bin 892 -> 0 bytes
 .../res/drawable-hdpi/ic_status_chat_18dp.png | Bin 1074 -> 0 bytes
 .../ic_status_connection_18dp.png             | Bin 1067 -> 0 bytes
 .../res/drawable-hdpi/ic_status_dnd_18dp.png  | Bin 897 -> 0 bytes
 .../ic_status_unavailable_18dp.png            | Bin 820 -> 0 bytes
 .../res/drawable-hdpi/ic_status_xa_18dp.png   | Bin 930 -> 0 bytes
 .../ic_account_box_outline_white_24dp.png     | Bin 301 -> 0 bytes
 .../ic_account_multiple_white_24dp.png        | Bin 292 -> 0 bytes
 .../ic_account_remove_white_24dp.png          | Bin 353 -> 0 bytes
 .../res/drawable-mdpi/ic_alert_white_24dp.png | Bin 343 -> 0 bytes
 .../ic_attachment_grey600_24dp.png            | Bin 441 -> 0 bytes
 .../main/res/drawable-mdpi/ic_avatar_2.png    | Bin 855 -> 0 bytes
 .../main/res/drawable-mdpi/ic_avatar_3.png    | Bin 1076 -> 0 bytes
 .../main/res/drawable-mdpi/ic_avatar_4.png    | Bin 1053 -> 0 bytes
 .../main/res/drawable-mdpi/ic_avatar_5.png    | Bin 936 -> 0 bytes
 .../main/res/drawable-mdpi/ic_avatar_muc.png  | Bin 1337 -> 0 bytes
 .../res/drawable-mdpi/ic_chat_white_24dp.png  | Bin 230 -> 0 bytes
 .../res/drawable-mdpi/ic_edit_white_24dp.png  | Bin 248 -> 0 bytes
 .../ic_help_circle_grey600_24dp.png           | Bin 639 -> 0 bytes
 .../res/drawable-mdpi/ic_list_white_24dp.png  | Bin 171 -> 0 bytes
 .../drawable-mdpi/ic_search_white_24dp.png    | Bin 346 -> 0 bytes
 .../ic_stat_play_circle_fill.png              | Bin 431 -> 0 bytes
 .../ic_status_available_18dp.png              | Bin 554 -> 0 bytes
 .../res/drawable-mdpi/ic_status_away_18dp.png | Bin 605 -> 0 bytes
 .../res/drawable-mdpi/ic_status_chat_18dp.png | Bin 687 -> 0 bytes
 .../ic_status_connection_18dp.png             | Bin 656 -> 0 bytes
 .../res/drawable-mdpi/ic_status_dnd_18dp.png  | Bin 590 -> 0 bytes
 .../ic_status_unavailable_18dp.png            | Bin 541 -> 0 bytes
 .../res/drawable-mdpi/ic_status_xa_18dp.png   | Bin 607 -> 0 bytes
 .../ic_account_box_outline_white_24dp.png     | Bin 525 -> 0 bytes
 .../ic_account_multiple_white_24dp.png        | Bin 486 -> 0 bytes
 .../ic_account_remove_white_24dp.png          | Bin 666 -> 0 bytes
 .../drawable-xhdpi/ic_alert_white_24dp.png    | Bin 669 -> 0 bytes
 .../ic_attachment_grey600_24dp.png            | Bin 869 -> 0 bytes
 .../main/res/drawable-xhdpi/ic_avatar_2.png   | Bin 1791 -> 0 bytes
 .../main/res/drawable-xhdpi/ic_avatar_3.png   | Bin 2394 -> 0 bytes
 .../main/res/drawable-xhdpi/ic_avatar_4.png   | Bin 2329 -> 0 bytes
 .../main/res/drawable-xhdpi/ic_avatar_5.png   | Bin 2092 -> 0 bytes
 .../main/res/drawable-xhdpi/ic_avatar_muc.png | Bin 2868 -> 0 bytes
 .../res/drawable-xhdpi/ic_chat_white_24dp.png | Bin 391 -> 0 bytes
 .../res/drawable-xhdpi/ic_edit_white_24dp.png | Bin 355 -> 0 bytes
 .../ic_help_circle_grey600_24dp.png           | Bin 1316 -> 0 bytes
 .../res/drawable-xhdpi/ic_list_white_24dp.png | Bin 196 -> 0 bytes
 .../drawable-xhdpi/ic_search_white_24dp.png   | Bin 591 -> 0 bytes
 .../ic_stat_play_circle_fill.png              | Bin 1192 -> 0 bytes
 .../ic_status_available_18dp.png              | Bin 1148 -> 0 bytes
 .../drawable-xhdpi/ic_status_away_18dp.png    | Bin 1189 -> 0 bytes
 .../drawable-xhdpi/ic_status_chat_18dp.png    | Bin 1486 -> 0 bytes
 .../ic_status_connection_18dp.png             | Bin 1539 -> 0 bytes
 .../res/drawable-xhdpi/ic_status_dnd_18dp.png | Bin 1174 -> 0 bytes
 .../ic_status_unavailable_18dp.png            | Bin 1085 -> 0 bytes
 .../res/drawable-xhdpi/ic_status_xa_18dp.png  | Bin 1235 -> 0 bytes
 .../ic_account_box_outline_white_24dp.png     | Bin 711 -> 0 bytes
 .../ic_account_multiple_white_24dp.png        | Bin 693 -> 0 bytes
 .../ic_account_remove_white_24dp.png          | Bin 960 -> 0 bytes
 .../drawable-xxhdpi/ic_alert_white_24dp.png   | Bin 921 -> 0 bytes
 .../ic_attachment_grey600_24dp.png            | Bin 1385 -> 0 bytes
 .../main/res/drawable-xxhdpi/ic_avatar_2.png  | Bin 2877 -> 0 bytes
 .../main/res/drawable-xxhdpi/ic_avatar_3.png  | Bin 3578 -> 0 bytes
 .../main/res/drawable-xxhdpi/ic_avatar_4.png  | Bin 3604 -> 0 bytes
 .../main/res/drawable-xxhdpi/ic_avatar_5.png  | Bin 3110 -> 0 bytes
 .../res/drawable-xxhdpi/ic_avatar_muc.png     | Bin 4397 -> 0 bytes
 .../drawable-xxhdpi/ic_chat_white_24dp.png    | Bin 606 -> 0 bytes
 .../drawable-xxhdpi/ic_edit_white_24dp.png    | Bin 504 -> 0 bytes
 .../ic_help_circle_grey600_24dp.png           | Bin 1862 -> 0 bytes
 .../drawable-xxhdpi/ic_list_white_24dp.png    | Bin 230 -> 0 bytes
 .../drawable-xxhdpi/ic_search_white_24dp.png  | Bin 871 -> 0 bytes
 .../ic_stat_play_circle_fill.png              | Bin 2076 -> 0 bytes
 .../ic_status_available_18dp.png              | Bin 1804 -> 0 bytes
 .../drawable-xxhdpi/ic_status_away_18dp.png   | Bin 1874 -> 0 bytes
 .../drawable-xxhdpi/ic_status_chat_18dp.png   | Bin 2425 -> 0 bytes
 .../ic_status_connection_18dp.png             | Bin 2450 -> 0 bytes
 .../drawable-xxhdpi/ic_status_dnd_18dp.png    | Bin 1834 -> 0 bytes
 .../ic_status_unavailable_18dp.png            | Bin 1716 -> 0 bytes
 .../res/drawable-xxhdpi/ic_status_xa_18dp.png | Bin 1930 -> 0 bytes
 xabber/src/main/res/drawable/ic_cellphone.xml |   8 --
 .../res/drawable/ic_client_adium_10dp.xml     |   4 -
 .../res/drawable/ic_client_adium_18dp.xml     |   4 -
 .../drawable/ic_client_conversations_10dp.xml |   5 -
 .../drawable/ic_client_conversations_18dp.xml |   5 -
 .../res/drawable/ic_client_empathy_10dp.xml   |   9 --
 .../res/drawable/ic_client_empathy_18dp.xml   |   9 --
 .../res/drawable/ic_client_gajim_10dp.xml     |   4 -
 .../res/drawable/ic_client_gajim_18dp.xml     |   4 -
 .../res/drawable/ic_client_gtalk_10dp.xml     |   4 -
 .../res/drawable/ic_client_gtalk_18dp.xml     |   4 -
 .../res/drawable/ic_client_ichat_10dp.xml     |   4 -
 .../res/drawable/ic_client_ichat_18dp.xml     |   4 -
 .../src/main/res/drawable/ic_client_large.xml |  28 ----
 .../res/drawable/ic_client_miranda_10dp.xml   |   7 -
 .../res/drawable/ic_client_miranda_18dp.xml   |   7 -
 .../res/drawable/ic_client_pidgin_10dp.xml    |   7 -
 .../res/drawable/ic_client_pidgin_18dp.xml    |   7 -
 .../main/res/drawable/ic_client_psi_10dp.xml  |  19 ---
 .../main/res/drawable/ic_client_psi_18dp.xml  |  19 ---
 .../main/res/drawable/ic_client_qip_10dp.xml  |  15 --
 .../main/res/drawable/ic_client_qip_18dp.xml  |  15 --
 .../src/main/res/drawable/ic_client_small.xml |  28 ----
 .../main/res/drawable/ic_client_vip_10dp.xml  |   5 -
 .../main/res/drawable/ic_client_vip_18dp.xml  |   5 -
 .../res/drawable/ic_client_xabber_10dp.xml    |   4 -
 .../res/drawable/ic_client_xabber_18dp.xml    |   4 -
 .../res/drawable/ic_cloud_sync_lightgrey.xml  |   8 --
 xabber/src/main/res/drawable/ic_exit.xml      |   8 --
 .../src/main/res/drawable/ic_github_logo.xml  |  33 -----
 .../drawable/ic_info_outline_white_24dp.xml   |   9 --
 .../src/main/res/drawable/ic_logo_circle.xml  |  15 --
 xabber/src/main/res/drawable/ic_open_lock.xml |   8 --
 .../main/res/drawable/ic_status_border.xml    | 107 --------------
 .../res/drawable/ic_status_thin_border.xml    | 107 --------------
 .../res/drawable/ic_status_without_border.xml |  84 -----------
 xabber/src/main/res/drawable/ic_sync_grey.xml |   8 --
 .../main/res/drawable/intro_background.webp   | Bin 110060 -> 0 bytes
 .../main/res/drawable/rounded_background.xml  |  15 --
 .../main/res/drawable/xabber_logo_large.png   | Bin 126385 -> 0 bytes
 .../main/res/layout-land/activity_intro.xml   | 118 ----------------
 .../account_group_item_bottom_separator.xml   |  43 ------
 .../account_group_item_top_separator.xml      |   9 --
 xabber/src/main/res/layout/activity_intro.xml | 131 ------------------
 .../main/res/layout/fragment_contact_list.xml | 128 -----------------
 .../main/res/layout/include_login_fields.xml  | 117 ----------------
 .../item_account_bottom_in_contact_list.xml   |  55 --------
 .../src/main/res/layout/item_base_group.xml   |  72 ----------
 .../item_half_transparent_background.xml      |  32 -----
 .../layout/item_nav_drawer_xabber_account.xml |  95 -------------
 .../res/layout/preference_switch_layout.xml   |   8 --
 .../main/res/layout/toolbar_with_progress.xml |  27 ----
 xabber/src/main/res/menu/item_message.xml     |  25 ----
 .../main/res/menu/toolbar_recent_chats.xml    |   9 --
 xabber/src/main/res/raw/smack_config.xml      |  30 ----
 .../main/res/values-ar-rSA/account_editor.xml |  35 ++---
 .../main/res/values-ar-rSA/chat_viewer.xml    |  26 +---
 .../main/res/values-ar-rSA/contact_list.xml   |  22 +--
 .../main/res/values-ar-rSA/contact_viewer.xml |   7 +-
 .../src/main/res/values-ar-rSA/muc_editor.xml |   6 +-
 .../res/values-ar-rSA/notification_bar.xml    |   5 +-
 .../res/values-ar-rSA/preference_editor.xml   |  32 ++---
 .../main/res/values-be-rBY/account_editor.xml |  30 +---
 .../main/res/values-be-rBY/chat_viewer.xml    |  26 +---
 .../main/res/values-be-rBY/contact_list.xml   |  28 +---
 .../main/res/values-be-rBY/contact_viewer.xml |   7 +-
 .../src/main/res/values-be-rBY/muc_editor.xml |   6 +-
 .../res/values-be-rBY/notification_bar.xml    |   5 +-
 .../res/values-be-rBY/preference_editor.xml   |  35 ++---
 xabber/src/main/res/values-be-rBY/words.xml   |   1 -
 .../main/res/values-bg-rBG/account_editor.xml |  35 ++---
 .../main/res/values-bg-rBG/chat_viewer.xml    |  26 +---
 .../main/res/values-bg-rBG/contact_editor.xml |   6 +-
 .../main/res/values-bg-rBG/contact_list.xml   |  36 +----
 .../main/res/values-bg-rBG/contact_viewer.xml |   7 +-
 .../src/main/res/values-bg-rBG/muc_editor.xml |   6 +-
 .../res/values-bg-rBG/notification_bar.xml    |   5 +-
 .../res/values-bg-rBG/preference_editor.xml   |  40 ++----
 xabber/src/main/res/values-bg-rBG/words.xml   |   1 -
 .../main/res/values-ca-rES/account_editor.xml |  35 ++---
 .../main/res/values-ca-rES/chat_viewer.xml    |  26 +---
 .../main/res/values-ca-rES/contact_editor.xml |   6 +-
 .../main/res/values-ca-rES/contact_list.xml   |  30 +---
 .../main/res/values-ca-rES/contact_viewer.xml |   7 +-
 .../src/main/res/values-ca-rES/muc_editor.xml |   6 +-
 .../res/values-ca-rES/notification_bar.xml    |   5 +-
 .../res/values-ca-rES/preference_editor.xml   |  34 ++---
 .../main/res/values-cs-rCZ/account_editor.xml |  35 ++---
 .../main/res/values-cs-rCZ/chat_viewer.xml    |  26 +---
 .../main/res/values-cs-rCZ/contact_editor.xml |   6 +-
 .../main/res/values-cs-rCZ/contact_list.xml   |  36 +----
 .../main/res/values-cs-rCZ/contact_viewer.xml |   7 +-
 .../src/main/res/values-cs-rCZ/muc_editor.xml |   6 +-
 .../res/values-cs-rCZ/notification_bar.xml    |   5 +-
 .../res/values-cs-rCZ/preference_editor.xml   |  40 ++----
 xabber/src/main/res/values-cs-rCZ/words.xml   |   1 -
 .../main/res/values-de-rDE/account_editor.xml |  35 ++---
 .../main/res/values-de-rDE/chat_viewer.xml    |  26 +---
 .../main/res/values-de-rDE/contact_editor.xml |   6 +-
 .../main/res/values-de-rDE/contact_list.xml   |  36 +----
 .../main/res/values-de-rDE/contact_viewer.xml |   7 +-
 .../src/main/res/values-de-rDE/muc_editor.xml |   6 +-
 .../res/values-de-rDE/notification_bar.xml    |   5 +-
 .../res/values-de-rDE/preference_editor.xml   |  40 ++----
 xabber/src/main/res/values-de-rDE/words.xml   |   1 -
 .../main/res/values-el-rGR/account_editor.xml |  35 ++---
 .../main/res/values-el-rGR/chat_viewer.xml    |  26 +---
 .../main/res/values-el-rGR/contact_editor.xml |   6 +-
 .../main/res/values-el-rGR/contact_list.xml   |  36 +----
 .../main/res/values-el-rGR/contact_viewer.xml |   7 +-
 .../src/main/res/values-el-rGR/muc_editor.xml |   6 +-
 .../res/values-el-rGR/notification_bar.xml    |   5 +-
 .../res/values-el-rGR/preference_editor.xml   |  40 ++----
 xabber/src/main/res/values-el-rGR/words.xml   |   1 -
 .../main/res/values-es-rES/account_editor.xml |  35 ++---
 .../main/res/values-es-rES/chat_viewer.xml    |  26 +---
 .../main/res/values-es-rES/contact_editor.xml |   6 +-
 .../main/res/values-es-rES/contact_list.xml   |  36 +----
 .../main/res/values-es-rES/contact_viewer.xml |   7 +-
 .../src/main/res/values-es-rES/muc_editor.xml |   6 +-
 .../res/values-es-rES/notification_bar.xml    |   5 +-
 .../res/values-es-rES/preference_editor.xml   |  40 ++----
 xabber/src/main/res/values-es-rES/words.xml   |   1 -
 .../main/res/values-fa-rIR/account_editor.xml |   7 +-
 .../main/res/values-fa-rIR/chat_viewer.xml    |   3 +-
 .../main/res/values-fa-rIR/contact_list.xml   |  10 +-
 .../main/res/values-fa-rIR/contact_viewer.xml |   7 +-
 .../src/main/res/values-fa-rIR/muc_editor.xml |   1 -
 .../res/values-fa-rIR/preference_editor.xml   |   8 +-
 .../main/res/values-fr-rFR/account_editor.xml |  35 ++---
 .../main/res/values-fr-rFR/chat_viewer.xml    |  26 +---
 .../main/res/values-fr-rFR/contact_editor.xml |   6 +-
 .../main/res/values-fr-rFR/contact_list.xml   |  36 +----
 .../main/res/values-fr-rFR/contact_viewer.xml |   7 +-
 .../src/main/res/values-fr-rFR/muc_editor.xml |   6 +-
 .../res/values-fr-rFR/notification_bar.xml    |   5 +-
 .../res/values-fr-rFR/preference_editor.xml   |  40 ++----
 xabber/src/main/res/values-fr-rFR/words.xml   |   1 -
 .../main/res/values-hu-rHU/account_editor.xml |  35 ++---
 .../main/res/values-hu-rHU/chat_viewer.xml    |  26 +---
 .../main/res/values-hu-rHU/contact_editor.xml |   6 +-
 .../main/res/values-hu-rHU/contact_list.xml   |  30 +---
 .../main/res/values-hu-rHU/contact_viewer.xml |   7 +-
 .../src/main/res/values-hu-rHU/muc_editor.xml |   6 +-
 .../res/values-hu-rHU/notification_bar.xml    |   5 +-
 .../res/values-hu-rHU/preference_editor.xml   |  34 ++---
 .../main/res/values-hy-rAM/account_editor.xml |  13 +-
 .../main/res/values-hy-rAM/chat_viewer.xml    |   5 +-
 .../main/res/values-hy-rAM/contact_list.xml   |   3 +-
 .../main/res/values-hy-rAM/contact_viewer.xml |   6 +-
 .../res/values-hy-rAM/preference_editor.xml   |   3 +-
 .../main/res/values-in-rID/account_editor.xml |  35 ++---
 .../main/res/values-in-rID/chat_viewer.xml    |  26 +---
 .../main/res/values-in-rID/contact_editor.xml |   6 +-
 .../main/res/values-in-rID/contact_list.xml   |  36 +----
 .../main/res/values-in-rID/contact_viewer.xml |   7 +-
 .../src/main/res/values-in-rID/muc_editor.xml |   6 +-
 .../res/values-in-rID/notification_bar.xml    |   5 +-
 .../res/values-in-rID/preference_editor.xml   |  40 ++----
 xabber/src/main/res/values-in-rID/words.xml   |   1 -
 .../main/res/values-it-rIT/account_editor.xml |  36 ++---
 .../main/res/values-it-rIT/chat_viewer.xml    |  26 +---
 .../main/res/values-it-rIT/contact_editor.xml |   6 +-
 .../main/res/values-it-rIT/contact_list.xml   |  36 +----
 .../main/res/values-it-rIT/contact_viewer.xml |   7 +-
 .../src/main/res/values-it-rIT/muc_editor.xml |   6 +-
 .../res/values-it-rIT/notification_bar.xml    |   5 +-
 .../res/values-it-rIT/preference_editor.xml   |  40 ++----
 xabber/src/main/res/values-it-rIT/words.xml   |   1 -
 .../main/res/values-iw-rIL/account_editor.xml |  36 ++---
 .../main/res/values-iw-rIL/chat_viewer.xml    |  26 +---
 .../main/res/values-iw-rIL/contact_editor.xml |   6 +-
 .../main/res/values-iw-rIL/contact_list.xml   |  36 +----
 .../main/res/values-iw-rIL/contact_viewer.xml |   7 +-
 .../src/main/res/values-iw-rIL/muc_editor.xml |   6 +-
 .../res/values-iw-rIL/notification_bar.xml    |   5 +-
 .../res/values-iw-rIL/preference_editor.xml   |  40 ++----
 xabber/src/main/res/values-iw-rIL/words.xml   |   1 -
 .../main/res/values-ja-rJP/account_editor.xml |  35 ++---
 .../main/res/values-ja-rJP/chat_viewer.xml    |  26 +---
 .../main/res/values-ja-rJP/contact_editor.xml |   6 +-
 .../main/res/values-ja-rJP/contact_list.xml   |  36 +----
 .../main/res/values-ja-rJP/contact_viewer.xml |   7 +-
 .../src/main/res/values-ja-rJP/muc_editor.xml |   6 +-
 .../res/values-ja-rJP/notification_bar.xml    |   5 +-
 .../res/values-ja-rJP/preference_editor.xml   |  40 ++----
 xabber/src/main/res/values-ja-rJP/words.xml   |   1 -
 .../main/res/values-lt-rLT/chat_viewer.xml    |  23 +--
 .../main/res/values-lt-rLT/contact_viewer.xml |   7 +-
 .../main/res/values-nb-rNO/account_editor.xml |  35 ++---
 .../main/res/values-nb-rNO/chat_viewer.xml    |  26 +---
 .../main/res/values-nb-rNO/contact_editor.xml |   6 +-
 .../main/res/values-nb-rNO/contact_list.xml   |  36 +----
 .../main/res/values-nb-rNO/contact_viewer.xml |   7 +-
 .../src/main/res/values-nb-rNO/muc_editor.xml |   6 +-
 .../res/values-nb-rNO/notification_bar.xml    |   5 +-
 .../res/values-nb-rNO/preference_editor.xml   |  40 ++----
 xabber/src/main/res/values-nb-rNO/words.xml   |   1 -
 .../main/res/values-nl-rNL/account_editor.xml |  35 ++---
 .../main/res/values-nl-rNL/chat_viewer.xml    |  26 +---
 .../main/res/values-nl-rNL/contact_editor.xml |   6 +-
 .../main/res/values-nl-rNL/contact_list.xml   |  36 +----
 .../main/res/values-nl-rNL/contact_viewer.xml |   7 +-
 .../src/main/res/values-nl-rNL/muc_editor.xml |   6 +-
 .../res/values-nl-rNL/notification_bar.xml    |   5 +-
 .../res/values-nl-rNL/preference_editor.xml   |  40 ++----
 xabber/src/main/res/values-nl-rNL/words.xml   |   1 -
 .../main/res/values-oc-rFR/account_editor.xml |  33 +----
 .../main/res/values-oc-rFR/chat_viewer.xml    |  26 +---
 .../main/res/values-oc-rFR/contact_editor.xml |   6 +-
 .../main/res/values-oc-rFR/contact_list.xml   |  22 +--
 .../main/res/values-oc-rFR/contact_viewer.xml |   7 +-
 .../src/main/res/values-oc-rFR/muc_editor.xml |   6 +-
 .../res/values-oc-rFR/notification_bar.xml    |   5 +-
 .../res/values-oc-rFR/preference_editor.xml   |  29 +---
 .../main/res/values-pl-rPL/account_editor.xml |  35 ++---
 .../main/res/values-pl-rPL/chat_viewer.xml    |  26 +---
 .../main/res/values-pl-rPL/contact_editor.xml |   6 +-
 .../main/res/values-pl-rPL/contact_list.xml   |  36 +----
 .../main/res/values-pl-rPL/contact_viewer.xml |   7 +-
 .../src/main/res/values-pl-rPL/muc_editor.xml |   6 +-
 .../res/values-pl-rPL/notification_bar.xml    |   5 +-
 .../res/values-pl-rPL/preference_editor.xml   |  40 ++----
 xabber/src/main/res/values-pl-rPL/words.xml   |   1 -
 .../main/res/values-pt-rBR/account_editor.xml |  33 +----
 .../main/res/values-pt-rBR/chat_viewer.xml    |  10 +-
 .../main/res/values-pt-rBR/contact_list.xml   |  19 +--
 .../main/res/values-pt-rBR/contact_viewer.xml |   7 +-
 .../src/main/res/values-pt-rBR/muc_editor.xml |   3 +-
 .../res/values-pt-rBR/notification_bar.xml    |   5 +-
 .../res/values-pt-rBR/preference_editor.xml   |  26 +---
 .../main/res/values-pt-rPT/account_editor.xml |  33 +----
 .../main/res/values-pt-rPT/chat_viewer.xml    |  26 +---
 .../main/res/values-pt-rPT/contact_editor.xml |   6 +-
 .../main/res/values-pt-rPT/contact_list.xml   |  22 +--
 .../main/res/values-pt-rPT/contact_viewer.xml |   7 +-
 .../src/main/res/values-pt-rPT/muc_editor.xml |   6 +-
 .../res/values-pt-rPT/notification_bar.xml    |   5 +-
 .../res/values-pt-rPT/preference_editor.xml   |  29 +---
 .../main/res/values-ro-rRO/account_editor.xml |  35 ++---
 .../main/res/values-ro-rRO/chat_viewer.xml    |  26 +---
 .../main/res/values-ro-rRO/contact_editor.xml |   6 +-
 .../main/res/values-ro-rRO/contact_list.xml   |  32 +----
 .../main/res/values-ro-rRO/contact_viewer.xml |   7 +-
 .../src/main/res/values-ro-rRO/muc_editor.xml |   6 +-
 .../res/values-ro-rRO/notification_bar.xml    |   5 +-
 .../res/values-ro-rRO/preference_editor.xml   |  34 ++---
 .../main/res/values-ru-rRU/account_editor.xml |  35 ++---
 .../main/res/values-ru-rRU/chat_viewer.xml    |  26 +---
 .../main/res/values-ru-rRU/contact_editor.xml |   6 +-
 .../main/res/values-ru-rRU/contact_list.xml   |  36 +----
 .../main/res/values-ru-rRU/contact_viewer.xml |   7 +-
 .../src/main/res/values-ru-rRU/muc_editor.xml |   6 +-
 .../res/values-ru-rRU/notification_bar.xml    |   5 +-
 .../res/values-ru-rRU/preference_editor.xml   |  41 ++----
 xabber/src/main/res/values-ru-rRU/words.xml   |   3 +-
 .../main/res/values-ru-rRU/xabber_account.xml |  84 +++--------
 .../main/res/values-sk-rSK/account_editor.xml |  35 ++---
 .../main/res/values-sk-rSK/chat_viewer.xml    |  26 +---
 .../main/res/values-sk-rSK/contact_editor.xml |   6 +-
 .../main/res/values-sk-rSK/contact_list.xml   |  36 +----
 .../main/res/values-sk-rSK/contact_viewer.xml |   7 +-
 .../src/main/res/values-sk-rSK/muc_editor.xml |   6 +-
 .../res/values-sk-rSK/notification_bar.xml    |   5 +-
 .../res/values-sk-rSK/preference_editor.xml   |  40 ++----
 xabber/src/main/res/values-sk-rSK/words.xml   |   1 -
 .../main/res/values-sr-rSP/account_editor.xml |  33 +----
 .../main/res/values-sr-rSP/chat_viewer.xml    |  26 +---
 .../main/res/values-sr-rSP/contact_editor.xml |   6 +-
 .../main/res/values-sr-rSP/contact_list.xml   |  30 +---
 .../main/res/values-sr-rSP/contact_viewer.xml |   7 +-
 .../src/main/res/values-sr-rSP/muc_editor.xml |   6 +-
 .../res/values-sr-rSP/notification_bar.xml    |   5 +-
 .../res/values-sr-rSP/preference_editor.xml   |  31 ++---
 .../main/res/values-sv-rSE/account_editor.xml |  36 ++---
 .../main/res/values-sv-rSE/chat_viewer.xml    |  26 +---
 .../main/res/values-sv-rSE/contact_editor.xml |   6 +-
 .../main/res/values-sv-rSE/contact_list.xml   |  30 +---
 .../main/res/values-sv-rSE/contact_viewer.xml |   7 +-
 .../src/main/res/values-sv-rSE/muc_editor.xml |   6 +-
 .../res/values-sv-rSE/notification_bar.xml    |   5 +-
 .../res/values-sv-rSE/preference_editor.xml   |  31 ++---
 .../main/res/values-ta-rIN/chat_viewer.xml    |  13 +-
 .../main/res/values-ta-rIN/contact_viewer.xml |   7 +-
 .../main/res/values-tr-rTR/account_editor.xml |  35 ++---
 .../main/res/values-tr-rTR/chat_viewer.xml    |  26 +---
 .../main/res/values-tr-rTR/contact_editor.xml |   6 +-
 .../main/res/values-tr-rTR/contact_list.xml   |  36 +----
 .../main/res/values-tr-rTR/contact_viewer.xml |   7 +-
 .../src/main/res/values-tr-rTR/muc_editor.xml |   6 +-
 .../res/values-tr-rTR/notification_bar.xml    |   5 +-
 .../res/values-tr-rTR/preference_editor.xml   |  40 ++----
 xabber/src/main/res/values-tr-rTR/words.xml   |   1 -
 .../main/res/values-uk-rUA/account_editor.xml |  35 ++---
 .../main/res/values-uk-rUA/chat_viewer.xml    |  26 +---
 .../main/res/values-uk-rUA/contact_editor.xml |   6 +-
 .../main/res/values-uk-rUA/contact_list.xml   |  32 +----
 .../main/res/values-uk-rUA/contact_viewer.xml |   7 +-
 .../src/main/res/values-uk-rUA/muc_editor.xml |   6 +-
 .../res/values-uk-rUA/notification_bar.xml    |   5 +-
 .../res/values-uk-rUA/preference_editor.xml   |  35 ++---
 .../main/res/values-vi-rVN/account_editor.xml |  35 ++---
 .../main/res/values-vi-rVN/chat_viewer.xml    |  26 +---
 .../main/res/values-vi-rVN/contact_editor.xml |   6 +-
 .../main/res/values-vi-rVN/contact_list.xml   |  22 +--
 .../main/res/values-vi-rVN/contact_viewer.xml |   7 +-
 .../src/main/res/values-vi-rVN/muc_editor.xml |   6 +-
 .../res/values-vi-rVN/notification_bar.xml    |   5 +-
 .../res/values-vi-rVN/preference_editor.xml   |  29 +---
 .../main/res/values-zh-rCN/account_editor.xml |  35 ++---
 .../main/res/values-zh-rCN/chat_viewer.xml    |  26 +---
 .../main/res/values-zh-rCN/contact_editor.xml |   6 +-
 .../main/res/values-zh-rCN/contact_list.xml   |  36 +----
 .../main/res/values-zh-rCN/contact_viewer.xml |   7 +-
 .../src/main/res/values-zh-rCN/muc_editor.xml |   6 +-
 .../res/values-zh-rCN/notification_bar.xml    |   5 +-
 .../res/values-zh-rCN/preference_editor.xml   |  40 ++----
 xabber/src/main/res/values-zh-rCN/words.xml   |   1 -
 .../main/res/values-zh-rTW/account_editor.xml |  30 +---
 .../main/res/values-zh-rTW/chat_viewer.xml    |  10 +-
 .../main/res/values-zh-rTW/contact_list.xml   |  19 +--
 .../main/res/values-zh-rTW/contact_viewer.xml |   7 +-
 .../src/main/res/values-zh-rTW/muc_editor.xml |   1 -
 .../res/values-zh-rTW/notification_bar.xml    |   5 +-
 .../res/values-zh-rTW/preference_editor.xml   |  26 +---
 xabber/src/main/res/values/account_editor.xml |  19 ---
 xabber/src/main/res/values/chat_viewer.xml    |  13 --
 xabber/src/main/res/values/contact_editor.xml |   4 -
 xabber/src/main/res/values/contact_list.xml   |  26 ----
 xabber/src/main/res/values/contact_viewer.xml |   3 -
 xabber/src/main/res/values/muc_editor.xml     |   2 -
 .../src/main/res/values/notification_bar.xml  |   3 -
 .../src/main/res/values/preference_editor.xml |  19 ---
 xabber/src/main/res/values/preferences.xml    |  56 +-------
 .../main/res/values/untraslatable_words.xml   |   2 -
 xabber/src/main/res/values/words.xml          |   1 -
 xabber/src/main/res/values/xabber_account.xml |  54 --------
 535 files changed, 1144 insertions(+), 5431 deletions(-)
 delete mode 100644 xabber/emojicon/src/main/res/drawable-hdpi/keyboard_background_holo.9.png
 delete mode 100644 xabber/emojicon/src/main/res/drawable-hdpi/orca_attach_camera_normal.png
 delete mode 100644 xabber/emojicon/src/main/res/drawable-hdpi/orca_attach_camera_pressed.png
 delete mode 100644 xabber/emojicon/src/main/res/drawable-hdpi/orca_attach_location_normal.png
 delete mode 100644 xabber/emojicon/src/main/res/drawable-hdpi/orca_attach_location_pressed.png
 delete mode 100644 xabber/emojicon/src/main/res/drawable-hdpi/orca_attach_photo_normal.png
 delete mode 100644 xabber/emojicon/src/main/res/drawable-hdpi/orca_attach_photo_pressed.png
 delete mode 100644 xabber/emojicon/src/main/res/drawable-hdpi/orca_attachments_arrow.png
 delete mode 100644 xabber/emojicon/src/main/res/drawable-hdpi/orca_attachments_arrow_reversed.png
 delete mode 100644 xabber/emojicon/src/main/res/drawable-hdpi/orca_composer_divider_horizontal.9.png
 delete mode 100644 xabber/emojicon/src/main/res/drawable-hdpi/orca_composer_divider_vertical.9.png
 delete mode 100644 xabber/emojicon/src/main/res/drawable-hdpi/orca_composer_popup_active_normal.png
 delete mode 100644 xabber/emojicon/src/main/res/drawable-hdpi/orca_composer_popup_active_pressed.png
 delete mode 100644 xabber/emojicon/src/main/res/drawable-hdpi/orca_composer_popup_normal.png
 delete mode 100644 xabber/emojicon/src/main/res/drawable-hdpi/orca_composer_popup_pressed.png
 delete mode 100644 xabber/emojicon/src/main/res/drawable-hdpi/orca_composer_tab.9.png
 delete mode 100644 xabber/emojicon/src/main/res/drawable-hdpi/orca_composer_tab_active.9.png
 delete mode 100644 xabber/emojicon/src/main/res/drawable-hdpi/orca_composer_tab_dark.9.png
 delete mode 100644 xabber/emojicon/src/main/res/drawable-hdpi/orca_composer_tab_pressed.9.png
 delete mode 100644 xabber/emojicon/src/main/res/drawable-hdpi/orca_composer_top_divider.9.png
 delete mode 100644 xabber/emojicon/src/main/res/drawable-hdpi/orca_emoji_backspace_back_normal.png
 delete mode 100644 xabber/emojicon/src/main/res/drawable-hdpi/orca_emoji_backspace_front_normal.png
 delete mode 100644 xabber/emojicon/src/main/res/drawable-hdpi/orca_emoji_backspace_front_pressed.png
 delete mode 100644 xabber/emojicon/src/main/res/drawable-hdpi/orca_emoji_category_cars.png
 delete mode 100644 xabber/emojicon/src/main/res/drawable-hdpi/orca_emoji_category_nature.png
 delete mode 100644 xabber/emojicon/src/main/res/drawable-hdpi/orca_emoji_category_objects.png
 delete mode 100644 xabber/emojicon/src/main/res/drawable-hdpi/orca_emoji_category_people.png
 delete mode 100644 xabber/emojicon/src/main/res/drawable-hdpi/orca_emoji_category_punctuation.png
 delete mode 100644 xabber/emojicon/src/main/res/drawable-hdpi/orca_emoji_more_back_normal.png
 delete mode 100644 xabber/emojicon/src/main/res/drawable-hdpi/orca_emoji_more_front_normal.png
 delete mode 100644 xabber/emojicon/src/main/res/drawable-hdpi/orca_emoji_more_front_pressed.png
 delete mode 100644 xabber/emojicon/src/main/res/drawable-mdpi/keyboard_background_holo.9.png
 delete mode 100644 xabber/emojicon/src/main/res/drawable-mdpi/orca_attach_camera_normal.png
 delete mode 100644 xabber/emojicon/src/main/res/drawable-mdpi/orca_attach_camera_pressed.png
 delete mode 100644 xabber/emojicon/src/main/res/drawable-mdpi/orca_attach_location_normal.png
 delete mode 100644 xabber/emojicon/src/main/res/drawable-mdpi/orca_attach_location_pressed.png
 delete mode 100644 xabber/emojicon/src/main/res/drawable-mdpi/orca_attach_photo_normal.png
 delete mode 100644 xabber/emojicon/src/main/res/drawable-mdpi/orca_attach_photo_pressed.png
 delete mode 100644 xabber/emojicon/src/main/res/drawable-mdpi/orca_attachments_arrow.png
 delete mode 100644 xabber/emojicon/src/main/res/drawable-mdpi/orca_attachments_arrow_reversed.png
 delete mode 100644 xabber/emojicon/src/main/res/drawable-mdpi/orca_composer_divider_horizontal.9.png
 delete mode 100644 xabber/emojicon/src/main/res/drawable-mdpi/orca_composer_divider_vertical.9.png
 delete mode 100644 xabber/emojicon/src/main/res/drawable-mdpi/orca_composer_popup_active_normal.png
 delete mode 100644 xabber/emojicon/src/main/res/drawable-mdpi/orca_composer_popup_active_pressed.png
 delete mode 100644 xabber/emojicon/src/main/res/drawable-mdpi/orca_composer_popup_normal.png
 delete mode 100644 xabber/emojicon/src/main/res/drawable-mdpi/orca_composer_popup_pressed.png
 delete mode 100644 xabber/emojicon/src/main/res/drawable-mdpi/orca_composer_tab.9.png
 delete mode 100644 xabber/emojicon/src/main/res/drawable-mdpi/orca_composer_tab_active.9.png
 delete mode 100644 xabber/emojicon/src/main/res/drawable-mdpi/orca_composer_tab_dark.9.png
 delete mode 100644 xabber/emojicon/src/main/res/drawable-mdpi/orca_composer_tab_pressed.9.png
 delete mode 100644 xabber/emojicon/src/main/res/drawable-mdpi/orca_composer_top_divider.9.png
 delete mode 100644 xabber/emojicon/src/main/res/drawable-mdpi/orca_emoji_backspace_back_normal.png
 delete mode 100644 xabber/emojicon/src/main/res/drawable-mdpi/orca_emoji_backspace_front_normal.png
 delete mode 100644 xabber/emojicon/src/main/res/drawable-mdpi/orca_emoji_backspace_front_pressed.png
 delete mode 100644 xabber/emojicon/src/main/res/drawable-mdpi/orca_emoji_category_cars.png
 delete mode 100644 xabber/emojicon/src/main/res/drawable-mdpi/orca_emoji_category_nature.png
 delete mode 100644 xabber/emojicon/src/main/res/drawable-mdpi/orca_emoji_category_objects.png
 delete mode 100644 xabber/emojicon/src/main/res/drawable-mdpi/orca_emoji_category_people.png
 delete mode 100644 xabber/emojicon/src/main/res/drawable-mdpi/orca_emoji_category_punctuation.png
 delete mode 100644 xabber/emojicon/src/main/res/drawable-mdpi/orca_emoji_more_back_normal.png
 delete mode 100644 xabber/emojicon/src/main/res/drawable-mdpi/orca_emoji_more_front_normal.png
 delete mode 100644 xabber/emojicon/src/main/res/drawable-mdpi/orca_emoji_more_front_pressed.png
 delete mode 100644 xabber/emojicon/src/main/res/drawable-xhdpi/keyboard_background_holo.9.png
 delete mode 100644 xabber/emojicon/src/main/res/drawable-xhdpi/orca_attach_camera_normal.png
 delete mode 100644 xabber/emojicon/src/main/res/drawable-xhdpi/orca_attach_camera_pressed.png
 delete mode 100644 xabber/emojicon/src/main/res/drawable-xhdpi/orca_attach_location_normal.png
 delete mode 100644 xabber/emojicon/src/main/res/drawable-xhdpi/orca_attach_location_pressed.png
 delete mode 100644 xabber/emojicon/src/main/res/drawable-xhdpi/orca_attach_photo_normal.png
 delete mode 100644 xabber/emojicon/src/main/res/drawable-xhdpi/orca_attach_photo_pressed.png
 delete mode 100644 xabber/emojicon/src/main/res/drawable-xhdpi/orca_attachments_arrow.png
 delete mode 100644 xabber/emojicon/src/main/res/drawable-xhdpi/orca_attachments_arrow_reversed.png
 delete mode 100644 xabber/emojicon/src/main/res/drawable-xhdpi/orca_composer_divider_horizontal.9.png
 delete mode 100644 xabber/emojicon/src/main/res/drawable-xhdpi/orca_composer_divider_vertical.9.png
 delete mode 100644 xabber/emojicon/src/main/res/drawable-xhdpi/orca_composer_popup_active_normal.png
 delete mode 100644 xabber/emojicon/src/main/res/drawable-xhdpi/orca_composer_popup_active_pressed.png
 delete mode 100644 xabber/emojicon/src/main/res/drawable-xhdpi/orca_composer_popup_normal.png
 delete mode 100644 xabber/emojicon/src/main/res/drawable-xhdpi/orca_composer_popup_pressed.png
 delete mode 100644 xabber/emojicon/src/main/res/drawable-xhdpi/orca_composer_tab.9.png
 delete mode 100644 xabber/emojicon/src/main/res/drawable-xhdpi/orca_composer_tab_active.9.png
 delete mode 100644 xabber/emojicon/src/main/res/drawable-xhdpi/orca_composer_tab_dark.9.png
 delete mode 100644 xabber/emojicon/src/main/res/drawable-xhdpi/orca_composer_tab_pressed.9.png
 delete mode 100644 xabber/emojicon/src/main/res/drawable-xhdpi/orca_composer_top_divider.9.png
 delete mode 100644 xabber/emojicon/src/main/res/drawable-xhdpi/orca_emoji_backspace_back_normal.png
 delete mode 100644 xabber/emojicon/src/main/res/drawable-xhdpi/orca_emoji_backspace_front_normal.png
 delete mode 100644 xabber/emojicon/src/main/res/drawable-xhdpi/orca_emoji_backspace_front_pressed.png
 delete mode 100644 xabber/emojicon/src/main/res/drawable-xhdpi/orca_emoji_category_cars.png
 delete mode 100644 xabber/emojicon/src/main/res/drawable-xhdpi/orca_emoji_category_nature.png
 delete mode 100644 xabber/emojicon/src/main/res/drawable-xhdpi/orca_emoji_category_objects.png
 delete mode 100644 xabber/emojicon/src/main/res/drawable-xhdpi/orca_emoji_category_people.png
 delete mode 100644 xabber/emojicon/src/main/res/drawable-xhdpi/orca_emoji_category_punctuation.png
 delete mode 100644 xabber/emojicon/src/main/res/drawable-xhdpi/orca_emoji_more_back_normal.png
 delete mode 100644 xabber/emojicon/src/main/res/drawable-xhdpi/orca_emoji_more_front_normal.png
 delete mode 100644 xabber/emojicon/src/main/res/drawable-xhdpi/orca_emoji_more_front_pressed.png
 delete mode 100644 xabber/emojicon/src/main/res/drawable/orca_composer_attach_camera_button.xml
 delete mode 100644 xabber/emojicon/src/main/res/drawable/orca_composer_attach_location_button.xml
 delete mode 100644 xabber/emojicon/src/main/res/drawable/orca_composer_attach_photo_button.xml
 delete mode 100644 xabber/emojicon/src/main/res/drawable/orca_composer_popup_button.xml
 delete mode 100644 xabber/emojicon/src/main/res/drawable/orca_composer_popup_button_active.xml
 delete mode 100644 xabber/emojicon/src/main/res/drawable/orca_emoji_backspace_front_button.xml
 delete mode 100644 xabber/emojicon/src/main/res/drawable/orca_emoji_more_front_button.xml
 delete mode 100644 xabber/emojicon/src/main/res/drawable/orca_emoji_tab_background.xml
 delete mode 100644 xabber/emojicon/src/main/res/drawable/orca_emoji_tab_dark_background.xml
 delete mode 100644 xabber/src/main/res/drawable-hdpi/ic_account_box_outline_white_24dp.png
 delete mode 100644 xabber/src/main/res/drawable-hdpi/ic_account_multiple_white_24dp.png
 delete mode 100644 xabber/src/main/res/drawable-hdpi/ic_account_remove_white_24dp.png
 delete mode 100644 xabber/src/main/res/drawable-hdpi/ic_alert_white_24dp.png
 delete mode 100644 xabber/src/main/res/drawable-hdpi/ic_attachment_grey600_24dp.png
 delete mode 100644 xabber/src/main/res/drawable-hdpi/ic_avatar_2.png
 delete mode 100644 xabber/src/main/res/drawable-hdpi/ic_avatar_3.png
 delete mode 100644 xabber/src/main/res/drawable-hdpi/ic_avatar_4.png
 delete mode 100644 xabber/src/main/res/drawable-hdpi/ic_avatar_5.png
 delete mode 100644 xabber/src/main/res/drawable-hdpi/ic_avatar_muc.png
 delete mode 100644 xabber/src/main/res/drawable-hdpi/ic_chat_white_24dp.png
 delete mode 100644 xabber/src/main/res/drawable-hdpi/ic_edit_white_24dp.png
 delete mode 100644 xabber/src/main/res/drawable-hdpi/ic_help_circle_grey600_24dp.png
 delete mode 100644 xabber/src/main/res/drawable-hdpi/ic_list_white_24dp.png
 delete mode 100644 xabber/src/main/res/drawable-hdpi/ic_search_white_24dp.png
 delete mode 100644 xabber/src/main/res/drawable-hdpi/ic_stat_play_circle_fill.png
 delete mode 100644 xabber/src/main/res/drawable-hdpi/ic_status_available_18dp.png
 delete mode 100644 xabber/src/main/res/drawable-hdpi/ic_status_away_18dp.png
 delete mode 100644 xabber/src/main/res/drawable-hdpi/ic_status_chat_18dp.png
 delete mode 100644 xabber/src/main/res/drawable-hdpi/ic_status_connection_18dp.png
 delete mode 100644 xabber/src/main/res/drawable-hdpi/ic_status_dnd_18dp.png
 delete mode 100644 xabber/src/main/res/drawable-hdpi/ic_status_unavailable_18dp.png
 delete mode 100644 xabber/src/main/res/drawable-hdpi/ic_status_xa_18dp.png
 delete mode 100644 xabber/src/main/res/drawable-mdpi/ic_account_box_outline_white_24dp.png
 delete mode 100644 xabber/src/main/res/drawable-mdpi/ic_account_multiple_white_24dp.png
 delete mode 100644 xabber/src/main/res/drawable-mdpi/ic_account_remove_white_24dp.png
 delete mode 100644 xabber/src/main/res/drawable-mdpi/ic_alert_white_24dp.png
 delete mode 100644 xabber/src/main/res/drawable-mdpi/ic_attachment_grey600_24dp.png
 delete mode 100644 xabber/src/main/res/drawable-mdpi/ic_avatar_2.png
 delete mode 100644 xabber/src/main/res/drawable-mdpi/ic_avatar_3.png
 delete mode 100644 xabber/src/main/res/drawable-mdpi/ic_avatar_4.png
 delete mode 100644 xabber/src/main/res/drawable-mdpi/ic_avatar_5.png
 delete mode 100644 xabber/src/main/res/drawable-mdpi/ic_avatar_muc.png
 delete mode 100644 xabber/src/main/res/drawable-mdpi/ic_chat_white_24dp.png
 delete mode 100644 xabber/src/main/res/drawable-mdpi/ic_edit_white_24dp.png
 delete mode 100644 xabber/src/main/res/drawable-mdpi/ic_help_circle_grey600_24dp.png
 delete mode 100644 xabber/src/main/res/drawable-mdpi/ic_list_white_24dp.png
 delete mode 100644 xabber/src/main/res/drawable-mdpi/ic_search_white_24dp.png
 delete mode 100644 xabber/src/main/res/drawable-mdpi/ic_stat_play_circle_fill.png
 delete mode 100644 xabber/src/main/res/drawable-mdpi/ic_status_available_18dp.png
 delete mode 100644 xabber/src/main/res/drawable-mdpi/ic_status_away_18dp.png
 delete mode 100644 xabber/src/main/res/drawable-mdpi/ic_status_chat_18dp.png
 delete mode 100644 xabber/src/main/res/drawable-mdpi/ic_status_connection_18dp.png
 delete mode 100644 xabber/src/main/res/drawable-mdpi/ic_status_dnd_18dp.png
 delete mode 100644 xabber/src/main/res/drawable-mdpi/ic_status_unavailable_18dp.png
 delete mode 100644 xabber/src/main/res/drawable-mdpi/ic_status_xa_18dp.png
 delete mode 100644 xabber/src/main/res/drawable-xhdpi/ic_account_box_outline_white_24dp.png
 delete mode 100644 xabber/src/main/res/drawable-xhdpi/ic_account_multiple_white_24dp.png
 delete mode 100644 xabber/src/main/res/drawable-xhdpi/ic_account_remove_white_24dp.png
 delete mode 100644 xabber/src/main/res/drawable-xhdpi/ic_alert_white_24dp.png
 delete mode 100644 xabber/src/main/res/drawable-xhdpi/ic_attachment_grey600_24dp.png
 delete mode 100644 xabber/src/main/res/drawable-xhdpi/ic_avatar_2.png
 delete mode 100644 xabber/src/main/res/drawable-xhdpi/ic_avatar_3.png
 delete mode 100644 xabber/src/main/res/drawable-xhdpi/ic_avatar_4.png
 delete mode 100644 xabber/src/main/res/drawable-xhdpi/ic_avatar_5.png
 delete mode 100644 xabber/src/main/res/drawable-xhdpi/ic_avatar_muc.png
 delete mode 100644 xabber/src/main/res/drawable-xhdpi/ic_chat_white_24dp.png
 delete mode 100644 xabber/src/main/res/drawable-xhdpi/ic_edit_white_24dp.png
 delete mode 100644 xabber/src/main/res/drawable-xhdpi/ic_help_circle_grey600_24dp.png
 delete mode 100644 xabber/src/main/res/drawable-xhdpi/ic_list_white_24dp.png
 delete mode 100644 xabber/src/main/res/drawable-xhdpi/ic_search_white_24dp.png
 delete mode 100644 xabber/src/main/res/drawable-xhdpi/ic_stat_play_circle_fill.png
 delete mode 100644 xabber/src/main/res/drawable-xhdpi/ic_status_available_18dp.png
 delete mode 100644 xabber/src/main/res/drawable-xhdpi/ic_status_away_18dp.png
 delete mode 100644 xabber/src/main/res/drawable-xhdpi/ic_status_chat_18dp.png
 delete mode 100644 xabber/src/main/res/drawable-xhdpi/ic_status_connection_18dp.png
 delete mode 100644 xabber/src/main/res/drawable-xhdpi/ic_status_dnd_18dp.png
 delete mode 100644 xabber/src/main/res/drawable-xhdpi/ic_status_unavailable_18dp.png
 delete mode 100644 xabber/src/main/res/drawable-xhdpi/ic_status_xa_18dp.png
 delete mode 100644 xabber/src/main/res/drawable-xxhdpi/ic_account_box_outline_white_24dp.png
 delete mode 100644 xabber/src/main/res/drawable-xxhdpi/ic_account_multiple_white_24dp.png
 delete mode 100644 xabber/src/main/res/drawable-xxhdpi/ic_account_remove_white_24dp.png
 delete mode 100644 xabber/src/main/res/drawable-xxhdpi/ic_alert_white_24dp.png
 delete mode 100644 xabber/src/main/res/drawable-xxhdpi/ic_attachment_grey600_24dp.png
 delete mode 100644 xabber/src/main/res/drawable-xxhdpi/ic_avatar_2.png
 delete mode 100644 xabber/src/main/res/drawable-xxhdpi/ic_avatar_3.png
 delete mode 100644 xabber/src/main/res/drawable-xxhdpi/ic_avatar_4.png
 delete mode 100644 xabber/src/main/res/drawable-xxhdpi/ic_avatar_5.png
 delete mode 100644 xabber/src/main/res/drawable-xxhdpi/ic_avatar_muc.png
 delete mode 100644 xabber/src/main/res/drawable-xxhdpi/ic_chat_white_24dp.png
 delete mode 100644 xabber/src/main/res/drawable-xxhdpi/ic_edit_white_24dp.png
 delete mode 100644 xabber/src/main/res/drawable-xxhdpi/ic_help_circle_grey600_24dp.png
 delete mode 100644 xabber/src/main/res/drawable-xxhdpi/ic_list_white_24dp.png
 delete mode 100644 xabber/src/main/res/drawable-xxhdpi/ic_search_white_24dp.png
 delete mode 100644 xabber/src/main/res/drawable-xxhdpi/ic_stat_play_circle_fill.png
 delete mode 100644 xabber/src/main/res/drawable-xxhdpi/ic_status_available_18dp.png
 delete mode 100644 xabber/src/main/res/drawable-xxhdpi/ic_status_away_18dp.png
 delete mode 100644 xabber/src/main/res/drawable-xxhdpi/ic_status_chat_18dp.png
 delete mode 100644 xabber/src/main/res/drawable-xxhdpi/ic_status_connection_18dp.png
 delete mode 100644 xabber/src/main/res/drawable-xxhdpi/ic_status_dnd_18dp.png
 delete mode 100644 xabber/src/main/res/drawable-xxhdpi/ic_status_unavailable_18dp.png
 delete mode 100644 xabber/src/main/res/drawable-xxhdpi/ic_status_xa_18dp.png
 delete mode 100644 xabber/src/main/res/drawable/ic_cellphone.xml
 delete mode 100644 xabber/src/main/res/drawable/ic_client_adium_10dp.xml
 delete mode 100644 xabber/src/main/res/drawable/ic_client_adium_18dp.xml
 delete mode 100644 xabber/src/main/res/drawable/ic_client_conversations_10dp.xml
 delete mode 100644 xabber/src/main/res/drawable/ic_client_conversations_18dp.xml
 delete mode 100644 xabber/src/main/res/drawable/ic_client_empathy_10dp.xml
 delete mode 100644 xabber/src/main/res/drawable/ic_client_empathy_18dp.xml
 delete mode 100644 xabber/src/main/res/drawable/ic_client_gajim_10dp.xml
 delete mode 100644 xabber/src/main/res/drawable/ic_client_gajim_18dp.xml
 delete mode 100644 xabber/src/main/res/drawable/ic_client_gtalk_10dp.xml
 delete mode 100644 xabber/src/main/res/drawable/ic_client_gtalk_18dp.xml
 delete mode 100644 xabber/src/main/res/drawable/ic_client_ichat_10dp.xml
 delete mode 100644 xabber/src/main/res/drawable/ic_client_ichat_18dp.xml
 delete mode 100644 xabber/src/main/res/drawable/ic_client_large.xml
 delete mode 100644 xabber/src/main/res/drawable/ic_client_miranda_10dp.xml
 delete mode 100644 xabber/src/main/res/drawable/ic_client_miranda_18dp.xml
 delete mode 100644 xabber/src/main/res/drawable/ic_client_pidgin_10dp.xml
 delete mode 100644 xabber/src/main/res/drawable/ic_client_pidgin_18dp.xml
 delete mode 100644 xabber/src/main/res/drawable/ic_client_psi_10dp.xml
 delete mode 100644 xabber/src/main/res/drawable/ic_client_psi_18dp.xml
 delete mode 100644 xabber/src/main/res/drawable/ic_client_qip_10dp.xml
 delete mode 100644 xabber/src/main/res/drawable/ic_client_qip_18dp.xml
 delete mode 100644 xabber/src/main/res/drawable/ic_client_small.xml
 delete mode 100644 xabber/src/main/res/drawable/ic_client_vip_10dp.xml
 delete mode 100644 xabber/src/main/res/drawable/ic_client_vip_18dp.xml
 delete mode 100644 xabber/src/main/res/drawable/ic_client_xabber_10dp.xml
 delete mode 100644 xabber/src/main/res/drawable/ic_client_xabber_18dp.xml
 delete mode 100644 xabber/src/main/res/drawable/ic_cloud_sync_lightgrey.xml
 delete mode 100644 xabber/src/main/res/drawable/ic_exit.xml
 delete mode 100644 xabber/src/main/res/drawable/ic_github_logo.xml
 delete mode 100644 xabber/src/main/res/drawable/ic_info_outline_white_24dp.xml
 delete mode 100644 xabber/src/main/res/drawable/ic_logo_circle.xml
 delete mode 100644 xabber/src/main/res/drawable/ic_open_lock.xml
 delete mode 100644 xabber/src/main/res/drawable/ic_status_border.xml
 delete mode 100644 xabber/src/main/res/drawable/ic_status_thin_border.xml
 delete mode 100644 xabber/src/main/res/drawable/ic_status_without_border.xml
 delete mode 100644 xabber/src/main/res/drawable/ic_sync_grey.xml
 delete mode 100644 xabber/src/main/res/drawable/intro_background.webp
 delete mode 100644 xabber/src/main/res/drawable/rounded_background.xml
 delete mode 100644 xabber/src/main/res/drawable/xabber_logo_large.png
 delete mode 100644 xabber/src/main/res/layout-land/activity_intro.xml
 delete mode 100644 xabber/src/main/res/layout/account_group_item_bottom_separator.xml
 delete mode 100644 xabber/src/main/res/layout/account_group_item_top_separator.xml
 delete mode 100644 xabber/src/main/res/layout/activity_intro.xml
 delete mode 100644 xabber/src/main/res/layout/fragment_contact_list.xml
 delete mode 100644 xabber/src/main/res/layout/include_login_fields.xml
 delete mode 100644 xabber/src/main/res/layout/item_account_bottom_in_contact_list.xml
 delete mode 100644 xabber/src/main/res/layout/item_base_group.xml
 delete mode 100644 xabber/src/main/res/layout/item_half_transparent_background.xml
 delete mode 100644 xabber/src/main/res/layout/item_nav_drawer_xabber_account.xml
 delete mode 100644 xabber/src/main/res/layout/preference_switch_layout.xml
 delete mode 100644 xabber/src/main/res/layout/toolbar_with_progress.xml
 delete mode 100644 xabber/src/main/res/menu/item_message.xml
 delete mode 100644 xabber/src/main/res/menu/toolbar_recent_chats.xml
 delete mode 100644 xabber/src/main/res/raw/smack_config.xml

diff --git a/xabber/emojicon/src/main/res/drawable-hdpi/keyboard_background_holo.9.png b/xabber/emojicon/src/main/res/drawable-hdpi/keyboard_background_holo.9.png
deleted file mode 100644
index 73868751cec4f61381e4e7313d4e41db56a91887..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 227
zcmeAS@N?(olHy`uVBq!ia0vp^tPBi{dK_#(mRs?SB|wU$*vT`50|;t3QaXTq&H|6f
zVg?58P7r1^KY4mBP_Wh0#W5tJ_3aEtt_B4G*ZCI{_x#V?b9PIiV#<}IMJInUEADZ9
zU(YI@l*V9IBhnDH`r`7f$Bw1wEj;@mv#ep>gMahyeTc3;;NkgZ=J{CnH`-o7!M`;F
z1%6lcs(cbn-L`t!dW~Y=Qhrg*2W=Y9KTW*G{eSwL`~!zBFSm4bbUc``;Y;bBqo){e
X9B9$Vd{f2^bP$85tDnm{r-UW|<yKg~

diff --git a/xabber/emojicon/src/main/res/drawable-hdpi/orca_attach_camera_normal.png b/xabber/emojicon/src/main/res/drawable-hdpi/orca_attach_camera_normal.png
deleted file mode 100644
index be062995fbc7cf7fbd0f084599a1b8101258cd75..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2021
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

diff --git a/xabber/emojicon/src/main/res/drawable-hdpi/orca_attach_camera_pressed.png b/xabber/emojicon/src/main/res/drawable-hdpi/orca_attach_camera_pressed.png
deleted file mode 100644
index 30ac6db915f2e52162290b77dc82328f31ff4f5e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2008
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
NlB*Nik?9b8?f+kd#SH)e

diff --git a/xabber/emojicon/src/main/res/drawable-hdpi/orca_attach_location_normal.png b/xabber/emojicon/src/main/res/drawable-hdpi/orca_attach_location_normal.png
deleted file mode 100644
index c52740f2a5f00535fb7170b21d8453c7f44663e3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1676
zcma)+{XY|k1IJa)^J7Mcnx|}~yP`1+NqHLXEUIDUdD#Op$90}X*Y>qh8@_Dfh?QoC
zWjoJ@JY;TLk>=qhg?UKQA`Nx*AKd5l`g}gWeLlavi9ZE+X{s5kDJUpt`gos3d~M1%
zt0;X<>Fx;?1qG$^K4;y7ewkdYz+N>81`JZ=xO%0A1l|0j{mPh(3+GfWZQKBv*OBh{
zH@Eww?2q#Icego{4!i)+Cnt1|spXEDWBRo*8Hx~+fx3a_Bw`;I+!Z=?53-&WZXWjp
zo4Ozn_+`35{k&7q)*rJrU4<^Z>b+mz|AVTa7%Ud;0D&CG#K(6rYis8<Q4T}$nD*#y
zzWvI_D~s~xkx`*^8DC7B9;vpi6dt|^0$}D8`ST|ZugD8=_Y6n3m6B1%tuZAiu|$%o
zc#e)RK6tS3_7L1^%W2|tlfX7-_t=zWs0BLAM%gLvPJrtE4Ir`;m*y?7Ez6Kzm*}HV
zC=TdT-ZPOX@%~II^4QeDoY8{G8TmB&x#eY`vXhS0{_)x3?2r6Rq9|gMcbH{|ha4hV
z*2LA9WCVHsW`yl)W@0dy``2H=BJX%h`L0CbXn|>dCwm2ENkaSE{W!i-nCyGV%4bfP
zoDuZGs!d{*7B;T;t}88iZDL5PHu9`J-6gOWrwV1gE#`!sdWsgOlP}AzpH`N)wX|%U
z0Q_%oXXMEyUJJNT^~Q&8$Pk1TUD>y)CBij~MB5Sq*#+Xni;*z%lS=T0xF9Nwg$>sA
zk1Tdw%Ta&`114<AJ6flEYy&}n?@LuY_F(9TunWG6KUU~8>U}O{tl0o;3P%~1doneE
zl6WHT5e<1ctq@b6l4bU2?la}hRaya;SYCVPif-cnJ5T~%)fl?yHRC}VPIF6xA80o@
zxq#D`4`f&4xiLgUWzUg~<if6O;kyQtcgX-Un~Pi!k`;CF86xz$G(Fc(Lu(nHxIHwa
zvhKoe5`CvHFEtxkj8}<xb}d6ixSrFcp<Kg?+KI`Z)lpn|!P^xhDlJO+rnRxLaKn=>
zcs#zK(L9lHz$3&%e!ln0fvU2$0qx_OuaS4%k-UH?cVzcX{Z8xkcK8x-Dh<bVeEGi5
z)dJT0!!)JNAg?3I1t@K0iKRnQnYxD|X>BIZRXgAG_udAA&StpjH2i2?E1}2W%!WL{
z1m@+U)=pq-oAmQPJc*~XS{u8UAiPC+XU(4#%7J3t<&hL;jXx(JZg<zLJa1@d7{uPQ
zdohy9702wZ9xrX;w|#+w-mnQfzKTzOwI7>_<+OF-Wm!@uL?YzdF65fJy5>`fXGAJR
zh9Q|sA%GMq^w_gy=<;jW&EB^rOxJ!2)g!{|m%9#bk0&Of_)4QA<{~o#<_goyCzQ;&
z?Vt9R{?HjA_WQY-wY{+Ht-qN7PGY#-a-k?>!AFJx8wnShY!9Ib!Prng#7ijGKlUWa
zGY?NzHC{WYx6<_GyK^-)&zxxBM27vng09y3%>x$HN#3Ui91cOtw<IUsb;hvQzAQ;x
zgc+g#)R^8vu~OJNkwf8dYigqG)k>QFpz`PATk^=NNyh5j?%#7Qr{?>sKLo9IR{{sG
zQ|Elw<C@uIs1^PJw@=oQ4>Hiht)I`RII#aEG?fZ-j@^nImq)^OKGTjIt!trlCw1A?
znZ62XMm%mGUm`}qt`&vBboLlWp!As`Uc%8oZqI;0dIXju2%v`2UCl2aj@ujaIQ!Q6
zjn3hWyEh!)jxr*O8;xQdg&VpRfslwyH-7Lfz!N%v^`0Q6^~G)8C$_cb#^gue`8!to
zqmWE$OOWZ5jp_w_U)m0RYzJj>+=j>ht_Odbb3m4SUX^4cMNF*Qlxp9pKyc3mkwv*-
z2esusZI&5Mcpg0gKJ_rM{DV{Byw3FOU)RQ)Le2WOynIuCqlKr9aYO1I<dCJq)xwLM
z_rcx)c8hD<197q5)D}=)MO9x?x%H)uyT~B<ZUwM4MbaWO0Sy~@qEP>s5Wl2@x0`K#
zXvWat;C>?#reM?;+IzK>vEX@AVrL?h3Ba#TU&2m?ENb*!MYr})%*ruS>^F{k1+!T=
zXLgp(t_VO)XCguxwafel#yP)Qm(OwROhHzLrRlC&1JHG6x}kdyZODiHNai$XnZn|A
z+@NXrku*8;F!;`vsh}u#DXOe_4o1$)`cK^cYimbYJ-vNl-;77wH^}>(3pmR@6Q27o
DIbR$r

diff --git a/xabber/emojicon/src/main/res/drawable-hdpi/orca_attach_location_pressed.png b/xabber/emojicon/src/main/res/drawable-hdpi/orca_attach_location_pressed.png
deleted file mode 100644
index 764b78be13a64d5d629fc7102c939b3f574b72da..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1671
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
E1N)W~LjV8(

diff --git a/xabber/emojicon/src/main/res/drawable-hdpi/orca_attach_photo_normal.png b/xabber/emojicon/src/main/res/drawable-hdpi/orca_attach_photo_normal.png
deleted file mode 100644
index fccbc66b1666c9d7b293a822478c83be34c36c2d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1740
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
G^8NwYGdtY?

diff --git a/xabber/emojicon/src/main/res/drawable-hdpi/orca_attach_photo_pressed.png b/xabber/emojicon/src/main/res/drawable-hdpi/orca_attach_photo_pressed.png
deleted file mode 100644
index faa949263c0d2f9a8e4d326ece92a5630afce10a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1707
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

diff --git a/xabber/emojicon/src/main/res/drawable-hdpi/orca_attachments_arrow.png b/xabber/emojicon/src/main/res/drawable-hdpi/orca_attachments_arrow.png
deleted file mode 100644
index 4417128e377039905b99cc2def4a0c757a08a8d2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 250
zcmV<W00sYvP)<h;3K|Lk000e1NJLTq000yK000UI1^@s6v{ioQ0002NNkl<Zc-p0s
zy9&ZE7)FEoE`kcWNpW%zy16(x`V5Y~qPXZJi0G0_D<bM<;|a7<q@}mOq0oLg;r|*T
z3YN9D9R$H#YdsQ8my;pd7-Jr=l~N9x$XZC&@Bth148yQrOUT9*0-cg2?5JQ|Nyern
z+%sg32#y@sD>G(?;DX-XIkF#QBw5c@lPe_T6FwKo5*U52l$vD9_%I~&Dl1D#Z#=vI
ze{%|#s<M>y%J?&P&4jyKygbBZ+nPkwbz(~I3+5W31MFS&5dZ)H07*qoM6N<$f*O!$
AsQ>@~

diff --git a/xabber/emojicon/src/main/res/drawable-hdpi/orca_attachments_arrow_reversed.png b/xabber/emojicon/src/main/res/drawable-hdpi/orca_attachments_arrow_reversed.png
deleted file mode 100644
index 556e5cef5352941c0b7f62c88787b28c48683412..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 197
zcmeAS@N?(olHy`uVBq!ia0vp^{6Ngk!3HF+w~DI+sUA-k$B>F!$rZo9t$j1wJil*m
z-QQpKoIjWZRvR}Q=oZ&6X_zDJlC|gGr>EY3|NsAQY;=I(0&9%|r^3H>XJL;&haMmA
zx0Kw#xZv~I1#Af!bzfgy-T3_c{A}X~ObW{xcrP$$)$}g=$#cO?ku8bgg8wuJ-t7)j
xjcsq4ShbipGQ40?Tj1udaPR+@m%($S7(Zn_TeQ00<t)%$44$rjF6*2UngF+(P$K{U

diff --git a/xabber/emojicon/src/main/res/drawable-hdpi/orca_composer_divider_horizontal.9.png b/xabber/emojicon/src/main/res/drawable-hdpi/orca_composer_divider_horizontal.9.png
deleted file mode 100644
index 51492dbda23b7c5a8b68f9dce4f6adf760b1209b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 98
zcmeAS@N?(olHy`uVBq!ia0vp^93afW1|*O0@9PFqnw~C>Ar-fh6C4`;XUwShFn__F
wNvhuK5)N~u{{J6;w5@YvQ)9~UqzYk%gBnIj)z{xV1!`jOboFyt=akR{08OYNi2wiq

diff --git a/xabber/emojicon/src/main/res/drawable-hdpi/orca_composer_divider_vertical.9.png b/xabber/emojicon/src/main/res/drawable-hdpi/orca_composer_divider_vertical.9.png
deleted file mode 100644
index ebf5e2d8ec1426a3812dc50ec9564efd48b373aa..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 94
zcmeAS@N?(olHy`uVBq!ia0vp^93afW1|*O0@9PFqs-7;6Ar-fh6C4`;Tiozi^#6Z+
r<ffF9p*)2)T>mb6GCI0H`YOdxxY;PF=-bJyKn)C@u6{1-oD!M<jkO*A

diff --git a/xabber/emojicon/src/main/res/drawable-hdpi/orca_composer_popup_active_normal.png b/xabber/emojicon/src/main/res/drawable-hdpi/orca_composer_popup_active_normal.png
deleted file mode 100644
index c5b1ec7fa8b7d63527b2224cbd775f36b49b5262..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 941
zcmV;e15*5nP)<h;3K|Lk000e1NJLTq001)p001)x1^@s6I-xKs000AYNkl<Zc-rk)
z+fUO_9Of1UUo@g2(IAmPgn&VfhA3j9yy%M$KKj@2C-`h)i1CF?*Y&i8wHvqqf`hTK
z`;C=sMj;w9*4@~~W&REfGZ$Kh#&(J4OHP(`=Q}-L&-c4@b#(*;1Ox;G1Ox;GwTRKt
z(FTLTaN%#)&|C;j3+)DmXAOwogU>mH_^x8HSYIW*UZ-QP0+*&}W1gb<*E-$gWle;9
zU`^d1U<x)<EDbEk!m>h7HGGyeUo$WQ1H9cb{y0MDimF0%I^7wXHSuLa$^;1>y?&xY
ziBC~etu!mlmkBu<`-l}NSiey<F;=U!4Q{%6jF`j02!4v<`YSDmzcY+*okoIHj*D1R
zcwu4TqH1DbQ!RFf+ekCQzRafZ^?8mH`pbEGJ=aMio<HV9evKuY%M9zERn=;lOy;i7
z9||f95+e8{4r9b}2~K3?z=|?L+#Y`<o6SDZBniNcha4*&8^f7opEQUKQporMf_qtE
z&fb#U=}e^4BbudVutQ@ak$U2A`RpfHE@MDO*%MiIxZUx1{28p*q-m{z4Kx%Ag*$;z
z#HS!gc6fc^a5lU10IyRsod8&FaK-7JSF&71*4nk%-L_O}`%%rcHP~`sm0_3HzX)kt
z@r3XRI$b`;W+E}7xwVuKi>*JL<UejJiD4(qJHg=E^O|lr^^EZzWGzp1@gl705&u}#
zYF{lFhVKLWEGyNK$}9)-0~BSvUrVua*rG7Px6@{_Qv66P%MYBQ+x~afLdZ0PdokJg
z;LJO-pB8^`lT!r+%f%?fKh@N76vYqVF1b_~kIh;>fB3T`rC$a@;*4CDJE%{LAks8H
ztdS6|muC14r8*J{i&n5tf60#B5ivH4Gns<zlJLSesP_9z3p9<hN~zcB_M4y?y<N^r
zrBeMKUw~7#9KSR+W@%PUOd#;J6~A}LStb|~=hEr)t;!Y!2RR7pTa84g<t&FdQ%Dr!
z=he($O<sR!ywWoGiG#If;P>7W_?;0kYKHmw-}%#dQH;J(y-&;KayR^eFlQ7j+eaJ0
z7J?JGSq(p#O!fd@Z!C2SCi6@hVrmS8v};vkIyN`sZ==yK-mR^~`+Pp%TW!6-^CT(P
zB}vJ5>l@!4l9YM{*V?o$n&)8PznGf;kl%<!)O5p1KtMo1KtMo1@PFecnWpO}5w=js
P00000NkvXXu0mjfR|B}E

diff --git a/xabber/emojicon/src/main/res/drawable-hdpi/orca_composer_popup_active_pressed.png b/xabber/emojicon/src/main/res/drawable-hdpi/orca_composer_popup_active_pressed.png
deleted file mode 100644
index 1b325a4483f790ad0363d680df1c515ab8d88b29..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1430
zcmV;H1!?+;P)<h;3K|Lk000e1NJLTq001)p001)x1^@s6I-xKs000GDNkl<Zc-rln
zZA?>V6vvB+8y^S-3StxxoDP!0oUrktY%yUI7RCp*@By+f1Y!c&63_&hgGg8m5jTi}
zV3bI*v1P-)(b7vT6mWut(%To>(v}xp+(fp0+hU>)Wao5GN7r~edfNdt+~gm6>3x#_
z?>Xl=&v}~5;jCRjpqD`5pr`;)IPn|Aal3YacpyF~6_iH)ZdEz`@rmypt`XspFOxz0
zL9w8{TUfEgXEO24b4Cb5^(rV4w3~bp769TAzlp>@a&WkyB+wp`hui>CIPsn2xDO2t
zjerjaK#>6k;uQKm;NakLxk#4)iU?2`^qt@e6Cc1Z4*xF_%svN9TwL4>0TUAwvkkKi
zvmr1kDJed|U;!yDEsgcX5Gg{N3v>E(J-=5dQ;7Q%D*};R-PqW4I1H}!jz4wk)1+R3
zOfHfPJo&Cy+I`~0C$DS@OvAb6RDqZp0gzRqX9BVOho+`4-dxZ4GiMr-Z;0d+j9Vt-
zS72fUH8nMfY+(3&K0BDSw6sV78FB$}Y6WK5f<`@!FE9T%K`53_x`3=rh)5=L%rYC8
z?Ck9D;NW1dVCw4X4vM7%3(tXZ2!L$o&wrWeo^p79_UyUWgkoxnX)I{Is;Vk}!(htG
z%cIqk^pHe)^BIF7Ou2~*7h1Di$JN(29=aivsQ`9`2}V6Z4;K~|?(!BUD=Ui~3`(t5
zA2XS)vz~y262)DN1U_F;QN3Rzrlv6!nLrFi^Iff0dz{Uh@d*Y+({%2X)}WL2E0>uJ
z3MB(`*RJ<`1d-A+Jp&W6qSnwRquE@*wwn12gLz8R#saP0r1umd&?9jlb82a{2D8y<
z{4hN|oyQg?H#gTe7*u?Ge3(X~dD~*0wR!+z)U?Squh*O2C7lS@Cz$;Fe4k*P0-zj7
zxk*nc=c+!La#=HFpmn<G_x#b$_!S0I4uJA>Mw7Nr<~c$bL7m=YppC`?N3Qz;rl_dM
ze=trB4UOc<2UL$e!N}x;f2vfsi~ZSXI$%mlO8f$Y8)9o)=P{9lvaBb~gyMl8+dHqn
z@55U8|6p*(hkZovX&-T~a<F;YFI~F&jz3_^%F29)akeO;zJZ6{Rx+aBTU*<Xdedz)
z!c<gLu!g~NNL$<0T<pb|%u1nZ-MT&T8?F=PUQTiU%C)aP@Up@5FHCcD+fis5XUN9*
z+^S_V+a~SyxpK3`KE_n#@Hv=}dzUYF<!uTKo?F1klBa!S#%iCMn3%}K=T$0Is?|1s
z=RYF!$Hj|Ra@fFBS64@HYHMq~hRMmviH2%4?y2<Bx@pze*w|aH<3>hCGIa)%qMsUi
z%2?$@6n*5#@m(7RQ&;zS0-igVQpPefdj~+W-ODa6^5Nm(42aMubIK{^PM-WMcEez>
zA%qzgx~B}@Tdel6@$qqwM`wjXamZ$$A9jyWKc#wVvDm)$a_?D#X=-X>wPs+3(~KsI
zf>I1WCPtoM3XP7AX02zuQmK3c&M#7mbPG3?w;q`-wr>Oi0iX4nVGDzjNF*r_9xQ&l
zuyD`1wDgMv7J2%5_X~VZE?2(3wDjxu_ka3%dU5e#XLon^LAKSbp`pPy7*u6t<?g}3
z!NbMH#nEgVRD|%M;q)KOR{2HK0n^dZ@j}3~w6tu)Y{P8BcmdPZ)wK<?<zT@7-!MHr
zJ)y7}?<22o1mt@F=pQ*a6h*xZyYF7|+EZA7fuP?g^p6~z)z#G??3^PbBlnP03kx8S
z2=tBqk;Czh7JS%=|H#P5hz<z}i6SW%v4zD$pXir>?EKf;b4Ug!!C+__xxKx;5$)~m
kysawqhd$BoKM{fJFQ|Oh={3mkO#lD@07*qoM6N<$f{Jjp&;S4c

diff --git a/xabber/emojicon/src/main/res/drawable-hdpi/orca_composer_popup_normal.png b/xabber/emojicon/src/main/res/drawable-hdpi/orca_composer_popup_normal.png
deleted file mode 100644
index e19ec1665637e2d47444a24458ed850223e24ecf..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 429
zcmV;e0aE^nP)<h;3K|Lk000e1NJLTq001)p001)x1^@s6I-xKs0004WNkl<Zc-rlj
z%}T>S6h?zCMWtQ15PUXqBR+&w5!`CuK#;DAv@?_1W|B}^ge)x7TB!X)u_CyzkmACI
zE{r#z7)oq6P9gFg__#1IaL*8OuciS20001hC^+Y<Ic}sGH(v7G7=6`ra2`7uA>=Lz
zj7h-%4im<h>*ikUWEeA2VUeGd4r3=nO&>(dNXS42GLV4`WPTZhaw{(ko0=L@Q|_$f
zrlx;*3z&D8HiuUx<V7Y^TvH;F&1RRGF3ZucttPBso+*)W94DC<vbRtf-E1n6sn<K3
zT*&)H%1~NLWSWCPLcg@yi<FU8rKUv2_x+`A|KYr3R^F9=UP6A@<*T>Hr{`m3e=`!=
zprk1}r7$av+q-U5qc@FKZ{A%BryNmMFlQhG8OT5eGXGwNR-gS~l21?eLeWmePNv=N
zZktxs4a=Bz)opcpJF%0YRV3+6CMT{tx*iVQT2MXDI}OgYxI)dZQxZYd000000REg$
X%0yU7=5)*@00000NkvXXu0mjfw?DQf

diff --git a/xabber/emojicon/src/main/res/drawable-hdpi/orca_composer_popup_pressed.png b/xabber/emojicon/src/main/res/drawable-hdpi/orca_composer_popup_pressed.png
deleted file mode 100644
index 438c06059ad7d09634f4c52dbccbe9c153da2a38..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 838
zcmV-M1G)T(P)<h;3K|Lk000e1NJLTq001)p001)x1^@s6I-xKs0009GNkl<Zc-rmS
zJxCj27zglEu+1R(4sA6?ZKX=1OFKxwJwrCZ#g0y)L(Np(0<}pCL6<aL9Hbgkqq)0S
zdv_WnYH2sqLB&d2I*T8uB^Z~c&y&8Xsfb>NH{69g_;VlO!vDuzcrV<`Fy~7R<Oak9
zv8f;?(zk}Wu+%~<5GUjz<PljbHN}2T(z~|wide{poshebCP<@#(?oi9lHQi$6~aq(
zAJPuFO+GNHAQsZMo%BZsV}Nu(8pwTUP*F^zcSm7guh*MlqYYwJ8KfBO-BxfI3<lJ-
zLd+_~VDHvaOpA&!h5prqX)a(K4o6jB>~_0`k(Iu_zQ*Vb|AytnT`nme<2nZWcwBXu
z$;tRrJ}I4YNhx0pKQEoWjn4U~VY<4ys9<6-_C+bAnCW+HP<5E;SR!y4CK_X3YM5&<
zPN%cVFg-mzCY?^FVU&b%xm+4X!_daK-R|-*!^8duv+RczmKP6LUOKum7e@c{h`DRe
z<-~*8#6q&S_p!Y!jK|}Vg~357!3(RG7o?MT;(e3~W^iz@CBX?lDv5zRU`s9r9$@8T
z0)bEm$BREJiJ9YsuVrES`}<{Kp85Tb<igTUB{71uoS}ljzX}_h+c9x5eM%d_&oBN?
zEwBCB+TIDt#S9D#$j4wNCMND>v)M>4my^!U&aO=6%jUPsimqoizF&7Pe7|sVa`Fm(
zr+3Q2c)i}L7-uw$QZYWC&&&)B4QUt+LmLwe1~rV*Fn+(E9%g1X`5Z^`iz7Q652y~a
zw)V-pxU_OqijkI9j#oc^enJfsiA1Pi#>U24_74wV@9pic@9yqpaD52-c$@}ibaa#+
zrkIhDk)}{6)QoGIZviTTsnjbC4Wm@d`1rVnQ5**P|HVvAP3etBV>6k)p~`sx*dHB?
zAP6^IE>|O&_GDBU1pC^sKRTFvK3{`R&Q`0nf!u0F6+z6{8~dZ9Fh>hE>hM5!clWLO
z`g$9=<;)6>1$$y&0;&6N_8iL6>9j7DN*UtuxH%jSTa+5?hdr_HzbgXEA5F@d7S?X2
Q>Hq)$07*qoM6N<$f_Ha^SpWb4

diff --git a/xabber/emojicon/src/main/res/drawable-hdpi/orca_composer_tab.9.png b/xabber/emojicon/src/main/res/drawable-hdpi/orca_composer_tab.9.png
deleted file mode 100644
index 47a8f4bde0c7ddd3ac713ea98a29ef790567eaa2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 100
zcmeAS@N?(olHy`uVBq!ia0vp^tUzqU!3HF!2nc=vQrey_jv*Ddk`o#l{(DF;@yS?x
wkZ(&&`mZ0qkLS3-)x}L9=o~AsSb%|H>&~zVs}}8E4AjQp>FVdQ&MBb@0NGC-DgXcg

diff --git a/xabber/emojicon/src/main/res/drawable-hdpi/orca_composer_tab_active.9.png b/xabber/emojicon/src/main/res/drawable-hdpi/orca_composer_tab_active.9.png
deleted file mode 100644
index 2ae026835097562a380dff80dc2bdec1c9b9c1e1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 98
zcmeAS@N?(olHy`uVBq!ia0vp^tUzqU!3HF!2nc=vQktGFjv*Ddk`o#l{(DF;Srn`P
tZBJy|u}V^0P-0b8NC610;7$@@Vz3Y0%ek+7h6qp-gQu&X%Q~loCICqM8OZ<u

diff --git a/xabber/emojicon/src/main/res/drawable-hdpi/orca_composer_tab_dark.9.png b/xabber/emojicon/src/main/res/drawable-hdpi/orca_composer_tab_dark.9.png
deleted file mode 100644
index 1e97ae0b5ca1610864f96309e946cecfbfb3cef2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 100
zcmeAS@N?(olHy`uVBq!ia0vp^tUzqU!3HF!2nc=vQrey_jv*Ddk`o#l{(DF;^~qR%
vl5a~)`X9f)j`z61)x}L9=o~AsSb%{+U{77lGHb<eKy3`3u6{1-oD!M<=TaS>

diff --git a/xabber/emojicon/src/main/res/drawable-hdpi/orca_composer_tab_pressed.9.png b/xabber/emojicon/src/main/res/drawable-hdpi/orca_composer_tab_pressed.9.png
deleted file mode 100644
index e5e223a43cba4913cc684565f2e0f2702485120f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 105
zcmeAS@N?(olHy`uVBq!ia0vp^96)Ty!3HFsSG{-#qzpV=978H@B_}jA{I@V*Q3+l1
zzn}N;lmFI7&mHbcT-Ku{5o)k1A>`nSro;sd`L&D;yHf8@|0w970@Tak>FVdQ&MBb@
E092VHEdT%j

diff --git a/xabber/emojicon/src/main/res/drawable-hdpi/orca_composer_top_divider.9.png b/xabber/emojicon/src/main/res/drawable-hdpi/orca_composer_top_divider.9.png
deleted file mode 100644
index 6fb5d36347bff44625d12eb43febc3b5fbe80e5e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 105
zcmeAS@N?(olHy`uVBq!ia0vp^%s|Y;!3HFk*Rf{-DFaUz$B>F!$q5Y&|9Lzb1S1<b
zk1-0KIbpQsgbZH_pSV#w|IB2j=YM{D{A^#w*TcxLmt9mj_4jK<pk4+~S3j3^P6<r_
DOA8*d

diff --git a/xabber/emojicon/src/main/res/drawable-hdpi/orca_emoji_backspace_back_normal.png b/xabber/emojicon/src/main/res/drawable-hdpi/orca_emoji_backspace_back_normal.png
deleted file mode 100644
index af0847912af15d2a3ea1e46ecbe68fff108f8324..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 656
zcmV;B0&o3^P)<h;3K|Lk000e1NJLTq0021v001or1^@s66ko##00074Nkl<Zc-rll
zO-NKx6vzF_P%$BElTaX2i$>=AgK-v35Cm;n#DLUZ+_q^EEg}isi)n$l3fi=6(JG1v
z1W|Jrg^Qq%$%Pt<qkY)#z<uzDtT(+8Pjvq9=e~FEd-tCI{W#~m*U(@v7z_r3!C)}#
zj#w<#kxV8}Boc{}VVKQkdkclaVY+NmBd%O7H)k@LVmh6EMER9+CnUea*9g9#MkEHE
zg>Rg3J9XsZzKbiBN-b=ya~QK$XK@}^HEhvK81i9{1n$2`49LTG0SsOKP1}lAk&SrJ
z3<gvJ2z<`7rzywbhOfQ~@6&da-SB|xZB-&usT5<U7Xk>}=DhZMXP5VGQui5(_nm-8
zq%9tg_i+78jmUgHe~6iX8qkZ%Gvma&HhDJ^i5x`eZR+mGwQthSQ}<DYNSS#AKCH!Y
z@cbs_h$IQF8wu`>-nM6@&qzE}aV8n83xn_erH8DtTGN#6{yypNB6V-oI35N&4(CFI
zg3+Iy7s9Wr3n3U4W6+m1iW5gO?3=6u5?_7yL-4(-5W*JgW8j$@L=KCy@&xk!Rmxl9
zZ9T6`7#Uy!E2=_>O9GYx2wayh65sZ`;?h3}AvdDYXsa|7i^Wb!?A2vFtVjt1UIh^P
zB$vybqPz@0`HiQKYqWJEev<nwm1&*JdKUj6@{3CxewDzlyRBbUo4Y!pg@7yiZzkv-
z_^?f2%wza%4@6efd^EG7$2eP4&Z*Q><ULjYcO*n0bP$K~g6sK^oTaZZ@w_U3W=XJ@
q1Uw97!tA%8!C){L3<iVYf58uQ`28e_kxLE$0000<MNUMnLSTYzEiXO*

diff --git a/xabber/emojicon/src/main/res/drawable-hdpi/orca_emoji_backspace_front_normal.png b/xabber/emojicon/src/main/res/drawable-hdpi/orca_emoji_backspace_front_normal.png
deleted file mode 100644
index 982e5aadcf583333d3a30763b2a04f8ffad3d213..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1160
zcmV;31b6$1P)<h;3K|Lk000e1NJLTq0021v001or1^@s66ko##000C}Nkl<Zc-rln
zTSy~U7{_(pF0^i|bV1n)zVtyY*wUBwRoYz;q-iu4?{VF_Vxnob8t}H-Aa;>1)w)kz
zd=a{!pj%y9x|k^4f?e=MeGo5LucS5>@dn1bU(bJ<3E8e@av3!<_`#oGPR{ZFo9~?S
zok=Dv%p+1#QZ5%47hf+cD@!gZDfv)pf^YZ-N7ykD&UD#iGO0{ontm@elx`UGh8?L1
zzTw|!G^)Yl;&MlXPN(~beQ-T5H;;02aw#V}M{<I1_y<Q}Vd2N%^33AvrTWsJr3iMC
z80atH;<FhZ7Z-OeKQDh?PLPaeAu%!W8V`9XDJkiCR%VtxJ1d*yBF6I<xWLCjCL|=h
zBS%PZ@sJTRhm5#@ynvJ<WTrOL&KgK873d1cSZ1WVrn^CjonWZwiz42*&tg2M2Z<V0
zUtdonBO`Qpcu2v<(a{k({&rAPQ&Z?bHZ(Ml!{Ok}i5ZKFi{}rCb7Ny;BW-PM(P@Np
z%Xz+#n4-<i&9t_*MyC~`Kx#EwJ8Pgobg%Xvt*)*L8r|I7Jh4q^1_06@Pg<>397tTT
z>gsCR*w_#RoSdAbit-Aw_E~9nch~*?-rgP!4i3_tqC52Bj~8@sa3Bt(MkL6psw$eF
zpBDs#@w&P?t`DYmS63G~olb7|wOMT(AlmdLdYYJ+I5E>_4v9KAK0faAF51`Ehua^n
zFE**3pL)n@wQ@JP{FwK@xlils>!AUO;yg4o<k!Z5Y1!M;OS*iWd#ZbmX|Y(i(&KH-
z1`VlEYwWCngmkOm7TIjJfOg3J{e61=+jB0Xo?|}v_5rP|ta$AUNMHQ%(r7e+LmKo3
znw^~uxD-6?efrXPxau7p9fJMN6cRF5n0?xCJY#!%o1Sz(agV{DMftzm+S<I9A<-b2
z$XAtrRZi2>(>_B25bF_r0odN&PTk$z94OwyYfDRu*Nw*?e@w4Js#R*cpMy|Mbqy^q
zFAD<h?CfyU9DQ(=AGSVpmypiRP7WGvxCq0;!=VKUS-!T=($bP3=-Aj8ciYtZed|ky
z2bh2S<72vAc$+IJ*qlNR5~{4Mq=khA!2<!-F*0~urZM$VX1uM*bA^OzYifPUXrSRQ
zq*|?h6;h>A*%>GWBeU5|qobpu-%BDe#r^V=aY~R7&Y=SX1EPE@;2Hh>{h<R1p};@-
z;So(uP0`%kTu_>snW1ODKI2YFAqB~cFZw}#>lWDmKP$*{)v=HnDmxR&MH%TC7myc_
zQiZ%EbIAXGgk^eL`MGjhPLS!!^gqGHL*h5}w^CD6zhm?y7lDUyMY$i0z*7?O@$v7a
zrKR=D0T3ME@qGFt%(Xb9Vq;^IZ+vp2Me&(pMyXW(!%{98!LLH0n7#Sw&DNNhnD-e^
zwC8g?d^TTmr8kc0-N?wu<ml+=52Paag>RStC>KxoagU#Y{0h?>OjnuSl#s5vd|&y0
a2LA;o-9LTeD5i@50000<MNUMnLSTYq)i=ig

diff --git a/xabber/emojicon/src/main/res/drawable-hdpi/orca_emoji_backspace_front_pressed.png b/xabber/emojicon/src/main/res/drawable-hdpi/orca_emoji_backspace_front_pressed.png
deleted file mode 100644
index ecf5259e4b68fc2f092b76b364bb7d1127e38ca4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1044
zcmV+v1nc{WP)<h;3K|Lk000e1NJLTq0021v001or1^@s66ko##000BqNkl<Zc-rln
zYe<t(7{^x-6;$8)R?&yW+!h9D7p*k9e29{WprSHw<ZNgpk)~-`k*VD^HFIiZWw<#n
zl(%%<M6FD$EX};+C6zYQ+|;?bp3XC!%+hA5csBRI|HIzBJ3POg^FGi299{-PKZ1g$
zGhKq`v-XFwnENhrj7{3SN&d*e7%7$<2;0VTy_(PFMRss_QA&<SwDE}Ki+Pj$B}~T<
zhhYI1IfZc92d}p;^G<~2J`cd!H`(Zfd1L;_vC#3{(mx<suHiz<BZ**rTxj${4wh?#
zXb7N{d&~?AkC+-O{6|ax5;-h*F}27w2)WofVHW$4pxzV!bz<`c4ahYFl4D|!gvShN
zhBQM?HOO@*Q^6th5$w2-H70Ej%Y+T5(_w|5h#tt5{vvR@A%TL*7U<Lbgt5j?GDL$+
z4u=y8=z;WzeFlv(g*LhIjL$6{lMlIy%pgDRImneNn25k}ClwNxsL$O(kjZ;sqGHk^
zoucwV`ol0_dspws5Zx*|A+h2)UeAX%h0-8k*%uk?x{?FQMb*%w>KnY?tJXkvSp#f7
zn*q6R8$sQtp$l?<L>^Q%cNhf3#NDEw^gp{NQXnSpBPf(=(2(jRDz1S|1Q5U568sQK
z>!kER+6SdUX{~frRTOU#7S+I-K(Y3>HUVOYe_9E`;%cxB5D$*&8UF&><VrdqH=Rib
zNqN&h6^>qYAKW5fYl%tFEp`0{?|!qt^-%Flt|v2?LYCP7go-TNjFLK78z>$!=FvNa
z(Av>WPvO}b@(3!ww*Pl4z}fu0ctz!u)7L`wT+JO-!O@Q{QfLH{kAq{Z_D|9FSKa6H
zsih$8?4hfL>?ZBtePi3GAra92R9ZhEsj!zGmO(7JhSgT*nEaE9=_x!qIY;J0Q=7sd
zV0W*Y>_{^EmnTs`(o1a%K?5J1TMjk@pmwAvp|PjV@$iTt|03-)2wGD64R&72h7$zv
zyPkQF_oyH|>m6)7lc6nWD%#9|P6vqV!Ck`N0%xs?+@l!Az~fAplcldxYv}c^D3>S+
z)Jx^2YtVJtd+jk4SG8*G+IR>0V`?_d=s(k6*Nw}mfPSRDs-^3U2U|q2_zk?Pm%*pz
z_A#lV={qDBR)gI@`=Rc%4x7DgK+2eeront9X@)dInjy`Q)Iu^CFpa~HtFZDl4M5~z
z^97a2HRQbk3*JpXOYeJN3ZTeg!4vrX@%9IEU-&$(=Pi+?_kE)U#k?_p<UpQb-{s-*
zBj>QaZXe?wPW(Xh)d=;0>y_Zka*dnI7)>y}GG{LEzC7Dlg!wY2a{L0qTdfp_XWA?P
O0000<MNUMnLSTYG;s1RA

diff --git a/xabber/emojicon/src/main/res/drawable-hdpi/orca_emoji_category_cars.png b/xabber/emojicon/src/main/res/drawable-hdpi/orca_emoji_category_cars.png
deleted file mode 100644
index e6a4aeb83a9556859cc4539596558e08d951aedf..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 912
zcmV;B18@9^P)<h;3K|Lk000e1NJLTq001oj001or1^@s6IvV1d000A5Nkl<Zc-rll
zZ)lBC9LHzOzsbKzlo!+;<94sRd$+s07t<|E<lS;xLf+6q<OO-<-*|yqNXjcoEwq{t
zmQenN))XcA6U(F-!U!{)&#%r?$LVr+?>*0M>N)l8d3w%szQ6DDJHPY$o%7`7dChBH
z^P1NN+I&9Wh)^h0Tv}RM9f?E|;c$34_bYVpY*~4Ec@6jTDk>_bF)Tk<dWRsU2BB9#
zJLm$RKsWeeK%RXBo!~iWDl03C4yM@rXf!$#!{<SN7WfACz*XeBV!S&WFWtgmpC;f9
zI1LVfdir<hV9aiwALjnD^0+hZCuk(R#=9mskw^^1@HI`a7(E37Vwh{e-$F@ZpZ-ZI
z_8)4(fALXAT#IwaH)_WE_<-ZVV6ZS<o|2N1BF5j*KE8{ET5Vl0;wD4>Kofm45C}}j
zln;;3h2yE?ZE!FikB_t}8q&q!gEG>C(fL{O6)<yqm0;m)1yil2HwZVW815%5ZZn-z
zEI48Tc&9{n<A^!d6#M=D;WB+rXvo5`F_rS+@I7;QamFH>@mwg2PK&>KFpi8cHXEpn
z)2gkLRkjLA5grLa*pg*2NePK@?9E_i$7H0ova)g%L@Ob>s4YO(!HmA*dMu-b&cFun
zd9cJ9ko^6Y52#D0h^#h9B#zr5Im`7bcyE;POd-4-*t?*3yNv!$`l<%v;n9e@XAEwW
zxRw}~{7U~)B|KZvcM%m4yJVwbl0C%3TB!7L-6eggyzEn3O`Uv=Ss2vjCmX>%V2iou
z!2TiQy~dOalb6EawLTCp*Cr`8%@($%Ym?aDX}otX<#s`(w+>@qvpx`S1bOzt!eVQ}
zixVAQIn@~Z8%cv_Qf^&Uc)T<W{E+=JA+d!1I_~d-UJEh(9bAI5Ru(_}ZAlh*>hMri
z>T!-zU9!Br{~!DGKjL-0+JQBwJ;$H}vHRpWmQIn$ms1LZHh?F&0HSA!261A#Czb8F
z3JVf~Khxt?GSN3AbZi37N3M#NXEJRzK`5NGCYr(9l6ZQn3kT*CHa)%B%*Q-iXIr%V
z6EQ@8m4%q8=$QHu<B)a7VzKGAMdQ_ls?a!gTC)1{#NaBa|8f|h@WkEviK!~>bv%5O
ma$fBH+Vz^(yymt4xBUia4a^K}x_`R>0000<MNUMnLSTX*XTMSa

diff --git a/xabber/emojicon/src/main/res/drawable-hdpi/orca_emoji_category_nature.png b/xabber/emojicon/src/main/res/drawable-hdpi/orca_emoji_category_nature.png
deleted file mode 100644
index 5fa53e56b76f9f67638c6f6012f64567cb8d2c8a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1378
zcmV-o1)chdP)<h;3K|Lk000e1NJLTq001Tc001Tk1^@s6s6FYf000FkNkl<Zc-rll
zdx%w46vk(!GJDXJ*+aCLa(d7-@3&1gf>c;W{&9QJ!%)a6GqML3J%%yT9u`iC5m-`I
zMn)4u1xkNZ2tk;X6{Uto54DFf&7jrT+<sqtXSg%obMHRY_(yc$W1oHR+G~G%?X}ik
z`xF%Xm!4EAbx>VhT|;ecZ5z0c_uIfZm6es_>8HTmH8nN&&|clx*f`;UkYcjK!2+-y
z{0auZ?_ej`27Uqij9#$5s;X+zfgsjqLTT_L_#Au;z6L*mFWlb@_E>IPb93|f5hI22
z!)%o_Tep_&x{&v=`n|fkx|04y^v9{+)YMdh%#HN7N}m6oA2DJ~KE)PTUr|wUe87+*
z$Xy4ty+4<immf1y#AeEOm}m~&!jLgI{|Suw!2UKdll0%=P*h)EKShxR9zo$e+FFR6
z$NMgbO--Py5c$`@j)sPY)6p{n9gl$};12o~1%WF(3gK0buKtXulVjfm-UpW@NiE2~
z37$dkyR>_)Gi|-wMOJdLN?Kc6M|(B>h9YYvSO{JOn^^e<@NiB=L%07dCjN}E8)?@v
z_CeYQ=yyA+MetkXnsX|VkfZ1g+VTuvkRzYXZ!d`;vd4vNqpXast>6aUi!<{f?lO(`
zJI}W|R*NFYE7+|xkWEIB#eXYM^msm2rKP2ZBD)4$5ECqg_}%nqTeV|x$#cGimgY&a
zW985&t;-ca_Q~sWMWE7-c0luD!4tCzVTCy+Ha{TQj?tu$J2pmFlg>@7aBwa?8jtLU
zEOcMi+z8u~?2H2l-W+&5oh(0ed#_S}eM$Y6kX$Ff^LFbrdAp>fWb_bUKw-B@tu8Ao
zJ2F9PdBS0z&cK)UtDpx$t;p{HedxPpa6w9Pt`_znG&3}-tE>S%!$?K=NRbz!M@|oi
zbvDe?gF)cKc$c&KrJ*ZTUWy@=b_$r0pla#%xGu`1qoWDVwSOrq&knVi@>4EipfiwE
zu@bk(tQ>SDMTYCDzZ`Ioaejpx^AKAQl7v~{<<6bI>HHj$ULbT;#u@e;tVh{$5hPqh
znkaRhH4BBybCBwnTez@Hd9g*tpicXDWO?PYaoH?zi_gbDY{5>@!30m~5T;e7kx~xx
zV$PudUKUa+0Pc@0LMl3y{;gn{whA)Rw^&KqRc;Tzy~UlOEN*KKQ6)+{mqAaej-u7d
zm!o`AmLsFk<QBS|{zjE8xK^oTxU4ce1g>zzD%e(N>r_U?9fA9mDku=KJ_cPG;%~~@
z;FQo39la{8`q<*Bp}{80&GmLJv9E<B+X=|mBuEcBF}5gwLar*b6qcXu#%j|OOf*rK
zk%R^0>%Qi7<gM?b^4TZB<b)PzOL!Gr=3sd>i%;$+JlQ#=S1BZP5(S6+GF0Bx@|s{`
zY<G#RH2|@fL(e-%U7{#Xu#oeS|K7QCalY~>vRbE|UxOB@YRwk}5WCZvyEsqrs80-M
zf(;qB`7oD}S$+A~>%pIZM@a`q#0-%mcY&`Ucvp^VT&v0|yGq(S)0XIt=?ZnWZr!$o
zYOap<_V%JIq!xisne<uRxOFETt`Cck@zqbI%}z+ZpkgxgwiOqt&5l$Z@~d?D)h8!^
zit6%~EA(4z<sZQ9s$^9eEA2REsT5lGuYDR&8G_P>eAi4n_w?8gHQ6RbrTueWv<O?d
zH={V%k|YHs@w-{kz0=U=s8@*O)1qTV(dCbKn=|A@>>XWDf}-yqe2Qvel4<@(QW#_9
kQFeigku5Fw{~6)uPdg5b9fw<aKL7v#07*qoM6N<$f@Y+n-v9sr

diff --git a/xabber/emojicon/src/main/res/drawable-hdpi/orca_emoji_category_objects.png b/xabber/emojicon/src/main/res/drawable-hdpi/orca_emoji_category_objects.png
deleted file mode 100644
index 268510488ffab72960260bbb7bcf5fc119fce683..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1020
zcmV<Y0|WetP)<h;3K|Lk000e1NJLTq001Tc001Tk1^@s6s6FYf000BSNkl<Zc-q}q
zOGuPa6m~4h-cb;gJ%$pZ24|c%!&nU!Vo_1i^e&2|*QO+B5mDA6dJus`U@d}#pcbW@
zN>>rIDHmn62wP-YX@y~0;-j(egKuJ_QD^-BaiW2bd*}b}J@>okoO{l>e@4dt{ByZn
z3q2msUbowQ!0B`b!r}0!w37mvbs*M+_9xH@wBUb9TFF5>b3x)M$TWJr-XgSq{I5d$
z4(~kaB(?-3T7i==<yMf|j()MUw=Er<EFe(?JOY6T&<1n>KY;JRFT8sV?8(i|9Wx?~
z{C@u|EPR8D1AX$V4?qJ=2sDXkM5qDsQc5Zq3{J!%_kbRex=yVCi+w(y2dx_>4FVhS
z?ve=h$q(nJ@&uMiQxPn_YcMlmOcqcmZIav*J~N#Zi1_43o#-FKqs#<-akmag7y3K+
z%rsJ=P-rv+UzE0L9S%oMqH}FF+XT$1l)v2pCYu=+W<ua&`Bho6yJis9+_#8#HZy(8
z1vFDQPNhBB`F6W~Jm$9Z(7>Fl%_J6<85?QVVftv5w06eKBz>MjA-uxC<__s}J}^^b
zH4?hdfQ&q8thuzbG}8=T76|)Hp++2+r%`eurUYAPDL1-PIQ}F9#KuKWHe6z-8D=~z
zVh;m>z*qxvm<g`RB`S>a%2WkGVrLB&e->zJKjd^X;Un-)HIjy$5b}-X4EkG4(0+lc
z57uj8BdR~GN}>*!W0aWEQ#B6&EOC?nlNN##I1d6|#so!+NilJ=WVZ0)GMozalmv7k
zrA#-ue0rfnP?cbn^2fJA%x!2pF?mx8>be5RZC6Y?m=HMzzvzyDyG+1l6GOhuX7!7W
z_wq2X0v<95Vo<qu(l8t!NYaPvqA_wXcVV0<QI*QUM@QiLw?g5l7i(XM8^Bcpw<%>@
zPK5~v@aH2csTg?A^((6s_!?!xKB1aH743}t{QN1(by-QBq8Mv%L287_oMz*_6!Obe
zKt|VW?RPKWq8PLm?KL@mcg)}p`9dW%iHXPg@r3aRezFG7R?#HDa)JGoe5V4ln3orf
zzkvR2^q-;M8Y7?Dst0cI=7nqEw7<4xwOX^~l!X|?;;@$Xj}a0@k9NuhzG9&kmEO(j
zf6+VM%Ddvs=k@OmlRCz4Kz~8fS%Aq__rntmAHZ|qJ@9FOMPoHVvQ1d{6>y)00En!I
zNpnoS#>IveXm++f6~raR3od-q%G-NNNDL8+yu6adA=Ut5%hLMc4&0W42>s=w%v;X`
q@lSl}WC4kjxCn4C-Tc?zb$<i*%hX1p5layO0000<MNUMnLSTZeGuTrA

diff --git a/xabber/emojicon/src/main/res/drawable-hdpi/orca_emoji_category_people.png b/xabber/emojicon/src/main/res/drawable-hdpi/orca_emoji_category_people.png
deleted file mode 100644
index c96c7fdffc16d2088ee6b7d5e8b511900576feae..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 905
zcmV;419tq0P)<h;3K|Lk000e1NJLTq001Tc001Tk1^@s6s6FYf0009}Nkl<Zc-rk)
zOK4L;6m6mi{=l}P)=kxdDa6G5W1wPIE`(wbvT)<d;=)oWxY12R!R}m$bzv0*g$mVW
zQ9+3=tfIJSHWAT<MX^N$Kls6D>p3uiNBZu(d3i~?>A>M7aOcjMJ9o~z_qDaHjuja3
zczi=N8tqOdlY7G9@V0zDzoz9Rg2CV>5b2G@Vgq<i0q=pO8hlG65>N3Q1KC4(c44Zo
zDTFea%z7-4!-6*jG7^3OPk^&PPeTb}*E`^J68H)%x*%mm1t=rZ{hkRiS3oKWhqHB(
zu_cJ8kKhD4>L!KV9fPBH4J2hHcO{idb-E^oNr@(rvL5ZldU9&EiKMDnMC1mu+3Z@=
z+c&9k_7`{rOsE^DTbQ@^DljM6fY>}z=AemK=G5(z7AxVH_d?Is;rFP+24b|s;>UGS
z1F;(r=8anMR63=TgbP)BsC@?i=LNg_RXZLP{Jz!r{K!q{qSb34o;eG#Zv204XNM?^
z)cC%v^9$nVMPlkTqfJ<lNmy=fCmcQyhz(eM!*1BY_Xl0XrVMUU+G4*I3qBNxovQJD
z#>qG4ge77o@4$T3J`#!Sg0mNb-Dr*P2?Jt-wxx@S_8>x+43ocDwJQ_~ewE-(zQ>ml
zQ;BRMim!N_h}IT5a(L|=4TVDOh{S0V->|!77qK2gV$`P+oG|HsI@m72jybqscpA5t
z5o6`qf>)3eu1nR#_mw18t9{nvd?rkIjWC~U1mN$QhFHHuY)qK+vaZ_6W@v=A!dId+
zDJxVAOy0v@Nd*Fd&4|i9f!MT8`MWT2#%9t#9sw%_kI^~;KcDQP#cEkM*QdIfirr)s
zkjw#pJ*1SLJr;6n20FUasUD-Am4$Hg)}9n|LD(!JwGX%}`1}P7nKa2h-VPyZ#1|fG
zI-TBbK*|q7Cn(4onJD)4^|ianhk}M2@rN}Q2p(XS!J{I0dx71mgeo~`*Btu`x1Dzf
zTPz21ORC!a47^bdEi07Y27+3q3e<IrxO=u(9=dNaQY7X1;|p6Xb~6ni$V4x?K0ax%
znP7{>ZpNgp5=tO`{TXtV=q^7&#n?EoMmOxXrzxJ)sg`{=!(#i@F^{vz!}AVH7gh<B
f9G7~xIy{a4VdseBdd|rN00000NkvXXu0mjfVbiCD

diff --git a/xabber/emojicon/src/main/res/drawable-hdpi/orca_emoji_category_punctuation.png b/xabber/emojicon/src/main/res/drawable-hdpi/orca_emoji_category_punctuation.png
deleted file mode 100644
index 8c272367c3ccf25afef83b0ccda82f789b16741d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 759
zcmV<T0to$yP)<h;3K|Lk000e1NJLTq001oj001or1^@s6IvV1d0008MNkl<Zc-rll
z&2NlR6vm7ADzUL378;DEOfuge8Ic%8ELgCZmBe3AiL&TQOBYrMv5;6uH5TGKMEnD#
zgpH&^1)-ssCXGfLQIy{!NAmW~$js)Q8Ff$c<evMUbKiOHz0Z5kZ5tY#IdkUBnKNfI
z$>Q;NE}2Z;0*}E!4WQq>old7WRYW+ENRXd=2Y%K8K4dbPTv^g29su9!g!FgNQ3>hJ
zIwAZUsZ{E4CGzN+iKIXAqFw>N=z0E@vFB*J!BOIOXup)$?m^IJ{UP(mf+qbm5{WDl
z@E_Q-KE_388|^i-`GA(v-vK^*#!ise7K_C;SpQfyn_Wgb8Z_xAp4@x-L0%lEJBxmZ
z{&BD`pU*F_Z{(n7><GEr$ZN$P$KM+Yh2~d79@9um23l1}E+%#!O!539?MCHjLY}e1
z)PNN6cFBx(w=W(T>E~?e5?jSr;05Sm+y&41F0Hm$&Srbo$>f^D;qW|@P7A&!+DH-E
zYGVQ;{RYx&Y3G)RO-b{-W4qp^$>CqI*degeCbC9SDijKHSosxTOQ59xY(0e5mx#Y)
z)zYT#2<Y|2FH7s17<iV;<rdOjs)js9$=OM}tHgv(Yx}i&^!vdNi;WR`s1KAmEyur#
zf7VvL2fPoO^n{iA?h>(+5N@*V_D<$5I$outP?C_2B`@uWd^_I*B|Q$VgB!l0pu%zA
zByr7GScduWi_$XCjqHqc&#JG+KSgXHXwri!2!d_-w8CM}byIv@Vysqmj|vVe-)iUe
zNY&42?+&O~*nPZ7AEj?x(d2N%Bok7;?Ofobi^{P)?=kgNvar|*;4jTXM!4TdcR}c8
zxohx$eaovq(pI_tEz%^lnLg`*^dx-R%aV>pqs?|tt~K#V@CdoCtLQIs9r`5i*Vfbu
py1wdS=Ki7M%$YN1&Yb<tegTr=(y}FY9(n)(002ovPDHLkV1m0<ei{G(

diff --git a/xabber/emojicon/src/main/res/drawable-hdpi/orca_emoji_more_back_normal.png b/xabber/emojicon/src/main/res/drawable-hdpi/orca_emoji_more_back_normal.png
deleted file mode 100644
index 629e35a772edd2c3ec42b76cb32a79e4d7813ab9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 458
zcmV;*0X6=KP)<h;3K|Lk000e1NJLTq0024w001or1^@s6|7ds%0004zNkl<Zc-rli
zyGjE=7=;s~g5VWF5YcEMC~+^@TU^#+3twSNErQzESqk>PfncEzpro?55wz1v1LCz3
zYcHtraz-|=3=^@+rZ^uQHaq`e`OnN`CX*qA5JCtcgb+dqA<d##EassF%d%D+#|aww
zJkOgzeG$H8JiRas+ZDDp)MjkkUc$2s?=;4;sfUc4I)a{{SLgxFt;;@)&7yW0`(B_s
zOimf4ob<gAwQB5nhOYjayrzLhwxMrHqQSX@rw=+&_^O6sjMRNm6y-1>XA0kAsZ{Ds
zJLtKhu@7i1v6^_b?-jl;v4xX=0fpyRVx`j#da7vb9pP3JL3NDXDw?l}THUAX`j7~(
z3M#gK+Cev<H>okPdQ){zp-||=`<@g+{6541H7I?r0@V_}Pv{uxNIU2-v?;bQX8i`w
z1J`xu6}~ZO3%Y==;oZkp_2m=QG|fq@^o}@$;=^lKoYpOIz4*T0g>a*2a$M82f&ciR
z{sz}ZHVA^A_{z#-H+1s?Cxj3}2qA<JLP+cI1Iy^WN7{ZjTL1t607*qoM6N<$f^IL-
AC;$Ke

diff --git a/xabber/emojicon/src/main/res/drawable-hdpi/orca_emoji_more_front_normal.png b/xabber/emojicon/src/main/res/drawable-hdpi/orca_emoji_more_front_normal.png
deleted file mode 100644
index 8932aed611b992aab045bfc3b3e016d06f9e5574..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 936
zcmV;Z16TZsP)<h;3K|Lk000e1NJLTq0021v001or1^@s66ko##000ATNkl<Zc-rln
zOH30{6o$(~5(TA^1cFW2xByJhxX~?9NJxmaw4L&<Af*BNn2pE=5mq9ijaCu}@(_>(
zk%UAe8(B1g4X_}A6>4LXf!KzHO%NJh$9pbqGcaXQ(nMyQll+;*{GI;aoI5wYovTpr
zDnCCz(QGznTCLW+hK7clViV@Z{K%n*P;o?wEX(RxJL|GES^Q0nO#!h9b7Ov+&8A15
zAXm5&j7H-vV*FiISp}69l~7S$Av$4h%#R$kwY9gAi{HibmPX4bF@l{W0{R)bLfwp0
zsZ?pzRn<SG1W9;2IXO9LA;|dL+}zBv(lV~RtQ@2w!n1~4$VVZwv$L;A5fZsVkO>lp
zOpqaENHIc|8cI2G0;D3sBSXrNGUQo@G%yB^oB*lFU@-g#kc<o|LkeWK*<t$2G_0?!
zgU926@eku*GMNOvmd7pNa=Bn*V*^%KSE0AJm#*ab9{i=!(cS@zi;Lj%`Cw&b1-f5!
z)75@VAQ?TwkrNP&%=KniT3P~r?e6Zv<i|<6a1Hs4)kbi;-EeSl5cUNE0T>({JaWC(
z)>iQT@*cUK-|vU6=UotOHilth1BqY0xw#3)i{m(`dsr9t^}OwYNQIvb-3*-eCnhE$
z`etTkXxIM<q~nzXwzszhp>U{~>P%tZ(9lrC@LPYjpyojh_25vQnwpB}o1LAdLpCOm
zL=cUdA2m~;<264&kN>fReXN~@ot+(lZ((8KFc9(J(fP(nhcUnQ_V!?GY>Yl<QRWju
z>UH|4AyNJP{WKVcL3zDiXnWEo@Qsd+(ys6C@6+cNCn@YA--F$no13FI1h0k1<>h6l
zH`T)_vc(P(g)`^Cy8-Cy>jRtB7SV&lvHfW~jJzKKr_*_2aP)OP>xALqVQ@GcbkaIy
zuGm7JQAr<Cuh$D9bvhkKKtVFn%8)Xo40-k;wK|Rnq#|vJR)&-z#R?fOamd4$utb+N
z_ch<71X-df`Hoy6NPMS$si>&vC7}nY2zdxsYItJ=?vlvL%DPruT>MoEfXIP7{M{dl
z;KP}kk&%&CaHqhbzNh}7(P(_6<)RVhRjbwR!n=j9)6>(h6CNdhA5W;8=Ys835nWAA
zPR>&*l{ds9%!|2$`BQ^Dagny4A$bzf1)>z9iy~4=Fn7}N4*mr=xse{^O-;!F0000<
KMNUMnLSTZYZo#_%

diff --git a/xabber/emojicon/src/main/res/drawable-hdpi/orca_emoji_more_front_pressed.png b/xabber/emojicon/src/main/res/drawable-hdpi/orca_emoji_more_front_pressed.png
deleted file mode 100644
index 54a266d21f5ad629ec75f784162cb5f4f5ccac04..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 828
zcmV-C1H=4@P)<h;3K|Lk000e1NJLTq0021v001or1^@s66ko##00096Nkl<Zc-rln
zT}V@57{^b6R8ZY@*F}(^%;N-wwC}Q@vbu}z3PZFsq|MM_UNpa^t7+vI)5@<Xr>@L$
z`7NnPmdlb16|`Y#Dv49m)P4B$K8u;BbA;~3nePM7-G67l-}{{RJvT4ItS+T;qvs{n
z4zEbHm(OLDL~M=R$d4Y(TIC(CIwOhHG)rY!)6#3%i@qXi<V9}6-{KvXa#m2#Gd$gg
zjlO3Nh%bUYHy=Zg@(BcrsF4@Bksm#Fho!PSNlDb5N`DdvN-Pt7qlY9iQ_m3$h=}lD
zWw}Fv$}+c*L=RS;`z0VE-(y8`S7^~@R<0d(2SI1EG1{-_#gX)NGfCn@C8;Epq>@yU
zN>WKGNhPTym2^wVbJ;ae-Z=onld~{5Zic+39yq0`;^i*p*MXtO1miRF(EDu?R4?Aa
z!IW}NW`D8{u9mbw`@jf%H_w65Gy#h8b~uz;;X28Xj4J3H9D~(mvDu-pt(PMZoUVud
zu_;(ym0Pe_K~wvl^StoFMi`y?$$6f6ei34IZLX8VKc8J#f`7~OV+Ky#dbW~Fs(uSX
zHA8-TAo<T?>`T(Y{nx#Mx$5pAvS<~qkxbBc!2FVx2ZgWN$=iP=GwZqq;pY}DaEwgZ
z`Kp$7^a<wbKMlj-R2NBJ(AL7(^c)YWwSNSTrd6)w&gU3l$!g=}+DL9MnV>V5SoH>e
zS-6X4wc8=5@uOqXE<1SChAsyf!dS_E#3^1WZsO&#2`En8W?y#f+rf!xIIe!m$sAEt
zLIar^E{HQ{G>yaQjOVWZgoGB<gXWbH(rdcNY5P(zg9lMmNi$?Md~i%GWDRiKd)Lca
z;ck7mV><+=>FIZpN>WKGNhPTym86nXl1i>GNrr(9Y>c)qFj40gg6P4@wf*SDy%-_O
zi}$}#N&;?hF@ktVWZHQC6_@C&?b6r>djEt+q7}snB0qYdkKkP%pQzle(zu7Qeu|>c
zq(}V}#Ug6tCERfZ3a>czHs*hdti-0B^2{w_Y2;<rbNvR|%)PQf+RZuu0000<MNUMn
GLSTYD9F~#*

diff --git a/xabber/emojicon/src/main/res/drawable-mdpi/keyboard_background_holo.9.png b/xabber/emojicon/src/main/res/drawable-mdpi/keyboard_background_holo.9.png
deleted file mode 100644
index fbe97f7a2a4a32a7b42c67198552b60b7d6e4650..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 204
zcmeAS@N?(olHy`uVBq!ia0vp^EI@pUgAGVF2|wHg5-4`^4B-HR8jh3>AfL0qBeIx*
zfx8og8O=|gUJDe=^K@|x@#uUzeIxGy1s)duDT#ajo8&w;ad2F8LFEu%UFWmZck)^e
zp^RJfgc>?D95h?cEV$z~o3G*2OX2Cd=Z{JE_%G;|2zz(<<Hzr-<TeUsPk3l?&5K{V
wXK$Bf+rO2+?s)K=zvyavh~u%_-{evzcCO~QGmFm~0&QmSboFyt=akR{04~}{r~m)}

diff --git a/xabber/emojicon/src/main/res/drawable-mdpi/orca_attach_camera_normal.png b/xabber/emojicon/src/main/res/drawable-mdpi/orca_attach_camera_normal.png
deleted file mode 100644
index da9b21747b1c55c10e4cc1f07618efa8eb20dab2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1084
zcmV-C1jGA@P)<h;3K|Lk000e1NJLTq003VA003VI1^@s6j!YZ%000C7Nkl<Zc-rlo
zTSydP7=~9XJJ{)>2q~nCiq1qxMnO;zT?JCDQDB*l?y|A5%2JV03q?T%5g}nvRAdoh
zMI~KTpcEEFCFw;cD(IYAR3@Fa_m@$Yk8yWqcH14+_kowu*?+$I_MMr3{?oc#gb+dq
zA%qY@2qA<JLI@#*5JCtcgb+eVTH^Qn$9g=TE9K?oKcTP*{YLrvl9G}UbT3X|=5dpz
zOKqlm@tfah)BJ;UFLmZ0pnEY0g+iHSWo0W-PhWtZ!L)Yh4fFzf3VpX}{trD?D)bzx
zfpQ&dyw~fUhy<H#n(KJsX8NRQ+HA)ekEF&S!IyfHo!B12z9rZ`PP2>fP(9sFZN<ET
z`O_ozH>cqfu*hlVx9Q0(7W<oRe!=so#^&MuF$aHFC(=B`EJV!Zv4pY(*q%1Xt<q`c
zcPAzvNt@>1mT_R%nM9diTwFZF%6G%L8$^tdBh5G1-)!Tq4;sW-n=12FAEV!x5A8FE
zvyJ8_$NUaxYEO*P($Y!z|6`)e4+ewTG(WmjXRH=F1$|9$i=}|(r>?2k2_01?np6|b
zcaCVjfxe(wcn5d&HRwA2Z&C9BH2?qU8*~`Tce~vK49-6a7h*Lo%1xS|*t+{1wmD{V
zMERxq2qn#rLw}%6cJd4a0;6&44VrKNj`#L4mym_(WdS~4gK}<YRyZ8akmV{WDu$v=
z1I@RtWAYrT)1)^E+YQRA37qxvBIrZl?`XbxeNfegh@T6!ni$Ev<oEjri+8{}nr~iJ
z26ud`h2v`@k5{cD?0Z7<O}u2iUhjAjd$*0T{AD6W70r*W2O{pEhzT4kFY9_y_2kj~
z*ruHnar5nt>qK_O)O)~2FSy^Czemh26~+-SN96dP=0`Vwm#8jQ#1U_d$niDJkFFYV
z=g+Xa_6CRdw)s{2AN#v#est3sMCc5?17$VV3GoC?<_kBrx_mz0a1mRxcmaQ*xjIwC
z@X&m7=4}vTIhojh*+Pu12KhD8d~<4n;R8kdVYn!Du{vldvt8zfr(hw67p&d=m3@rW
zufpfI^x@{-mCgEU={#8;ZT&2KexK%BtozllabJ0$(=<}GgrF&MAWdAXY7QyeQ=6t~
z^KGW8T1k63nG&DWk0mx*S+1>*;a^P0X~gcjR@J3Ro<P5+X04)CF={kapKR$!&^dQH
z&HSD&dLYT>_vkZp6?OT3wXPF&{to@8Ja@%QI1x+CeU36;Uje3)`-|j`s7E}><|j?~
zZqpoPJ`$QB=0sJUd=`3}X6DzroQPU206j|AAH+d*MMXu~E~la<D%9d6Xp4n~sE!t@
z(MoLRx(FeJ5JCtcgb+dqA%qY@2qA<JLI@#**ykVE+bYIDL7DFW0000<MNUMnLSTa7
C2o4+o

diff --git a/xabber/emojicon/src/main/res/drawable-mdpi/orca_attach_camera_pressed.png b/xabber/emojicon/src/main/res/drawable-mdpi/orca_attach_camera_pressed.png
deleted file mode 100644
index c0a1ad5b47cfe3ffbad86242ecdbfa6cb8578618..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1080
zcmV-81jqY{P)<h;3K|Lk000e1NJLTq003VA003VI1^@s6j!YZ%000C3Nkl<Zc-rlo
zdx%U?9LHzZW4-x<w5>LO3}Kj^nVp9<rJ<z#Lv5H9e~?l{Nt=)rQ$(R8ZQ3nDmLyBq
z{Ds<$Q1Zz7!z<K!&n|iF#(I3ucBiJ(-8=VX<{IBmeLK5%@BPg=-+Sh~*X1IF5JCtc
zgb+dqA%qY@2qA<JLI@#*5JK`2zu!NmyuADZ^d0)0Nx@*S2WfLO8XZpeECMqR>oHyB
zC2XL37J-qiCe7bR_i|)Dw3qH>AdyHEqLwazSxwMWr~`ThJ%^q^UrpBhE+tkj^bDV0
zkF?aW#`}D}@yOr}lQsKa(1$=E;B}nwkw|1LGWSBs<Tq$PGCCXSqda>7_fXtIN0|?!
zQ=^!dco9?5+W7nV_6@*rd8X4k(xj5PS<-d0=ATA88xDm+KKxu~r+KI-)rdPUlW=bp
zbX+AyjnmBU&6wzLt(p(hughO;Tt8u#`LS4RkioLGNcl@R(tMTcW@`R=l{iasWxkkW
z{5R&KaJy9u*i7@YQ}a8aNok$A8^6D|%Y3ibJCx>YOH9TZQP5*ZKifQFsiOJ0lbDAz
z2ov>4o;cF{9E#?v>l1Vn=3GL08ES)iX#U^R7j(!6kVfM1ct4fTABn#&LVA_v+pAMh
zv4M_rj##0j`PTFkT5EFUbrhbxLi5dQm0BJ=9?!r~C^Q4+EXF-?Xc{gT$oExLR1B7v
z3~0W-f*+DULrj{KAz_EgGhzd0nfwyO5;&fDL-Y0PooF_s_@&T89nYSttgI}O`hcZ0
zUw@%%<r=Tk_>>ycpBJMeTzgFOb#$_5t4pK}oE;|C^5;smzn11_)?F#?0GN<85vMsl
zj^FPO()`RiD#eYMUDrvUjER0gITc6qHMCP|a;h!FDwgv2mgZ|~dwN`q=jU69HCoDJ
zJI&WFaJ^){$L!e~Y0O`MYuz+oTP;%P0%ZbaG|mxevNeGnZf14IVzFUT>=g!M{D5&&
zrM_b&&DS?ZUoM3g=R(gLh_Oi}f2}lMpW0CS`%CeMz>G6GRzbI@EHOv9ykJZ<eXP|l
zgsv$@r|uOeo14Pna8PXp6o0!z^9{EBV%fN_e4qmzAx1(le4^X!F4D+v9ha2NDT(%f
zy2-4HQPM7MrdU%KUcefcf#cfBG4`|hxQ*D`){3??%Nyvo#jcfB6H``JR-$aSblNoP
z+U7L#+m%|eF3aYp^bxuU?NQEkZWXg)7<EhPgzeC3r<vcNWb7AoP<+L+Y<|{+7dqKd
z=ELl9(w?YjlTRXjooD7Zx}1nOEr1vBAYcC>PE6*Eo^Z}8VxvMioU~EzK~$$pOzfb5
yix5HxA%qY@2qA<JLI@#*5JCtcgb+fAdHw+RiAPt1p)$k(0000<MNUMnLSTX?bPX5)

diff --git a/xabber/emojicon/src/main/res/drawable-mdpi/orca_attach_location_normal.png b/xabber/emojicon/src/main/res/drawable-mdpi/orca_attach_location_normal.png
deleted file mode 100644
index 796e94120ec31db5ddf0d07428227df15f4af0cd..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 945
zcmV;i15W&jP)<h;3K|Lk000e1NJLTq003VA003VI1^@s6j!YZ%000AcNkl<Zc-rlo
zOKTHR7={xC>jlLNctJt5y0nO*xDs?>g%;7ptRx|1Cdnir#UQ%TMd(KAs$N#bjs5_o
zXc0sdX;<O}6+y&HL9w7HYD<;cHoixun1*I@&SWNup7()|(vmr(&-vy%mpKy(5kd$d
zgb+dqA%qY@2qA<JLI@#*5YqfaqtR8VRBCS`k%%Xg$>WGqh-0>GAI0BxMIw<UwB#d@
zy%mBBh^L5YMA0QC5QB&=bjWJj^GG_K-U*5Q62dFRPuvZcEX&$No08;mxn;=qKFFK$
zD7`#>AiB|R3+=jqEEU=Q#wY3J@fdg0W?G&D$mu|g1tfkZKB9y7(Dv*>^`NNHk^)B%
zCn2#dlgX?_UEhx1Par->UO$REfF0lrtZlLxk50O4n&!$1?X19O?#SK&*=%;B?xkii
zguajzHY^5XxAx-k_)>iCtz<_&FbrdX&hmQ{>a``)Cg%4s**4Jur*)m#Y;dN5QlexR
zO-}idT^o#Qxfny%oma^Eam738yF%MNT8Yo+^Na9Le^n4PC9aWNq_yDllPc3strlRI
z9v<>ANAHl#`U9$M<NI{#G|-;&Apc&WP?+b|Zn0PlD@->_2i{(t<PUmWp`OL%;R?-$
z6=zSS@`rSi|GtJTf}3LRzN8bvVh0og2fVh4Ye#gF@5dg_C&Y8-XRU4h(n<bAz#C|)
zF{zXM;U<&+PAB=-noNGbPV@XsGs(yI$?25&>l9a^f!2H5w%6;nqj{rAvVK6jjWuLj
zdy~j-*G|5(74W3N^6$H>nE(6IV>D7e?!L~Du88axkMkN-ZickY`WY<C+TQ^A)5!YW
zA@b*`*7Z8eze4MOYk#Z4xt&_$3+}cxv_887y6YrAMcZXK&vjo0DIVpm>eDctvwvR=
zN5ZScm}#0@XxV-6?F&eL7wuL-90?3yzyCJNjoRGbuk!O*oQ|Vawer*J(@ORTZ7LFr
z#TG)|vl``Jq)G4Pr%mNBZP~Q)k?25LtgZZbdE_Y0fwt0~KOJyYWz!6CnAZHO|H~ot
zwWRzrH0J;6cSp7QkD1La!!YL4Rxsr!=_3DCrI+Q1PawN5&oQ(4hM(JLCt#f2&xfUN
zt;oJOL3}{GLtAn>IZq??AArU7^97n9gb+dqA%qY@2qA<JLI@#*5JCtc{~*5stn$Ul
TGk=y`00000NkvXXu0mjfZ}ZrJ

diff --git a/xabber/emojicon/src/main/res/drawable-mdpi/orca_attach_location_pressed.png b/xabber/emojicon/src/main/res/drawable-mdpi/orca_attach_location_pressed.png
deleted file mode 100644
index 76dc17c8a8447ff59dd38ad040421380d6c5b04f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 930
zcmV;T16}-yP)<h;3K|Lk000e1NJLTq003VA003VI1^@s6j!YZ%000ANNkl<Zc-rlo
z%WD%+6o*p<>jT9q_&`ClaTPL|JWR|3NnNO+MRbvs8xc_uEQ;tx7t)Q?Reh|A8~p<m
z(ISW_(ypW`DuRfQfMP*W)D|l>t^Te=nua{?otY$K@9%>{OVhcu-<&yf@0mLu4<UpQ
zLI@#*5JCtcgb+dqA%qY@2qEq#8jUUw27_B7k;uMqID8CWPa=+lLZLmIfMFPmXvslL
z)7%Kbry=_(VhZuQN=zUI5#5PIVg>D41lb&h^y?DBE5%R5C0s4*X;YF|EVcyF`Vo^B
zrI*GyqQ~p?w$g5mYzJ=~l0GAF6+OmnVFN9f0fIUaWAzYU6d!SdH`8_z$jBXq8Z9Gm
z1OiVW3>>!#VdDGa`1uFP<41V{rb~^Xkn#88@%XZG<M{plHhg|p_6oq1b)D{|W+CE*
zq_CX08CM%GnM^Lm@4b~AZ`kMa&C@ySdll;Se#tTSDvWtb*D2*%%s|FvMPc<SwP;GE
zQf&%rgHhRWXIsfRuaKcX6vzH9JGQv`v=Wb-<^ufVUlrs}ieqHP&SWyJxT5kZ(@(7y
zV34!Z!W_L*GV8agj*aZ^(y8Q}v#>(Fk3;9w7`jDax>+23I>{fj*djP91XmJ|&wDMd
ze1~+B|K3KA=9cK)7oCKbLQiPGM%!UTC;3kFa6TcP7rxpZ>z7XQC+gflQ;ob%@^dbe
z|4t|Q*W4suJTcQr{vnrT{$ZWuuNHOIC0U;j1OjVx>+RfhN!AbO*iPQ=2KnOe(6Os5
zS^-a*EdD{274xhwJ=rG9@A7Dj$o}Cb$sf`->x*jt)+UIb!Yn81A%DxyjRsFIuh9Cm
z{C0(XJ9gtsEEZcy>oZS4PlK}lAZ?dWc&_`h&f;aBhH0Dq9X7Uv*NQRR+`Y71{RH&a
zNq#r&)}XLIKj(0{xx;d!Hura`{CpO><7ic_{Pa20LfB24ilo!&`H=U_X1TdYlh(_R
zp|Y8_MEoOh0%_4+`LXiIQS1Y4r#)v*z*Uu|8DbZ$IfQANOCj{Nr2I29=6v>tB<la|
zY&JWWw(4^OK2Syct4c4+5$CRe%VorWL-=W@&J?<z4~ySgk$rK3IDmME_TTPg+y{=*
zNaM>-2gF~X2|@@Vgb+dqA%qY@2qA<JLI@#*5b_`L2lAHs6Ux>=1ONa407*qoM6N<$
Eg4|BOdjJ3c

diff --git a/xabber/emojicon/src/main/res/drawable-mdpi/orca_attach_photo_normal.png b/xabber/emojicon/src/main/res/drawable-mdpi/orca_attach_photo_normal.png
deleted file mode 100644
index 7d405538e38d121054a6eae5db035b5e83d7b39f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 972
zcmV;-12g=IP)<h;3K|Lk000e1NJLTq003VA003VI1^@s6j!YZ%000A%Nkl<Zc-rlo
zNoW&M7{?n07Zf){To6S?#ZufsL=+V2av!`@jD##RBsPIq6^qWnix&|=t=^<Z4<erQ
z(t|}55k>LhQuN>kDu_!(ZR7vRj11G6ER9L$oB99XBk5$B_kMZvy*KZ@wzLpJ2qA<J
zLI@#*5JCtcgb+dqA%qY@2q9ugrBX`~2N9-}NG6j<@wi2__;fnmflB;Dl!V54R3j#_
z#m|HM?}Eku4O|8LB+5@q7jMb$mni>)s}j3)U0)(0P~Jz5vcHlj-*mO2HbG^-7a949
zL}C_RKdmZib<ocdCk?}x8Wj2HzgFS-W5oW@$cNy$sMrgye2e1`^ZERYAjntccN{ZA
zAs@%DR_OFD22lP`pwnnI@-vyt9IGPb<bR9D<C6j=U&SHO@-YJ1T+MI~scBgN<(s1A
z<Jih-<f{(3p0Z&0I5U^aO{07VrfH6|MmFW-->Rn^>Ky2}uj4AaO!*_{fA-+D-#+5M
zK-!u*=a;%2-=|Uj$oIA*p1IzC2eGcsGPJuo^pEJ|7f`-;dRUFv@jp6P^b?D4&JP}Q
zH8)G8QjGE&gc_Q<1iEkDIw`*n(1Hy$S?81IFIDKo2l3ff${$@Px(o3O-}zPDE4W@e
zP~~*-1EjhMlwVtmZ-wB`&Q8>B#pq1es#aaYeEliPuM%rIV!%V<YfJn<jf*8i_~Euu
zeg$xcIuR|tznsWXu2#K7Os9N*V)%S-1D6YXDc?WOcQ<;i7FX5YNXl2ayv+A#h~XwI
zmVZLbj+A_rZxK(?^3G|RHs00ZH#T|uNn6xrHLp2t{jb;yCx&4x#IZL`-YOCu`8amW
zBlq@Yv)TFTCTI-y=|n?5TKUd0!^6Qb+9VZz`RHI5t2@&G?obQ2{6e8H8PD$rbbFw$
ze5At-;^pJ93-Kg~fmFEMPre#?aaOZAWtS}<m+5i$9i*=7>m`JBCH$NFktn|-3|qtz
zw;j{fGUOMF#VPm!-b$B`I%Mp11TpdzxP&*Mkne?xABOO=_F}uW6GD!Bd+x?cL0xz}
zYzO|%qjH^%44fm2bERqxwGG@J`8d+(8FBK%0K{*F>>uLgqaqj7_B|<qE8worl=cyE
z@=@rXFpPpQ`q?f{zS^#b!oL&#ABufyI$UH9#VBY6DsjUjj|P3%skR^X)Uw^25JCtc
ugb+dqA%qY@2qA<JLI@#*5JCtE7JmR|s2(Y`28VP20000<MNUMnLSTZ^OwmUG

diff --git a/xabber/emojicon/src/main/res/drawable-mdpi/orca_attach_photo_pressed.png b/xabber/emojicon/src/main/res/drawable-mdpi/orca_attach_photo_pressed.png
deleted file mode 100644
index 0e3e452e7e51adfe6bbeb60e5c1bdd5c97bb0e7f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 969
zcmV;)12+7LP)<h;3K|Lk000e1NJLTq003VA003VI1^@s6j!YZ%000A!Nkl<Zc-rln
zNoW*76ow}XE+}q@xFCv(ip}(N&(dRy=%5fC?}L|!c!?sSUffW04qm*72(CBD(SwL5
zz2u;XA`(%&xCA}8K_ZAtM2+z;>5;ZGJxeAt>DT>#@JP=>Pt}*ISJhP&ixENyA%qY@
z2qA<JLI@#*5JCtcgb+dqA!13TQcDqg)9G|kN}#+)5Nkz?&tx(ksKgJ%kkB}fYP3mg
z@$(Sh1dIP0=n31z$w#4gN*C|M9f|T!cv?^%X=sUrKzSd#%KloS{Gz7?#RZl9L1g6H
zwmmDEOrBO1bq44cczsgSw5dUnpUq}h;ra<;duZgNo6p5(FMaauBf~Ie1VO$kzbl0n
zLm?mUU#l|PxD+(`h`~Uo(OTr|x<1FLNTu1v*IX_)DPZzdqc|X1K2pw_TBdu*|H}d>
zzbINh-dkCVd^I39QkHl;J`)4xG|K;<acX8$MgHvui=uwx2I30k5C7g4eD=#n{AZ*l
zqrqj4W3KxZD1W%1cEoef_wON+4T^8~4CwudL}CHumq`znWhKzkH;%>tYntXF{AOR7
z-gK+lN@Wz~j~Z%f>JjLTeU#r=O4+Rz>wG@DTxAd+Ko8R>e*_>cZN~k6BEG0+1<$j?
zjvAMWdo)d(K>2l`S}gAM$t9t`)QWL!s#aacM#(A4uMxEzf&2EB5&6au-&^NK$sqo5
z>nXnq`Fwt&+EuC~a)diouMpEI-=8+zud9jsv|W^6+f!;&0)zP0NXl2ayn^@w;&%%+
z%0D7zM@qiRw}@wmbA>`-yk};UY4P!sc%)V}(cQ1RDs;89aRToP@!s1O9}|g=e0=9<
znZd8yG|l<=+cO4dbfO_2Eq+sl>EXZ_9gqsYe8VsntL5DQo=yw5eA~7s<N9Ghj|Te6
zM=DH<myh=k;`(V2!?LX9e)64}7gse~P<Gk!QNZKgCrCs}LO4C)-`bBj`KUxk7><ZT
z@?F<*wG8>Xu1`TB--X~Gu*<cNFeK)@CR+b$6!e2o>1sXcY|PngcTPgckzZQ7Q7Ooo
z<s2#nUhh{M+06|6#vZiT&U!-~124^dT=h63PJS4`9Df~ze-|$w1;5}N-;)yeeU`Kj
zi<6HObTJIGAk<@nIQi<h9=hy%;qtrHa=6GG3i&Hgft%huDj@n)&#mXUIU$4)LI@#*
r5JCtcgb+dqA%qY@2qA<J5-k1zo>MI$?~0#A00000NkvXXu0mjf&*sO;

diff --git a/xabber/emojicon/src/main/res/drawable-mdpi/orca_attachments_arrow.png b/xabber/emojicon/src/main/res/drawable-mdpi/orca_attachments_arrow.png
deleted file mode 100644
index cec8039fe3ead57c2e126f88f16b0935eb52cce3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 161
zcmeAS@N?(olHy`uVBq!ia0vp@K+Mj;1|%;R9G3!88J;eVAr-fh6Am!_`~Uy^$6sGx
zALTj1w16#bL0h!LpZ`x!PdDzo#1gVcd<kP){NAdojp2u9o991M%5Hd6@9>c;#_USs
zMTW!mjZ&L0=6W!AKDfwosJ`LVqXem#2B!TS84Sq_ZpAyuFfg2dw7ojL^6Vs_oeZ9?
KelF{r5}E+oDnRD|

diff --git a/xabber/emojicon/src/main/res/drawable-mdpi/orca_attachments_arrow_reversed.png b/xabber/emojicon/src/main/res/drawable-mdpi/orca_attachments_arrow_reversed.png
deleted file mode 100644
index ab41be4826bb16f32629deed0f92be147865936d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 142
zcmeAS@N?(olHy`uVBq!ia0vp^AT}!p8<4C?sm%aVp`I>|Ar-fhEB^o6`|$Pk_4bS(
z>vMiwT^$}Dzpp0qECZ86n{>bjb+Oj__xDsjKGVR{z+~v~hu!m{zQVV}18fakryG9A
q2ONxFFjbM~2SdO^mkBRlJYrB^k-3kHg>@Cs0tQc4KbLh*2~7ZAG&L&#

diff --git a/xabber/emojicon/src/main/res/drawable-mdpi/orca_composer_divider_horizontal.9.png b/xabber/emojicon/src/main/res/drawable-mdpi/orca_composer_divider_horizontal.9.png
deleted file mode 100644
index 1e63d7cf2475bc5d0b5beab9b8713c527310a2e5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 92
zcmeAS@N?(olHy`uVBq!ia0vp^Y#_`5A|IT2?*XKgJzX3_DsCkwG&KCrkg)%;zvAN~
owiKSrU*$QZCKxgsG8`^q_~ND1H$SsrAy7Gkr>mdKI;Vst07q*ZmjD0&

diff --git a/xabber/emojicon/src/main/res/drawable-mdpi/orca_composer_divider_vertical.9.png b/xabber/emojicon/src/main/res/drawable-mdpi/orca_composer_divider_vertical.9.png
deleted file mode 100644
index bff2c6c5d623e1ff5afb9ded7fc15b540cb2da57..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 90
zcmeAS@N?(olHy`uVBq!ia0vp^Y#_`5A|IT2?*XI~JzX3_DsCkwI5hkZ=utZG;s5{t
mZAZJs%@=e8`ZqC3vopkOSL%x^=sE&a%;4$j=d#Wzp$PywEgSy;

diff --git a/xabber/emojicon/src/main/res/drawable-mdpi/orca_composer_popup_active_normal.png b/xabber/emojicon/src/main/res/drawable-mdpi/orca_composer_popup_active_normal.png
deleted file mode 100644
index 46b1e6f3606f6bf7f86849b2c70de3aee5c80ad9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 509
zcmV<Z0RsMsP)<h;3K|Lk000e1NJLTq001HY001Hg1^@s6I!6n_0005RNkl<Zc-rlj
z%SyvQ6o#ulg@`VTPoz6{N}*V&R1rmqikAvr5Cu2xMKH-sT03cUp%v`L7f__srfDv%
zxX?voYCO>v+BDV8)J^llS!D9hIUi@{gaiV<eEIU#Yhu}CkVoPzi^$|(UJjEn@TJbr
z$sk>bWHQJh@s&fwhNy8UJ=f8TNC-Su-K(7m!VonO9*aly#Etmmd9u(3!IN+k#CISp
z?ok8D<?~Yj^XZ0x&MY;-MmUtJxjgp6Q!Yde#J27JLa`M0f`Klqz<TuO$XX%t1$iI#
z4p6-(4veg*8*Z5Tvm4NUmX#f6Pgf=f689;pzUI-HmM9iW+m5&Eqg>JqrW1^!sGI-x
zP2n+F?$iwc-2D%RJ}9>O+p&BHpE~H;(Kv}&Ox8U*P{WC|)wYhvA;U2J)FB{w++7R_
zX-if0Ma`(hgrxN0e$VpaG1bYz32EA0L`X;<s$QONcnqTw^@71zj8OxTu5NZ)AfO;j
z&aB&~>*Yw|;?ivPUS4IksDV_g)zRxrR(29Qg*45W>Etb!U&7$2I^MhN{UaRB2<>|^
z3hh5NO>^QeuVq=|Z*T7>uxHr+f%4_cSI_ASHU=hz95FJ_00000NkvXXu0mjfQ@Zm&

diff --git a/xabber/emojicon/src/main/res/drawable-mdpi/orca_composer_popup_active_pressed.png b/xabber/emojicon/src/main/res/drawable-mdpi/orca_composer_popup_active_pressed.png
deleted file mode 100644
index cd963c0eef673cfab9175d656808485746f701c9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 754
zcmV<O0uB9%P)<h;3K|Lk000e1NJLTq001HY001Hg1^@s6I!6n_0008HNkl<Zc-rmQ
z?`slq90zdO9_f=@-awlQ4O77fBC7}DGeHEwKfq`8tVjLWVquIjp{!_Z5JnXJVAIp{
z=kDfOZh`ioQLNb0>D?K~*n`%S9#*>R`@QaByEMNSrasug8$A8o_w(ZW{oW}m6u*uk
z5Dkb4<W!Gh5_%3P4j{%s?81j9dlZw<b6muXfLK8=5H-lL9z`wmwDJa}QmF?obUg$}
zqvH)KmFfgI8SNuv6hOuX0fHSt1{;E57!o8Lj!a~-EAL(`5EnYtK7AfPo5~i}Cntku
z6o^KnL4$-Nk%>I{>MIBb(v0D`>+Nb6V(CkurU7en<m%_CV9<&LF&GRTAw-&bA|S-<
z<9P073&fO&5Cg7_b`A1jYwO|?Ros_i;)&cXv1T!zzM3ajo01yt{pQEZU4s~n#*ytR
zGv5YtCx&N(aLJ^I?JE7yX0sjd1kvmDXb=%oq1jm}MmU!OxeCoZfY+dGR#^}jH8`qF
z?OuzSITVIr=V2}C?aM<f7K`lX2+e+qw8OA$ZC37c<ewpUB73{tY$S=Ls9cEIY?cjC
z<H`Kpzb%V^c_e3P>~{N@!r^crLEykRk-sl(3YMrz71kQk_lY$57!iXGfdeK9a!%Te
zTwZH1Of3vH@XYec`j0<nhI)o@=b%Htb7ETBgaQb#X>a`Az%(0dg-Il`GhKsFg<|yJ
z;IJW_1!-Ni%1jqtzW#m)Tqw?Uf;gSdF@?+J>If;7N~g<jHg@5_uu-K#Uu#zjFjqj$
zH(2|2W0R#Q%GNaqOu1Y>v$M0Ct=H@4JJo`kb9;MV7BiWQ4P~>+g8a`PMm)sh@$?<y
zcDs)t0}Szcy}Euwcta=@g5L+)K0>s-A(cuE`+PpF@Lxr*5gOPV8u&j*IF1{Jsz4xs
k`ThQ$1onbGVQ*;o38v|WHK-<A<^TWy07*qoM6N<$f~V|UfdBvi

diff --git a/xabber/emojicon/src/main/res/drawable-mdpi/orca_composer_popup_normal.png b/xabber/emojicon/src/main/res/drawable-mdpi/orca_composer_popup_normal.png
deleted file mode 100644
index 179c1c56e4e06e47d19dedfb739a13aee7b7dd8c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 238
zcmV<K01^L*P)<h;3K|Lk000e1NJLTq001HY001Hg1^@s6I!6n_0002BNkl<Zc-rmO
zK?=e!5CzcQOu-8X9>P<Ir?6*mmo$w{lcplt+i0OUf*VV0#B7Q#j6#IYhYzy|%p(v;
z6k#x!A%>)4OlZD-w3~xLD3fQB<i?gJ62jfc6XA*wgdl`%)Vy2J_7{F$(WaT4`a^gT
ze~)mLOK%7ldi5&^&-B6@QrFE)s@;Wgb$iwRvUlh7wrT*bBYZUoLCD`gba^;BL{aWf
o!63$%2>`^lcE-;$1~bUq0h-3SXkVUtCjbBd07*qoM6N<$f-cWty#N3J

diff --git a/xabber/emojicon/src/main/res/drawable-mdpi/orca_composer_popup_pressed.png b/xabber/emojicon/src/main/res/drawable-mdpi/orca_composer_popup_pressed.png
deleted file mode 100644
index 9c334bce21c12c9c2dc7985bba15e9819562b0e8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 455
zcmV;&0XY7NP)<h;3K|Lk000e1NJLTq001HY001Hg1^@s6I!6n_0004wNkl<Zc-rmQ
zPfNmZ9LMpYCwIx%1kLS`*z`7b6mNnEi*;YnbLb)L5<P<;8blyMTjn2(bQXj?03o4^
z&p_}Hc}&*tyFU=(gf`h$OnAdjCVXCp9o#U?{KQZMDvvtwsl2rr!+s!gDAu~T?^Ahe
zGiPIVQAHGqN}_grDrs#N4MQT4pwJ=XBVe_RVZd>G4}D1m2uUGGHVhE*|3EG-<wHg7
zHX%3%25EH$pRG<`huWR~!V`ofNe>VcVdoY?5JZR|G)+g4&_O7Q`Xi8fLp?<U%hkc(
z_qe>isUL5I6bc1L$X&B1dq<en8~5j~A<g!~)wUqFYWvIy!Z6Hc$Yk<<GSFTY-JbTf
zuGKN8-wmH%KgQ!X-U-68Y!>4<F7TT*f`k@QDwVQWxm=DQTZ3rB(cDI8PoudfNVQsZ
z4Vg}-N3+>XhT!ZLQmItDLALehIfAT()M~X%&=A8QNfJB^rvrqf4TGX6ah~VX*1HP7
x5d>_5!FWNU>v|kiq9~GrAovn&!6s~j;Ts{LKGz=ly&C`k002ovPDHLkV1hxs#Fzj8

diff --git a/xabber/emojicon/src/main/res/drawable-mdpi/orca_composer_tab.9.png b/xabber/emojicon/src/main/res/drawable-mdpi/orca_composer_tab.9.png
deleted file mode 100644
index f377b526ccab987f3e2b2483ecf42a02d9daa53e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 92
zcmeAS@N?(olHy`uVBq!ia0vp^EI_Qp!3HENSSmt+l(MIbV@SoV<b;NX{{cJ?=U5an
q^&~d^*N@-Fb8IowVx|mEHU`x<ie0mwaxDfbXYh3Ob6Mw<&;$U`rx{-W

diff --git a/xabber/emojicon/src/main/res/drawable-mdpi/orca_composer_tab_active.9.png b/xabber/emojicon/src/main/res/drawable-mdpi/orca_composer_tab_active.9.png
deleted file mode 100644
index 9fdffacfe869d21160f4cbaaa52a040dd082e666..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 94
zcmeAS@N?(olHy`uVBq!ia0vp^EI_Qp!3HENSSmt+l&YtTV@SoV<b;NX{{cLVIi=bE
rnhls^%8t2mw5^g7l{m?y!O6xDdg-?B5y?z{paup{S3j3^P6<r_%oG?$

diff --git a/xabber/emojicon/src/main/res/drawable-mdpi/orca_composer_tab_dark.9.png b/xabber/emojicon/src/main/res/drawable-mdpi/orca_composer_tab_dark.9.png
deleted file mode 100644
index 06510fd963e03c2b24a2b631373c7d6e9053bf94..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 95
zcmeAS@N?(olHy`uVBq!ia0vp^EI_Qp!3HENSSmt+l$xiDV@SoV<b;NX{{cLV;p<|4
t@*gtz_y79(_+~?&t1Aw8h&gx~FwB{3=rTpT<SbAJgQu&X%Q~loCIDI3947z(

diff --git a/xabber/emojicon/src/main/res/drawable-mdpi/orca_composer_tab_pressed.9.png b/xabber/emojicon/src/main/res/drawable-mdpi/orca_composer_tab_pressed.9.png
deleted file mode 100644
index 74adc9942372474b2408dcf30552a852f0e6b3a1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 95
zcmeAS@N?(olHy`uVBq!ia0vp^Y(T8Y0V02;-Z}=P)I41rLn>}1Cp0wt&yY}(n6#UT
s^{~o+>!atK4=xs3EOa=GDf=G-1K0lOu7h66qCg!Cp00i_>zopr0F4P81poj5

diff --git a/xabber/emojicon/src/main/res/drawable-mdpi/orca_composer_top_divider.9.png b/xabber/emojicon/src/main/res/drawable-mdpi/orca_composer_top_divider.9.png
deleted file mode 100644
index 5a0f06d5c0dd050b4edcc5d4ca080436699fd857..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 103
zcmeAS@N?(olHy`uVBq!ia0vp^%s|Y^!3HG1Z=QA&Na=aHIEGZ*N=|5K_|N0fAgIQm
zG-G0F<V4FkCuHm_p1-;IdGmug^7eKA+{4(?7#Q9k6=aGlG(QE@$>8bg=d#Wzp$Pz{
CksyNr

diff --git a/xabber/emojicon/src/main/res/drawable-mdpi/orca_emoji_backspace_back_normal.png b/xabber/emojicon/src/main/res/drawable-mdpi/orca_emoji_backspace_back_normal.png
deleted file mode 100644
index 3ef16b52319f0a3077a5c8761e66a3b1c93f0e4e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 342
zcmV-c0jd6pP)<h;3K|Lk000e1NJLTq001Tc0015c1^@s6Koo3l0003UNkl<Zc-muN
z7zLwX6pRAe17l-jR&8x<9%6ArLjx1d9c5x-G8yQw-$4AI1pLFmz`&oDA+-UB|B>h@
zFa~;P6RkpO6FCk-!dqw&QcH1JXk=uhf+n^eh}Y5FVZe}T!4-W#N9lpon3|eOK%;9R
zR2vhJf0Jeo16mwIAWi)RI!YF#*4*5j56LsjX%=EY3$;NO6OnfQ0Uafd<eB9(Ph&vC
zt`Om{c4R%Eki+4jE!0l<xA8ct1FDP>$iA$rt1AfNfC^PCWgSg&<$W9uy8}(=XQBMx
zplAg~r!ifM3uuVk#o@S*=xL5_<rq@JzCdmPOS6(6$#ILws4IU0^##(rA`cA>WmZ>L
o=OqS%GQwzkY!r-wQ81DK007TW+36QMpa1{>07*qoM6N<$f=;Z5ssI20

diff --git a/xabber/emojicon/src/main/res/drawable-mdpi/orca_emoji_backspace_front_normal.png b/xabber/emojicon/src/main/res/drawable-mdpi/orca_emoji_backspace_front_normal.png
deleted file mode 100644
index dcd91375c1abc9aa761b0b4b69318cb9f6651d49..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 664
zcmV;J0%!e+P)<h;3K|Lk000e1NJLTq001Tc0015c1^@s6Koo3l0007CNkl<Zc-qa_
zJ8#-h7zSVxB}iR5q#e4kg48bk3sr;|YWac<=8}>$C3U1W5)x!=#;RnAnyu~+NC%pc
zl?a9goPW^JGJs%b;&OUkH?Hc|7#l+Hk>245+uy^-!3X2>{T?f_EI-WW^KS};!qGB<
z+AzT4GlnRNj}%4ukxr#aGLc+LP+NJe{Dj4Dt?p!Y-X-J&@j|HO2qwVRq^R^sj?2Ug
zp&e6U0&HCrMAa*>s1W@O6JUN1!u&c+5Co6HctMTF;>2xI$rQ=F$T$uPPrD{<(tNOT
zxlD$`A#pPXg8?}%9^1pXIbijAoy<D4hPD`(rfFoJaiv{3hw(hG#-tdTmTI*+vEaem
z1JfK`z5I4*3A3xgahy9?sZ=84@z@eY_c{HTz3iSozo=a3b9A8HZks<!+VNY1oqjx>
zh{C{Y`^vt4EWUlld9_;Y|25_c#`3BpO2jI;T#k%JBS-5e`zrhAJS&s|n^X(oScfpA
z)oM*eoqs(yowJqRvh1=e7|XJ%7!`?KI-QO!3db04Vmq^~&+${{-+LWkc6F%59SrI9
zdX_Mtfx7;Ft<QnkeYr~x3x}2+yLA}S?RG73{eIus4b~NmVO6?$5~pc4n={{F8})|m
zwW(!x7*eTJX4)%@ABu~GAy`*f;7)>HB2KPpf-wv;6KoMN!=5uL-N=a-LYw4$*t!Q{
z`oqXtBocY=6&NhW<J)Q|6naees2<PpWSM~>7z{o!9(XbC1p<Mmo6j~+!r|~4&6hjQ
y8EV4-i|?<oa<ky>(`?W@xZ`Zx)b<;Hs{8^nJ#>3um?Y%@0000<MNUMnLSTa8`8bOJ

diff --git a/xabber/emojicon/src/main/res/drawable-mdpi/orca_emoji_backspace_front_pressed.png b/xabber/emojicon/src/main/res/drawable-mdpi/orca_emoji_backspace_front_pressed.png
deleted file mode 100644
index b30152f1fe3e40fb636a2a0d1548e3659522e755..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 541
zcmV+&0^<FNP)<h;3K|Lk000e1NJLTq001Tc0015c1^@s6Koo3l0005xNkl<Zc-muN
zfC8no4t~|x&J5Mq?&^WTof#lEFdzekgnj{y)T#Fj3K#!3Dp~&DsFcnaXeY>S&9tfa
z<)YdJ;SN(zo?K>By5he{#p(gYAUCKdPbr5xOe16V#DR7c3~OZ0o&<N8)*y12R{E&J
z2EbvK)ocIT)vYHQn^vx&y~9=>yZ!&q-+%u}0Y88L{a?K3DD50};M&vw<bp%jpV7u)
zhps*QPYF1D<2m&mw*A5*oE8T5>_Fikxcc<}zAH~@@36W1uKmZAq9P~m2CH#v-2&!s
zJ@)|22PO80uRqbwVRb7{{{M$3o&N<&dUtLGtF>#`0N1zk;$zx{SXlo~u*Jjx_twpL
z9YysJyYu2BK}XF$a05k;Juu|{Vet^v)7Yaop9wn3v=Zcr5C5H-HbSBmSg4|xbu`J9
z&)$8->afRezx+1?CiLr1--G!e$G8EbHD=Nt`V<$ST=oR$2yEcXkKZW#fAlQJVEE><
z_k*wGhvBW~9+F&F{`&Lxf9c|5v~OL2(iJJKi_!MjsKW-G!!$DIR2rAB8gNH}+@O&?
zw+iksmBdM+y7^0<4y5BicIy@_c?xn1$}oXO_7q|5{3R9Ixr--j=PjB-R}8dMCvQ=u
fM)pEshQSU1J6~!Je)U|u00000NkvXXu0mjfS+EVI

diff --git a/xabber/emojicon/src/main/res/drawable-mdpi/orca_emoji_category_cars.png b/xabber/emojicon/src/main/res/drawable-mdpi/orca_emoji_category_cars.png
deleted file mode 100644
index 377653c3c81f4f4483b1295ba98d01bdc9af53bd..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 499
zcmV<P0Sx|$P)<h;3K|Lk000e1NJLTq0015U0015c1^@s6J20-I0005HNkl<Zc-muN
z7zLwXpn-{riL0@(@oXSI3B<R7_%0H@YGh=z4M>**u?STx1RBH-#9M&)Kau!@si|oY
zrS>uc4cY}Y@Fx&Ao0*xZIXF15AS*I3Fc1LBc>_b`G*s<xAlreG;EjM9^cNVE9)#4Z
zsHm_5)$W7pxds$sA~%@9h5#Kfk61mxU{(UE{{zwoWZRKrDJu~FfEr*$qTZcQU)Par
zv4w?&0xZ6)t*v=2EiE~T#XujoK=sZi)wdcz+)YAC#)U!IEDRKS#8}!0iz6!H>*nU>
zsyHnLx-Jk&@k^is%7An`G%Jx}5vY*K0-Co5N$euN>@yEZVE|Gnw2@%xH&DJtDhJLX
z$;sgg=FKog$XNl%FCoF=_s9hdkiQouXJ}|>g3HItVTyq4^T438g$Dmi5`%g^P`@Fx
z?EZ%&u7S(P?Nm-w$oMZ1b78d@6hxqW2vjhUniv>rzCg1%h{;k^^(`>i8;C7H;F>^j
zOiHN*!$7@fD6$x+$&1Vi<|L9C^~7pA3oEBVwGEk7>RhBy^Ce1?m6eqkP-7u5-`SB{
pmxC%6pryH>2Eu5=aTL%M008_~v2xVyy`lgB002ovPDHLkV1j{X)W-k-

diff --git a/xabber/emojicon/src/main/res/drawable-mdpi/orca_emoji_category_nature.png b/xabber/emojicon/src/main/res/drawable-mdpi/orca_emoji_category_nature.png
deleted file mode 100644
index d8e95cdac4588f80d2166d1a8ae14e174878d704..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 729
zcmV;~0w(>5P)<h;3K|Lk000e1NJLTq000>P000>X1^@s6#OZ}&0007@Nkl<Zc-qaD
zJ7`m36vtb&^-ZPXq7E5?BB@F9CI(DE9i2+6f;tp+C@LbjD7c79#n<4Xpi-Q45~)g|
zn?eU4gNWiF2(45H@mb@ervCnLLc{gm?@GEf@aNw9ednD2cb;FGnr6c<nM|(8WHR^D
z>GTBn%=<N-uTrVhA3fRMHDeMCy#Z6;3OEd&fK!ki<v9)}v)Sy1h6y-rTm%>?`Rx}9
zg@urfA~Q0RP<3HojMrv|ObMBndhhP;o*QbE6YoRetwI3afj+!><kG>D4sb*H0m{=4
za5ol<wfYfkWb-$8jZ&HCdT;{#1Z|F-4T1;gcY+x2XDx>}{e*8>1+{s|H!0D61i4&p
zIS0Dq2~#s`7j(FCxjfHHG6V(!Lb3&gC7xv&yX2QIRhzsaWYao)w6plhl!7X)CmxTl
zM(#B4+c1><=cLockPr!SN9qlz!G5VE9VEw)sam{+@sNTzgG>dq)I#-G2x-bn9l?~H
zw8ufRLo%KGYNxzsWxL2hGU-Fo?;yD>8KTo(i(x@E&c<*w8lBJ59K|~li7ZgkL9gbP
zhonkcwyKw8NPVFylOE(dC4=5oZ$-pxPJOf3k0G?SwqGn3m$LTJJgOjnysmIsS-Wn1
zre^#A4hDs!1w7{@ha6*MbI@KQkywTP7t&C64aD<SHLh9J8&XxfHJTLiAWt;LheE3C
zT*&+@Sw1>~3_JwiX}ZM@lBXe_oK#Nncx8~lcAKPwgf8mmvZ~C_fNoH9_L>*NVK?Cc
z8~0T;RQ(<a)l3?|*ob#fYGQz|;I_5Ff8C1x)(;mU>#{LX&FAx)U+<MaPA|{**!O5d
zH>3S&sCD`T#QV*oWqd!YYs?pTv!>xI*g}!=o49ILh}X@Ezg2$$Kl2&DuOtxv00000
LNkvXXu0mjfWwKbO

diff --git a/xabber/emojicon/src/main/res/drawable-mdpi/orca_emoji_category_objects.png b/xabber/emojicon/src/main/res/drawable-mdpi/orca_emoji_category_objects.png
deleted file mode 100644
index 26f88c776356ff38edeee7801feeeb490d78653b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 540
zcmV+%0^|LOP)<h;3K|Lk000e1NJLTq000>P000>X1^@s6#OZ}&0005wNkl<Zc-qaD
z&nv@m7{^CQ4pzuXxly(@`)voAgChO|XE`fs<s><9k#fL6mXn_~Nt7QqWl2iO0g0q`
zkR;R$uctn%ZEX8~_noqO_q0Cm&+~qs=kt7?&(~!7Z$FpIweEB}AF+EDi>0jK0&cf^
z41rYy%-A6jDyV?R<7vie6r6)QZ~@*xd!b4+1>)d~Y&OVZUX|?y`-xpMTB3e&gdGnA
z0wrn7#Rv?DxCCM(iztr5;xGfHhyW(wy@FER0yyuKDD8H8LykadR5rnUN)?vPzm(}m
zHt=r1aXzJz4%*bn9R&~hh&<7{eHu&KA`PPJg8F>EI@PjPEqsT=QLp%2da?-0Ca>39
zt%c9Im8-)K=@B^v*E-9)EYm;}ndt2j73a~WM<lV2^XWBdXvY(3`<%~|W$zid&3Z9e
z98_oFH!w)!1UZ}O@>wCoz?{K>8dPQLNm;PjY_)2X-_yR8MkhA{5qSy-yfImQMJ|(S
z!zIv7?>G7V{;Dj)G5H+L;t+HoFvI_Mb#D$+_TyB#Bc#U3hZ0QSQf3nlcCkBRaS&15
zSQ1a(ohu0%PHV2ZR>-S|qhag<8@3V;R}v)iZ8(eA5xMP>k<l0OAWh`xPrg>jXcFi9
e*y(@wDfJEHn8%^DK%dY60000<MNUMnLSTYo-THL^

diff --git a/xabber/emojicon/src/main/res/drawable-mdpi/orca_emoji_category_people.png b/xabber/emojicon/src/main/res/drawable-mdpi/orca_emoji_category_people.png
deleted file mode 100644
index c3463bb2541bbc50545e33a4832b9d15e6efc3ef..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 498
zcmV<O0S*3%P)<h;3K|Lk000e1NJLTq000>P000>X1^@s6#OZ}&0005GNkl<Zc-muN
z7;HdWTbs?;*jUos+?<c92Ai0ecmfSxXJlmb1W5l!!ta4{2Y_@gP#H5>h64>X2I327
z2IInSfEMPEWC2i99uWT|(gGO%2gDmlvEUDh7QivkN81So5g9(fhCA?Cf-Mf(baizF
zf%GSIIa5<p7a*;HMbA&5oGh+X^dE~s63}35LzDZ06vT(o^#L8c2wPmN!)6IEZ}32U
zX^STJ4oPo27QOGW1=SO5mcTL|P~IJvAwc#dY<dk14NcH<GS)~mFfdSnTCx^R?mLnt
zFL4BQB63hk;z=nW9~$9E)*FD9C*aXr47UUnBveSY*l-4V#J@*RJwW_{1pE<O5=T$M
z2hbFxkx~?ynVG4fS@K&&MTH$(ae|UWK?#CbOMs5*Kr3GMU{l8oDoxQ8RsqGC2w4D1
zs_2C!P_HYlx+4c#nj%}&38cAjn9l@ET|QVMd>5focmozqzk!yu09|YcO3uK%V+EvB
zfMWNssC`aU%?T>5$xO1(few);rQ+%!q1Xon@h-CJexOD<P-%)K4<QHR9-NU(DgfpK
o6Hr+MDk?xZ8I;j5^1(m?0C2eVzLAbbT>t<807*qoM6N<$f~?`h2LJ#7

diff --git a/xabber/emojicon/src/main/res/drawable-mdpi/orca_emoji_category_punctuation.png b/xabber/emojicon/src/main/res/drawable-mdpi/orca_emoji_category_punctuation.png
deleted file mode 100644
index 085d4d55606809bc7e3d980153e0fa5a0378a0ce..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 391
zcmV;20eJq2P)<h;3K|Lk000e1NJLTq0015U0015c1^@s6J20-I0003_Nkl<Zc-muN
z7zLwX6wm?~8XAfk8ygpyn3yzB69dgGHa9mH$7wN8!3iM#Pa}L5pT+-ZXz_o17XKei
z7Ed%aHB|!A4}tg<5QjQAII!5**a(8+4v2q4)jcyZG71E-f$Cj=ar=oPi$RG4Dt8yi
zPO`ML<OH&pfh+}y11*~iReJ=;HU_D)wzlS_hL1a-a?gOc9B6n8RD3g3yaR|YfP4!I
z8Ia?kp|Orqi&sH?i7a*mnDwMU7#al^fY=;psRPh*51_a{H7q^>G)x;=%*@P84H~Sk
zkmA=D8X8$ZIt@sFr_|zC(BMRl_c&x90r`=j1P2NMQ0PDlq7xKZ40Qb>P%4GSG1zxd
zK8j<Y@p=;)68kAmT*#>!Ds~sdhx!^GDzJ0_P0<gBbOAyai$BxQ;%_)D1}2Pbpn|Wo
luoQ^%MjIZZU=+{<000OVAwjZ5Ap-ya002ovPDHLkV1hbtj`{!q

diff --git a/xabber/emojicon/src/main/res/drawable-mdpi/orca_emoji_more_back_normal.png b/xabber/emojicon/src/main/res/drawable-mdpi/orca_emoji_more_back_normal.png
deleted file mode 100644
index 41ea3bcf679a560748d6c789169fdcd62cfb9407..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 276
zcmeAS@N?(olHy`uVBq!ia0vp^>Od^V!3HGPUt<pdQnx)_978H@B_~L*E=~~XX$myp
zayzKuz^<mI_UhQNW9|(<GzG3Jo|cr9RAo5&j`^c%aBy(-j2+F*%<KU<b^-6X72>iJ
z5)>SSk2C68vK;xJc;mu_3zAxT>__S+Jc(;*Ycq0w+BNYjgX|4|?c;adw{eI>DHIwT
z8+)e|D*WR<5))u6d_iXWw6H#H_f1a>4W76x3_Q*xV%_|tgVm#|r{RZo$RG27`RZpc
z$zE_QbKp*DT&UXftUxazikrP{nZL6$v+yRFfEdmd>YN_g{m<?|oDcF#0wcp7=I~bc
TlX=WQZ!&ng`njxgN@xNAOlx8#

diff --git a/xabber/emojicon/src/main/res/drawable-mdpi/orca_emoji_more_front_normal.png b/xabber/emojicon/src/main/res/drawable-mdpi/orca_emoji_more_front_normal.png
deleted file mode 100644
index 0e10df579622a05a9a6c9abec9903fb8949d131f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 560
zcmV-00?+-4P)<h;3K|Lk000e1NJLTq001Tc0015c1^@s6Koo3l0005^Nkl<Zc-rmQ
zze@sP7zc2R5?UInq0LpHmi~nZap<@o-sx#SEvgG@Qz(QiDH>{M=?A{mtdoC0QIihp
z=pZhIlMVg@icjxj-Qf{v8t6;-z;}5bj_1S6!Ru+UeASSus#C#Wa4!@JMfwrkjRv$>
z^pa(HTGO<*<)vlt`}}<g?$&m+ceLoP;lNtp$fx>%g-}ZbO$ZxN+)7OKs=z|%i4im*
zY*dzH!V1hSx$n`0Fe`&FYXc@p5~DCtB3_RdSO`5NMq$DL_6L|Kio~OMfQ1Nx@Q+~8
zlPDC6MYy}Y`!RcddWL*H534JyrvCokJ`@TCNW>Fez<7};vI4Dg965&OA~9mjDwT@S
zuhnWse{*Bg^h`FJg?4)czC+mS%d2TgsZ=s%)oRr=+tqd({j<|EQ@>m;cLw8mp2%()
zS|uC~L%m)%mfT$57&Ba`7b5k3U_D@ZCY4G-yFJv>84PoHa0t0v4lXY)f6S7}B&5^n
z#!r{#{`S^3WHK3ee0YT4?C1*Ci<n^?Pw3?dEQDGHu<l_T$1w_9<OsdUfrZdRVjnij
zAgu8*GU9T%&RKz>MgM#ob~qd}^p5%v1rhogG}!I-S^a|-Ys_Y|%`MC?TsfW2I8CC*
yiQ{fGpvBTuL*FmlIL!pjWRElPz1yn)sqzUJ@JKfSTjzfO0000<MNUMnLSTZ)@c@DV

diff --git a/xabber/emojicon/src/main/res/drawable-mdpi/orca_emoji_more_front_pressed.png b/xabber/emojicon/src/main/res/drawable-mdpi/orca_emoji_more_front_pressed.png
deleted file mode 100644
index b0e5739673bef2898df7bb970be64459d8905b9c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 432
zcmV;h0Z;ykP)<h;3K|Lk000e1NJLTq001Tc0015c1^@s6Koo3l0004ZNkl<Zc-muN
zfC8no4u192_6+ru_UZw_K)XS1U_b^63H<^(xs&dhRL%cyR=apWFvxE0+==()GTQ~=
z4%5t;SY}$c<iADZ@&UylH)v;1D2F>tr*Qhjfp!!O>l93zG)NsbW7J`z4jXmYsKZ8{
z!*Unx|9|z#oB!>bPGQJxICuB|+50d5JGZYv5f7QX<^QEeZ~o6ZaG5p^%UZbaKQidr
zdKxbG>hm|a_@BRj;o=_M>rnI@y7`3q4%>R+K8hvxUVntk{r>Y8Mb3ZXCa`$H(t{}C
zPv3u`zQfYy?fL)jAHtHBjVIx9Pv3uri~stA8e;#DH0{0ekTz*7dCu<tM{Yg)U%BcC
zhTNi~*Z%Ll`tZMP>uMBnpT3RYDD2&ScC@${b=auGMjbW+9ac1>(!62d9R+fOPT|Zd
zxWiO(Cy5$XE_gbSjsw{Zas$XMD8mFA*;9n|%jZ|<S1g#UU%p@pT`|y3y|Q_gAU7}!
ab^rj@R+47whgy380000<MNUMnLSTZ6rq!GP

diff --git a/xabber/emojicon/src/main/res/drawable-xhdpi/keyboard_background_holo.9.png b/xabber/emojicon/src/main/res/drawable-xhdpi/keyboard_background_holo.9.png
deleted file mode 100644
index f5c9df3e52eef4d43ebdb9e7cbdb34b2cd529577..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 267
zcmeAS@N?(olHy`uVBq!ia0vp^Yzz#HlQ@7R!vUWSD}fYCv6E*A2N2Y7q;vrJoCO|{
z#S9GGogmC;e)9BMpx|0h7srr{#<w#axsE6Zu-sPd|M-9XNAt<u?W#gISdPxSC&wYj
z<#aX1rlW(QVMmPyLqIlfjc+!u{GBt_0_6{GuIFQTp)0&*8{<^IpAO|Yj3-M%nJm{n
zv7YpDRY^p->V|h-2UecWTzcss96#lYUdwRO3aEgkDC%#1f>G>r{>7Ibe!AaydgmI8
z#&Xl1@J*~=w)QVbxMjSv5eyCr2mGqs+i{xna&-H9_0!p}fDUKyboFyt=akR{0Bo*l
A^Z)<=

diff --git a/xabber/emojicon/src/main/res/drawable-xhdpi/orca_attach_camera_normal.png b/xabber/emojicon/src/main/res/drawable-xhdpi/orca_attach_camera_normal.png
deleted file mode 100644
index d1c02cf618bcb056e07f1b9ce4a1631aa9a67e34..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3384
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
NSYWM9%8iem`ZrDj0>c0R

diff --git a/xabber/emojicon/src/main/res/drawable-xhdpi/orca_attach_camera_pressed.png b/xabber/emojicon/src/main/res/drawable-xhdpi/orca_attach_camera_pressed.png
deleted file mode 100644
index 9bb11a42e5931c241771ad3b90caadc4dbcfc0bc..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3390
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
X?N#Or*v6#ge>A2>7PxH8sdN7Y0$Ug1

diff --git a/xabber/emojicon/src/main/res/drawable-xhdpi/orca_attach_location_normal.png b/xabber/emojicon/src/main/res/drawable-xhdpi/orca_attach_location_normal.png
deleted file mode 100644
index af8a2fda1d6f2d57744233b796cb952832b0274e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1882
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
Z_oQ@AD?OD38pR*FVXj^-HBO-^{|D0Lj*tKV

diff --git a/xabber/emojicon/src/main/res/drawable-xhdpi/orca_attach_location_pressed.png b/xabber/emojicon/src/main/res/drawable-xhdpi/orca_attach_location_pressed.png
deleted file mode 100644
index 12b8608a10f08d1a1ba9a633ad8fb22a8a42e6fa..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3078
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
VXPIEd!|Q+MXq1;zmE(73{{vtsSa<*c

diff --git a/xabber/emojicon/src/main/res/drawable-xhdpi/orca_attach_photo_normal.png b/xabber/emojicon/src/main/res/drawable-xhdpi/orca_attach_photo_normal.png
deleted file mode 100644
index 86f17352ec8175e2a54d224b1528d82637562695..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2956
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

diff --git a/xabber/emojicon/src/main/res/drawable-xhdpi/orca_attach_photo_pressed.png b/xabber/emojicon/src/main/res/drawable-xhdpi/orca_attach_photo_pressed.png
deleted file mode 100644
index d6d1869b2d130b6562ae04516ad314040ad523df..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2947
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

diff --git a/xabber/emojicon/src/main/res/drawable-xhdpi/orca_attachments_arrow.png b/xabber/emojicon/src/main/res/drawable-xhdpi/orca_attachments_arrow.png
deleted file mode 100644
index b339725e5f193d067fff0e4a6f1883e661bf6248..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1126
zcmaJ=O=#3u9FHCCt{>If1&dY6BVDUvGnvdsIukqFnM|g3#FTM5Vii}+B(F_q^U>th
zN$W1Or3)h>h=;idiwY{eh=ul~;-!b()n#RoMMQcii}WH|yoezBQajayV@UGe`}6z#
z{-5uBw&zgYrlw5<LDXfsg&baY;cx5rwfMjA&%m#E*@@D9sMqXAMahOlQZWk<WOQi&
z=AfjE4*v-|2*UTHmhVG-;t@_Zb-(0c{H|_cHbHcBx|SplLIetMKr`axtGf?Kpeb?k
zcti|{Rtl<G_m~ZP$9nSe*q|I!$j+ZYhs$9B9U=+1`jFvpZk$}v<?!A!(<E4dpusr#
zDX2a%3sR;HLBt=T<N(6}mi05?2+J~UAQ)hRbO66B#e}&C%LUuP>O*30w$jh#gsxRz
z_!K8qge;Dxi^Zb981kF;0L{c=F;62Hq%eYVMhzsnl;N~g6a?tVwq_yCG=Qfl70eM7
zCvl{oQqZk6S;JW^6D}C-N*2xd171oMpeTMDs_ScL2j$@Bc)u#_<VP(?=b&Sb*fMTh
ze~ahJ;!-x0kZI>lbEs0qtZE|DQB4b^dReeflw{5D4Et9YqR3?o2T6tuGeVri8h%Yv
zxMYeCw<q~%AQX-=OgfZgm{gh<(tJ3YOsAr3g)5lyhz<=@;VPfGv8r5e7<3DJ7ND)2
zg-Vxg>R=^lPOBaZTUBqBt5lDry(*W+!O&i7zi4&Egy+ZGt_?0etc^Z2@Vwi2u$TU?
zeU2~1(~OYJyUz;0ynh$*oli8CE>5^Vlv+rVpY3XGpc-lxUncG~m3*0zJ^RbUJoWE}
z0t-&Bn_rl{vqgE!0XEfm?#+vf2j-|N+vc02yJxnm*Wz<+S8C^vPE9td*XnMRkNJjM
zXO=h4KE8bFVWK>Hss2MpcJtreb8WjzdqbDDzMXIzAM<j7a%vXSiARqT&EqH3#2>+I
z{m|6S;NkK5C;ZQ+%G18(9qQ9wU#VvK^wr-^E|n+#x_dvn;mP{I=47*UX8n%&>)8uv
hr~2LRH8Z}%_&Q?x^}+Cew<dM(=4aA9!fpP{<VUb;ZrcC=

diff --git a/xabber/emojicon/src/main/res/drawable-xhdpi/orca_attachments_arrow_reversed.png b/xabber/emojicon/src/main/res/drawable-xhdpi/orca_attachments_arrow_reversed.png
deleted file mode 100644
index 918d0bafe6113ce20ab12a922a7e0a00d3b0cc0e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1076
zcmaJ=O-$2J9Ip%z7RE=AAO@3{f&>!RuKNNS26pR!B^KsbB8kz^wGU{ZAGQxyhzAFW
zfg3mU0vL=K4;~FsqeQrP^GLjq7!Tgin_@J+4h9~aP22b0KfmAa|M`}ZLjxZ71vfzu
zp2Q%Z!fONm+!f{ce`BR#4=+t9K8i;4ag-HJNN}>AfgquZ6EFoudG_{u*h3JmRwX@(
zMun@aq^p$ZU?^KPFq<HH`fNj#rXT_tIH70}^5E555-4(nydDyKf)Rt0%HW&{N9Kmo
z(%h8PEt7q{pvPvhfC`ZaY;{_*SUW=Iby>W3%rpt|5HuAbkAfN%k|3s=5QM0JSMo6o
z2!|;q7z&4(%fRnr{In0hVJ{P8Lt)n63638Udo$&6HpTZJ`@*LPIf;<L(sVYPrLqA^
zHz#POySv-b@cX?O;k9NpB-&ohYAGo2(2`8WK#HybM^Vh^GblphNRLubjT2eTIxZ6~
z7;TFN%}_okr2<e8{ts2v6SRd=@HF0k3R~$}1JWsI=`*H;8#mtKxH8z72}PuvX<eT#
zR53ZJBi)+R4G<d%gLXlb6wNVo<Qam%CNv9)ngkPkgv1(@qR1>4iv~NnXwVl3b}>vm
zz%fiL9_8cFU>6sUb%hIDUYBN6sG$N^KIMjra-CsN4eXhRrg8_${id#heA28^JQjaZ
zy<@IiJeELFE{%hso!0)<>VgT+kFz})TzohgeW>AiH}PO^F8*G{m*Po+=hF7a%-vsy
zp@7S^;|A5@dUNxc%y1j{*0{Klv(GkEq58VIAMZ*VzL)KC$x3sZdz#zln%i0{m+#fo
zu3g%>GW;O-<^KHkz;X$A)Bia4^Mhx1yuIRe`E1$ZLA|(M^D?(pRhHXKF06f8-uHN(
z9qhF}{JQnII@o?|V`(9^)JM50o7^QUkEp{%d91eAwZxn&9pY}jSUvCJ2(V3DtL#{5
Syy%ZR_c#$B;-5#y=Klb1DpbS(

diff --git a/xabber/emojicon/src/main/res/drawable-xhdpi/orca_composer_divider_horizontal.9.png b/xabber/emojicon/src/main/res/drawable-xhdpi/orca_composer_divider_horizontal.9.png
deleted file mode 100644
index f10e37bfdebfb3065c95a891685320ae2167bca3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 95
zcmeAS@N?(olHy`uVBq!ia0vp^AT}2V8<6ZZI=>f4sd>6MhE&{2PH<@WZ(+cDuzt~1
soybj3?Cp92{1_%AnKHkv?KeKaxYONDt72uS2T%utr>mdKI;Vst0AJ`Ei~s-t

diff --git a/xabber/emojicon/src/main/res/drawable-xhdpi/orca_composer_divider_vertical.9.png b/xabber/emojicon/src/main/res/drawable-xhdpi/orca_composer_divider_vertical.9.png
deleted file mode 100644
index 523493cabc6becb01f53f905b87cc23d86986ca6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 95
zcmeAS@N?(olHy`uVBq!ia0vp^AT}2V8<6ZZI=>f4sd>6MhE&{2PH<rTU%0{WV7)@b
srWDRF*Z-XXKk9F2s#sM>ba19HJiqOxb?2#_4p0Y!r>mdKI;Vst0BEutG5`Po

diff --git a/xabber/emojicon/src/main/res/drawable-xhdpi/orca_composer_popup_active_normal.png b/xabber/emojicon/src/main/res/drawable-xhdpi/orca_composer_popup_active_normal.png
deleted file mode 100644
index 08ccb0fcdc855c0b682d4c887b2a941db8c5b366..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 687
zcmeAS@N?(olHy`uVBq!ia0vp^E<o(c!3-piOx&Ofq<#kYgt!9f{rmT?+PZbss#WVY
zZd<=`2N11Ww{z`U5PQR>o$J?cUk?%Av~$CTtw0eVTDNK2x{cenZQHhC)2@x1cLEvz
z|Nq~!=kSjoKep}Iw{_dzZ{NNFMV>x?0hE38<Qb3+1W%s5c<|^6kg<2~As`7f=l=c2
z+jj2XvTg6poA-bs8#nLTxM}A`pc~e2zkmP!vuE#sf)_7cyLB5R`{&P}(`PQ+xOo@I
z27>b!uWZ@2=i%e0&!4}%c?+Zf2tI!N^z`Wqpfey`pq97qKm7Xj8^VQ?K(EEtO_K(C
zKBy$fFPMQvf;s8a4IP<7{~R*^z16+<-6@{$+dFn6HKiXvWtjK=J<Ozg>Vk=p^?i?T
zzhW8B-&ax4kmJ60nKkk0O|Qa-zs{e$;h%Q=!Zr*2b*FZFOYtgk&HaC48Uq8Pu&0Y-
zNJZS+%kELyfjq2<jPE5git-LPOz!dY<xzV+=lnnM!vQa9cv5_8vl;)dSrY2CG-&0v
zZ~Ghimi5&C4}6)jX!Y*(mmZr}88iH4PT^sakoqR2EV<xR{^9jKeT=Ijm?h>HC~7xo
z<uFXvOUb&WkrI*~bK*@*qDXSeXYNN?g(o$RMXc-Gd`IKhitd&vp+-(zl8mjr9f#ap
z5|!7i5X{Prop}0e$AbMY7z>@J&N%3GrbGKru3*rM=qjs}E1xGEdhb4^=(JSWO}*F?
ze3DDv?3%FmjKmU=-+E6TT##5IV|wK3$4;p=bLMrf|MZ9H#*RhbKfl)MnjQTy?A~2_
y8@r8v|9txOP0#mB;BOH>srdVslz^VQ!k>0wi8!Ouo4LTiXYh3Ob6Mw<&;$UMuaYzX

diff --git a/xabber/emojicon/src/main/res/drawable-xhdpi/orca_composer_popup_active_pressed.png b/xabber/emojicon/src/main/res/drawable-xhdpi/orca_composer_popup_active_pressed.png
deleted file mode 100644
index b91b206374e5c714efb01d4dd0b3328129d5446f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1365
zcmcIjk5|%H6vxa&<co;l4<OUjFwrS){zw`LLFG0X`J-QMoks3d<d1U2YUZiTmcN?f
z$|FU}%+%DWNFi-nsb~--g(Xai5-gV-v?R4Gb+6Mo{Rg|}y!$@)bMF1T`|f$KfWux7
zA@B$o3<kw*U?zZ_2^I@(54=Lq8UTaYO>w?SVuA4gFdPmCWU*N6Cvgl0^AVFsB!7Q@
zDwP@)6%`m5m~rqRkw_F**EP4wTO{&7TVw?VWqkgT#^x&^EH4*TU%K4db`9X7qLSv;
zc7V@Th^ngV;^N}iY__ALV@gU2AY)=;Dk?<9#R92RDwAKoD(kGNsUefe!zQytdhN+m
zv$wZ5$mDXlDwS&3^vw9gq|s>l`}=h|9S~1XPv`Ub$BrHA?(PNUS7aRug{lCwQdV~1
z!UZ5Dkx0;JbPH%eB0qVuFefKhCX+QaHHpQwX=!Pidk+TnhS=Cxg+ehpI(l2J8Ppk!
zM&tPSc)vy~z1lG{@?58XWHOn?#>TAH36p8WX0vIvTD4j|H8u5O%<}s6G{{#fm9@3C
z+1c50xtz!2>GgUDf(!<O#bU8qt>Cht9L#oMVIev?8u-e}N-$Nk*$k!uLSPIA126!9
z&M6cM0`cJud}II#P6Wy&qL(T_)g4G+C&KLDNC-!craJkpjtC77TD}zTg^dg(V9<^$
zT#z9U(RC$?<O!i5lv@C1uWex{dS&1I*Zb$kS3RAH-;IJu#0huW=b>-j24TA9`dm@a
zs=L})+PYy-kT^5D>q8-g)((e-puQmEpAKRn-g86pVe`8?Lt8U%5B$ZXO8akYLIn~+
zJs}dvU4aaM`z*rwI1%k!2yRX|yqAajVuUNEO?!U=23xc{j!92CG-TE565TdpZ@v1x
z_wj~<QbO7H@=~#0-HXRL^B?FXKcDX0F;UoAbmktz<K@HwFOf?0W#dne)%HDaa#p)k
zwLj_U4BHl~5}F!`0k9j1Ng>e>H`C*j`-&fRywB~f-a`ut3RY^=4kVTf?-ylQPHNtP
zka{xg_`d!A4clZb!4deCC`WNkQqi_Zn=qYqRf`EE>yml-<c96rmrz1dDFsb(_Y+$b
z^`-Q*owLaN<a07CcU_;IaO*0zGWc-n^ihSq(68jqoPBsE&9=L1jjyxEtA^fjbJ-<z
zLwS)O86&ctZTzl}H@c;B9d@h5lj#-FhF}bK&Elil{y1lA%0<?lKA%^5SLEm5CCYSV
z$TE5mk-T<iUn+lvAh%f2{CM#{_SsI|)7JHfaMS||C2uJc0E%l~&?$j$9;f$5&Ip{I
z&wvVvEO<h_Z!X7yz=bE*(*-*{yOypIu-KK{qjdJpym9x?Sa{cxO$s!Rb8>maE;s|(
zz!?dqKl+=s7rXvt#(jLRYe!1Q9+wf3hsj9W2+ykYx$LaJdAs)vI?IWW@hqI)e8^|B
zoBrlkljqP`b4wyyv!q7*Yb-SX9V)yuYsTAcZNkj5ee-C-Z<F=qq-AS<;O1XkoiqKO
zb>iLZ<U>nTrqFTnvm&ukmm|J4TT)d4Tkg)H9Tj>ib*f*FocGyau3=n{VkAm^PgUHF
zzo*5wr<N8T+Us0n80rZReZ4O`1uwohQ2Le}7DI)J$ph)rdfI7kDRsbs{la*C{&?3i
s8lL#?geAUb%i12Hpo)f9Azh9Sgz|hF=FXtLC4BfgaV$2onXx1HKP3lI5C8xG

diff --git a/xabber/emojicon/src/main/res/drawable-xhdpi/orca_composer_popup_normal.png b/xabber/emojicon/src/main/res/drawable-xhdpi/orca_composer_popup_normal.png
deleted file mode 100644
index d5f15ac12c2d354b37072e42927719285676909d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 441
zcmeAS@N?(olHy`uVBq!ia0vp^E<o(c!3-piOx&Ofq^1S<gt!9f^+2#`$A*nN*Kgdh
zaq})9xoPw6jhl7?(HbCk(+;4>1`yi0Y86Pq#x1*6ZQHhS^X?NT&YnMi<?8L*o44-%
z|NsB4JqM4SIP>=H`+fV5ZP>IEh>jdP{rU4(pcE$9f8gl814n_1ckMp-?%jK!g0Ek{
ze){woqSCk~dJfQKMkPUh!3+Y6p1fc8fBnzjs{4O@UoCWfx#%}NQ|;dZUmmad@bB-d
zW|>KQ_wQ=pd-s0+mxc3=9T$=Ku66b|Q1=2)7srr_TW>FK7dm7h(2{6b@MKOiuTpbi
z)&J?q4tg;!O^QR#{Cg@Eznx35<%W$t$KeCtT|AoinYwzMR>&1}3Uz2;NPJaNedLNf
zk7SAqU+>#vEitohO_a1ub$_<sLCo*irM@-S^iH_ly!}q8uj4yA+r{ITcZ!8x-G2IO
z8#5E*ArWb1A;t1$8<!KtKP66jx4bYp{aNR#S6JY*Rws_XmHBCNMJtQ*CTs<|mBG{1
K&t;ucLK6VjruDf1

diff --git a/xabber/emojicon/src/main/res/drawable-xhdpi/orca_composer_popup_pressed.png b/xabber/emojicon/src/main/res/drawable-xhdpi/orca_composer_popup_pressed.png
deleted file mode 100644
index ddb6e9b74d4531d40050525097f833ff413e1036..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1088
zcmeAS@N?(olHy`uVBq!ia0vp^E<o(c!3-piOx&Q#z`!^oz$e5N$fX4k6%_><D<UES
zH(W?a2*OrZS65L{iHnO{v1Ze{_1o8N*uG}n*7X~AtX;R&+S+>Krky}!Zf@@B>FMX^
z$Ii|k9UYyNl$4vB+tAvzdfgVF%JmzzuU@kyAt9rztPIFqvwmw@Ztlj-yXMVX+|bal
za^>32&d%j))@<IoyQ8CH*Peq%j-7t-;^p3bM>lNR2}FmFo_hZL<)lfI)~#Fj_3PJP
zF!15S2cY)3bLTEuvSj1NjoY?uJ96a6i4!OG?LV@2|Ir&aZt(K*K7IOZ=dOcKpFaQg
z?c2wXAK$)xfBW|BY15`HT)6P{>(_7Jz6Cn?)vH%P@Bjb*-@?KINY0x#59sm7j~@el
z1mpsNlamur1jqoo!O+l<iwhJ@5D}o@rAwD~?AT#A-Ma`V)KL=T7tFxO!NV)6ZDGx+
zY-6ggqopJ(B`IR2AuS}puEx)!%PS+O$)_&C%O|(u*@w;lxA6Y_&Bw>9&d1AVboj@Q
z4GO$B*C>Ct;&bFR|1J0B>4uO0{=V+w)0}be@V*WiUZ5&ozV{z^)t7!<zU1U-J|#6?
zJ~bXy4h1Gr1x^`8eraJ&Q7K7rF%~XCp}pUaRRhz_c~2L|kcwMxZ@32^au7N2(cQ#x
zjiRH62<z@e8^7PH7O#H4x0^R-#gDD7hYvp4aPo~2-?aZv&%SwRUR^Og_QweaSJz}w
zS4jmCSL0(6YkGKmPqt~A>Deh7axOm7@?%HD<>$5$%7<rJ$|;{aW8^lC$sl6VTC*sD
zjY1i-O>ZVOObI!r)=_rG<>0X;%N(Mtyic>ubK3ke^FhLyrnw3SPg)#Ed}`z&F!A&m
zCU-M^A;mqWJRW{!GbY3osk}d~@RN1jA*XOhJHa58+ORc^Qxql!NoqPPJ(cPZd8Mx?
z8W8!lUt?m{il6Qw9&4pmuFjuel9iJcrmX9=B=l0Cv{dHwFIO7ftW;w)C+dk_>TUm`
zF(EG2O<wAy{Do$oMS{OCeCQA}v@%=guuAPpM|DxwFYllg>(h-l7iXo&r6((kMso0P
zl2AMm#G-h5KWF4c2e;JZ7LLfN6HR$jYMEPe@@gfbZ@Y9<r<dpFmmlwS`IgFZ@!-RU
zjs+7GitabdxN;QzSv_HLvW4yA69WI<h@8`(!^Ao1;T{Y2^G~O?K55O{x$6r<%>4qD
zde%E<O&RV~)&7~=k$LB%-Fsb@&v)!??0(KS{A6!ycc<Fn-P5bm6^At*)Ydj8yw6oC
UmW@http_DRPgg&ebxsLQ0Jnk0U;qFB

diff --git a/xabber/emojicon/src/main/res/drawable-xhdpi/orca_composer_tab.9.png b/xabber/emojicon/src/main/res/drawable-xhdpi/orca_composer_tab.9.png
deleted file mode 100644
index 1a6c0fedbfab372722387ef1679c636d09e81140..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 106
zcmeAS@N?(olHy`uVBq!ia0vp^>_F_q!3HE}A3wtbqzpY>978H@B_}jA{EskTd2@5~
wb9<|{lYjTu{4`=~dnq?n1_5_Yvd|7^czfnfOliPzEudxwPgg&ebxsLQ08)1&LjV8(

diff --git a/xabber/emojicon/src/main/res/drawable-xhdpi/orca_composer_tab_active.9.png b/xabber/emojicon/src/main/res/drawable-xhdpi/orca_composer_tab_active.9.png
deleted file mode 100644
index c636c87022cd801a7ff693daf292f97e3c1054d7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 109
zcmeAS@N?(olHy`uVBq!ia0vp^>_F_q!3HE}A3wtbq)a?r978H@B_}jA{EskTDOkSc
zulw-=&o)W%|H%nECf-o}-|y82hkVtZbEaxDymW3&DJb8j1=P>r>FVdQ&MBb@0G`1k
Az5oCK

diff --git a/xabber/emojicon/src/main/res/drawable-xhdpi/orca_composer_tab_dark.9.png b/xabber/emojicon/src/main/res/drawable-xhdpi/orca_composer_tab_dark.9.png
deleted file mode 100644
index 33d4b90903b115b8829969057589bbc965c63d9d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 110
zcmeAS@N?(olHy`uVBq!ia0vp^>_F_q!3HE}A3wtbq)a_s978H@B_}jA{EskTd2@5~
zb9<{c?|pTDe*x)}e~&BvtPd$dz#HC=*2FNfWgD{=<SV@g8o=P`>gTe~DWM4f8KWhn

diff --git a/xabber/emojicon/src/main/res/drawable-xhdpi/orca_composer_tab_pressed.9.png b/xabber/emojicon/src/main/res/drawable-xhdpi/orca_composer_tab_pressed.9.png
deleted file mode 100644
index fa7c6809d62334a29ec58ada852fc74f6a2631e4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 116
zcmeAS@N?(olHy`uVBq!ia0vp^+(7Ke!3HGR^W$`Yl(naeV@SoV<b;NX|1Jp}Csy43
zGGCx=<=^)r*8K`?GwoJYgnV4_DDddwE_cy>ExAw|kidihpOW8_4CPmw&v+e6dIL0u
N!PC{xWt~$(69B-kD7gRt

diff --git a/xabber/emojicon/src/main/res/drawable-xhdpi/orca_composer_top_divider.9.png b/xabber/emojicon/src/main/res/drawable-xhdpi/orca_composer_top_divider.9.png
deleted file mode 100644
index c80da27ef1b02a7f38513bd0b721b819e51b051b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 113
zcmeAS@N?(olHy`uVBq!ia0vp^%s?!_!3HERXC3VVQWl;rjv*Ddk`o#l{_}V=2u3or
z9%gymz>$_BDVD+~ZPd;@^Kk2#hmOxaC>Q%Ym?Ljr_fNfvIhlbWIYd_KZ`NTKpcxFF
Lu6{1-oD!M<ooXU#

diff --git a/xabber/emojicon/src/main/res/drawable-xhdpi/orca_emoji_backspace_back_normal.png b/xabber/emojicon/src/main/res/drawable-xhdpi/orca_emoji_backspace_back_normal.png
deleted file mode 100644
index 861ce7ba1ce58b6bf1f102af2bc3d0bcf4929f91..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1659
zcmeAS@N?(olHy`uVBq!ia0vp^zCdit!3HE>Xg?_gQj#UE5hcO-X(i=}MX3yqDfvmM
z3ZA)%>8U}fi7AzZCsS=07?@QuLn2Bde0{8v^K<nQL2C3WatnaE85nHrD+&^mvr|hH
zl2X$%^K6yg@7}MZkeOnu6mIHk;9KCFnvv;IRg@ZB<rk7%m7Q#vqGWHUU{hfQG$1#%
zBvGLvHz%*ys=`(YY_1iM4HDK@QUEI{$+lI3I4Z(7K*2e`C{@8!&saCvz|c^^%uLVF
z#MI2pP)EVYz|ctF0Eo<V4Na^}&8&>f6`()~Xj@TAnpKdC8`Lf!&sHg;q@=(~U%$M(
zT(8_%FTW^V-_X+15@d#vkuFe$ZgFK^Nn(X=Ua>OF1ees}<f6=ilFa-(1(1n}N%^HE
zwn{*kLcEY$05>+T7#d8#0MoBXEYLU9GXQxBrqI_HztY@Xxa#7Ppj3o=u^L<)Qdy9y
zACy|0Us{w5jJPyqkW~d%&PAz-CHX}m`T04pPz=b(FUc>?$S+WE4mMNJ@J&q4%mWE%
zf_3=%T6yLbmn7yTr+T{BDgn*V%gju%GIMfucCs)uGca~BH#BrLc5*c|baFO!GjKL@
zadvfdgXwk2PcF?(%`1WFO#$k4vM>k6jfsVUv6}@}y`aR9TL84#CABECEH%ZgC_h&L
z>}jh^+-@<!?G}jM6fACm`ok2bUVWfr^g&UJ6xA>xVEO?u;RzSWfhYacJYae+0w(M_
zr=~;(2Bx>3E{-7;x8BV1@9+(jIsQI5Y2Fc^HXlLH#KtFAqfa#T2AL^!ZP+-G_iz$h
z=M+t!vVT(qv^RdxKe=CacJ#Hbxvi~7eOw-Xt*JZv{@Tm0X}i9k{cHUE+wW`J<M)=I
z+x@-vp5^|}*3b8OZNAClbJFCnfP_hN+6A6jj>eKG46lXjl=S0PU){xdS2FIAyF^>>
z7W*whM=EC>+SSni=%!@cEAxG=><!<K-=4^}A+_arMJ?a-)vx%C+x)9%US`-f?SrCv
z!n$wOI|UeWlppfG(^sfH_dQRMA!6<aqqnp5b5AY|{uCM6kjlrKpv}3yF#gcG_@pgA
z<E%0mCg1tWrSEm4RAT+%eD%!FGV2dq_h#lz`23|?*Z;;>KDk5tKk&s`M1AFWKjo09
z{6X=(?Q9z&Ti7d{*;`*|%7or#%CoL}v}I@i_XjHirfy6B;GVybagEcC#_gpM9bW&U
zAMH^qDAV4N{ez)wyQ}fXyL@#EGDC~z9ByBBp`N#{efxv;d^=))%s1wWP58ZM?!2B&
z%~qkyv?2@dXZL(5-^Jj~D|Nt3IB!`+ym#pl-MsP>4f*1%I%g+dTfM(-)}$r>bDOI5
zzO46K>A-zBK<Mj3k^MbavYLhWT)(iV^6KwLVg*L2ekm+DjqBDm24~3}PT#Aa$7pVJ
zlH;Yw4X3mDo9gFY{&eqW!k;~B9_pH~n%_yB`Y$+p&oyOPOWBFO|HJ-l;k7tfJAdze
zH%7m0PT@jjv%BM8gp@SyY|Yl*vEuBiO>>IoT+y=Y3}b)n{;+lz_loVA!i}%P6Ta>#
zj#|baRuWw*Der%yROI`S8>_<}*U2s3f4zO8+T|^s>?Q}*1O0o<t}ak``l*MZpgBs(
zq)A9)JG*wn<fM}IeyjJGzEU+|{XSs>XZ<P3TekTNH7zU+rW~(Sj+&jSX?b_=64wp#
ztJ8a~ZuNe>Sx2S&!i;iN_sG=xtwtGaXBU7H7AB)>{eLDNhPd?AWlI;F{t2oMJYD@<
J);T3K0Ra6ohMoWb

diff --git a/xabber/emojicon/src/main/res/drawable-xhdpi/orca_emoji_backspace_front_normal.png b/xabber/emojicon/src/main/res/drawable-xhdpi/orca_emoji_backspace_front_normal.png
deleted file mode 100644
index d1d49c415fe0b2eed842d1175cab03fa045d986d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1174
zcmV;H1Zn$;P)<h;3K|Lk000e1NJLTq002z@002D*0{{R3-}Mwj00054P)t-s00000
z00000000000000000000000005fKr0c6WMtdU|?#Z*OmPbailUaAIO&Zf$O4WMlvU
z0B>z?0001EVq-8cFg7+e00000001&9G5`PoEG#Sl002@^QUCw|PEAe#002HdK2lLq
z00000002TlLI3~&G%++xN=#8uQA|oqGc7X!003%cY7`U{0002-@$vQa^?ZAL_4W02
zbanFb@>f<@Z*Fhs=;&x?XzJ?fu&}Vy)6~w+&R}0)ySlsI-`~K%z|+&y$;ipDudvY2
z(9Fxs!@|S#^z`K9<Y{PWy1Kf<!^5qtt>@?GSXfwARaTXhmF(>7Zf$OUet!G=`|a%Q
z!ok9ciHZIF{lUS(mX((N{{FSKwV|P*Vqs#bsHs&{Ri&h*;o;$&oSgUf_iJivUtV9|
z-rwcr<+HN0+uGZ?xw+Wb*w)t8+S=N)v$L<SuT)c1pP!$MjEt<StoHWyv9PgIQd3e<
zQdn15V`5{pw6yyA`v3p``T6;|xVda=Y~bMFudc6kb#?FW@9XR9d3bqST3cFKT4rTt
zUR_>USXo?KT$DP$2LJ#7F?3Q+Qvd-21qTQM20W|f@of8TMEpezy%P5&CJ87h3Mm`;
z7snG{{tX_CB4Wq($|x^9K^h*_oK^q;0%u7?K~#8N<jmU<f-n#T(A~{zKtT+k8K8tr
z`sATC8yz~x{qq!X=!->ZQ$j0YI$4*h`ck5<lCx)~ug!kEOB{RC>R-q1)@|jwyW_lx
z?>B_rOWxElLbh>Gc{7g{vaL^(w-8?#F%WT>K-(0Uc!q8Be{BnBTcF#A^*P;17>L3!
ztk<D8;YJk~l!^+9I_~0D>sI&WZ_%$RE<ouu%ON(IwnOV_eE-bJB<GpTuV%;OR@F74
z3yGTh`~r2(tH;&e-qF1pQ~UTtOkX_hdjN3_vb3RL{GT?GK{`!SG#dEkm_KABExgiQ
z%Z@{8!kq+#soZo5EjI(Hysf!94YPI4F0i%w9Hg8qUCjdvt@hCJA1eM;%Og-}vBNEC
zgq6Y6mJw=&xCUXXWh7}L*cu|OZ-`DdVZJ6pDYeZlMB8o>rtN^M?N$)2ASio}t%>~u
zHAWq>HF2cG43D_uM9mC$62j=Nda8SLo>hD;yrtBr8l=uI+K6=tbU5pZt(n)5DjBAA
z0}w|8UlX^Gx-;%UL2o{Qtx=DVD*A(ibej1DRdL!+JNA#WAPk3b95F>^(&0xGYJmb`
z$jf3FJb_p60B?+r_5Y%)iH9~tSqwHQHpap40Y3Zl+%?|ZdM?-aQ*w=O&N6MPsPV~C
zqHR?*ep&s$uy*@WQ4^Jm#;yX8Xo`JGJLu_aw4VmrH0T%xc)k|Q_dx7ZGCb;NNRZgh
zGzc|dVL-)pHX|0l&xJ9I%<6N%Njl2jva)fS;OcWQEQFbx+kfq|bC+Rc)nAQ6N#V7x
oAk^sztp1S@K)-DO=<y@n0HP#M*}<l<lmGw#07*qoM6N<$g2FB_ZvX%Q

diff --git a/xabber/emojicon/src/main/res/drawable-xhdpi/orca_emoji_backspace_front_pressed.png b/xabber/emojicon/src/main/res/drawable-xhdpi/orca_emoji_backspace_front_pressed.png
deleted file mode 100644
index 807a000e03c3fa69f0e792877372b2aac1e35de8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2289
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

diff --git a/xabber/emojicon/src/main/res/drawable-xhdpi/orca_emoji_category_cars.png b/xabber/emojicon/src/main/res/drawable-xhdpi/orca_emoji_category_cars.png
deleted file mode 100644
index 91a51df4bb260ec44752f1a70cd652335b414a0e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1806
zcmaJ?do)ye9QR0(qz;qP&~2g@^I~Q&jW7>+jbxA}l`(TO6Ek<r+%ZEDqIXB{3CXL~
zLoKU~J?oriRI6=^rc%**EfTG$&51U&cZBwjwfEfndwkFL^Z9<izwhUF?xB$24Hk24
z=NcFoSor%fLy?)L|4e5iBXzV{hD=LfRwT@UcEU=Y3^ec&KrtZTFXqL9p&(C?lyDzJ
z5XKIout+$P9Yp0rVjNHJgHws62pS>tQb~FII1mP6z*v#Q6Ej$&!2lwGCuTF5O<+qI
zpitzOECV^o!D0O5IKGDf<Fy{3si+8n7=(F%N*phdQ&par30^9))|>GdV8R8C^Td2j
zDv})nFd!KSka4b9K7mLCC=?u#M5a)P&VUPn=z=F8F9k~^QOOjliyJWcV324s!A@!@
z(|0l!vh&0UVOUDV<CRJ!PU(t+WU+Xnhlhur!^H)Qcwps85}2pLO5`i17?_}(FB3^&
z5hMZhjJy~~0efPQOuv>OmQK@3<desQ92j23lj4aug1)3FM>hNaUB%*QZ#f(ae#`ei
ziREEQQV<^s${~e}k2G%Q3VkRkl_3LpFeD3up!lg%3=u*wBo{(bfWe^vtJyrhNTN5a
znLx1FRDX#a=1KUVKhqO~aNtBD0hLJbbz>2H=mb}i50S`nMFs|o&ScR^?mjGrJ7o&X
zg!l?ED1oQ2f^S&Hj99%G#8M<O6O@S(L4mIf5(5)OQ$;i9;xQxNBvvqUE<Q72@klaw
zeQW>K>M0YVAN_J#xX5N&`k(~Sy9^QbV(!2><i4c&GkwBTFZ**h3axys>#VMuppFHe
zp`+qiSBg=!KofV<g7?LRt5EoGr^dr7UEoIhPJc`8+KiAQAf|R-@yP2^x|U)6cpob+
zyrK#y_1$%C(XsYBHl}wPN>8=s#P`!iB0q`~d&UxD+io?pN$Llz(o^*ZgIsTD7d07e
zjW&-@$4Wn4`wcRFuZl_(5`SFCorBGa(Zy$%rg|^wH6B7I8>Kiu-@EpVi@9^8^-Gid
zOs+~3R+8&xmY*g0ka~GPY&>N8vzhoWvpkKeu>mWoULK^a*Ksa~KW&VA^)c^`L5pc?
z7Fx|GIjmFJuiNuNARAHI?YSVFKm4>eu4!b8J%(4`>D2Ck{(F|){((;i#d8|XpP7xT
zb;-iY(-&V2&tIlYx67oAWIEP7dOL6K_{xD7{m1KCuh;dQ?r5N|EBYg?XMj+xMvXQ?
zH~Tz-vJ1Gi%GtK2?mP==O;*H%v85($*#2xrYi=d%Rz3Jklh{#zdz`E;%&1I|w3qEo
z(Vo+go17Q6C`sztn9q%0=p3agr#q+Y>B*CC8vL->?ak#;e^PDJ<t>jgjCLGb(~)$0
zy~zpOon6qassQs3XV+dR(b)^b51#$0yl|;5DQsJxcbegDqr6!px4Ut>Z3iwHrqtRH
zqIXyHT`N@E+8Cx>yXb7ulxW#x)|(S}z3lfkna1j5S3bJhmJnR*xK-W#PLZ6o&&j{+
zEJ_z4WV-g64&OMxIZ%N<kf%r(4N$5a!v;GqmF@QSTVPp~lAAs(^GaG;;_hz$_>D)Z
zV{|jU#<D`QZFI=C=h(`~TuSz~QR@u_0i)ZsM`)Er59>&VmyQTtuemp9LgREoCr0=<
zym3Y)x#d;>E&Qss-C>;KkSWf{Ueu+=v<>EuHK8RtqJ}tV@kzPM)$d-#9x7<#dm6y_
zRST~cWP8VvS78GVmlZvrDXP2=&?GNy!aIgp5nJ9mpYpZ28GBe`7i#wezCG**awBH<
zZ{fx?)y>5n<`@=!x^#CLjp~}ZIk4!<UMt{8YTFO(2firHJLP?6e$_lGDeXtY73Z~H
z<g=$M$NP^zH*|jRL^JOm?aJaE_qFAY<I4T%2dulCmbfoZ(hV=2J)rJB$}H5XF7J3{
zG;UIUu{ThgC~PFWTRoiDjavB2je;(xU7J47Nzkjk!lY_a`skx$sAz+S?{tbZ&f_Tk
OAIhH<%>14no$(LVTGFEc

diff --git a/xabber/emojicon/src/main/res/drawable-xhdpi/orca_emoji_category_nature.png b/xabber/emojicon/src/main/res/drawable-xhdpi/orca_emoji_category_nature.png
deleted file mode 100644
index 52b9003f798c03d7c42012e21aff65733410d17b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2551
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
F`ybzeBf|gy

diff --git a/xabber/emojicon/src/main/res/drawable-xhdpi/orca_emoji_category_objects.png b/xabber/emojicon/src/main/res/drawable-xhdpi/orca_emoji_category_objects.png
deleted file mode 100644
index e5965e81fb700df1ba113fdf429df604562abf40..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2023
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

diff --git a/xabber/emojicon/src/main/res/drawable-xhdpi/orca_emoji_category_people.png b/xabber/emojicon/src/main/res/drawable-xhdpi/orca_emoji_category_people.png
deleted file mode 100644
index 437692e7f604d30dec969df615c5a6973b78e868..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2011
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

diff --git a/xabber/emojicon/src/main/res/drawable-xhdpi/orca_emoji_category_punctuation.png b/xabber/emojicon/src/main/res/drawable-xhdpi/orca_emoji_category_punctuation.png
deleted file mode 100644
index cef75d7779564f7562ea2fb384deaa04bc22c0f1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1490
zcmeAS@N?(olHy`uVBq!ia0vp^HXzKw1|+Ti+$;i8k|nMYCBgY=CFO}lsSJ)O`AMk?
zp1FzXsX?iUDV2pMQ-L~|RWd^&N+NuHtdjF{^%6m9^eS=-fVzQ(*;f=KCTFLXC?ut(
zXXe=|z2CiGNg*@ERw>-n*TA>HIW;5GqpB!1xXLdixhgx^GDXSWPQj+a3TQxXYDuC(
zMQ%=Bu~mhw64+cTAR8pCucQE0Qj%?}1aVY^Z-9bxeo?A|sh+WJvVozYf|;3~p^2%P
znW2t?k%6I+z5x)K=^C0?nVMM{nJYkn6417ylr*a#7dNO~K%T8qMoCG5mA-y?dAVM>
zv0i>ry1t>Mr6tG=BO_g)3f<z$ypqHU-MnIDm<cYa#mPmP1tppJc?uvC6O-~wOKg>Z
zE`@j@w*YQzUNJP7fB~jokyxN_sAmB35=^15FMg%Dxp39RB|)hO_hL1;IHa;5RX-@T
zIKQ+g85nVC${?!>telHd6HD@oLh|!-V4)b0kzbNuoRMFk;2dnGpy8XCoS6p_&;;x7
z^|kWMD=taQOHTE4u~h<^p_iGNVrAswVq|9SYGGh(;%I2-Y78WtU7cK9olGnoU7an=
zV0vBhlS^|`^GaZPQxJMBaq0ynhTH<6%`T}$nPsUdZbkXI3SduLWnyuQp@EyZtAUdt
zPV=C8Q?R%Ns@DjoUVWfr^g&UJ6xA>xVEO?u;RzSWfhYacJYae+0w!#E=C|Pt3`{Pb
zE{-7;x8BV3_B(7K;2_<SAlsMFl5k&6aW8|APGp<%1=gVO6;C<Nig7Ax`CX7XXvr}D
z8AnQQ1dDsm(u)sjW-U|9OJ5TBy65q;)VjP!OEPcWRxOm6(I|<ADncI|Oek1qcg)Lw
zs$AKer`|7jU+SFlsW3I6p?2eyiQ!zo4yN4Dw#dvWd~)xZWLLv^9X7j_%ryzcxvQA>
zOg(hKG_}J-X<Nk0t(TNJOxd5Yvc67zey2I>;^PYC+K8=7x1^oZnNszkmT!aSxysrZ
z?<YN0yffvD-pTwLsb~KMuTGn@&DlzEgVW29mHp3BE*cokS-tp(tN8-=zN?e|@-nfr
zgiY$^4G=j~bnOF=;KiGZT8n=+9pDn;v~~6nul#er_=kk(WK{;&BZr$rb_(2_*7n$S
zlR?G)AU<=^OH7R2O&`1!(haBNCr1ml1(+VZR5s<{J%RJO7cE#tPt2QExxIH$D656S
zPK)L{W?vI_g~cTP4Qss1CEj8#c%DuF=mNzkV-?rj+z&t}uD|=@n~96LTGK~W&9cvW
z6%p@exOk@Ob_?-`mN#}K@_hTZYwb!+{?~uzJbzP~ydm54?8k@8Uc9nv-RS?OPTa;u
z>7E$dgH4ttmmfas+5YPNLe2A&mu;IG%hJblR6py|Vc*u0n`T#58>r{UE#^P>vy+|q
zy}*a<M`JQ&AB1-|+P`A(*JYcx=Fbu4c~vR;SKd|a&*zurcDO&KZ|M~Otqt1)G2>PH
cWIqEl!=`D^C-()3iGWI3Pgg&ebxsLQ0OiUkm;e9(

diff --git a/xabber/emojicon/src/main/res/drawable-xhdpi/orca_emoji_more_back_normal.png b/xabber/emojicon/src/main/res/drawable-xhdpi/orca_emoji_more_back_normal.png
deleted file mode 100644
index 57a22ee09aea639ff2e992748cb1aefa94da35d6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1383
zcmeAS@N?(olHy`uVBq!ia0vp^en4!)!3HExIP_cxQj#UE5hcO-X(i=}MX3yqDfvmM
z3ZA)%>8U}fi7AzZCsS=07?@QuLn2Bde0{8v^K<nQL2C3WatnaEfri;v6eK2Rr<N!r
zrKV@**($x?y<bToGsRXZ+|<{=x4=0yBh#a*C^fjsFC@7tJJ~Wt$=*)EroswnKyGSD
zqC!P(PF}H9g{>0UTq__OB&@Hb09I0xZL0)vRD^GUf^&XRs)DJWv2L<~p`n7AnVzAE
zshOFfj)IYap^?4;5Si&3npl~dSs9rtK!Fm_wxX0Ys~{IQs9ivwtx`rwNr9EVetCJh
zUb(Seeo?x<p{1oI$P6PRU7!lx;>x^|#0uTKVr7^KE~&-IMVSR9nfZANAQKal@=Hr>
zm4GgVcp<j{ZfssLG?;(^reBd*pl_&W0P+${p|3A~rMbCq)x{-2sR;LCHMlsWvLIDI
zD784hv?v)EacRmRs|u`~i&7Iy@{2<9^K)RK7?6=)l3$#WU!dR|Y^I>$o0y!L2NKW(
z>+top^2{qPNz6-5^>ndS0-B+hnVDi`<l<svX71{2U~J-OXy|GTB%EEHTwI+@EF4{(
zEzDqgUGkGlb5rw5V0u#!dR=hp1to^u0-((<sYRJ(sVQzn`MC;UPg`Z;c8eoU^PqZD
zaJ$6`r(S)aWAs5$ixkx`Az=CeG2sap$bl#Q)I4B%F9IfPJIh6@7#J9Ddb&7<RNQ(q
z>#Vj*piEorPmYa3Pm42sH*fnKm?JWImdK`wtVic7%1dhsCM7n{VwG0qjy!YdTA$?7
zB?3lf>%LzJz5Mph&Y81{URS<;Y4Y6s`J9>0@69Y;cC0XVd&?i&r5X-0j|AE+nk<ee
z@)dR{cQ_+)Sqi~icY*MpDWb`jB6OaukQ5bO6uabT-wpqzLF?Y{+{wTD$e!!_I)yi?
z#C_HY*B5hHzd~esQsC=5BEfTld-gkc9BZ4U>79A{%kxvG1<jSdxwPi@2wu>Y)BU`)
zll%RnC(oRDvgUq1Q4^x7B&TpTCFltAyIH>7CX@L#3K`tr<vPo=cjxY}QL7exku?u<
zsP(w=Oww3qRc$TrBKz|*)Gi9E7V5HIneBXRO1E3LgnCL$_LL)cTd(Bn*1nuz82{+t
z^>Y1v+!3$ucirY&`9A7b-x2S5hU`kOUsnsAoWNZnCRupvWZzXC_9@|^_FKN#ceni5
za%J7om;*JJ@2z{?zmtP=?bO~Yg-343vR~<`c5mykJpQs*Mfd#Y_X{>J3f|KlyirWy
zi+O31+n37SpQi3Ch|(6`SuA6}lLHi>M-=-MfC1_(;|LDWBZA=Yg>gSAA7JQWNNMcT
S_^S#k`aE6zT-G@yGywoquK0HV

diff --git a/xabber/emojicon/src/main/res/drawable-xhdpi/orca_emoji_more_front_normal.png b/xabber/emojicon/src/main/res/drawable-xhdpi/orca_emoji_more_front_normal.png
deleted file mode 100644
index 2fe38cc0560ef5684fa9fa915e6bbcebd375f7bd..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1028
zcmeAS@N?(olHy`uVBq!ia0vp^zCdit!3-qte-&|NU|^gS;1l8s<YEPaf`a8`<yDnc
zK#-rGUs_UHkXMkDl$4j7my(hK)RLc@4<wV5k_`+D%*@Onh8XD>0U0_vIzTcg5M-;L
zuOE=Kv$KP6fovxyCm?BJXyW7L6BrN(B#m{Afg)LHSt24LK*q)m8}Hx0|M>Cay?gf-
z<QIg6hW-Elf8V}+eSLkufB#NRNzKa4dj0D4j~_o88yfrj`X}^H06OE_w{J&|965jf
z{JVGW&YnFxbH>a+fBwYA#QyvDud}oB!Gi~@R;|j(&M7M`n>%Oj=~JhtO`G=X*RS^W
z_Rx^fuCA`0?w-Vi#4lgI96WIF)vH%qwrttDb!%H&+s~grYierR+uDyGKYsi6?Gq<X
zbaZs&=jHF*x%1YoTMHL1T)K4W)vH%;-n^NSo)Hop5*!o^^l3zRM0i;E#0e8GUA*+{
z*|STRE=`^^xxBpm$l)VTpFX{F=gyinYZBrUQj$}mBBP?CqSI2-;$q_>BO+s>W3ID`
zo&<)1VM&l*FaskqD?0}ho6YK{A9H@^y8LnF*(>y2RgF_alS@<jr}%N<_<y`|JxWQ(
zzn#+1w{et`yE-Qf7_}cfT^vIy;+~w3=4&z#aC<oOrS1X^u?uVwPM1xKF4ji#SikuH
zEb_o~8LOngTT_-yHJBSYebuj^pjg#(f1mi-x&NnZ$v^A+-=ge$ndbW19m!!e+ZA5z
zN%8&4>>^z?)%0_W;;mmsk=!49HQAK-ls%-Gh5Ze3f9dD4Wg3V4-emkdjKRTy!DVH$
zT1@ZG{I%XETBIwjZ>s#y5L=dSdPT<PfmD{=kty$|-1;>mecA-C+3nkI&YZ5=+-Sga
zIEFoZVo;OCnU<LfeU6g_o_{V(Oq>|HVrTx(-T&9@+NHHDN8|px$Qu1?kNzYX=@c&W
zSjN!jH1Qn6Cd+@yYidvC+-ER7AFyD)eB1r~4@`Npr51E(OtsapS|zkc?cq|c6^c)G
zwYT-BeVElK&V0dXODzAYzE>StEz#oowhftvUl@-hNbI=d8KG>pmq*eqxgjMeMz+CJ
zk^jnx60>-n+BMf^pT6dLr|frgt;(ZY_TOf0y<GgQZL9y=dwn~f7;rc-ZrECRZENDk
z9#@tl`98L@?)_iBAco=Iq1NJto9E|jo7#5!hMe@In;%ZZJ`wF)^C;tY$Q5bUtqix%
z1!XeL47;?g_|gosxaHB8Ro+={SSNo><GRIH+2ZpLr!pBIo%8qb$!CWQJpQgexiq4}
qqI<&5YSVwpj7gGQN-^@8?1w%d@&1{`x)+#m7(8A5T-G@yGywqjI@5Fj

diff --git a/xabber/emojicon/src/main/res/drawable-xhdpi/orca_emoji_more_front_pressed.png b/xabber/emojicon/src/main/res/drawable-xhdpi/orca_emoji_more_front_pressed.png
deleted file mode 100644
index 57b04f8d1e97b8f3e76a5b2b58f096bd30c04c97..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1987
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

diff --git a/xabber/emojicon/src/main/res/drawable/orca_composer_attach_camera_button.xml b/xabber/emojicon/src/main/res/drawable/orca_composer_attach_camera_button.xml
deleted file mode 100644
index 0b255fb273..0000000000
--- a/xabber/emojicon/src/main/res/drawable/orca_composer_attach_camera_button.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector
-  xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="true" android:drawable="@drawable/orca_attach_camera_pressed" />
-    <item android:drawable="@drawable/orca_attach_camera_normal" />
-</selector>
\ No newline at end of file
diff --git a/xabber/emojicon/src/main/res/drawable/orca_composer_attach_location_button.xml b/xabber/emojicon/src/main/res/drawable/orca_composer_attach_location_button.xml
deleted file mode 100644
index 4971113aae..0000000000
--- a/xabber/emojicon/src/main/res/drawable/orca_composer_attach_location_button.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2013 Klamr. All rights reserved.
-  ~
-  ~ This software is the confidential and proprietary information of Klamr or one of its
-  ~ subsidiaries. You shall not disclose this confidential information and shall use it only in
-  ~ accordance with the terms of the license agreement or other applicable agreement you entered into
-  ~ with Klamr.
-  ~
-  ~ KLAMR MAKES NO REPRESENTATIONS OR WARRANTIES ABOUT THE SUITABILITY OF THE SOFTWARE, EITHER
-  ~ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED WARRANTIES OF MERCHANTABILITY,
-  ~ FITNESS FOR A PARTICULAR PURPOSE, OR NON-INFRINGEMENT. KLAMR SHALL NOT BE LIABLE FOR ANY LOSSES
-  ~ OR DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR DISTRIBUTING THIS SOFTWARE OR
-  ~ ITS DERIVATIVES.
-  -->
-
-<selector
-        xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="true" android:drawable="@drawable/orca_attach_location_pressed"/>
-    <item android:drawable="@drawable/orca_attach_location_normal"/>
-</selector>
\ No newline at end of file
diff --git a/xabber/emojicon/src/main/res/drawable/orca_composer_attach_photo_button.xml b/xabber/emojicon/src/main/res/drawable/orca_composer_attach_photo_button.xml
deleted file mode 100644
index ca7508dd96..0000000000
--- a/xabber/emojicon/src/main/res/drawable/orca_composer_attach_photo_button.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector
-  xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="true" android:drawable="@drawable/orca_attach_photo_pressed" />
-    <item android:drawable="@drawable/orca_attach_photo_normal" />
-</selector>
\ No newline at end of file
diff --git a/xabber/emojicon/src/main/res/drawable/orca_composer_popup_button.xml b/xabber/emojicon/src/main/res/drawable/orca_composer_popup_button.xml
deleted file mode 100644
index d43dc26e4d..0000000000
--- a/xabber/emojicon/src/main/res/drawable/orca_composer_popup_button.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector
-  xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="true" android:drawable="@drawable/orca_composer_popup_pressed" />
-    <item android:drawable="@drawable/orca_composer_popup_normal" />
-</selector>
\ No newline at end of file
diff --git a/xabber/emojicon/src/main/res/drawable/orca_composer_popup_button_active.xml b/xabber/emojicon/src/main/res/drawable/orca_composer_popup_button_active.xml
deleted file mode 100644
index f5e40ef8c2..0000000000
--- a/xabber/emojicon/src/main/res/drawable/orca_composer_popup_button_active.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector
-  xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="true" android:drawable="@drawable/orca_composer_popup_active_pressed" />
-    <item android:drawable="@drawable/orca_composer_popup_active_normal" />
-</selector>
\ No newline at end of file
diff --git a/xabber/emojicon/src/main/res/drawable/orca_emoji_backspace_front_button.xml b/xabber/emojicon/src/main/res/drawable/orca_emoji_backspace_front_button.xml
deleted file mode 100644
index a2d2f5b627..0000000000
--- a/xabber/emojicon/src/main/res/drawable/orca_emoji_backspace_front_button.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="true" android:drawable="@drawable/orca_emoji_backspace_front_pressed"/>
-    <item android:drawable="@drawable/orca_emoji_backspace_front_normal"/>
-</selector>
\ No newline at end of file
diff --git a/xabber/emojicon/src/main/res/drawable/orca_emoji_more_front_button.xml b/xabber/emojicon/src/main/res/drawable/orca_emoji_more_front_button.xml
deleted file mode 100644
index a799d56d95..0000000000
--- a/xabber/emojicon/src/main/res/drawable/orca_emoji_more_front_button.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="true" android:drawable="@drawable/orca_emoji_more_front_pressed"/>
-    <item android:drawable="@drawable/orca_emoji_more_front_normal"/>
-</selector>
\ No newline at end of file
diff --git a/xabber/emojicon/src/main/res/drawable/orca_emoji_tab_background.xml b/xabber/emojicon/src/main/res/drawable/orca_emoji_tab_background.xml
deleted file mode 100644
index f68e6212b9..0000000000
--- a/xabber/emojicon/src/main/res/drawable/orca_emoji_tab_background.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector
-  xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_selected="true" android:drawable="@drawable/orca_composer_tab_pressed" />
-    <item android:state_pressed="true" android:drawable="@drawable/orca_composer_tab_active" />
-    <item android:drawable="@drawable/orca_composer_tab" />
-</selector>
\ No newline at end of file
diff --git a/xabber/emojicon/src/main/res/drawable/orca_emoji_tab_dark_background.xml b/xabber/emojicon/src/main/res/drawable/orca_emoji_tab_dark_background.xml
deleted file mode 100644
index 07ff608c99..0000000000
--- a/xabber/emojicon/src/main/res/drawable/orca_emoji_tab_dark_background.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2013 Klamr. All rights reserved.
-  ~
-  ~ This software is the confidential and proprietary information of Klamr or one of its
-  ~ subsidiaries. You shall not disclose this confidential information and shall use it only in
-  ~ accordance with the terms of the license agreement or other applicable agreement you entered into
-  ~ with Klamr.
-  ~
-  ~ KLAMR MAKES NO REPRESENTATIONS OR WARRANTIES ABOUT THE SUITABILITY OF THE SOFTWARE, EITHER
-  ~ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED WARRANTIES OF MERCHANTABILITY,
-  ~ FITNESS FOR A PARTICULAR PURPOSE, OR NON-INFRINGEMENT. KLAMR SHALL NOT BE LIABLE FOR ANY LOSSES
-  ~ OR DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR DISTRIBUTING THIS SOFTWARE OR
-  ~ ITS DERIVATIVES.
-  -->
-
-<selector
-  xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="true" android:drawable="@drawable/orca_composer_tab_pressed" />
-    <item android:drawable="@drawable/orca_composer_tab_active" android:state_checked="true" />
-    <item android:drawable="@drawable/orca_composer_tab_dark" />
-</selector>
\ No newline at end of file
diff --git a/xabber/emojicon/src/main/res/values/attrs.xml b/xabber/emojicon/src/main/res/values/attrs.xml
index e406440ce9..66556fcb0e 100644
--- a/xabber/emojicon/src/main/res/values/attrs.xml
+++ b/xabber/emojicon/src/main/res/values/attrs.xml
@@ -26,15 +26,4 @@
     <dimen name="keyboard_height">250dp</dimen>
     <dimen name="less_than_keyboard_height">80dp</dimen>
 
-    <style name="emojiDialog" parent="@android:style/Theme.Dialog">
-        <item name="android:layout_width">fill_parent</item>
-        <item name="android:layout_height">fill_parent</item>
-
-        <!-- No backgrounds, titles or window float -->
-        <item name="android:windowFrame">@null</item>
-        <item name="android:windowBackground">@null</item>
-        <item name="android:windowNoTitle">true</item>
-        <item name="android:windowIsFloating">false</item>
-    </style>
-
 </resources>
\ No newline at end of file
diff --git a/xabber/src/beta/res/values/application_title.xml b/xabber/src/beta/res/values/application_title.xml
index 832b3c1b0a..31e83cbc75 100644
--- a/xabber/src/beta/res/values/application_title.xml
+++ b/xabber/src/beta/res/values/application_title.xml
@@ -15,5 +15,4 @@
     <string name="application_title_short">Xabber</string>
     <string name="application_title_full">Xabber Beta</string>
     <string name="caps_entity_node">https://www.xabber.com/</string>
-    <string name="xabber_xmpp_host">xabber.org</string>
 </resources>
diff --git a/xabber/src/main/java/com/xabber/android/data/xaccount/HttpApiManager.java b/xabber/src/main/java/com/xabber/android/data/xaccount/HttpApiManager.java
index 12a947debc..720acb52e3 100644
--- a/xabber/src/main/java/com/xabber/android/data/xaccount/HttpApiManager.java
+++ b/xabber/src/main/java/com/xabber/android/data/xaccount/HttpApiManager.java
@@ -19,7 +19,8 @@ public class HttpApiManager {
 
     public static final String XABBER_FORGOT_PASS_URL = "https://www.xabber.com/account/auth/forgot-password/";
 
-    public static final String XABBER_API_URL = "https://api.xabber.com/api/v1/";
+    //public static final String XABBER_API_URL = "https://api.xabber.com/api/v1/";
+    public static final String XABBER_API_URL = "https://api.dev.xabber.com/api/v2/";
     private static final String XABBER_COM_URL = "https://www.xabber.com/";
     private static IXabberApi xabberApi;
     private static IXabberCom xabberCom;
diff --git a/xabber/src/main/java/com/xabber/android/ui/fragment/RecentChatFragment.java b/xabber/src/main/java/com/xabber/android/ui/fragment/RecentChatFragment.java
index 23f40baaf5..03a581c9e2 100644
--- a/xabber/src/main/java/com/xabber/android/ui/fragment/RecentChatFragment.java
+++ b/xabber/src/main/java/com/xabber/android/ui/fragment/RecentChatFragment.java
@@ -114,10 +114,10 @@ public void onDetach() {
 
     @Override
     public boolean onMenuItemClick(MenuItem item) {
-        if (item.getItemId() == R.id.action_close_chats) {
-            MessageManager.closeActiveChats();
-            updateChats();
-        }
+//        if (item.getItemId() == R.id.action_close_chats) {
+//            MessageManager.closeActiveChats();
+//            updateChats();
+//        }
 
         return false;
     }
diff --git a/xabber/src/main/res/drawable-hdpi/ic_account_box_outline_white_24dp.png b/xabber/src/main/res/drawable-hdpi/ic_account_box_outline_white_24dp.png
deleted file mode 100644
index 33eae95081eb883d866599156ee2f3f0b0c04833..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 514
zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k1|%Oc%$NbB*pj^6U4S$Y{B+)352QE?JR*yM
zv<Dcwoy@ia36>Q&rUPlPeufHm>3#+V#$Hbs$B>A_Z>R6~Vs;d0-+!@0=%5#O_Cc)#
z#f@H4%v^R39~5=|erD*JyHsC6^Nnb-u(op31hc8Fu0fn#Ny2qvc@H?$@9ip2Z~2pu
zIAiABzj=Az`dT~HxF*+%PuRjYrQzk2?=lRs#=HG&oG;DXbUiX?Miifc^HsO+`bP|=
zDwRp^@ccP-YGc>t@WyBU4j1QT&b(PS%Vg3wB?sfhA6HJ9Zx@lw9>Njpa7ib=mhpnw
z=IIl@HfgD><SJ>@Hs5t_y8VPDN*5TODZi^+@Gxm-cm{7o$4C7g5$_ykYOuTzdvWwf
zwca%S2{ZRHl`fDk{NA{$`>&Vd@q1^YCQbABc!RyZUB<z<WbVRa>sHo>DtZ<lP}{(`
zhM`;U3yTfI^aHIkZPU3_PBz3oVCeY$LwEN^-aTGcEPZEvB11FSExcw#m+X{3;CYF+
zraI%a@%`$){MK`g)#okyXEM&bxl+An`@f?b<z3!vT5@;F_cbnWzN<LQ?T9T^*1oHH
z>euP+NB-e2jSR!5I_&-URoJg?>bwjk{#vF)@99VCK2JCgj3ow7S3j3^P6<r_hOE*?

diff --git a/xabber/src/main/res/drawable-hdpi/ic_account_multiple_white_24dp.png b/xabber/src/main/res/drawable-hdpi/ic_account_multiple_white_24dp.png
deleted file mode 100644
index a3546d56b86d4f8cd41f75655a56eac95fb0a4da..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 410
zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k1|%Oc%$NbB*pj^6U4S$Y{B+)352QE?JR*yM
zv<Dcwoy@ia36>Q&rUPlPeufHm>3#+VMpaK2$B>A_Z>Jji9X60~vsYfymzv1H=dgX1
zaOk-M2X3`a-K-$Scj$)S++8kDSww}jb#y#*L{BGos&WhcEEjeS`8xa2i=Us>Zx$}`
zQ7cZcSj`dRskJKc<(%qwm&}=Y8ZGN*G9TXdPp?(XWOK&r<<n*grSDoDe>`wW@Inh$
zZu^}9?~iazZR^?8I{(~$t1DNT_SSv-U2Z66b5WPsPc_zS*MyR|y>-*SsJ%RD`Te57
zd!I{dm*jWLYa24kHS|7wb~ohR61C@gN7ri`u}y0e^3`elxc<y>5&Jn7%-eKNRct$;
zbHbK!-<o~%O<t|=*>OVSME#~;|E?G6W=^QNF-y{87w56{VfV$Y-fien-!s*I?Z10}
u-&P;bzZ!L^_V~@!4{lD{AEY+f(xr}}X_w@*4-de>$>8bg=d#Wzp$PyI(x$%v

diff --git a/xabber/src/main/res/drawable-hdpi/ic_account_remove_white_24dp.png b/xabber/src/main/res/drawable-hdpi/ic_account_remove_white_24dp.png
deleted file mode 100644
index 8fa2e62b16bc2cc3270d8c6cf5e368ebcb2fe914..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 455
zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k1|%Oc%$NbB*pj^6U4S$Y{B+)352QE?JR*yM
zv<Dcwoy@ia36>Q&rUPlPeufHm>3#+V#vo4@$B>A_Z>QO2F*%Af+`kne;i22KmqlMt
zdh6y7GTieN-{^|Hxm?ZMKf&#w+L2o#T#O&RKZ}_iUUx>vcs9$k>}hl7et$Omzi6k6
z(tnNwo;8i-54`7RC;X8%(kxgyOMAjL&CM)%cb>E9+@A1~$^DH5)7|QyR&sOZxh~0%
z+`j(n+m;5!35;o#?x)*DE#3NLH>_T7#4dYl&xD|vF{k;LiEP+3XI<0OwE<}?&)R$(
z(~g{#X-(Va6x#cKwMwtW`tDn9tHPFvi09p2edV0Tw$+n0k1qXTCo#J(K=a=Hs~1an
zS)1E->nsUaT)cu;bNOVc7mURZSZ};AnZJcuz4rc#@0J(1RqYw$8oBdgO!6Lir?BM6
zs=m6xw66Ri|4hw-Zz{nBY|C7wJDblqxZHDjVt9b-hsea`DxP*R=cc$SNM78-Ex28N
qOS^*+D|7h5uph-v6FpQ+?!UgP`gKt~=WSq6GkCiCxvX<aXaWFUSh73-

diff --git a/xabber/src/main/res/drawable-hdpi/ic_alert_white_24dp.png b/xabber/src/main/res/drawable-hdpi/ic_alert_white_24dp.png
deleted file mode 100644
index 5895a82d4515fce5b468adfe9e5640dcafe2eecc..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 526
zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k1|%Oc%$NbB*pj^6U4S$Y{B+)352QE?JR*yM
zv<Dcwoy@ia36>Q&rUPlPeufHm>3#+V#+jZjjv*0;-%d01lXjGFyT4$^LeHnywqADG
z<nmg0N4p(+L9(JM>ssg6vzS|$3z)K4gm||+V==kl@?+_THAx@xY~<GO6?*8Ix99Qy
z`d_xjzYntiSAOLnYw|Ym#Fi_&e`K1zZMOQPzj#^dtyhnmE-b#47xdyx>bY5yUar(v
zb<)quzi#BXcgrkq(>FmcPF$6F>y;KiSB=B>>fh4W?^7*gndi2Y&fQVA`tr*a{+yRJ
zD}sWbY;HYweS)UN{b@e&bElg8*}36a^~ujOZ~4ESyrun$Z35F1nWqdsNxfAq4fzMu
zrpM}EyAk8@m#4>kf~LgrC~5x}EGr(j-t61@sr8DU!5YV92@=`Q7RIH>d=8Cya*Ai0
zLU4d&xpS)z_YT%i$A9O)Yh16`az9@_<n6+TQbx-anf`eE@qKzPMyN>6F??Q|l*LAs
zchh_`c-HLE&sy-Mu6k?x9QX6upOQTJj2|ep6l^w8d_J*wlk?0)|Btlp*nQ)VfJdG7
zbr1V*Y>(of*<{_DIE`idLFNytEg$}9)?H++GgS$`z`9Pl?8gJy5A2Hy>Ma$gUv&b;
O7=x#)pUXO@geCyJW#xPT

diff --git a/xabber/src/main/res/drawable-hdpi/ic_attachment_grey600_24dp.png b/xabber/src/main/res/drawable-hdpi/ic_attachment_grey600_24dp.png
deleted file mode 100644
index 04b54445e050f149ba02f6e30678120a3ee561f3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 773
zcmV+g1N!`lP)<h;3K|Lk000e1NJLTq001Na001Ni1^@s6;Q*MJ00006VoOIv00000
z008+zyMF)x010qNS#tmY07w7;07w8v$!k6U000Sga6xAP001Na001Nacn2Gg0007z
zNkl<ZSi|j=F=!M~5Qe|m+XyD9GzyAJP}5ilf*`33f~A6mU~8jxnsfKuBM??Zx!mqa
zFolH#L4t*#AU1-6U?XTFTBx8Qjl`gZ;w_1}yd8^d<lH1@E_a2+e%0HV;m!Yk_RWKg
zjEszo{~P&N!QkNFM%%Uz1AQXW*-A52od@2{&CNX<8yox8l%Qg<xOrh=VF)-2v?OF%
zQ<3R7jxU5^cyCRD^7;IMTrT$z*qMZCzz1Lk&=$080`>!T;@J5x3~w|P<ayp+W6TSn
z2lyc(SLWyE$45s;zqi93&+~eXF}HyMz*v@bU}R+E?NZ)KJ7$cT0D44ZT15KG<#MH6
zVgO2|(o|Ph*D>G|kTb?yT-BjMp>SMP9|9W3@j#_gd0wCQeSbr>S}lsm8DM)eI)Wf5
zrh1)I)tkWQAP9CW#qIhcRXqhDB9GHz0HP?G5RsGZa7tAtljWBBxSgu&Pl_L<H*g&1
z2(TpPnyNlqYjfMSr_wPI*{!MoUmFS924Gp%<O&-cOqOqgAQ)=J9pCr6qbPEc!#}Oh
zrGM(50C605uOR4qvfSx7&ervc@jS0LilRrr9>C;sxk@94CV?JRJp|mZPZ(n!SeA8_
z#T)qEb=}v1X;RN7V@&-V%GY0cNZm5mb%%k=$t3Ly!!WAP7Yc==s(P2j8MSU2P3pfK
zs?}<@IyyQosp>Wnxz6IV@rQD`{G?bc?lZ=m0CvT3Y|{iHG6TGuot<6#Tjsj10|dzi
zw>mpJ^S<v_TXCc*(JRFq#~Bxq)5-T2;12LoRe!9fiEZ0crBdnRdIbT9>$)y540N^O
z;L9fUYFMkpH3))otyb$(RUdc-d~1WSjEszojAr=_YrF@UG>>rN00000NkvXXu0mjf
DU2#}*

diff --git a/xabber/src/main/res/drawable-hdpi/ic_avatar_2.png b/xabber/src/main/res/drawable-hdpi/ic_avatar_2.png
deleted file mode 100644
index 2f1151c5c9f49af415be42f935ef270c7dda6980..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1269
zcmV<R1Pc3!P)<h;3K|Lk000e1NJLTq002k;002k`1^@s6RqeA!000EMNkl<ZcwX(B
zU8q$>6vsWOh1i3lriKz4_z@cUE!dNmln_`d^`H+adZ7>>%ojiCYKSjBsij3`1fqyS
zVHBaFXc=7dBT&=_jk=)b2Yw_}n%;hYIT!Xl?tAv0J$vSIVGS(KK6|e<v)1pdJu`du
zoJtofbqQ3APkjOgC?i7*kOA`RL@a|WgDivm2v`RB@v}b2GN_YeP)ke8+ql|XsZ@>@
zb(uP5V0)iB_7$ze)h^mCMsTxnt`T{O0RMA!6#J*KIfuN1{g1BpMfGC>Qd>umodmea
z)nNdw#by|`b6jnG^rHcilLR@DkMEG-1bTz-BRHO{??^x7DdcbDGIAC<irydS4dwVG
zGM4Wbd;)g0jS8p=X$PN!kY^DEo>hKD;hwS&I7_pX%f22B5LwU-=RZJJAnH$C%T)}P
zBVPcj#nrf|eiT5!8GwVkktszTP1t?I@jM{?RYF~vRRjkFoWXc;DCg~z>2OuyIG?Wq
z>1JMoqIy9A0jDR9{fvxGIH*qc4l>5U>0{_VgFKh85p+Rvo-#PJ+a)xhEjZJVaOfY7
z`y+Re)5ypi&NcyI60l{b(Jkro8m@hqqmIHV!2l7^SiJhBCZGp=ACLTroIun!WtHDh
zn1H;19IjFRSCD}uoggJ7pj~*JHmTDHBzeLiqK8$`Y5r~o(0dMbIjIH#ME3N?iz~>J
zPTmw#zKvObASs(lFQEX<!cz_FvC32c9SqS}C_s8{(xfg{Sq7l>AsPz>=qsF^7sBCo
z>f8XJB_Y}i1*iwk>d_)r(HfDa5T%#L096;I*3i;GBriY>-<sVn#?fZ#c%9=<O82(?
z3YXLF4%*d2@J2*aiLN=@*NCbCrI9-J*4nfIKm(e%okEI^K7yn<%UejyPP&2MKEr>_
zxCN(3xsTBp>N%4%t_8G;i^?9KqBWjTu>sNEA>_P|<JhhSP-8tnA8~P|XCp6SKdb`)
z{Y0C3eDNvk0Musmt<9iG)UJoiynRotGZ(9HW_AFet<?;Az91p>MK9OBR7mTjHEq{C
zrk7(w`t`I<bBewo_C&F@4^sASuioM=?%zUrRoYs4YNimN&Ubfdfy%Wk`lxgiphWww
zgN&vLsjHMlZ>75IIvSA651XZHfHDXfAOn<j6V<<N8Dtq`86*Oa=0Sca(yi?lvs=tB
zuPlQsgDiurlg^O?oo*D<lIxxvft97QkYWDwvMNi~6RMNeva7bx#VT6p(u!i~B?usS
z$&!bD(FLV@{CI_51Lw_9?SurR%?a}n?QPaRA(e4RpOj#<LGxPTyk6gEH%D!`#EI5*
zXKnU8fNTMf-be%~!2qRsOIH2B`ROUw-XO?tThF7nh~rOF^u9#z-5?~|snh^v&^AB@
z$nS=<46+RBTp9E|?!M+Rifv;Q)6^kaiG7RdUq0`rL^mqAtAb&E8an$^^j4y$x4zLz
zY(PVZtO@Cxh;TbW&rL=QAWbqgXL==Z{&$YYqkBCX9U6)XNP$)VnxOap+MuQXk7@F!
z4OndodiraWCXCweqkYgHqnDg*N8uD5P?V@jY{UR%z%)Px$nSo$46+Qe4Dusj8RW;$
f`XI|7zYO{x4nwC{W6}<F00000NkvXXu0mjfC2m(U

diff --git a/xabber/src/main/res/drawable-hdpi/ic_avatar_3.png b/xabber/src/main/res/drawable-hdpi/ic_avatar_3.png
deleted file mode 100644
index 7e2bfccc98b836001c3550c7d4048403b8784514..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1650
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

diff --git a/xabber/src/main/res/drawable-hdpi/ic_avatar_4.png b/xabber/src/main/res/drawable-hdpi/ic_avatar_4.png
deleted file mode 100644
index 532bc01e74d95b7669df03583e607aca683a552d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1644
zcmV-y29x=TP)<h;3K|Lk000e1NJLTq002k;002k`1^@s6RqeA!000IvNkl<ZcwX(B
zX~-5;6vumv_C+aMK(ePIH7X<gP+^$TW>8kxrWF*4_907>$cl=B79xx`!lFL3sraF?
zw6X<>%7QR0TeQ_Mi%?r=q0P77UuNE>dGBm@nau8m!^|_!J@=mTd(ND@%sic~Vksri
ziG0clL_if05&=a(Zb>9YP>i4$L2d+M1iA5xIq1J0K|MV^r{TkfPN(yVTP)aVZ}t%c
zpk=r=9Y8PHx#*^~Spx#jVYs&t84RF5-CVWP4hjed2V>R+ICrCsdFbDcUO)6Nx6${Z
z6B^J?82K9VC{D`RJ_QK-a8Z#Wn7bl9$a>@>WHvGm-M4%=Ytu$hKr#pbT@G&`lW}x@
za%~vLNyzEQ{uPG5$oCH+^U(jp#z_~Q;D8b!qc}c^T!@^9j7OUGy$YSnfb^V;!%cOY
z8rih{-ugt+<9wK4-N4_9cW`<|TS+@OAi$`PnaDH?I2+MfhwPctoy+HQ+kn&tpj&a~
zN((qrQJzx%5s));ZOjDFbjx;Ys|5u_^qheu^J-hux8g(~%%+`(`Re@K*Bb3k<og#K
z+OJd%1_-AH(EG~F?eQ(=W07tW5tYVK;WuP8a$rH__qjei<gFGGkS2%MW*l3JBO?H}
zBi96L+d715)HyYsKGdk&xJnQ}K-dOLzC`xOS@aa2_ePFrY-zEA=0|6FZ0{dUg#vUO
zy#&n-i5I#BmjGxqKgxETpM&gxEJxnu`j4*QLIJt~!>)5RE~meS&+o|b%<)6c`vYPf
zfS%=CIW8@lB7BT!Hz1Ye)Lq-eu26vHV8q!?49V2hul`;FAq65Rzaj@C!;wQXN9D3H
zNZs|?HyL0{IDe*W2@?vC)=$S)0Mak~Ne+a7Xw>Q&Kpeoeeg$n#;rcAgALM29#scYg
zlYS^bi|Fk5Oov*X=WmY{T-)9N;t;NB7obVe`c6xb{Gd>`jY$A{uuVXd>8wAJ<_j$s
zw1Usx8oE^m)%BpF-Zgx`0GWa4cH66AyLSWV(%OJXc=`pkcG6yrlH(T{SwmwQJqio@
zyYr=%2`Lc4(a;~N%)zEj3*lt#r~ZyfWHd)jEy~Iz=-=A}kd_BpCYXwH$JaS%DZpiP
zv>GF2&{v^o7}{MyzxpwZ1$zWcpad-sY$?}9q5o4YKs2UXV*^r@5X=15zVTE#yN`A>
zTG-}<rfij9cdm-;v{7su!ue5%Mof)j8X=9PPm=cV>;FtoiXhFJl@Hn~T9YZ~c`e3K
z3`kl89^}xI_Lwh1jET>o-7;0}4{1}*YbgSBG`(n4&?b7*qHx!(rS;MMO_d$$-vXek
z9rTT=h4UbyNKPuLbq!KBPuaAQh5nJ~X{Op%Q7$>fcV|`;#ROgoZr=o;fG$R6VdzHc
z?85o?h*cjJj($$R`&sCfssuG2NT1TXccTkD(hlPQApPJIQfNRL$;SCKxT39*0D9eL
zf1v^0gt6WeX9<8Q0P;F8ga)JyEImGMtK0*isXjXk4M;0<?~}I@0E+?Sb#fXSkQS(#
z&imS+uL_R!02)|Tsmb?20m%?XGVKEuE+m^6TeI$<rrWAz?Y05vF$|bk(>Wj2^e|By
zc3w&wfUd&Qo4r_DuaOA=(w?}N(gvWDvGi##)>b#7?Uo?`(gf8@X#-FfOF#2sZFwV_
zNzVYzZ9e;I1CaXo4zbx8DDzd(qSy2^2uKzJ=WU;G)K+jn>V%Q(RSqLP8n1V!7XjoK
zk8K*8Y73Ay&hD(?jJ7^M$V7$SD>7}{4h4>0$qQcE0<<-r+=X0>6zz5EA>uF`?|o5|
z$W!j>8Ypa8fKmr>SkJ5UK=BcS)2o0pG<*Gj2Pnx$BRHC#qenmyP>qzyZ4)D?j8g<u
z5k&wxoGN<Un=dO#(t1SPTd1p%&Gc7=Eprr0a?oxZ^=v=?GQ$D@Y2B6u^gJI<$dS}s
zX&`l-U$3i?5!#ta=M5n;@_W^q5s$&?H*<hA`_{`?dXFeA*Hh2x?^Shx<m<FDQ8XC_
zB)vI*5~62k58$*OclRmO)3&W%rO|UXJsf<(#!*|He+`hW!ENhBKo!Izpa{tAri>93
qBPd3Y8-W->Zv0{niV@@%L4N^BBjs3>V<YPT0000<MNUMnLSTZJF$E6*

diff --git a/xabber/src/main/res/drawable-hdpi/ic_avatar_5.png b/xabber/src/main/res/drawable-hdpi/ic_avatar_5.png
deleted file mode 100644
index d0c32dffc4f79a7da22ba9f57ec7dd368bb1ee7a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1414
zcmV;11$p|3P)<h;3K|Lk000e1NJLTq002k;002k`1^@s6RqeA!000F|Nkl<ZcwX(B
zTgX*a5XU`QXjURcX;DcQsfAc+6rYq7lnMG!LZlB`l$n&7Mra1T<bwvGsS!#LDkUmu
zVL?$zDqgxs36ct-mU%4{sYtqg{r<8~Y<GL_wf5y(2Xht-XJ2M!&HT^IT66ZE)97R)
z7lDT1laGJ_<cJUh$N;Lgh*$(!1X%=CL%<@a8h*A0Sp=Oy5!Bw^J_d95HX4nsWz9y%
zNMwIQ$0ucV6p;&>VmS98#ytn!jDvp_F;u+BU&zO9Xf*O$iprPa4-Js!+YBwm!Pkl!
z3_x>`>4U6*4l;rQ6h%QBpYK5ZaP&A%58(J#okN#EU6n%6A!w%nh3|X#uH|?eG>G$k
zLC|56-~dG+t>Uv6bOm&^hqGV9^Cz?paHf0k*TxbQAfn)0EPoc#I&?t^FOEnSklrXE
zTS_DtK!9^O7QPMLR?5=Th1PI74xoOiL07JdAOHc*Rao(<XFB=%`~{461JVg!fiir#
z0O8nWD4h~1eidW(7o8;9npO8)ACvu-<6ogc1@wImuk5)pCZk&DUhLBPRA^vVHv}d@
zTKtz~)n=Ihp`bg0+am><Tn@bm%|+SozSf}Ub$B0%@k>u{NITUx&~+ZVwlHT~l%@v~
z{4a1%c6pDe*n9<nzLAjp8H%1SlS=Xc8VB=|lv#IiZ8FL}c3FfWx4`om6rV@m_F(8I
z=qu<_mmcmb;#3MK;?^bjPjcQLd%kn&!5#rJ4;q!iyBr;3ivTnW=I3)J)mHsXUfN;M
zYIyET(b3K|QD>J^vHPmLyJYY$z>cS~bVcc;@<4Q62H!Sx3@HN8V=ymrIFOlk7<DnS
zhoN%{fKZn8ID)-!@Q<W|lyu6PV-5267Xhdz%vvL~FuH~+UZvf?KOiye0j{lZ3D$W3
z4(8w3)aOX2<g|ZtK|5kHee)}6CQ<pXC>rMJ$V&L8G0_2JXGbCJDO#CrD)Y``Uj0;2
zD$Rhh(kVWf)~+eYzME!&R~^KpqY-`yYOeZu-YBgGLh~U#-Uv0cyH3N_wM?i-BCeq#
zQ$K!RMov3w>hJ<clF>KwG>0>x9*)^3aQ{sx#QM`TMeEN+P_hh2nyPeKCO-h?pbJHB
zfSQT`N;QmjxQC&vUFcEn{RpYn2sQM@t#<&liTg@LRpDNvFhDV&ZsK?@lw6+_x~fj^
zg5L77q8_G+IKG%Ka0BXYPpH&7qcv#-JSs1|M`?g!K*iUmV_YAP5$|EB)}K}Y)Q5TX
zyy-^BYn{nMt1>`R4j5W%^jv2@;Ha|IwUz)B%`LyQp&Z4YpS{B+g|QZZ(hO)NKve)q
z${IipGz}mFs9M5V1X%=G1T_&jRVY@2<G<3DVwPgnV#*@OBFG}h7HQ8IuwBdnlmTP_
zdFE0E+Zh)@q2G&5ppsS}K&_)A>!2I3bVse$<|}IhpxPTdI}9NC!c#?cf;|)fq}70<
zXXCYxjs{4th1B{o0y;mkUY#9!Z=W3M^w6uK=1|jB{}jF-xTaU)8hYXP5wr+^3ik;4
zpxL1Sr5Qj}eaQ8DQtpk?+mPmU_@3l=K?>hu_$K-|R|k&)<Ur8?GJvWjnnjRB(Elfb
zMzTA-AKS&A;CSKLxQppuK98q3J^+B!L3?Vj%@60}gA_jf6+zu=K}IXqplk3<P2p;G
zY7YH9YJA*d08){uR^vNk*Y|Qf1YUKK1R22rilRd;D(Z4qGnSg3mf*BHzfK!b`>wie
zRekS))a|eS>R_WK00r}|hKURy2Z#oc0aPu|EP^b8EP|>bU=dUeKU;$=f~rN(KOK4W
USO`T}Jpcdz07*qoM6N<$g7uV&6#xJL

diff --git a/xabber/src/main/res/drawable-hdpi/ic_avatar_muc.png b/xabber/src/main/res/drawable-hdpi/ic_avatar_muc.png
deleted file mode 100644
index f68590d2e426c1edc7175653ece45647019403d7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2029
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
LNkvXXu0mjf-LurN

diff --git a/xabber/src/main/res/drawable-hdpi/ic_chat_white_24dp.png b/xabber/src/main/res/drawable-hdpi/ic_chat_white_24dp.png
deleted file mode 100644
index 53b527815a0e7c8449f8dec1310956176b8e00f3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 339
zcmV-Z0j&OsP)<h;3K|Lk000e1NJLTq001Na001Ni1^@s6;Q*MJ0003RNkl<ZSV!%c
zO$x#=5QQ5Bw+bH68>k!IO5M5;^aOf7H(d%!d=)A+Wb#9jNfs$&mCp3*dy{lh(G+%x
z!g!jpfuxi(D0aeFVayY&*CGE6V=shw4$t~i2ta2{Y!id1=`R4<P(Tk%ESZ5i04*q>
z7bd36Kn;L?PN|kvpxzB{g~kCPc4E;;U3>)^REefgh)piB-j*S0>yp^vo<pr6lS(mb
zs4UAIY9r_t@1pkI7%6Kg>I!7@)1=TF!4q48*z+bJ?Z+=RfSRuYSrj(5usJNd!m>5h
zQ*#3K$DljL&U6gY0UZ&b{Ys}OcD2b@fmmU_{q^`Ql`Wqg#sriFh62h4qXTL=3s~FE
lrdTN<Im`Y(6!K=VVm}R;sU=e>1+D-9002ovPDHLkV1k^0ht&W8

diff --git a/xabber/src/main/res/drawable-hdpi/ic_edit_white_24dp.png b/xabber/src/main/res/drawable-hdpi/ic_edit_white_24dp.png
deleted file mode 100644
index 1ca8fa1001ecc784dc4d2ad3a9147d37e97e69f2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 339
zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k1|%Oc%$NbB*pj^6U4S$Y{B+)352QE?JR*yM
zv<Dcwoy@ia36>Q&rUPlPeufHm>3$&Ro~MgrNW|f{*Bto{I!LrVT;G?FoOoL5DTA2G
z8fo>14C@}7@GV-)?GeYVq8i-wuWd%TWu~#eRsF1qP7CEZUNC4cczs(*fz8M-^}qr3
zG>#`R&)HeGG}^w~v+&xK>9r}#8U!bVxah7mJp9>Ew&5uAl(*tq33_*(mo77Ya^Q}0
z<>4s{qwEY_Lq7fM>o=@q<vGCjg1u+)m-PmP2d=aj{(V_1tHv$CzU({8vTw8F4{tP^
zer3&vJiSaI*NfMrLR5v%tX42Sqpc8pX7hrWOIL)HJukjxGMHvkY_oggu@<M&5*F!O
WD^eU^n^^*V%HZkh=d#Wzp$Pz!!FzZB

diff --git a/xabber/src/main/res/drawable-hdpi/ic_help_circle_grey600_24dp.png b/xabber/src/main/res/drawable-hdpi/ic_help_circle_grey600_24dp.png
deleted file mode 100644
index 60db1bc9ad6f1571ccf2333ff13f93068df8dc9a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1078
zcmV-61j+k}P)<h;3K|Lk000e1NJLTq001Na001Ni1^@s6;Q*MJ00006VoOIv00000
z008+zyMF)x010qNS#tmY07w7;07w8v$!k6U000Sga6xAP001Na001Nacn2Gg000BQ
zNkl<ZSi|j@PiP!f9LK-EnVrz=g0UB4DV8N_J*gDRhB}A#;K55#(eckk4_-WIo6UA#
zQ=vFwo6tAeChbAUU7>VUBK06`4iU_zco8l2;GZF+2Z@3h$Ru@lGCvQU4VmfA+nH@E
zDE*#>_ulXK`@G+q_nY?yxUc`1D64^GS^Ch>(19Qbo(Et8coe{cVfSAEeg&|gY1$Y4
z{rwHwwu5^DR4$kM4a0bcnU4W@D5cp75jm|^>!Ycusg1h^B!qaGnQH*{WX))(Wg<E%
zrJTJZAltSz&+|S6a3U?dLQF)bq?GRi;G{vi3bs@#T>$X50_JZ3a{w*@xC&quz#{;1
z36no)n&#d{qw#s>3{|Vu(*WK}G$gv%Y&J)xr>B40-aaxiva7GJZ<?83QB3xf<2WZ%
z168ZlmjKk0`ibbgl=7$|AcPR-nE6OTHv_O7$N8))kZs#LJkR?nOnoO^TUuJ$SFhJM
zw`Jro05qG;OYMwVmZcYq#qR(-nc!!+P$)cM+xE@vjaqz^=XpmIFd(8@8%79GG7RH7
zGtV&djA0npg%BkGsMqV8L{w8GanJht`n&PQ2#{r2I)G8tQnXsFx%P7q1XBQZZtLC|
zw%s<i<GL|dY}<}7M0P`1fd^Gia=F}_LWs@K;r<Roo@ze~3=I6?d7jGM;Ks(rGXTEn
z2owat3+S%X%!y?LMD%_8d2MZNH<7x0g)z5)BI#o011W%1S|_5dB`2a+yBWk|Mu3Ru
z@jHOI3E)L3<+lJZIy$-+w<^3+@tE;lHqax?CT`W0%K$JoHdfSi{R)5wQrJdfYAFoT
z$aWm(O8_XB%e#Hwzk(h=#Bre29(?@i`+mFLP%fAIgoqx?U>}JYf2n`YN<&1K+h?6h
zrLrHu!7TRinDLi-F)I)=FK;>1v{DZfio}f6Ax+a}gCMA6^jQ)@91r0RWd+hSZ8j0e
zb=}2cvA6<YFoVxSy?}&Taa}i(p~#YjAI-BpI`2hi+aKzVKmbrE6wU*<k-_OzW<JBr
zX8?Si!R|&FE27(uu=DftzG<4v04$_CM}IsyIeDVdXv~?W`7nTIQ`j(ox5mfEuf;n$
z7RK--H<4ksSvAq=w1_SlAR)wsE@xu^m?xsIfURBjoN6!;U6fM3hJ>3(PGQUWeExOM
z^L~N)8kBaIF@TADK7SI5YtX-WQLIQQKkYV9PvdQ2Vd2N&;o%uw*H-~N4WN(`<aZ+a
w!1w((YPH%AX$<b^&j#0Z7vpv2zW#Um2MzRc`=M?_%m4rY07*qoM6N<$f{29go&W#<

diff --git a/xabber/src/main/res/drawable-hdpi/ic_list_white_24dp.png b/xabber/src/main/res/drawable-hdpi/ic_list_white_24dp.png
deleted file mode 100644
index 436113d27b472386af5a349a7160e30306ca41fd..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 207
zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k0wldT1B8K;Lb6AYF9SoB8UsT^3j@P1pisjL
z28L1t28LG&3=CE?7#PG0=Ijcz0ZK3>dAqwX{BQ3+vmeOgEbxddW?<k3n!+v2$S`Y;
z1W?f3)5S5w<9PC)^A55HEV3@FaBRM;z^;&zV8PI0U}ng$NbcwYwzevTn;c6LbCMWb
wY;$=Q&ARTEoNICoNGv&aYlY)twu$@<3co`brMM)%1C3<xboFyt=akR{05jt_l>h($

diff --git a/xabber/src/main/res/drawable-hdpi/ic_search_white_24dp.png b/xabber/src/main/res/drawable-hdpi/ic_search_white_24dp.png
deleted file mode 100644
index a2fc5b2e7087e77c8bebb3999d0504cecb97b611..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 504
zcmV<U0SEqxP)<h;3K|Lk000e1NJLTq001Na001Ni1ONa4O9@aD0000WV@Og>004R>
z004l5008;`004mK004C`008P>0026e000+ooVrmw00002VoOIv0RM-N%)bBt010qN
zS#tmY3ljhU3ljkVnw%H_00D4GL_t(Y$L-d!N<vW>0ALM4Cu@#qXmRlgLR{L~>lLCQ
zaB9g>aBm2j9D9K>m(X_zTHJy_ni?D=q_4qKS>4;cSKI2G<#PD%$A5m#J^#(g{m#t&
zJ!svYV@-#)6&8hd^u72Pk6OxEp^}cM@t~dsD!B<SP7R!D>9`Lo6T9i5w`?wKzOUu&
z8-cM(I%p>_C*Q(03_(8~)DPK21y((SS~9fm1=G1reV*swEE(DZgV^Nj;5HdL2B)!5
zITSn*YJyfQR0zi+5jq5&SZE83lA&#IFCP<n0D8$#!6Vp@+1MR8N^_1{A^DAnz&3cY
zmIhk&0EVhxvT27i-$?td)lI;&b9H3}TMoje7+OhxjqDnW9>Y-VV%m$X627_l@uXoT
zJYPps(TUcaxivO5(sL9_+zV7Uipp}qmwuwM^@^hFKwW*MvbLR~ZZws>gMCn!^VA~E
uu;?mK&1F07j9NOQ8P#02M*qJx3(r?D#L7`^-AZZz0000<MNUMnLSTYH{LkkA

diff --git a/xabber/src/main/res/drawable-hdpi/ic_stat_play_circle_fill.png b/xabber/src/main/res/drawable-hdpi/ic_stat_play_circle_fill.png
deleted file mode 100644
index a06750572355517942639f30734f92a8823aba1e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 697
zcmV;q0!ICbP)<h;3K|Lk000e1NJLTq001Na001Ni1^@s6;Q*MJ0007jNkl<ZSVzs6
zJxEqj7{|RKN$JpHAB))FV6_D`*kD58CNvm`9}$@vwK_NiIcP*qMQBEtf`dWOnxGCf
zG&DCf^lm~e4yg#i+wU*u%JIJUde8B_)w%HJy`1};=l$L1Jm)#*+^8n7D+-LK#v7<y
zE}!8guAwWa1vR5aRF5{%PgFwR&_}c!MbWzJi#r1WassC}P#?OCjye3vHa4Hp0(uA7
zMqZy>AVBJH(uMAzHgr7CY0C30+CHII=sjRNSw0Q~GQ)G9&i9ZaRPCh*y+F^ihA|Te
zn2U6rKpm*IS`w@OZ|+yn7*Jo5ep7)=WacowULZ)))dw1GB_mY<WOC*q#-jyCCJCfS
zJwfAkPNe~LV>DAx&g2DHIW+{(Qf#;n$V_cLRGs-(*D`<99hZb8&}|+*L#|W%4YsZ5
zQWf+n2@e2zEgyS8CXp9uYxi)j;r)sxQD+r7w?^L{CAbaLPvbOlslYL_Lj9JPIYq;W
z(MgXNicM9~hw(LU1HGhi(9_v2koo|nTBRr{S{FS1$b1%GcWt0m&*74jJ)jr>FhNbB
zbDmIZ0A00#zT=?T(@7eTe4a<WXaJpd^jQMvtPS*wj@m-_Topi8q>gZZ6Fo*v4o)`#
zYOsOI4xN%FnLsjR_>S_U#rY9x$ny_SWCLk)<ywDY-$h1f3!M6(bEwE!_S7VH-YD76
zD`r`6b*P9+J<KbsYWrTPm0G8XaMm(2O?_AUIr^z07r)vYAZ_Hs*$)}0aCVFaNawI{
z_S6PS39kJ3|EG?4z6NzJv!E2IFix%(R5)jQyW9rz^&`0kWPBge#$H<&9cg}`68gK}
fhkO^O!`lA=G2jn0rsYCj00000NkvXXu0mjf^WHeS

diff --git a/xabber/src/main/res/drawable-hdpi/ic_status_available_18dp.png b/xabber/src/main/res/drawable-hdpi/ic_status_available_18dp.png
deleted file mode 100644
index e49d570f9eb5d5669c6b5293eb831449ce78c457..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 848
zcmV-W1F!svP)<h;3K|Lk000e1NJLTq000{R000{Z1^@s6jnwp20009QNkl<ZNK0d6
zpd(<Uqg@OnS@!?`e+i)D)PYz4h<^d`V<5iC$jJDc7)KMd3}}G}(4g$!|9(f_et$>(
z;ipFoUw(gKU}a)q5aSYKP!m-BBEl)M3#euq(9*s5EX8RV&=Qbb@`qm^I@aIbD7^2{
z0frAhKVX=}#K^>;Ev&^5sN&CHDq*q(<S?M6kFZ&a)iR((OhCm`PrW#kG3opihL1l#
z5)(=cHqurM+4`9;c-VNnfEJ!d*M!Tm-klG27fri3gW=!*e?(aXQ>4Hr&(LDi^p>BE
z&lYImb!5#LmH~a`cje914K+vW8UOzOOOiz}#rmRp3=NjG=UA9ntbi8&go&eA2DFIv
z=bxXK@(vVgJp1yTEQ?^8(sYv<e3g9)fR;_fWm)Ks2fJ2Hy)d03i$IzM*##J8xlDh|
z!OEcsv=AIb=ssIsb)+`p@|!CZTLv<q)TD^PPR14#cSkTR`~K_ugQ)Fs^1wVr70X=Z
zof+~BbE<%rwWC-Dj4u{ohW(kdFCUcbsRA^F)ET<%I_3c_OGdYh=hpjMpNkKcQ^g{X
zA)st9*=fQGpk<NhmN7s1{N!im-dtvC*`_I^!O&&bJ_l%7Dn^|B`upov^tO1_?|;5i
z#Xe}9RRAsP#FiT8Hl1iqI{o4dRV*tuDP(YvvBRDkfr-TP(38X4y3h1cY#Bd0Kf`Qb
zKI3HN#F@{S{`~uMy69l3(fyAPD6%j`H<7_#*$;OK0x})wJC~d9Z|$r&Tn)0AEDND!
z<5^(YXpOUMgqaMqux;1FJ(Zwhi_}tIiC>YS*{b0UA3M0zzk%#pTvZH6eEQL6$I>UC
zpT_X@_gA8PXfI>OkZF+qjGKiERG(c$*F>nM&UyL$RqM(dt9TDRIl}PsFTA#Zo5Kh!
zUbRKE7(!Ho7>vb@HUT9-HT4s0t|O)mA`8@5^7;4Yh%2wJiaq=cY=ivz!obGN#vsWp
z$)F>m^%F?%2CA6|v}6yyARuTNQapl67A+vw0AhY126+>dWX}UF`9e%M6KxqWh7nRj
aSIYp9aWgA_dSTrF0000<MNUMnLSTZ2(U+b8

diff --git a/xabber/src/main/res/drawable-hdpi/ic_status_away_18dp.png b/xabber/src/main/res/drawable-hdpi/ic_status_away_18dp.png
deleted file mode 100644
index f5773b652fad95b2a2928a75b2371d30d982b83a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 892
zcmV-?1B3jDP)<h;3K|Lk000e1NJLTq000{R000{Z1^@s6jnwp20009+Nkl<ZNK3tz
zT}TvB6oAj2+0pO^ZCfh~TYRY1ph!u}A~EVgO?`+2rHE3pz#c++Nc$zo3M%j+d$Fuu
zGJ8<U%KXXxAW}>1hf+%xHzchUHx=ET*?T*)DY!d3yCaGN=Vk6W=ezfud(OE87Vskr
z$bwnH7-P$Eb0(B<6bFh0rJE2UYT2}37y=CFs1T?lmkob1F<TEXhYf%W01~_sh<^PT
z35sk$opOXW`+};%5F)STv&r9=Xm{ljYOVn`X;u0n9B>f{z?t%ZTai)+KnfAs?+xk|
zh9C}=uhW5+BhJ<mV0JGMFW$JQG|+84{|f@b(h=C<siFqEO8csdr1rA_%;{!B!ejBD
z2+a1~Ys5&n354x;tPr5zhQO~gl@u^MRTdj+trcG$AV4LBLm~4Oz{DVkP1&mH;g%(V
zF1g|ZaKaV@+NTxWU<eXGn*1m>WW}&ivsY(YV6q_}cMAA5`;Q^4ObwPze^gaV?PpYX
ztrbQV89+#HvVag2jX+l}JWqB{Y}uECVVpBecA!hT2HdI)Id^ZAFvqyrQJZMQnwl3F
z7rh5`iKQh7yXXePeCe=Y?P7g~eC_82MhtNv?6`jmVfmi05N7Qf^>xc+16R&~0qwo(
zbwh0UGti-Tt~C;dWsv%)3SqgPFrNMGvx`qtd4DG(L2`@q{yDoV!P)7G8W2M~o~)_@
zVTY7CbJ}|xHJet0G_LB5=+|Li6x8=KF$8S<r)zyGXD1MLSqWq8ru4cXj}E->bvVsy
zy3JRBGiIsWM#j=;f87)5ZINb&s)~Vn2-ww(br!5zXB@VuHnDMcJRA8oCm_F}7<kh`
z^$sF?#}e4dtewxq=X(*XX(lQ*HPsv6V{W&q_Qq)|1eVgi2gOqRX{6Ixolu?%Ldxww
z5V%;*m0Nh!MvVOb2DQ{5mfB7Nh@+Z-oG}yU*|`DGh061+%hSl;q&|w*_=59Gc__6!
z29PF{P(rYt5`d2_04_55Au7m|`v2Yc__Vx1qR{3zh$A_4uyrZ3_2N?p-ynP-kWeF#
zhy*(cF*c%38A6(Tg}^UtMjqwPvKA!<B@9I#ie{7!gp6s4vu2nUXZ~~+6!s5*zFsTD
S#t0e!0000<MNUMnLSTZnW|G?g

diff --git a/xabber/src/main/res/drawable-hdpi/ic_status_chat_18dp.png b/xabber/src/main/res/drawable-hdpi/ic_status_chat_18dp.png
deleted file mode 100644
index cd17e6bab4975a9a3b957d5ef6ca5c7fe737c27c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1074
zcmV-21kL-2P)<h;3K|Lk000e1NJLTq000{R000{Z1^@s6jnwp2000B|Nkl<ZNK3tz
zX=qee6vzK>X0pv>W=vB}RICQ0PQ^k=11{rM>j#%2RZtWvirOluAXTf4C`#QyaKVaV
zlzwU}SVU~0E>WXZqA{sTV~oZm8e=fVWwz$MnR&1O`{L-V&cqLSaCwiroZr3Y{Lej4
zLN`8AH?q(rn5Jp@+}seh9&8HRBeuJeB>7X>bW#`rAJWiLz&{6p2SX5~ea*`*6JX$w
zsn7#M?rC=XMCiG9K@-9V5n~IXzS<7?k6b9_;CCEb1_B*G=2Rf9=#<zPp%3Fh<H87{
z1?-2vY6-jtc@kGDUINlb0Om!lkStROtd3rk2(}Ay*>~`ja=w}xC^XCX5nx@{4#_r#
zz&qiKV_-bhGz9LPfO`waf?WfJW}Ai)xTcE!9YvrV>W+XBlm<<{1=m^!)YkU{g;ts8
z0U4845Vj`~Y$oJ$$KX300n#+!eED5GZh3(T;~ePQM<^dC|N9;qo7yqPS%`xELbPFz
z!4BAVKZ2B5K%nlT=#%{d_m8s?sEJs2``^bnbo7$mm!D_Hy490W-_VBL`#Y6xvu0xR
zhOZz+2gS0Sq8TM(cR3cO{?~|?-}YxtMZo^K-Hg(o_4(-4(~9+Lrs7`xQ|vuZruSuA
zGO%^y^jKKNc&c-831QnJV2qcE2`j_(y^wvB8#SE0P)j$y#24co=+`$#AHQ&^4h>Du
zFxEK;0}FaaFQYyNQz)B`5VkNHmW{xDH{9!E7rk$fNCVrBUkRHN4KpIx!jr8u`g{s%
zYM-FEh#u|YqpBLNRMcbi$imRc4iolGY|J#JjxieqtwR^Y*RzMioR!`sTt#JrK7V*|
z0j00UY%O6s;=r_0cy=y;zZ&%q+E8`#A!bhhEM-{xb1#mcsKTQ8qhT;mnwDi$qcedT
zHElAKD}TbfPY0YXtAT-fp7{C4NrBH_c=6luO3a#3jNA__Oez~-7kQSIFwdw&^*UT7
zMF=*%QCu^V`O8V4poiTY0}TdMT&rxvE#~4ZdLbw0^_;A^tOQdM-yp&gQ(z)h`4`-q
z2oC7Rh2$?@u7fb#JKqj#b|w^m08d(7aC<s1)X`gyk?uP2bl#0O_~A@=H-@%N;8w`z
zf9Sln-ro9(5<pAqD|oyz(oII><=J4jWksIWIDnv%XOOHSR<+@SiAs#<KLDj-F?@%3
zTwl_d=@ZhORNsOYNM=#bZbmOkR;iakZQFv5->p!t68ffEgxR49y;4tOrT+9J2SlZA
zj<>s1{z3Y2;VNhzaY6S&kaqNckTm{-@c$>xA@hBP9eW5l`z{wGg@wh@$nT+SJO)@l
sAdcC{R!xW}6+fp8OT}2SIo%5TAJFG`E2~#lg8%>k07*qoM6N<$g1JimJ^%m!

diff --git a/xabber/src/main/res/drawable-hdpi/ic_status_connection_18dp.png b/xabber/src/main/res/drawable-hdpi/ic_status_connection_18dp.png
deleted file mode 100644
index 3441b1d612d1fa26f89deeb438457873db384ab8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1067
zcmV+`1l0S9P)<h;3K|Lk000e1NJLTq000{R000{Z1^@s6jnwp2000B>Nkl<ZNK3tz
zdrTBp6vn?@D#+Txio{nd29$!2YGQmO*v7=v#z$>6jRnMN0D(nNpt2%D)0D&qiK2@N
zN>R|r(m-lyqqU`&SjDIirD{}sk*yLRRilW2rD^DQrcPXzU3T;jZt`Vk&i(HF-I;Ul
zoz<Zao30O8cqLd@SJzN3E`%~toz!jWs!pf-N6Vt!!U*u^L`hWS3y|Zy&lsqt3J5*g
z8`LF?5b2AhHc^ALtel=hvM@q#IrBS(5u~SiCuPzIvA5mh&0GQ-9LKtXZK3hY*8r(Q
z9`WJ>0<YN5(F4Y(`h<omO4nq&1;2qt7=3*-aT~ASK=7y_c<AND;2af3;NR-tZZLxS
zvEu?2`mC)DCUX`xWUWEK+ru@%EJY>o^74dfS(NHeCCuUqwul`S(z$K-9t;~Y1mO!l
z)&vq$dq)SNSDCRfdkum{21rP@Mj(Oz%8lcbl`|I6(eWHHsb=ikk%uQOPchj4|6*)u
zZAGcI5*IFCfx%$Fyje3bd*%$K@6qGO@G}}wee47pE?&agRf*~%C3m&XU^WIvo~%2I
zx^sUZ%@m8A%@(X)5yw1uAbxcwuH9_v_N2+N%dlk8LX>@9g^<ysFkwsxq7qY3QCt8*
z#Ji5a8@s`nuQwQwWa<x8{(yl-UuETy2`gdUm5-_;)yT~+?D0ws-u-dNT7u)J>R`Lw
ztmJEXS_U>{XTX1upZNC@Cj0f}Yb5MV-nUAyXulP~L4lYNHVsjx6qFZjha|uJ;Ez3E
z5-8hcQC@e=@mgf8Ohj6C4&Tah1iYgZ)^~)->C+A7@#4umtekX!w>LhW^AW=1l2BG?
z!NJ47Ag{2v2h7v69}ZhfapH6xn(y32{L;mUNik#dH(5#!*@_8^bC$Df3<lRXoJY;?
zwa83OQgRlv_;dLB_^{H_l?m<J((uo)BKiyDe_MjEsgp52^j*bQzI(fBTT583GuR#m
zV>&xKu_Q4Sr8~CZ?)|?I7%&2QZq)k^9-?6HepX{64199QX~e?$O5aV}pGvtOIeHA&
zn`}slk5*wWt8oq;KZ~od^Z@#Mc_BJdww|`u*50lZM_$fX+@phKP_O$;&Y5~@lI*pF
z^mQ;NC*VDnvzGRC?pBNq8O?)WzG`=Uf{24v`5}LPrSwwDEl*o9aoiX!EYzN<$NST!
zsNS=@nC|jyR9ysa;B}@Zf^*YDh9y^x_T8>NF%p*@obVdJI~*h5v-6H)-F>N(Ibc2Y
zmPY7L^vRdH*_mI<e~=Lzm`+7dN{Kl%IpTh!EQHkbwkWqSyFAJXGnNXad?|t0s0Kph
lPmkNC8Rm8-4Te62{RhYcS1V8y%Hse4002ovPDHLkV1ir;2$}!@

diff --git a/xabber/src/main/res/drawable-hdpi/ic_status_dnd_18dp.png b/xabber/src/main/res/drawable-hdpi/ic_status_dnd_18dp.png
deleted file mode 100644
index f0914eef58d3f014ab1e3ddfef3af2de62dd96b8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 897
zcmV-{1AhF8P)<h;3K|Lk000e1NJLTq000{R000{Z1^@s6jnwp20009>Nkl<ZNK3tz
zODvpG6oAh^V@l{?m`tb?)p$nKG!l=dSahKsL?WUVLp+*FbkQ^xN{~tPCAzR^B~lF=
z8Z2mvjJ63$7ZO?>v{hn4J<?)OW`;43zvqf+=IQ@c<0fbG|L2_V-gC}9=TdNri#kOX
z91BL%v>$FR9K{=DA7v5cJ4I1?Hk)RIAwY<Z%1rzFd77!IaP7<t7`C^8;_<*WAOQF=
zG3qmZeuJp<9HH-zf;xpEg#0VkudO{^X>0Rc>*)c#N@eGZ;&6Z;7YFAG3qg>Q@&+iX
z452?9K^?*n#6jg}n?pmTb5&KK-`HRiCGbs4gAkeQr;DfO4Frzc8aabKUG3_+r<BQn
zHX2!h%u4QIVGz~Ys^SR*R}uKl(%24$r^?(O9qsvAR7BAR!?8eSWv_$;h-_~Dgn3Ou
zpw9f=3Wgw_X>V^rk(Cv(x3KU}AhS_$WhMAarFRk5=nR(gtFyCHSzCJ|5HaQng&>y8
z7rE~47Z7-m3)_=*e96zhiD5i3j5r8wXaJ!^LUQ-P4rb73=Eo8fgYZuM7nmqJ8!pz>
zRU+(>6%6y`qMe=9DKaxj+5cTG0s-*FVn(=0tA*bqBUXC+*jR|}=y-{+Vq4f*^~A)^
zWNxmNfmeJyDP=|&DX4M0XO@dxgG;@=uMn1J3*+u8mAcOo3D?r#j7S86)Ko^8VP^+a
z0|VA4!-zz;x4%HxExVi<b-J0cq@+-zM#JcwjlyBhDiHR>Q8l(qmzEZ74iB^O#i$cn
zUk}2J49C@oMRI+;udjc$yqwVylLF7j2gHMei(C&6r}vD5EoyW!C+D(edYZ}Kk^h4$
zD!{*>z<CED)_A&WYK1~RC6#h$J*$~$2R-bKAF(%HaoQWrRtS8!+TDGhv@P0XI@Sq2
zA|oNHrDYxOC&`snc$|$G^1VqVm*1YNt_CBPHJc?&Plu42niVdePv)7z)`n?P-_b2E
zKUivN;;;AjgK2lyo=H*QiIX~@qy)T^lV76(nbb>;Hpk`-avlxK4O?5JL5r}Z9lSv}
zuCCw~6huHex4^)+sMCm$cSl8l5oVD`(pjQVB2c_g$WWX|8AphkO_*83*f?X-IaSyn
X2<t^F+IaM}00000NkvXXu0mjfPKKVp

diff --git a/xabber/src/main/res/drawable-hdpi/ic_status_unavailable_18dp.png b/xabber/src/main/res/drawable-hdpi/ic_status_unavailable_18dp.png
deleted file mode 100644
index f70c4809c749b435004bb90cb72af3b4812a5e6d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 820
zcmV-41Izr0P)<h;3K|Lk000e1NJLTq000{R000{Z1^@s6jnwp20008}Nkl<ZNK3tz
zT}V@57{{M8mmj#%WFt}-b7D-p5Epn;P7t~&a3C^hUZ%5fU9<?SuI5EwV9LOnNadYH
zqC`Z{$8Mw>jit+rRTo3%$RW#{jp=c^^?yY}&(3jYZ1}<h<2}#&{N8uZCr8J)xMO5d
zUa(9ia~hX3K{Svp$O_~a$8jk+m(B?TKnFw4?d@%QBoZ-2qftsGlcZECsj8}q^m=_l
zqtSeV&ND!LM?ocFfUs{p@p$~v?Ch-8@Ap$8k;t+I0M*siQCnLZH8wWBXBWd>SPUu(
z14seor@>(G`qb2vC`8OyQ&SUlb#+B6Dk?4mxFFP#f<2j^pT9LTGehZgT8=yZ>r_`)
zQ(s@--^$8L3xL6chqGXKl{FL!y&WGP=kf*Z8?LXfr{3P)?+S(DJb?WE{vjAZCsL`@
zkCBm)hFC0?*NcS8R;!g-TU&1e=8=Ng=H}+!Oixc21Y(EPYBdcE46KxvmKp)vVSB=t
zy&4-EyMn*5U>Gyd-Q7*i&CSerU$bC5&o8^(ZUb_vD6p267P8rF_W*l%2nK&Ck+A&m
z@GuMeqAY{KKu)LgC15>5m?|6&$45s;ivnUsSQ@xouGfIsg|L#fwKaZdXsD!EwA$KQ
z>hJG=4wxg$X9)Y>gM))-;Jc#m_I!2+u*YK2_+nyW;ws8iQDAnvoy=ylcr+qNE-fxD
zewdt`EEuLzsdn?MtgK8j&lD(8-#i}Axz*Lxf`A<z9b~asq$>!sj@Mm8RDSe&y^5Wk
z-Nes(?bSv<YU2gT+PH5Ozz3-McUjrO@4R3&H8tdLIAVKM|L4KOQZ0t<dzY4$uCac$
zxw$C|h+v@3&dxvO<>joO1%!ukb?O`I>+AP@KA$=e2+-CR8#@j!)~Ss~Bel1;lgVUy
zhp((tN5pO?X9m&Z;BCwutU#Y)Gswoq#_kNF)9Khqz-zVI&(QGz^5v+%ASdjAA6aEN
y3u%Cygs{wChAaS*J)DS8Wy54SEr-&v!u|pC5i=`(4H{Me0000<MNUMnLSTaLQi#9+

diff --git a/xabber/src/main/res/drawable-hdpi/ic_status_xa_18dp.png b/xabber/src/main/res/drawable-hdpi/ic_status_xa_18dp.png
deleted file mode 100644
index 023e369af6bb08c5a8cb78886c39fa18fa5abd01..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 930
zcmV;T16}-yP)<h;3K|Lk000e1NJLTq000{R000{Z1^@s6jnwp2000ANNkl<ZNK3tz
zdq|T}6u{3nosZn+vmxmyvE>vsv(iiqLJjK=i|nCE1es)5p=Mb9VI(aRw30~u!-7gt
zq(VxA)FR51d}~EI$$U&*KEgI%d$@JJm9W?6K1;lC*vIZU=XdWt=bm#3Sj9oCA`6xU
z(`YoVxHvBq2NVU$5K0e05K20WHVZ?53pz@ctJHBF{W7oa;Tf2kRe_Zy19;BX5a_{~
zUgv0CgE|EWeZ3Tv5{3|RE@51%xLHsucCKjr0r+j?i@_iugl`XLBHba<-?<8nk`X#+
z3ThIDAO<SmtLd6dN_p4=6Ea$-1kqd9Lf-LB68kll`w-Y}2&97LmAoHKyI9%_3u=v?
zjW3S{$^{MdjLeukF&}q3c$&I-(wWT+L*Q3kB_kN_D!M^5Re9)k7okF@hNB~A2S}zA
z5S86V8J;kKBb2B3wJ{mQP6Wyq74={UV$LblUAwbd1bt(3CY{lNk%q#f8zC{=Ed^ou
zRItO3-i=nImxw4=O&7-HSiwhO(2$+Ag$Du`NQZ_yD?5<e8H>mG-!Rfa(J5~@7{n!G
zS8oKHo>%n?QXAIeomvstu~1jIbHeKi!m{;X7%xk_u<~8kTFA6t5!iN54pe7sd4RA4
zLl~>=yHpmHZFD{Kz+}ucn54yThD|5XfDAtL{0W1Pn;pEpx~&{xafUF9UdgOHG_%>l
z+|IB(QK}Txi6OJ%n|40P(;lia0*VoqXcRNKazP|WYv51MYm>+12-v{Z)<voznUcfc
z#JqO;Z_F+sEXN3jal0RX_w&ixPm@b+j`mz(f;YqjQ)DB;_C9MGdzn<MS7m5B*Hv_3
zGoeWsJjAl0zGn=jTGPDedRyQZ@$^4I7LBrwctTQyJ9Pyi6>)bFt$os0`*S-O3YBqf
zq_cuBfdiDC_iM%2hEmqXMMns{QCcs#eBrSO)MTD7V~}0pNvi*Z6H8n5yLC;eS`7Jr
z;fvPs)2WX{Ae~du!o>t}At#<c!m-u%vra=JbDjDurm^r=^#HrFc^qaH##e$s4<UR9
zI2Xl(a9^kA2p~JP*wpIiyg_(qnErD{8QUoO#a(=Z*f1I3!L=oy1akbXMV)+v)Gc)c
zW??#UBrA&#iU7qPg=~ubDD4QLmAbTHw1Q?vX;opr0WGm~E97DJi2wiq07*qoM6N<$
Ef_S~BtN;K2

diff --git a/xabber/src/main/res/drawable-mdpi/ic_account_box_outline_white_24dp.png b/xabber/src/main/res/drawable-mdpi/ic_account_box_outline_white_24dp.png
deleted file mode 100644
index a362b9995979eb9397e61dd18cd955f6a57ff150..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 301
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`GjY)RhkE<hRxemd{22U45`9+AaB
z+5?Q;PG;MI1j`B>(}6TtKSPDj(q%x-4o?@y5Rc<;r)=bHHV|<+AIP>~iNaF$gf5RM
zkxG+OSe7Mm`}9v?jgt~TAt?5YTa{IP=Yel`|Ch(RSp_mJV0QbK%(83gGH)&x&)$va
zPg<5o7c(>{HtPR-df|*WH-p@V-K(D}G5tDf@H?pPo6{Sc*87L-YuNq^1`18RfBOGf
zYlf@`tUL#-*D1ccx{R+uY=-gwd6F5reD5Z$I#a3oGV#=h50VjuzWdZYdyl$ai75Rr
iMTF;(V%D4+ef$f5gip}gzAhE$2L?}9KbLh*2~7a3m27|j

diff --git a/xabber/src/main/res/drawable-mdpi/ic_account_multiple_white_24dp.png b/xabber/src/main/res/drawable-mdpi/ic_account_multiple_white_24dp.png
deleted file mode 100644
index 6d8473bc8a3f1a13c120697dd68e55e636db49c0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 292
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`GjY)RhkE<hRxemd{22U45`9+AaB
z+5?Q;PG;MI1j`B>(}6TtKSPDj(q%x-dQTU}5Rc<;CvW6E<iO*a+ae^P5N#0Rme8$X
z9njL(xrtG-;n@TYxn5;ghj%=eL^UcW&HlY@|ChDGk&$W+j9U&|UB$|^{+(e)#qy7@
z<eDEIZaTQy|K^jv>T?g~RCvEU+3`v4XFa3V0yaGd{yS@`s#iB=U8?VSdHLwlrxG5*
zYqoE>8SEp^YjyllxYcaiBPCmxDJbpM7v8)2mE4W46Ulz^yg#0%t&*A>9(wlQ<Z!VA
Z!U{g~9(i5eu?y&Q22WQ%mvv4FO#m3bZ0rC4

diff --git a/xabber/src/main/res/drawable-mdpi/ic_account_remove_white_24dp.png b/xabber/src/main/res/drawable-mdpi/ic_account_remove_white_24dp.png
deleted file mode 100644
index 35e94095f2864da388830695a3fb1e3dc403dcd9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 353
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`GjY)RhkE<hRxemd{22U45`9+AaB
z+5?Q;PG;MI1j`B>(}6TtKSPDj(q%x-8&4O<5Rc<;C-3%S3KVg@{!u<ntE07!fmPVf
zG25>A2V-ug?$Rp)!dk*Y6DK8IyyNM{Yq7qqW$K(q`@WsCv=(0%Bl9Xk_v-tQrB-rY
zHB0jTo(_}cO$?}-^=bd{)>+rD?Tq@fYqNFo25WV@(EV4Y&RQC^bni<6wo0LpTHn-L
ztIMxuyF{K{B6R*&Tg_#)CmlB!gcBIw1nV|<TD>-3bk2l#CwHK+W<!6+k2SlP@{}K`
zu6^I={(x}@^QxKo4do9cE4n(iZ@YW;%F?rut2QrtRQ&aV)1F5Q&drusW8D$Hraq<M
l(1AEccbC=m1y7AEnS2);m2*vVx(xI;gQu&X%Q~loCIGl)iVXk&

diff --git a/xabber/src/main/res/drawable-mdpi/ic_alert_white_24dp.png b/xabber/src/main/res/drawable-mdpi/ic_alert_white_24dp.png
deleted file mode 100644
index f36c06f3446fadcd0e807f6069cbacb96d91afd9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 343
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`GjY)RhkE<hRxemd{22U45`9+AaB
z+5?Q;PG;MI1j`B>(}6TtKSPDj(q%x-BTpB{5Rc<eudJPT$U(;8W2+<&n`rm3AO_I@
z2Hp#dzuKHK8kklzFm1@t;c8A~t4lv|Cr;tM<Hxi`n|{ZAy6@@qL(Aa!pWsi7edn`3
zbRIY*zk1zMPQAbfO-oK6IHo;&-IL%u_gUV}*f#b1hUw?!_L?=e7K!;jb)J(HT%!N1
zC2{frtKTau86&Pw?Jry_xFab>eM7DJn<j>w)u+-cLM-m+@Si#Lq*g}iL@?hAan@<B
zyS?3}Y&tW!zu=uh!7+_k>HX*YITn6kpT_%if=%pyGrxjt!{0jQK93HpbFMtK?o;{4
byMLJMn3TkJG8{4k`j)}d)z4*}Q$iB}R!fE+

diff --git a/xabber/src/main/res/drawable-mdpi/ic_attachment_grey600_24dp.png b/xabber/src/main/res/drawable-mdpi/ic_attachment_grey600_24dp.png
deleted file mode 100644
index 40ed600b18cfe01762959365df63142ebaf85a57..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 441
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`GjY)RhkE<hRxemd{22U45`9+AaB
z+5?Q;PG;MI1j`B>(}6TtKSPDj(q#+`j4qxojv*e$-%eiZ#~di&c0Ptnu2rFN8IyN`
zhRK6WQHgsAr?;J!-m?9ql#UHUXadI`#x534CaD#U!Ho%4GxQ>7Exl`|==kM?wfTMX
z{RYX$_Pe*que$nbRq;EC8;sK$cg~4=e_-pXu*Vj4XH7T`7f5F?vpzU<Cax%5YZFHZ
zgXqN4_qEd-1sDQFL_@#IRD@mKYtbjKp6f2+>KnS(c(a7Ye}jOl95ej8ufP5}wQhes
zTMi@le$MStx{MhnQvO?`*5;;7RSEO>ds}qk>5^y6A9)`fIb)~3HseOZ$um|j7tGAH
zdhWOPySrs{NYGWIg2|~L)Rc}cJa~83%{qxTTfvvTLgt$%tx|L5+r+c(%o_!crmahS
z&+R<yI6EtC+kuQr*|+}s8HL6LhQ4n+w<UVY(H+(m1?Osegg@RhFP1z|GJVdPmpzj8
ahsB?1%rA&hPWcTCTn0~9KbLh*2~7aow5>J(

diff --git a/xabber/src/main/res/drawable-mdpi/ic_avatar_2.png b/xabber/src/main/res/drawable-mdpi/ic_avatar_2.png
deleted file mode 100644
index 3a867c65974afc12fcf90ccb9b2d261b53a96c44..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 855
zcmV-d1E~CoP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm0009XNkl<ZXhZFo
zTZoNO6vyW?F3q@&d5|a__Yxz_gOW?U@Zj<wp5(=o%L5Xcym)XMjge*~<;k1jLCFL1
zAVpG2iKtPcP)51tcKjCmjQw%W`S!Q>s_E4JYW1D-t+m(x|6hCUefIg1x*ETd8s}dZ
z1q}2I#u<n+5Lf|~7Ah8tGvM()Ns^aYe25)H%tB&sX2rVrwFFEDY(JznW`QDLGcklF
zXR=~l{3-$j2x6VwE?~E@d6>+~DC{%Vi`~Vf`aReR1pIIzm=&WbU@l;nu#wp4GQeMr
zkkgPqo<+>nuOh&-#R)(g9e|6(bYnXaBBFw>U;&Wd2ZMtiEUqwS4I;jIjO`y1BmnX&
z$#fZ$JktAHv8z~f1yY-MJ`3Az{2d6`H6Q{YKN#Rg*c3zHG4~_bNo;rpQin|ZdgGUc
z+=7UQz9PJ500FB2l|>tRbt6D#&g%*h&;{ZaFVys)UIa|`%@ZQvI-tvZfvs_}D>WkG
zi%+hU0NP?INeWdG3D^U`UK2Z$&l7z>{~7b0?@|m|Qwy+RRdRmBcL)5RrI>yJ5L(T{
zi&%XIsdxD2oAwFXK@3hGgqp#>#`on81vzIQS!@C48NALRfrJS0@#gM0q+(bfo)+x6
zV<M@3L+MA*7H}BH9>*kWiCd&7U;?@1B-`YG{|xez%C*o49v;978A)#8@4(u%1eg|D
zOg`C8hg89rgJC=I_x}^%pga{q&mPkhkQYA+h%@lFXMS&^v4!$hAhu9!p+6M}IgQr*
z?|}Tf+M9Rnl!<@EE;P<JPsj|k0xHLfp}yc|Tqgo{_~!5yAb{*dv$@G1dpW;s!|Y0)
z;`<9jtc`nvMN(!@&h}5R9{YTsS4fZm8w@dWz?x${YlYZ7BlIozF_v#EzBhTvmWz)9
zN>zz7;Mq@_Ep!78OD!JL=<}y$4anQ+g7L|##3p>7JUOR^X$n|EW_c+fi?s`a+pYH6
zz~{4=Y`Jatj%tvX9BKkgrG=op<B>NPsf#rt+h{$$4_f5a1!xj;&80d6uArK6QGjMO
heR9Pa@Tr>Sm|v{A4nW=k2iyPv002ovPDHLkV1iomj6VPX

diff --git a/xabber/src/main/res/drawable-mdpi/ic_avatar_3.png b/xabber/src/main/res/drawable-mdpi/ic_avatar_3.png
deleted file mode 100644
index 15a77758666bfe5899a65ff76313756e6a7018b2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1076
zcmV-41k3x0P)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm000B~Nkl<ZXhZFp
zTZm0j7{})rW-_KRnoRCQgWScV%P0{~F6ELuNGKttJfNIWqfjD|OG#3qj3Sbk!MjVY
zGjbWXCdvJNJ%0ab?P<?(=InLW-Y!SytAFe4y}$LX|9`Fht+n<#vAis|SeEn8%L(|~
zBbXb3|84{li9|a@C1SDIw?82+@>d7};~_p00o$@wKt9AzB4BEe0K~Szrx4$dLB6d$
zk9-8w5X81qoB=;Td+-|6LA23N1iwvO*K%LJP8O*E2z7$RO0W=gPr<03dxyX-Fb(vD
z{5mJ*rcz`AAU~Oy2SK?7p%?f_%oqe{l$<RR0g#^ogCn3Vcmqy>IUp#06$0YU>@6Ay
zj1Bn;oGyb7#`y&0Oz;qN4Gh5RhKT(ZekomodMGe10%~xYp5*wP>#|lVf9C!Ou+h|e
zOId-4r-6;7a0n#;^4*B}2xvOAwFHhz+<9P-sZ{Nn%+>-RtK=MRdT$`*G0*_kfT2M5
z3T#y*`PCyp^)t4V0?c$c(U8?}3+ipZed1y+(EEN3)PXNRuZ{!_Gi478RvMKOM7*=`
zZQ=5Z0LXX2;}Wn*z&-daNorK@zXV-1<r7M^)6XYtFu#kF>h(r|5<eqLC15cTL@b>>
z=HYJB%d;$6)Lehhh?1}yK)tP*YlsoH2mvoGVzqEdC14yL=aT{{QFZT}Ktp%+oY4{y
zFA+0sTmJ9Cb#R=R+Ez3faZ4zA8T9o1RvzxeS5tM9wUz_3c{Ud4RT5$KUJIj<LT;!R
zwRnZKeFWGma-csbO%w1H&&s?N+<F#DAwY?(1uP0%K@hFxl@`IYjud;}8({>@Cy@3&
zQP>26YycYdAlm}@)t*xr0eWYf0|m7j@Vqn6M**$sML_$h27?E_-?t&JoN2Z&0!|ZU
zN=V|W-Uz9tHHN&>)LOu`cB@tvMu27}n?)*!$XN($EAC`Y0?bNn-Ae(?wjyAa6MHJT
z3Q)3LaBVcH-U0+1aE;|EU?~l1&W^%HBjBQIAXfo9XmFWpqrQ6I`K?Xd2iI7x0^&5d
z-nCI*Jxz-P!o+bE(2+(DgGoT=K(1DU0By&e%}IdQ8nclW9c|{c_pb)pif3YR1XN{G
zA=x*S0DmyVT;W<@Y@X?SNMC6BxX}rP&P@HL(>NvY&3{!u^X!5+tr<G>@+{7eqmaK9
zhP>+j&Jjo_pd9kg!jjJk2*`n~8-ZE`Rr*Bfu<DMk$$|S6eay43l%-)7FMr2HnFIP`
zL;HCptG-*8dkrB#pQt)M)U33YXPcvV|0B%-)6*hY1VMebwlGBKe}a6Mv!8TgBO8IJ
udNk8GIRTmWSk(Tx5s11+GmV$^Bk&VyCoVv*SdGB|0000<MNUMnLSTZoA?mjP

diff --git a/xabber/src/main/res/drawable-mdpi/ic_avatar_4.png b/xabber/src/main/res/drawable-mdpi/ic_avatar_4.png
deleted file mode 100644
index 7c22a6bdab9223d47a78be224728a60d552c806c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1053
zcmV+&1mgRNP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm000BzNkl<ZXhZFo
zNoW*76oxZmG~ymt3}Q5>pm9TR561N*21Epxix`)i;=!my5K$0==+*5Yh<NazkzB+D
zMMQByBM}#j8*Wj-4HdWe{ZbP;otdO-sxXO8!B6*0y?*ci>%Ho#>R3iAZ?RU+KO-%m
zxigr~z<-s2+S=L<u~_VjPtkv^gdjfz;>8G9*J1=fN&}D;WmK`<itPz(FSjHC-63-b
z%nyoyY-j!(4tj%M;29{xW~NW_^5tAYke!O3<zOjTVD2Y#Z5tx{ncqjj4un+s65=dC
zL`-=s<F;=EVn47^Ic-5mZ3O#9O`HWlei{+VL8m6joTtAh7-sDDB4A~+3V{4z2wVkS
zA`lse%^0vJV7mel`yxD>)Wj(R2sndhWuOL30GiN~l0^H+|LsA$K>u6r2O>g!DYcXZ
zKz<?-FPf-dxt4;}puZ&(tqlh(pQ$r<5wH_4Yf}uY$@>^onyje|*PBe<;Cd50h%(7t
z1e_&EVFUs1vAJa+!XmDg3r2v4U^WP^5g&}exS(?gx*v|`B0!|_0}l0iycZyPn|qa3
zS3`89xenkOjC+aSSzvS%gYlF8d5F*(udcZW*o7B4m5^6J3zzmg8dZ_i>r%v;YM(?5
zl$mGSH1a?>0*aCfU}6rUQ?)H(PeORg@0xgBVyl#w7_!<jxU@X{R^zh=P6~il_d?@4
zC`hZgV%D{K8Nk6|dKNaqL?xjb-VI)WV=k-%&lZJCLw)ecHiD*beW$_2P8^a7I8M*p
z2&7c+<H5BEwoyz<A+{}wVb~^|0hL7s2rf2>{A!1(vUvoW+CoI(bp!#8Wj?8o29uby
z^}|||FgF3>wXUsk3ATEJC=;%&3V*>jT4aA#Zy_BCHR1$&tqA<qKBhQwwB&~0jo)v!
zzN`d<og+Y72Tf=nZ4?8eh0dzE3Ybo`(^e6a8!twH-hx)mRe<J%7BL@fI|4S?I&u<V
z=D|y@eQX0Ku&+SC99us=1e_x14BNm7?5h!wXY0p@0PTs^*al8ue+2<LwOKVE0(6+)
zZxywn@m>B}f&iThteOu28nskDR&C-ro#-kd{>F-Rz}SZXZKJOPZKK0Yhn@=}3AE^S
z3mD`;{CTRx<Igz@kRui}5nBW{f}8-U0!T`LY;^GN)glGNNkLLIJT@)BqOQD@(7%*{
zlZcrW7{Gkyz@HDfl-C_DLrtHKtl9MG%Y#$%odJE7)~QZML4EsN708Yb?gxRk<eTZ!
z2VUpqRe%}kOs*Xvs55N6Mi%syBGctlV%Vp50nS5e=^!n@a=^Tsr!(MvNG%<<`V9OA
XFU>eWx+Wxz00000NkvXXu0mjf>T}Sq

diff --git a/xabber/src/main/res/drawable-mdpi/ic_avatar_5.png b/xabber/src/main/res/drawable-mdpi/ic_avatar_5.png
deleted file mode 100644
index ba1d54fc6848fe466a5bc6034b413f72f9d98b04..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 936
zcmV;Z16TZsP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm000ATNkl<ZXhZFo
zTZm3k7>55pC8w0Qpd4~67vsjUsbNwg!-b+ogpwww5@IkVB;!UD%20+}8r(Q!#KZ+R
zLn&%5OgZEn%GHc9zvtEd$C_=QX745awN}0Dz1RBI_r330-&%XGozInc$(K0)oD=ZB
zXVA@nn}LiYU@e6Tg+gUMpKnRR2ipnQbz%Q1iG7rfO#!t8YJ=3(I8q3>hRsH7-^JO+
zwc8XhfM7SkVlW8I1Y<#e@C`f%Pr*`92KhsA<dU>o6QE#>>=7=@z$DNwfWSxUIzR;i
zUM3+JXJbVG#0L}TELa&A&};w7bps-r655BF1qy(Wraec1&bR>BDqWgEd7Q1Uy})w~
zF(f>;5N9Apo!I|0jsFsWVHpPZ#2?gw27f2h0ruy4Ugy>A=lThp4q>E4TLl`yG|&a+
z;{Rco0{m-j?e?Jl<=B5H+6M_ZN8@_KVJr7r==8`R1m|<8GlO5?S?RGYgpd}q+75tm
zp3M`k)A6qv=~eK*go+bD+itPcVtX`7KqHN7eZIPR)<~=K=VBWHE^)sqglu1`=i&Fh
z;a7x@1MOJ;Qitu~C;{63?t&o!oxf1G4=Am=5g;+c`@%HDwjO_beCeW`_m}rn%)<6{
zr~ozKXbhKnpj{<sp(|~wft9TgKYFok1}$K60P!ExodO3TuN3Vmk=v-3<C@CZ0ZtcE
zr$zXC$I4jV(7yr%E&l7&?|^t)P>k6303u|gJl9KVwC6-4qL-Bx_Na{H)x7~|J@u>u
z?w^6}5WgMeKUP4ov$x;x<hc@@#PJpC-r5p?zZ(2)!ruyT8JwX`GaOkG3kdRJTR<Gy
zR4EkY)Cu@AI@*?N+zj+}1Y8Qa6bk-KNSsM7g<J}`6e_fn1>+Mhns7sXTWw9_C+oM6
zPDXpv1UCBUgKa(n9;ES;Re<{IKhRV#0+?rEo!*Xlq^59PV-S47y^g3N-wgT3X~?Tj
zCIMzpwp5Wc4;}3gn<yLF7IC?0*x#XTL0ZygKPR9#8g2$s=9A478VLs-F^fK1$@3ZB
z8qiMx^T${dZOc<~?$ynj0FS5+{=2|;Pz}jjUcKU61gnAm?NnvidH%^FHrB#W?mHl;
z-{`#x>tvY3B{{4oogJ$)kTj@GJ14;AXr}SyW+2U|+3ZvDGw=(_`bR*}5L?s$0000<
KMNUMnLSTY9NW2RG

diff --git a/xabber/src/main/res/drawable-mdpi/ic_avatar_muc.png b/xabber/src/main/res/drawable-mdpi/ic_avatar_muc.png
deleted file mode 100644
index b5a7bfbb6dad7f53dafc63dd72e258cc2d66f866..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1337
zcmV-91;+Y`P)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm000F5Nkl<ZXhZFp
zd+6O`9LIMscN3dy6Lu+Wi<vc-hDNSwq7`;&Vlpy`xs>}Y5gN*->>roOG74peh~&0J
zlPo0n4GY_H+4%juUZ>}K`gVLT&-w0q(og59ci;1UF7MCh{XEb2^IT42&;U=30q*~x
zo`C;)1bZVeAV#3Szkhoi?Qb+1e`YyM`C#$~Q~q0wAnNZ(z0K6$oWr*r`4l()DC3Ko
zLKqwd(FG9Rkz??3@|RNnO_@Q<;oFzT+0?%`hwmEl7gPRY8DEruV00eOAz&gn&>jL`
zf_K1Q7`wB~Sh^e$S2=3naIn9+z!zX8*Z|-CF?>-1Fg6XcMPO(S>96F^!|0<iM&X-9
zy$8UqIrZ0(KNr5I%J@nJVC)=79tR(UUYgKG`XTSmWk<$o_HdC=_|B)?I`*_9a7bJI
z_j%W^@n9x=ON#gk1%$c(IRs9f*FYaQu8r_@-u<{w0Di=yG5TGWQTX;D|1;o6{4&@U
z9Me|!)$l%r=Xx-z=vycga47`$74<+y+0_`lD@VYU<Y$%@*tiV7Tp!8=To3W-9ST^E
z!RvAa+(Q1T9r8T~-_3b#{w086HndF#w}MUJ%m{-EF!EwVy;c?M9M8-Ah&E4C$8Y5Z
zumn4X>{iMW@HeGffscSrT~T7>Tgpd3ya}hq@cg)_eo}|$*3|nH7?O+9Jrte<#(_Tg
zZC5D3cx=*<7a|0-A`ec@p#B<+yprV+<)g`;mMn<8-^lw-5du!3&KT>tJl84U3CL!^
z*%XaKk}n3Uz_Gvu%F%R%eiMuWmn2(`5S0widlrar1iB)?sdEs{Y)m=tbhAfy%5li`
z!iaLMQ!cbSil?E|keZdcBEYym1t;E0EYh0``8^l>0$gFUBHYj9?*^8GskCoy=4e|K
zUTYWdJvPt9_==SCGx?otBaY;^;nIaIoxbMfQ1AnATHOYRVOjxxn2y5H8AH&qfDMrB
z4BiEAfOHfxLLGr&w*k!*=DpEmWXQ5t4SQKBUFNDi94<#io*j5R2HL~60u(k0Y^44!
zY2vIfdNLKx01pAzgS3D}5L}cd!0=e!4Y^g)S@11w>x@TucSMt<0QX`}&u6Ib^lPQE
zmDt5BSyi1nBO&<R);PWg4|k1*H@DhV(lV!F!o}~ta5(w|vJru>HPx~VlnL0IMhn1R
zU<d{d3(gxV&jW7*WB*H4yr+#T@rj{#-{UzsEQrhay*pS7+zYMA<1gJ#Ck;IlK-Aoy
z^V=wtguT=F{d`3MvuXDrNW$*H*jVK#BoV5NH(EfN2m^kM+l0KSJfAHylvAz%zctU?
zrtvuL`64>?1khEz5$H{!=r1Nz{6Boe#%0$A5BYAJ-Eve(MxoomaNw5w0HV-Woe))x
zLX$Bv2YBFd0rKXeN>YIPs0+agoG-jW$udw$K$?i@v>)#s^;)XEhoO$0PTSvN0g@rY
zr9bBIpSHc47q<>SRT;XZO)Ua~2=^}D+9mrUPio1A%)I0V&RwN94eQ*zZHe=?txZ4>
z;bt#6D|kWcjh-W9UUMTznohoF=~_}xK)M_0X^)Iv&YITK)6Lsw@{Lqp{+j$>;K^FL
zzY9~ye^xx`D`X*#UK|8?n|3$wCSwx$9*$~BwN9bntOxXAIO$=emBLN8qtd)isVmhk
vpf1N^d3pk3d#YRYdLz)So{i-l@FVaK1a#s+fe;>X00000NkvXXu0mjfi581x

diff --git a/xabber/src/main/res/drawable-mdpi/ic_chat_white_24dp.png b/xabber/src/main/res/drawable-mdpi/ic_chat_white_24dp.png
deleted file mode 100644
index 6dffe16101c5b3be5576f5641231bf270d706322..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 230
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`GjYdu{YLp;2bQx+H|EZO*zr-1w4
z|NrmVx8#TkbO&d=^j`3<#LewkuR`$z-3qoR-a#1_KEJ&eunN5p`@_m*5O|V_Z2@b-
zapm6)`@{~!IIQV!DEuKGsp}|z;SN($Y@het1HTh~unShLa_r~sdfXtx{ZBF7CTfY&
zlpdoSx(A|e1fFKM=*~{zp4G5&!MsZePWrxyVgY9ha>N3z7L;&HtrXSKIBI5kNOHcU
dNq#5;!;Q~{k_#VSzX^0WgQu&X%Q~loCIBs*SP1|C

diff --git a/xabber/src/main/res/drawable-mdpi/ic_edit_white_24dp.png b/xabber/src/main/res/drawable-mdpi/ic_edit_white_24dp.png
deleted file mode 100644
index 8c7ec3c17cf425cf71e956d806ab46dc241c9d4f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 248
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`GjY)RhkE<hRxemd{22U45`9+AaB
z+5?Q;PG;MI1j`B>(}6TtKSPDj(q%wSv!{z=h{y4_mkha>3`N);el3#f-x%l2;=iEv
z`JHPKKX0<cgatok6)am7V%$HU=df4)1cQfNzFTVg+s(IM;PA8C=@M%<?R%x*j74dc
zk2Z9qyiqcr@7{OuQ)NodT-DGg1;@87-;+7*|Fq}vCuaYzw6Em+GI_d#eWj{^`hTGl
f9*Li(O6gBN!nBK9aNilAa~M2b{an^LB{Ts5ZkJaq

diff --git a/xabber/src/main/res/drawable-mdpi/ic_help_circle_grey600_24dp.png b/xabber/src/main/res/drawable-mdpi/ic_help_circle_grey600_24dp.png
deleted file mode 100644
index b42e7a26c0771e151ae761fc15748ce038fadbe0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 639
zcmV-_0)YLAP)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv00006VoOIv00000
z008+zyMF)x010qNS#tmY07w7;07w8v$!k6U000Sga6xAP000;O000;Ocub|H0006C
zNkl<ZNXOMxF^kh+7=GS1O0jSOw*!v^?iMEzob(^KcokZ3b1H&Up<ml`3J8kd7w9IM
z!O6+OwdZi)e^8E_Tr4z1a1$~VikIYdForZulb+{t&-C%WPoC%do+R%FTy{`V)3U6q
z^ZEP%fChlu0CwV*2jB~Uqk6r5WLeg)a~t$}y@yd0y&|H$qD?UKHvm1`w#OS8G@H$;
zVHhuoNSrebIh)O%jYgv|U94nTYs5VOEh5??qAdWexVCg?(==Zco}k<9Hi+mj!}%Tr
z!L8wN_%mJXbUN2HO*;i}V@Z&xA*GzG7_{5%E4r?K1+bejXep&eLWuhS-o&*hN~vQZ
zL=(V=41enT{!Pbm&Xyw5b$vfa9E-)`Q@nhOKVQ*KyiWJh*p0PT-obtj8MRu?7ea70
z3IM29t99gK)qsfZU^9e7^b`OzO?#9_NNXhq%)GsUI5YEODdoq0zkipAp06QouNZ6s
zB6?@r_WQwLuop$qF@S4j&!i*zQAQ4eKmtG*hOYtW1sh4U(h+?wGw?ib8ZYma<d|rs
zBbt;Mn5G%TUsPE%iB@9Z`~C#L6c@)d)><}j9OsOg3kRH1ij-1?Bc7SX-@iB;5p3HY
zGqd{FtuwRAj%_VVa$WbpFbw34>p1_l;;!o+Wb6Os!l_g$eJSN(UjHIj<_Umt*_C<u
Z@f%#5&xcC7ehdHr002ovPDHLkV1lTh6Wss+

diff --git a/xabber/src/main/res/drawable-mdpi/ic_list_white_24dp.png b/xabber/src/main/res/drawable-mdpi/ic_list_white_24dp.png
deleted file mode 100644
index 5e51ed478015d17122802eaa9cb257f1d72e7ebd..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 171
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM0wlfaz7_*1g=CK)Uj~LMH3o);76yi2K%s^g
z3=E|P3=FRl7#OT(FffQ0%-I!a1C(G&@^*J&_}|`tW<QX}S>O=~G=W<fgc%uT%>kLM
z?CIhdVsSe8&v^%_1evQ2O>6>3IhGc#TIz9lg}hsryxSBuhNjmljNi}8f=p!aboFyt
I=akR{0J5VjMgRZ+

diff --git a/xabber/src/main/res/drawable-mdpi/ic_search_white_24dp.png b/xabber/src/main/res/drawable-mdpi/ic_search_white_24dp.png
deleted file mode 100644
index dff1e3a8a4abf2916b71ed6e3c88f7370c629fbd..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 346
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM0wlfaz7_*1g=CK)Uj~LMH3o);76yi2K%s^g
z3=E|P3=FRl7#OT(FffQ0%-I!a1C(G&@^*J&_}|`tW<QX}S>O=~G=W<fgc%uT%>kKx
z$<xI##NzbcEB0N797Nb3ESRV4cz!{SvPOlr>-&j^;{Fsb>76#~R)pq#vC~dQ28EX`
zg8%)PA$hNQvd6BsPYx$MT=FHzYSw;c=IFCirMEQdzMB?gJ98>mrHoF2`8ro&(KN$?
zLq;6eEsi*JnsBu5ICg-0ufm(hH_M#FT9of3J?ID($lK80XsI<h>dVu{%sqUTTG`IE
z%F_IAZfVbDpL*}1(7rV<)A`oT%lo!WNPN!hC40?{(?z~=?ahAfb5Z5J`h)2;|0n+E
m@m=+TO(=7^cI_YGAB>{YCan_sd1o=ucMP7celF{r5}E*-^@JJ#

diff --git a/xabber/src/main/res/drawable-mdpi/ic_stat_play_circle_fill.png b/xabber/src/main/res/drawable-mdpi/ic_stat_play_circle_fill.png
deleted file mode 100644
index 8602f750e3c1573a9a48b642bf99141bea05f6e5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 431
zcmV;g0Z{&lP)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv0004YNkl<ZNK3ty
zJ4*yH5XViUSXo$HA?l%xa9_a62cqaVIPtm@ds`oskJ?uy*qz{KP=wRU+R8@pQTY+H
zS%0%kBzNv+HwSUyPav6@UuH6!n7+uL@x@P)q{{jlnnhEnqV}JRPv{O^8e?Ab;$#8{
zJdVQ#s-ua5Bwtv+Lg#?qx^4de2tJ8X3rz=B?*aP;kZ0Gg1E9e#v?PJ?Q*$X<(}ny3
zv@DWp=+3)0BAL`}xm>^j3tPQxJHzJ?z_!e%0PU7r&w)O&b}#9p!4jL0gI|#DvVa{X
z_B@Vl))vtUI`VA94Y3Pg-vX{RKpvxw@w{eRV?0B11)1F7vt$A97?1igumFXOFm9rC
zG?e4_fzOx)d|}jI7N8LET}3BoIK%fFz`(x&qL(Q2kWVQ|dgz|7<B-d?=`sP2duh`u
zPVs&;?TUC;g#zRah<Dj3MBaip*R}12s1J?<iT7l>eXZAcgSi=$_2|nL-U@#73x1%W
Z<sa26rWw!QEpz|?002ovPDHLkV1j92#tZ-e

diff --git a/xabber/src/main/res/drawable-mdpi/ic_status_available_18dp.png b/xabber/src/main/res/drawable-mdpi/ic_status_available_18dp.png
deleted file mode 100644
index 891544550be46d020481835a1128c93f3ca2eadb..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 554
zcmV+_0@eMAP)<h;3K|Lk000e1NJLTq000sI000sQ1^@s6R?d!B0005;Nkl<ZI8S3_
zpb}ujXU_ls|G9zk%0SEt#E%&n8DHU2kJTWc0d`NmJgGYK;+*rN&yQLD{QJWo#wE(2
zEv$9TP|RQ|(6CuRL;oNfieeDZ0LGtxezq^Uv8-(K-K~s&|Nq5s0MIaoO#O@#@_e%X
z$Sy=N=;z;`^=&6R8_vEwhd1Q-+4&fntm-c)@he#a4f_UC3^xeq8lB}gR$f?kV+AuY
z;V;i8$Ixfj-OkR+UWH=NryrkYCGSp8{r=}WG3J2P<Qryxc9D0H1iI=g+(n0;9DdYw
zx>uHHQ-BK1Bup7<Evh_$2JHYF1oRf``a2tc&bzVzZ*oAlM3P&QVV3K(T%bWyU<R>l
zxU=c!+$-~$NO6%Ak0irPmuWdbgQmh=aO~OfJHQwNB|f5onS=?@Yt<e=gLc9V`ugYF
z<dmK1IiG)hCfcAJgY3`l3TS~13@6pKx7S}?aCH$VI}ikNys`|v_Fe6qtemLP57PPj
z@9(PClO3&RUY;e8Ao&@Zt?JJ!@+*Q8BsjfbWD#IG>Y9IbQOS-6J3+CDVW5tPHbb_4
z#xWUQnE;?6uVD&sWm@+;AMVzjesRX~;ipI7JSWL5!Jsc@aLZWCU?Na6{!EK*J<vsB
sKruBS28G*wpbH-0@-s;Z5MRIn0M?|y6W<vRvj6}907*qoM6N<$f)SVmkN^Mx

diff --git a/xabber/src/main/res/drawable-mdpi/ic_status_away_18dp.png b/xabber/src/main/res/drawable-mdpi/ic_status_away_18dp.png
deleted file mode 100644
index 09f84ff1f123bbeb83964ebb425e0672d080b54f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 605
zcmV-j0;2tiP)<h;3K|Lk000e1NJLTq000sI000sQ1^@s6R?d!B0006cNkl<ZI8S3_
zpb}ujXU_ls|G9zk%0SEt#E%&n8DHU2kJTWc0e1gC-L3lf{E+kiPq$eZ{{3NK<dR}w
z6g9oZBw;-jXxJ>Ep?{DKMKK6y03*Yn@9lrDOep(%dod%(0Cd18YQn%`+;D=CU(Fxc
zg{TJo{aOF#NLB;TC2;-BYVi#J9&Kg#|Kkn9Om-m#R{MDu7zMSgfrfnpNx%&Px<=>k
zwJ8_=UY^8^><YGkQw+ZkCNcbfe+9*HjQpw$tS)QY8Cf~2P!0O=Zq~1@PN@vPzoKZs
zWe`Xai)q_uCZ!NbpsT*ZUG(?i)<=Ji7s#TA2|k0Eq?{O7Y-e}^4cY-V2<R==zc=Uo
z{ClATBNp))#K<Gh!0Np_7iiEFm_aOmZ_WoA)Xs#>MGUOK<n;d^T<YKRgA9L;<}fhw
z0uA!oodYyzD#B}zcisU?f)XEUpaK;$FrtJ%1H+$h4FA8qU|^DR1bS_z2hgCMh*<me
zdGfC<PB{#}J`kO0SWH`hfgOe#*uZd7{d;5f)xQ_JLD_*IVB}W;M*kXM^mC&|KRD3;
z{;v9SB(oJ12KWFYhcE++-Q4rg1o<5$9YJFcm_@#J{khmx^6&0SlmLbq%qV6C$|A=Y
z`BVacVe=X;j?HGEH{JigyHfY>`F_j)A8&*694M+8C9H2TN!UyT>cO9B(G3L}C<YW$
r17c9P-3Pkh0WL4&EsqF>IFbSYW<cW;qm=q300000NkvXXu0mjfgdG(S

diff --git a/xabber/src/main/res/drawable-mdpi/ic_status_chat_18dp.png b/xabber/src/main/res/drawable-mdpi/ic_status_chat_18dp.png
deleted file mode 100644
index 6ef14ef42a226093f63b19b06847929e471485c5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 687
zcmV;g0#N;lP)<h;3K|Lk000e1NJLTq000sI000sQ1^@s6R?d!B0007ZNkl<ZI8UvV
z-Ahw(7{|Y7=bSm`+yZ;C%?)EK6q|)a^rDePXhqaTe?ehaRyP&2iwb%%0+ldtyy`+K
zqPh?k^CE(vs312OhFX|z%VuTe+{-zwv(t0V(z&%Ay6Ax)41T|Tp6B^K-{&y+Pr+z$
zWLd7DdnX;9PMBes&!yfM1rcBuq!|y={=LXVILH#9TLo}+Z^66!2{u5`U(2C+AObMR
zh+PoxpMx+=cLXR5t`0CBdkNNlczJ~dp!7w=yDuRf&{mEy1LpGq=xTQoEU7$R0#P*^
zAv_Eq^?>~+{aHI;y3)n4WuAPH6dOS7bO+>=%9)({3a>AS_I(YgbyQ*S-YcxEGU3pH
z##|obi3OCkuBECHxr)T+Atd@JO*S44`SJAGIGT63(7ers>pec`^&Gmd9nFFGCaUV}
zeggSa5Vgfa@QO$cE`j3-5pVp{Xxi*RrOBZFwwTM|a<0ySbk%^R_auRCErK`*kHz%D
zZQa~l0@Z6sOpTz#nE5mhTMbRn(%VU({#<K6U%yAZ$LSpo;$WLw6EqSCQ8Ejxj#j0$
zb^<A0$%ZT?`w%<T8I69#*u*S$w`?d13x&U7nobL82V)0`y{ABISzZreXcVctd^qwQ
z!O;jdx$Ur7SE#@r^GS>Z!Z20nv31KjfUTiwF4OqS^T(eRJ?$YwUR4a4$;cRg7e#b7
zrh?3s1~k-LVKC6zWew^7V@TC6MOGwr1Hzp%5T7XMzuV*LsiosDz}k+GHeVJWlv>(0
zNRt<6X}3cPGwRZ^G-}R00lx7j{aJfy3)9n>71JoHE1!`MRKZlKacX{#G(Avo`5SGa
V<`Xn7>+b*n002ovPDHLkV1h>aJDdOj

diff --git a/xabber/src/main/res/drawable-mdpi/ic_status_connection_18dp.png b/xabber/src/main/res/drawable-mdpi/ic_status_connection_18dp.png
deleted file mode 100644
index 806f3bd57e91cd7c00863953744949e284302fa2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 656
zcmV;B0&o3^P)<h;3K|Lk000e1NJLTq000sI000sQ1^@s6R?d!B00074Nkl<ZI8S3_
zpb}ujXU_ls|G9zk%0SEt#E%&n8DHU2kJTWc0d_zQRY2?v#4JdfuL0Rpfp`|s&_BqA
zq8J1;0K{(x;xZt{=h_oMd4FUVq8n5XRL}r4kO8QOQ0QF%DzFBs`vy`7R}Ivx1LR-0
zb@v|go%;_Nyj&cy8uab^4~9i6*Dz!x#DL`6fd+ws0L7qLKz?dV-(-f0yi5ib7D&*%
zdHasx!>3OSN(%A}Oi)+OUc8*a-pYbOO<D0XP>Ceau&>B2di3zgQ`wVe&NB!L3o_VQ
zm@{nNxrd>5+AM~@|Nb%PYilx0YHMUTc<cm&g{cw4q7`cya#G?!c6kB~+5t8Q=q*t6
z{@j1`IHMpxAH#v8Cm3>55*S=Uq8Yvey#fPuCHV~ZA3kD8iHT&GI&Tp}QDzEADi>(b
z6qrFEfBXd6#>C6R12rffY|zi2zu*Q{7v?ZLc>IJREiQ^-8qlD^46s2tK!c_td+pBC
z=P#7^9XZY*CL+vW1$6$#?YqG?gJMxtNs(b@ZyUqb-TN5a9PAjDuiFR<a1WqCJCO~V
z3^KjBcM?NsPC5ezJ3H7Vz;I)D_x=Nej;1;TD=-2;hR#{C0%({mgS@N^*1%Q;>brXP
z!9&)QXU{W41qWb_{wL3#GwcVtIyNi_d-OvC9h4?ofB*RdwjCSz2aG``CMJ;7c_0QQ
z$nPKywk*;G6fePQ3PSK0kQo3p<TXqPSEh9bDyRcuOEk-F0r?Yw7=NZkcLgwD#eiaJ
qKnzM}_kk{WfXk%>b0z^V!lePSnB)^O%$3vt0000<MNUMnLSTX#QWC@f

diff --git a/xabber/src/main/res/drawable-mdpi/ic_status_dnd_18dp.png b/xabber/src/main/res/drawable-mdpi/ic_status_dnd_18dp.png
deleted file mode 100644
index 449b5c5b0034ada90b6cd733e1a403040bd41bbb..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 590
zcmV-U0<ryxP)<h;3K|Lk000e1NJLTq000sI000sQ1^@s6R?d!B0006NNkl<ZI8S3_
zpb}ujXU_ls|G9zk%0SEt#E%&n8DHU2kJTWc0d_y`-mQ9n<cRaP+qYT%|NhOuE-lT#
zYixW?z}k8$(6CuRL;oNfieeDZ0LDMxzqdb`G^y;xk|m7)|DdP^>*F&vW>BoJKf$G{
z>W}O~6odZ${8@i9C#T`V;lp@Cj#WsAL38%(3*1^-)<DC)ffU0H0=h=$$<(PA9#5IV
zOicI#UBsZfYE?TkCubFkL4V%8n|0RJHTCb;uf&)GR-@d~@>wi6SQ6-}uW%Q=*|zP`
zt)e1XqD=uR6m)cC(3m#O6KK#5ut7j?u|AtW|L4Q5E-;@}M1(;yE)J`iUoKo=c(-pK
zSdK$Zj=^x}&Rn2DQ(y+MJYTTj=Y!5pCXfO)F);?2tSqbseL8iD0qA;&LGtnphC6oT
z01cXo@Y>FucW&k9gAyOnK+wT~L1X%K51>Ii;RgNr`gQU-XXl(hA3hLmkWy3AXYtTb
z)W8OYlj^fMbFMz@?FD5Af`Cg!g+X`a%64XMZq(=p2m0^dRoAn#TR$8+gx4TeVPQ~$
zJkPDE2}+RPL5eZ6$k(r3k9vAaUanfj!0_)MhJk#hrVL8;^~X4sl>>l=yoM>jm1*6-
zT)kTN;lKe)V5SA<IZzDoTUy={u(6p4)QmsVqFWCPH!+}?8YpQ2@qM5R9^mpb-tvfG
ch$ATg0I18$6Rj+-T>t<807*qoM6N<$f`L95;{X5v

diff --git a/xabber/src/main/res/drawable-mdpi/ic_status_unavailable_18dp.png b/xabber/src/main/res/drawable-mdpi/ic_status_unavailable_18dp.png
deleted file mode 100644
index 4c974b6bed6f7e0da0c8a8150b620fed43a4b44d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 541
zcmV+&0^<FNP)<h;3K|Lk000e1NJLTq000sI000sQ1^@s6R?d!B0005xNkl<ZI8UvU
zze@sP7{}i$#X%QQ(vSuX1))_Wf|iDADiQwx(YAAo6CA1~4%?z!oK)~H@CPXlq8K@K
zAf-l7l!MxMWS*w>oao_cUMKXxv)n!J=l#CV^L#P%Pk{+>27`ed{;xwyA>T0!YtF0x
z6$F6oX0z$5R4O}-Mnlr;^^j7jM0&mc(PT0O02T!3_au}D0sz+ObjVaHMHC7Jtl#g?
z2mlze*=%=Ot@dD2ArI8;c2C3M@L9E573`c`E=O*+o6_lYTL5dZ#T*FKY-BPSDxFR*
zi|IcoLO70-GMUWB1JN`c^!xos48w@w3~L+?2W_!fRzcM#r--7cw`erFCYl0;X0sVN
zoz8s#-3&qSENL#6W8(3+;5tlSqEe}l*X#8F=z0v2<nwtZ7K<${qDZY)BZ44s00lS&
zrBdlR5{a<OCptz?+XGOF1GU@jE0QGfR%<v-QDL{+X{*)BZ#MMFn9XJ%lF1}%hd)E3
z(IAh<Gdq6vBv`>03Wd(W8iF8&LV;W^*ZpWAzj%8znjQvwbdg9Tj*G=2JIxuO!C+u5
zatn$Mp*J7nf_bLht<`EL<#KtmUat>5$4<y-G(Lf8FX6DTX{WCTMJw>l1j+X81r)r_
fd-FmIDAc$g0x!T5+An%^00000NkvXXu0mjf_Hpch

diff --git a/xabber/src/main/res/drawable-mdpi/ic_status_xa_18dp.png b/xabber/src/main/res/drawable-mdpi/ic_status_xa_18dp.png
deleted file mode 100644
index c8a5e04dbdc0fabb4d9f188c2b67e7e462a74d47..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 607
zcmV-l0-*hgP)<h;3K|Lk000e1NJLTq000sI000sQ1^@s6R?d!B0006eNkl<ZI8S3_
zpb}ujXU_ls|G9zk%0SEt#E%&n8DHU2kJTWc0d}`ve5=}f`JMBPXJ1)<|NYM(E6l-Q
zsmg!NUQ2K)(6CuRL;oNfieeDZ0LJe>|FpMndRR7R-&4jvKm*W$g(^QoXOzkbO=%u~
zWEY|s^!@kW`ow8h8}?p#2iKqKEX}a-^lOG!pMJr`gn3yRR_5zn(39h_1{(GaBmp-F
z=o+1#Ee|hrZF<0r?1~$GRt(`2FEd<x_!-4<8dBU0yQ+-ZIoX-3Pz-we`PVFys*|Z-
ze*8tzfXg6|qW(Db&(Ss#l0a8|g}Z3|saKEEW?z#<4-<R_x#<ZrEXmRF1RAshY!J{}
ztkZTq`Ps1ME=DZkGe}X4li_5GSuW6^DKLXrX6$+Lvu@R0CTuR^;a~<@hLG8F`5i;z
zjH?VvK!Z-SnB@QsnhJNpmUFM~Bu>8yN_;2)q?nlr)uCU1{$+Uf{wD*}YaT#@cEVMB
z{`P0Gan;G3_g{Y#ooV`F)jr4AN}>ifFq~8;?|6K*dEGrwb|47UfziLS%AlQ_ofS3u
zK{|i_{#%tW{c0;H4DbOFNP;}C3rUdQQPL4K_833^{L|IE=6=bdL(drgVdfA9D>VUz
zu4vU`YLZ+5Kto=`EX0**-GM2&Zr7!EmcUF4&U2usw$~K8<)|$%5vUn|rbYJ-Fx<p|
tVroDP3b*?}7d*h_WxVAP!4OAM002Pu>l0GqOMw6Y002ovPDHLkV1o7q97g~E

diff --git a/xabber/src/main/res/drawable-xhdpi/ic_account_box_outline_white_24dp.png b/xabber/src/main/res/drawable-xhdpi/ic_account_box_outline_white_24dp.png
deleted file mode 100644
index 75bf7d9c25fb95c88ec7ca4b979556ef48b11bbf..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 525
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1|-9oezpTCwj^(N7a$D;Kb?2i11Zh|kH}&m
z?E%JaC$sH9f@KAc=|CE+pW)oQo^S>R#u=V2jv*QM-p(}iJM19fdY@&9gELF0$|U0n
zT#H0PWIBxliUeLPTH>&1kwcSKiHyP)g*i-8UovGnT{fns=dRcNR(kE-n?LWbp6kou
zU}0*!rL<E2rCZRFSDlaU{59#FrnHZJ4}<%>`;XZTj5c5QZC*R&z-y@vb_<qulh`ho
zJrK6|u+~n^XtQ4&bJWa?X%^dgHa*Kvjb68pg?V4*p2oYI#HN+7^*lQ6Zd|?U%FSO}
zXDF{z&fN4cZLY_wClTqZ|F}xbShj`za+LH0lQS0{^K_qy|Dq@-YNBr3yWYuFx<V(T
z&-(u-f#Zc!r(L|XE6_47CGvB7*)8*4^MD9r^-OjPcD;t+2NExi9xi^sTfz3Ok=^*W
z=GDk+S_&(5Uj|*WahBegB6oaC>}PAq30J0?oK~!vJ9Ei8f97QNkKV`h*yfyCu|z*X
z|NHI8r?=01+kTS&UFeC>J)fogLRY*xoh#hCpS_9k{*t+k9rp6&+gBYuDyYi4<n4jE
z?gwXXHF?N>+`1qs?Xz!lr?mh(PeXLVL&qOV=WIQM<bmP%?<ea@W;Z|2S6RP-5ys%@
L>gTe~DWM4f$okkP

diff --git a/xabber/src/main/res/drawable-xhdpi/ic_account_multiple_white_24dp.png b/xabber/src/main/res/drawable-xhdpi/ic_account_multiple_white_24dp.png
deleted file mode 100644
index 82e39c2956c5a9c4894dcbd68e6d7ffbef7af830..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 486
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1|-9oezpTCwj^(N7a$D;Kb?2i11Zh|kH}&m
z?E%JaC$sH9f@KAc=|CE+pW)oQo^S>R#zIdQ$B>MBZ>MkcIvgO<_CMOIyLnOcLJKav
zymR|p(!&c^&gOskOuD4_qav4HWQ*7lPYn@yhm~RG_UytP2Q%{WqNJ+rP6)j#KUdFj
za_>Z*!v;KuR|q<ATQDm<Fx|K4M_l&Bx{M!s21@e<FT_rfm)ghM^K-W0g>|>qCpFYH
zKI8nm>aP}ChYgcU=<iC4e#W#(X54!9h39fZUp~M1p;l;h+j)lXjoHqBA26<Cy59CH
z@yb7AsrD7`-KKE`-e263_{W(`R<(iGvwc#Zimb=2$y>BFZ@x>PB&TZYv1@XP^2=+M
z-~V}^4fdR#`d4Y;YzO`wY|rG_H?~y1`PPu;*Pr}g@tXPKdl=_1Ocq-BdBzb_Y5Om`
zIX-Say6eD(Lk}X`Qp~jW&HJ)t&3wHpA2mb{iM&Xun&1AzbK*gvL+U(6d%vIlr5F0d
z^HSN%?f3fApWpFY^}TJ$cB8r~hG`;klb+1^{f+bc+xb7Tzq)Umbc3NSQKBtzjq!ZG
Xz_t%=ck*rnV}ilc)z4*}Q$iB}WEajI

diff --git a/xabber/src/main/res/drawable-xhdpi/ic_account_remove_white_24dp.png b/xabber/src/main/res/drawable-xhdpi/ic_account_remove_white_24dp.png
deleted file mode 100644
index b32b7fe81008326b44ee73322c907a70b3c86562..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 666
zcmV;L0%iS)P)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00006VoOIv00000
z008+zyMF)x010qNS#tmY07w7;07w8v$!k6U000Sga6xAP001xm001xm&hCs?0006d
zNkl<ZXx{CYy=oL;6o#K;B!#eQB{s2BgrpN}Y-15(o1d+1ybj3)SQy9^#2c{NA|%8{
zu-ky>4TuoXC>FAt$0D=1CNq=C%+8F(Jg~4cobP<^yWh__3mqLD9UUDFpf0Mf)S>z_
z`3#eHi*4)66F#rLR>x*DPGaWU)|)1NU~vZjl?iqG3gRbhx2=03en}mbFfdY=iq3Pb
zMi0+{xf0{%lCk9tsFxZm5c9Nx`NCr_h){dLp4!h5-%nzCIl1puFi>u++EWjw_Tpwr
z%;wbIKFl(qo|M@C6HdyA4|PA~K&?;3tfw5zeKk_@4J#NJ7S(-y@+BfvcYr7SJ$!S(
zu4?kU%fAP64D3XNDY*wg*$O)-Iqt$1nO=#scbhqR8o5TZCf~SZ@{zhxAWwUROkK+`
zF;dqG=BT}usI!m}5x;>|U>i8i2|Z0>R+BN+nAH|Km$R96+8G_<R#5vHLf10R#K@eA
z-L&|b7P7WX%&e7YinJD>2fXF1!oJBc+6P_$&m!VS&JS{zv&#M$cmUi7?f^HFkQ3l5
z@EQ07ya(Pz#Ft90tk6y;x6MoS=nD7$d5)4C&HdR|SJZ<FqO&+qSLzhLpzhTm{5*T=
z!mPzFtH%w9pKz=$PirWB{izRu55SGumN%VWz@v!x2-SL_tro<S%(*prsImgzfLkpX
z0Qepex2qbk?ATcl5dk%~(@oGB=;-L^=;&yZKS=}1eS!D8*#H0l07*qoM6N<$f^h>X
AGynhq

diff --git a/xabber/src/main/res/drawable-xhdpi/ic_alert_white_24dp.png b/xabber/src/main/res/drawable-xhdpi/ic_alert_white_24dp.png
deleted file mode 100644
index c690431c1b7cf62346486a36fa985c15891187dc..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 669
zcmV;O0%HA%P)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00006VoOIv00000
z008+zyMF)x010qNS#tmY07w7;07w8v$!k6U000Sga6xAP001xm001xm&hCs?0006g
zNkl<ZXx{Cay-piJ6ot=NqH*Jj)?Fm0iG-BaPvAcEh&l~QNlSs;Q1b#j08c<2ft1FP
zQb7p~6i|ThmtuCoS@!4d?`)(!lAH0Y=R136XXlKiL4yXhCSU<9LUUAw-vU<AXDc*M
z6$1yn>mW2wS@><>e#5{$upOGKjDb@=>NGT$6@CYJO)>Ba?1bhkf_K0L*}4E+XwEzX
zyA*3TG-nq47`QeVxCX{ejXP@4!w*SQL%(U%w?6`=z@y>r$9e=TW;-)*RsufOS!nJU
zeh#cF7+3@I(C{PRvI2apOQ6Z;u(W~w8t}39L%~mg+Xf8W0+SF1mU&bu{qwZ!8h!>m
zH)!A)n00C3yl7sOGyrhk75u_7u`3vWw&N%7F|jQJrQ>JWHTb)vHs|Ur8pAB}-W(qZ
z|41?|dCobPxE{-Ok{%>|a?agZI+v-ykrlqCCec_XnJR#ff<H?duA{Z2ug<xvqK<_?
z_y~B?A$-hrf+2odpuR~8v1^=1W9KT@AwK%8WJ_9Y=tk0K=iF0PhoTBtW8%j<lTbwi
zh4C}<hw+hbC8<&Xud$3K^(0?~o3t<UDsWsCzG00c7Q3h(6YFjzvXmJ=UCKZs`8B_9
z$ADMz?}qheW7-tj>mj@%roCii@<E%(?|1ro6n-baPkM+Ok`*}YF}xzS!_9`b3g9E%
zFG+p>JLpBy7w6n>>E8-0{{whMjNKjr3>q|OP^SI@>{q5paQlbI00000NkvXXu0mjf
DEr%cU

diff --git a/xabber/src/main/res/drawable-xhdpi/ic_attachment_grey600_24dp.png b/xabber/src/main/res/drawable-xhdpi/ic_attachment_grey600_24dp.png
deleted file mode 100644
index 764c82c3a79b97575349de58ac38843ce2559b42..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 869
zcmV-r1DgDaP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00006VoOIv00000
z008+zyMF)x010qNS#tmY07w7;07w8v$!k6U000Sga6xAP001xm001xm&hCs?0008;
zNkl<ZXx{CYF=$gk7{~wLy;rHcipHTR)s7;#IA{tj4h5URl6ES%7qQ^t3op+~mN&FQ
z`X0$tN+}(j9J+`F7lXthF1AkX<j@ioanhk#3YX8JFB+12jct=u@P5;MFW=q$zq>E@
z-2obnMx)VaG#brmL4WHwJ3AYbQcePx1aKX|RRC58G*tlX0w@R}R<hab_K5=UJg>J>
zsiXj;0bJ;S;KQf_Sh6fD<$2!zkpr-8d%!f!mjG^cS$HD_%d*B*L6}iJT-UwA%<plK
zDmAtNtOy|rQp(*R2rBJX>Nt)igorb<4ImkQzPq=#mk02u(O<a(wr!s^P4gXq+u^5u
z04d9|mORg^c4(DV!DNVNE;J=G-wc9atKLVbI`;JRJgyhd%;UcAFLqNr00coW4`4ks
z4I#vIqfb)`*|vR=nV-~bBC>toFC4N;Ng}cV#BqXC$@hI_HV{#snUes(%wsJBFimp;
z!1>VJ+S%Dzj+)eU-8p8?oOGpIuu<0@Z2VD`LKC$HGq0|#tx46Wj^iY|AigC{J3vG?
zm>B?I7{;5Zj$zu=crB%z$>nmNJD{=t2rst`fSE7XwabX+_rOH-Fqg}H>412I$7yYz
zrUey88?L)Jj+4QkS|F>{>T08pDuuo=^SQ7+h=by#VgtZvxJt{ZRH`j06j8{)%*%~6
zKp6ltZv(gn08+}ar~sHbPeh}kdCxG6ayp%E%gWdOgLM@8`uc2@uPTLJ)fz-JJvB9D
zs5%BguueqtZBZOe6~JQDJqQ4r#0?D%m4y&90D1xR$6~SXrBdmGs&lDSdOJKk{E>(*
z0q6&CrVXMi06qbDA%u9au(0sFSS-pYXJz$sUH2(7KMT!$W*!fMAhH^tCd%}P$K#tq
zhy;KE00t4=9~l|>kw_#qi^U=zZHmqk`5ri}>vY=!0J{62iMq_S;?P2t&*#5dmURa}
v2Eflw2XP$!nMeI`cR-`jXfzs)=6~iFcA^zMdYH-I00000NkvXXu0mjfy6Sp$

diff --git a/xabber/src/main/res/drawable-xhdpi/ic_avatar_2.png b/xabber/src/main/res/drawable-xhdpi/ic_avatar_2.png
deleted file mode 100644
index a49745f294df34dff2a1a0a12f8bef09890fbaf4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1791
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

diff --git a/xabber/src/main/res/drawable-xhdpi/ic_avatar_3.png b/xabber/src/main/res/drawable-xhdpi/ic_avatar_3.png
deleted file mode 100644
index cf3db22c2fdcef49bafc94306d9da511ff34c47f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2394
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

diff --git a/xabber/src/main/res/drawable-xhdpi/ic_avatar_4.png b/xabber/src/main/res/drawable-xhdpi/ic_avatar_4.png
deleted file mode 100644
index 9ac231b722a815a8b468b5e40609fa99bcc663b0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2329
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
bFRZwf>~2e9czEJ|ULF{Q=;dDR#z^@uzF{RZ

diff --git a/xabber/src/main/res/drawable-xhdpi/ic_avatar_5.png b/xabber/src/main/res/drawable-xhdpi/ic_avatar_5.png
deleted file mode 100644
index 06d30ea7c35119aa64c17d318c738f9d08ff0127..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2092
zcmai$`#aMO1IE9bjoEO``7Fo1S|*3bAv7b(p_n<09HWxM79m2lp%QseiVaK6xrS`?
zI1?efk<cm`O4DqT9uHEyy??-ay+7Qa`?@~A-M`&8@gB#d;c9RI0Hj@AoCv==?7xAD
z|K?&zvNZrme0Ozn@JR^~m0zk=^wk);EK1`jbL_ycM~vj(NlpIaJgU#(G(T(Joj{tu
z_a3#xjKY}(llYN}il*2lMMY;@MUfA@6;H!d2XtY1Z-Ues*=00a^T=Kvb>C)p+W7YF
z75+{+d#o+tWz5Ri7YD>hAzh{4$tVgxw-;gpvNNB5+tmWd_nM0_J_I8EpLo*%O}uzf
zCi9L1iA0K2`nNQ<nA)Zx3~-L%KYzpoe$|bcbKfF2@N+p9#hK{~*t|R=xu?@x(f^{L
zApr@O4k1@00!9N_rzvmyR{r!qZ?cC5vthT|;Z5pycOa$EfRBMJ!weZ{1ok341rhlC
zKyx|<3TxnYOiQ0StWDalPafIn=Jxp~$0o<d#6}1`g^@yap`P%tP;rD+G3%GQ4`x#|
zzPtZ+uiq1aQLl{8YLXBUt9ntcHQ+jY&tb0Eq>GU)65D=O?_19XhMrAH$r6DGd#b5i
zU^c8AI<F}1WeZw1o7&@Ll!y3Z_9RkiPx(`I22*ap@K;HP{0PCvQMX)>)-~Apy(Mh~
znFOJvCmo{K#THkA4}EW_o(;%ei+j0#O>tBo(2ok!Uv2%0$OW|HlAibEkV5sz@R`PR
z`&;dHzLlPWW^77FxP8X2K(*F80ELVwSar*n0YX0|8Oh9fCKUX0m}^_ezZA=>?xb%A
zQKNwJj18CmoUIV^3R7LN*Oa-rBEItOs{3K=IJN7jtl){(KB+;n^v~hVVD3OAmFEkv
z%7eHHm8<y3aH~b!%L@kJo*NlVJvdKt)&H^w!>e<)xW5l<!fDmN72i3lMEwT2FCDeC
zYF%OtOM{_wp1E@KpFd}yf%zS;Elg~`N<rh+PaEOxV{f~rmf1CwlH$;vbgatQ^rsH$
zW-%W*Z!w}FGsp{D4)==5c8eHhKC<uzC%D6dGJ~^7THgMq8cIWXxd7eXejZ5^=eSz`
z;Od+wDxpnoD1Q(QRw-{e2EWpd)g#VUr_)8X2pj45+Turo@t%@Pf=sT&ZDMf5{UWnR
zTiu$%^UU=&SezC#(pJ3M0JPEaI)3X2K@~kw`jvN%>OWLa#x6fTCiqiMKK`qxcuPvK
zg0U;&YFb8@ej{*$fREW<7k*76eK1XWGIvq8QkN(}EO0ldA2u&dv6yi}El!(d5B9~F
zvJSSPPWb#7Xld{v#6Pw}m{=@4uFC`qLha8P!x~oIcFsVJO!o*)o4PZ+eyk%~y(Ja{
zoISzp>$GaX*8^ykTkAheBfdVKd(r4SV%t=z&aSE;(49$zVvS?EH;_yvphGS`8hdb&
zdDhA}-p;XFmhQsQ$02XsyS!n(u)%$4JXgA&{(|?>!T<r8zK#2Ed*<e6h;p_#H#Z?f
zpZ+#a%$;RtdZ>kB0`3#_@ruKh!{XUF)-};{T_zv6QPF`<{{T%^dk-x@EDs)wYmX|+
zin0q>AYj>mG(JP2kQm<n>O}@~`{&<f#Cz`LCttAT7X1iTA87k%AeYmg{bvawy4E#D
z11zYT)I=o2@vnyWF*!EWW<J4V6q)4q{U*uuN!JN{)c2jEv-Eb42W9Q$V|4}~N0viy
zVf8ryox`|ar1nc_d)h`jVPHu~1t`>nt!a}dwQ{}ou(Y4!Eph}Ma8?%g+NSptS^uf>
zN2@L!@_(D510q43WtGjezU1^8+AGo2k>oZ^l_L};`C#eH#?AJ?SR;=p1}pONR8Mpc
zF%Xoo^@rb=YInB10jn%}Ar751vExYC4~8frzYRqUg{hT%mfL!xQy7iG;U!q$vYe<x
zr?kFZ^@pwK6ih-~5S&$vHfHx>w-spSbaM>SI44M1L%tUh*XDs9jlfix)iX6|01D?U
z#Wh;Ce@H^MI{ftz#s54w2v{-PM$dqYj<VF7B<BacquP#BCTo+#EJ3p=XiTvrUaf`P
zi=wD|RxO!<+?X@cTu9u<I!+J@7d6!mDh0@Pckhit4D(J}g~|8k)l6Psd4rc1f<&^9
zyanU=>+e7(1J<|GC>O^yhyf>FYkpC<8v?6%?T2>9LWesxI7SyZ2NJZwKB*-)JVBNZ
zp4rfGo{Vje)TuSt@YSaRT&HA3&U!}^qkd*CSY#hFq&8kCxHLwR8=fGK)$-R`&Rdat
z8s-xdaa&t}Y-6NvB(B?1$&b+qM>b%>m!kyNfmDW1P4$3*=7565m2*4G29ishE;rBf
zR+IJh9c7=n(R#Q$Dyg+rUyyk++3FKPs!p9Z$5AMl3GKoibkCT)1|48bn}Ci}T2w0z
zJTV^TUpocfI=zpFqDbOZ#VldOqe&cQJ3LNd0VV1Q9!THK%H9D)(Z}ihQ0KO_ypqTt
zhq0RFJ_&<>$Z7_3%!X=$K9T7{f`{sPd91kQqrz6!Rx53VBhb1t2qdDQPLJF!BZ_gm
zzy9=!^{eiWXF;6S%Kj>u9K#y({OjH?xBZ*ZQ?+cs=7C#qj?=_Q-R&y_ue>B;G=XVt
z#KOBvjq*}SS(Snsc4{J{f4gWjv0%^!gUiNi3M%z3BqF0f^(A{b>14^!rcY_R8xn`@
zsfI@i-nCN9(1FK}%lER;zjw{kK;x?{XbHejT@%io{NEx)X+D%P-gDJ(@d*9*3jkc5
LJ)9aG!!rH@el*qA

diff --git a/xabber/src/main/res/drawable-xhdpi/ic_avatar_muc.png b/xabber/src/main/res/drawable-xhdpi/ic_avatar_muc.png
deleted file mode 100644
index e06aedce786b666ad69b4368146d0a13affb470d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2868
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
SW3=A@0000<MNUMnLSTX=U~+K)

diff --git a/xabber/src/main/res/drawable-xhdpi/ic_chat_white_24dp.png b/xabber/src/main/res/drawable-xhdpi/ic_chat_white_24dp.png
deleted file mode 100644
index 23b1f69afc516964256ae858b501c1c2c3b588dc..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 391
zcmV;20eJq2P)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm0003_Nkl<ZXhZFq
zu?+$-3`H*zB}gy?Vg;yK0EuDfD4=2&8U|nhMqmmkuA?~q6-Zpj#Xbcqj%1`XoR$3N
zA18-}s|x?P!u3}MklVqa15MK`Anb&(#u#T7S!4Yx#?Co+_qF^0K>Qp*H;h?k;r{Xu
ze6jK&LI7t3Zk37u$hiPu^Q|oe(2`D-0@MJQPyjCkjFbXY0O%w=<bVN4x@Qjf8Tfa$
zaf~;yIg=eQ0KzhJ02#1j^xuWuxp`ABGAm*$;>35M;<u1wfpX?fzKJ=DNX8@sq;4VV
zrlsHwz#Jf6m&LabwSe?<P7OqVP)G};<~IN;L(<PncYxK{(p&?q)}mH`C${I3)7;et
zFu1)Q12`fBd+9<QGJmKy+6SOcd<)72P$`}ZpjJEwK(%-ZK)v`FKoR2m01n!Y%4oZN
l$eF7#*8Xac+m+%Scmtn(<uTCRcsKw6002ovPDHLkV1l;Tp=kgB

diff --git a/xabber/src/main/res/drawable-xhdpi/ic_edit_white_24dp.png b/xabber/src/main/res/drawable-xhdpi/ic_edit_white_24dp.png
deleted file mode 100644
index 7c6a745434e309d6fa9e2ba6e756b33dca0943f5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 355
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1|-9oezpTCwj^(N7a$D;Kb?2i11Zh|kH}&m
z?E%JaC$sH9f@KAc=|CE+pW)oQo^T-Nou`XqNXEUlHx6<hG7xG1*i^hCxBTV7)IB>I
zj7!+XU&@)i;@VsBdymP21n)^n_qq4|XW7s1#G%PG`)u0p-;Amk7@03HNoNN0>|@HS
zc{j=R2#Z}m#{#x@XZ-V73Y2nIDW7W;T)X9JbM^wy4v8gi<^D6wJD_N^=yKEd?#==S
z&EEfIw_9Ak9Eel4Q+dSo#^mvHrM{gH)Rk2}hN}FtT@<M|;oxuM{ib^!KK{69``J6y
z_dc}!XWTda*z`8@Kffw2ey{mfF<rHe=Y+UD+mbUY52&-fIH=C@;*dMri^J|LFOIOY
oS*X;X5o3FC>~@aX?W}4>mGsGW%XYmu4D>mJr>mdKI;Vst0E~u?_5c6?

diff --git a/xabber/src/main/res/drawable-xhdpi/ic_help_circle_grey600_24dp.png b/xabber/src/main/res/drawable-xhdpi/ic_help_circle_grey600_24dp.png
deleted file mode 100644
index 7abe2935aa56840a3df1cc77725573803acd62cf..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1316
zcmV+<1>5?GP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00006VoOIv00000
z008+zyMF)x010qNS#tmY07w7;07w8v$!k6U000Sga6xAP001xm001xm&hCs?000E9
zNkl<ZXx{CaUuauZ9LK-Ed$T>{W)$6Ih#l>d?x7+$H!K!9{}BId%on@)XRrq~QreBS
z`P24cc!ppg_qGvdk)Tx{HtNh?EDi^XMko=x2@36l3I=Ay7dx!xR@UU+pASnUO>UBt
z<z^kMALv7W_ji8h`#rhmo^#IyHreF%hTJG3gix~C>|RAt9%JS`0PY3Q4nQlUm;jal
z{0!hSGk@*#`7Q||><u*#iA36M+a4sMmkNR#;R-XKwJd8Y9*_TiQw;=z!5u_&iilnT
zu(g>%0C0_&-?J?1^>{pfwdDrF;qVIp-UhIvN#W)ENksjzSnPaD3<Ls!Ep2UWrvbd?
zvhZ@IG))^4LgZzVRhc9qgjZ3N^8j9Kv3LO3m&@fI^!xpvrc$X~y=0|cLLd;>Vw&a*
zfP<0(76A+?iqgf*K4$hQiqZvOsBle&gQjWD^!4@C9biwrgu-oeNTSm<03({Fz3cFJ
zTm-Nvgg9-QW<P*Q)Svu^IyySu0&u)mQq4IK3Wc60q8S<S%zVHwj4vf}5ekK#AfgKr
zCcw-`48!=O+V!eG(fIiIc4qz@fVW;JM07&e^>Z@f0U(`D|Ju{ja}~e=iQ4;ndwV~a
zo16RB>3Y>$D4);20bsj?o`p;%lPC?0jEwA3RdoWuQ-#n)%d&!#las#{b26DsqO-HJ
zA3#@~`gi5?`BMM}oh~{~;z%UY4&Y^((PZZ7WHM=$wpCU22LOElwiW*RR8{>k7!2+%
z<|UI!i<zfo`T+3i@bK_G(gv7$0Fo=Ls;Xa<wVecTr$g!;ilV$(t8ERos;W95Wk3j_
z05~dH7|eX7Ec9fJ^vCP8tqKtxEofUu#T-~&UEPNUHfGHHcQ_oDO>c%>*=%+%fbU9!
z6^@vBf2$NQbNOTTzDC*;(WB)tr#bLYi}e3RL}R4^+qMrkH~@QO3^X(<lC0Ra?bmhv
zmttUSY^;-r1{x_sM7zslP6qCFTRbyAJuxwHsTdd?9c{BLYZelVWIb(82DZ5<eht90
zhGBeLD&Ds3ivaGwfqE6%>h4CHWJuTbZ;Jm2A-uM2UjXp1TOBwV_{XK%3!0{_+hUle
z`4NCeny6W!&B?$YE*W^gbXy$`ho8aq?L{+GXmc{~lN;(4MOpXEC!%96l&#R_WZ<$J
z2FkYy%)HlyvK87Y3=mPu4Fj=Qto(l6*=$WGZ54YVuh%<on&uK3Kd4$qI2>j-2BL%|
zuh%<Y9(3A`+5pbD+_@W^aXN~0TnC6~3fC8*TZOfPrV1Pl#A2}}0J3jOH-qVdrV6UQ
z6MH<Kllgr9Fy!8gE6{a)-HAsNb7I-!@tmx7vFcVL8jUV9^B^`DW*&@2qst8&006@<
zJ_eA$#*rv!s7l?<+{((zaR9R$Abz&ccTJ>Dr-cw+(=^XP{(Q7qKGQVqh!A46UZT|L
zbSjm~`ThQ6E|=Sh*1d8TNobmOObBsJCi#~7zyaWduIn;qvHv6W3zU*hrx&`ryFUcr
zBccaxq(&KQ%$#86=M2M`Z?y47e&kzX=Cg{Tyi;wFYPo?TjeKS$qVH|n{>rV-teb3d
ayYnBNz_q5x3pY#v0000<MNUMnLSTZ~0bS?-

diff --git a/xabber/src/main/res/drawable-xhdpi/ic_list_white_24dp.png b/xabber/src/main/res/drawable-xhdpi/ic_list_white_24dp.png
deleted file mode 100644
index abefc200a2f96cce00a96519ead18141f21565ab..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 196
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA0wn)(8}a}tg=CK)Uj~LMH3o);76yi2K%s^g
z3=E|}g|8AA7_4S6Fo+k-*%fF5lweBoc6VX;-`;;_Kaj^+;1OBOz`!jG!i)^F=12eq
zZ9H8ZLn02py{st2puody@aw;O^Q?m#cWVZPZ=Ru7eHLg9!w2~Q)$sa#Tp7%1ulO0j
d805siGEr$BjLN58KLm0ZJYD@<);T3K0RRITGqL~x

diff --git a/xabber/src/main/res/drawable-xhdpi/ic_search_white_24dp.png b/xabber/src/main/res/drawable-xhdpi/ic_search_white_24dp.png
deleted file mode 100644
index 043759acd44bd8a77d1032b2cd28674552b16563..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 591
zcmV-V0<iswP)<h;3K|Lk000e1NJLTq001xm001xu1ONa4{R=S+0000WV@Og>004R>
z004l5008;`004mK004C`008P>0026e000+ooVrmw00002VoOIv0RM-N%)bBt010qN
zS#tmY3ljhU3ljkVnw%H_00GBIL_t(o!|j*LY63A7hTW))mxW!s@v^PrLPP|`=TP(|
zT6)p8I=+G%rLQ4Msg9zpbYBD?Kz#;B@b98&jC7ndv00RQW;Nvh^JOw5=NtzdY9Gf5
z@ZSLmG%&;pCQPhgKu7%d0C~K?DkjJs5Afg-cF~4*4B!lJ;KdXHS%8O`ev1wY2*C*#
z!YHD<htT8zyUlq=^4n+%GdkXq0pzLu8D2|^4+E;niUVHh>b(a|KKd17Q9y$3ebUyJ
zrr!_~12l-O!(CaADC=T?A+Z&>fD%#m#Q-Z}3vmGvqFjgpOk#6#0dAsP%K=<J25jWE
zD9i;!iE=3hFo><l1(b=>5CiDM*5v}8h_WUIh|>d<vbANX?p*Y$m=NO(zJn$|=0r6T
zzl(BoZG!^{KRu3HWMr=EHbu;kw%D9G9dF9z0}WFqt@Kbr1a7zyMVbCu05B1hO__l`
zgmru!NnI}KYiQX_zC{y3`lid4Em@2$ryr4DyNkMf;T1z2eJrrX21^*IF$t#1AZlt#
zM;7s*rZ%nc5yuv{EaF~Gb$!bq?$ng;ETXEWKVT6RH4VrO1zf1=a6S>2DqE;)T%Eei
d6W~t*J^)IQO7UD07i<6k002ovPDHLkV1mcw=^g+8

diff --git a/xabber/src/main/res/drawable-xhdpi/ic_stat_play_circle_fill.png b/xabber/src/main/res/drawable-xhdpi/ic_stat_play_circle_fill.png
deleted file mode 100644
index 3cc201cea60478d987ec5f3a8d4f2f6ea84840cc..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1192
zcmV;Z1XufsP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm000DUNkl<ZXhYSS
zTc}N27{~WI=;ZR?o=bEd+zTbNNx8o0baLE|<Ft$9fl_1>atlRn4~p<0b<iP%?VQ>j
zC-J~>D^cvo6XmugUfs6ee>LZ7uCeD_bIvj5T8mNt=Gt?O@A4mGeBb!SSUXqqowwX~
z?te`t1X@~Jx-t+Wz$h@r``m?RZ*PEJ@_YyGfji)?KId||H?9L{O#r9cV0;i*2Yv_b
zQabaI{%65<&;*%JDdqFstq9=!IAqU&J~l=}WHdwbA#o+GzElKoyc-5if=QrlT4OQ&
zH3QecT!=I$)t#6C&d)~aLC_<qa?5^iky{3dzmmwu62S2vP_zMT2Krp7rr6j7k<X<J
zmL%XgzaIrlE9JFe=O}+KhQyaB`*8&75!_QH=Y6xgAh0Gi0Y-lgLZ>RcY{LB1=r4f8
z@vtvLXTZxgO%({(q?4<_9uk(Fq6l0<U|Le`73%jtb|#qd(24+~Kc0?PLDqTRm8Y`N
zbO>m03$2KNR~|g&TiYG>2C^N%a1fiKEf~E(rhl;PFbNE$!$S+jzQ}n#Xu~@ImN@7s
zC0YxCn|=qAz%jn4b1-}!<ufJEY)<8I8mKDGvYp1pZ><P;C9#UCv{hx$xdH)?!~mX$
z!ITUcsEY0DXQaXmKwvUoTy`{6M8G4_p66Py$x(Mu{1*uPtrtN8S?s#42>4bRAkBi7
zsBMA>64(j>)n-KmR3^`J9HmGC-fVQ_`5zbyTnfVr5ct(3@PHS?%1OW@p_ANtu*JdF
zV+ag32|VY8e}=WyU2+Bj%SlUDJH67b_Kmdd6$E;j1X|K+3F)7RK!8YpKA!*+(%ObV
zK7NBiTnz#W=s$t>j8rX*fVS!Uv^caxGeAbtz^UeH1f4AGHAA4MIRh%6hgc{JiX<hl
z8lhbdww^#>ph-Z7m%<ipsXQ)?Dqt^yNx&tIHb7v8NnjN(c3V2`i<R2Q6sX$BesZ)S
z@of;u@9e=KRv>AUacN<t#E&Rk4tBaIHe_c&pur^2ofisZmxGL1%qdMC0@E{eUKe2f
zAfUpt_|QRia4jc-<#a9jRdDGxFUxig=V$o}&GUdxQuiIKX=jyk#gdkd%WOuup>wgW
zAoI;6AcN0<?S63G)2qwhavUjNd&}oTC;`3n&ISLLY4jW>w?>D01@AvWB~jNZSLig+
z#abC;^}~qH!$o(cQ3P}Y{Rm`zp0(xm9>GC4uO(E}BG)NP=?{9UQv4R0E_jcGITCld
zt84XbRc5dc=T}7e5Jy1uikL5~5((`~b>_N{4dP&jD*nK+13xyFa$bHW&eagnh1Wiy
zpH$1)6tMMCYd&!hhj|DIWv2^3w+cF(XW5h<_51P9VcEti1|mo(E>yYdC}_K5o2r!_
z7lFpOCF3*$Mr^3;7!6he-O;4Il2lcx!_8iB8^;UfL7Hhz90R44dP_^oN*D=r%iS5|
z&#g55?yI$}n{WT$4Q}}*aT<p+n*kT2S;}TI16ewhR@YbEzF0sV*fVhe0000<MNUMn
GLSTYz!6_90

diff --git a/xabber/src/main/res/drawable-xhdpi/ic_status_available_18dp.png b/xabber/src/main/res/drawable-xhdpi/ic_status_available_18dp.png
deleted file mode 100644
index 3d8b58cfe0d40233c67d77fb09ca63f61e0f3395..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1148
zcmV-?1cUpDP)<h;3K|Lk000e1NJLTq001Na001Ni1^@s6;Q*MJ000C-Nkl<ZSV!%c
zdrZ?;6vxl64<-mj4b(`C;DX8!4K0d-NHpTI`H#YYI0WVcqGmW2iAac|1bq9CCZY~Q
zrhoVVO+;Z!ritmqVNgLs(1Kd!QMQ7tAjN`3>h}^bsBM2gE5F1TPjk}8J@?#C&pkc&
z+;a4Z3HOQd(B}hWwOS>JZUA%!R0)+qd!WtGT8`t|oQeJiM+hK`u+Tc_GRuHvg5IPj
zV{a$*5A>6(%$1aGO7eE|Lg=|V*qn!+09=buIKe;wnFFVX%>Cx@Yt0(EuCE~N|Mi0)
z?~1}jL26|%EuON7RLbC&fGdQ}c7PfAz<7ZG!fdt;SO<2L>B^;N>r1HnWjCMSH{)M>
zPNmdY>nO-;W-C5S0F=hjWQRb2kz(@i#$IFM-dhLge#ZmBAR`SCA&Qx{f|3IhEfP+$
z8c?V0IpPEQ&G5pInq84YZ7-b4(YMwO_X(rSxf!pdob(4kmD+-`3xw#Tm@KBk3{57r
zn*MbvGPWi~`7WV!RhkK7A%JRl*TyCgU?#y(ySHk;;zn!bsKE?7N>`^*)RZL^cpnKU
z>)YFFV>tj7+%{Bi%&p8Dbr|N*UG7fDmllx1#Ul<ttTeol_aX$C@fg)(t6Uq54@CiD
zPGhIX&`*I$w*VB%2b7}gdQzBvZL?@F%&~`y2c7z^h-4C35TIBQ9TZy;Dn6q<7k65F
zR#YJ7JU2WC1yq#@paYJ8bUFXzPOWLXD>_j8^jJy?Ty+6Ju{ME*3SnRBl?~GWdJLii
zh55{<?9i?E02FKwXdDKNE6Wq9$HES7aRtW-?TN^50+6pgAO!}x68=cSdBtj%xH8Kt
zh;~QhH3G=b9uQ0N-i=q&Tw2gph%F0nlw^fw)&NNDD5>jqSM3X|Y`rNq4-F-C34r1q
z0Tq=#zP#o{ZIS3eJHxh9$VBxP03CD$6o-?&IOVSmWW_@)VaLa*?~6z-k<SFseMdm9
z7}W2q%o~5lP%Rb@Mf)$OwLz<I17_~XMeLpSyXuV%*;_POqC{z|+>MS$6_Dpwp78)G
z5dy^OQN!VyBi>gUua0_@HmQE5Z+)X~!0|#s?FS=3)s9C)e=b9_m72TR&1Q6DDH^n2
zRB5a!XARnW?F3&7dl(76DeL++YB#rkG*RT_2-+O-Yd>1pXuy=&a>xh7n*5XP=4Y$&
zZ|)&om(D3DH1>lvCm~>EA3&0!#r7NtxdyQtYCbN7S!heRi;pf5UJC~EALmc&XQxoW
zgc)q#e*_H69lOE{G&~bIwHU9DbeKE7DSz@O{oPVQxRKa&JVrW()Du-KaoMv4*PvrC
z%mGX%-!~BqG?eIU3*(@v&`9K$tnqmhb@s8V^ebXNXCL=T<frgsonRwu&Ona>q=^q?
zc>IHaMmj~rSZSCCWq&q!L*>xt(5KL9Kxl<RjI?ta$eG22%=rSu7p2z#ppi83%?`N$
O0000<MNUMnLSTZDzZ0DR

diff --git a/xabber/src/main/res/drawable-xhdpi/ic_status_away_18dp.png b/xabber/src/main/res/drawable-xhdpi/ic_status_away_18dp.png
deleted file mode 100644
index 7208de06637147afd80126375a6a82abe5394f5b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1189
zcmV;W1X}xvP)<h;3K|Lk000e1NJLTq001Na001Ni1^@s6;Q*MJ000DRNkl<ZSV!%c
zYiv|S6vxlp$JT;0T}X=%0+cV677Y)#3fNU33aJTV=+-D|P)bM>O9IA6fWjBR511G&
zuUI4yUZF@031~_iO%3%6XjNP#t=6`-LU>qOD7Jea!+)T{cImxyciSe!ILX<)**SCO
zmvhgYb7mRcXM^2mJoMiI;+!k+?!%BwNIFD=bV2@voMnt%OvL+fdk7#;W20q|JhFO5
z@@q}RyDt&hCNX_D(Xg?^hL6QG3*+N6$S%OOdWG{01dzvI^dmC6X4y^0$ZGk5_?0?<
z829d#<R|5!CrO#ONPI^CR|cgLfVIoOq(A@>I_rpA8?1(XsukW&6uBz1duN{cvq+n^
zmRMTgFZ}p2plaL}y8;15#o|49C9jyZD~VtJ&NE0KMaD?YEF|^O)dn$jDWDEI8Il2g
z!n<0Rn_s_5ysIrSn5b3CxcQ{b{LmsrTMVdU{TXxwf_Dlj(otqqhe!mj)6k!(AU0w=
znRT1V{-Z()tz;}FE$98~P@Dm%`q%~i0s&?W6wjHp#VK}crRyeoUL}As$UIX*_V0(K
zKtcgP1h7+h3<8QrFLDCfZlA9yGQU|a-5?Pl@}-b3uZk$i9|Dj_4R;Sg?2hn`AHTI3
zRr$&M@1KSS2v*g}D-h&wod!^j45*M_{k6=fd|nD86cX}~SeTSbzJ;|!iarHUB8lD_
z_q;NAsN4#dhOD1UhZac0(o>%zapt}Qpe=4djb_ao8TJJcbMld}hs0~kDkAlfRYw7o
z-!D*aBJ43v%v1SwQ6uGJAVA8vXGxpA^+y0rbplGoM0=zHWy|Q4(+nhrM7*R0NS}M4
z1wa#=fKo8g5&1lTdespZ5Lw+Qw5X#lBQ|*|={cm$+20JHiB3Qw$h(a%7x;K*V|+j!
zv}2R!tx__(v<^Vi-GVx7*1nl#x1RK{1y1egSvW4kJn15x^r?xxL45>31#UpQt@=H$
zTc}M#J+$C1QpN<|2G9p?Kp|B2a^u8YBHpLW3@)E29}B<5+4p4w=odGjWK6c9j`>l~
z1{WgAnwq(c)T!^D0Sr#i-QiSRH}NY!tTC!zgys-<NgsidbCTEtqY40Y#0!wfNA>3E
zwP|)^AN@h`m=@SX%A^nq8RdFvKg6!c+68Fn4;xiz&^mt`6cAxVnUqgjVDmLRiUzGA
z*08LF{TKmWY<{(b_zlsc4{RvopCj#wEx0dfF97Cvf7WC`qRHROZ=7FZo+={Ve&;a6
zN5+)fg*3akhnVsjV9K2gc)13N8|p@~BJWw@t<0+5O?dVU#70gbZF&i@QPV`VehDxl
zb{vNk=--uysX2Jw#{ao6*={&UcFS>OU55*)mW)0pC;}IWFBdmSwi9dD14eqG^9<A*
z=;9TIAfnk0BEB@<fw=6xj8lMp^%P<cP9T<w>%O8lL+21=2S8f9x->4JXru6$NDYre
z#Gegm5FH|VmL|yefH>zBB3dtDphPzFvgUsvnU`(?+xX5jtK2b>00000NkvXXu0mjf
Db%Y;T

diff --git a/xabber/src/main/res/drawable-xhdpi/ic_status_chat_18dp.png b/xabber/src/main/res/drawable-xhdpi/ic_status_chat_18dp.png
deleted file mode 100644
index 625aa8aeb6eb782c746e5fecff7bb535010355a0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1486
zcmV;<1u^=GP)<h;3K|Lk000e1NJLTq001Na001Ni1^@s6;Q*MJ000G*Nkl<ZSV!%c
zX>3$g6vzLsZ)UnochW|~Rs__dZJ~>WMk~t)l}eCw0WHBAKtv)!3<^ro7>p1Vl*nQc
z;ue=yYCr)&liEVn1_W6u1;kLKv;tCSXXxzX|Gu{447@ip416HQliXR}z4zSToO|v$
z=Z=J%Or)EP2mc))x7!^?>)y$B2U{|mj?K*WC)*)OlFo)={cE-mK}K_->1^ZSwkN{X
z3b-!vs}qnSfUqRCKKw2<^5sjm_X&48Sh%2p2$D^u@4#)zgKZaJ`w4Iy=Of3}Ye_MH
zJ{>UR^F7T*xb+-VPO$bsU;%*$BE~GH8D55Uhm5Xjz-<bo_uqaw1&Er)4NX16hmR4e
z*572mK!lMw`2%jrRG8nUF^&cg;xm%VL_7>cPO)=8%Lw(UmZCsF6>y!MiO!`o(76y{
zyrvoM0gQ9$Y;qx?HmfPr1fq3jz-?ZS4zXKp*ALUH!N4<NoF(==i%`d|RICa_m|Hop
ziQ5zlTf>cm>D6SMMTZ}~n_u$@<@R1c3uq1Ozs`nf`HhDW8YLqTx03HM#RL+e!6R1z
z(K-q2Z9(VaNH|WY0-4QL)c<?}E|(j5BL^ckhViFITH7vR@4jZl#YG}7cQAB15kFNV
zVxn;JJp`g-`3IT-=Slj`B2_&CV%dssAr=<WC(($P7L12pFXP;KlhS9ib;qWx;R8@M
zHBTK##H#o;?9<&%C=o;zQL|7bESrka<zq>Y($g*NSiW+H&mwbYkHyfz$*8G2is~)<
zJ$+$e5>_rNfp}MyX#Qw@`tt;O!ynKeFugtq_Jf++Rlal!>~@}BidgKGMH7&a5QWAg
zXRvNVoo8NhQVhypC{TwHPa_`TwoTqdpdwYEo<L~DrDtWvA5BFE51+>7tp^kzDtI6b
z*_i`9W4G@-toWDkp(#Z<=-*ekq=x9}KGE|J5NNm-P&_-@agn*xeOX)4jq1^*0x?TY
z5y<n4d^VRBisf3DaB=3f<*QHub;Af$-b|nrEei=i3p$=Nz<CB2+RgZS+d({DIx5s9
zedakFF1)v~4o^+bhb%K37;+i4=j|s@raz}{glWYv*!L)7-dgn?iY8@YVE@GHh7!Id
zPU+-AQOS6mx{5$0{(v^Zy8Q`U{zw_qbgT{A=&1AOi~}cz4Ap6}@W*|Rd2_}hJ}#<T
zPxL|_`-}zD`=&pjVrKSAo-~f>PBWi;-hhPoC=@)H77~!d;l%2STIA*o!bmnnMEZzd
z%Mbdy2=tpjph$MMFpniLpDE*Pj5+VFt3gJ3Ka9Iyl+nRUSC<_dKCV}`e8NMlB6~%t
zk4pCvCdXTwR&sp}j^AHI=Ms;VEEYR9QgL*21PUjPfH5jOAeGqes;_>*y`zR;Ouo1a
z^oYbQQ<7_J34yAD0TS`(7%o>N!CK=P&#-{n-N*66uA>-{-XEFFRec%w!n}OT#Ke1~
zsTDsqbSLJ*iJ9nkWpIpo5(pnt&+hwzDnEoGE?&Zd{tIS(UMO08tRbwmcYiYuHMXGb
zuMQ=n>vS^2^YCyTZXc42>=7wQ87OWaS4jA1*4VQ;`BW5W;+EheflAm_bns`;`6{c%
z^O{>EoL0mb0ps^18kqTwPqP$|Cvn_2Y6=4Zi6Z|)xc)AMi6_%}GN9k64`2{f5^0f@
zjx&ugm0F4d29};1>QY_`7s664!LpUQczFm`<lDGKWh{G!iW}{tgb}`@DFK0cXA*1-
zKd*-CLMp5~yDy4b6@kPPsLx<(7%S=>(o5?&cL`y{71yr>4J5Smlqbdf$n1-J`j-w)
z-jY36X&z_!7PbNG);06xGq$w^ITZ+`xBr@eyp<A8ga&3u<<ACQ=%HupU^~gSj}T44
oLU@l087P#+f|>I_P#`P)13L8cG|rq%vH$=807*qoM6N<$g1|Vl_5c6?

diff --git a/xabber/src/main/res/drawable-xhdpi/ic_status_connection_18dp.png b/xabber/src/main/res/drawable-xhdpi/ic_status_connection_18dp.png
deleted file mode 100644
index de9b7924e767612eb4011a85615da092b80d4728..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1539
zcmV+e2K@PnP)<h;3K|Lk000e1NJLTq001Na001Ni1^@s6;Q*MJ000HbNkl<ZSV!%c
zc~Dh#6vw};ijxW`qE1b=n_+2gqX?5aPAOR$U<xXsm|?gOqA2ndM4k+YAfkfgfEKu5
zZn-p?NvWaYUXG(9Dk_yVqsV5l^*wjEua~~%LjB=1otZPdcYo)c`+4V_-}&8(4IVSG
zdCYk5-vMfDY_w%|yHj7HcB0x-tEe}r7i?^7?zANP&CU=(-r$X<P)AZ-E!^}+t`$(T
z33p2?oMs?`^kvXA>L9Jbo9zDJ-*wa&g59;|YZZtfVzZFCh-zmopoR4^t_2XP&{7PG
zK!g#19O{IB0AlP~%P$`gD$iUzYd~3aocb@psA1~)!Iw}wO~o|}#O#DL)n4(dudj!l
zUCS%h(9j55Tf^-t8L|(dE<X%q5{NKeXn2X*P8=#KD-ok#j?|^nM$MOd<@b@Ck%hSV
z5wNu}-0}z`c@wJ9IHEbA)ierK4I>vPpt`08>C57b18OF_^XqR244s7l-_Zyj?{Dnq
zPaqi$26+UC*>U0OZK{)49X?tFeOd<cv(n+}?5r8$VMB=%qfbU2<2=<>3ZTeI0`<2B
z^tav#3i|{jh7G~EF{4bvNI8$6I*YsI<>=zx3H^Kbf}^8@N!##+ad7M4iUr|e#_Jx0
zk|C;ysSIu5btSJ?ua{!VtVrz5&q13uPT0QpD~uWWrXkq=Lxo6MwH8&?HHK^MZXK~?
z{v5p8LrxW-yrKdZE?&am0sT;X_B<kE6R>~t2DEZ?RDI?WD9I8~2^XIcgUvg3qp0`{
zR>bSj(9i&%fM9IQSb>iGmB&t=LWC|JEb$}R5cu3xDN1RM96yOIJNIB^!eS-Hh;czk
zh@Oi+uk}>@wh_qBBv8{J{GE%+{??~vz`1=pga%K<m6B@+jf}>Dg3rMKm^eLLxn@p$
zh7Uzd#7vajC`C|M1P*P_hl9O6W=F@ub3kACzvH92o@2aT=76MY4d>0gI6Zpz^icZe
zyP^}w%+14RYf@3o5)FNCyjd7oc(Q9}6s%vXWX03R7hmLLDm@mTk`5{B)QJZFQUX0~
z4oK!sxw;s&BvI*w0N;0U^h7bzvvaYDyQHGB3d8*ZEdt5Sx94V|uC5+lqx`UgpWQpT
zAuc%$T|2uYWWqSr{|14&nFEq0e?V0_E@@RJ92^`ld)j1NE4_(HABQU?Yu&09{3eIu
zR@qNxp@w;RVrg_FE?>QdklAx_XvZelbJEX<(qX8#r}5@EL!j3!HMMNP9%3N7YTws~
zk+oc}H1FGilaZ*K50CCIV&B1U5X)a{O6=Jy*{O->{`_;;wtF86zdx=twH!Zhy+4VY
zWRVi1NwyMbtR<lJTnrY2vY&r}|CH(2wJ{qVTwSnkV?F}?Mx%|BGBc68sQ_6U@=(t{
zQAO6InTHG>s9ZXI{s&Z6Rl|E=f9}}RSe%rKJ$X4i7v+Idkw^k1TLO|9B(q2n*;&0j
zdSF^mAZlxCl@c0D>FqKU9xKA#domc^G0bZaTwVT}=ylABlu9Iw<&vz0g#;Ogc!fY0
zEdj~Tm!m_D5S%!34)bF5$je-*?2?ws!EcXXS=wrB{d5gnoZG8miV4%tIHtM7bt#P&
zsD`@46s3Ht6PNH<Ficp@Y$crdA4WtW{G$-ad@_=;1lp<vNOCUEDsEydb7$I|1<=iz
zg%_UfrWr&v+_nDzuHU?cnNyY4ROKi?cxih45D)Gu>HN*Aw>;CdZTkf5Yz@t*8LZ~P
z130yAZERn`FY<tP<>4UK9${C~VTR^AYcs5)*%-onY0BIhkZg}!s^zh)4MeQuoSZ}$
z!!B-ChMGzzHHxQ3QLVl<Szwbl+VO;u-Z3khZ@``!!YCQkm$fHEv6NSzwNxEp?pgEI
z4Ahh@DWMEbc{TE;%KN-Ixxs~e>KcNSS_4tnn+0SXlo^xJFn}umY>@FFBm6$~I`uRm
p<gKOI(qf=y-$|px|3KCf^(So)|1^p`6vhAm002ovPDHLkV1k}I=KKHv

diff --git a/xabber/src/main/res/drawable-xhdpi/ic_status_dnd_18dp.png b/xabber/src/main/res/drawable-xhdpi/ic_status_dnd_18dp.png
deleted file mode 100644
index 7c2e8216e4e47494c956484549e9c4f5bca44e28..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1174
zcmV;H1Zn$;P)<h;3K|Lk000e1NJLTq001Na001Ni1^@s6;Q*MJ000DCNkl<ZSV!%c
zT}+c_6vxlo7LXuKD?%c~%EFXYxWEa_Ol$N4FSs!isA1Cu6k?2@m`MC!?m|e6n->s4
zLye&^vJA(?%%VoGhVu$Pzy?ti1TCV1laC^_rPTjJsHyb*tZibJJ;_P?_Ib{Ee(!nD
zd(L^v(PuWe&y0uuJ3wBqR|W5W1xbY@Ks1nX$a9E|<G9zscwe!H0J07nZHMGeJDm$A
zdwa<>G(=vvo76Ee6qS@jQHvH4aa;%1`~f)!IJ;ap*+2lvgwblx`1rSjmoL+st5<2P
zt!)Nm?$GG<q+7k3;x}$&pDw^zu;wR#y_Eu!1Of<KQ{nY^etvoJqS{_pM^hssQg%Pg
z#~6*2eE2YFv$9^`$L|64x0tdh5Mb0$Zg33_Zs{s3qp>@8WP^OPkmD$E+cq+kmAN^!
zx(HB>LWZP(>Ya9bX-82JIs5yAgYnaf+pvL_o;u~>G@3j>{mExg5D4BWnHn9n*vw{{
z?Cbkv7@vWJO`9mCs>*@um4ND+YnT@ZFnCSqVb{KW+Bes)hYZGN2tWj|e{j7PP+tEH
zgn;UXTUvH@?${A>7-mqT)zXS<*9dQ80f1O)_%H&1;2k|?`|+rv9X4B7fSA#w(o!-U
zIM529Y$>3U@y<@meLU-M4vkJnnJq2EMMR_niY3vR!RMhSdu?sO^V6rp$uncyXt9uP
z&6;um{UQd`(^*pT#qh0LVFyY=j2iauZw634FVJivbl%I!QBT?f%MaX3>gZ_2pdN>V
zywlSGdJA%LD7B`h9Y7gEKsrpkZOzW6sj;yD0}FF=Sz=QR)CRqYr%wa)w3(TdcHzP^
z04)&$(qdwyb=4}~dKGdY+<2PR+6SOyAs`mylenWuzB^+1BPuabv4<vldT83^3eaPv
zWLb6fJpg?z7StV&_U>K&?~NOZH&&`J8`PHoWEKNDKVY>M_ntVR)V|{N#`=2FnM?-(
z^s5+90V;dbUAzJ0{iw_+-cU?|J^qz9Z;~o9G7Ufv#DLg)-H$q^M?DKEguk)G;$m7-
zUVa-eS^mEZ71t_9d;1YvVPROjq>hcH6=;DY;^NEzx+DjP<)g0dii-Hx&CMbAQp)k;
zl#rj#N`XmM`@sm1wasYgf46PkOcUMRA%jZD%cGRaN|tq5gZ6l?VW}3j1_8dOW9wFO
z4h(!U6icjMo;*2)zWO`B{KaQb3WzoNR>1u5XxA=6TM`r$r&1BiIg5Aic9Kf<BVd|@
z49PhLu@h<~GVLL>CEP$m18>$9+F*WqIwc=HO0gLk>_l4#7|}LD63Dj^Vro6U*ScQ4
zGQMnVq@gQU2qzL=4i!2Ay~)G^m-Rbt92C!D;W5ArOSxD!&}^WyM_2$Ug{(z<Y2H0~
zLT=wt8p&>+!9X#osjL%ZN0r|oX8`g{3dA?B2*}?kJjPPPHxTw`Lp&q`G79O1+y%r#
oxe)&Af(8m^GdVi{14()5J>YPuG{!u(lK=n!07*qoM6N<$f)sHgZ2$lO

diff --git a/xabber/src/main/res/drawable-xhdpi/ic_status_unavailable_18dp.png b/xabber/src/main/res/drawable-xhdpi/ic_status_unavailable_18dp.png
deleted file mode 100644
index 4bc80159c380bc08a5094841d5ea09290f8cf51e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1085
zcmV-D1j74?P)<h;3K|Lk000e1NJLTq001Na001Ni1^@s6;Q*MJ000C8Nkl<ZSV!%c
zT}YEr7{{M|G@XiMXrKryLG439ni>SnR0IuCA~(!Z3Mbe_mq|pX7X^Y{Sh~y<NrfV{
zi?BPrNlU@P6g9*k+-yTr{7BQ5oAy6riRs?G@0Kq}bl}fk_nz~d-=6cF=R8LV?Xf1=
zV?6Zl0Bvk+Na5WhP&9N9l0)C2NoZIik$m;W`yP7;AZIX9A#~PevmKb3nW3enC9>P?
z<m2N*K|w(dp^ZZAPy^t;2!#_21dw<by>GQzPYnzV(9qBj8I48<$oA&%?@v)tQKVL@
zDKawhCxGhFrxc&_d|<pl0AYP@t*@___4fA4y1Ke(Wo3oW?&kZjurSKX%A$yf2n)W<
z1JrAGgWUoFMux#puq2mST3TpgVnQ&;){cOnq@*NDPfuTyN~M?a_fsxId_a%q=H`m(
z>gs5Ip4Z#Fu(7eRl$V!hm&s)30rk?=08SuyN58tdT3=mVO|!GJypsv-kdTl-TCH{&
z{ndaP-#*SI5MV;laSY28I6OQobS}aDbUGcy$H%|H01cov{#agDRsi&HY;5dmV`HP>
zNj&MOR4S>Yq=c{=wE$wNVYBV<5MWpmF=MHelanmRiPMsklPM!3;~jt!`GE8mi>1D*
zs!ALZr&T{cKPoLPB?Nd3pjZ-hG*=#K?d<H-LZSjO<9fZGCD0N8Rk{QE+|bZ)czk@v
z2H17Ll#~>fn_d7Y$0d+65n3xMDrCq%yAH73U`$L56%-T<0Vs|OXg^-emz9+fa**gi
zI8LazxYz_B6&Fw-UM!ZEmwR+xc}wmDG6Luj7Z3~bAC;Ar3RYH#-Plo*pP&B$KquS<
z^=NZ*^RbbU5wUs58Psh6(zyd_?CI&b($Uc&I#6L@Aw@?=UkA`VcR*U4?5)^ogk2{Z
z6gxgxVwB6}#{u-w9gq?)%{a$`aGr?<q|s<7Gc)r&U=p@Y!gbo;HJMB|4F-cKUh?(z
zbsVk%0RcJywFv=Y`Dnboy*;GAzkk=gl#`P~iHV7CVfeJ5@`Di|esn14pV!pX(Dd~5
zu0c5qv?Um11=^?WhWSd^2MF+MwY9ahu(0sgP;qf_l$)DtLtT9iFt1!0<O5<weiL9W
zHZ?Vo*=+U-iWT{(si~BfmS)9s0o2N6NXRva-B9n~Qg{PbAW3(3H{n?@Sa^6iWoKuT
zN~L1e-UYz0*x_uvK)**Krjqe&SX^8@+Sk`dgM)*_RS_r@3YPF#;Ihv(jC%y#1`O}I
z3kGrqI$J_5R0L@dU-GG`DOz4$cHCgub`A~>rqIw(RtXx>=NVKB5R*`sdIYr9C_Khe
z!%2w!vmpf92YrJkpaDR5l~uh468eih?e`yu&tty;Dru865qZ~200000NkvXXu0mjf
DxQp<@

diff --git a/xabber/src/main/res/drawable-xhdpi/ic_status_xa_18dp.png b/xabber/src/main/res/drawable-xhdpi/ic_status_xa_18dp.png
deleted file mode 100644
index de961b864a52078a041de91dd9bd17c31ca8e27d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1235
zcmV;^1T6cBP)<h;3K|Lk000e1NJLTq001Na001Ni1^@s6;Q*MJ000D<Nkl<ZSV!%c
zdrZ?;6vxl6EwVbSv=fGzqIC}B;l>y+WsV4cY>G3pnP5<ZGe9!8%t?aFhL0_gv23sh
zCMt?^YTTwU;|TiC-dkjopk>M<j47ezC6$3?y!xQs_c}GT^!I3I6SM3lCuw@m<J0rI
zzjMwlNB7v`?lB(v?*KWSP8qVh01^oag(x5+kWNS=$8jcKvhQ_<0J0Q;av<pzn?rM@
zZ;VVsR<cbvC@4@tvmOYfS(^KZ<ER-rUqTK7u1hMMWFUYfz-ig=_(XEmxjw2se~s$f
z&1ADXC&khP1yE{?nlcxK(b8zO6>t?$+5xaZF)&defH0ly6AtHF2fy!@e|W}7gCjOE
zzqj`n&JLoYHS=k4#Pl9~xfW1A2^k9l0Y(nv!+mD!`rQ33RCn1d8N^i)8KPI7nN8bt
zTAN(Py$Gn!`5cJ>9WeHf=jlGUNS%L<`vl`^^jv%h9mtECP{_F#09EbDAukZJlY4#C
zUa_oLPwl2LUYM`9#gjHfNjoa9(D7fcib7{S6-H$nB8Q>)1fbg74Lkw?W+oI{bIMy(
zHTr9UL4MtpL=Qixq=I8@boA$5Q6Q!OAOhG~d`tn<9d896(BAKw1~z5wZWImR3sCS>
z1)VEOBD{?m0Ai)#_L>BQ?5MHZ{cN#b+0gNqUx1j?&CA1SyG~mVpd>M%+@{XqinLu9
zL}8eMFBxKXtX5rme-TYl$YKG-is+5yDMOVdHHM6mnhw7LG3O^<dz2N>*8x-_1k}E!
z?2`6}X3?U0!-uaKVzyh-!>MqU_9TE-djz^!2rY?)b#g<$w7T<efL1&{gFf99a}hvs
zd_ck27<^<)EtyB{et%?WCsbV!X9Un3J|Gn~%#r!E=vUqWjaeOJwL1iVgnRK!jtHi&
z3LY~6Xf7WRJLKcZJL{)hzB=kvhNLLF7tfVwC7-+$-2k9?p+nugabI)vnTCETF(@TU
zP4@?~9xT34PVVT5`8d>XuF_TkC{qaN(Ee|`HnQ~kdmZ1rkkVo`TLDxm1eAf!UYSr>
zN6yK!*Ii?rj`q=1x|jkLvKRoh2mvXv*^NG?MnAi20Pc=n#(ebl>Urk@ljyp~*IeJZ
z&^}a{{$7J$vZPY}(_Cjv3&;del@uUWkJ|E&{vPt#S@9Xi+cbWZ9YO1s%&djo(~`yy
z764T{69fH;W$)^#tyfwJkOH<A1KP(MBH0+h2DCriZNx^{-8kT{K40=1bq!dg#1quf
zC5F<ToCS7;jMD+;v?paTAXZ?GbPrh8W$$gGMkAX%y<aj+`S~ltY3s_l78ys`fT`s3
zBIO#yZm31L6uwb<+Q5~6(?u4M7U3E!Zq76+&YDjN^Hl6cn*|tlc6gU4&@D@xsZ@O4
z(>rL1I`m@?ovJqxZX_NZPetWUi_y^fC1I2rtFa+SITUvS=DJvZB?H|&=<E?@K=L3d
zIA4m^o)I#cZDhw)T7_b#4OLR~LqV7XIRkXQfb0W^Q4HkPzE?o5PLVNI8lHr(KN~_I
x0gxd`2Sg8uR;duKdOidB5=@HC|3G3{`Wq~#-!wn?4PyWR002ovPDHLkV1f`)G|>P6

diff --git a/xabber/src/main/res/drawable-xxhdpi/ic_account_box_outline_white_24dp.png b/xabber/src/main/res/drawable-xxhdpi/ic_account_box_outline_white_24dp.png
deleted file mode 100644
index e371d2a02fa10a6aea060d87a6faec599e309417..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 711
zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY1|&n@ZgvM!Y)RhkE<hRxemd{22U45`9+AaB
z8myGT?PRtcNU*HHF&!>=uJQvb0|Qf#r;B4q#jUruZL>ohMUH*^FBr)k_*)|9$|Z9F
zSD#BuIW~H(ly~^!)U;M}i%+t+$6~QVO@SMOX0yI_5aZVU6!GSso7tS3cdU)e&;Fd6
znD)++fA`Mf@^Xb10VfW{7Rj7>2Pd%|Fn(ZIz-$q}yU}HTgZ_c+2dy*zzO+&BoZe`D
z;O(uu+qUrA7;T=f**uwPQVHJ=hC8e7#=6@ve?RkPyZHy7M@{}e>kl#RuzY)Rs?>$a
zw`5Z%TnT;^{YGF%!0yF;y=UJnGS@IwI6EiD?0W2mX=Y!S?>p+Zmg9sVqotC9JIj-f
z1{uK#k8|EKF{rF%iaxOQ<@|lj)@k3imF2GFJ#*#YF7HX-O7_@#de^SCf6c0*>n(NC
zeA1RX+kbhpY?&?Km%KgyYx>@XC0i{IWv;opV*j<+oYfcRT+3oD*$SkR<e#h%z0mJe
z9JN~Xg5N^R)FZk3{2Vq0`b2F1-Y>QH$A!3=@?p2H-0yBE$_}o7(+qTpGE<R@L!XxX
z&a6+)Yjz*tDq!Ei7sEK~{VD!N!4JGYIQB5Neg5-dWr_3LH_a+*y{j}|CiKOYJWjAG
z-y8P#rk+Bk^Q8|g3uV$ZGLs)NPcoVCCFW9K`$LnyW!d~<mJ8nU9Q>1Qo$he6?9wDT
zqo2>C4t34k`+n0uw{y4uG&3DE2`ko}W4vHebcgp&vA*6#%JZJde&hl<2o_$i;!@A_
zEasSNcYcbwpX8KZT)(1r&*qs_<;D9V^lhGz$E%lH<W~G<x%2*w!`+gFzG}xM#qZi}
mm?^|}WZ^w<gbVmR(|38N*HB}5@INrAF?hQAxvX<aXaWH6Ksq-7

diff --git a/xabber/src/main/res/drawable-xxhdpi/ic_account_multiple_white_24dp.png b/xabber/src/main/res/drawable-xxhdpi/ic_account_multiple_white_24dp.png
deleted file mode 100644
index e6bd3deadc122629d54b6647bc99b518ebbf4d9f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 693
zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY1|&n@ZgvM!Y)RhkE<hRxemd{22U45`9+AaB
z8myGT?PRtcNU*HHF&!>=uJQvb0|S$Tr;B4q#jUqDH)e?hN*w)IEbJ?;ST-qPVdQF)
z%;^FXc2u^BG%d}45FN2(!$(dro#q7P+bkP52{CnvIeBd5T+w>4^uO3SCz-PJwDf1^
zbgJqM&c<1M-`%eBX0AsX6ij1%!Faw=_(AojIV$tNirLzy8OkO&>|?wTx#iD|r*D{^
zv$oB*U@sF_wJ)=rec-6fVgDG0*}2cn0|O@7|BhtKeSTaoef^;i!qvG?#W#j*T-+>G
zWv8+8+KHY}?prG#GFYo#mzudT%kj0TOv2tLQOd?)x-aI3Z(VR%D$PO{qReXDLx$r}
zWq+mkF6i&P_N3?O&-SE$j5Sv^3OM4!xMdElx8{;NqJIVm#GF=0F|6@=<#lUPiGPs$
zrCd+*N$!*Osht=1lvk~t@FnijY=J}Dg{ti)eF?d=O6AqL^-(8`3gj(V?lCSFy57(k
zIH_<(ir#s{<IWG<*ZeU$n!|j)VKZ0j6HD)JH}otnGe0m2tGk%A>wtHH%*Gj83OA*1
zKTy-3{470p52K7}#3>#318&FWFjk0a*I!#^n{cDdIGpF?j&#Q81M4GxzC8PF=KJcq
zQ@j)Gliyu8{4_mi_MJ=f!>4F3-9P)|8jn}%#(tlb-0FVK{UYp{oohZZQFmtHtnG%M
z{{LFYQ8TGz`CGA~8a~B4zV#e;rkJd;wvWBw?|J=Jp2BgBmV#O@N5@M$-u)?Y+*12X
z$%!L)y+`TUdei&=tIj=aD%!C?Mo*)i`_#iGP#A&0KmGlTg6-iOrF{LS0TUL3r>mdK
II;Vst06+pSLjV8(

diff --git a/xabber/src/main/res/drawable-xxhdpi/ic_account_remove_white_24dp.png b/xabber/src/main/res/drawable-xxhdpi/ic_account_remove_white_24dp.png
deleted file mode 100644
index bdd14d5a46f754ffc6e2541abadd7a05168ca78c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 960
zcmV;x13&zUP)<h;3K|Lk000e1NJLTq002k;002k`1^@s6RqeA!00006VoOIv00000
z008+zyMF)x010qNS#tmY07w7;07w8v$!k6U000Sga6xAP002k;002k;&Ux?!0009^
zNkl<Zc-rlny=xRf7>9qaNIsfq6G2H3gC7KfDf|O0B_gM3)D%|fk|LFjRu<Y@=P%GE
zDp6x8sSPNB5CuiF(iA4K5TiU6H>b;a-tOJ*?Ci-ra7Fg!-uInncV~BIB1IyRNF)-8
zL?V$$q--p70cijul4_DJNIE8I)P40q(mP4Zk{+4a$I!KwE#@$=2<(y0o@;wJblqji
zsR26~#5A)5)I!(qTh0RTvkN&5egX@j`{7GYEvKBMr2p$m0*(ON1;}Zz4IIf^*S^qV
z65NtBRA9Uz7c&=?c+3N%lHN+%UvTIjlE%#JL$?8{as|~?yd1fhxyGWZ2s&TY*r|em
z8DKDLKwuD<>9CIDp5*wA4cu@~gcV>QL;C^O7T`t)dAfNi%*u{$ISrn+ljP()ZTd|n
zNj)d1g`A|M{ub@~Tgb^Q3E1=~XtQWJS5p!`0s0c{``od1TusUO*rTAwMGG3_&p6Un
zQbsu|qzv-FyhlOvg$i;7w;E6WIy0o7`L^R$BHt+4mNhzMkNQh!@nn>gTTUY1q6a~X
zUgRW-?kD{gYQ+;;4CX1hDmhv8A*o|IiCn$8+(CUXUd~Y1GKnW#m$?>lN-A{0tSWP{
z-<a85Nz;;cyZHI8q-htU9Ll`Kn(|hE(Y^~gg-UWYi~w^k<_7T9eKy>&IqF+O<wD7i
z`JN)9oWfoddkO+fHF^pHOjdgiN?z{hNhoo_tje_A_HiA&E$Nx0OJ?>hrTu`U2a?W7
zx@l&2IxPq=N#l}EOFALxl%z39hg9F|YV4iuxX&lmw~RI=y^-`v(uSE)ia|<Pv<D`E
z>%c=`i~MZ4Sl5BcJpB*0aR^LEx-996q?4Z0y_R%O(tR^q57p<aVy1xA0<My7Sp}v-
zduS!52CM}X)65!G_zw_Z7+4BzqYX>I@W1N!ItEc6ARkIP8u~<~@LtkIGke+mg*QRK
zxTNQjhV#ZMiO-VGn%PG3pcg^Zry?&TO@!`shpbCFV`kqQ2Yjt4&Z_t1$kjZXJm5>v
zwa`5+s&-$u*cV9$Lie;ww$1Ed;}2hg%9#gw!pweqsobtc)rf*ph=Njxf>MZrB9TZW
i5{X12kw_#`Ier1w4j6m{3c}+60000<MNUMnLSTaL&aQF*

diff --git a/xabber/src/main/res/drawable-xxhdpi/ic_alert_white_24dp.png b/xabber/src/main/res/drawable-xxhdpi/ic_alert_white_24dp.png
deleted file mode 100644
index 65fc214f2b708f3369b808e0c2a64b3d9ed95702..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 921
zcmV;K17`e*P)<h;3K|Lk000e1NJLTq002k;002k`1^@s6RqeA!00006VoOIv00000
z008+zyMF)x010qNS#tmY07w7;07w8v$!k6U000Sga6xAP002k;002k;&Ux?!0009d
zNkl<Zc-rlnu}<7T6h-eK(a=!Q(nTUoB&4(`A3z`ah?)kaOiK~bQ1b(P06!4YB9Lf6
zqJk0{D4+nbCxva11RIaX^LA{QBW=a*?3=4QW_@HSlgVT<nM?$LRbVys9D@Xy1y0M?
zZ0dOi2e8RAo2lm+6u<&-^H)GOz(VS|1_Q9mOLkMwH3)!Z;Hf5{Ctx}Ce5u26zyZx1
z050{MDFa%gowd|+rV3{cxbO(*0+>rR=S;$kzDrv4c;90A-uDBr2;6zJr{WIq3G;0L
z>~#pIVlVaF(+Xz=m;?kg0ajAaZynAIa1;<u#SxJ5x@jKJdXI1_)>H4pDx7)XDndY4
z!2Go4o@QNtNQ!X-x=^n5b^w-uhY0PdcmS4C?<;0N`w_#b*iXH$SmCT1gi~RzXHD;v
zDb(qSB&*|aCh3!N?$K%w))(mw*@dHW?G4Kfm^Fw(nVw6s{+E0!>4S6b+G26b25rec
z9F^a(HHGhq2hAF_mRHvCWjuP8c8zKg5R667;-^t90s;d)8#QqXHF_#PQ}{fDbFN`M
zx~wDVQqo7~+<mM)#lA@UYE&zt>)B`xqEMozk~$0ahz*jYdlfCZjIpnn4f+`pjsbJ!
zEW?3tjT-wRT@g*s_C8`13iMD?@b8ewN37yl(r4$~q|g3h9I<bG!ZBpIoUIqV8bqN!
z&(+fu8Z}6gu2tNp-G(mEw?VNqsujKUY;c1pl;?@0p+7G7sKObYg?zYAgSIvNa8%B?
z9s1#*fGAYwn4U%retNd^5yM`iS`nmYLmFhQQLPBlvz;2m^fam!o%L+j2AOD7*MLDl
zo%O8u5EM%DPzD~`@P}d@6BV~0$3AcN+H9#ZcPzq5z>K6FUp?!);jfb3(!)zD<(^t;
zO)*rXc45j#tinsr`ZOrDMzz9A&%WBAJ{ol-wCdTm1`S1{TG6U!8yi$A%U?2n0%QOn
z>5FsjcikVGE{?r5>d0u+vrR{As2bIZMm_tYL9sOI2&vVxbqyN2Mzx|=&;HY(5ouH_
vUg+8X8#ES;YDF(So5^G{nM@{=c}M&K?W?)iUj+sW00000NkvXXu0mjf`zD=n

diff --git a/xabber/src/main/res/drawable-xxhdpi/ic_attachment_grey600_24dp.png b/xabber/src/main/res/drawable-xxhdpi/ic_attachment_grey600_24dp.png
deleted file mode 100644
index 6428fdd1f0950789be11879c20e3596ccbd66e98..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1385
zcmV-v1(y1WP)<h;3K|Lk000e1NJLTq002k;002k`1^@s6RqeA!00006VoOIv00000
z008+zyMF)x010qNS#tmY07w7;07w8v$!k6U000Sga6xAP002k;002k;&Ux?!000E^
zNkl<Zc-rlnT})g>6vzK(_z>6#B-PfENK-V?8WWB6quGTAYuFg0i9CrPPl8))vNf<D
z?2}%NFTIx#DlsvnC5>r~%7aZ~O9C%Euq#4*FfpX@1Cv(KkTi{y3%bj_$A_hHx$NE@
z5V&id-`k!$GkfO0GiT16yMRKWP$(1%g+ifFC=?2XLZMJ76pE67wquZZJpLpzKTAYM
znE3$!cLAvNcy1<uYee)jfG+`D)OG!rT@$FgySuu)yu6c{PY}`l9*ZHvDuA<@Oy=!@
zfq~z4RG@e~{vtD<0?_F7thc~TB6>~N^@}o%HziOw9KNHfs_Fv(A+KloFR=mi7>04G
zSVL)n!r^djRaMmm08hI#TL3T(V4j(8c&PvpRWkDdB0377KA%WL)K+XINeQHBTBT{4
zqX3TP`yv1z3n9+T&CPu^GBRR$DU6d)C{$5jU*EyZ?*X{m@pzGl4(Yl+U#Ne%%$Jy^
zIhaozW=;V(*4Nkfo!3GXVrXb61K^`bBr+<5xD4Q-oX54y{4Rhu3iU6#g4P1^7aKYf
zovEp*Ij(71+G`PH>Fw=pv~BwvWYdsatXh`U)ZgEKEnlB9w*kAmyQ_r|mjKi`9t|6Y
z(K#_OQBvEf7|CSv55M2PNJP))n1vAHr&KC6ldq5K7OSYJ=wN2&QJ(bqd~eD+rD>X2
zT3Tu+qILj>0qjGOA7-l<hEa4!EG{k%*VWaX#QGooIRGE#YcJdevu*n=hsk2*F4=9B
zNF<t;mzSrB=sbWI05t5BII;{44P}^lJlE!y=oVZ-(P;E3XGdl}CmWDsvDkf<Wu*Y@
z^-_?02qCUAbMCzM7i{Y?PS9y6D=RxK<AA1V0>G!GD9&anxPpl2h{Lo{U0t1$8Pqh*
zmjFDT=g~NTZ<*QC;BMP?Bhf$Miiir{&D?_YA;;&hHBGZ6eQ0+YnEBPdzP?Yq6b8s9
zjzrYz@a@M!?cKK6p4<;a^t-GRMD&EiG*$}Y06=YR?d#Z>wp`wdK<nx`%zRze31)VR
zTN0UeZ*OlS5xws)uUeK>@IK}y(4u3KdmsrBtrL@(ANE?DNF;K=w(U`@&!Pd~Y@sZ=
zm_W`+-XrS_Gdr`=U^E(i#S39Vp-@FU9`6!D%wYXJ49H$q-*M|-F!PMXVwaH3FmJKo
z^ZEA61nO8U_A-EcF=w2JrjRX%?kLQ>Z#&8z1y3<%o+6@Lf%dMftoQ*;7IV($^L=KT
zW)C(V^{vd@TCD$ek$aRo#R1SGQ&n`^Vq;E&Wm%mvj;*b-c4P}^rN&JnYLlrZ0!7Ll
z(P;Ds$92PE=0|0(8;L}s$+qp!nfb8Ss$h#nd)JF&b8|CeeH;=*^hhumJSS7?n4Fxv
z(c0R2I-O2`Pehdf?gUVSBA4WC!UQl!L^DJ*Kt#t4!#F=RHMO*vL0nhR+N+%_*!cEh
z*f5NaU6`cj{I4pCTcK!eCYelL2?PQS$QHYDc`ThyKjZiNr&Fm^DF)+hL8^Ea3<k$C
znM?q{!CX5L-AhDWfk5D3OH0f3hK7b;XJ=<wX3YNzJNaI0UI_8$Zcawm^^=|nv?fwX
zzgd;3NpF@-9k+vngMS%@ag2!C09^H2klkQQ`G~IT7gkqS9|Um1t=M!sa9jO9XeYLq
rLZMJ76bgkxp-?Ck3WY+UP{{K)T?)}VzdL1W00000NkvXXu0mjftCM*Z

diff --git a/xabber/src/main/res/drawable-xxhdpi/ic_avatar_2.png b/xabber/src/main/res/drawable-xxhdpi/ic_avatar_2.png
deleted file mode 100644
index 58a9128d052eb4d511280a750ebea55b99af3ef3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2877
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

diff --git a/xabber/src/main/res/drawable-xxhdpi/ic_avatar_3.png b/xabber/src/main/res/drawable-xxhdpi/ic_avatar_3.png
deleted file mode 100644
index 4ac026663bef71b15d3bba4f6f4561f3c0b2f077..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3578
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
JVV%Aw;XlqxpHKh*

diff --git a/xabber/src/main/res/drawable-xxhdpi/ic_avatar_4.png b/xabber/src/main/res/drawable-xxhdpi/ic_avatar_4.png
deleted file mode 100644
index d1ef0a16845919096a11fcafc2dd771568743fcd..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3604
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
IU3ZB6AN5YC761SM

diff --git a/xabber/src/main/res/drawable-xxhdpi/ic_avatar_5.png b/xabber/src/main/res/drawable-xxhdpi/ic_avatar_5.png
deleted file mode 100644
index 5ca2426090d6e353df77962224c14a20f8e68cb4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3110
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

diff --git a/xabber/src/main/res/drawable-xxhdpi/ic_avatar_muc.png b/xabber/src/main/res/drawable-xxhdpi/ic_avatar_muc.png
deleted file mode 100644
index 5a936be92b9aad53d53b3915c0691917c6951595..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4397
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
Km2%}Lum1<~Gc=n3

diff --git a/xabber/src/main/res/drawable-xxhdpi/ic_chat_white_24dp.png b/xabber/src/main/res/drawable-xxhdpi/ic_chat_white_24dp.png
deleted file mode 100644
index 2ced3eb419868e96210f6f8420af275caa5f539d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 606
zcmV-k0-^nhP)<h;3K|Lk000e1NJLTq002k;002k`1^@s6RqeA!0006dNkl<ZcwX(C
zJx;_h5QP&8emZK-fP^T3f*ZgUH~@5T04g{DG>8LmhCKlV1r3NRP}4323NO-vv{K^i
zj6HIkd6C?Cobl&3Gj=xFy5bciP?JxX009jsgn$SrE{RY<u?lLMW&>lKqn)AcqHV^l
zNp|ZwJorF+LVK+1`a9%NP(gsR1LGOmUiN9(IPivHPXXz(Z}?t7fU^#x7qopF-$pZP
z3+bp&Ng+TNFnk!zG;AHY1fct_TZ8~T!{FG~uhESD3P1-^KwmJ}9?cYN9hn2rmK0E%
z-P=6m;sT(~XbOcG0YMrBw1^KXXdqD#5CO&25_1Lh-5}0wy){k(jl`OOa)%fdq+9`s
z%v1Jdhz-yrpwa-P438XRnOCtKlS+9{0#X*4WQSFjdF2YE3<JqntYW2AF@_jJY?%OJ
zSoFx13X){V0{e0wq)ZXX_CW=TX31r91zG1H>Aps~U<8yq#Hb+U3P`2i*PkJl_~;;A
z80H{l1hC96z-bip1KTyJR7>rz0VMimvQ#jCeiM*E4x)kpHI$?Yh=Bg%PW2L}Ck3fq
z1NH>y3RUc`D~~e=Rn<Gd9BMvA@Sva;&WZM8mZ<_t^Es68@xm=u;kxwQv{eq8ESwft
zY?7WdoLE4UhZ6(H1sp9PH*hq7T)~k7atB8O$R(Ur0l9^<3Lw{Th5+46_4pt;67kPX
sh92fiXnO2R1yMn9x~GDupg0Bn0-1POSRuf0D*ylh07*qoM6N<$f_bd^7XSbN

diff --git a/xabber/src/main/res/drawable-xxhdpi/ic_edit_white_24dp.png b/xabber/src/main/res/drawable-xxhdpi/ic_edit_white_24dp.png
deleted file mode 100644
index 2beb2b4279e750488b07e8add9a7979d45ff4d6d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 504
zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY1|&n@ZgvM!Y)RhkE<hRxemd{22U45`9+AaB
z8myGT?PRtcNU*HHF&!>=uJQvb0|R5Tr;B4q#jUruEQ1a^2)I2IW4y7ClTkAK0YgiQ
zOzQ>K=?ib9Z0jf%*sOBIrT<7HH&?aStCio*{CUrC=}UN&w^6W{=F%xatDZG*8nEAM
z@P8n4qdV?;7>iFMYyIwQxlG=^2@R43=bznjj(TLH_Fzl93Bz(-l?NpZe#IW?$`i{L
zr{5@B(*5FVwbPjf=JX}~FLv4#&TG_va6#~;ZIzk+oaIv&+Dv?Q@pI+l3Z<`8Y9_`t
zKW+^9mTSkD&J$#8;XENP%VKTY9=jz9vD>>QH<etnI_I_|srblB{>;wL4>~q?ZF#@-
z+*}PA<J~5k7xT=nH{5)^V`t2%iYE*)fd^S5Ef_6AZJsZwsTJreXqnt&Eb7PO_c8zJ
zA;G?aO%HV3l>S^_ThO8`^YG81nH=hD%ir7&0`Z<Oy^22iQmFC7hWGc*^zB~vyU#5m
z{6xCEHjDaBp5>uC_b*6cd$sy-A<HV^<D4tvWY`z%Ds*GI+HcIXf?e%m_WiI0Wd&>u
jTU!@T2?7S*tvBqc1*?+vJ(l_d<A%Z0)z4*}Q$iB}Dj(4v

diff --git a/xabber/src/main/res/drawable-xxhdpi/ic_help_circle_grey600_24dp.png b/xabber/src/main/res/drawable-xxhdpi/ic_help_circle_grey600_24dp.png
deleted file mode 100644
index a0bd78ae264f513078b5eac4a0fd75b6069ea829..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1862
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
Ag8%>k

diff --git a/xabber/src/main/res/drawable-xxhdpi/ic_list_white_24dp.png b/xabber/src/main/res/drawable-xxhdpi/ic_list_white_24dp.png
deleted file mode 100644
index 6b7e78f83f46fc0e40457ebae088c83b0cad08c4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 230
zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY0wn)GsXhaw6p}rHd>I(3)EF2VS{N990fib~
zFff!FFfhDIU|_JC!N4G1FlSew4N!t9$=lt9;eUJonf*W>XMsm#F#`j)FbFd;%$g$s
z6pZt9aSX}0_x8FWAA^7Z%K__;|Mf3xt%y-Hie9A_d2*8SJuhwrI9M?I%h{X1-km>O
z85)%8aKHIdxD>~UX)Ad^7|7V^?6A!z)d3DlXIjnR>fdNC_6ledgQu&X%Q~loCIE-<
BM#KOB

diff --git a/xabber/src/main/res/drawable-xxhdpi/ic_search_white_24dp.png b/xabber/src/main/res/drawable-xxhdpi/ic_search_white_24dp.png
deleted file mode 100644
index 0bbeab15018d2d779acfa48a6d31812bd822c0c2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 871
zcmV-t1DO1YP)<h;3K|Lk000e1NJLTq002k;002k`1ONa4|Kxkj0000WV@Og>004R>
z004l5008;`004mK004C`008P>0026e000+ooVrmw00002VoOIv0RM-N%)bBt010qN
zS#tmY3ljhU3ljkVnw%H_00Q4hL_t(&-tE~<OB+EP$MHxGNsCFNUQN<ts4t)>c&g|N
z5EJwTh$skwz7N5N6vS$Uo>hDS62XHl^&maQClVj%p;|<c2+6kxOFOf>jXTSKlL$Mx
zh5i5XAu~I(vlAlJUY}3^3P1rU06i;E4>^`7a?Tw!?x;{?ku2S<0FAKC1J3P%Ery#3
z8sr;Kw=WDd1N4Gr+_pLeqW*%?e8;RElJXDqh6~JFg^WL-v;*fS%Vf#WNtjMD<XGX_
zfs~X7y|i`K1(QS^u8c6nrLE(l(je<l{z$ArP@Hwk^#xhbpylqFbrF`QuGREQg7kT3
z)@58?tJ;?XjaWL%eW2cPLsFn^Z79bK0$*{Z)NaUtdbBlb(lBybsjbo_0m^CfPQ)-W
z%8gP#Dgjzj0+&4u%vGg+K>}1%0<#`K<4XOG1n67|^s*}TDfMLu(47+4=>Zf|>Te}L
zH6<|Y0Tfp1Ywhq4#g+Pd2~efo#*liK<vf5Ul=@u>(4rE!;sLa#)Xz(RvP$5!hnf19
zQa>gE>ekk>DZ|JaZ7oa4toB<<=p}K3zyv>(+D)m)k74bp=959-XRY#`+!NzhEjaHo
z?!8vEC;13FV0k{yyW-TfIr^>auH%Dc7qQ-OEF~<R1#{BdpeToypSWV$akmv^MjOfi
z2gcKdi=AsqTSOk)4XcdPM~pCW`j}u%n|J>GpB;Ye?K2J}lXga0`t3)`)^Sg@18pmG
zYD#jm6cn_(r%|ghM}!XTyAv~#yUY67cfr~Fd!u6^rKCY2LJYA%^*@v<o7${==AC3V
z<hmGTfgQ@+QsbU7yUa6YTS8xZC;9chInAksbnK4g-z#t@QnHnx5NS@#N&X%bcp&+G
zc9F7?jvABvKTb(;Y$Nry_B6<d)SN@7q<d1c&cW=Yk~67!M{`Mz+6$zUO0Dj)$4~Dc
xQmNI0S|^oSecM|}y}>bg017|>C;&ZY&~Mf+D9V0d!fyZo002ovPDHLkV1g`zh|d53

diff --git a/xabber/src/main/res/drawable-xxhdpi/ic_stat_play_circle_fill.png b/xabber/src/main/res/drawable-xxhdpi/ic_stat_play_circle_fill.png
deleted file mode 100644
index 549fdce13781fd26f937825f69a69e40cc6781af..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2076
zcmV+%2;=vOP)<h;3K|Lk000e1NJLTq002k;002k`1^@s6RqeA!000N$Nkl<ZcwX(C
zY0O<i7{`0<`z|CzYTtusEwQyi7YWg-SVD=?YEji{wAzY>NNk}(kqRL`*w>0`NvWbj
zYO5AeKJ<e~h_x+>*Z=pLdvki;bI!~;cV>Ft=AGo9TlYO@X3p=<GxN;z%+cu8Qwj+*
zdiWF*=mBIIA<+PJbaZT_zHBUQA?+g_BkeC8Ds3(8Ep27`yGozSrC+4arLUw#=5wV!
z*EAZ9zhjL4pnwEr6FtQ4(q7Vu2Fl_3+_~bz{iypsk=~cyl)jNx2-cq!>$Bb#43OX)
zt=0!h$4W;@+e<#%`&spUAiXEe6{L5pPg~&vpB?UH%;-4vW2n?$+E3cFLchw~!sz*0
zdP{m<S|C_|m8qcUT5o^^X9qQOt#p|gEgSmkq+>n*=sM=CC#C6v^u6PKg_pGrNMJTI
zW^}7Q`}*jVhdMq|9aE(F0`*5b^|b{^aQ0N=7fBN(R;N0Z)#}XM(!+v;305kV00|8D
zF$rT*gKG$<34{4*u5^dAP@w)TOQ|X#{FjFeBz&7X7yPBg(kKD?xNJvD1JdZhk69q$
z+;yk&yE;3ltUKTg$e0z&Hoix9gVX#Wf73tk;Fk$hhs&>91`rkBE*<YuagDF}P<@*q
zKv;pbH~})N6>!dw>OSY#9-29ciF>>teQCSc3ds05lT=Y1mvY<l<^3Js=w1njlDR3j
zxBz0yFk7mdpHmf1^FI8fa|P(7%7D!FVU8-Oi-+7Ul=S_0+yeyZhrEh&N08t!*RXxK
z#&@r3R^J2a&((Pw+#*0H>BeWIooe<#zPm$k?o0uimsN2Qpc%U13Ms^{{6*D!khHJw
zr>$7uBLZ}ZGawV}nxz{EhlVKQRO!poOo>S2<{=s>Q74<(5m~-bml0&bq%7;#OQC{Y
z<J6fMYHLf=&IS4;G`m5Ghw^zT0k(Ujsp;@-79fJ>_y~i1_8?VPCm_BPBm(s~pjS$S
zW<!{?%cBsH9HV|MO<tS@=oDQ*RE`K?sL}#tAhBW+A($$i6RJ^5y~MaNv*&UFnV9ko
zrlVFTvW*8>3sAEj<F${`f8Qj<c1+p45@4GmNH~$5Wi1HmAd@94%&BcWyvwbbfXrxO
z9>U}pO)L_mj$#!yutNoi^in3E9rf)pscPQJ^+9q08A!}SeWbC{5GmFw2bjJB^lcs>
zLK@_mLYG27&BisNS=sPUMoYVf?v$yYtw+mgOq&?~$z2gT;snTyCbA~v+6cEC5utC)
zLAT_MARIS-t<c38P+~NZ&%aYTO(M@9s*nX4kq78){UJugurweun%Ea!C5;Sda*G6r
zba`h<n;235!$SQuiFzvmGLTr+hDq!baV&k0rX>Q@+G3>v5!7xTK?%vJGN6RX9jSj$
zkWTm9=amA~Vvq*p6zTUs&Icg+j$4Ac5f0wYL%;qvE0sJG>o$OlxsiUlRGKDnyv9o@
z0>tU97%sk#5p;<9O0@HA$!DH!wE(pkq)qHoH5Mucl>Buo12W+l&I7QT5lix&hFU5>
z2j`hs-IsYH444!v*dAW&scR*L%lw08(hJmftJ=~d$RscEaM{R)oCY4%2)a0L1hH&#
zR3vn924u1;Ea^o2Vx*s@3DC`XfY|da3{6M%I{^|LHmK)I<E7mq^ou423lO=$&XS&_
zapk{|@Gn9ZTeyRm5FS0jv-2ck*D=aZYNU?<alAMa5VlRW;pD)*u?5VChfk)n61(|W
z1?w4-%(SLQ5KHEC)47nHDgt!58fG4hHENR2$vih%fJi2G9YK5}yC0yBr=)EI5=sZ{
zi6Hith=&gk*ltnPzv_<!?a3y$N>)~bxC?Qika6i`+6S}dL_XnFLM^^`=dQdluh9au
z#0H3DAxXpQq|k{&;ILibC^7GItgD>Z8nt~N&z;O@04g)JBQxWd<kUmU<#zoU9Iqp^
z`+~$=gGq1WcweZ?ShYq9&Kv0liViP8bX1^U6*~w1fuWwbWWA3I&V^a`6agZ`%4F>=
zj8L-Eu`cI0-Y@}rr7R$p{M#hVVSO&_KgSAC<{LtV>1EADyXa=zZVr#HkL5Ex)Ih=c
zF7M&2`FBAg_VTP0E4vx%hrqOk3(nI;4Y~lr)yIKj!x(DWj|HXK4(4>f#Lk^WMQ*VI
z;!cesj>?g=V>GQRN6r^SUc8$x;jHq)aA9!*WFT><lS!LgRCg|fl_v@gr|qq!44`HR
zf+Hd^a%a}gSGa(rL_cY<06D!o<_xIW8RKQY+6^HA=PZGFtqj=GfQ-3ug!eItpjO@I
zB<39E8g}Zu=~Jpy1;l+PNSuc4FU1UMm3cr`E2adF&b;nwR>=k`0ZNz~2QNv(a6+|i
zknnTxl4rTBR(aIh0%XjM37Zh@jZ%yQPA($|51E6Yb8LQ&t+KWOB}Nkgf8JH+FhR(?
zRnapsYS>^;D%w8Spm;N}bVDYG)lc7(sv)LC_A~S;Rf1hBq<5t!q<MK8&oW?|*LoX4
z8L)6HIlDt<g4K=~x6k&7A>;J1GR@8kc2xnAzQ<>WyYxpRioF}JHXL9^6d6(iWmWTT
z<gHk;c@Lg*1my6Rr^BQ^zyu#b86%2l0CN-JRT2ZFk%5O##qpKiQZv=VNq5dFGfH^z
zmbY;jDg2L?_-<7)HRBUVx~`xjC}hWD)!hTgLb?Z#1<-$VS2$;uvi5BN0000<MNUMn
GLSTY_UgI$U

diff --git a/xabber/src/main/res/drawable-xxhdpi/ic_status_available_18dp.png b/xabber/src/main/res/drawable-xxhdpi/ic_status_available_18dp.png
deleted file mode 100644
index 9dc7da76f971f5c0cfe67a19c4d738999ff1e23d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1804
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

diff --git a/xabber/src/main/res/drawable-xxhdpi/ic_status_away_18dp.png b/xabber/src/main/res/drawable-xxhdpi/ic_status_away_18dp.png
deleted file mode 100644
index 22809e9a1b0f076b45a25ed4530379fd5d13a0bc..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1874
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
M07*qoM6N<$f+0a{RsaA1

diff --git a/xabber/src/main/res/drawable-xxhdpi/ic_status_chat_18dp.png b/xabber/src/main/res/drawable-xxhdpi/ic_status_chat_18dp.png
deleted file mode 100644
index 3f83767116d13b4c73b86b5378c8ae1e1840bdec..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2425
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

diff --git a/xabber/src/main/res/drawable-xxhdpi/ic_status_connection_18dp.png b/xabber/src/main/res/drawable-xxhdpi/ic_status_connection_18dp.png
deleted file mode 100644
index bff0c53b4612f9d88a28f7689a8e4726845e36bd..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2450
zcmV;D32pX?P)<h;3K|Lk000e1NJLTq001@s001@!1^@s6j74hQ000SDNkl<ZXhZE<
z2~bp57CmU(Fe92pV@+yejE0!iEy`$!34>UIMl>QWAc`Ua3SvNHQBfIG76sXnov@0y
zM#-4TR%XU*I1@F|876AnjYeD$1(CV;)7||3G~NF<-7}Sxx9S$v|KEGxJMX@C-+Aw2
zf#0ZD{6=x%A+TRtW*=ruX~vqHoBNT^P*Q8s{-jo<kB~Ny-XJ|o`ft*IT3A?IRT|%r
zy~#30Ksc5SsSD|3(m{qASG{khzsE?cNGk~BS2F$dnspeM3eZGqC5&_oX-8r*$b+N_
z43t3fZ=<9modAJ)ky?!<bu_AV{Z9MobpU~@F($TAzz9$$YHTU#Cem)kG%VBS4%w|C
z-9iAHWcmnZih&U*OY%!4^-$7K2W?Bp-;==Il^aJ9FapKd*+J?gw*eE{?W9<41dg+4
zP-FumP+cfmG3j)JQO#%YA%&hM2b>aM(G)b)e0`Q3Ig@~S8?u%KjIza5Zx3l_alrdc
zO<Wn#<q_U@O)pIpzjJ4;Cb<#b0-OmP_orPk2#h-ZD0%-t`m{L8g9i_=dgEp|IoRQk
zBZr$D)veog2#=1%#)uGDTK15}zeEp45V#BNH7p0%N^;&H4NzEKiIkiIczevj{8>yk
zOe=@KJ%VN7Ycc*UTdZ9Xh)$h&htZOB0_I~BFv`|r<oG=)^FEDy_x%Yh30Z~y{rVy`
zHVTjT>0??{6zzKL4J=%?0_QJXMv&hkOrP9_1KcCCVFZq6QybBnF#@)NJa`k<$i0RJ
zc=`w7r*jvOn-qsZ&kis-D0RS-H9ul;P#CE5D9=j46OZ#aYe^2hTc8M-iUa<GoL&_>
z?%MwsY}}d(mv@}-p0AhLK&b;~7nNaKVF_lx>kNOddD8Z7(u4lG%742VBVZ%Q=^JSz
zci%vqzjz5HnMvsP<P!#gH8eEh@VC`C`ol@o-na?N9^El`;InvZtPLLR+0&qZ-JN>O
z_FjtmyLYiYI}KL7ekb+e3b|YQP#-Yfvv}{)NX@C!aPwJ)sg4s6;@`S%EB5Z!wFYqb
zn`%TSq~OZcYi$59sD*B>aCM$6Of|6_`0J;ze{(FlbYV^a6jkg(QdS;<mw4mdNqmsd
zl5OO_NC_~eFwSBJbpr`et6`%m@#ijFgu7oL4wU4hd-qm8{LyEJur4kU4ULU@vodSi
z6a*}quVv%4d?jW~al-g<w!-tvSAK@G$0EF8^EzVJ@aafPjuEg|lmI(P#?Ol#!lGjE
zcbZlo6z9^EYS~)~%6A|&rw~QyiFj_nGs3e|Kb@tD7J|AvhG`w=Dt_H6j2Xo<AGlLr
zkBP1x7(HSbV%D@09oL0^;Js~cQMPo`=8@xdrZp{ePDNGWU?$yF3~Z*?5@B6rCA1dG
zfUrnfKPPaoqDa$V#D+L<#^lQ2fdi1AyjinXdHM(A%(-(yO!fY?HZ}n~Ma!r<KJ)bN
zrJ-#I*q7pm?E&NaiCVEC)0+u1+%anSP(+9GF3=**bG^{JS1;rx#|yuik&K@{hq6^K
z7nfjHn7TzMDl9R{>8RXSh24c&ngW$sP=cJ|GNf!;j}fo6nR$~5*giSH`0_=IuH3Gx
zgM*7Z9PQsm#Bx4k0{8FV7oNQ`#2Sgwk;1d9*M7mIIi89@u`v&poh{!ifB=*uv!ECS
zDVy>9a|4BE#g)6UH8U5nk>RkVwI-371guOBFlHLe$27tjnBd|DhqvFv>YxDOc@t%4
z0s*rgG*B2xmdih1#T562ih)Ii2El&Z8-icf`=x>wrY2Ap2MEv9g)4qt1jddUDUCma
zfNhrpj8DmRVnb%}6K8th<rl0Gw>Dh!%4LBsnh9V<Zo2S{vuHPUmceQ$?b)_1n}p1>
zL?<L;Pt`}*SCpe+8)><P$S>Q0jQ9<B?WG}7cP9eIcO)9ow~z6zuC*I__$@~xb-XxZ
zt0q8jWHb(a`85ud=A*Y&FX6dA6_l^4nY750r}{pL^6XS}rG1MB(9L(5P~y3GsQ0*4
zT#!Eh0z30F!S)h)o$R#8gg#)^<UC9qV14{nR8eK(;C)rBqh#kEBxdB`&*8!NlkHf+
zy!yLiSQ@$pTyW&bN`GHCJ30uaH9rywAYkLhjK-$bt>u2&JZ}MHMNXP@L+1<Fe)LYO
z*y#h7M-EySHoNwJNIWr3SYup7SS}FzcBO3~BQ6>*S`XIXP!|A0z<9mHMuut1I@2yL
zKHP=_9a&h;5(#ke^by)ruWwOYzDedAXD!hOjE~<f3r8iFXnIT~2Ed&Wud}GlNdn#J
z*0pup<0)0Tb1zb9Z8Yj&A3XX_<L&UCj~99ne-sNdme2rS4W-I0*^Z3-BCS~=vd^Gc
zi<JOl8o_t#Erd-aesm5ya`ZT|6Js!BaLX+=SInMmPr1Uoi<hqm)A#5JBEhvpf-PG}
zu%o@5rs7FEb@$#qbnn(e&u-qjjafv3`8N}9UWXD<MuORyMxC#l?ZtsUIrKM#615sP
z#)j4aAFj<S>3Q!Xue1Vzix&ulSt7US_fv|FEh=Dh>2JO`7&8l>;BfFMI(g$dT`a(4
zNROZR7kon^(8tOOrQ4D<Srj#pOQ3YJ0YfKfo)28NUl8~9Kc~;YD{!U28#Cggg)0J6
z%eCvZSP&2_Fq!!Et1z0VoJ9C)U^oHetBW=w=Q4-S6gg7Q$`7g#la!8;Lthm#XKLYd
z+@7j~@SZyx^JmY{6<%l2P#ekt#;f%R=}Y41e7P4z`x=idpU+G!%oS^I-a-&vKj^rj
z>iG4WYOV1Hy-!HB>N2mlnp0<psJ5_jQ_8jL*YQ~I-fd3T)CP~~J5n|;ZQEeR)DF6C
ztV{_+L98?a<!i`Z2{68E&Led*6x59G`OM`)zzlv)k_}8XC3(G7l1?&X=i3X-=dJk!
zO4bQh5ik`vKGI~9&io&O%cZs!6DTIUvP3a36*&I9!q-Jy4%>VVk=3$1BW4!dPAY+V
zAkU@6$|zv!2B@I$IfV~rrvBW*m5<kxKLI+e1d!UcL%>woV|Fr6HL`y&rV|pMkLh<D
z>HqKFA;cY`?D2i|G*YGsOq{jPBKi@ZS7oS#GW3}V2B%|FvAqtcK=O?X6Flab;(s|}
zj`s^GPci-k^fl>m0%Y_*tLW-Sho_<`M%NrM9s)DRsG2k8!;G18bj=a_zu0F%WOcId
Q(*OVf07*qoM6N<$f{SC500000

diff --git a/xabber/src/main/res/drawable-xxhdpi/ic_status_dnd_18dp.png b/xabber/src/main/res/drawable-xxhdpi/ic_status_dnd_18dp.png
deleted file mode 100644
index d02832690e7afb0662e41da0482d356591491407..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1834
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
YA1mgERVQjhF8}}l07*qoM6N<$g1ii0Gynhq

diff --git a/xabber/src/main/res/drawable-xxhdpi/ic_status_unavailable_18dp.png b/xabber/src/main/res/drawable-xxhdpi/ic_status_unavailable_18dp.png
deleted file mode 100644
index 27e184ba9d624fec1678aabe89aebd9265d147d3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1716
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
KMNUMnLSTY!vo&Y{

diff --git a/xabber/src/main/res/drawable-xxhdpi/ic_status_xa_18dp.png b/xabber/src/main/res/drawable-xxhdpi/ic_status_xa_18dp.png
deleted file mode 100644
index ca2328f1f56c728d6198593e62fa90a331cae277..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1930
zcmV;52X**~P)<h;3K|Lk000e1NJLTq001@s001@!1^@s6j74hQ000M3Nkl<ZXhZFq
z2~bsK6vxkF7bHWF2VtnG1fmj~GHIq|7Kn<b=D49!ZkbLwsc7XgWvRH;Br1xS6WWwZ
zZrNBCxg?4rgNT5mXz@T)e4y;h>wg{>2Jy+e_rCYU9L~%c-sOJZ`M%#h_gl{Su7aLY
zQ9Pww)B^T@^K6U9q<T!F(I`>pCFqM#S7;lk1+)TM2>l0|1x-;X6t|_?*H_+X9s>y5
z3WAP;4uN*j*SK(BgTEJ{N1#6e@{GuOO%^j4OaKZ-D+{47Llyaj6?8IFP082pQM#&_
zR0ZW!SW-om)f%$0P|&k>mh`-%HFb5dCEt$r)X&R-+P1djjxyv?=sE@kBwx!CgTMgQ
z4Xv(%hE&&R==X~SwCmJOI+}Wi$}4L`cgWVtoCb7vpm%~?XpoO1nbr2{Fmw*!u820&
zpr9-;0GYwY2hbH74Ot&Ne~Z4@ca5&zES1xT2kLmZ+S1(64m2#lnE^|1b1`%+0IQ`K
zmkb6dTQsl%8lHQ%oFaE!p~J~WAN%x14@X)v(Sww2te9sfbPC|g#KK7e1C%uk?}iRe
zxqgo(MW;~?#*eAQ-N}ZcBfKcE^E2GUUg&thu^07<XfQzW=#GbuJOmHTioHz5<&xeG
zy`9ljz}nJ`)=coAQ9-<V(67)DV&J5JEr-#_-%<-GVpAHGR*0J%Lj9b`$zJ<9QF=}>
zC0^krOqy6(n9+ALz3H{?ZMouRfKAh9K@=Fg6#_&1vu~A}4_bbn)Wuc$?AG5u66r^N
zo$R&OTaM+>LX1f{;(#S$&s-n!Zg0m+Kp5cmH)TgJ7@%77!!E6;Za;KY3h~&IBE|ya
zHeXP-qF)yH5+L(%=?^&7qxvESYym2N8Fk<~tvrw|g-Ki1m|$#g(yPzW%5h!!=SG0d
zkOc;B@k@Q_#_cj?|7A&ZzfAgMVQer9a|I<V4&Yr2PshH1OV<V0q{jd@50zHT-H}N<
zj^|4DmMJ{OHp2p)Y4dwt{4*9{5t6`!J>Ug+sb`Om|CT+q8{1<HVF|DOwIqN#D{YH#
z>8fk`f279%=8sBAd(Y(4v@JTlEy{zY0ON*v+cke^N38<^_H*OTGzAuk!po<|q|?5$
z`Jy0n6*3hV?<tQj2_%JrVgNQ(3fNxk*u(rI6G??Vp<FQ)7<=TzvOu0hE&{BF6tIk|
z`K2B~pBNVRnF@?SHbi*R$ll6IVVvD*2&eN^6ef-`Y@e*gev>NKS=xH01p6?=og%|J
zaWg^iTA~;*&QGX!oyw!xaT!l6*w{WUv@V=eDl`OO2gQJK@<kQ<r-~NDbG}8sn9^gz
z0@_i`R1V^448VR61I95zUR;8T=6!EGFpdcBmx<p%*L5`bt7O9N=b@)N91HcP+J$;F
zz<v}1#!+(d?!<hWu~q&W)_9D`^?PqjVAt{=PCHC^#g$egR)Y)%80SdprKxqS=wyc4
ze)#GXx&6`BYxpY4HS{R328(ncz>>s*oxfF7;p;R1G*uyOCRaxEawg~6yoGGpc`{F%
zzH2O;Hh8<YGbdn`08@(vi$lTi0n5%&+Q0W@cgmC%Pb>{2>_9k^%o*ngq^Vbt!|#oY
z5b?$!@_o{zi_%uR^FWGj6TqfR0qcOmS*J49mSItbjWbg`lsUofv}m|?ahA3T<{H?6
z9L0WdV8Fselcw3Ef?L2%$3FEZPd7WxQ@BV9TLiF)_`5yoAkqT+v!%9gvhpFmP82u8
zo9%A{)D&F}>5HH_L3#l*l4rlANyM4o<`#3oTV8H<+!;TBU6KqYcx^KN#&T+aQv}T|
z<NCVNTBN=qIwy^~{)x#_aRxXUW6gWa`cz6tzuRnVot#_IVWi(2TN@$$CU}hx^!~_G
zSJ=G%`8mSE{n+97{A~9}^$F9Vjd$~nJEYfRbrtF|R_w9xZ_}uxLV7Ar?$fYFihIYb
z?$p1V1Dl8j)J%Q0q=1>jSR8abpNGAVLkY3@dwrc~>b|YDIju*`#UToWW3EwRj*~=#
z39lrNw>{8MK3w2qq&xRGGB=Iz?jrhKPx9%Y&HZz{H5pK%P8TJC32+?JY=w@=$}OQe
z+cPNXDyR31C)}w}|8}$rschkFdK>;V9Z;eNw`4E@jz4SQ!}QO}t7^=*VlTPo&<!do
zl^#SkejMH0>}VeHg~3>a(K+5(a620SCGOlxFenSGt}~cW`r!B1P(L-oiue<`6ps)i
z6P}bJeE!7~!??aK^p+2R6xy!`cs$JpP_`6Xb!80#6THW}lS#spb?2`KPG=R;@yq-<
zL=jz9mC#Lm9#Ml+_&VWJ%8u<?@mUx3>e7bZ?CD5uZP|=gjzOcK&G$J(!zT&v+2MKw
zbTo7z)TS03>8_H>`tLk!0LA0R4zpbY;kbxBv=bgmkmI4obqw~Hu1*M$0l3EjpeMB9
zCr7-;D}ZK0IiYeEng$^GVY-e^m;}riPux%&EntQ|!N*;{#bb~Ai5uG9f0mx%Rf^0y
QmjD0&07*qoM6N<$f`Kcs0RR91

diff --git a/xabber/src/main/res/drawable/ic_cellphone.xml b/xabber/src/main/res/drawable/ic_cellphone.xml
deleted file mode 100644
index b89b49f185..0000000000
--- a/xabber/src/main/res/drawable/ic_cellphone.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<!-- drawable/cellphone.xml -->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:height="24dp"
-    android:width="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path android:fillColor="#96616161" android:pathData="M17,19H7V5H17M17,1H7C5.89,1 5,1.89 5,3V21A2,2 0 0,0 7,23H17A2,2 0 0,0 19,21V3C19,1.89 18.1,1 17,1Z" />
-</vector>
\ No newline at end of file
diff --git a/xabber/src/main/res/drawable/ic_client_adium_10dp.xml b/xabber/src/main/res/drawable/ic_client_adium_10dp.xml
deleted file mode 100644
index 929b53e298..0000000000
--- a/xabber/src/main/res/drawable/ic_client_adium_10dp.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<vector android:height="10dp" android:viewportHeight="49.181"
-    android:viewportWidth="49.181" android:width="10dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FF000000" android:pathData="M26.05,39.15c1.22,-0.06 1.97,0.03 5.53,0.84c3.56,0.82 4.41,2.34 5.41,2.22c1.28,-0.15 -0.38,-1.64 -0.75,-2.25c-0.44,-0.72 0.4,-2.84 0.09,-3.34s-1.12,0.22 -2.56,0.62c-0.68,0.19 -2.19,-0.09 -4.31,-1.09c-2.13,-1 -5.13,-1.31 -8.01,0c-2.87,1.31 -5.18,1.25 -6,1c-0.81,-0.25 -1.94,-0.38 -1,1c0.94,1.37 0.38,1.94 0,3c-0.37,1.06 -0.37,1.31 0,2c0.38,0.69 2.88,-1.88 6,-3C23.58,39.02 25.65,39.17 26.05,39.15zM18.45,43.15c1.69,0.69 4.69,-0.94 7,-1c2.32,-0.06 7.76,1.66 8.01,1s-4.88,-1.97 -8.01,-2C22.33,41.12 18.45,43.15 18.45,43.15zM19.45,25.65c0,1.93 0.45,3.5 1,3.5c0.56,0 1,-1.57 1,-3.5c0,-1.94 -0.44,-3.51 -1,-3.51C19.9,22.14 19.45,23.71 19.45,25.65zM28.46,25.65c0,1.93 0.44,3.5 1,3.5c0.55,0 1,-1.57 1,-3.5c0,-1.94 -0.45,-3.51 -1,-3.51C28.9,22.14 28.46,23.71 28.46,25.65zM15.45,22.14c0,-4.41 2.02,-8 4.5,-8c2.49,0 3.63,3.84 3.63,8.25c0,4.42 -0.08,8.44 -2.56,8.44C18.53,30.83 15.45,26.56 15.45,22.14zM12.2,38.15c0,0 -1.44,-4.75 1.5,-3.81c2.94,0.93 4.38,1.06 6.75,-0.19c2.38,-1.25 6.57,-1.25 9.01,0c2.43,1.25 5.25,0.87 7,0c1.75,-0.88 3.81,0.25 3,2c-0.81,1.75 -1,3 -1,3s2.44,-4.31 3,-5c0.56,-0.69 2,-1 2,-1s-1,0 -1,-1s1,-4 1,-4s-1.13,-0.94 -1,-2c0.12,-1.07 2,-3.01 2,-3.01s-3.38,-0.18 -3,-2c0.37,-1.81 1,-5 1,-5s-3.06,0.44 -5,-1c-1.94,-1.43 -6.94,-6.75 -8,-8c-1.07,-1.25 -1.75,-2.12 -5.01,-2c-3.25,0.13 -4.25,1.63 -6,4c-1.75,2.38 -5.37,6.19 -7,7c-1.62,0.82 -3.81,1.38 -4,1c-0.19,-0.37 1,4 1,4s0.69,2.13 -1,2c-1.69,-0.12 -2,0 -2,0s1.81,3.69 2,5.01c0.19,1.31 -1,3 -1,3s1.75,0.18 2,2C8.7,34.96 10.14,36.52 12.2,38.15zM34.58,22.14c0,4.42 -3.08,8.69 -5.56,8.69c-2.49,0 -2.56,-4.02 -2.56,-8.44c0,-4.41 1.13,-8.25 3.62,-8.25C32.57,14.14 34.58,17.73 34.58,22.14z"/>
-</vector>
diff --git a/xabber/src/main/res/drawable/ic_client_adium_18dp.xml b/xabber/src/main/res/drawable/ic_client_adium_18dp.xml
deleted file mode 100644
index c795b2cdce..0000000000
--- a/xabber/src/main/res/drawable/ic_client_adium_18dp.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<vector android:height="18dp" android:viewportHeight="49.181"
-    android:viewportWidth="49.181" android:width="18dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FF000000" android:pathData="M26.05,39.15c1.22,-0.06 1.97,0.03 5.53,0.84c3.56,0.82 4.41,2.34 5.41,2.22c1.28,-0.15 -0.38,-1.64 -0.75,-2.25c-0.44,-0.72 0.4,-2.84 0.09,-3.34s-1.12,0.22 -2.56,0.62c-0.68,0.19 -2.19,-0.09 -4.31,-1.09c-2.13,-1 -5.13,-1.31 -8.01,0c-2.87,1.31 -5.18,1.25 -6,1c-0.81,-0.25 -1.94,-0.38 -1,1c0.94,1.37 0.38,1.94 0,3c-0.37,1.06 -0.37,1.31 0,2c0.38,0.69 2.88,-1.88 6,-3C23.58,39.02 25.65,39.17 26.05,39.15zM18.45,43.15c1.69,0.69 4.69,-0.94 7,-1c2.32,-0.06 7.76,1.66 8.01,1s-4.88,-1.97 -8.01,-2C22.33,41.12 18.45,43.15 18.45,43.15zM19.45,25.65c0,1.93 0.45,3.5 1,3.5c0.56,0 1,-1.57 1,-3.5c0,-1.94 -0.44,-3.51 -1,-3.51C19.9,22.14 19.45,23.71 19.45,25.65zM28.46,25.65c0,1.93 0.44,3.5 1,3.5c0.55,0 1,-1.57 1,-3.5c0,-1.94 -0.45,-3.51 -1,-3.51C28.9,22.14 28.46,23.71 28.46,25.65zM15.45,22.14c0,-4.41 2.02,-8 4.5,-8c2.49,0 3.63,3.84 3.63,8.25c0,4.42 -0.08,8.44 -2.56,8.44C18.53,30.83 15.45,26.56 15.45,22.14zM12.2,38.15c0,0 -1.44,-4.75 1.5,-3.81c2.94,0.93 4.38,1.06 6.75,-0.19c2.38,-1.25 6.57,-1.25 9.01,0c2.43,1.25 5.25,0.87 7,0c1.75,-0.88 3.81,0.25 3,2c-0.81,1.75 -1,3 -1,3s2.44,-4.31 3,-5c0.56,-0.69 2,-1 2,-1s-1,0 -1,-1s1,-4 1,-4s-1.13,-0.94 -1,-2c0.12,-1.07 2,-3.01 2,-3.01s-3.38,-0.18 -3,-2c0.37,-1.81 1,-5 1,-5s-3.06,0.44 -5,-1c-1.94,-1.43 -6.94,-6.75 -8,-8c-1.07,-1.25 -1.75,-2.12 -5.01,-2c-3.25,0.13 -4.25,1.63 -6,4c-1.75,2.38 -5.37,6.19 -7,7c-1.62,0.82 -3.81,1.38 -4,1c-0.19,-0.37 1,4 1,4s0.69,2.13 -1,2c-1.69,-0.12 -2,0 -2,0s1.81,3.69 2,5.01c0.19,1.31 -1,3 -1,3s1.75,0.18 2,2C8.7,34.96 10.14,36.52 12.2,38.15zM34.58,22.14c0,4.42 -3.08,8.69 -5.56,8.69c-2.49,0 -2.56,-4.02 -2.56,-8.44c0,-4.41 1.13,-8.25 3.62,-8.25C32.57,14.14 34.58,17.73 34.58,22.14z"/>
-</vector>
diff --git a/xabber/src/main/res/drawable/ic_client_conversations_10dp.xml b/xabber/src/main/res/drawable/ic_client_conversations_10dp.xml
deleted file mode 100644
index c3e462ad89..0000000000
--- a/xabber/src/main/res/drawable/ic_client_conversations_10dp.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<vector android:height="10dp" android:viewportHeight="24.000229"
-    android:viewportWidth="24.001152" android:width="10dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillAlpha="0.5" android:fillColor="#000000" android:pathData="m23.137,23.995c-0.221,-0.025 -0.478,-0.112 -2.008,-0.685 -0.719,-0.269 -1.459,-0.546 -1.644,-0.615 -0.185,-0.069 -0.353,-0.134 -0.373,-0.144 -0.037,-0.019 -1.585,-0.601 -1.704,-0.641l-0.065,-0.022 -0.08,0.036c-0.766,0.349 -1.52,0.621 -2.221,0.802 -0.631,0.163 -1.386,0.287 -2.103,0.347 -0.323,0.027 -1.234,0.037 -1.589,0.018 -0.319,-0.017 -0.77,-0.057 -0.823,-0.074 -0.021,-0.01 -0.109,-0.021 -0.196,-0.031 -0.921,-0.115 -1.986,-0.39 -2.88,-0.745 -0.964,-0.383 -2.007,-0.961 -2.789,-1.544 -1.031,-0.77 -1.932,-1.7 -2.651,-2.736 -0.131,-0.189 -0.295,-0.441 -0.295,-0.454 0,-0.01 -0.06,-0.111 -0.133,-0.234 -0.339,-0.571 -0.665,-1.258 -0.894,-1.886 -0.306,-0.84 -0.526,-1.797 -0.608,-2.641 -0.011,-0.116 -0.027,-0.23 -0.034,-0.253 -0.023,-0.072 -0.034,-0.267 -0.043,-0.749 -0.018,-1.039 0.089,-1.973 0.343,-2.969 0.096,-0.377 0.279,-0.962 0.315,-1.004 0.01,-0.01 0.043,-0.09 0.076,-0.176 0.523,-1.373 1.304,-2.632 2.305,-3.717 0.393,-0.426 0.664,-0.694 0.961,-0.949 0.85,-0.73 1.706,-1.286 2.722,-1.766 0.345,-0.163 0.752,-0.336 0.819,-0.347 0.022,0 0.128,-0.039 0.235,-0.078 1.475,-0.531 3.069,-0.785 4.59,-0.729 0.209,0.01 0.457,0.016 0.551,0.018 0.184,0 0.511,0.037 0.853,0.086 1.258,0.18 2.456,0.545 3.604,1.099 0.124,0.06 0.242,0.122 0.262,0.138 0.02,0.016 0.102,0.064 0.182,0.106 1.426,0.759 2.744,1.866 3.749,3.151 0.087,0.111 0.168,0.209 0.18,0.217 0.033,0.022 0.402,0.558 0.551,0.8 0.513,0.833 0.891,1.658 1.186,2.592 0.087,0.274 0.232,0.835 0.232,0.895 0,0.025 0.014,0.113 0.032,0.196 0.103,0.487 0.177,1.057 0.209,1.617 0.019,0.333 0.01,1.233 -0.019,1.533 -0.053,0.585 -0.134,1.096 -0.255,1.617 -0.032,0.138 -0.058,0.262 -0.057,0.275 0,0.059 -0.146,0.558 -0.282,0.943 -0.188,0.53 -0.406,1.024 -0.683,1.545l-0.158,0.297 0.021,0.092c0.011,0.051 0.081,0.328 0.153,0.615 0.073,0.288 0.135,0.548 0.138,0.578 0,0.03 0.204,0.835 0.448,1.789 0.785,3.071 0.736,2.867 0.736,3.06 0,0.222 -0.07,0.387 -0.231,0.541 -0.106,0.102 -0.194,0.15 -0.326,0.177 -0.08,0.016 -0.206,0.02 -0.305,0.01zM6.358,12.917c0.561,-0.075 1.018,-0.512 1.105,-1.058 0.021,-0.131 0.01,-0.372 -0.026,-0.499 -0.032,-0.121 -0.114,-0.293 -0.191,-0.403 -0.073,-0.105 -0.243,-0.265 -0.354,-0.334 -0.449,-0.28 -1.013,-0.277 -1.454,0.01 -0.12,0.077 -0.31,0.269 -0.382,0.387 -0.074,0.12 -0.137,0.277 -0.166,0.415 -0.033,0.155 -0.021,0.432 0.025,0.578 0.068,0.217 0.161,0.374 0.316,0.529 0.298,0.298 0.706,0.435 1.127,0.378zM12.105,12.917c0.525,-0.07 0.952,-0.448 1.086,-0.96 0.037,-0.14 0.033,-0.455 -0.01,-0.596 -0.114,-0.41 -0.433,-0.743 -0.84,-0.876 -0.161,-0.053 -0.25,-0.066 -0.444,-0.064 -0.146,0.001 -0.198,0.01 -0.299,0.032 -0.414,0.104 -0.755,0.396 -0.901,0.772 -0.06,0.153 -0.082,0.275 -0.082,0.443 -0,0.346 0.116,0.629 0.36,0.873 0.115,0.115 0.214,0.187 0.348,0.251 0.255,0.123 0.506,0.164 0.779,0.127zM17.865,12.917c0.182,-0.024 0.381,-0.099 0.548,-0.204 0.108,-0.069 0.273,-0.228 0.348,-0.337 0.082,-0.118 0.132,-0.222 0.178,-0.367 0.032,-0.1 0.034,-0.123 0.034,-0.332 0,-0.193 0,-0.238 -0.027,-0.319 -0.082,-0.282 -0.248,-0.521 -0.482,-0.692 -0.116,-0.085 -0.313,-0.176 -0.463,-0.213 -0.107,-0.027 -0.154,-0.032 -0.309,-0.032 -0.376,0 -0.663,0.109 -0.922,0.356 -0.268,0.255 -0.391,0.54 -0.391,0.9 0,0.324 0.118,0.614 0.344,0.847 0.114,0.117 0.219,0.195 0.361,0.265 0.245,0.122 0.51,0.165 0.781,0.129z"/>
-    <path android:fillAlpha="1" android:fillColor="#000000" android:pathData="m21.747,23.536c-0.413,-0.155 -1.172,-0.44 -1.686,-0.632 -0.514,-0.192 -0.942,-0.356 -0.95,-0.364 -0.012,-0.012 0.039,-0.145 0.251,-0.647 0.238,-0.565 0.267,-0.641 0.273,-0.718 0.01,-0.075 0,-0.09 -0.024,-0.127 -0.016,-0.023 -0.055,-0.057 -0.086,-0.076 -0.064,-0.038 -1.945,-0.743 -2.056,-0.771 -0.093,-0.023 -0.247,-0.023 -0.357,0 -0.061,0.013 -0.199,0.072 -0.451,0.193 -0.473,0.227 -0.772,0.35 -1.247,0.517 -0.118,0.041 -0.228,0.083 -0.244,0.094 -0.043,0.027 -0.069,0.096 -0.06,0.156 0,0.027 0.104,0.348 0.222,0.714 0.118,0.365 0.214,0.673 0.214,0.684 0,0.022 -0.075,0.047 -0.406,0.135 -1.183,0.313 -2.474,0.452 -3.68,0.397 -0.265,-0.012 -0.814,-0.055 -0.883,-0.068l-0.036,-0.01 0.01,-0.087c0,-0.048 0.039,-0.333 0.078,-0.634 0.075,-0.584 0.077,-0.634 0.028,-0.734 -0.05,-0.101 -0.154,-0.148 -0.434,-0.197 -1.289,-0.221 -2.452,-0.64 -3.579,-1.291 -0.28,-0.162 -0.371,-0.19 -0.498,-0.156 -0.087,0.023 -0.174,0.128 -0.544,0.653 -0.249,0.353 -0.361,0.501 -0.377,0.502 -0.037,0.001 -0.461,-0.298 -0.785,-0.552 -0.968,-0.761 -1.799,-1.646 -2.475,-2.641 -0.195,-0.286 -0.238,-0.357 -0.23,-0.375 0,-0.01 0.244,-0.155 0.535,-0.326 0.291,-0.171 0.556,-0.335 0.59,-0.365 0.11,-0.098 0.144,-0.212 0.104,-0.345 -0.012,-0.038 -0.102,-0.224 -0.2,-0.413 -0.562,-1.074 -0.896,-2.121 -1.05,-3.294 -0.035,-0.263 -0.047,-0.294 -0.134,-0.34 -0.086,-0.046 -0.202,-0.045 -0.789,0 -0.792,0.066 -0.735,0.063 -0.743,0.037 -0.034,-0.109 -0.049,-1.161 -0.022,-1.574 0.064,-0.989 0.236,-1.89 0.534,-2.811 0.09,-0.276 0.096,-0.292 0.123,-0.292 0.011,0 0.31,0.093 0.665,0.207 0.705,0.226 0.729,0.231 0.837,0.181 0.076,-0.035 0.118,-0.096 0.191,-0.277 0.462,-1.141 1.158,-2.219 2.01,-3.111 0.183,-0.192 0.221,-0.276 0.183,-0.403 -0.021,-0.069 -0.03,-0.079 -0.513,-0.538 -0.273,-0.259 -0.491,-0.477 -0.491,-0.488 0,-0.03 0.315,-0.319 0.641,-0.587 0.965,-0.796 2.078,-1.452 3.242,-1.913 0.077,-0.031 0.116,-0.041 0.125,-0.032 0.01,0.01 0.123,0.274 0.257,0.593 0.141,0.336 0.263,0.608 0.289,0.646 0.034,0.049 0.061,0.072 0.104,0.091 0.096,0.041 0.19,0.027 0.528,-0.08 0.704,-0.222 1.277,-0.347 1.983,-0.434 0.389,-0.048 0.643,-0.063 1.238,-0.073 0.619,-0.011 0.663,-0.014 0.747,-0.068 0.047,-0.03 0.09,-0.131 0.105,-0.249 0.01,-0.057 0.033,-0.349 0.057,-0.648 0.024,-0.3 0.047,-0.551 0.052,-0.558 0.01,-0.016 0.142,-0.01 0.46,0.027 1.397,0.155 2.777,0.555 4.031,1.169 0.157,0.077 0.226,0.117 0.226,0.131 0,0.011 -0.145,0.283 -0.322,0.604 -0.177,0.321 -0.328,0.603 -0.335,0.626 -0.03,0.102 0,0.19 0.073,0.238 0.019,0.012 0.142,0.084 0.275,0.161 0.737,0.426 1.337,0.881 1.971,1.492 0.342,0.329 0.537,0.538 0.775,0.828 0.196,0.239 0.227,0.274 0.271,0.299 0.056,0.033 0.13,0.029 0.211,-0.011 0.038,-0.018 0.315,-0.203 0.616,-0.41 0.436,-0.3 0.551,-0.374 0.567,-0.364 0.043,0.026 0.374,0.506 0.575,0.834 0.587,0.959 1.013,1.954 1.298,3.037 0.08,0.304 0.101,0.417 0.079,0.417 -0.017,0 -1.137,0.233 -1.234,0.257 -0.12,0.029 -0.211,0.072 -0.245,0.115 -0.014,0.017 -0.032,0.06 -0.039,0.095 -0.015,0.068 -0.01,0.117 0.038,0.386 0.091,0.515 0.131,0.995 0.131,1.569 0,0.331 -0.01,0.525 -0.022,0.706 -0.039,0.447 -0.105,0.89 -0.186,1.258 -0.055,0.252 -0.048,0.362 0.027,0.429 0.079,0.07 0.15,0.091 1.133,0.333 0.202,0.05 0.31,0.082 0.315,0.094 0.021,0.053 -0.293,1.009 -0.475,1.444 -0.17,0.409 -0.377,0.842 -0.549,1.148 -0.048,0.086 -0.084,0.165 -0.084,0.185 0,0.041 0.048,0.242 0.196,0.82 0.06,0.234 0.106,0.432 0.102,0.44 -0.01,0.02 0.011,0.015 -0.721,0.194 -0.37,0.091 -0.632,0.16 -0.65,0.174 -0.059,0.042 -0.089,0.098 -0.089,0.166 0,0.041 0.208,0.888 0.606,2.464 0.333,1.321 0.603,2.406 0.599,2.412 0,0.01 -0.016,0.01 -0.028,0.01 -0.012,-0.001 -0.359,-0.129 -0.773,-0.284zM6.504,12.894c0.145,-0.036 0.362,-0.141 0.484,-0.235 0.237,-0.182 0.401,-0.437 0.47,-0.733 0.031,-0.133 0.028,-0.398 -0.01,-0.534 -0.15,-0.587 -0.661,-0.981 -1.273,-0.982 -0.608,-0.001 -1.12,0.38 -1.277,0.948 -0.028,0.102 -0.032,0.142 -0.033,0.312 -0,0.172 0,0.208 0.032,0.312 0.148,0.53 0.61,0.907 1.159,0.946 0.145,0.01 0.317,0 0.444,-0.034zM12.251,12.894c0.145,-0.036 0.362,-0.141 0.484,-0.235 0.237,-0.182 0.401,-0.437 0.47,-0.733 0.031,-0.133 0.028,-0.398 -0.01,-0.534 -0.129,-0.506 -0.524,-0.869 -1.046,-0.964 -0.151,-0.027 -0.409,-0.019 -0.56,0.019 -0.457,0.114 -0.82,0.463 -0.943,0.908 -0.03,0.107 -0.034,0.143 -0.034,0.315 0,0.171 0,0.209 0.033,0.313 0.147,0.529 0.61,0.906 1.159,0.945 0.145,0.01 0.317,0 0.444,-0.034zM18.015,12.894c0.117,-0.03 0.301,-0.112 0.409,-0.182 0.251,-0.164 0.447,-0.434 0.527,-0.726 0.029,-0.105 0.034,-0.146 0.034,-0.309 0,-0.215 -0.021,-0.325 -0.105,-0.512 -0.3,-0.671 -1.146,-0.952 -1.822,-0.605 -0.702,0.361 -0.908,1.256 -0.428,1.869 0.226,0.289 0.576,0.475 0.94,0.5 0.15,0.01 0.317,0 0.443,-0.034z"/>
-</vector>
diff --git a/xabber/src/main/res/drawable/ic_client_conversations_18dp.xml b/xabber/src/main/res/drawable/ic_client_conversations_18dp.xml
deleted file mode 100644
index 9797f66a0c..0000000000
--- a/xabber/src/main/res/drawable/ic_client_conversations_18dp.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<vector android:height="18dp" android:viewportHeight="24.000229"
-    android:viewportWidth="24.001152" android:width="18dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillAlpha="0.5" android:fillColor="#000000" android:pathData="m23.137,23.995c-0.221,-0.025 -0.478,-0.112 -2.008,-0.685 -0.719,-0.269 -1.459,-0.546 -1.644,-0.615 -0.185,-0.069 -0.353,-0.134 -0.373,-0.144 -0.037,-0.019 -1.585,-0.601 -1.704,-0.641l-0.065,-0.022 -0.08,0.036c-0.766,0.349 -1.52,0.621 -2.221,0.802 -0.631,0.163 -1.386,0.287 -2.103,0.347 -0.323,0.027 -1.234,0.037 -1.589,0.018 -0.319,-0.017 -0.77,-0.057 -0.823,-0.074 -0.021,-0.01 -0.109,-0.021 -0.196,-0.031 -0.921,-0.115 -1.986,-0.39 -2.88,-0.745 -0.964,-0.383 -2.007,-0.961 -2.789,-1.544 -1.031,-0.77 -1.932,-1.7 -2.651,-2.736 -0.131,-0.189 -0.295,-0.441 -0.295,-0.454 0,-0.01 -0.06,-0.111 -0.133,-0.234 -0.339,-0.571 -0.665,-1.258 -0.894,-1.886 -0.306,-0.84 -0.526,-1.797 -0.608,-2.641 -0.011,-0.116 -0.027,-0.23 -0.034,-0.253 -0.023,-0.072 -0.034,-0.267 -0.043,-0.749 -0.018,-1.039 0.089,-1.973 0.343,-2.969 0.096,-0.377 0.279,-0.962 0.315,-1.004 0.01,-0.01 0.043,-0.09 0.076,-0.176 0.523,-1.373 1.304,-2.632 2.305,-3.717 0.393,-0.426 0.664,-0.694 0.961,-0.949 0.85,-0.73 1.706,-1.286 2.722,-1.766 0.345,-0.163 0.752,-0.336 0.819,-0.347 0.022,0 0.128,-0.039 0.235,-0.078 1.475,-0.531 3.069,-0.785 4.59,-0.729 0.209,0.01 0.457,0.016 0.551,0.018 0.184,0 0.511,0.037 0.853,0.086 1.258,0.18 2.456,0.545 3.604,1.099 0.124,0.06 0.242,0.122 0.262,0.138 0.02,0.016 0.102,0.064 0.182,0.106 1.426,0.759 2.744,1.866 3.749,3.151 0.087,0.111 0.168,0.209 0.18,0.217 0.033,0.022 0.402,0.558 0.551,0.8 0.513,0.833 0.891,1.658 1.186,2.592 0.087,0.274 0.232,0.835 0.232,0.895 0,0.025 0.014,0.113 0.032,0.196 0.103,0.487 0.177,1.057 0.209,1.617 0.019,0.333 0.01,1.233 -0.019,1.533 -0.053,0.585 -0.134,1.096 -0.255,1.617 -0.032,0.138 -0.058,0.262 -0.057,0.275 0,0.059 -0.146,0.558 -0.282,0.943 -0.188,0.53 -0.406,1.024 -0.683,1.545l-0.158,0.297 0.021,0.092c0.011,0.051 0.081,0.328 0.153,0.615 0.073,0.288 0.135,0.548 0.138,0.578 0,0.03 0.204,0.835 0.448,1.789 0.785,3.071 0.736,2.867 0.736,3.06 0,0.222 -0.07,0.387 -0.231,0.541 -0.106,0.102 -0.194,0.15 -0.326,0.177 -0.08,0.016 -0.206,0.02 -0.305,0.01zM6.358,12.917c0.561,-0.075 1.018,-0.512 1.105,-1.058 0.021,-0.131 0.01,-0.372 -0.026,-0.499 -0.032,-0.121 -0.114,-0.293 -0.191,-0.403 -0.073,-0.105 -0.243,-0.265 -0.354,-0.334 -0.449,-0.28 -1.013,-0.277 -1.454,0.01 -0.12,0.077 -0.31,0.269 -0.382,0.387 -0.074,0.12 -0.137,0.277 -0.166,0.415 -0.033,0.155 -0.021,0.432 0.025,0.578 0.068,0.217 0.161,0.374 0.316,0.529 0.298,0.298 0.706,0.435 1.127,0.378zM12.105,12.917c0.525,-0.07 0.952,-0.448 1.086,-0.96 0.037,-0.14 0.033,-0.455 -0.01,-0.596 -0.114,-0.41 -0.433,-0.743 -0.84,-0.876 -0.161,-0.053 -0.25,-0.066 -0.444,-0.064 -0.146,0.001 -0.198,0.01 -0.299,0.032 -0.414,0.104 -0.755,0.396 -0.901,0.772 -0.06,0.153 -0.082,0.275 -0.082,0.443 -0,0.346 0.116,0.629 0.36,0.873 0.115,0.115 0.214,0.187 0.348,0.251 0.255,0.123 0.506,0.164 0.779,0.127zM17.865,12.917c0.182,-0.024 0.381,-0.099 0.548,-0.204 0.108,-0.069 0.273,-0.228 0.348,-0.337 0.082,-0.118 0.132,-0.222 0.178,-0.367 0.032,-0.1 0.034,-0.123 0.034,-0.332 0,-0.193 0,-0.238 -0.027,-0.319 -0.082,-0.282 -0.248,-0.521 -0.482,-0.692 -0.116,-0.085 -0.313,-0.176 -0.463,-0.213 -0.107,-0.027 -0.154,-0.032 -0.309,-0.032 -0.376,0 -0.663,0.109 -0.922,0.356 -0.268,0.255 -0.391,0.54 -0.391,0.9 0,0.324 0.118,0.614 0.344,0.847 0.114,0.117 0.219,0.195 0.361,0.265 0.245,0.122 0.51,0.165 0.781,0.129z"/>
-    <path android:fillAlpha="1" android:fillColor="#000000" android:pathData="m21.747,23.536c-0.413,-0.155 -1.172,-0.44 -1.686,-0.632 -0.514,-0.192 -0.942,-0.356 -0.95,-0.364 -0.012,-0.012 0.039,-0.145 0.251,-0.647 0.238,-0.565 0.267,-0.641 0.273,-0.718 0.01,-0.075 0,-0.09 -0.024,-0.127 -0.016,-0.023 -0.055,-0.057 -0.086,-0.076 -0.064,-0.038 -1.945,-0.743 -2.056,-0.771 -0.093,-0.023 -0.247,-0.023 -0.357,0 -0.061,0.013 -0.199,0.072 -0.451,0.193 -0.473,0.227 -0.772,0.35 -1.247,0.517 -0.118,0.041 -0.228,0.083 -0.244,0.094 -0.043,0.027 -0.069,0.096 -0.06,0.156 0,0.027 0.104,0.348 0.222,0.714 0.118,0.365 0.214,0.673 0.214,0.684 0,0.022 -0.075,0.047 -0.406,0.135 -1.183,0.313 -2.474,0.452 -3.68,0.397 -0.265,-0.012 -0.814,-0.055 -0.883,-0.068l-0.036,-0.01 0.01,-0.087c0,-0.048 0.039,-0.333 0.078,-0.634 0.075,-0.584 0.077,-0.634 0.028,-0.734 -0.05,-0.101 -0.154,-0.148 -0.434,-0.197 -1.289,-0.221 -2.452,-0.64 -3.579,-1.291 -0.28,-0.162 -0.371,-0.19 -0.498,-0.156 -0.087,0.023 -0.174,0.128 -0.544,0.653 -0.249,0.353 -0.361,0.501 -0.377,0.502 -0.037,0.001 -0.461,-0.298 -0.785,-0.552 -0.968,-0.761 -1.799,-1.646 -2.475,-2.641 -0.195,-0.286 -0.238,-0.357 -0.23,-0.375 0,-0.01 0.244,-0.155 0.535,-0.326 0.291,-0.171 0.556,-0.335 0.59,-0.365 0.11,-0.098 0.144,-0.212 0.104,-0.345 -0.012,-0.038 -0.102,-0.224 -0.2,-0.413 -0.562,-1.074 -0.896,-2.121 -1.05,-3.294 -0.035,-0.263 -0.047,-0.294 -0.134,-0.34 -0.086,-0.046 -0.202,-0.045 -0.789,0 -0.792,0.066 -0.735,0.063 -0.743,0.037 -0.034,-0.109 -0.049,-1.161 -0.022,-1.574 0.064,-0.989 0.236,-1.89 0.534,-2.811 0.09,-0.276 0.096,-0.292 0.123,-0.292 0.011,0 0.31,0.093 0.665,0.207 0.705,0.226 0.729,0.231 0.837,0.181 0.076,-0.035 0.118,-0.096 0.191,-0.277 0.462,-1.141 1.158,-2.219 2.01,-3.111 0.183,-0.192 0.221,-0.276 0.183,-0.403 -0.021,-0.069 -0.03,-0.079 -0.513,-0.538 -0.273,-0.259 -0.491,-0.477 -0.491,-0.488 0,-0.03 0.315,-0.319 0.641,-0.587 0.965,-0.796 2.078,-1.452 3.242,-1.913 0.077,-0.031 0.116,-0.041 0.125,-0.032 0.01,0.01 0.123,0.274 0.257,0.593 0.141,0.336 0.263,0.608 0.289,0.646 0.034,0.049 0.061,0.072 0.104,0.091 0.096,0.041 0.19,0.027 0.528,-0.08 0.704,-0.222 1.277,-0.347 1.983,-0.434 0.389,-0.048 0.643,-0.063 1.238,-0.073 0.619,-0.011 0.663,-0.014 0.747,-0.068 0.047,-0.03 0.09,-0.131 0.105,-0.249 0.01,-0.057 0.033,-0.349 0.057,-0.648 0.024,-0.3 0.047,-0.551 0.052,-0.558 0.01,-0.016 0.142,-0.01 0.46,0.027 1.397,0.155 2.777,0.555 4.031,1.169 0.157,0.077 0.226,0.117 0.226,0.131 0,0.011 -0.145,0.283 -0.322,0.604 -0.177,0.321 -0.328,0.603 -0.335,0.626 -0.03,0.102 0,0.19 0.073,0.238 0.019,0.012 0.142,0.084 0.275,0.161 0.737,0.426 1.337,0.881 1.971,1.492 0.342,0.329 0.537,0.538 0.775,0.828 0.196,0.239 0.227,0.274 0.271,0.299 0.056,0.033 0.13,0.029 0.211,-0.011 0.038,-0.018 0.315,-0.203 0.616,-0.41 0.436,-0.3 0.551,-0.374 0.567,-0.364 0.043,0.026 0.374,0.506 0.575,0.834 0.587,0.959 1.013,1.954 1.298,3.037 0.08,0.304 0.101,0.417 0.079,0.417 -0.017,0 -1.137,0.233 -1.234,0.257 -0.12,0.029 -0.211,0.072 -0.245,0.115 -0.014,0.017 -0.032,0.06 -0.039,0.095 -0.015,0.068 -0.01,0.117 0.038,0.386 0.091,0.515 0.131,0.995 0.131,1.569 0,0.331 -0.01,0.525 -0.022,0.706 -0.039,0.447 -0.105,0.89 -0.186,1.258 -0.055,0.252 -0.048,0.362 0.027,0.429 0.079,0.07 0.15,0.091 1.133,0.333 0.202,0.05 0.31,0.082 0.315,0.094 0.021,0.053 -0.293,1.009 -0.475,1.444 -0.17,0.409 -0.377,0.842 -0.549,1.148 -0.048,0.086 -0.084,0.165 -0.084,0.185 0,0.041 0.048,0.242 0.196,0.82 0.06,0.234 0.106,0.432 0.102,0.44 -0.01,0.02 0.011,0.015 -0.721,0.194 -0.37,0.091 -0.632,0.16 -0.65,0.174 -0.059,0.042 -0.089,0.098 -0.089,0.166 0,0.041 0.208,0.888 0.606,2.464 0.333,1.321 0.603,2.406 0.599,2.412 0,0.01 -0.016,0.01 -0.028,0.01 -0.012,-0.001 -0.359,-0.129 -0.773,-0.284zM6.504,12.894c0.145,-0.036 0.362,-0.141 0.484,-0.235 0.237,-0.182 0.401,-0.437 0.47,-0.733 0.031,-0.133 0.028,-0.398 -0.01,-0.534 -0.15,-0.587 -0.661,-0.981 -1.273,-0.982 -0.608,-0.001 -1.12,0.38 -1.277,0.948 -0.028,0.102 -0.032,0.142 -0.033,0.312 -0,0.172 0,0.208 0.032,0.312 0.148,0.53 0.61,0.907 1.159,0.946 0.145,0.01 0.317,0 0.444,-0.034zM12.251,12.894c0.145,-0.036 0.362,-0.141 0.484,-0.235 0.237,-0.182 0.401,-0.437 0.47,-0.733 0.031,-0.133 0.028,-0.398 -0.01,-0.534 -0.129,-0.506 -0.524,-0.869 -1.046,-0.964 -0.151,-0.027 -0.409,-0.019 -0.56,0.019 -0.457,0.114 -0.82,0.463 -0.943,0.908 -0.03,0.107 -0.034,0.143 -0.034,0.315 0,0.171 0,0.209 0.033,0.313 0.147,0.529 0.61,0.906 1.159,0.945 0.145,0.01 0.317,0 0.444,-0.034zM18.015,12.894c0.117,-0.03 0.301,-0.112 0.409,-0.182 0.251,-0.164 0.447,-0.434 0.527,-0.726 0.029,-0.105 0.034,-0.146 0.034,-0.309 0,-0.215 -0.021,-0.325 -0.105,-0.512 -0.3,-0.671 -1.146,-0.952 -1.822,-0.605 -0.702,0.361 -0.908,1.256 -0.428,1.869 0.226,0.289 0.576,0.475 0.94,0.5 0.15,0.01 0.317,0 0.443,-0.034z"/>
-</vector>
diff --git a/xabber/src/main/res/drawable/ic_client_empathy_10dp.xml b/xabber/src/main/res/drawable/ic_client_empathy_10dp.xml
deleted file mode 100644
index d8f2b8da4c..0000000000
--- a/xabber/src/main/res/drawable/ic_client_empathy_10dp.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector android:height="10dp" android:viewportHeight="49.181"
-    android:viewportWidth="49.181" android:width="10dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FF000000" android:pathData="M12.45,40.65c0,0 5.38,5.75 8,2c2.63,-3.75 3.63,-7.25 3.63,-7.25s2.13,0 2.38,-0.75s-0.13,-3.63 -1,-6c-0.88,-2.38 0.12,-6.26 -4,-10.01c-4.13,-3.75 -9.13,-3.62 -13.01,0C4.58,22.27 2.83,32.4 12.45,40.65z"/>
-    <path android:fillColor="#FF000000" android:pathData="M30.46,28.65c0,0 -0.38,7.5 3,8c3.37,0.5 9.25,-5.25 11,-11c1.75,-5.76 -2,-9.88 -7,-10.01c-5,-0.12 -6.63,4.13 -7,6c-0.38,1.88 -2,5.26 -2,6.01S30.46,28.65 30.46,28.65z"/>
-    <path android:fillColor="#FF000000" android:pathData="M14.45,11.64c0,-0.55 0.45,-1 1,-1c0.56,0 1,0.45 1,1c0,0.55 -0.44,1 -1,1C14.9,12.64 14.45,12.19 14.45,11.64z"/>
-    <path android:fillColor="#FF000000" android:pathData="M28.96,8.14m-1.5,0a1.5,1.5 0,1 1,3 0a1.5,1.5 0,1 1,-3 0"/>
-    <path android:fillColor="#FF000000" android:pathData="M32.96,13.14m-1.5,0a1.5,1.5 0,1 1,3 0a1.5,1.5 0,1 1,-3 0"/>
-    <path android:fillColor="#FF000000" android:pathData="M18.45,7.64c0,-1.66 1.35,-3 3.01,-3c1.65,0 3,1.34 3,3c0,1.66 -1.35,3 -3,3C19.8,10.64 18.45,9.3 18.45,7.64z"/>
-</vector>
diff --git a/xabber/src/main/res/drawable/ic_client_empathy_18dp.xml b/xabber/src/main/res/drawable/ic_client_empathy_18dp.xml
deleted file mode 100644
index 0c2c7a0518..0000000000
--- a/xabber/src/main/res/drawable/ic_client_empathy_18dp.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector android:height="18dp" android:viewportHeight="49.181"
-    android:viewportWidth="49.181" android:width="18dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FF000000" android:pathData="M12.45,40.65c0,0 5.38,5.75 8,2c2.63,-3.75 3.63,-7.25 3.63,-7.25s2.13,0 2.38,-0.75s-0.13,-3.63 -1,-6c-0.88,-2.38 0.12,-6.26 -4,-10.01c-4.13,-3.75 -9.13,-3.62 -13.01,0C4.58,22.27 2.83,32.4 12.45,40.65z"/>
-    <path android:fillColor="#FF000000" android:pathData="M30.46,28.65c0,0 -0.38,7.5 3,8c3.37,0.5 9.25,-5.25 11,-11c1.75,-5.76 -2,-9.88 -7,-10.01c-5,-0.12 -6.63,4.13 -7,6c-0.38,1.88 -2,5.26 -2,6.01S30.46,28.65 30.46,28.65z"/>
-    <path android:fillColor="#FF000000" android:pathData="M14.45,11.64c0,-0.55 0.45,-1 1,-1c0.56,0 1,0.45 1,1c0,0.55 -0.44,1 -1,1C14.9,12.64 14.45,12.19 14.45,11.64z"/>
-    <path android:fillColor="#FF000000" android:pathData="M28.96,8.14m-1.5,0a1.5,1.5 0,1 1,3 0a1.5,1.5 0,1 1,-3 0"/>
-    <path android:fillColor="#FF000000" android:pathData="M32.96,13.14m-1.5,0a1.5,1.5 0,1 1,3 0a1.5,1.5 0,1 1,-3 0"/>
-    <path android:fillColor="#FF000000" android:pathData="M18.45,7.64c0,-1.66 1.35,-3 3.01,-3c1.65,0 3,1.34 3,3c0,1.66 -1.35,3 -3,3C19.8,10.64 18.45,9.3 18.45,7.64z"/>
-</vector>
diff --git a/xabber/src/main/res/drawable/ic_client_gajim_10dp.xml b/xabber/src/main/res/drawable/ic_client_gajim_10dp.xml
deleted file mode 100644
index 8acef46571..0000000000
--- a/xabber/src/main/res/drawable/ic_client_gajim_10dp.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<vector android:height="10dp" android:viewportHeight="49.181"
-    android:viewportWidth="49.181" android:width="10dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FF000000" android:pathData="M13.95,29.65c0,0 -6.31,-0.32 -6,-2c0.31,-1.69 2.63,-3.69 5,-5.01c2.38,-1.31 7,-2 7,-2s-3,-2.12 -3,-7c0,-4.87 3.69,-8 9,-8c5.32,0 7.69,5.25 8.01,7c0.31,1.75 -0.19,4.75 -1,6c-0.82,1.25 -2,2 -2,2s4.06,1 7.62,3.07c3.57,2.06 4.32,4.25 3.63,5.31c-0.69,1.06 -7,1.19 -6.57,0.88c0.44,-0.32 -0.37,8.87 -0.68,10.75c-0.32,1.87 -2.69,2.81 -5,3c-2.32,0.19 -11.01,0 -11.01,0s-3.31,0.19 -4,-4S13.95,29.65 13.95,29.65z"/>
-</vector>
diff --git a/xabber/src/main/res/drawable/ic_client_gajim_18dp.xml b/xabber/src/main/res/drawable/ic_client_gajim_18dp.xml
deleted file mode 100644
index bc9d4f78ca..0000000000
--- a/xabber/src/main/res/drawable/ic_client_gajim_18dp.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<vector android:height="18dp" android:viewportHeight="49.181"
-    android:viewportWidth="49.181" android:width="18dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FF000000" android:pathData="M13.95,29.65c0,0 -6.31,-0.32 -6,-2c0.31,-1.69 2.63,-3.69 5,-5.01c2.38,-1.31 7,-2 7,-2s-3,-2.12 -3,-7c0,-4.87 3.69,-8 9,-8c5.32,0 7.69,5.25 8.01,7c0.31,1.75 -0.19,4.75 -1,6c-0.82,1.25 -2,2 -2,2s4.06,1 7.62,3.07c3.57,2.06 4.32,4.25 3.63,5.31c-0.69,1.06 -7,1.19 -6.57,0.88c0.44,-0.32 -0.37,8.87 -0.68,10.75c-0.32,1.87 -2.69,2.81 -5,3c-2.32,0.19 -11.01,0 -11.01,0s-3.31,0.19 -4,-4S13.95,29.65 13.95,29.65z"/>
-</vector>
diff --git a/xabber/src/main/res/drawable/ic_client_gtalk_10dp.xml b/xabber/src/main/res/drawable/ic_client_gtalk_10dp.xml
deleted file mode 100644
index 27b07da1ca..0000000000
--- a/xabber/src/main/res/drawable/ic_client_gtalk_10dp.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<vector android:height="10dp" android:viewportHeight="49.181"
-    android:viewportWidth="49.181" android:width="10dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FF000000" android:pathData="M23.33,25.44c0.36,-0.12 0.69,-0.31 1,-0.56v-2.24c-0.69,0.07 -1.23,0.13 -1.66,0.16c-0.42,0.03 -0.82,0.11 -1.23,0.24c-0.36,-0.15 -0.64,-0.05 -0.83,0.28c-0.19,0.34 -0.28,0.67 -0.28,1.01c0,0.5 0.16,0.85 0.48,1.03c0.32,0.19 0.8,0.29 1.44,0.29C22.6,25.65 22.96,25.58 23.33,25.44zM5.45,21.14c0,5.46 3.1,10.34 7.75,13.55l-0.75,8.96l6.78,-6.03c2.14,0.67 4.41,1.03 6.73,1.03c10.77,0 19.5,-7.84 19.5,-17.51c0,-9.66 -8.73,-16.5 -19.5,-16.5C15.18,4.64 5.45,11.48 5.45,21.14zM17.38,26.6c-0.25,0.04 -0.57,0.04 -0.93,0.04c-0.82,0 -1.43,-0.22 -1.81,-0.69c-0.37,-0.46 -0.56,-1.21 -0.56,-2.24v-4.08h-1v-1h1v-2h2v2h2v1h-2v3.65v0.95c0,0.26 0.03,0.5 0.09,0.72c0.07,0.22 0.16,0.37 0.3,0.5c0.14,0.12 0.34,0.19 0.62,0.19h0.43h0.39h0.17v0.89C17.86,26.57 17.63,26.6 17.38,26.6zM24.33,26.65v-0.88c-0.22,0.16 -0.41,0.28 -0.56,0.41c-0.16,0.12 -0.38,0.23 -0.64,0.34c-0.28,0.09 -0.53,0.13 -0.78,0.13h-1.07c-0.84,0 -1.54,-0.21 -2.11,-0.65c-0.56,-0.43 -0.84,-0.98 -0.84,-1.65c0,-0.53 0.14,-0.97 0.42,-1.31c0.28,-0.33 0.7,-0.72 1.24,-1.18c0.53,0.07 1.18,0.05 1.93,-0.03c0.75,-0.08 1.55,-0.14 2.43,-0.19v-0.07c0,-0.72 -0.19,-1.22 -0.57,-1.5c-0.37,-0.29 -0.93,-0.43 -1.68,-0.43c-0.35,0 -0.75,0.1 -1.21,0.29c-0.45,0.18 -0.89,0.43 -1.31,0.71h-0.25v-1.65c0.25,0.37 0.66,0.42 1.22,0.11c0.56,-0.3 1.14,-0.46 1.72,-0.46c1.4,0 2.44,0.24 3.09,0.68c0.64,0.45 0.97,1.12 0.97,2.03v5.3H24.33zM29.58,14.64v12.01h-2v-12.01H29.58zM34.94,22.1l3.89,4.55h-2l-3.29,-4.02l-0.71,0.47v3.55h-2v-12.01h2v7.83l3.02,-3.83h1.98L34.94,22.1z"/>
-</vector>
diff --git a/xabber/src/main/res/drawable/ic_client_gtalk_18dp.xml b/xabber/src/main/res/drawable/ic_client_gtalk_18dp.xml
deleted file mode 100644
index 2b74001fd9..0000000000
--- a/xabber/src/main/res/drawable/ic_client_gtalk_18dp.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<vector android:height="18dp" android:viewportHeight="49.181"
-    android:viewportWidth="49.181" android:width="18dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FF000000" android:pathData="M23.33,25.44c0.36,-0.12 0.69,-0.31 1,-0.56v-2.24c-0.69,0.07 -1.23,0.13 -1.66,0.16c-0.42,0.03 -0.82,0.11 -1.23,0.24c-0.36,-0.15 -0.64,-0.05 -0.83,0.28c-0.19,0.34 -0.28,0.67 -0.28,1.01c0,0.5 0.16,0.85 0.48,1.03c0.32,0.19 0.8,0.29 1.44,0.29C22.6,25.65 22.96,25.58 23.33,25.44zM5.45,21.14c0,5.46 3.1,10.34 7.75,13.55l-0.75,8.96l6.78,-6.03c2.14,0.67 4.41,1.03 6.73,1.03c10.77,0 19.5,-7.84 19.5,-17.51c0,-9.66 -8.73,-16.5 -19.5,-16.5C15.18,4.64 5.45,11.48 5.45,21.14zM17.38,26.6c-0.25,0.04 -0.57,0.04 -0.93,0.04c-0.82,0 -1.43,-0.22 -1.81,-0.69c-0.37,-0.46 -0.56,-1.21 -0.56,-2.24v-4.08h-1v-1h1v-2h2v2h2v1h-2v3.65v0.95c0,0.26 0.03,0.5 0.09,0.72c0.07,0.22 0.16,0.37 0.3,0.5c0.14,0.12 0.34,0.19 0.62,0.19h0.43h0.39h0.17v0.89C17.86,26.57 17.63,26.6 17.38,26.6zM24.33,26.65v-0.88c-0.22,0.16 -0.41,0.28 -0.56,0.41c-0.16,0.12 -0.38,0.23 -0.64,0.34c-0.28,0.09 -0.53,0.13 -0.78,0.13h-1.07c-0.84,0 -1.54,-0.21 -2.11,-0.65c-0.56,-0.43 -0.84,-0.98 -0.84,-1.65c0,-0.53 0.14,-0.97 0.42,-1.31c0.28,-0.33 0.7,-0.72 1.24,-1.18c0.53,0.07 1.18,0.05 1.93,-0.03c0.75,-0.08 1.55,-0.14 2.43,-0.19v-0.07c0,-0.72 -0.19,-1.22 -0.57,-1.5c-0.37,-0.29 -0.93,-0.43 -1.68,-0.43c-0.35,0 -0.75,0.1 -1.21,0.29c-0.45,0.18 -0.89,0.43 -1.31,0.71h-0.25v-1.65c0.25,0.37 0.66,0.42 1.22,0.11c0.56,-0.3 1.14,-0.46 1.72,-0.46c1.4,0 2.44,0.24 3.09,0.68c0.64,0.45 0.97,1.12 0.97,2.03v5.3H24.33zM29.58,14.64v12.01h-2v-12.01H29.58zM34.94,22.1l3.89,4.55h-2l-3.29,-4.02l-0.71,0.47v3.55h-2v-12.01h2v7.83l3.02,-3.83h1.98L34.94,22.1z"/>
-</vector>
diff --git a/xabber/src/main/res/drawable/ic_client_ichat_10dp.xml b/xabber/src/main/res/drawable/ic_client_ichat_10dp.xml
deleted file mode 100644
index 3a16ccf9f9..0000000000
--- a/xabber/src/main/res/drawable/ic_client_ichat_10dp.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<vector android:height="10dp" android:viewportHeight="49.181"
-    android:viewportWidth="49.181" android:width="10dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FF000000" android:pathData="M3.95,25.98c0.72,4.88 3.91,8.81 8.43,11.23c-0.53,1.35 -1.21,2.72 -1.93,3.44c-1.75,1.75 -4,3 -4,3s6,0.5 9,-1c1.32,-0.66 2.83,-1.89 4.1,-3.07c2.51,0.4 5.18,0.44 7.91,0.07c13.5,-1.84 20.88,-11.62 19.5,-21.01c-1.38,-9.39 -11.34,-15.67 -25.84,-13.17C9.57,7.47 2.57,16.58 3.95,25.98zM17.45,16.64h10.01c1.1,0 2,0.9 2,2v2.7c1.72,-1.76 5,-4.7 5,-4.7v11.01c0,0 -3.28,-2.87 -5,-4.27v2.27c0,1.1 -0.9,2 -2,2H17.45c-1.1,0 -2,-0.9 -2,-2v-7.01C15.45,17.54 16.35,16.64 17.45,16.64z"/>
-</vector>
diff --git a/xabber/src/main/res/drawable/ic_client_ichat_18dp.xml b/xabber/src/main/res/drawable/ic_client_ichat_18dp.xml
deleted file mode 100644
index 1d1d4fc181..0000000000
--- a/xabber/src/main/res/drawable/ic_client_ichat_18dp.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<vector android:height="18dp" android:viewportHeight="49.181"
-    android:viewportWidth="49.181" android:width="18dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FF000000" android:pathData="M3.95,25.98c0.72,4.88 3.91,8.81 8.43,11.23c-0.53,1.35 -1.21,2.72 -1.93,3.44c-1.75,1.75 -4,3 -4,3s6,0.5 9,-1c1.32,-0.66 2.83,-1.89 4.1,-3.07c2.51,0.4 5.18,0.44 7.91,0.07c13.5,-1.84 20.88,-11.62 19.5,-21.01c-1.38,-9.39 -11.34,-15.67 -25.84,-13.17C9.57,7.47 2.57,16.58 3.95,25.98zM17.45,16.64h10.01c1.1,0 2,0.9 2,2v2.7c1.72,-1.76 5,-4.7 5,-4.7v11.01c0,0 -3.28,-2.87 -5,-4.27v2.27c0,1.1 -0.9,2 -2,2H17.45c-1.1,0 -2,-0.9 -2,-2v-7.01C15.45,17.54 16.35,16.64 17.45,16.64z"/>
-</vector>
diff --git a/xabber/src/main/res/drawable/ic_client_large.xml b/xabber/src/main/res/drawable/ic_client_large.xml
deleted file mode 100644
index 6d7317e125..0000000000
--- a/xabber/src/main/res/drawable/ic_client_large.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (c) 2013, Redsolution LTD. All rights reserved.
-
-     This file is part of Xabber project; you can redistribute it and/or
-     modify it under the terms of the GNU General Public License, Version 3.
-
-     Xabber is distributed in the hope that it will be useful, but
-     WITHOUT ANY WARRANTY; without even the implied warranty of
-     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-     See the GNU General Public License for more details.
-
-     You should have received a copy of the GNU General Public License,
-     along with this program. If not, see http://www.gnu.org/licenses/.
--->
-<level-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@drawable/ic_client_adium_18dp" android:minLevel="0" android:maxLevel="0" />
-    <item android:drawable="@drawable/ic_client_empathy_18dp" android:minLevel="1" android:maxLevel="1" />
-    <item android:drawable="@drawable/ic_client_gajim_18dp" android:minLevel="2" android:maxLevel="2" />
-    <item android:drawable="@drawable/ic_client_gtalk_18dp" android:minLevel="3" android:maxLevel="3" />
-    <item android:drawable="@drawable/ic_client_ichat_18dp" android:minLevel="4" android:maxLevel="4" />
-    <item android:drawable="@drawable/ic_client_miranda_18dp" android:minLevel="5" android:maxLevel="5" />
-    <item android:drawable="@drawable/ic_client_pidgin_18dp" android:minLevel="6" android:maxLevel="6" />
-    <item android:drawable="@drawable/ic_client_psi_18dp" android:minLevel="7" android:maxLevel="7" />
-    <item android:drawable="@drawable/ic_client_qip_18dp" android:minLevel="8" android:maxLevel="8" />
-    <item android:drawable="@drawable/ic_client_vip_18dp" android:minLevel="9" android:maxLevel="9" />
-    <item android:drawable="@drawable/ic_client_xabber_18dp" android:minLevel="10" android:maxLevel="10" />
-    <item android:drawable="@drawable/ic_client_conversations_18dp" android:minLevel="11" android:maxLevel="11" />
-</level-list>
\ No newline at end of file
diff --git a/xabber/src/main/res/drawable/ic_client_miranda_10dp.xml b/xabber/src/main/res/drawable/ic_client_miranda_10dp.xml
deleted file mode 100644
index 2e3e544b08..0000000000
--- a/xabber/src/main/res/drawable/ic_client_miranda_10dp.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<vector android:height="10dp" android:viewportHeight="49.181"
-    android:viewportWidth="49.181" android:width="10dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FF000000"
-        android:pathData="M11.45,37.65c0,0 -6.56,-4.07 -9,-11c-2.44,-6.94 1.44,-9.82 6,-10.01c4.57,-0.18 10,6 10,6s1.69,-9 7.01,-9c5.31,0 8.25,8.25 8.25,8.25s6.25,-6.62 10.75,-4.25c4.5,2.38 4.25,9.13 3,13.01c-1.25,3.87 -8,7 -8,7s6,-6.57 5,-12c-1,-5.44 -5.47,-3.59 -7,-2.01c-3.13,3.26 -5.63,8.07 -5.63,8.07s-0.44,-5.56 -1.62,-9c-1.31,-3.79 -7.44,-3.63 -8.75,0.43c-1.32,4.07 -1.01,8.51 -1.01,8.51s-3.75,-7.07 -8,-9.01c-4.25,-1.93 -6.31,1.94 -5,6.01C8.76,32.71 9.26,34.52 11.45,37.65z"
-        android:strokeColor="#FF000000" android:strokeLineCap="round"
-        android:strokeLineJoin="round" android:strokeWidth="1.0002"/>
-</vector>
diff --git a/xabber/src/main/res/drawable/ic_client_miranda_18dp.xml b/xabber/src/main/res/drawable/ic_client_miranda_18dp.xml
deleted file mode 100644
index 7b15d9591d..0000000000
--- a/xabber/src/main/res/drawable/ic_client_miranda_18dp.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<vector android:height="18dp" android:viewportHeight="49.181"
-    android:viewportWidth="49.181" android:width="18dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FF000000"
-        android:pathData="M11.45,37.65c0,0 -6.56,-4.07 -9,-11c-2.44,-6.94 1.44,-9.82 6,-10.01c4.57,-0.18 10,6 10,6s1.69,-9 7.01,-9c5.31,0 8.25,8.25 8.25,8.25s6.25,-6.62 10.75,-4.25c4.5,2.38 4.25,9.13 3,13.01c-1.25,3.87 -8,7 -8,7s6,-6.57 5,-12c-1,-5.44 -5.47,-3.59 -7,-2.01c-3.13,3.26 -5.63,8.07 -5.63,8.07s-0.44,-5.56 -1.62,-9c-1.31,-3.79 -7.44,-3.63 -8.75,0.43c-1.32,4.07 -1.01,8.51 -1.01,8.51s-3.75,-7.07 -8,-9.01c-4.25,-1.93 -6.31,1.94 -5,6.01C8.76,32.71 9.26,34.52 11.45,37.65z"
-        android:strokeColor="#FF000000" android:strokeLineCap="round"
-        android:strokeLineJoin="round" android:strokeWidth="1.0002"/>
-</vector>
diff --git a/xabber/src/main/res/drawable/ic_client_pidgin_10dp.xml b/xabber/src/main/res/drawable/ic_client_pidgin_10dp.xml
deleted file mode 100644
index 9555fa6b07..0000000000
--- a/xabber/src/main/res/drawable/ic_client_pidgin_10dp.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<vector android:height="10dp" android:viewportHeight="49.181"
-    android:viewportWidth="49.181" android:width="10dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FF000000"
-        android:pathData="M10.95,27.65c0,0.82 0.67,1.5 1.5,1.5s1.5,-0.68 1.5,-1.5c0,-0.83 -0.67,-1.5 -1.5,-1.5S10.95,26.82 10.95,27.65zM-0.05,45.15h32.26c0,0 -0.75,-0.13 -3.25,-2c-2.5,-1.88 -0.63,-2.88 1,-10c0.27,-1.22 0.41,-2.44 0.42,-3.64c-0.23,1.46 -0.75,2.43 -1.55,2.39c-2.48,-0.14 -3.74,-1.77 -3.87,-4.25c-0.13,-2.32 1.45,-4.32 3.93,-4.32c0.15,0 0.43,0.26 0.71,0.72c-1,-3.38 -2.84,-6.01 -4.64,-6.91c-3.26,-1.62 -8.26,-3 -15.01,1s-5,14.76 -5,20.01S-0.05,45.15 -0.05,45.15zM7.95,27.65c0,-2.49 2.02,-4.51 4.5,-4.51c2.49,0 4.5,2.02 4.5,4.51c0,2.48 -2.01,4.5 -4.5,4.5C9.97,32.15 7.95,30.13 7.95,27.65zM14.95,36.15c0,0 3.82,-1.13 5,-2c1.19,-0.88 1.94,-0.94 3.01,0c1.06,0.94 2.75,1.94 3,2s-1.57,2.5 -4,3C19.52,39.65 14.95,36.15 14.95,36.15zM25.96,27.65c0,0.82 0.67,1.5 1.5,1.5c0.82,0 1.5,-0.68 1.5,-1.5c0,-0.83 -0.68,-1.5 -1.5,-1.5C26.63,26.15 25.96,26.82 25.96,27.65zM42.58,5.2h-21.5c-2.5,-0.25 -5.75,3 -6,5.5v3.1l2,-0.23v-2.12c0,-2 3,-4.5 4.75,-4.25h20c2,-0.5 5.01,2.25 5.01,4.25v15c-0.25,1.5 -1.75,3.5 -3.26,4c-1,0.25 -2.5,0.25 -3.25,0.5c-1,0.25 -1.75,1.25 -2.75,2.25c0,-0.75 0.25,-1.5 -0.75,-2.25h-3.32l-0.55,2.19l2.62,0.06c-0.25,0.75 -0.5,1.75 -0.5,2.5c0,0.25 -0.25,1.26 0.75,1.26c0.75,0 3.25,-3.01 5.25,-4.01c1.25,-0.75 3.01,-0.5 4.26,-1c2,-1 3,-3.5 3.5,-4.75v-16.5C48.84,8.44 44.34,4.7 42.58,5.2z"
-        android:strokeColor="#FF000000" android:strokeLineCap="round"
-        android:strokeLineJoin="round" android:strokeWidth="1.0002"/>
-</vector>
diff --git a/xabber/src/main/res/drawable/ic_client_pidgin_18dp.xml b/xabber/src/main/res/drawable/ic_client_pidgin_18dp.xml
deleted file mode 100644
index 4969a1cd12..0000000000
--- a/xabber/src/main/res/drawable/ic_client_pidgin_18dp.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<vector android:height="18dp" android:viewportHeight="49.181"
-    android:viewportWidth="49.181" android:width="18dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FF000000"
-        android:pathData="M10.95,27.65c0,0.82 0.67,1.5 1.5,1.5s1.5,-0.68 1.5,-1.5c0,-0.83 -0.67,-1.5 -1.5,-1.5S10.95,26.82 10.95,27.65zM-0.05,45.15h32.26c0,0 -0.75,-0.13 -3.25,-2c-2.5,-1.88 -0.63,-2.88 1,-10c0.27,-1.22 0.41,-2.44 0.42,-3.64c-0.23,1.46 -0.75,2.43 -1.55,2.39c-2.48,-0.14 -3.74,-1.77 -3.87,-4.25c-0.13,-2.32 1.45,-4.32 3.93,-4.32c0.15,0 0.43,0.26 0.71,0.72c-1,-3.38 -2.84,-6.01 -4.64,-6.91c-3.26,-1.62 -8.26,-3 -15.01,1s-5,14.76 -5,20.01S-0.05,45.15 -0.05,45.15zM7.95,27.65c0,-2.49 2.02,-4.51 4.5,-4.51c2.49,0 4.5,2.02 4.5,4.51c0,2.48 -2.01,4.5 -4.5,4.5C9.97,32.15 7.95,30.13 7.95,27.65zM14.95,36.15c0,0 3.82,-1.13 5,-2c1.19,-0.88 1.94,-0.94 3.01,0c1.06,0.94 2.75,1.94 3,2s-1.57,2.5 -4,3C19.52,39.65 14.95,36.15 14.95,36.15zM25.96,27.65c0,0.82 0.67,1.5 1.5,1.5c0.82,0 1.5,-0.68 1.5,-1.5c0,-0.83 -0.68,-1.5 -1.5,-1.5C26.63,26.15 25.96,26.82 25.96,27.65zM42.58,5.2h-21.5c-2.5,-0.25 -5.75,3 -6,5.5v3.1l2,-0.23v-2.12c0,-2 3,-4.5 4.75,-4.25h20c2,-0.5 5.01,2.25 5.01,4.25v15c-0.25,1.5 -1.75,3.5 -3.26,4c-1,0.25 -2.5,0.25 -3.25,0.5c-1,0.25 -1.75,1.25 -2.75,2.25c0,-0.75 0.25,-1.5 -0.75,-2.25h-3.32l-0.55,2.19l2.62,0.06c-0.25,0.75 -0.5,1.75 -0.5,2.5c0,0.25 -0.25,1.26 0.75,1.26c0.75,0 3.25,-3.01 5.25,-4.01c1.25,-0.75 3.01,-0.5 4.26,-1c2,-1 3,-3.5 3.5,-4.75v-16.5C48.84,8.44 44.34,4.7 42.58,5.2z"
-        android:strokeColor="#FF000000" android:strokeLineCap="round"
-        android:strokeLineJoin="round" android:strokeWidth="1.0002"/>
-</vector>
diff --git a/xabber/src/main/res/drawable/ic_client_psi_10dp.xml b/xabber/src/main/res/drawable/ic_client_psi_10dp.xml
deleted file mode 100644
index da4f54affa..0000000000
--- a/xabber/src/main/res/drawable/ic_client_psi_10dp.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<vector android:height="10dp" android:viewportHeight="40.677"
-    android:viewportWidth="40.677" android:width="10dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FF000000"
-        android:pathData="M8.7,17.88c-0.25,0.13 -0.12,-1.62 -2,-1c-1.87,0.63 -2,1 -2,1l-1,-3c0,0 2,-1.62 6,-2c4,-0.37 4.5,0.5 4,3s-2.92,10.16 -3,12.01c-0.12,3 4,4 4,4l7,-28.01h5.01l-6.01,24.01c0,0 0.25,4.37 3.01,2c2.75,-2.38 4.5,-5.63 5,-10c0.5,-4.38 0,-7.01 0,-7.01h5c0,0 0.12,7.88 -2,14.01c-2.13,6.12 -7.5,7.37 -10.01,8c-2.5,0.62 -3.87,0.75 -4,2c-0.12,1.25 -1,3 -1,3h-6c0,0 2.63,-3.25 2,-4c-0.62,-0.75 -4.62,0.12 -6,-3c-1.37,-3.13 -1.37,-5.63 0,-9C8.08,20.51 8.95,17.76 8.7,17.88z"
-        android:strokeColor="#00FFFFFF" android:strokeLineCap="round"
-        android:strokeLineJoin="round" android:strokeWidth="1.0002"/>
-    <path android:fillColor="#FF000000"
-        android:pathData="M27.71,9.88c0.31,-0.12 1,-2 1,-2s1.68,0.44 2,1c0.31,0.57 0,1 0,1S27.39,10.01 27.71,9.88z"
-        android:strokeColor="#00FFFFFF" android:strokeLineCap="round"
-        android:strokeLineJoin="round" android:strokeWidth="1.0002"/>
-    <path android:fillColor="#FF000000"
-        android:pathData="M28.71,5.88l1,-2c0,0 3,0.69 4,2c1,1.31 1,4 1,4h-3C31.71,9.88 32.68,7.1 28.71,5.88z"
-        android:strokeColor="#00FFFFFF" android:strokeLineCap="round"
-        android:strokeLineJoin="round" android:strokeWidth="1.0002"/>
-    <path android:fillColor="#FF000000"
-        android:pathData="M30.71,2.88l1,-2c0,0 3.56,0.97 5,4c1.44,3.03 1,4.85 1,5c0,0.16 -2,0 -2,0S36.43,4.98 30.71,2.88z"
-        android:strokeColor="#00FFFFFF" android:strokeLineCap="round"
-        android:strokeLineJoin="round" android:strokeWidth="1.0002"/>
-</vector>
diff --git a/xabber/src/main/res/drawable/ic_client_psi_18dp.xml b/xabber/src/main/res/drawable/ic_client_psi_18dp.xml
deleted file mode 100644
index 654e3e6f7c..0000000000
--- a/xabber/src/main/res/drawable/ic_client_psi_18dp.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<vector android:height="18dp" android:viewportHeight="40.677"
-    android:viewportWidth="40.677" android:width="18dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FF000000"
-        android:pathData="M8.7,17.88c-0.25,0.13 -0.12,-1.62 -2,-1c-1.87,0.63 -2,1 -2,1l-1,-3c0,0 2,-1.62 6,-2c4,-0.37 4.5,0.5 4,3s-2.92,10.16 -3,12.01c-0.12,3 4,4 4,4l7,-28.01h5.01l-6.01,24.01c0,0 0.25,4.37 3.01,2c2.75,-2.38 4.5,-5.63 5,-10c0.5,-4.38 0,-7.01 0,-7.01h5c0,0 0.12,7.88 -2,14.01c-2.13,6.12 -7.5,7.37 -10.01,8c-2.5,0.62 -3.87,0.75 -4,2c-0.12,1.25 -1,3 -1,3h-6c0,0 2.63,-3.25 2,-4c-0.62,-0.75 -4.62,0.12 -6,-3c-1.37,-3.13 -1.37,-5.63 0,-9C8.08,20.51 8.95,17.76 8.7,17.88z"
-        android:strokeColor="#00FFFFFF" android:strokeLineCap="round"
-        android:strokeLineJoin="round" android:strokeWidth="1.0002"/>
-    <path android:fillColor="#FF000000"
-        android:pathData="M27.71,9.88c0.31,-0.12 1,-2 1,-2s1.68,0.44 2,1c0.31,0.57 0,1 0,1S27.39,10.01 27.71,9.88z"
-        android:strokeColor="#00FFFFFF" android:strokeLineCap="round"
-        android:strokeLineJoin="round" android:strokeWidth="1.0002"/>
-    <path android:fillColor="#FF000000"
-        android:pathData="M28.71,5.88l1,-2c0,0 3,0.69 4,2c1,1.31 1,4 1,4h-3C31.71,9.88 32.68,7.1 28.71,5.88z"
-        android:strokeColor="#00FFFFFF" android:strokeLineCap="round"
-        android:strokeLineJoin="round" android:strokeWidth="1.0002"/>
-    <path android:fillColor="#FF000000"
-        android:pathData="M30.71,2.88l1,-2c0,0 3.56,0.97 5,4c1.44,3.03 1,4.85 1,5c0,0.16 -2,0 -2,0S36.43,4.98 30.71,2.88z"
-        android:strokeColor="#00FFFFFF" android:strokeLineCap="round"
-        android:strokeLineJoin="round" android:strokeWidth="1.0002"/>
-</vector>
diff --git a/xabber/src/main/res/drawable/ic_client_qip_10dp.xml b/xabber/src/main/res/drawable/ic_client_qip_10dp.xml
deleted file mode 100644
index 8932c21317..0000000000
--- a/xabber/src/main/res/drawable/ic_client_qip_10dp.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<vector android:height="10dp" android:viewportHeight="47.508"
-    android:viewportWidth="47.5" android:width="10dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FF000000"
-        android:pathData="M3.38,27.81c-2.31,0.06 -2,1 -2,1s-0.19,2.93 0,5c0.19,2.06 2,2 2,2h7l0.57,4h3.43c0,0 -0.75,-5.69 -1,-9c-0.25,-3.32 -3,-3 -3,-3H3.38zM4.38,30.81h6v2h-6V30.81z"
-        android:strokeColor="#FF000000" android:strokeLineCap="round"
-        android:strokeLineJoin="round" android:strokeWidth="1.0002"/>
-    <path android:fillColor="#FF000000"
-        android:pathData="M44.31,27.81c2.31,0.06 2,1 2,1s0.19,2.93 0,5c-0.19,2.06 -2,2 -2,2h-7l-0.57,4h-3.44c0,0 0.76,-5.69 1.01,-9c0.25,-3.32 3,-3 3,-3H44.31zM43.31,30.81h-6v2h6V30.81z"
-        android:strokeColor="#FF000000" android:strokeLineCap="round"
-        android:strokeLineJoin="round" android:strokeWidth="1.0002"/>
-    <path android:fillColor="#FF000000"
-        android:pathData="M17.57,15.8c-0.1,-1.11 0.71,-1.93 1.81,-1.84l8.64,0.69c1.1,0.08 1.9,1.04 1.79,2.14l-0.8,8.02h-10.63L17.57,15.8zM16.38,9.8l-1,-5h-3l6,35.01c0.44,2.56 2.01,3 2.01,3s3.31,0.06 6,0c2.68,-0.06 3,-4 3,-4s2.69,-17.13 3,-22.01c0.31,-4.87 -2,-5 -2,-5L16.38,9.8zM19.39,28.81h9l-1.25,10.12c0,0 0.18,2.25 -1.82,2.38l-2.12,-0.13c0,0 -2.38,0.32 -2.88,-3.06C19.82,34.75 19.39,28.81 19.39,28.81z"
-        android:strokeColor="#FF000000" android:strokeLineCap="round"
-        android:strokeLineJoin="round" android:strokeWidth="1.0002"/>
-</vector>
diff --git a/xabber/src/main/res/drawable/ic_client_qip_18dp.xml b/xabber/src/main/res/drawable/ic_client_qip_18dp.xml
deleted file mode 100644
index d7c069a459..0000000000
--- a/xabber/src/main/res/drawable/ic_client_qip_18dp.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<vector android:height="18dp" android:viewportHeight="47.508"
-    android:viewportWidth="47.5" android:width="18dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FF000000"
-        android:pathData="M3.38,27.81c-2.31,0.06 -2,1 -2,1s-0.19,2.93 0,5c0.19,2.06 2,2 2,2h7l0.57,4h3.43c0,0 -0.75,-5.69 -1,-9c-0.25,-3.32 -3,-3 -3,-3H3.38zM4.38,30.81h6v2h-6V30.81z"
-        android:strokeColor="#FF000000" android:strokeLineCap="round"
-        android:strokeLineJoin="round" android:strokeWidth="1.0002"/>
-    <path android:fillColor="#FF000000"
-        android:pathData="M44.31,27.81c2.31,0.06 2,1 2,1s0.19,2.93 0,5c-0.19,2.06 -2,2 -2,2h-7l-0.57,4h-3.44c0,0 0.76,-5.69 1.01,-9c0.25,-3.32 3,-3 3,-3H44.31zM43.31,30.81h-6v2h6V30.81z"
-        android:strokeColor="#FF000000" android:strokeLineCap="round"
-        android:strokeLineJoin="round" android:strokeWidth="1.0002"/>
-    <path android:fillColor="#FF000000"
-        android:pathData="M17.57,15.8c-0.1,-1.11 0.71,-1.93 1.81,-1.84l8.64,0.69c1.1,0.08 1.9,1.04 1.79,2.14l-0.8,8.02h-10.63L17.57,15.8zM16.38,9.8l-1,-5h-3l6,35.01c0.44,2.56 2.01,3 2.01,3s3.31,0.06 6,0c2.68,-0.06 3,-4 3,-4s2.69,-17.13 3,-22.01c0.31,-4.87 -2,-5 -2,-5L16.38,9.8zM19.39,28.81h9l-1.25,10.12c0,0 0.18,2.25 -1.82,2.38l-2.12,-0.13c0,0 -2.38,0.32 -2.88,-3.06C19.82,34.75 19.39,28.81 19.39,28.81z"
-        android:strokeColor="#FF000000" android:strokeLineCap="round"
-        android:strokeLineJoin="round" android:strokeWidth="1.0002"/>
-</vector>
diff --git a/xabber/src/main/res/drawable/ic_client_small.xml b/xabber/src/main/res/drawable/ic_client_small.xml
deleted file mode 100644
index 357fdf3f38..0000000000
--- a/xabber/src/main/res/drawable/ic_client_small.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (c) 2013, Redsolution LTD. All rights reserved.
-
-     This file is part of Xabber project; you can redistribute it and/or
-     modify it under the terms of the GNU General Public License, Version 3.
-
-     Xabber is distributed in the hope that it will be useful, but
-     WITHOUT ANY WARRANTY; without even the implied warranty of
-     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-     See the GNU General Public License for more details.
-
-     You should have received a copy of the GNU General Public License,
-     along with this program. If not, see http://www.gnu.org/licenses/.
--->
-<level-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@drawable/ic_client_adium_10dp" android:minLevel="0" android:maxLevel="0" />
-    <item android:drawable="@drawable/ic_client_empathy_10dp" android:minLevel="1" android:maxLevel="1" />
-    <item android:drawable="@drawable/ic_client_gajim_10dp" android:minLevel="2" android:maxLevel="2" />
-    <item android:drawable="@drawable/ic_client_gtalk_10dp" android:minLevel="3" android:maxLevel="3" />
-    <item android:drawable="@drawable/ic_client_ichat_10dp" android:minLevel="4" android:maxLevel="4" />
-    <item android:drawable="@drawable/ic_client_miranda_10dp" android:minLevel="5" android:maxLevel="5" />
-    <item android:drawable="@drawable/ic_client_pidgin_10dp" android:minLevel="6" android:maxLevel="6" />
-    <item android:drawable="@drawable/ic_client_psi_10dp" android:minLevel="7" android:maxLevel="7" />
-    <item android:drawable="@drawable/ic_client_qip_10dp" android:minLevel="8" android:maxLevel="8" />
-    <item android:drawable="@drawable/ic_client_vip_10dp" android:minLevel="9" android:maxLevel="9" />
-    <item android:drawable="@drawable/ic_client_xabber_10dp" android:minLevel="10" android:maxLevel="10" />
-    <item android:drawable="@drawable/ic_client_conversations_10dp" android:minLevel="11" android:maxLevel="11" />
-</level-list>
\ No newline at end of file
diff --git a/xabber/src/main/res/drawable/ic_client_vip_10dp.xml b/xabber/src/main/res/drawable/ic_client_vip_10dp.xml
deleted file mode 100644
index 9ebf597f92..0000000000
--- a/xabber/src/main/res/drawable/ic_client_vip_10dp.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<vector android:height="10dp" android:viewportHeight="43.512"
-    android:viewportWidth="43.512" android:width="10dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FF000000" android:pathData="M21.24,13.73c-1.77,-0.24 -4.03,1.28 -5.09,2.73c-0.85,1.16 -0.36,3.02 0.29,4.13C17.13,17.75 18.88,15.31 21.24,13.73zM21.84,11.57c1.09,-0.14 1.83,0.54 2.84,0.61c0.4,-0.1 0.79,-0.19 1.2,-0.25c0.78,-0.38 1.43,-1.03 2.11,-0.82c0.4,0.12 0.57,0.42 0.6,0.73c3.69,0.31 6.89,2.36 8.77,5.33c-0.03,-0.3 -0.06,-0.59 -0.1,-0.88c0.01,-0.98 -0.33,-2.34 -1.23,-4.17l-0.09,-0.2c-2.45,-5.11 -7.71,-8.69 -13.91,-8.65c-7.15,0.05 -14.6,5.17 -15.33,14.69l0.02,1.73c0.01,0.35 0.09,0.92 0.19,1.48c0.03,0.35 0.1,0.77 0.24,1.22l0.08,0.32c1.51,4.95 4.7,8.08 8.3,9.71l-0.02,0.18c0.01,3.91 -0.24,4.96 1.96,6.64c1.81,1.41 2.28,2.12 4.66,2.12c2.44,0.01 2.98,-0.71 4.85,-2.18c1.72,-1.48 1.94,-2.03 1.96,-4.45c-0.43,0.05 -0.87,0.08 -1.31,0.08c-3.12,0 -5.95,-1.24 -8.02,-3.26c-2.76,-0.5 -5.2,-1.86 -7.05,-3.77c0.01,-0.15 0.1,-0.3 0.3,-0.46c0.69,-0.56 0.13,-0.97 -0.22,-1.66c-0.36,-0.69 0.62,-0.9 0.4,-1.87c-0.22,-0.97 -2.6,-1.37 -3.38,-2.68c-0.21,-0.35 -0.46,-0.59 -0.73,-0.77c-0.07,-0.51 -0.11,-1.03 -0.11,-1.55c-0.05,-3.79 1.55,-7.25 4.13,-9.7c0.55,-0.01 0.62,-0.28 1.25,-0.66c0.7,-0.43 1.41,-1.08 2.33,-0.66s1.91,0.28 1.49,-0.43c-0.36,-0.59 0.69,-0.94 0.39,-1.4c1.15,-0.33 2.36,-0.52 3.62,-0.52c2.5,-0.02 4.84,0.67 6.85,1.87l-0.24,0.2c-0.71,0.57 -1.91,0.08 -2.97,-0.84c-1.06,-0.92 -2.13,0.01 -3.19,0.66s-0.99,1.14 -0.85,1.5c0.14,0.35 0.35,0.63 -0.64,0.85c-0.99,0.22 -1.27,-0.2 -2.12,0.23c-0.84,0.43 0.22,0.56 0.64,0.84c0.43,0.28 -0.7,1.21 -1.48,1.5c-0.77,0.28 -0.42,1.27 0.01,1.27C18.46,13.49 20.64,11.72 21.84,11.57z"/>
-    <path android:fillColor="#FF000000" android:pathData="M29.88,27.32c0.15,-0.26 0.25,-0.65 0.25,-1.19c0,-0.5 -0.16,-0.86 -0.44,-1.11c-0.3,-0.23 -0.49,-0.35 -0.56,-0.39v3.18C29.45,27.74 29.7,27.59 29.88,27.32zM26.5,22.68c0.25,0.28 0.8,0.52 1.63,0.73v-3.61c-0.57,0.05 -1.05,0.18 -1.43,0.38c-0.39,0.2 -0.57,0.64 -0.57,1.33C26.13,22.01 26.25,22.4 26.5,22.68zM18.12,23.81c0,5.52 4.48,10 10.01,10c5.52,0 10,-4.48 10,-10c0,-5.53 -4.48,-10.01 -10,-10.01C22.6,13.8 18.12,18.28 18.12,23.81zM30.59,24.67c0.35,0.25 0.54,0.7 0.54,1.35c0,0.72 -0.21,1.33 -0.58,1.83c-0.38,0.52 -0.86,0.83 -1.42,0.93v2.03h-1v-2c-0.54,0 -1.08,-0.1 -1.61,-0.3c-0.54,-0.19 -1,-0.3 -1.4,-0.31v-1.39h0.11c0.38,0.28 0.82,0.5 1.3,0.67c0.49,0.19 1.02,0.3 1.6,0.33v-3.44c-0.16,-0.03 -0.33,-0.06 -0.54,-0.13c-0.21,-0.04 -0.39,-0.09 -0.53,-0.14c-0.73,-0.18 -1.23,-0.48 -1.51,-0.9c-0.28,-0.43 -0.43,-0.94 -0.43,-1.57c0,-0.72 0.27,-1.36 0.83,-1.89c0.55,-0.53 1.27,-0.84 2.18,-0.94v-2h1v2c0.34,0.02 0.7,0.16 1.07,0.44c0.38,0.28 0.68,0.33 0.93,0.11v1.45h-0.1c-0.26,-0.25 -0.56,-0.46 -0.87,-0.65c-0.33,-0.19 -0.67,-0.3 -1.03,-0.35v3.85c0.07,0.03 0.15,0.05 0.23,0.06c0.06,0.03 0.13,0.05 0.19,0.05C29.89,24.1 30.25,24.42 30.59,24.67z"/>
-</vector>
diff --git a/xabber/src/main/res/drawable/ic_client_vip_18dp.xml b/xabber/src/main/res/drawable/ic_client_vip_18dp.xml
deleted file mode 100644
index 03d892627b..0000000000
--- a/xabber/src/main/res/drawable/ic_client_vip_18dp.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<vector android:height="18dp" android:viewportHeight="43.512"
-    android:viewportWidth="43.512" android:width="18dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FF000000" android:pathData="M21.24,13.73c-1.77,-0.24 -4.03,1.28 -5.09,2.73c-0.85,1.16 -0.36,3.02 0.29,4.13C17.13,17.75 18.88,15.31 21.24,13.73zM21.84,11.57c1.09,-0.14 1.83,0.54 2.84,0.61c0.4,-0.1 0.79,-0.19 1.2,-0.25c0.78,-0.38 1.43,-1.03 2.11,-0.82c0.4,0.12 0.57,0.42 0.6,0.73c3.69,0.31 6.89,2.36 8.77,5.33c-0.03,-0.3 -0.06,-0.59 -0.1,-0.88c0.01,-0.98 -0.33,-2.34 -1.23,-4.17l-0.09,-0.2c-2.45,-5.11 -7.71,-8.69 -13.91,-8.65c-7.15,0.05 -14.6,5.17 -15.33,14.69l0.02,1.73c0.01,0.35 0.09,0.92 0.19,1.48c0.03,0.35 0.1,0.77 0.24,1.22l0.08,0.32c1.51,4.95 4.7,8.08 8.3,9.71l-0.02,0.18c0.01,3.91 -0.24,4.96 1.96,6.64c1.81,1.41 2.28,2.12 4.66,2.12c2.44,0.01 2.98,-0.71 4.85,-2.18c1.72,-1.48 1.94,-2.03 1.96,-4.45c-0.43,0.05 -0.87,0.08 -1.31,0.08c-3.12,0 -5.95,-1.24 -8.02,-3.26c-2.76,-0.5 -5.2,-1.86 -7.05,-3.77c0.01,-0.15 0.1,-0.3 0.3,-0.46c0.69,-0.56 0.13,-0.97 -0.22,-1.66c-0.36,-0.69 0.62,-0.9 0.4,-1.87c-0.22,-0.97 -2.6,-1.37 -3.38,-2.68c-0.21,-0.35 -0.46,-0.59 -0.73,-0.77c-0.07,-0.51 -0.11,-1.03 -0.11,-1.55c-0.05,-3.79 1.55,-7.25 4.13,-9.7c0.55,-0.01 0.62,-0.28 1.25,-0.66c0.7,-0.43 1.41,-1.08 2.33,-0.66s1.91,0.28 1.49,-0.43c-0.36,-0.59 0.69,-0.94 0.39,-1.4c1.15,-0.33 2.36,-0.52 3.62,-0.52c2.5,-0.02 4.84,0.67 6.85,1.87l-0.24,0.2c-0.71,0.57 -1.91,0.08 -2.97,-0.84c-1.06,-0.92 -2.13,0.01 -3.19,0.66s-0.99,1.14 -0.85,1.5c0.14,0.35 0.35,0.63 -0.64,0.85c-0.99,0.22 -1.27,-0.2 -2.12,0.23c-0.84,0.43 0.22,0.56 0.64,0.84c0.43,0.28 -0.7,1.21 -1.48,1.5c-0.77,0.28 -0.42,1.27 0.01,1.27C18.46,13.49 20.64,11.72 21.84,11.57z"/>
-    <path android:fillColor="#FF000000" android:pathData="M29.88,27.32c0.15,-0.26 0.25,-0.65 0.25,-1.19c0,-0.5 -0.16,-0.86 -0.44,-1.11c-0.3,-0.23 -0.49,-0.35 -0.56,-0.39v3.18C29.45,27.74 29.7,27.59 29.88,27.32zM26.5,22.68c0.25,0.28 0.8,0.52 1.63,0.73v-3.61c-0.57,0.05 -1.05,0.18 -1.43,0.38c-0.39,0.2 -0.57,0.64 -0.57,1.33C26.13,22.01 26.25,22.4 26.5,22.68zM18.12,23.81c0,5.52 4.48,10 10.01,10c5.52,0 10,-4.48 10,-10c0,-5.53 -4.48,-10.01 -10,-10.01C22.6,13.8 18.12,18.28 18.12,23.81zM30.59,24.67c0.35,0.25 0.54,0.7 0.54,1.35c0,0.72 -0.21,1.33 -0.58,1.83c-0.38,0.52 -0.86,0.83 -1.42,0.93v2.03h-1v-2c-0.54,0 -1.08,-0.1 -1.61,-0.3c-0.54,-0.19 -1,-0.3 -1.4,-0.31v-1.39h0.11c0.38,0.28 0.82,0.5 1.3,0.67c0.49,0.19 1.02,0.3 1.6,0.33v-3.44c-0.16,-0.03 -0.33,-0.06 -0.54,-0.13c-0.21,-0.04 -0.39,-0.09 -0.53,-0.14c-0.73,-0.18 -1.23,-0.48 -1.51,-0.9c-0.28,-0.43 -0.43,-0.94 -0.43,-1.57c0,-0.72 0.27,-1.36 0.83,-1.89c0.55,-0.53 1.27,-0.84 2.18,-0.94v-2h1v2c0.34,0.02 0.7,0.16 1.07,0.44c0.38,0.28 0.68,0.33 0.93,0.11v1.45h-0.1c-0.26,-0.25 -0.56,-0.46 -0.87,-0.65c-0.33,-0.19 -0.67,-0.3 -1.03,-0.35v3.85c0.07,0.03 0.15,0.05 0.23,0.06c0.06,0.03 0.13,0.05 0.19,0.05C29.89,24.1 30.25,24.42 30.59,24.67z"/>
-</vector>
diff --git a/xabber/src/main/res/drawable/ic_client_xabber_10dp.xml b/xabber/src/main/res/drawable/ic_client_xabber_10dp.xml
deleted file mode 100644
index e9755a4591..0000000000
--- a/xabber/src/main/res/drawable/ic_client_xabber_10dp.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<vector android:height="10dp" android:viewportHeight="43.5"
-    android:viewportWidth="43.501" android:width="10dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FF000000" android:pathData="M27.55,25.84c0.35,-0.49 0.35,-0.9 0.43,-1.66c0.07,-0.76 0.56,-1.39 1.27,-2.3c0.7,-0.9 1.13,-1.46 -0.2,-2.08c-1.33,-0.62 -2.08,-4.81 -3.77,-5.22c-1.69,-0.41 -1.97,-0.48 -3.8,-1.24c-1.84,-0.77 -4.51,0.94 -5.7,2.56c-1.19,1.62 0.23,4.61 1.08,5.02c0.84,0.41 2.03,-0.92 3.78,-0.65s1.61,3.6 1.47,5.6c-0.14,2 0.42,3.51 1.46,3.91C24.61,30.19 27.55,25.84 27.55,25.84zM15.14,32.04c0.01,3.91 -0.24,4.96 1.96,6.64c1.81,1.41 2.28,2.12 4.66,2.12c2.44,0.01 2.98,-0.71 4.85,-2.18c2.15,-1.86 1.96,-2.25 1.95,-6.67l-0.01,-0.36c4.93,-2.5 8.42,-7.57 8.49,-13.54c0.01,-0.79 -0.04,-1.56 -0.15,-2.32c0.01,-0.98 -0.33,-2.34 -1.23,-4.17l-0.09,-0.2c-2.45,-5.11 -7.71,-8.69 -13.91,-8.65C14.51,2.76 7.06,7.88 6.33,17.4l0.02,1.73c0.01,0.35 0.09,0.92 0.19,1.48c0.03,0.35 0.1,0.77 0.24,1.22l0.08,0.32c1.51,4.95 4.7,8.08 8.3,9.71L15.14,32.04zM34.8,19.82c-0.95,6.48 -6.67,11.34 -13.13,11.38c-3.76,0.03 -7.1,-1.52 -9.48,-3.98c0.01,-0.15 0.1,-0.3 0.3,-0.46c0.69,-0.56 0.13,-0.97 -0.22,-1.66c-0.36,-0.69 0.62,-0.9 0.4,-1.87c-0.22,-0.97 -2.6,-1.37 -3.38,-2.68c-0.21,-0.35 -0.46,-0.59 -0.73,-0.77c-0.07,-0.51 -0.11,-1.03 -0.11,-1.55c-0.05,-3.79 1.55,-7.25 4.13,-9.7c0.55,-0.01 0.62,-0.28 1.25,-0.66c0.7,-0.43 1.41,-1.08 2.33,-0.66s1.91,0.28 1.49,-0.43c-0.36,-0.59 0.69,-0.94 0.39,-1.4c1.15,-0.33 2.36,-0.52 3.62,-0.52c2.5,-0.02 4.84,0.67 6.85,1.87l-0.24,0.2c-0.71,0.57 -1.91,0.08 -2.97,-0.84c-1.06,-0.92 -2.13,0.01 -3.19,0.66s-0.99,1.14 -0.85,1.5c0.14,0.35 0.35,0.63 -0.64,0.85c-0.99,0.22 -1.27,-0.2 -2.12,0.23c-0.84,0.43 0.22,0.56 0.64,0.84c0.43,0.28 -0.7,1.21 -1.48,1.5c-0.77,0.28 -0.42,1.27 0.01,1.27c0.42,-0.01 2.6,-1.78 3.8,-1.93c1.2,-0.15 1.98,0.69 3.18,0.61c1.2,-0.07 2.05,-1.35 2.97,-1.07c0.92,0.27 0.63,1.48 0.2,1.69c-0.42,0.21 -1.41,-0.13 -1.48,0.43c-0.07,0.57 0.63,0.63 0.21,1.06c-0.43,0.42 0.7,0.91 1.26,1.67c0.56,0.77 1.32,3 2.3,3.35c0.98,0.34 2.54,-1.9 2.54,-1.9c0.29,-0.85 -1.89,-0.97 -2.31,-1.67c-0.41,-0.7 -0.34,-0.98 0.85,-0.85c1.2,0.13 2.11,1.04 2.73,1.88c0.63,0.83 0.39,3.07 0.81,3.55C34.75,19.79 34.77,19.81 34.8,19.82z"/>
-</vector>
diff --git a/xabber/src/main/res/drawable/ic_client_xabber_18dp.xml b/xabber/src/main/res/drawable/ic_client_xabber_18dp.xml
deleted file mode 100644
index fcf5fb19fc..0000000000
--- a/xabber/src/main/res/drawable/ic_client_xabber_18dp.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<vector android:height="18dp" android:viewportHeight="43.5"
-    android:viewportWidth="43.501" android:width="18dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FF000000" android:pathData="M27.55,25.84c0.35,-0.49 0.35,-0.9 0.43,-1.66c0.07,-0.76 0.56,-1.39 1.27,-2.3c0.7,-0.9 1.13,-1.46 -0.2,-2.08c-1.33,-0.62 -2.08,-4.81 -3.77,-5.22c-1.69,-0.41 -1.97,-0.48 -3.8,-1.24c-1.84,-0.77 -4.51,0.94 -5.7,2.56c-1.19,1.62 0.23,4.61 1.08,5.02c0.84,0.41 2.03,-0.92 3.78,-0.65s1.61,3.6 1.47,5.6c-0.14,2 0.42,3.51 1.46,3.91C24.61,30.19 27.55,25.84 27.55,25.84zM15.14,32.04c0.01,3.91 -0.24,4.96 1.96,6.64c1.81,1.41 2.28,2.12 4.66,2.12c2.44,0.01 2.98,-0.71 4.85,-2.18c2.15,-1.86 1.96,-2.25 1.95,-6.67l-0.01,-0.36c4.93,-2.5 8.42,-7.57 8.49,-13.54c0.01,-0.79 -0.04,-1.56 -0.15,-2.32c0.01,-0.98 -0.33,-2.34 -1.23,-4.17l-0.09,-0.2c-2.45,-5.11 -7.71,-8.69 -13.91,-8.65C14.51,2.76 7.06,7.88 6.33,17.4l0.02,1.73c0.01,0.35 0.09,0.92 0.19,1.48c0.03,0.35 0.1,0.77 0.24,1.22l0.08,0.32c1.51,4.95 4.7,8.08 8.3,9.71L15.14,32.04zM34.8,19.82c-0.95,6.48 -6.67,11.34 -13.13,11.38c-3.76,0.03 -7.1,-1.52 -9.48,-3.98c0.01,-0.15 0.1,-0.3 0.3,-0.46c0.69,-0.56 0.13,-0.97 -0.22,-1.66c-0.36,-0.69 0.62,-0.9 0.4,-1.87c-0.22,-0.97 -2.6,-1.37 -3.38,-2.68c-0.21,-0.35 -0.46,-0.59 -0.73,-0.77c-0.07,-0.51 -0.11,-1.03 -0.11,-1.55c-0.05,-3.79 1.55,-7.25 4.13,-9.7c0.55,-0.01 0.62,-0.28 1.25,-0.66c0.7,-0.43 1.41,-1.08 2.33,-0.66s1.91,0.28 1.49,-0.43c-0.36,-0.59 0.69,-0.94 0.39,-1.4c1.15,-0.33 2.36,-0.52 3.62,-0.52c2.5,-0.02 4.84,0.67 6.85,1.87l-0.24,0.2c-0.71,0.57 -1.91,0.08 -2.97,-0.84c-1.06,-0.92 -2.13,0.01 -3.19,0.66s-0.99,1.14 -0.85,1.5c0.14,0.35 0.35,0.63 -0.64,0.85c-0.99,0.22 -1.27,-0.2 -2.12,0.23c-0.84,0.43 0.22,0.56 0.64,0.84c0.43,0.28 -0.7,1.21 -1.48,1.5c-0.77,0.28 -0.42,1.27 0.01,1.27c0.42,-0.01 2.6,-1.78 3.8,-1.93c1.2,-0.15 1.98,0.69 3.18,0.61c1.2,-0.07 2.05,-1.35 2.97,-1.07c0.92,0.27 0.63,1.48 0.2,1.69c-0.42,0.21 -1.41,-0.13 -1.48,0.43c-0.07,0.57 0.63,0.63 0.21,1.06c-0.43,0.42 0.7,0.91 1.26,1.67c0.56,0.77 1.32,3 2.3,3.35c0.98,0.34 2.54,-1.9 2.54,-1.9c0.29,-0.85 -1.89,-0.97 -2.31,-1.67c-0.41,-0.7 -0.34,-0.98 0.85,-0.85c1.2,0.13 2.11,1.04 2.73,1.88c0.63,0.83 0.39,3.07 0.81,3.55C34.75,19.79 34.77,19.81 34.8,19.82z"/>
-</vector>
diff --git a/xabber/src/main/res/drawable/ic_cloud_sync_lightgrey.xml b/xabber/src/main/res/drawable/ic_cloud_sync_lightgrey.xml
deleted file mode 100644
index 345ca237e1..0000000000
--- a/xabber/src/main/res/drawable/ic_cloud_sync_lightgrey.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<!-- drawable/cloud_sync.xml -->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:height="24dp"
-    android:width="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path android:fillColor="#bdbdbd" android:pathData="M12,4C15.64,4 18.67,6.59 19.35,10.04C21.95,10.22 24,12.36 24,15A5,5 0 0,1 19,20H6A6,6 0 0,1 0,14C0,10.91 2.34,8.36 5.35,8.04C6.6,5.64 9.11,4 12,4M7.5,9.69C6.06,11.5 6.2,14.06 7.82,15.68C8.66,16.5 9.81,17 11,17V18.86L13.83,16.04L11,13.21V15C10.34,15 9.7,14.74 9.23,14.27C8.39,13.43 8.26,12.11 8.92,11.12L7.5,9.69M9.17,8.97L10.62,10.42L12,11.79V10C12.66,10 13.3,10.26 13.77,10.73C14.61,11.57 14.74,12.89 14.08,13.88L15.5,15.31C16.94,13.5 16.8,10.94 15.18,9.32C14.34,8.5 13.19,8 12,8V6.14L9.17,8.97Z" />
-</vector>
\ No newline at end of file
diff --git a/xabber/src/main/res/drawable/ic_exit.xml b/xabber/src/main/res/drawable/ic_exit.xml
deleted file mode 100644
index 5852cec8b4..0000000000
--- a/xabber/src/main/res/drawable/ic_exit.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<!-- drawable/exit_to_app.xml -->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:height="24dp"
-    android:width="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path android:fillColor="#fff" android:pathData="M19,3H5C3.89,3 3,3.89 3,5V9H5V5H19V19H5V15H3V19A2,2 0 0,0 5,21H19A2,2 0 0,0 21,19V5C21,3.89 20.1,3 19,3M10.08,15.58L11.5,17L16.5,12L11.5,7L10.08,8.41L12.67,11H3V13H12.67L10.08,15.58Z" />
-</vector>
\ No newline at end of file
diff --git a/xabber/src/main/res/drawable/ic_github_logo.xml b/xabber/src/main/res/drawable/ic_github_logo.xml
deleted file mode 100644
index 9a848626a8..0000000000
--- a/xabber/src/main/res/drawable/ic_github_logo.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="35.318dp"
-    android:height="35.318dp"
-    android:viewportWidth="35.318"
-    android:viewportHeight="35.318">
-
-    <path
-        android:fillColor="#fff"
-        android:pathData="M23.71,34.689c-0.172,0.062-0.345,0.137-0.522,0.168c-0.678,0.121-1.112-0.229-1.116-0.922
-c-0.009-1.287-0.009-2.572,0.012-3.859c0.022-1.48-0.012-2.941-1.139-4.162c0.67-0.12,1.266-0.204,1.849-0.338
-c3.862-0.887,5.868-3.323,6.124-7.366c0.131-2.058-0.236-3.946-1.604-5.567c-0.099-0.114-0.104-0.373-0.057-0.539
-c0.364-1.34,0.258-2.649-0.166-3.959c-0.105-0.327-0.279-0.428-0.602-0.407c-1.134,0.063-2.173,0.461-3.089,1.073
-c-0.883,0.593-1.705,0.722-2.754,0.482c-2.31-0.521-4.635-0.369-6.94,0.165c-0.261,0.062-0.612-0.021-0.851-0.161
-c-1.082-0.634-2.164-1.25-3.412-1.496c-0.965-0.188-1.049-0.14-1.305,0.793C7.816,9.77,7.784,10.947,8.113,12.13
-c0.047,0.172-0.002,0.448-0.117,0.575c-2.557,2.853-1.631,8.244,0.092,10.309c1.34,1.604,3.12,2.326,5.096,2.701
-c0.345,0.064,0.688,0.113,1.033,0.173c-0.296,0.77-0.562,1.497-0.863,2.212c-0.059,0.138-0.246,0.254-0.399,0.312
-c-1.938,0.752-3.604,0.199-4.713-1.56c-0.593-0.938-1.354-1.639-2.488-1.842c-0.036-0.007-0.073-0.026-0.106-0.021
-c-0.305,0.08-0.607,0.164-0.911,0.246c0.171,0.238,0.292,0.558,0.521,0.701c0.961,0.608,1.586,1.475,1.999,2.498
-c0.649,1.604,1.909,2.319,3.546,2.459c0.799,0.065,1.606,0.01,2.481,0.01c0,0.996,0.036,2.133-0.015,3.265
-c-0.026,0.61-0.639,0.854-1.373,0.604c-1.947-0.666-3.752-1.621-5.311-2.963C0.956,26.96-1.214,20.83,0.657,13.655
-C2.522,6.503,7.383,2.116,14.651,0.739C24.708-1.163,34.235,6.161,35.233,16.37C36.021,24.418,31.284,31.949,23.71,34.689z
-M14.229,25.85c-0.006,0.014-0.01,0.024-0.016,0.038c0.018,0.003,0.036,0.006,0.055,0.009
-C14.282,25.898,14.294,25.923,14.229,25.85z
-M9.679,29.031c0.157,0.097,0.307,0.22,0.477,0.273c0.062,0.02,0.177-0.121,0.38-0.271
-c-0.282-0.107-0.448-0.201-0.623-0.225C9.845,28.8,9.757,28.953,9.679,29.031z
-M11.112,29.277c0.023,0.105,0.232,0.236,0.355,0.234
-c0.119-0.002,0.235-0.16,0.354-0.25c-0.108-0.099-0.216-0.195-0.548-0.494C11.201,28.975,11.082,29.143,11.112,29.277z
-M12.87,28.854c-0.148,0.035-0.273,0.172-0.408,0.266c0.079,0.1,0.158,0.193,0.285,0.35c0.175-0.16,0.294-0.271,0.414-0.379
-C13.061,29.004,12.944,28.836,12.87,28.854z
-M8.512,28.261c0.082,0.155,0.209,0.289,0.381,0.508
-c0.115-0.188,0.24-0.332,0.218-0.361c-0.109-0.143-0.257-0.26-0.403-0.367C8.698,28.033,8.495,28.227,8.512,28.261z" />
-</vector>
\ No newline at end of file
diff --git a/xabber/src/main/res/drawable/ic_info_outline_white_24dp.xml b/xabber/src/main/res/drawable/ic_info_outline_white_24dp.xml
deleted file mode 100644
index 9567ecd775..0000000000
--- a/xabber/src/main/res/drawable/ic_info_outline_white_24dp.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
-    <path
-        android:fillColor="#FFFFFFFF"
-        android:pathData="M11,17h2v-6h-2v6zM12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM12,20c-4.41,0 -8,-3.59 -8,-8s3.59,-8 8,-8 8,3.59 8,8 -3.59,8 -8,8zM11,9h2L13,7h-2v2z"/>
-</vector>
diff --git a/xabber/src/main/res/drawable/ic_logo_circle.xml b/xabber/src/main/res/drawable/ic_logo_circle.xml
deleted file mode 100644
index 32202a773f..0000000000
--- a/xabber/src/main/res/drawable/ic_logo_circle.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item>
-        <shape android:shape="oval">
-            <solid android:color="@color/grey_200"/>
-        </shape>
-    </item>
-    <item
-        android:drawable="@mipmap/ic_launcher"
-        android:bottom="10dp"
-        android:left="10dp"
-        android:right="10dp"
-        android:top="10dp"
-        />
-</layer-list>
\ No newline at end of file
diff --git a/xabber/src/main/res/drawable/ic_open_lock.xml b/xabber/src/main/res/drawable/ic_open_lock.xml
deleted file mode 100644
index f5d0e0126f..0000000000
--- a/xabber/src/main/res/drawable/ic_open_lock.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<!-- drawable/lock_open_outline.xml -->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:height="24dp"
-    android:width="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path android:fillColor="#757575" android:pathData="M18,20V10H6V20H18M18,8A2,2 0 0,1 20,10V20A2,2 0 0,1 18,22H6C4.89,22 4,21.1 4,20V10A2,2 0 0,1 6,8H15V6A3,3 0 0,0 12,3A3,3 0 0,0 9,6H7A5,5 0 0,1 12,1A5,5 0 0,1 17,6V8H18M12,17A2,2 0 0,1 10,15A2,2 0 0,1 12,13A2,2 0 0,1 14,15A2,2 0 0,1 12,17Z" />
-</vector>
\ No newline at end of file
diff --git a/xabber/src/main/res/drawable/ic_status_border.xml b/xabber/src/main/res/drawable/ic_status_border.xml
deleted file mode 100644
index 73e1f1e349..0000000000
--- a/xabber/src/main/res/drawable/ic_status_border.xml
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<level-list xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item android:minLevel="0" android:maxLevel="0">
-        <shape android:shape="oval">
-            <solid android:color="@color/green_500"/>
-            <size android:width="@dimen/account_status_without_border" android:height="@dimen/account_status_without_border"/>
-        </shape>
-    </item>
-    <item android:minLevel="1" android:maxLevel="1">
-        <shape android:shape="oval">
-            <solid android:color="@color/orange_500"/>
-            <size android:width="@dimen/account_status_without_border" android:height="@dimen/account_status_without_border"/>
-        </shape>
-    </item>
-    <item android:minLevel="2" android:maxLevel="2">
-        <shape android:shape="oval">
-            <solid android:color="@color/red_500"/>
-            <size android:width="@dimen/account_status_without_border" android:height="@dimen/account_status_without_border"/>
-        </shape>
-    </item>
-    <item android:minLevel="3" android:maxLevel="3">
-        <shape android:shape="oval">
-            <solid android:color="@color/blue_500"/>
-            <size android:width="@dimen/account_status_without_border" android:height="@dimen/account_status_without_border"/>
-        </shape>
-    </item>
-    <item android:minLevel="4" android:maxLevel="4">
-        <shape android:shape="oval">
-            <solid android:color="@color/indigo_500"/>
-            <size android:width="@dimen/account_status_without_border" android:height="@dimen/account_status_without_border"/>
-        </shape>
-    </item>
-    <item android:minLevel="5" android:maxLevel="5">
-        <shape android:shape="oval">
-            <solid android:color="@color/blue_grey_500"/>
-            <size android:width="@dimen/account_status_without_border" android:height="@dimen/account_status_without_border"/>
-        </shape>
-    </item>
-    <item android:minLevel="6" android:maxLevel="6">
-        <shape android:shape="oval">
-            <solid android:color="@color/cyan_500"/>
-            <size android:width="@dimen/account_status_without_border" android:height="@dimen/account_status_without_border"/>
-        </shape>
-    </item>
-    <item android:minLevel="7" android:maxLevel="7">
-        <shape android:shape="oval">
-            <solid android:color="@color/teal_500"/>
-            <size android:width="@dimen/account_status_without_border" android:height="@dimen/account_status_without_border"/>
-        </shape>
-    </item>
-    <item android:minLevel="8" android:maxLevel="8">
-        <shape android:shape="oval">
-            <solid android:color="@color/purple_500"/>
-            <size android:width="@dimen/account_status_without_border" android:height="@dimen/account_status_without_border"/>
-        </shape>
-    </item>
-    <item android:minLevel="9" android:maxLevel="9">
-        <shape android:shape="oval">
-            <solid android:color="@color/dark_purple_500"/>
-            <size android:width="@dimen/account_status_without_border" android:height="@dimen/account_status_without_border"/>
-        </shape>
-    </item>
-    <item android:minLevel="10" android:maxLevel="10">
-        <shape android:shape="oval">
-            <solid android:color="@color/lime_500"/>
-            <size android:width="@dimen/account_status_without_border" android:height="@dimen/account_status_without_border"/>
-        </shape>
-    </item>
-    <item android:minLevel="11" android:maxLevel="11">
-        <shape android:shape="oval">
-            <solid android:color="@color/pink_500"/>
-            <size android:width="@dimen/account_status_without_border" android:height="@dimen/account_status_without_border"/>
-        </shape>
-    </item>
-    <item android:minLevel="12" android:maxLevel="12">
-        <shape android:shape="oval">
-            <solid android:color="@color/light_blue_500"/>
-            <size android:width="@dimen/account_status_without_border" android:height="@dimen/account_status_without_border"/>
-        </shape>
-    </item>
-    <item android:minLevel="13" android:maxLevel="13">
-        <shape android:shape="oval">
-            <solid android:color="@color/light_green_500"/>
-            <size android:width="@dimen/account_status_without_border" android:height="@dimen/account_status_without_border"/>
-        </shape>
-    </item>
-    <item android:minLevel="14" android:maxLevel="14">
-        <shape android:shape="oval">
-            <solid android:color="@color/deep_orange_500"/>
-            <size android:width="@dimen/account_status_without_border" android:height="@dimen/account_status_without_border"/>
-        </shape>
-    </item>
-    <item android:minLevel="15" android:maxLevel="15">
-        <shape android:shape="oval">
-            <solid android:color="@color/brown_500"/>
-            <size android:width="@dimen/account_status_without_border" android:height="@dimen/account_status_without_border"/>
-        </shape>
-    </item>
-    <item android:minLevel="16" android:maxLevel="16">
-        <shape android:shape="oval">
-            <solid android:color="@color/amber_500"/>
-            <size android:width="@dimen/account_status_without_border" android:height="@dimen/account_status_without_border"/>
-        </shape>
-    </item>
-
-</level-list>
\ No newline at end of file
diff --git a/xabber/src/main/res/drawable/ic_status_thin_border.xml b/xabber/src/main/res/drawable/ic_status_thin_border.xml
deleted file mode 100644
index 0d00dad5f8..0000000000
--- a/xabber/src/main/res/drawable/ic_status_thin_border.xml
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<level-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:minLevel="0" android:maxLevel="0">
-        <shape
-            xmlns:android="http://schemas.android.com/apk/res/android"
-            android:shape="oval">
-
-            <solid
-                android:color="#fdd835"/>
-
-            <stroke
-                android:width="1px"
-                android:color="#ffffff"/>
-
-            <size
-                android:width="@dimen/account_status"
-                android:height="@dimen/account_status"/>
-        </shape>
-    </item>
-    <item android:minLevel="1" android:maxLevel="1">
-        <shape
-            xmlns:android="http://schemas.android.com/apk/res/android"
-            android:shape="oval">
-
-            <solid
-                android:color="#FF388E3C"/>
-
-            <stroke
-                android:width="1px"
-                android:color="#ffffff"/>
-
-            <size
-                android:width="@dimen/account_status"
-                android:height="@dimen/account_status"/>
-        </shape>
-    </item>
-    <item android:minLevel="2" android:maxLevel="2" >
-        <shape
-            xmlns:android="http://schemas.android.com/apk/res/android"
-            android:shape="oval">
-
-            <solid
-                android:color="#FFFFA000"/>
-
-            <stroke
-                android:width="1px"
-                android:color="#ffffff"/>
-
-            <size
-                android:width="@dimen/account_status"
-                android:height="@dimen/account_status"/>
-        </shape>
-    </item>
-    <item android:minLevel="3" android:maxLevel="3" >
-        <shape
-            xmlns:android="http://schemas.android.com/apk/res/android"
-            android:shape="oval">
-
-            <solid
-                android:color="#FF1976D2"/>
-
-            <stroke
-                android:width="1px"
-                android:color="#ffffff"/>
-
-            <size
-                android:width="@dimen/account_status"
-                android:height="@dimen/account_status"/>
-        </shape>
-    </item>
-    <item android:minLevel="4" android:maxLevel="4" >
-        <shape
-            xmlns:android="http://schemas.android.com/apk/res/android"
-            android:shape="oval">
-
-            <solid
-                android:color="#FFD32F2F"/>
-
-            <stroke
-                android:width="1px"
-                android:color="#ffffff"/>
-
-            <size
-                android:width="@dimen/account_status"
-                android:height="@dimen/account_status"/>
-        </shape>
-    </item>
-    <item android:drawable="@drawable/ic_status_invisible_18dp" android:minLevel="5" android:maxLevel="5" />
-    <item android:minLevel="6" android:maxLevel="6" >
-        <shape
-            xmlns:android="http://schemas.android.com/apk/res/android"
-            android:shape="oval">
-
-            <solid
-                android:color="#757575"/>
-
-            <stroke
-                android:width="1px"
-                android:color="#ffffff"/>
-
-            <size
-                android:width="@dimen/account_status"
-                android:height="@dimen/account_status"/>
-        </shape>
-    </item>
-    <item android:drawable="@drawable/ic_status_unsubscribed_18dp" android:minLevel="8" android:maxLevel="8" />
-</level-list>
\ No newline at end of file
diff --git a/xabber/src/main/res/drawable/ic_status_without_border.xml b/xabber/src/main/res/drawable/ic_status_without_border.xml
deleted file mode 100644
index 8a829c615f..0000000000
--- a/xabber/src/main/res/drawable/ic_status_without_border.xml
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<level-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:minLevel="0" android:maxLevel="0">
-        <shape
-            xmlns:android="http://schemas.android.com/apk/res/android"
-            android:shape="oval">
-
-            <solid
-                android:color="#fdd835"/>
-
-            <size
-                android:width="@dimen/account_status_without_border"
-                android:height="@dimen/account_status_without_border"/>
-        </shape>
-    </item>
-    <item android:minLevel="1" android:maxLevel="1">
-        <shape
-            xmlns:android="http://schemas.android.com/apk/res/android"
-            android:shape="oval">
-
-            <solid
-                android:color="#FF388E3C"/>
-
-            <size
-                android:width="@dimen/account_status_without_border"
-                android:height="@dimen/account_status_without_border"/>
-        </shape>
-    </item>
-    <item android:minLevel="2" android:maxLevel="2" >
-        <shape
-            xmlns:android="http://schemas.android.com/apk/res/android"
-            android:shape="oval">
-
-            <solid
-                android:color="#FFFFA000"/>
-
-            <size
-                android:width="@dimen/account_status_without_border"
-                android:height="@dimen/account_status_without_border"/>
-        </shape>
-    </item>
-    <item android:minLevel="3" android:maxLevel="3" >
-        <shape
-            xmlns:android="http://schemas.android.com/apk/res/android"
-            android:shape="oval">
-
-            <solid
-                android:color="#FF1976D2"/>
-
-            <size
-                android:width="@dimen/account_status_without_border"
-                android:height="@dimen/account_status_without_border"/>
-        </shape>
-    </item>
-    <item android:minLevel="4" android:maxLevel="4" >
-        <shape
-            xmlns:android="http://schemas.android.com/apk/res/android"
-            android:shape="oval">
-
-            <solid
-                android:color="#FFD32F2F"/>
-
-            <size
-                android:width="@dimen/account_status_without_border"
-                android:height="@dimen/account_status_without_border"/>
-        </shape>
-    </item>
-    <item android:drawable="@drawable/ic_status_invisible_18dp" android:minLevel="5" android:maxLevel="5" />
-    <item android:minLevel="6" android:maxLevel="6" >
-        <shape
-            xmlns:android="http://schemas.android.com/apk/res/android"
-            android:shape="oval">
-
-            <solid
-                android:color="#757575"/>
-
-            <size
-                android:width="@dimen/account_status_without_border"
-                android:height="@dimen/account_status_without_border"/>
-        </shape>
-    </item>
-    <item android:drawable="@drawable/ic_status_connection_18dp" android:minLevel="7" android:maxLevel="7" />
-    <item android:drawable="@drawable/ic_status_unsubscribed_18dp" android:minLevel="8" android:maxLevel="8" />
-</level-list>
\ No newline at end of file
diff --git a/xabber/src/main/res/drawable/ic_sync_grey.xml b/xabber/src/main/res/drawable/ic_sync_grey.xml
deleted file mode 100644
index c929991321..0000000000
--- a/xabber/src/main/res/drawable/ic_sync_grey.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<!-- drawable/sync.xml -->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:height="24dp"
-    android:width="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path android:fillColor="#757575" android:pathData="M12,18A6,6 0 0,1 6,12C6,11 6.25,10.03 6.7,9.2L5.24,7.74C4.46,8.97 4,10.43 4,12A8,8 0 0,0 12,20V23L16,19L12,15M12,4V1L8,5L12,9V6A6,6 0 0,1 18,12C18,13 17.75,13.97 17.3,14.8L18.76,16.26C19.54,15.03 20,13.57 20,12A8,8 0 0,0 12,4Z" />
-</vector>
\ No newline at end of file
diff --git a/xabber/src/main/res/drawable/intro_background.webp b/xabber/src/main/res/drawable/intro_background.webp
deleted file mode 100644
index 14488789bb52f5bfc7ebb80864007a56507c47df..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 110060
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
F001h=M)d#y

diff --git a/xabber/src/main/res/drawable/rounded_background.xml b/xabber/src/main/res/drawable/rounded_background.xml
deleted file mode 100644
index 65a4682973..0000000000
--- a/xabber/src/main/res/drawable/rounded_background.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <gradient
-        android:endColor="@color/account_register_blue"
-        android:centerColor="@color/account_register_blue"
-        android:startColor="@color/account_register_blue"
-        android:angle="270" />
-    <corners
-        android:radius="30dp" />
-    <padding
-        android:left="10dp"
-        android:top="10dp"
-        android:right="10dp"
-        android:bottom="10dp" />
-</shape>
\ No newline at end of file
diff --git a/xabber/src/main/res/drawable/xabber_logo_large.png b/xabber/src/main/res/drawable/xabber_logo_large.png
deleted file mode 100644
index 766507ac65d5704f45747d7bb0f3de3362fa870b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 126385
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
LexOyYiH!U|c4qRA

diff --git a/xabber/src/main/res/layout-land/activity_intro.xml b/xabber/src/main/res/layout-land/activity_intro.xml
deleted file mode 100644
index 4669c312f4..0000000000
--- a/xabber/src/main/res/layout-land/activity_intro.xml
+++ /dev/null
@@ -1,118 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="horizontal" android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@color/intro_background"
-    android:paddingLeft="@dimen/intro_horizontal_margin"
-    android:paddingRight="@dimen/intro_horizontal_margin"
-    android:paddingTop="@dimen/intro_vertical_margin"
-    android:paddingBottom="@dimen/intro_vertical_margin">
-
-    <ImageView
-        android:id="@+id/ivImage"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_marginRight="16dp"
-        android:src="@drawable/art_welcome"
-        android:layout_weight="1"
-        />
-
-    <LinearLayout
-        android:orientation="vertical"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_vertical"
-        android:layout_weight="1">
-
-        <LinearLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:orientation="vertical"
-            android:layout_gravity="center_horizontal">
-
-            <TextView
-                android:id="@+id/tvTitle"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:gravity="center"
-                android:layout_marginBottom="10dp"
-                android:textSize="22sp"
-                android:textColor="@color/black_text"
-                android:text="@string/intro_welcome"
-                />
-
-            <TextView
-                android:id="@+id/tvDescription"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:textSize="16sp"
-                android:gravity="center"
-                android:textColor="@color/black_text_secondary"
-                android:text="@string/intro_xabber_description"
-                android:layout_marginBottom="32dp"
-                />
-
-            <Button
-                android:id="@+id/btnSignIn"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:text="@string/intro_signin"
-                android:textColor="@color/white"
-                style="@style/Widget.AppCompat.Button.Colored"
-                android:theme="@style/BlueButton"
-                android:layout_gravity="center_horizontal"
-                android:layout_marginRight="16dp"
-                android:layout_marginLeft="16dp"
-                />
-
-            <Button
-                android:id="@+id/btnSignUp"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                style="@style/Widget.AppCompat.Button.Borderless"
-                android:theme="@style/BlueButton"
-                android:textColor="@color/account_register_blue"
-                android:text="@string/intro_signup"
-                android:layout_gravity="center_horizontal"
-                android:layout_marginRight="16dp"
-                android:layout_marginLeft="16dp"
-                />
-
-        </LinearLayout>
-
-        <LinearLayout
-            android:id="@+id/llSocialLogos"
-            android:orientation="horizontal"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_horizontal"
-            >
-
-            <ImageView
-                android:id="@+id/ivGoogle"
-                android:layout_width="48dp"
-                android:layout_height="48dp"
-                android:src="@drawable/ic_google_plus"
-                />
-
-            <ImageView
-                android:id="@+id/ivFacebook"
-                android:layout_width="48dp"
-                android:layout_height="48dp"
-                android:layout_marginLeft="32dp"
-                android:src="@drawable/ic_facebook"
-                />
-
-            <ImageView
-                android:id="@+id/ivTwitter"
-                android:layout_width="48dp"
-                android:layout_height="48dp"
-                android:layout_marginLeft="32dp"
-                android:src="@drawable/ic_twitter"
-                />
-
-        </LinearLayout>
-
-    </LinearLayout>
-
-</LinearLayout>
\ No newline at end of file
diff --git a/xabber/src/main/res/layout/account_group_item_bottom_separator.xml b/xabber/src/main/res/layout/account_group_item_bottom_separator.xml
deleted file mode 100644
index 187a688653..0000000000
--- a/xabber/src/main/res/layout/account_group_item_bottom_separator.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
-    android:layout_width="match_parent"
-    android:layout_height="8dp"
-    android:clickable="true"
-    android:elevation="1dp"
-    android:id="@+id/bottom_layer"
-    >
-    <RelativeLayout
-        android:orientation="vertical"
-        android:layout_width="match_parent"
-        android:layout_height="4dp"
-        android:clickable="true"
-        android:elevation="2dp"
-        android:id="@+id/top_layer"
-        >
-
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="1px"
-            android:background="?attr/contact_list_account_group_separator"
-            android:layout_alignParentBottom="true"
-            />
-
-        <include layout="@layout/offline_shadow"
-            android:id="@+id/offline_shadow_top"
-            />
-
-    </RelativeLayout>
-
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="1px"
-        android:background="?attr/contact_list_account_group_separator"
-        android:layout_alignParentBottom="true"
-        />
-
-    <include layout="@layout/offline_shadow"
-        android:id="@+id/offline_shadow_bottom"
-        />
-
-</RelativeLayout>
\ No newline at end of file
diff --git a/xabber/src/main/res/layout/account_group_item_top_separator.xml b/xabber/src/main/res/layout/account_group_item_top_separator.xml
deleted file mode 100644
index 47a7ca2147..0000000000
--- a/xabber/src/main/res/layout/account_group_item_top_separator.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
-    android:layout_width="match_parent"
-    android:layout_height="6dp"
-    android:clickable="true"
-    >
-
-</FrameLayout>
\ No newline at end of file
diff --git a/xabber/src/main/res/layout/activity_intro.xml b/xabber/src/main/res/layout/activity_intro.xml
deleted file mode 100644
index 70a7a24b56..0000000000
--- a/xabber/src/main/res/layout/activity_intro.xml
+++ /dev/null
@@ -1,131 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@color/intro_background"
-    android:paddingLeft="@dimen/intro_horizontal_margin"
-    android:paddingRight="@dimen/intro_horizontal_margin"
-    >
-
-    <ImageView
-        android:id="@+id/ivImage"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:src="@drawable/art_welcome"
-        android:layout_marginTop="16dp"
-        android:layout_above="@+id/centerView"
-        />
-
-    <LinearLayout
-        android:orientation="vertical"
-        android:id="@+id/center"
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_centerVertical="true"
-        android:layout_marginBottom="@dimen/intro_vertical_margin"
-        />
-
-    <LinearLayout
-        android:orientation="vertical"
-        android:id="@+id/centerView"
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_centerVertical="true"
-        android:layout_below="@+id/center"
-        />
-
-    <LinearLayout
-        android:id="@+id/textLayout"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical"
-        android:layout_marginTop="16dp"
-        android:layout_marginLeft="16dp"
-        android:layout_marginRight="16dp"
-        android:layout_below="@+id/centerView"
-        >
-
-        <TextView
-            android:id="@+id/tvTitle"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:gravity="center"
-            android:layout_marginBottom="8dp"
-            android:textSize="22sp"
-            android:textColor="@color/black_text"
-            android:text="@string/intro_welcome"
-            />
-
-        <TextView
-            android:id="@+id/tvDescription"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:textSize="16sp"
-            android:gravity="center"
-            android:textColor="@color/black_text_secondary"
-            android:text="@string/intro_xabber_description"
-            android:layout_marginBottom="8dp"
-            />
-
-        <Button
-            android:id="@+id/btnSignIn"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="@string/intro_signin"
-            android:textColor="@color/white"
-            style="@style/Widget.AppCompat.Button.Colored"
-            android:theme="@style/BlueButton"
-            android:layout_marginRight="16dp"
-            android:layout_marginLeft="16dp"
-            />
-
-        <Button
-            android:id="@+id/btnSignUp"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            style="@style/Widget.AppCompat.Button.Borderless"
-            android:theme="@style/BlueButton"
-            android:textColor="@color/account_register_blue"
-            android:text="@string/intro_signup"
-            android:layout_marginRight="16dp"
-            android:layout_marginLeft="16dp"
-            />
-
-        <LinearLayout
-            android:id="@+id/llSocialLogos"
-            android:orientation="horizontal"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_horizontal"
-            android:layout_marginTop="18dp"
-            >
-
-            <ImageView
-                android:id="@+id/ivGoogle"
-                android:layout_width="48dp"
-                android:layout_height="48dp"
-                android:src="@drawable/ic_google_plus"
-                />
-
-            <ImageView
-                android:id="@+id/ivFacebook"
-                android:layout_width="48dp"
-                android:layout_height="48dp"
-                android:layout_marginLeft="32dp"
-                android:src="@drawable/ic_facebook"
-                />
-
-            <ImageView
-                android:id="@+id/ivTwitter"
-                android:layout_width="48dp"
-                android:layout_height="48dp"
-                android:layout_marginLeft="32dp"
-                android:src="@drawable/ic_twitter"
-                />
-
-        </LinearLayout>
-
-    </LinearLayout>
-
-</RelativeLayout>
\ No newline at end of file
diff --git a/xabber/src/main/res/layout/fragment_contact_list.xml b/xabber/src/main/res/layout/fragment_contact_list.xml
deleted file mode 100644
index 9fe63ab2a5..0000000000
--- a/xabber/src/main/res/layout/fragment_contact_list.xml
+++ /dev/null
@@ -1,128 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (c) 2013, Redsolution LTD. All rights reserved.
-
-     This file is part of Xabber project; you can redistribute it and/or
-     modify it under the terms of the GNU General Public License, Version 3.
-
-     Xabber is distributed in the hope that it will be useful, but
-     WITHOUT ANY WARRANTY; without even the implied warranty of
-     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-     See the GNU General Public License for more details.
-
-     You should have received a copy of the GNU General Public License,
-     along with this program. If not, see http://www.gnu.org/licenses/.
--->
-<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:id="@+id/coordinatorLayout"
-    android:background="?attr/contact_list_background"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <android.support.design.widget.AppBarLayout
-        android:id="@+id/appbar"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:background="@color/bottom_navigation_background"
-        android:visibility="gone"
-        >
-
-        <RelativeLayout
-            android:layout_width="match_parent"
-            android:layout_height="?attr/actionBarSize"
-            >
-
-            <include layout="@layout/account_color_indicator" />
-
-            <android.support.v7.widget.Toolbar xmlns:app="http://schemas.android.com/apk/res-auto"
-                android:id="@+id/toolbar_default"
-                android:layout_width="match_parent"
-                android:layout_height="?attr/actionBarSize"
-                android:background="#00000000"
-                android:elevation="4dp"
-                app:titleTextAppearance="@style/ToolbarTitle"
-                />
-
-        </RelativeLayout>
-
-    </android.support.design.widget.AppBarLayout>
-
-    <android.support.v7.widget.RecyclerView
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:id="@+id/contact_list_recycler_view"
-        android:layout_above="@+id/containerBottomNavigation"
-        app:layout_behavior="@string/appbar_scrolling_view_behavior"
-        />
-
-    <RelativeLayout
-        android:id="@+id/info"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:gravity="center_vertical" >
-
-        <ImageView
-            android:id="@+id/connected"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerHorizontal="true"
-            android:src="@drawable/xabber_logo_80dp"
-            tools:ignore="ContentDescription" />
-
-        <ImageView
-            android:id="@+id/disconnected"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerHorizontal="true"
-            android:src="@drawable/xabber_logo_grey_80dp"
-            tools:ignore="ContentDescription" />
-
-        <TextView
-            android:id="@+id/text"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_below="@id/connected"
-            android:layout_centerHorizontal="true"
-            android:text="@string/application_state_starting"
-            android:textColor="?android:attr/textColorSecondary" />
-
-        <Button
-            android:id="@+id/button"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_below="@id/text"
-            android:layout_centerHorizontal="true"
-            android:layout_marginTop="20dip"
-            android:text="@string/application_action_waiting" />
-
-    </RelativeLayout>
-    <LinearLayout
-        android:id="@+id/placeholderView"
-        android:orientation="vertical"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:gravity="center_vertical"
-        android:visibility="gone"
-        >
-
-        <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_horizontal"
-            android:src="@drawable/xabber_logo_80dp"
-            />
-
-        <TextView
-            android:id="@+id/tvPlaceholderMessage"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_horizontal"
-            android:layout_marginTop="10dp"
-            android:text="@string/placeholder_no_unread"
-            android:textColor="?android:attr/textColorSecondary" />
-
-    </LinearLayout>
-
-</android.support.design.widget.CoordinatorLayout>
diff --git a/xabber/src/main/res/layout/include_login_fields.xml b/xabber/src/main/res/layout/include_login_fields.xml
deleted file mode 100644
index 27160ca0b1..0000000000
--- a/xabber/src/main/res/layout/include_login_fields.xml
+++ /dev/null
@@ -1,117 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@color/cardview_light_background">
-
-    <TextView
-        android:id="@+id/loginLabel"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="16dp"
-        android:paddingLeft="4dp"
-        android:textColor="@color/black_text_secondary"
-        android:text="@string/username_hint"
-        />
-
-    <EditText
-        android:id="@+id/edtLogin"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_below="@id/loginLabel"
-        android:imeOptions="actionNext"
-        android:singleLine="true"
-        android:textSize="16sp"
-        android:theme="@style/Theme"
-        android:hint="@string/username_hint"
-        />
-
-    <TextView
-        android:id="@+id/passLabel"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="16dp"
-        android:layout_below="@id/edtLogin"
-        android:paddingLeft="4dp"
-        android:textColor="@color/black_text_secondary"
-        android:text="@string/account_password"
-        />
-
-    <EditText
-        android:id="@+id/edtPass"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginBottom="10dp"
-        android:layout_below="@id/passLabel"
-        android:imeOptions="actionNext"
-        android:singleLine="true"
-        android:textSize="16sp"
-        android:theme="@style/Theme"
-        android:hint="@string/pass_hint"
-        android:fontFamily="sans-serif"
-        android:inputType="textPassword"
-        />
-
-    <Button
-        android:id="@+id/btnLogin"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_below="@id/edtPass"
-        android:layout_alignParentRight="true"
-        android:layout_marginBottom="16dp"
-        style="@style/Widget.AppCompat.Button.Colored"
-        android:theme="@style/BlueButton"
-        android:textColor="@color/white"
-        android:text="@string/button_login"
-        />
-
-    <RelativeLayout
-        android:id="@+id/rlForgotPass"
-        android:layout_width="wrap_content"
-        android:layout_height="32dp"
-        android:layout_marginTop="8dp"
-        android:paddingRight="12dp"
-        android:paddingLeft="12dp"
-        android:layout_below="@id/edtPass"
-        android:background="?android:attr/selectableItemBackground"
-        android:clickable="true"
-        >
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignParentLeft="true"
-            android:layout_centerVertical="true"
-            android:textStyle="bold"
-            android:textColor="@color/teal_500"
-            android:text="@string/forgot_pass"
-            />
-
-    </RelativeLayout>
-
-    <!--<RelativeLayout-->
-        <!--android:id="@+id/rlSignUp"-->
-        <!--android:layout_width="wrap_content"-->
-        <!--android:layout_height="32dp"-->
-        <!--android:layout_centerHorizontal="true"-->
-        <!--android:layout_marginTop="16dp"-->
-        <!--android:paddingRight="12dp"-->
-        <!--android:paddingLeft="12dp"-->
-        <!--android:background="?android:attr/selectableItemBackground"-->
-        <!--android:clickable="true"-->
-        <!--android:layout_below="@id/rlForgotPass"-->
-        <!--&gt;-->
-
-        <!--<TextView-->
-            <!--android:layout_width="wrap_content"-->
-            <!--android:layout_height="wrap_content"-->
-            <!--android:layout_centerInParent="true"-->
-            <!--android:textSize="12sp"-->
-            <!--android:text="@string/signup"-->
-            <!--android:visibility="gone"-->
-            <!--/>-->
-
-    <!--</RelativeLayout>-->
-
-</RelativeLayout>
\ No newline at end of file
diff --git a/xabber/src/main/res/layout/item_account_bottom_in_contact_list.xml b/xabber/src/main/res/layout/item_account_bottom_in_contact_list.xml
deleted file mode 100644
index f196a8ac90..0000000000
--- a/xabber/src/main/res/layout/item_account_bottom_in_contact_list.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
-    android:layout_width="match_parent"
-    android:layout_height="8dp"
-    android:clickable="true"
-    android:elevation="1dp"
-    android:id="@+id/bottom_layer"
-    android:background="?attr/contact_list_contact_background"
-    >
-    <RelativeLayout
-        android:orientation="vertical"
-        android:layout_width="match_parent"
-        android:layout_height="4dp"
-        android:elevation="1dp"
-        android:id="@+id/top_layer"
-        >
-
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="1px"
-            android:background="?attr/contact_list_account_group_separator"
-            android:layout_alignParentBottom="true"
-            android:layout_marginLeft="2dp"
-            />
-
-        <include layout="@layout/offline_shadow"
-            android:id="@+id/offline_shadow_top"
-            />
-
-    </RelativeLayout>
-
-    <include layout="@layout/account_color_indicator" />
-
-    <View
-        android:layout_width="2dp"
-        android:layout_height="1dp"
-        android:background="?attr/contact_list_contact_background"
-        android:alpha="0.5"
-        android:layout_below="@+id/top_layer"
-        />
-
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="1px"
-        android:background="?attr/contact_list_account_group_separator"
-        android:layout_alignParentTop="true"
-        android:layout_marginLeft="2dp"
-        />
-
-    <include layout="@layout/offline_shadow"
-        android:id="@+id/offline_shadow_bottom"
-        />
-
-</RelativeLayout>
\ No newline at end of file
diff --git a/xabber/src/main/res/layout/item_base_group.xml b/xabber/src/main/res/layout/item_base_group.xml
deleted file mode 100644
index 5e7109be22..0000000000
--- a/xabber/src/main/res/layout/item_base_group.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (c) 2013, Redsolution LTD. All rights reserved.
-
-     This file is part of Xabber project; you can redistribute it and/or
-     modify it under the terms of the GNU General Public License, Version 3.
-
-     Xabber is distributed in the hope that it will be useful, but
-     WITHOUT ANY WARRANTY; without even the implied warranty of
-     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-     See the GNU General Public License for more details.
-
-     You should have received a copy of the GNU General Public License,
-     along with this program. If not, see http://www.gnu.org/licenses/.
--->
-<RelativeLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="@dimen/expander_height"
-    android:elevation="2dp"
-    >
-
-    <ImageView
-        android:id="@+id/indicator"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:src="@drawable/ic_expander_indicator"
-        android:tint="?attr/contact_list_subgroup_expander_color"
-        android:layout_centerVertical="true"
-        android:layout_alignParentLeft="true"
-        android:layout_alignParentStart="true"
-        android:alpha="0.2"
-        />
-
-    <ImageView
-        android:id="@+id/group_offline_indicator"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:src="@drawable/ic_show_offline"
-        android:tint="?attr/contact_list_subgroup_offline_indicator_color"
-        android:layout_alignParentEnd="true"
-        android:layout_alignParentRight="true"
-        android:layout_centerVertical="true"
-        android:alpha="0.2"
-        android:paddingRight="@dimen/active_chat_padding_right"
-        android:paddingEnd="@dimen/active_chat_padding_right"
-
-        />
-
-    <TextView
-        android:id="@+id/name"
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/expander_height"
-        android:gravity="center_vertical"
-        android:singleLine="true"
-        android:ellipsize="marquee"
-        android:text="name (0/0)"
-        android:layout_toRightOf="@id/indicator"
-        android:layout_toEndOf="@id/indicator"
-        android:layout_toLeftOf="@id/group_offline_indicator"
-        android:layout_toStartOf="@id/group_offline_indicator"
-        />
-
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="1px"
-        android:background="?attr/contact_list_subgroup_separator"
-        android:layout_alignParentBottom="true"
-        />
-
-    <include layout="@layout/offline_shadow" />
-
-</RelativeLayout>
\ No newline at end of file
diff --git a/xabber/src/main/res/layout/item_half_transparent_background.xml b/xabber/src/main/res/layout/item_half_transparent_background.xml
deleted file mode 100644
index 1b55664f88..0000000000
--- a/xabber/src/main/res/layout/item_half_transparent_background.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical" android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:background="@color/white"
-        android:layout_marginLeft="2dp"
-        android:layout_above="@+id/effect"
-        />
-
-    <View
-        android:id="@+id/effect"
-        android:layout_width="match_parent"
-        android:layout_height="12dp"
-        android:background="@drawable/half_transparent_background"
-        android:layout_marginLeft="2dp"
-        android:layout_alignParentBottom="true"
-        />
-
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="1px"
-        android:background="?attr/contact_list_subgroup_separator"
-        android:layout_marginLeft="2dp"
-        android:alpha="0.5"
-        android:layout_alignParentBottom="true"
-        />
-
-</RelativeLayout>
\ No newline at end of file
diff --git a/xabber/src/main/res/layout/item_nav_drawer_xabber_account.xml b/xabber/src/main/res/layout/item_nav_drawer_xabber_account.xml
deleted file mode 100644
index 8d20f587a5..0000000000
--- a/xabber/src/main/res/layout/item_nav_drawer_xabber_account.xml
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:orientation="vertical"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:paddingRight="16dp"
-    android:paddingTop="8dp"
-    >
-
-    <LinearLayout
-        android:id="@+id/accountInfo"
-        android:orientation="horizontal"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:paddingLeft="16dp"
-        android:visibility="gone"
-        >
-
-        <LinearLayout
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_vertical"
-            android:layout_weight="1"
-            android:orientation="vertical">
-
-            <TextView
-                android:id="@+id/tvAccountName"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginBottom="2dp"
-                android:textStyle="bold"
-                android:textColor="@color/white_text"
-                android:textSize="12sp"
-                android:shadowColor="@color/black"
-                android:shadowDy="2"
-                android:shadowDx="2"
-                android:shadowRadius="1"
-                android:text="@string/title_xabber_account"/>
-
-            <TextView
-                android:id="@+id/tvAccountEmail"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:ellipsize="marquee"
-                android:lines="1"
-                android:textColor="@color/white_text"
-                android:textSize="12sp"
-                android:shadowColor="@color/black"
-                android:shadowDy="2"
-                android:shadowDx="2"
-                android:shadowRadius="1"
-                android:text="@string/no_username"
-                />
-        </LinearLayout>
-
-    </LinearLayout>
-
-    <LinearLayout
-        android:id="@+id/noAccount"
-        android:orientation="vertical"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:paddingLeft="16dp"
-        >
-
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="2dp"
-            android:text="@string/title_xabber_account"
-            android:textStyle="bold"
-            android:textColor="@color/white_text"
-            android:textSize="12sp"
-            android:shadowColor="@color/black"
-            android:shadowDy="2"
-            android:shadowDx="2"
-            android:shadowRadius="1" />
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:textSize="12sp"
-            android:textColor="@color/white_text"
-            android:shadowColor="@color/black"
-            android:shadowDy="2"
-            android:shadowDx="2"
-            android:shadowRadius="1"
-            android:text="@string/not_login"
-            />
-
-    </LinearLayout>
-
-</LinearLayout>
\ No newline at end of file
diff --git a/xabber/src/main/res/layout/preference_switch_layout.xml b/xabber/src/main/res/layout/preference_switch_layout.xml
deleted file mode 100644
index 49e4e6e2cc..0000000000
--- a/xabber/src/main/res/layout/preference_switch_layout.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<android.support.v7.widget.SwitchCompat xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@android:id/checkbox"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:background="@null"
-    android:clickable="false"
-    android:focusable="false" />
\ No newline at end of file
diff --git a/xabber/src/main/res/layout/toolbar_with_progress.xml b/xabber/src/main/res/layout/toolbar_with_progress.xml
deleted file mode 100644
index 00963690db..0000000000
--- a/xabber/src/main/res/layout/toolbar_with_progress.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<android.support.v7.widget.Toolbar xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/toolbar_default"
-    android:layout_width="match_parent"
-    android:layout_height="?attr/actionBarSize"
-
-    app:titleTextAppearance="@style/ToolbarTitle"
-    android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
-    app:popupTheme="?attr/toolbar_popup_theme"
-    android:elevation="8dp"
-    app:contentInsetStartWithNavigation="0dp"
-    >
-
-    <ProgressBar
-        android:id="@+id/toolbarProgress"
-        android:layout_width="18dp"
-        android:layout_height="18dp"
-        android:indeterminateTint="@color/black"
-        android:indeterminateTintMode="src_in"
-        android:layout_gravity="left"
-        android:layout_marginLeft="8dp"
-        android:visibility="gone"
-        />
-
-</android.support.v7.widget.Toolbar>
diff --git a/xabber/src/main/res/menu/item_message.xml b/xabber/src/main/res/menu/item_message.xml
deleted file mode 100644
index 59b54a49de..0000000000
--- a/xabber/src/main/res/menu/item_message.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:id="@+id/action_message_repeat"
-        android:visible="false"
-        android:title="@string/message_repeat" />
-
-    <item android:id="@+id/action_message_appeal"
-        android:title="@string/message_appeal"
-        android:visible="false"
-        />
-
-    <item android:id="@+id/action_message_quote"
-        android:title="@string/message_quote" />
-
-    <item android:id="@+id/action_message_copy"
-        android:title="@string/message_copy" />
-
-    <item android:id="@+id/action_message_remove"
-        android:title="@string/message_remove" />
-
-    <item android:id="@+id/action_message_open_muc_private_chat"
-        android:title="@string/message_open_private_chat"
-        android:visible="false"
-        />
-</menu>
\ No newline at end of file
diff --git a/xabber/src/main/res/menu/toolbar_recent_chats.xml b/xabber/src/main/res/menu/toolbar_recent_chats.xml
deleted file mode 100644
index 2ecef1a43a..0000000000
--- a/xabber/src/main/res/menu/toolbar_recent_chats.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
-    <item android:id="@+id/action_close_chats"
-        android:orderInCategory="150"
-        android:title="@string/close_chats"
-        app:showAsAction="never"
-        />
-</menu>
\ No newline at end of file
diff --git a/xabber/src/main/res/raw/smack_config.xml b/xabber/src/main/res/raw/smack_config.xml
deleted file mode 100644
index bb15981f00..0000000000
--- a/xabber/src/main/res/raw/smack_config.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Smack configuration file. -->
-<smack>
-
-    <!-- Classes that will be loaded when Smack starts -->
-    <startupClasses>
-        <className>org.jivesoftware.smackx.ServiceDiscoveryManager</className>
-        <!-- <className>org.jivesoftware.smack.PrivacyListManager</className> -->
-        <className>org.jivesoftware.smackx.muc.MultiUserChat</className>
-        <className>org.jivesoftware.smackx.mam.MamManager</className>
-        <!--
-        <className>org.jivesoftware.smackx.bytestreams.ibb.InBandBytestreamManager</className>
-        <className>org.jivesoftware.smackx.bytestreams.socks5.Socks5BytestreamManager</className>    
-        <className>org.jivesoftware.smackx.filetransfer.FileTransferManager</className>
-        -->
-    </startupClasses>
-
-    <!-- Keep-alive interval in milliseconds -->
-    <keepAliveInterval>30000</keepAliveInterval>
-
-    <!-- Keep-alive response interval in milliseconds -->
-    <keepAliveResponse>30000</keepAliveResponse>
-
-    <!-- Enable/Disable local Socks5 proxy -->
-    <localSocks5ProxyEnabled>true</localSocks5ProxyEnabled>
-
-    <!-- Port of the local Socks5 proxy -->
-    <localSocks5ProxyPort>7777</localSocks5ProxyPort>
-
-</smack>
diff --git a/xabber/src/main/res/values-ar-rSA/account_editor.xml b/xabber/src/main/res/values-ar-rSA/account_editor.xml
index db27804c57..9c04d3e2d3 100644
--- a/xabber/src/main/res/values-ar-rSA/account_editor.xml
+++ b/xabber/src/main/res/values-ar-rSA/account_editor.xml
@@ -2,40 +2,25 @@
 <!--Generated by crowdin.com-->
 <resources>
   <string name="account_compression">ضغط البيانات</string>
-  <string name="account_enabled">مفعّل</string>
-  <string name="account_host">المضيف</string>
+    <string name="account_host">المضيف</string>
   <string name="account_password">كلمة المرور</string>
   <string name="confirm_password">تأكيد كلمة المرور</string>
   <string name="account_port">منفذ</string>
   <string name="account_priority">الأولوية</string>
   <string name="account_resource">المورد</string>
   <string name="account_server_name">خادم</string>
-  <string name="account_type">نوع الحساب</string>
-  <string name="account_type_hints_gtalk">معرف gmail.com أو نطاق تطبيقات Google</string>
-  <string name="account_type_helps_gtalk">إن لم يكن لديك حساب Google بإمكانك إنشاء حساب في http://mail.google.com\nأيضاً يمكنك استخدام your_user_name@your_google_domain</string>
-  <string name="account_xmpp_register_warning">يجب عليك <a href="http://www.google.com/#q=register an XMPP account"> تسجيل حساب XMPP</a> قبل إضافته إلى Xabber!</string>
-  <string name="account_type_helps_xmpp">لمعرفة المزيد عن XMPP (Jabber) الرابط: https://xmpp.org</string>
-  <string name="account_user_name">اسم المستخدم</string>
+    <string name="account_xmpp_register_warning">يجب عليك <a href="http://www.google.com/#q=register an XMPP account"> تسجيل حساب XMPP</a> قبل إضافته إلى Xabber!</string>
+    <string name="account_user_name">اسم المستخدم</string>
   <string name="EMPTY_SERVER_NAME">لم يتم تحديد اسم الخادم</string>
   <string name="EMPTY_USER_NAME">لم يتم تحديد اسم المستخدم</string>
   <string name="CONFIRM_PASSWORD">كلمات المرور غير متطابقة</string>
-  <string name="account_archive_mode">الاحتفاط بسجل المراسلات</string>
-  <string name="account_archive_mode_available">على الخادم إذا كان متوفراً</string>
-  <string name="account_archive_mode_dont_store">عدم الاحتفاظ</string>
-  <string name="account_archive_mode_local">محلياً على الجهاز</string>
-  <string name="account_archive_mode_server">على الخادم</string>
-  <string name="account_archive_mode_unread">محلياً فقط للرسائل الغير المرسلة أو الغير مقروءة</string>
-  <string name="account_compression_summary">علِّم لتفعيل ضغط البيانات</string>
+    <string name="account_compression_summary">علِّم لتفعيل ضغط البيانات</string>
   <string name="account_custom">تخصيص المضيف</string>
   <string name="account_custom_summary">استخدم إعداد مخصص للمضيف بدلاً من سجل SRV</string>
-  <string name="account_enabled_summary">علِّم لتفعيل الحساب</string>
-  <string name="account_invalid_port">المنفذ يجب أن يكون رقماً (الافتراضي: 5222)</string>
+    <string name="account_invalid_port">المنفذ يجب أن يكون رقماً (الافتراضي: 5222)</string>
   <string name="account_invalid_port_range">المنفذ يجب أن يتراوح بين 1 إلى 65535 (الافتراضي: 5222)</string>
   <string name="account_invalid_priority">قيمة الأولوية يجب أن تكون بين -128 و 127 (الافتراضي: 10)</string>
-  <string name="account_oauth">تخويل</string>
-  <string name="account_oauth_invalidated">غير مخول</string>
-  <string name="account_oauth_summary">OAuth ضبط</string>
-  <string name="account_proxy_host">مضيف الوسيط</string>
+    <string name="account_proxy_host">مضيف الوسيط</string>
   <string name="account_proxy_invalid_port_range">منفذ الوسيط يجب أن يتراوح بين 1 إلى 65535 (الافتراضي: 8080)</string>
   <string name="account_proxy_invalid_port">منفذ الوسيط يجب أن يكون رقماً (الافتراضي: 8080)</string>
   <string name="account_proxy_password">كلمة المرور للوسيط</string>
@@ -47,18 +32,14 @@
   <string name="account_sasl_summary">عطل الخيار للخوادم القديمة جداً</string>
   <string name="account_store_password">الاحتفاظ بكلمة المرور</string>
   <string name="account_store_password_summary">تعطيل هذه الخاصية لطلب كلمة المرور في كل مرة تدخل فيها على الحساب</string>
-  <string name="account_syncable">دمج في حسابات النظام</string>
-  <string name="account_syncable_summary">إظهار الأسماء من هذا الحساب في قائمة اتصال الهاتف</string>
-  <string name="account_tls_enable">تفعيل TLS</string>
+    <string name="account_tls_enable">تفعيل TLS</string>
   <string name="account_tls_enable_summary">استخدم تشفير TLS إذا أمكن للاتصال بالخادم</string>
   <string name="account_tls_legacy">Legacy SSL</string>
   <string name="account_tls_legacy_summary">استخدم تشفير legacy SSL للاتصال بالخادم</string>
   <string name="account_tls_mode">استخدام TLS/SSL</string>
   <string name="account_tls_require">استلزام TLS</string>
   <string name="account_tls_require_summary">استلزم تشفير TLS للاتصال بالخادم</string>
-  <string name="account_use_orbot">اتصل عبر شبكة اخفاء الهوية TOR و تفعيل بروتوكول التشفير TLS\nلا ينصح به لحسابات Google Talk</string>
-  <string name="confirm_cancellation">متأكد أنك تريد تجاهل كل التغييرات؟</string>
-  <string name="INCORRECT_USER_NAME">اسم المستخدم غير صحيح. أنظر للنص المساعد بالأسفل لمزيد من التفاصيل.</string>
+    <string name="INCORRECT_USER_NAME">اسم المستخدم غير صحيح. أنظر للنص المساعد بالأسفل لمزيد من التفاصيل.</string>
   <string name="orbot_required_message">كي تستخدم شبكة TOR يجب تثبيت وتفعيل برنامج Orbot. هل ترغيب في تثبيته من المتجر؟</string>
   <string name="orbot_required_title">تثبيت Orbot?</string>
   <string name="install_orbot">تثبيت Orbot</string>
diff --git a/xabber/src/main/res/values-ar-rSA/chat_viewer.xml b/xabber/src/main/res/values-ar-rSA/chat_viewer.xml
index f99152fb62..a74f2473f8 100644
--- a/xabber/src/main/res/values-ar-rSA/chat_viewer.xml
+++ b/xabber/src/main/res/values-ar-rSA/chat_viewer.xml
@@ -19,11 +19,8 @@
   <string name="message_quote">اقتباس</string>
   <string name="message_remove">احذف من سجل الرسائل</string>
   <string name="message_repeat">أعد محاولة الإرسال</string>
-  <string name="message_open_file">فتح</string>
-  <string name="message_save_file">حفظ</string>
-  <string name="save_history">حفظ السجل محلياً\nتخزين سجل الرسائل محلياً</string>
-  <string name="show_history">إظهار سجل الرسائل</string>
-  <string name="action_attention_called">تم إرسال طلب انتباه</string>
+    <string name="save_history">حفظ السجل محلياً\nتخزين سجل الرسائل محلياً</string>
+    <string name="action_attention_called">تم إرسال طلب انتباه</string>
   <string name="action_attention_requested">تم طلب انتباهك</string>
   <string name="action_ban">%1$s تم حظره</string>
   <string name="action_ban_by">%1$s تم حظره بواسطة %2$s</string>
@@ -71,26 +68,17 @@
   <string name="otr_refresh">إعادة تشغيل التشفير</string>
   <string name="otr_request">تم طلب تشفير المحادثة باستخدام OTR لكن ليس لديك أداة تدعمها. استخدم Pidgin أو Gajim أو Adium لأنظمة الحاسوب، أو Xabber أو ChatSecure لأنظمة Android.\nتصفح http://otr.cypherpunks.ca/ لمزيد من المعلومات.</string>
   <string name="otr_start">ابدأ التشفير</string>
-  <string name="otr_unencrypted_message">هذه الرسالة لم تيم تشفيرها</string>
-  <string name="otr_unreadable_message">الرسالة المشفرة التي أرسلتها ليست مقروؤة لدى الطرف الآخر</string>
+    <string name="otr_unreadable_message">الرسالة المشفرة التي أرسلتها ليست مقروؤة لدى الطرف الآخر</string>
   <string name="otr_verification">تحقق OTR</string>
   <string name="otr_verify_fingerprint">تحقق بالبصمة</string>
   <string name="otr_verify_question">تحقق بالسؤال السري</string>
   <string name="otr_verify_secret">تحقق بكلمة سر</string>
-  <string name="under_construction">قيد الإنشاء</string>
-  <string name="under_construction_message">هذه الشاشة قيد الإنشاء</string>
-  <string name="chat_events_show_text_global">استخدم الإعدادات العامة</string>
+    <string name="chat_events_show_text_global">استخدم الإعدادات العامة</string>
   <string name="chat_events_show_text_always">إظهار نص الرسالة</string>
   <string name="chat_events_show_text_never">إخفاء نص الرسالة</string>
-  <string name="sending_file">جار إرسال ملف %s</string>
-  <string name="error_sending_file">خطأ في إرسال ملف %s</string>
-  <string name="no_application_to_open_file">لايمكن العثور على تطبيق لفتح هذا الملف</string>
-  <string name="could_not_save_file">تعذر حفظ الملف</string>
-  <string name="file_saved_successfully">تم حفظ الملف بنجاح</string>
-  <string name="received_by">تم الاستلام بواسطة %s</string>
-  <string name="could_not_get_path_to_file">لا يمكن الحصول على المسار إلى ملف</string>
+    <string name="error_sending_file">خطأ في إرسال ملف %s</string>
+    <string name="could_not_get_path_to_file">لا يمكن الحصول على المسار إلى ملف</string>
   <string name="message_open_private_chat">فتح محادثة خاصة</string>
-  <string name="http_file_upload_slot_error">لا يمكن تحميل الملف. كبير جداً؟</string>
-  <string name="no_permission_to_read_files">لا يوجد إذن لقراءة الملفات</string>
+    <string name="no_permission_to_read_files">لا يوجد إذن لقراءة الملفات</string>
   <string name="no_permission_to_write_files">لا يوجد إذن لكتابة الملفات</string>
 </resources>
diff --git a/xabber/src/main/res/values-ar-rSA/contact_list.xml b/xabber/src/main/res/values-ar-rSA/contact_list.xml
index fa9a0ac61f..497acdd223 100644
--- a/xabber/src/main/res/values-ar-rSA/contact_list.xml
+++ b/xabber/src/main/res/values-ar-rSA/contact_list.xml
@@ -18,17 +18,13 @@
   <string name="application_state_roster">متصل.</string>
   <string name="application_state_starting">جارِ تشغيل التطبيق&#8230; </string>
   <string name="application_state_waiting">بانتظار الاتصال&#8230;</string>
-  <string name="chat_list">قائمة المحادثات</string>
-  <string name="chat_list_is_empty">لا توجد محادثات دائرة</string>
-  <string name="chat_viewer">محادثة</string>
-  <string name="close_chat">أغلق المحادثة</string>
-  <string name="CONNECTION_FAILED">خطأ في الاتصال</string>
+    <string name="chat_viewer">محادثة</string>
+    <string name="CONNECTION_FAILED">خطأ في الاتصال</string>
   <string name="contact_add">إضف طرف اتصال</string>
   <string name="contact_delete">حذف</string>
   <string name="contact_block">حظر جهة الاتصال</string>
   <string name="contact_delete_confirm">هل حقاً تريد أن تحذف طرف الاتصال %1$s من حساب %2$s؟</string>
-  <string name="contact_list">قائمة الاتصال</string>
-  <string name="discard_subscription">رفض الاتصال</string>
+    <string name="discard_subscription">رفض الاتصال</string>
   <string name="exit">خروج</string>
   <string name="group_active_chat">محادثات دائرة</string>
   <string name="group_none">لا توجد مجموعات</string>
@@ -40,14 +36,7 @@
   <string name="request_subscription">طلب الاشتراك</string>
   <string name="XMPP_EXCEPTION">خطأ في تدفق البيانات</string>
   <string name="application_state_closing">حفظ التغييرات&#8230;\nسيتم إغلاق التطبيق قريباً.</string>
-  <string name="certificate_details">\n\nأصدرت لـ:\nCommon Name (CN): %1$s\nOrganization (O): %2$s\nOrganizational Unit (OU): %3$s\nSerial Number: %4$s\n\nIssued by:\nCommon Name (CN): %5$s\nOrganization (O): %6$s\nOrganizational Unit (OU): %7$s\n\nسريان المفعول:\nصدرت في: %8$s\nتنتهي في: %9$s.</string>
-  <string name="certificate_invalid_chane">فشل التحقق من سلسلة التوقيع</string>
-  <string name="certificate_invalid_target">فشل التحقق من الهدف</string>
-  <string name="certificate_self_signed">شهادة موقعة ذاتياً</string>
-  <string name="certificate_show_details">تفاصيل ...</string>
-  <string name="close_chats">إنهاء جميع المحادثات</string>
-  <string name="contact_integration_suggest">هل تريد دمج Xabber في قائمة اتصالات النظام؟\nيمكن تغيير هذا الإعداد من \"الإعدادات\" → \"حسابات XMPP\" → حسابك → \"دمج في حسابات النظام\".\nتنبيه: قائمة اتصالات النظام قد تصبح أبطأ لبضع دقائق.</string>
-  <string name="group_room">اجتماعات</string>
+    <string name="group_room">اجتماعات</string>
   <string name="OTR_ERROR">خطأ OTR</string>
   <string name="select_contact">برجاء النقر لاختيار طرف اتصال</string>
   <string name="show_offline_always">أظهر دائماً</string>
@@ -62,8 +51,7 @@
   <string name="block_list">قائمة الحظر</string>
   <string name="contact_blocked_successfully">تم حظر جهة الاتصال بنجاح</string>
   <string name="error_blocking_contact">خطأ في حظر جهة اتصال</string>
-  <string name="unblock_contact">إلغاء حظر جهة الإتصال</string>
-  <string name="contacts_unblocked_successfully">تم إلغاء حظر جهات الاتصال بنجاح</string>
+    <string name="contacts_unblocked_successfully">تم إلغاء حظر جهات الاتصال بنجاح</string>
   <string name="error_unblocking_contacts">خطأ في إلغاء حظر جهات الاتصال</string>
   <string name="block_contact_confirm">هل حقاً تريد أن تحظر طرف الاتصال %1$s من حساب %2$s؟</string>
 </resources>
diff --git a/xabber/src/main/res/values-ar-rSA/contact_viewer.xml b/xabber/src/main/res/values-ar-rSA/contact_viewer.xml
index 7667d7ee07..fb0f40546e 100644
--- a/xabber/src/main/res/values-ar-rSA/contact_viewer.xml
+++ b/xabber/src/main/res/values-ar-rSA/contact_viewer.xml
@@ -17,12 +17,9 @@
   <string name="vcard_organization_unit">الوحدة التنظيمية</string>
   <string name="vcard_title">الوظيفة</string>
   <string name="vcard_role">الدور</string>
-  <string name="vcard_other">معلومات أخرى</string>
-  <string name="vcard_categories">فئات</string>
-  <string name="vcard_decsription">وصف</string>
+    <string name="vcard_decsription">وصف</string>
   <string name="vcard_note">ملاحظات</string>
-  <string name="vcard_address">العنوان</string>
-  <string name="vcard_address_pobox">صندوق بريد</string>
+    <string name="vcard_address_pobox">صندوق بريد</string>
   <string name="vcard_address_extadr">العنوان</string>
   <string name="vcard_address_street">شارع</string>
   <string name="vcard_address_locality">المجاورة</string>
diff --git a/xabber/src/main/res/values-ar-rSA/muc_editor.xml b/xabber/src/main/res/values-ar-rSA/muc_editor.xml
index 47880af352..f292a9863a 100644
--- a/xabber/src/main/res/values-ar-rSA/muc_editor.xml
+++ b/xabber/src/main/res/values-ar-rSA/muc_editor.xml
@@ -20,12 +20,10 @@
   <string name="muc_invite_confirm">%2$s يدعوك أن تنضم للاجتماع %3$s. هل تنضم من حساب %1$s؟</string>
   <string name="muc_invite_confirm_reason">%2$s يدعوك أن تنضم للاجتماع %3$s: %4$s. هل تنضم من حساب %1$s؟</string>
   <string name="muc_leave">ترك الاجتماع</string>
-  <string name="muc_save">حفظ الاجتماع</string>
-  <string name="muc_choose_conference">اختر الاجتماع</string>
+    <string name="muc_choose_conference">اختر الاجتماع</string>
   <string name="muc_next">التالى</string>
   <string name="muc_get_hosted_conferences">الحصول على الاجتماعات المستضافة</string>
   <string name="muc_error_getting_conferences">خطأ في الحصول على الاجتماعات</string>
   <string name="muc_type_conference_name">أدخل اسم الاجتماع</string>
-  <string name="contact_is_blocked">جهة الاتصال محظورة!</string>
-  <string name="conference_invitation">دعوة للاجتماع</string>
+    <string name="conference_invitation">دعوة للاجتماع</string>
 </resources>
diff --git a/xabber/src/main/res/values-ar-rSA/notification_bar.xml b/xabber/src/main/res/values-ar-rSA/notification_bar.xml
index 9778f04b0e..4e1f896d15 100644
--- a/xabber/src/main/res/values-ar-rSA/notification_bar.xml
+++ b/xabber/src/main/res/values-ar-rSA/notification_bar.xml
@@ -34,10 +34,7 @@
   <!-- Used for plural form in russian. -->
   <string name="connection_state_waiting_5">-</string>
   <string name="connection_state_offline">%1$d %2$s غير متصل</string>
-  <string name="archive_available_request_message">هل تريد حفظ سجل الرسائل على الخادم؟\nهذا يمكن Xabber من تحميل سجل الرسائل من كل الأجهزة التي تستعمل هذا الحساب.\nتلك الخاصية ستستهلك كمية أكثر من البيانات وستقلل سرعة الاتصال بشكل طفيف.\nتحذير: كل السجل سيُحذف من على جهازك.</string>
-  <string name="archive_available_request_title">تفعيل أرشفة الرسائل؟</string>
-  <string name="INVALID_CERTIFICATE">شهادة غير صالحة</string>
-  <string name="muc_invite_message">هل ترغب في الانضمام للاجتماع؟</string>
+    <string name="muc_invite_message">هل ترغب في الانضمام للاجتماع؟</string>
   <string name="otr_verification_in_progress">اضغط هنا للإلغاء.</string>
   <string name="PASSWORD_REQUIRED">مطلوب كلمة المرور</string>
   <string name="pay_attention">انتبه</string>
diff --git a/xabber/src/main/res/values-ar-rSA/preference_editor.xml b/xabber/src/main/res/values-ar-rSA/preference_editor.xml
index 3f94c569d1..b84cd30992 100644
--- a/xabber/src/main/res/values-ar-rSA/preference_editor.xml
+++ b/xabber/src/main/res/values-ar-rSA/preference_editor.xml
@@ -8,14 +8,11 @@
   <string name="contacts_order_alphabet">أبجدي</string>
   <string name="contacts_order_status">بالحالة</string>
   <string name="contacts_show_accounts">جمِّع حسب الحساب\nجمِّع الأطراف في قائمة الاتصال حسب الحساب</string>
-  <string name="contacts_show_active_chats">المحادثات النشطة بالأعلى\nأظهر المحادثات النشطة بأعلى قائمة الاتصال</string>
-  <string name="contacts_show_avatars">إظهار الصور الرمزية\nإظهار الصور الرمزية للأطراف في قائمة الاتصال</string>
+    <string name="contacts_show_avatars">إظهار الصور الرمزية\nإظهار الصور الرمزية للأطراف في قائمة الاتصال</string>
   <string name="contacts_show_empty_groups">أظهر المجموعات الخالية\nأظهر المجموعات التي ليس بها أطراف متاحة</string>
   <string name="contacts_show_groups">إظهار المجموعات\nإظهار المجموعات في قائمة الاتصال</string>
   <string name="contacts_show_offline">إظهار الأطراف الغير المتاحة</string>
-  <string name="contacts_show_panel">إظهار لوحة الحسابات\nإظهار أزرار بالصور الرمزية في الركن اليمين السفلي لقائمة أطراف الاتصال</string>
-  <string name="contacts_stay_active_chats">تكرار المحادثات النشطة\nأظهر المحادثات النشطة بأعلى قائمة الاتصال وكذلك في مجموعات الاتصال</string>
-  <string name="debug_log">سجل التصحيح\nكتابة الرسائل لسجل التصحيح (برجاء إعادة تشغيل البرنامج لتطبيق التغيير)</string>
+    <string name="debug_log">سجل التصحيح\nكتابة الرسائل لسجل التصحيح (برجاء إعادة تشغيل البرنامج لتطبيق التغيير)</string>
   <string name="debug_file_log_title">كتابة ملف سجل التصحيح \nكتابة سجل التصحيح إلى ملف محلي (يمكنك مشاركته).</string>
   <string name="debug_log_files_title">ملفات السجل\nقائمة ملفات السجل المكتوبة.</string>
   <string name="debug_log_files_activity_title">ملفات السجل</string>
@@ -24,8 +21,7 @@
   <string name="events_persistent">أيقونة شريط المهام\nاظهار مستمر للإخطار. هذا الخيار يمنع نظام Android من إزالة التطبيق من الذاكرة</string>
   <string name="interface_theme_dark">داكن</string>
   <string name="interface_theme_light">فاتح</string>
-  <string name="interface_theme_normal">الافتراضي</string>
-  <string name="interface_smiles_android">تعبيرات Android</string>
+    <string name="interface_smiles_android">تعبيرات Android</string>
   <string name="interface_smiles_none">لا تعبيرات رسومية</string>
   <string name="preference_connection">إعدادات الاتصال\nإعدادات الاتصال</string>
   <string name="preference_contacts">قائمة الاتصال\nتخصيص مظهر قائمة الاتصال</string>
@@ -40,8 +36,7 @@
   <string name="chats_font_size_small">صغير</string>
   <string name="chats_font_size_xlarge">كبير جداً</string>
   <string name="chats_hide_keyboard_landscape">في الوضع العرضي</string>
-  <string name="chats_receipt">إيصالات تسليم الرسائل\nأرسال واستقبال إيصالات تسليم الرسائل</string>
-  <string name="chats_show_avatars">الصور الرمزية في الرسائل\nإظهار الصور الرمزية في كل رسالة</string>
+    <string name="chats_show_avatars">الصور الرمزية في الرسائل\nإظهار الصور الرمزية في كل رسالة</string>
   <string name="chats_show_status_change_muc">في الاجتماعات</string>
   <string name="chats_state_notification">إرسال إخطار الكتابة\nإخطار الطرف الآخر أنك تكتب له رسالة</string>
   <string name="connection_adjust_priority">تعديل الأولوية\nضبط الأولوية حسب الحالة المحددة. أولوية الحساب سيتم تجاوزها.</string>
@@ -54,28 +49,17 @@
   <string name="contacts_reset_offline">إعادة تعيين إعدادات الأطراف الغير متاحة\nمسح الإعدادات الفردية للمجموعات وأطراف الاتصال</string>
   <string name="contacts_reset_offline_warning">هل ترغب حقاً في مسح الإعدادات الفردية للمجموعات وأطراف الاتصال؟</string>
   <string name="events_first_only">تنبيه للرسالة الأولى\nإشعار فقط لأول رسالة في الحوار</string>
-  <string name="events_ignore_system_vibro">تجاهل إعدادات النظام للاهتزاز\nاستخدم هذا الخيار في حالة عدم عمل الاهتزاز بالنظام</string>
-  <string name="events_message">ضبط الإشعارات\nضبط الإشعارات عن الرسائل الواردة</string>
-  <string name="events_message_chat">المحادثات فقط</string>
-  <string name="events_message_chat_and_muc">المحادثات والاجتماعات</string>
-  <string name="events_message_none">بدون إشعارات</string>
-  <string name="events_visible_chat">الإشعار في المحادثة الحالية\nالإشعار للرسائل الواردة في المحادثة الحالية</string>
-  <string name="events_suppress_100">حظر بعض رسائل الحالة\nحظر رسائل \'الهويات في هذه الغرفة ليست مجهولة\'</string>
+    <string name="events_suppress_100">حظر بعض رسائل الحالة\nحظر رسائل \'الهويات في هذه الغرفة ليست مجهولة\'</string>
   <string name="negative_priotiry_summary">‎%s‎ (لن تتلقَ رسائل من أي محادثة)</string>
   <string name="preference_accounts">حسابات XMPP\nإدارة الحسابات</string>
   <string name="preference_security">الأمان\nإعدادات الأمان</string>
   <string name="security_check_certificate">تحقق من شهادة الخادم\nإخطار بمشاكل الشهادة على الاتصالات المشفرة</string>
-  <string name="security_clear_certificate">حذف الشهادات\nمسح قائمة الشهادات المهملة</string>
-  <string name="security_otr_history">احتفاظ بسجل المحادثات\nاحتفظ بسجل المحادثات المشفرة بـ OTR</string>
-  <string name="security_otr_mode">وضع OTR</string>
+    <string name="security_otr_mode">وضع OTR</string>
   <string name="chats_attention">لفت الانتباه\nاستجب لطلبات لفت الانتباه الواردة</string>
   <string name="chats_attention_sound">صوت التنبيه\nاختر نغمة</string>
   <string name="connection_load_vcard">حمّل بطاقة vCard\nحمّل وحدّث البيانات الشخصية وصورة طرف الاتصال. عطّلها لتقليل استخدام بيانات الشبكة.</string>
   <string name="connection_load_images">تحميل صور\nتحميل الصور من رابط الملف تلقائياً. تعطيل للحد من استخدام بيانات الهاتف.</string>
   <string name="connection_use_carbons">وضع النسخة الكربونية\nقد تكون غير مستقرة!سوف تشارك المحادثات لنفس الحساب على هذا العميل. عطّلها لتقليل استخدام بيانات الشبكة.</string>
-  <string name="connection_use_plain_text_auth">المصادقة بنص غير مشفر \nاستخدام نص غير مشفر لمصادقة
-كافة الحسابات. لا يوصي به.</string>
-  <string name="events_phrases">عبارات مفتاحية\nتخصيص إخطارات للرسائل المستقبلة التي تحتوي على عبارات معينة</string>
-  <string name="security_clear_certificate_warning">هل ترغب حقاً في حذف كل الشهادات المهملة؟</string>
-  <string name="account_error_settings">إعدادات</string>
+    <string name="events_phrases">عبارات مفتاحية\nتخصيص إخطارات للرسائل المستقبلة التي تحتوي على عبارات معينة</string>
+    <string name="account_error_settings">إعدادات</string>
 </resources>
diff --git a/xabber/src/main/res/values-be-rBY/account_editor.xml b/xabber/src/main/res/values-be-rBY/account_editor.xml
index b24a7c7569..1391270155 100644
--- a/xabber/src/main/res/values-be-rBY/account_editor.xml
+++ b/xabber/src/main/res/values-be-rBY/account_editor.xml
@@ -2,38 +2,24 @@
 <!--Generated by crowdin.com-->
 <resources>
   <string name="account_compression">Выкарыстоўваць сцісканьне</string>
-  <string name="account_enabled">Рахунак уключаны</string>
-  <string name="account_host">Хост</string>
+    <string name="account_host">Хост</string>
   <string name="account_password">Пароль</string>
   <string name="confirm_password">Падцьвердзіць пароль</string>
   <string name="account_port">Порт</string>
   <string name="account_priority">Прыярытэт</string>
   <string name="account_resource">Рэсурс</string>
   <string name="account_server_name">Сэрвер</string>
-  <string name="account_type">Тып рахунку</string>
-  <string name="account_type_hints_gtalk">рахунак gmail.com ці службы google</string>
-  <string name="account_type_helps_gtalk">Калі вы ня маеце рахунку Google, вы можаце стварыць яго па адрасе http://mail.google.com\nГэтаксама вы можаце выкарыстоўваць ваша_імя@ваш_гугладамен</string>
-  <string name="account_type_helps_xmpp">Калі вы жадаецца даведацца болей аб XMPP (Jabber), то гэта можна зрабіць тут: https://xmpp.org</string>
-  <string name="account_user_name">Імя карыстальніка</string>
+    <string name="account_user_name">Імя карыстальніка</string>
   <string name="EMPTY_SERVER_NAME">Пустая назва сэрвера</string>
   <string name="EMPTY_USER_NAME">Пустое імя карыстальніка</string>
   <string name="CONFIRM_PASSWORD">Паролі не супадаюць</string>
-  <string name="account_archive_mode">Захоўваць гісторыю паведамленьняў</string>
-  <string name="account_archive_mode_available">На серверы, калі такое магчыма</string>
-  <string name="account_archive_mode_dont_store">Не захоўваць</string>
-  <string name="account_archive_mode_local">Лякальна на гэтай прыладзе</string>
-  <string name="account_archive_mode_server">На серверы</string>
-  <string name="account_archive_mode_unread">Лякальна толькі недасланыя і непрачытаныя</string>
-  <string name="account_compression_summary">Пазначце, каб уключыць сцісканьне дадзеных</string>
+    <string name="account_compression_summary">Пазначце, каб уключыць сцісканьне дадзеных</string>
   <string name="account_custom">Увесь хост уручную</string>
   <string name="account_custom_summary">Выкарыстоўваць наладкі адмысловага хаста замест SRV запісу</string>
   <string name="account_invalid_port">Порт мусіць быць лічбай (па-змоўчаньні: 5222)</string>
   <string name="account_invalid_port_range">Порт мусіць быць лічбай паміж 1 ды 65535 (значэньне па-змоўчаньні: 5222)</string>
   <string name="account_invalid_priority">Прыярытэт мусіць быць лічбай дыяпазону паміж -128 і 127 (па-змоўчаньні: 10)</string>
-  <string name="account_oauth">Аўтарызацыя</string>
-  <string name="account_oauth_invalidated">Не аўтарызаваны</string>
-  <string name="account_oauth_summary">Наладкі OAuth</string>
-  <string name="account_proxy_host">Хост для проксі</string>
+    <string name="account_proxy_host">Хост для проксі</string>
   <string name="account_proxy_invalid_port_range">Порт для проксі мусіць быць лічбай паміж 1 ды 65535 (па-змоўчаньні: 8080)</string>
   <string name="account_proxy_invalid_port">Порт для проксі мусіць быць лічбай (па-змоўчаньні 8080)</string>
   <string name="account_proxy_password">Пароль для проксі</string>
@@ -45,18 +31,14 @@
   <string name="account_sasl_summary">Адключыце гэтую опцыю для вельмі старога сервера</string>
   <string name="account_store_password">Захоўваць пароль</string>
   <string name="account_store_password_summary">Адключыце гэтую наладку, каб кожны раз уводзіць пароль пры падлучэньні</string>
-  <string name="account_syncable">Інтэграцыя з кантактамі ў тэлефоннай кніжцы</string>
-  <string name="account_syncable_summary">Паказваць сукразмоўцаў з гэтага рахунку ў сьпісе кантактаў тэлефона</string>
-  <string name="account_tls_enable">Уключыць TLS</string>
+    <string name="account_tls_enable">Уключыць TLS</string>
   <string name="account_tls_enable_summary">Выкарыстоўваць TLS шыфраваньне, калі магчыма, каб падлучыцца да сервера</string>
   <string name="account_tls_legacy">Стары SSL</string>
   <string name="account_tls_legacy_summary">Выкарыстоўваць старое SSL шыфраваньне падчас падлучэньня да сервера</string>
   <string name="account_tls_mode">Выкарыстоўваньне TLS/SSL</string>
   <string name="account_tls_require">Патрабаваць TLS</string>
   <string name="account_tls_require_summary">Патрабаваць TLS шыфраваньне падчас падлучэньня да сервера</string>
-  <string name="account_use_orbot">Выкарыстоўваць ананімнае злучэньне праз TOR і патрабаваць TLS шыфраваньня\nНе раім для Google Talk</string>
-  <string name="confirm_cancellation">Ці насамрэч вы жадаеце адмяніць ўсе незахаваныя зьмены?</string>
-  <string name="INCORRECT_USER_NAME">Няправільнае імя карыстальніка. Паглядзіце на падказку ўнізе экрана</string>
+    <string name="INCORRECT_USER_NAME">Няправільнае імя карыстальніка. Паглядзіце на падказку ўнізе экрана</string>
   <string name="orbot_required_message">Для выкарыстаньня TOR неабходна усталяваць праграму Orbot і актываваць ў ім перадачу дадзеных (праксіяваньне). Ці хочаце вы ўсталяваць яго праз Google Play?</string>
   <string name="orbot_required_title">Усталяваць Orbot?</string>
   <string name="install_orbot">Усталяваць Orbot</string>
diff --git a/xabber/src/main/res/values-be-rBY/chat_viewer.xml b/xabber/src/main/res/values-be-rBY/chat_viewer.xml
index 2f6d79332f..3a0e4682dc 100644
--- a/xabber/src/main/res/values-be-rBY/chat_viewer.xml
+++ b/xabber/src/main/res/values-be-rBY/chat_viewer.xml
@@ -21,11 +21,8 @@
   <string name="message_remove">Прыбраць з гісторыі</string>
   <string name="message_repeat">Даслаць яшчэ раз</string>
   <string name="message_otr_show_original">Паказаць тэкст паведамленьня</string>
-  <string name="message_open_file">Адчыніць</string>
-  <string name="message_save_file">Захаваць</string>
-  <string name="save_history">Захоўваць лякальную гісторыю паведамленьняў\nЗахоўваць гісторыю перапіскі ў памяці прыстасаваньня</string>
-  <string name="show_history">Паказаць гісторыю паведамленьняў</string>
-  <string name="action_attention_called">Вы пасьпяхова гукнулі суразмоўцу</string>
+    <string name="save_history">Захоўваць лякальную гісторыю паведамленьняў\nЗахоўваць гісторыю перапіскі ў памяці прыстасаваньня</string>
+    <string name="action_attention_called">Вы пасьпяхова гукнулі суразмоўцу</string>
   <string name="action_attention_requested">Вас гукнулі</string>
   <string name="action_ban">%1$s забанены</string>
   <string name="action_ban_by">%2$s забаніў %1$s</string>
@@ -73,8 +70,7 @@
   <string name="otr_refresh">Нанава пачаць шыфраваньне</string>
   <string name="otr_request">Суразмоўца паспрабаваў пачаць OTR шыфраваньне гутаркі, але ў вас не ўсталяваны плягін для яго падтрымкі. Усталюце Pidgin, Gajim ці Adium для PC/Mac і Xabber ці ChatSecure для Android. Пачытайце https://otr.cypherpunks.ca/ каб атрымаць больш інфармацыі.</string>
   <string name="otr_start">Пачаць шыфраваньне</string>
-  <string name="otr_unencrypted_message">Гэтае паведамленьне не было зашыфравана</string>
-  <string name="otr_unreadable_message">Зашыфраванае паведамленьне, якое вы даслалі, нечытэльнае</string>
+    <string name="otr_unreadable_message">Зашыфраванае паведамленьне, якое вы даслалі, нечытэльнае</string>
   <string name="otr_not_decrypted_message">Немагчыма расшыфраваць паведамленьне</string>
   <string name="otr_verification">Праверка асобы суразмоўцы OTR</string>
   <string name="otr_verify_fingerprint">Праверыць адбіткам</string>
@@ -87,21 +83,13 @@
   <string name="otr_verification_progress_title">ідзе OTR верыфікацыя</string>
   <string name="otr_verification_notify_button">Адчыніць</string>
   <string name="otr_verification_notify_button_cancel">Скасаваць</string>
-  <string name="under_construction">У працэссе распрацоўкі</string>
-  <string name="under_construction_message">Гэты экран знаходзіцца ў працэссе распрацоўкі</string>
-  <string name="chat_events_show_text_global">Выкарыстоўваць глябальныя наладкі</string>
+    <string name="chat_events_show_text_global">Выкарыстоўваць глябальныя наладкі</string>
   <string name="chat_events_show_text_always">Паказваць тэкст паведамленьня</string>
   <string name="chat_events_show_text_never">Хаваць тэкст паведамленьня</string>
-  <string name="sending_file">Дасылаем файл %s</string>
-  <string name="error_sending_file">Памылка адпраўкі файла %s</string>
-  <string name="no_application_to_open_file">Адсутнічаюць праграмы для адкрыцьця гэтага файла</string>
-  <string name="could_not_save_file">Немагчыма захаваць файл</string>
-  <string name="file_saved_successfully">Файл пасьпяхова захаваны</string>
-  <string name="received_by">Атрымана %s</string>
-  <string name="could_not_get_path_to_file">Немагчыма атрымаць шлях да файла</string>
+    <string name="error_sending_file">Памылка адпраўкі файла %s</string>
+    <string name="could_not_get_path_to_file">Немагчыма атрымаць шлях да файла</string>
   <string name="message_open_private_chat">Адчыніць прыватную гутарку</string>
-  <string name="http_file_upload_slot_error">Немагчыма запампаваць файл. Мо ён занадта вялікі?</string>
-  <string name="no_permission_to_read_files">Няма правоў на чытаньне файла</string>
+    <string name="no_permission_to_read_files">Няма правоў на чытаньне файла</string>
   <string name="no_permission_to_write_files">Няма правоў на запіс файла</string>
   <string name="error_description_title">Апісаньне памылкі:</string>
   <string name="message_status_sent">Дасланае</string>
diff --git a/xabber/src/main/res/values-be-rBY/contact_list.xml b/xabber/src/main/res/values-be-rBY/contact_list.xml
index c6b29226aa..eeb657684c 100644
--- a/xabber/src/main/res/values-be-rBY/contact_list.xml
+++ b/xabber/src/main/res/values-be-rBY/contact_list.xml
@@ -18,17 +18,13 @@
   <string name="application_state_roster">Падлучана...</string>
   <string name="application_state_starting">Праграма запускаецца... </string>
   <string name="application_state_waiting">Чакаю на падлучэньне...</string>
-  <string name="chat_list">Сьпіс гутарак</string>
-  <string name="chat_list_is_empty">Няма актыўных гутарак</string>
-  <string name="chat_viewer">Пагутарыць</string>
-  <string name="close_chat">Закрыць гутарку</string>
-  <string name="CONNECTION_FAILED">Пры падлучэньні ўзьнікла памылка</string>
+    <string name="chat_viewer">Пагутарыць</string>
+    <string name="CONNECTION_FAILED">Пры падлучэньні ўзьнікла памылка</string>
   <string name="contact_add">Дадаць суразмоўцу</string>
   <string name="contact_delete">Выдаліць</string>
   <string name="contact_block">Заблякаваць суразмоўцу</string>
   <string name="contact_delete_confirm">Ці насамрэч Вы жадаеце выдаліць суразмоўцу %1$s з рахунку %2$s?</string>
-  <string name="contact_list">Сьпіс суразмоўцаў</string>
-  <string name="discard_subscription">Адмовіць ў аўтарызацыі</string>
+    <string name="discard_subscription">Адмовіць ў аўтарызацыі</string>
   <string name="exit">Выйсьці</string>
   <string name="group_active_chat">Актыўныя гутаркі</string>
   <string name="group_none">Па-за групамі</string>
@@ -40,14 +36,7 @@
   <string name="request_subscription">Запытаць аўтарызацыю</string>
   <string name="XMPP_EXCEPTION">Памылка падлучэньня (XMPP exception)</string>
   <string name="application_state_closing">Захаваньне зьменаў ...\nПраграма хутка зачыніцца.</string>
-  <string name="certificate_details">\n\nКаму выданы:\nІмя (CN): %1$s\nАрганізацыя (O): %2$s\nПадразьдзяленьне (OU): %3$s\nСерыйны нумар: %4$s\n\nКім выданы:\nІмя (CN): %5$s\nАрганізацыя (O): %6$s\nПадразьдзяленьне (OU): %7$s\n\nТэрмін дзеяньня:\nВыдадзены: %8$s\nСканчаецца: %9$s.</string>
-  <string name="certificate_invalid_chane">Памылка праверкі ланцужка подпісаў</string>
-  <string name="certificate_invalid_target">Сертыфікат не прайшоў праверку</string>
-  <string name="certificate_self_signed">Сама-падпісаны сертыфікат</string>
-  <string name="certificate_show_details">Падрабязнасьці ...</string>
-  <string name="close_chats">Закрыць усе гутаркі</string>
-  <string name="contact_integration_suggest">Ці хочаце вы інтэграваць Xabber з кантактамі сістэмы?\nГэта можна зьмяніць пазьней праз \"Наладкі\" → \"Рахункі XMPP\" → Ваш рахунак → \"Інтэграцыя з кантактамі ў тэлефоннай кніжцы\"\nУВАГА: Сістэмны сьпіс кантактаў можа стаць павольней на некалькі хвілінаў.</string>
-  <string name="group_room">Канфэрэнцыі</string>
+    <string name="group_room">Канфэрэнцыі</string>
   <string name="OTR_ERROR">Памылка OTR</string>
   <string name="select_contact">Абярыце патрэбнага суразмоўцу</string>
   <string name="show_offline_always">Заўжды паказваць</string>
@@ -62,17 +51,14 @@
   <string name="block_list">Сьпіс заблякаваных суразмоўвацў</string>
   <string name="contact_blocked_successfully">Суразмоўца пасьпяхова заблякаваны</string>
   <string name="error_blocking_contact">Памылка пры блякаваньні кантакта</string>
-  <string name="unblock_contact">Разблякаваць суразмоўцу</string>
-  <string name="unblock_all">Разблякаваць ўсіх</string>
+    <string name="unblock_all">Разблякаваць ўсіх</string>
   <string name="unblock_selected">Разблякаваць абраных</string>
   <string name="dark_theme_suggest_dialog_join_dark_side">Цёмная</string>
   <string name="dark_theme_suggest_dialog_stay_on_light_side">Сьветлая</string>
   <string name="battery_optimization_disable_dialog_title">Аптымізатацыя расходу батарэі</string>
-  <string name="save_log_to_file">Захаваць у файл</string>
-  <string name="open_log_file">Адчыніць</string>
+    <string name="open_log_file">Адчыніць</string>
   <string name="send_log_file">Даслаць</string>
-  <string name="intro_welcome">Вітаем ў Xabber</string>
-  <string name="synchronize_bookmarks">Сінхранізаваць закладкі</string>
+    <string name="synchronize_bookmarks">Сінхранізаваць закладкі</string>
   <string name="remove_all_bookmarks">Выдаліць ўсе</string>
   <string name="remove_selected_bookmarks">Выдаліць абраныя</string>
 </resources>
diff --git a/xabber/src/main/res/values-be-rBY/contact_viewer.xml b/xabber/src/main/res/values-be-rBY/contact_viewer.xml
index 64832ab398..5d7df49402 100644
--- a/xabber/src/main/res/values-be-rBY/contact_viewer.xml
+++ b/xabber/src/main/res/values-be-rBY/contact_viewer.xml
@@ -15,12 +15,9 @@
   <string name="vcard_organization">Арганізацыя</string>
   <string name="vcard_title">Пасада</string>
   <string name="vcard_role">Функцыі, якія выконвае</string>
-  <string name="vcard_other">Іншыя зьвесткі</string>
-  <string name="vcard_categories">Катэгорыі</string>
-  <string name="vcard_decsription">Апісаньне</string>
+    <string name="vcard_decsription">Апісаньне</string>
   <string name="vcard_note">Заўвагі</string>
-  <string name="vcard_address">Адрэса</string>
-  <string name="vcard_address_pobox">Паштовая скрыня</string>
+    <string name="vcard_address_pobox">Паштовая скрыня</string>
   <string name="vcard_address_extadr">Дадатковая адрэса</string>
   <string name="vcard_address_street">Вуліца</string>
   <string name="vcard_address_locality">Горад</string>
diff --git a/xabber/src/main/res/values-be-rBY/muc_editor.xml b/xabber/src/main/res/values-be-rBY/muc_editor.xml
index 99fa87a98b..f692030b53 100644
--- a/xabber/src/main/res/values-be-rBY/muc_editor.xml
+++ b/xabber/src/main/res/values-be-rBY/muc_editor.xml
@@ -20,12 +20,10 @@
   <string name="muc_invite_confirm">%2$s запрашае вас паўдзельнічаць у канфэрэнцыі %3$s. Далучыцца з рахунку %1$s?</string>
   <string name="muc_invite_confirm_reason">%2$s запрашае вас паўдзельнічаць у канфэрэнцыі %3$s: %4$s. Далучыцца з рахунку %1$s?</string>
   <string name="muc_leave">Выйсьці з канфэрэнцыі</string>
-  <string name="muc_save">Захаваць канфэрэнцыю</string>
-  <string name="muc_choose_conference">Выбраць канферэнцыю</string>
+    <string name="muc_choose_conference">Выбраць канферэнцыю</string>
   <string name="muc_next">Далей</string>
   <string name="muc_get_hosted_conferences">Атрымаць сьпіс канфэрэнцый</string>
   <string name="muc_error_getting_conferences">Падчас атрыманьня сьпісу канфэрэнцый узьнікла памылка</string>
   <string name="muc_type_conference_name">Увядзіце імя канфэрэнцыі</string>
-  <string name="contact_is_blocked">Суразмоўца заблякаваны!</string>
-  <string name="conference_invitation">Запрашэньне ў канфэрэнцыю</string>
+    <string name="conference_invitation">Запрашэньне ў канфэрэнцыю</string>
 </resources>
diff --git a/xabber/src/main/res/values-be-rBY/notification_bar.xml b/xabber/src/main/res/values-be-rBY/notification_bar.xml
index a556ed514c..769b7ae989 100644
--- a/xabber/src/main/res/values-be-rBY/notification_bar.xml
+++ b/xabber/src/main/res/values-be-rBY/notification_bar.xml
@@ -34,10 +34,7 @@
   <!-- Used for plural form in russian. -->
   <string name="connection_state_waiting_5">%1$d з %2$d %3$s чакаюць на паўторнае падлучэньне</string>
   <string name="connection_state_offline">%1$d %2$s офлайн</string>
-  <string name="archive_available_request_message">Ці хочаце вы захоўваць гісторыю паведамленьняў на серверы?\nГэта дазваляе Xabber падгружаць гісторыю паведамленьняў адразу на ўсіх прыладах, дзе выкарыстоўваецца гэты рахунак.\nГэта будзе спажываць больш трафіку і крыху зьменшыць хуткасьць падлучэньня.\nУВАГА: Уся вашая лякаяльная гісторыя будзе выдаленая.</string>
-  <string name="archive_available_request_title">Уключыць архіў паведамленьняў?</string>
-  <string name="INVALID_CERTIFICATE">Сертыфікат не падыходзіць</string>
-  <string name="muc_invite_message">Ці хочаце Вы падлучыцца да канфэрэнцыі?</string>
+    <string name="muc_invite_message">Ці хочаце Вы падлучыцца да канфэрэнцыі?</string>
   <string name="otr_verification_in_progress">Націсьніце, каб перарваць.</string>
   <string name="PASSWORD_REQUIRED">Патрэбны пароль</string>
   <string name="pay_attention">Вас гукнулі</string>
diff --git a/xabber/src/main/res/values-be-rBY/preference_editor.xml b/xabber/src/main/res/values-be-rBY/preference_editor.xml
index fbffe1f608..39fec856e2 100644
--- a/xabber/src/main/res/values-be-rBY/preference_editor.xml
+++ b/xabber/src/main/res/values-be-rBY/preference_editor.xml
@@ -9,14 +9,11 @@
   <string name="contacts_order_alphabet">Па альфабэце</string>
   <string name="contacts_order_status">Па статусе</string>
   <string name="contacts_show_accounts">Групаваць па рахунках\nДазваляе паказваць суразмоўцаў, адсартаваных па тых рахунках, да якіх яны дададзеныя</string>
-  <string name="contacts_show_active_chats">Актыўныя гутаркі ў пачатку\nАдлюстроўваць актыўныя гутаркі ўверсі сьпісу суразмоўцаў</string>
-  <string name="contacts_show_avatars">Паказваць аватары\nДазваляе бачыць аватары ў сьпісе суразмоўцаў</string>
+    <string name="contacts_show_avatars">Паказваць аватары\nДазваляе бачыць аватары ў сьпісе суразмоўцаў</string>
   <string name="contacts_show_empty_groups">Паказваць пустыя групы\nПаказваць групы, нават калі ў іх няма суразмоўцаў</string>
   <string name="contacts_show_groups">Паказваць групы\nДазваляе групаваць суразмоўцаў па групах</string>
   <string name="contacts_show_offline">Паказваць офлайн суразмоўцаў\nПаказвае суразмоўцаў, якія зараз не падлучаныя</string>
-  <string name="contacts_show_panel">Паказваць панэль рахункаў\nДазваляе бачыць кнопкі з выявамі рахункаў у правым ніжнім куце сьпісу суразмоўцаў</string>
-  <string name="contacts_stay_active_chats">Дубляваць актыўныя гутаркі\nПаказваць суразмоўваў, зь якімі ідзе гутарка, не толькі ў пачатку сьпісу кантактаў, але і ў асноўным сьпісе</string>
-  <string name="debug_log">Журнал ладкаваньня\nЗапісваць сістэмныя паведамленьні ў журнал ладкаваньня (трэба перазапусціць праграму, каб пачало працаваць)</string>
+    <string name="debug_log">Журнал ладкаваньня\nЗапісваць сістэмныя паведамленьні ў журнал ладкаваньня (трэба перазапусціць праграму, каб пачало працаваць)</string>
   <string name="debug_file_log_title">Запісваць файлы журналу\nВесьці журнал лакаваньня ў лякальным файле (вы можаце потым ім падзяліцца).</string>
   <string name="debug_log_files_title">Файлы журналу\nСьпіс захаваных файлаў журналу.</string>
   <string name="debug_log_files_activity_title">Файлы журналу</string>
@@ -29,8 +26,7 @@
   <string name="interface_theme">Тэма</string>
   <string name="interface_theme_dark">Цёмная</string>
   <string name="interface_theme_light">Сьветлая</string>
-  <string name="interface_theme_normal">Стандартная</string>
-  <string name="interface_smiles">Смайлы</string>
+    <string name="interface_smiles">Смайлы</string>
   <string name="interface_smiles_android">Стандартныя смайлы</string>
   <string name="interface_smiles_none">Адключыць графічныя смайлы</string>
   <string name="preference_connection">Наладкі падлучэньня\nНаладкі варыянтаў падлучэньня</string>
@@ -50,8 +46,7 @@
   <string name="chats_font_size_xlarge">Вялізны</string>
   <string name="chats_hide_keyboard">Схаваць клявіятуру</string>
   <string name="chats_hide_keyboard_landscape">У ляндшафтным рэжыме</string>
-  <string name="chats_receipt">Абвесткі пра дастаўку паведамленьняў\nДасылаць і атрымліваць абвесткі пра пасьпяховасьць дастаўкі паведамленьняў</string>
-  <string name="chats_show_avatars">Аватаркі ў паведамленьнях\nПаказавць аватаркі ў кожным паведамленьні</string>
+    <string name="chats_show_avatars">Аватаркі ў паведамленьнях\nПаказавць аватаркі ў кожным паведамленьні</string>
   <string name="chats_show_status_change_muc">У канфэрэнцыях</string>
   <string name="chats_state_notification">Паказваць абвесткі пра набор тэкста\nПаказвае, калі ваш суразмоўца набірае тэкст</string>
   <string name="connection_adjust_priority">Зьмяніць прыярытэт\nУсталяваць прыярытэт, згодна абранаму статусу. Прыярытэт рахунку будзе ніжэйшы.</string>
@@ -64,33 +59,21 @@
   <string name="contacts_reset_offline">Скінуць наладкі для офлайн сьпісу\nВыдаліць індывідуальныя наладкі адлюстраваньня суразмоўцаў офлайн для групаў і рахункаў</string>
   <string name="contacts_reset_offline_warning">Ці насамрэч вы жадаеце выдаліць індывідуальныя наладкі для групаў і рахункаў?</string>
   <string name="events_first_only">Абвяшчаць пра першае паведамленьне\nПаведамляць толькі пра першае паведамленьне ў гутарцы</string>
-  <string name="events_ignore_system_vibro">Ігнараваць наладкі вібрацыі сістэмы\nВыкарыстоўваце гэтую наладку, калі сістэмная вібрацыя не спрацоўвае</string>
-  <string name="events_message">Налад абвестак\nНаладзіць абвесткі аб уваходзячых паведамленьнях</string>
-  <string name="events_message_chat">Толькі ў гутарках</string>
-  <string name="events_message_chat_and_muc">У гутарках і канфэрэнцыях</string>
-  <string name="events_message_none">Не паведамляць</string>
-  <string name="events_visible_chat">Абвесткі пра гэтую гутарку\nПаведамляць пра новыя паведамленьні у гэтай гутарцы</string>
-  <string name="events_suppress_100">Ігнараваць некаторыя паведамленьні\nНе атрымліваць службовыя паведамленьні кшталту \'Гэтая канфэрэнцыя не ананімная\'</string>
+    <string name="events_suppress_100">Ігнараваць некаторыя паведамленьні\nНе атрымліваць службовыя паведамленьні кшталту \'Гэтая канфэрэнцыя не ананімная\'</string>
   <string name="negative_priotiry_summary">%s (вы не будзеце атрымліваць паведамленьні з аніводнай гутаркі)</string>
   <string name="preference_accounts">Рахункі XMPP\nКіраваньне рахункамі</string>
   <string name="preference_security">Бясьпека\nНаладкі бясьпекі</string>
   <string name="security_check_certificate">Правяраць сертыфікат сервера\nПаведамляць, калі ёсьць нейкія праблемы з усталяваньнем зашыфраванага падлучэньня</string>
-  <string name="security_clear_certificate">Выдаліць сертыфікаты\nАчысьціць сьпіс ігнаруемых сертыфікатаў</string>
-  <string name="security_otr_history">Захоўваць гісторыю\nЗахоўваць гісторыю нават у OTR размовах</string>
-  <string name="security_otr_mode">Рэжым шыфраваньня OTR</string>
+    <string name="security_otr_mode">Рэжым шыфраваньня OTR</string>
   <string name="chats_attention">Гуканьне і прыцягненьне увагі\nРэагаваць на гуканьні ад суразмоўцаў</string>
   <string name="chats_attention_sound">Як гукнуць\nАбярыце рынгтон на гуканьне</string>
   <string name="connection_load_vcard">Загружаць vCard\nЗагружаць і абнаўляць перасанльныя зьвесткі суразмоўцы і аватар. Выключыце, каб зьменшыць сеткавы трафік.</string>
   <string name="connection_use_carbons">Рэжым капіркі\nМожа працаваць не стабільна! Прымаць паведамленьні іншых сесій вашага рахунку. Адключыце, каб зэканоміць трафік.</string>
-  <string name="connection_dns_resolver_type">Тып DNS-кліента</string>
-  <string name="connection_dns_resolver_type_dns_java_resolver">DNSJavaResolver</string>
+    <string name="connection_dns_resolver_type_dns_java_resolver">DNSJavaResolver</string>
   <string name="connection_dns_resolver_type_mini_dns_resolver">MiniDNSResolver (эксперыментальны)</string>
   <string name="events_phrases">Ключавыя выразы\nСтварыць адмысловыя абвесткі для атрыманых паведамленьняў, якія ўтрымліваюць адмысловыя выразы</string>
-  <string name="security_clear_certificate_warning">Ці насамрэч вы жадаеце выдаліць ўсе ігнаруемыя сертыфікаты?</string>
-  <string name="account_error_settings">Наладкі</string>
-  <string name="category_xabber_account">Рахунак Xabber</string>
-  <string name="category_xmpp_accounts">Рахункі XMPP</string>
-  <string name="category_interface">Інтэрфейс</string>
+    <string name="account_error_settings">Наладкі</string>
+    <string name="category_interface">Інтэрфейс</string>
   <string name="category_settings">Наладкі</string>
   <string name="category_about">Аб праграме</string>
   <string name="category_appearance">Зьнешні выгляд</string>
diff --git a/xabber/src/main/res/values-be-rBY/words.xml b/xabber/src/main/res/values-be-rBY/words.xml
index b5f63a35f2..0077859b11 100644
--- a/xabber/src/main/res/values-be-rBY/words.xml
+++ b/xabber/src/main/res/values-be-rBY/words.xml
@@ -20,5 +20,4 @@
   <string name="settings">Наладкі</string>
   <string name="ok">ОК</string>
   <string name="login">Увайсьці</string>
-  <string name="resume">Працягнуць</string>
 </resources>
diff --git a/xabber/src/main/res/values-bg-rBG/account_editor.xml b/xabber/src/main/res/values-bg-rBG/account_editor.xml
index eb1939036c..9d7758813b 100644
--- a/xabber/src/main/res/values-bg-rBG/account_editor.xml
+++ b/xabber/src/main/res/values-bg-rBG/account_editor.xml
@@ -2,40 +2,25 @@
 <!--Generated by crowdin.com-->
 <resources>
   <string name="account_compression">Компресия</string>
-  <string name="account_enabled">Включен</string>
-  <string name="account_host">Хост</string>
+    <string name="account_host">Хост</string>
   <string name="account_password">Парола</string>
   <string name="confirm_password">Потвърждаване на парола</string>
   <string name="account_port">Порт</string>
   <string name="account_priority">Приоритет</string>
   <string name="account_resource">Jabber ресурс</string>
   <string name="account_server_name">Сървър</string>
-  <string name="account_type">Вид на профила</string>
-  <string name="account_type_hints_gtalk">gmail.com потребител или Google Apps домейн</string>
-  <string name="account_type_helps_gtalk">Ако нямате Google профил, може да си създадете от http://mail.google.com\nСъщо можете да използвате потребител@google_domain</string>
-  <string name="account_xmpp_register_warning"><a href="http://www.google.com/#q=register an XMPP account">Регистрирайте XMPP профил</a> преди да го добавите в Xabber!</string>
-  <string name="account_type_helps_xmpp">Можете да научите повече за XMPP (Jabber) от тук: https://xmpp.org</string>
-  <string name="account_user_name">Потребител</string>
+    <string name="account_xmpp_register_warning"><a href="http://www.google.com/#q=register an XMPP account">Регистрирайте XMPP профил</a> преди да го добавите в Xabber!</string>
+    <string name="account_user_name">Потребител</string>
   <string name="EMPTY_SERVER_NAME">Името на сървъра не е въведено</string>
   <string name="EMPTY_USER_NAME">Потребителското име не е въведено</string>
   <string name="CONFIRM_PASSWORD">Паролите не съответстват</string>
-  <string name="account_archive_mode">Съхраняване на съобщенията</string>
-  <string name="account_archive_mode_available">На сървъра при възможност</string>
-  <string name="account_archive_mode_dont_store">Не съхранявай</string>
-  <string name="account_archive_mode_local">Локално на устройството</string>
-  <string name="account_archive_mode_server">На сървъра</string>
-  <string name="account_archive_mode_unread">Локално само неизпратените и непрочетените</string>
-  <string name="account_compression_summary">Избери за активиране на компресиране на данните</string>
+    <string name="account_compression_summary">Избери за активиране на компресиране на данните</string>
   <string name="account_custom">Персонализиран хост</string>
   <string name="account_custom_summary">Използване на персонални сървърни настройки вместо SRV запис</string>
-  <string name="account_enabled_summary">Смени, за да активираш профил</string>
-  <string name="account_invalid_port">Портът може да е само число (5222 по подразбиране)</string>
+    <string name="account_invalid_port">Портът може да е само число (5222 по подразбиране)</string>
   <string name="account_invalid_port_range">Портът може да е число между 1 и 65535 (5222 по подразбиране)</string>
   <string name="account_invalid_priority">Приоритета може да е число между -128 и 127 (0 по подразбиране)</string>
-  <string name="account_oauth">Упълномощяване</string>
-  <string name="account_oauth_invalidated">Не е упълномощен</string>
-  <string name="account_oauth_summary">OAuth настройки</string>
-  <string name="account_proxy_host">Прокси хост</string>
+    <string name="account_proxy_host">Прокси хост</string>
   <string name="account_proxy_invalid_port_range">Прокси портът може да е число между 1 и 65535 (8080 по подразбиране)</string>
   <string name="account_proxy_invalid_port">Прокси портът трябва да е число (8080 по подразбиране)</string>
   <string name="account_proxy_password">Прокси парола</string>
@@ -47,18 +32,14 @@
   <string name="account_sasl_summary">Спри при по-стара версия на сървъра</string>
   <string name="account_store_password">Запазване на пароли</string>
   <string name="account_store_password_summary">Изключи за проверка на паролата при всяко вписване</string>
-  <string name="account_syncable">Интегриране в системните контакти</string>
-  <string name="account_syncable_summary">Показване на контактите от този профил в указателя на телефона</string>
-  <string name="account_tls_enable">Включване на TLS шифриране</string>
+    <string name="account_tls_enable">Включване на TLS шифриране</string>
   <string name="account_tls_enable_summary">Използване на TLS шифриране, когато е достъпно на сървъра</string>
   <string name="account_tls_legacy">При остаряла версия на SSL</string>
   <string name="account_tls_legacy_summary">Използване на по-стара SSL версия при връзка със сървъра</string>
   <string name="account_tls_mode">TLS/SSL употреба</string>
   <string name="account_tls_require">Изискване на TLS</string>
   <string name="account_tls_require_summary">Използване на TLS шифриране при връзка със сървъра</string>
-  <string name="account_use_orbot">Чат през TOR мрежата и задължаване на използването на TLS шифриране\nНе се препоръчва за Google Talk</string>
-  <string name="confirm_cancellation">Сигурни ли сте, че искате да отмените всички промени?</string>
-  <string name="INCORRECT_USER_NAME">Неправилно потребителско име. Вижте текста отдолу за детайли.</string>
+    <string name="INCORRECT_USER_NAME">Неправилно потребителско име. Вижте текста отдолу за детайли.</string>
   <string name="orbot_required_message">За да използвате TOR е нужно да имате инсталиран Orbot и той да е активиран, за да се проксира трафик през него. Желаете ли да го инсталирате чрез Google Play?</string>
   <string name="orbot_required_title">Да се инсталира ли Orbot?</string>
   <string name="install_orbot">Инсталиране на Orbot</string>
diff --git a/xabber/src/main/res/values-bg-rBG/chat_viewer.xml b/xabber/src/main/res/values-bg-rBG/chat_viewer.xml
index 3b939096d5..94392d6c99 100644
--- a/xabber/src/main/res/values-bg-rBG/chat_viewer.xml
+++ b/xabber/src/main/res/values-bg-rBG/chat_viewer.xml
@@ -23,11 +23,8 @@
   <string name="message_remove">Премахване от историята</string>
   <string name="message_repeat">Изпрати отново</string>
   <string name="message_otr_show_original">Покажи съобщение</string>
-  <string name="message_open_file">Отваряне</string>
-  <string name="message_save_file">Запазване</string>
-  <string name="save_history">Запазване на историята локално\nЗапазване на съобщенията от историята локално</string>
-  <string name="show_history">Покажи историята</string>
-  <string name="action_attention_called">Контактът е сръчкан</string>
+    <string name="save_history">Запазване на историята локално\nЗапазване на съобщенията от историята локално</string>
+    <string name="action_attention_called">Контактът е сръчкан</string>
   <string name="action_attention_requested">Сръчкаха Ви</string>
   <string name="action_ban">На %1$s е наложена забрана</string>
   <string name="action_ban_by">На %1$s е наложена забрана от %2$s</string>
@@ -75,8 +72,7 @@
   <string name="otr_refresh">Рестартирай шифрирането</string>
   <string name="otr_request">Поискан е неофициален (Off-the-Record) поверителен разговор, но Вие нямате необходимата добавка. Използвайте Pidgin, Gajim или Adium за PC/Mac и Xabber, Conversations или ChatSecure за Android. Посетете http://otr.cypherpunks.ca/ за повече информация.</string>
   <string name="otr_start">Започни шифрирането</string>
-  <string name="otr_unencrypted_message">Това съобщение не е шифрирано</string>
-  <string name="otr_unreadable_message">Шифрираното съобщение, което изпратихте, е нечетимо</string>
+    <string name="otr_unreadable_message">Шифрираното съобщение, което изпратихте, е нечетимо</string>
   <string name="otr_not_decrypted_message">Съобщението не може да се дешифрира</string>
   <string name="otr_verification">OTR проверка</string>
   <string name="otr_verify_fingerprint">Удостовери с отпечатък</string>
@@ -89,21 +85,13 @@
   <string name="otr_verification_progress_title">Тече проверка на OTR</string>
   <string name="otr_verification_notify_button">Отвори</string>
   <string name="otr_verification_notify_button_cancel">Откажи</string>
-  <string name="under_construction">В процес на разработка</string>
-  <string name="under_construction_message">В процес на разработка</string>
-  <string name="chat_events_show_text_global">Използване на глобални настройки</string>
+    <string name="chat_events_show_text_global">Използване на глобални настройки</string>
   <string name="chat_events_show_text_always">Покажи текста на съобщението</string>
   <string name="chat_events_show_text_never">Скриване на съобщението</string>
-  <string name="sending_file">Изпращане на файл %s</string>
-  <string name="error_sending_file">Грешка при изпращане на файла %s</string>
-  <string name="no_application_to_open_file">Не е намерено приложение за този тип файлове</string>
-  <string name="could_not_save_file">Файлът не е запазен</string>
-  <string name="file_saved_successfully">Файлът е съхранен успешно</string>
-  <string name="received_by">Получено от %s</string>
-  <string name="could_not_get_path_to_file">Не е намерен път до файла</string>
+    <string name="error_sending_file">Грешка при изпращане на файла %s</string>
+    <string name="could_not_get_path_to_file">Не е намерен път до файла</string>
   <string name="message_open_private_chat">Отваряне на частен чат</string>
-  <string name="http_file_upload_slot_error">Файлът не може да се качи. Моля проверете размера</string>
-  <string name="no_permission_to_read_files">Липсват привилегии за четене на файлове</string>
+    <string name="no_permission_to_read_files">Липсват привилегии за четене на файлове</string>
   <string name="no_permission_to_write_files">Липсват привилегии за писане на файлове</string>
   <string name="error_description_title">Описание на грешката:</string>
   <string name="message_status_sent">Изпратено</string>
diff --git a/xabber/src/main/res/values-bg-rBG/contact_editor.xml b/xabber/src/main/res/values-bg-rBG/contact_editor.xml
index 790c2385bb..0496f54d49 100644
--- a/xabber/src/main/res/values-bg-rBG/contact_editor.xml
+++ b/xabber/src/main/res/values-bg-rBG/contact_editor.xml
@@ -17,12 +17,8 @@
   <string name="processing_image">Обработка на изображение...</string>
   <string name="error_during_crop">Грешка при изрязване на изображението</string>
   <string name="error_during_image_processing">Грешка при обработка на изображението</string>
-  <string name="account_settings">Настройки на профила</string>
-  <string name="account_user_info">Данни за профил</string>
-  <string name="account_server_info">Информация за сървъра</string>
+    <string name="account_server_info">Информация за сървъра</string>
   <string name="account_server_info_description">Списък с възможностите на сървъра</string>
   <string name="conference_private_chat_invitation">%1$s от %2$s иска да започне поверителен разговор с Вас</string>
   <string name="accept_muc_private_chat">Приеми</string>
-  <string name="block_muc_private_chat">Блокирай</string>
-  <string name="no_permission_camera">Няма разрешение за достъп до камерата</string>
 </resources>
diff --git a/xabber/src/main/res/values-bg-rBG/contact_list.xml b/xabber/src/main/res/values-bg-rBG/contact_list.xml
index 47424f71ae..a69edc364c 100644
--- a/xabber/src/main/res/values-bg-rBG/contact_list.xml
+++ b/xabber/src/main/res/values-bg-rBG/contact_list.xml
@@ -18,17 +18,13 @@
   <string name="application_state_roster">Свързан.</string>
   <string name="application_state_starting">Стартиране на приложението&#8230;</string>
   <string name="application_state_waiting">Изчакване на връзка&#8230;</string>
-  <string name="chat_list">Разговори</string>
-  <string name="chat_list_is_empty">Няма активни разговори</string>
-  <string name="chat_viewer">Разговор</string>
-  <string name="close_chat">Затвори разговора</string>
-  <string name="CONNECTION_FAILED">Грешка при свързване</string>
+    <string name="chat_viewer">Разговор</string>
+    <string name="CONNECTION_FAILED">Грешка при свързване</string>
   <string name="contact_add">Добави</string>
   <string name="contact_delete">Изтрий</string>
   <string name="contact_block">Блокирай</string>
   <string name="contact_delete_confirm">Наистина ли искате да изтриете контакта %1$s от профила %2$s?</string>
-  <string name="contact_list">Списък с контакти</string>
-  <string name="discard_subscription">Отхвърли контакт</string>
+    <string name="discard_subscription">Отхвърли контакт</string>
   <string name="exit">Изход</string>
   <string name="group_active_chat">Разговори</string>
   <string name="group_none">Без група</string>
@@ -40,15 +36,7 @@
   <string name="request_subscription">Заявка за абонамент</string>
   <string name="XMPP_EXCEPTION">Грешка в потока на данни</string>
   <string name="application_state_closing">Запазване на промените...\nПриложението скоро ще се затвори.</string>
-  <string name="certificate_confirmation">%1$s.\nИздателят използва неодобрен (SHA-1) отпечатък: %2$s? Искате ли да не бъдете уведомявани за проблеми с този сертификат?</string>
-  <string name="certificate_details">\n\nИздаден на:\nИме (CN): %1$s\nОрганизация (O):%2$s\nОтдел (OU):%3$s\nСериен номер: %4$s\n\nИздаден от:\nИме (CN): %5$s\nОрганизация (О):%6$s\nОтдел (OU):%7$s\n\nВалиден:\nИздаден на: %8$s\nИзтича на: %9$s.</string>
-  <string name="certificate_invalid_chane">Грешка при проверка на веригата с подписи</string>
-  <string name="certificate_invalid_target">Неуспешна проверка на сертификат</string>
-  <string name="certificate_self_signed">Самоподписан сертификат</string>
-  <string name="certificate_show_details">Детайли&#8230;</string>
-  <string name="close_chats">Затвори всички разговори</string>
-  <string name="contact_integration_suggest">Искате ли да интегрирате Xabber в системните контакти?\nМоже да се промени в \"Настройки\" → \"XMPP профили\" → Вашият профил → \"Интегриране на контакти\".\nВъзможно е списъкът с контакти да реагира бавно в продължение на няколко минути.</string>
-  <string name="group_room">Конференции</string>
+    <string name="group_room">Конференции</string>
   <string name="OTR_ERROR">OTR грешка</string>
   <string name="select_contact">Изберете контакт</string>
   <string name="show_offline_always">Винаги показвай</string>
@@ -63,8 +51,7 @@
   <string name="block_list">Черен списък</string>
   <string name="contact_blocked_successfully">Контактът е блокиран успешно</string>
   <string name="error_blocking_contact">Грешка при блокиране на контакта</string>
-  <string name="unblock_contact">Разблокирай контакта</string>
-  <string name="contacts_unblocked_successfully">Контактът е разблокиран успешно</string>
+    <string name="contacts_unblocked_successfully">Контактът е разблокиран успешно</string>
   <string name="error_unblocking_contacts">Грешка при разблокиране на контакта</string>
   <string name="block_contact_confirm">Наистина ли искате да блокирате контакта %1$s от профила %2$s?</string>
   <string name="unblock_all_contacts_confirm">Наистина ли искате да разблокирате всички контаките от профила %1$s?</string>
@@ -76,19 +63,10 @@
   <string name="dark_theme_suggest_dialog_stay_on_light_side">Останете на Светлата страна</string>
   <string name="battery_optimization_disable_dialog_title">Пестене на енергия</string>
   <string name="battery_optimization_disable_dialog_message">Устройството Ви е в режим на пестене на енергия и това може да доведе до забавяне на уведомления и загуба на съобщения.\n\nЩе Ви помолим да изключите тази функция.</string>
-  <string name="save_log_to_file">Записване на файл</string>
-  <string name="clear_log">Изтриване на стари файлове</string>
+    <string name="clear_log">Изтриване на стари файлове</string>
   <string name="open_log_file">Отвори</string>
   <string name="send_log_file">Изпрати</string>
-  <string name="intro_welcome">Добре дошли в Xabber</string>
-  <string name="intro_xabber_description">XMPP клиент с отворен код за Android</string>
-  <string name="intro_have_account">XMPP вписване</string>
-  <string name="intro_register_account">Регистриране на XMPP профил</string>
-  <string name="intro_create_xabber_account">Ползвай Xabber профил</string>
-  <string name="intro_use_third_party_accounts">Ползвай друг XMPP профил</string>
-  <string name="intro_faq">Ако нямате XMPP профил, моля <a href="https://www.xabber.com/faq/">прочетете F.A.Q.</a> за това как да си направите.</string>
-  <string name="intro_web_search_register_xmpp">Регистриране на XMPP профил</string>
-  <string name="synchronize_bookmarks">Синхронизирай отметките</string>
+    <string name="synchronize_bookmarks">Синхронизирай отметките</string>
   <string name="remove_all_bookmarks">Премахни всички</string>
   <string name="remove_selected_bookmarks">Премахни избраните</string>
   <string name="remove_all_bookmarks_confirm">Наистина ли искате да премахнете всички отметки от профила %1$s?</string>
diff --git a/xabber/src/main/res/values-bg-rBG/contact_viewer.xml b/xabber/src/main/res/values-bg-rBG/contact_viewer.xml
index 291434db24..e54400bcf4 100644
--- a/xabber/src/main/res/values-bg-rBG/contact_viewer.xml
+++ b/xabber/src/main/res/values-bg-rBG/contact_viewer.xml
@@ -17,12 +17,9 @@
   <string name="vcard_organization_unit">Отдел</string>
   <string name="vcard_title">Длъжност</string>
   <string name="vcard_role">Роля</string>
-  <string name="vcard_other">Друга информация</string>
-  <string name="vcard_categories">Категории</string>
-  <string name="vcard_decsription">Описание</string>
+    <string name="vcard_decsription">Описание</string>
   <string name="vcard_note">Бележки</string>
-  <string name="vcard_address">Адрес</string>
-  <string name="vcard_address_pobox">Пощенска кутия</string>
+    <string name="vcard_address_pobox">Пощенска кутия</string>
   <string name="vcard_address_extadr">Разширен адрес</string>
   <string name="vcard_address_street">Улица</string>
   <string name="vcard_address_locality">Местоположение</string>
diff --git a/xabber/src/main/res/values-bg-rBG/muc_editor.xml b/xabber/src/main/res/values-bg-rBG/muc_editor.xml
index 29edb3e14f..eebd93a737 100644
--- a/xabber/src/main/res/values-bg-rBG/muc_editor.xml
+++ b/xabber/src/main/res/values-bg-rBG/muc_editor.xml
@@ -20,12 +20,10 @@
   <string name="muc_invite_confirm">%2$s ви кани да се присъедините към конференция %3$s. Присъединете се от профил %1$s?</string>
   <string name="muc_invite_confirm_reason">%2$s ви кани да се присъедините към конференция %3$s: %4$s. Присъединете се от профил %1$s?</string>
   <string name="muc_leave">Напусни конференцията</string>
-  <string name="muc_save">Запази конференцията</string>
-  <string name="muc_choose_conference">Избор на конференция</string>
+    <string name="muc_choose_conference">Избор на конференция</string>
   <string name="muc_next">Напред</string>
   <string name="muc_get_hosted_conferences">Получи списък с конференциите</string>
   <string name="muc_error_getting_conferences">Грешка при доставяне на конференциите</string>
   <string name="muc_type_conference_name">Име на конферентния разговор</string>
-  <string name="contact_is_blocked">Контактът е блокиран!</string>
-  <string name="conference_invitation">Покана за конферентен разговор</string>
+    <string name="conference_invitation">Покана за конферентен разговор</string>
 </resources>
diff --git a/xabber/src/main/res/values-bg-rBG/notification_bar.xml b/xabber/src/main/res/values-bg-rBG/notification_bar.xml
index f428ce2ab8..92dd027111 100644
--- a/xabber/src/main/res/values-bg-rBG/notification_bar.xml
+++ b/xabber/src/main/res/values-bg-rBG/notification_bar.xml
@@ -34,10 +34,7 @@
   <!-- Used for plural form in russian. -->
   <string name="connection_state_waiting_5">%1$d от %2$d %3$s чакат да се свържат</string>
   <string name="connection_state_offline">%1$d %2$s извън линия</string>
-  <string name="archive_available_request_message">Искате ли да съхранявате историята на съобщенията на сървъра?\nПозволява на Xabber да зарежда историята от всички устройства, ползващи този профил.\nТази опция ще увеличи трафика на данни и ще намали малко скоростта на връзката.\nВНИМАНИЕ: Историята на устройството ще бъде изтрита.</string>
-  <string name="archive_available_request_title">Разреши архивиране на съобщенията?</string>
-  <string name="INVALID_CERTIFICATE">Невалиден сертификат</string>
-  <string name="muc_invite_message">Искате ли да се включите в конференцията?</string>
+    <string name="muc_invite_message">Искате ли да се включите в конференцията?</string>
   <string name="otr_verification_in_progress">Натиснете тук за прекратяване.</string>
   <string name="PASSWORD_REQUIRED">Необходима е парола</string>
   <string name="pay_attention">Обърнете внимание</string>
diff --git a/xabber/src/main/res/values-bg-rBG/preference_editor.xml b/xabber/src/main/res/values-bg-rBG/preference_editor.xml
index fe761ac6fb..2247d39773 100644
--- a/xabber/src/main/res/values-bg-rBG/preference_editor.xml
+++ b/xabber/src/main/res/values-bg-rBG/preference_editor.xml
@@ -12,14 +12,11 @@
   <string name="contacts_order_alphabet">По азбучен ред</string>
   <string name="contacts_order_status">По статус</string>
   <string name="contacts_show_accounts">Групирай по профил\nГрупира контактите в списъка по профил</string>
-  <string name="contacts_show_active_chats">Активни разговори отгоре\nПоказва активните разговори в горната част на списъка с контакти</string>
-  <string name="contacts_show_avatars">Покажи аватари\nПоказва аватарите на контактите в списъка</string>
+    <string name="contacts_show_avatars">Покажи аватари\nПоказва аватарите на контактите в списъка</string>
   <string name="contacts_show_empty_groups">Покажи празните групи\nПоказва групите с контакти извън линия</string>
   <string name="contacts_show_groups">Покажи групите\nПоказва групите в списъка с контакти</string>
   <string name="contacts_show_offline">Покажи контактите извън линия</string>
-  <string name="contacts_show_panel">Покажи панел с профилите\nПоказва бутони с аватари в долния десен ъгъл на списъка с контакти</string>
-  <string name="contacts_stay_active_chats">Дублиране на активните разговори\nАктивните разговори ще се показват отгоре на списъка с контакти и в групите</string>
-  <string name="debug_log">Debug Log\nЗаписва съобщения в debug log (моля рестартирайте приложението, за да наложите промените)</string>
+    <string name="debug_log">Debug Log\nЗаписва съобщения в debug log (моля рестартирайте приложението, за да наложите промените)</string>
   <string name="debug_file_log_title">Запиши Log файл\nЗаписва debug log файл.</string>
   <string name="debug_log_files_title">Log файлове\nСписък със записаните Log файлове.</string>
   <string name="debug_log_files_activity_title">Log файлове</string>
@@ -36,8 +33,7 @@
   <string name="interface_theme">Тема</string>
   <string name="interface_theme_dark">Тъмна</string>
   <string name="interface_theme_light">Светла</string>
-  <string name="interface_theme_normal">По подразбиране</string>
-  <string name="interface_smiles">Емотикони</string>
+    <string name="interface_smiles">Емотикони</string>
   <string name="interface_smiles_android">Android емотикони</string>
   <string name="interface_smiles_none">Без графични емотикони</string>
   <string name="preference_connection">Настройки на свързване</string>
@@ -62,8 +58,7 @@
   <string name="chats_font_size_xlarge">Много голям</string>
   <string name="chats_hide_keyboard">Скрий клавиатурата</string>
   <string name="chats_hide_keyboard_landscape">В пейзажен режим</string>
-  <string name="chats_receipt">Известия за доставени съобщения\nЗа изпращане и получаване на известия за доставени съобщения</string>
-  <string name="chats_show_avatars">Аватари в съобщенията\nПоказва аватари при всяко съобщение</string>
+    <string name="chats_show_avatars">Аватари в съобщенията\nПоказва аватари при всяко съобщение</string>
   <string name="chats_show_status_change">Покажи промяната на статусите</string>
   <string name="chats_show_status_change_muc">В конференции</string>
   <string name="chats_state_notification">Индикатор при писане\nУведомете контакта, че набирате текст</string>
@@ -77,37 +72,24 @@
   <string name="contacts_reset_offline">Нулирай офлайн настройките\nЩе изчисти индивидуалните настройки за групи и профили</string>
   <string name="contacts_reset_offline_warning">Наистина ли искате да премахнете индивидуалните настройки за групи и профили?</string>
   <string name="events_first_only">Известие при първо съобщение\nУведомявай само при първото входящо съобщение в чата</string>
-  <string name="events_ignore_system_vibro">Игнорирай системните настройки за вибрация\nИзползвайте тази опция, ако вибрацията на работи</string>
-  <string name="events_message">Настройки за уведомленията\nНастройки за уведомленията на входящи съобщения</string>
-  <string name="events_message_chat">Само за разговори</string>
-  <string name="events_message_chat_and_muc">Разговори и конференции</string>
-  <string name="events_message_none">Не уведомявай</string>
-  <string name="events_show_text">Преглед на съобщения\nПокажи съобщението в лентата за уведомления</string>
+    <string name="events_show_text">Преглед на съобщения\nПокажи съобщението в лентата за уведомления</string>
   <string name="events_show_text_muc">Преглед на съобщения\nПокажи съобщението в лентата за уведомления</string>
-  <string name="events_visible_chat">Известия в текущия чат\nУведомявай за входящи съобщения в текущия чат</string>
-  <string name="events_suppress_100">Потискане на някои съобщения\nНяма да получавате съобщение \"Тази стая не е анонимна\"</string>
+    <string name="events_suppress_100">Потискане на някои съобщения\nНяма да получавате съобщение \"Тази стая не е анонимна\"</string>
   <string name="negative_priotiry_summary">%s (няма да получавате съобщения)</string>
   <string name="preference_accounts">XMPP профили\nУправление на профили</string>
   <string name="preference_security">Сигурност\nНастройки на сигурността</string>
   <string name="security_check_certificate">Проверявай сертификата на сървъра\nУведомявай за проблеми със сертификати на шифровани връзки</string>
-  <string name="security_clear_certificate">Премахване на сертификати\nИзтрий списъка с отхвърлените сертификати</string>
-  <string name="security_otr_history">Пази хронологията\nСъхранява хронологията на разговорите за OTR сесии</string>
-  <string name="security_otr_mode">OTR режим</string>
+    <string name="security_otr_mode">OTR режим</string>
   <string name="chats_attention">Сръчкване\nРеакция при входящо сръчкване</string>
   <string name="chats_attention_sound">Звук при сръчкване\nИзберете мелодия</string>
   <string name="connection_load_vcard">Зареди vCard\nЗарежда и обновява личните данни и аватара на контакта. Изключете за да намалите трафика на данни.</string>
   <string name="connection_load_images">Зареди изображенията\nЗарежда автоматично изображенията от URL. Изключете, за да намалите трафика на данни.</string>
   <string name="connection_use_carbons">Carbon-copied режим\nНестабилен! Позволява на всички вписани устройства да получават съобщения. Изключете, за да намалите трафика на данни.</string>
-  <string name="connection_dns_resolver_type">DNS Resolver</string>
-  <string name="connection_dns_resolver_type_dns_java_resolver">DNSJavaResolver</string>
+    <string name="connection_dns_resolver_type_dns_java_resolver">DNSJavaResolver</string>
   <string name="connection_dns_resolver_type_mini_dns_resolver">MiniDNSResolver (експериментален)</string>
-  <string name="connection_use_plain_text_auth">Удостоверяване в открит текст\nИзползва удостоверяване в открит текст за всички профили. Не се препоръчва.</string>
-  <string name="events_phrases">Ключови изрази\nСъздайте персонализирани уведомления за съобщения, съдържащи специфични изрази</string>
-  <string name="security_clear_certificate_warning">Наистина ли искате да премахнете всички отхвърлени сертификати?</string>
-  <string name="account_error_settings">Настройки</string>
-  <string name="category_xabber_account">Xabber профил</string>
-  <string name="category_xmpp_accounts">XMPP профили</string>
-  <string name="category_interface">Интерфейс</string>
+    <string name="events_phrases">Ключови изрази\nСъздайте персонализирани уведомления за съобщения, съдържащи специфични изрази</string>
+    <string name="account_error_settings">Настройки</string>
+    <string name="category_interface">Интерфейс</string>
   <string name="category_settings">Настройки</string>
   <string name="category_about">За приложението</string>
   <string name="category_appearance">Външен вид</string>
diff --git a/xabber/src/main/res/values-bg-rBG/words.xml b/xabber/src/main/res/values-bg-rBG/words.xml
index 5c38287444..ea73ad4977 100644
--- a/xabber/src/main/res/values-bg-rBG/words.xml
+++ b/xabber/src/main/res/values-bg-rBG/words.xml
@@ -20,5 +20,4 @@
   <string name="settings">Настройки</string>
   <string name="ok">ОК</string>
   <string name="login">Вход</string>
-  <string name="resume">Възобнови</string>
 </resources>
diff --git a/xabber/src/main/res/values-ca-rES/account_editor.xml b/xabber/src/main/res/values-ca-rES/account_editor.xml
index 865c1d46a3..dcbfd8d951 100644
--- a/xabber/src/main/res/values-ca-rES/account_editor.xml
+++ b/xabber/src/main/res/values-ca-rES/account_editor.xml
@@ -2,40 +2,25 @@
 <!--Generated by crowdin.com-->
 <resources>
   <string name="account_compression">Usar compressió</string>
-  <string name="account_enabled">Habilitada</string>
-  <string name="account_host">Servidor</string>
+    <string name="account_host">Servidor</string>
   <string name="account_password">Contrasenya</string>
   <string name="confirm_password">Confirmar contrasenya</string>
   <string name="account_port">Port</string>
   <string name="account_priority">Prioritat</string>
   <string name="account_resource">Dispositiu</string>
   <string name="account_server_name">Servidor</string>
-  <string name="account_type">Tipus de compte</string>
-  <string name="account_type_hints_gtalk">Nom d\'usuari per gmail.com o domini de Google</string>
-  <string name="account_type_helps_gtalk">Si no tens un compte en Google en pots crear un de nou en http://mail.google.com\nSi ja en tens, pots utilitzar el_teu_nom_dusuari@el_teu_domini_de_google</string>
-  <string name="account_xmpp_register_warning">Heu de <a href="http://www.google.com/#q=registrar el compte XMPP"> registrar el compte XMPP</a> abans d\'afegir-lo a Xabber!</string>
-  <string name="account_type_helps_xmpp">Per saber més de XMPP (Jabber): https://xmpp.org</string>
-  <string name="account_user_name">Nom d\'usuari</string>
+    <string name="account_xmpp_register_warning">Heu de <a href="http://www.google.com/#q=registrar el compte XMPP"> registrar el compte XMPP</a> abans d\'afegir-lo a Xabber!</string>
+    <string name="account_user_name">Nom d\'usuari</string>
   <string name="EMPTY_SERVER_NAME">No s\'ha especificat el nom del servidor</string>
   <string name="EMPTY_USER_NAME">No s\'ha especificat el nom d\'usuari</string>
   <string name="CONFIRM_PASSWORD">Les contrasenyes no coincideixen</string>
-  <string name="account_archive_mode">Desar historial de missatges</string>
-  <string name="account_archive_mode_available">Al servidor si és possible</string>
-  <string name="account_archive_mode_dont_store">No desar</string>
-  <string name="account_archive_mode_local">Localment al dispositiu</string>
-  <string name="account_archive_mode_server">Al servidor</string>
-  <string name="account_archive_mode_unread">Localment només si no s\'ha enviat ni llegit</string>
-  <string name="account_compression_summary">Marcar per usar compressió de dades</string>
+    <string name="account_compression_summary">Marcar per usar compressió de dades</string>
   <string name="account_custom">Servidor manual</string>
   <string name="account_custom_summary">Usar un servidor manual en comptes del registre SRV</string>
-  <string name="account_enabled_summary">Activar compte</string>
-  <string name="account_invalid_port">El port ha de ser un nombre (per defecte 5222)</string>
+    <string name="account_invalid_port">El port ha de ser un nombre (per defecte 5222)</string>
   <string name="account_invalid_port_range">El port ha de ser entre 1 i 65535 (Predeterminat: 5222)</string>
   <string name="account_invalid_priority">El valor de la prioritat ha de ser un nombre entre 128 i 127 (per defecte: 10)</string>
-  <string name="account_oauth">Autorització</string>
-  <string name="account_oauth_invalidated">No autoritzat</string>
-  <string name="account_oauth_summary">Configuració OAuth</string>
-  <string name="account_proxy_host">Servidor proxy</string>
+    <string name="account_proxy_host">Servidor proxy</string>
   <string name="account_proxy_invalid_port_range">Port del servidor proxy ha de ser entre 1 i 65535 (per defecte: 8080)</string>
   <string name="account_proxy_invalid_port">Port del servidor proxy ha de ser un nombre (per defecte: 8080)</string>
   <string name="account_proxy_password">Contrasenya del proxy</string>
@@ -47,18 +32,14 @@
   <string name="account_sasl_summary">Inhabilitar per a servidors molt antics</string>
   <string name="account_store_password">Desar contrasenya</string>
   <string name="account_store_password_summary">Desactiva aquesta opció per sol·licitar contrasenya cada vegada que et connectis</string>
-  <string name="account_syncable">Integrar amb els contactes del sistema</string>
-  <string name="account_syncable_summary">Mostrar contactes d\'aquest compte a la llista de contactes del telèfon</string>
-  <string name="account_tls_enable">Habilitar TLS</string>
+    <string name="account_tls_enable">Habilitar TLS</string>
   <string name="account_tls_enable_summary">Utilitzeu xifratge TLS quan sigui possible connectar al servidor</string>
   <string name="account_tls_legacy">SSL llegat</string>
   <string name="account_tls_legacy_summary">Utilitza el xifratge SSL llegat quan connecta a servidor</string>
   <string name="account_tls_mode">Ús de TLS/SSL</string>
   <string name="account_tls_require">Requereix TLS</string>
   <string name="account_tls_require_summary">Requereix el xifratge TLS quan connecta a servidor</string>
-  <string name="account_use_orbot">Xat a través de la xarxa d\'anonimat TOR i força TLS criptogràfica protocol\nNot recomanat per a Google Talk</string>
-  <string name="confirm_cancellation">Esteu segur que voleu descartar tots els canvis?</string>
-  <string name="INCORRECT_USER_NAME">Nom d\'usuari incorrecte. Consulta el text d\'ajuda per sota per a més detalls.</string>
+    <string name="INCORRECT_USER_NAME">Nom d\'usuari incorrecte. Consulta el text d\'ajuda per sota per a més detalls.</string>
   <string name="orbot_required_message">Per a processar utilitzant TOR ha de tenir Orbot instal·lat i activat al trànsit d\'apoderat per ell. Voleu instal·lar-lo de Google Play?</string>
   <string name="orbot_required_title">Instal·lar Orbot?</string>
   <string name="install_orbot">Instal·lar Orbot</string>
diff --git a/xabber/src/main/res/values-ca-rES/chat_viewer.xml b/xabber/src/main/res/values-ca-rES/chat_viewer.xml
index 8b43212193..e440da0b76 100644
--- a/xabber/src/main/res/values-ca-rES/chat_viewer.xml
+++ b/xabber/src/main/res/values-ca-rES/chat_viewer.xml
@@ -21,11 +21,8 @@
   <string name="message_remove">Elimina de l\'historial</string>
   <string name="message_repeat">Torneu a intentar enviar</string>
   <string name="message_otr_show_original">Mostrar missatge</string>
-  <string name="message_open_file">Obrir</string>
-  <string name="message_save_file">Desar</string>
-  <string name="save_history">Desar l\'historial de missatges localment\nEmmagatzemar l\'historial de missatges al dispositiu</string>
-  <string name="show_history">Mostra l\'historial</string>
-  <string name="action_attention_called">S\'ha enviat una cridada d\'atenció</string>
+    <string name="save_history">Desar l\'historial de missatges localment\nEmmagatzemar l\'historial de missatges al dispositiu</string>
+    <string name="action_attention_called">S\'ha enviat una cridada d\'atenció</string>
   <string name="action_attention_requested">S\'ha rebut una cridada d\'atenció</string>
   <string name="action_ban">%1$s ha estat bloquejat</string>
   <string name="action_ban_by">%1$s ha estat bloquejat per %2$s</string>
@@ -73,28 +70,19 @@
   <string name="otr_refresh">Reprendre el xifratge</string>
   <string name="otr_request">S\'ha demanat una conversa privada OTR (Off The Record) però no tens el connector necessari. Pots usar Pidgin, Gajim o Adium per a PC/MAC i Xabber o ChatSecure per a Android. Més informació a http://otr.cypherpunks.ca/.</string>
   <string name="otr_start">Activar el xifratge</string>
-  <string name="otr_unencrypted_message">Aquest missatge no ha estat xifrat</string>
-  <string name="otr_unreadable_message">No es pot llegir el missatge xifrat que heu enviat</string>
+    <string name="otr_unreadable_message">No es pot llegir el missatge xifrat que heu enviat</string>
   <string name="otr_not_decrypted_message">El missatge no es pot desxifrar</string>
   <string name="otr_verification">Verificació d\'OTR</string>
   <string name="otr_verify_fingerprint">Verificar amb empremta digital</string>
   <string name="otr_verify_question">Verificar amb una pregunta</string>
   <string name="otr_verify_secret">Verificar amb un secret compartit</string>
   <string name="otr_verification_notify_title">Sol·licitud de verificació d\'OTR</string>
-  <string name="under_construction">En construcció</string>
-  <string name="under_construction_message">Aquesta pantalla està en construcció</string>
-  <string name="chat_events_show_text_global">Utilitza la configuració global</string>
+    <string name="chat_events_show_text_global">Utilitza la configuració global</string>
   <string name="chat_events_show_text_always">Mostrar el text del missatge</string>
   <string name="chat_events_show_text_never">Amagar el text de missatge</string>
-  <string name="sending_file">Enviant fitxer %s</string>
-  <string name="error_sending_file">Error enviant fitxer %s</string>
-  <string name="no_application_to_open_file">No s\'ha trobat aplicació que pugi obrir aquest fitxer</string>
-  <string name="could_not_save_file">No s\'ha pogut desar el fitxer</string>
-  <string name="file_saved_successfully">El fixer s\'ha desat correctament</string>
-  <string name="received_by">%s rebut</string>
-  <string name="could_not_get_path_to_file">No s\'ha trobat el camí del fitxer</string>
+    <string name="error_sending_file">Error enviant fitxer %s</string>
+    <string name="could_not_get_path_to_file">No s\'ha trobat el camí del fitxer</string>
   <string name="message_open_private_chat">Obrir xat privat</string>
-  <string name="http_file_upload_slot_error">No ha estat possible carregar el fitxer. Massa gran?</string>
-  <string name="no_permission_to_read_files">Sense permís per llegir arxius</string>
+    <string name="no_permission_to_read_files">Sense permís per llegir arxius</string>
   <string name="no_permission_to_write_files">Sense permís per escriure arxius</string>
 </resources>
diff --git a/xabber/src/main/res/values-ca-rES/contact_editor.xml b/xabber/src/main/res/values-ca-rES/contact_editor.xml
index c8b8c8871e..c4dcec0d12 100644
--- a/xabber/src/main/res/values-ca-rES/contact_editor.xml
+++ b/xabber/src/main/res/values-ca-rES/contact_editor.xml
@@ -17,12 +17,8 @@
   <string name="processing_image">Processant la imatge...</string>
   <string name="error_during_crop">Error durant l\'ajustament de la imatge</string>
   <string name="error_during_image_processing">Error durant el processament de la imatge</string>
-  <string name="account_settings">Configuració del compte</string>
-  <string name="account_user_info">Informació de compte</string>
-  <string name="account_server_info">Informació de servidor</string>
+    <string name="account_server_info">Informació de servidor</string>
   <string name="account_server_info_description">Llista de capacitats de servidor</string>
   <string name="conference_private_chat_invitation">%1$s de %2$s vol començar un xat privat amb tu</string>
   <string name="accept_muc_private_chat">D\'acord</string>
-  <string name="block_muc_private_chat">Bloquejar</string>
-  <string name="no_permission_camera">Sense permís d\'accés a la càmera</string>
 </resources>
diff --git a/xabber/src/main/res/values-ca-rES/contact_list.xml b/xabber/src/main/res/values-ca-rES/contact_list.xml
index 6d67e68a08..cac5ca98cd 100644
--- a/xabber/src/main/res/values-ca-rES/contact_list.xml
+++ b/xabber/src/main/res/values-ca-rES/contact_list.xml
@@ -18,17 +18,13 @@
   <string name="application_state_roster">Connectat.</string>
   <string name="application_state_starting">Carregant l\'aplicació&#8230;</string>
   <string name="application_state_waiting">Esperant a connectar&#8230;</string>
-  <string name="chat_list">Llista de xats</string>
-  <string name="chat_list_is_empty">Cap xat actiu</string>
-  <string name="chat_viewer">Xat</string>
-  <string name="close_chat">Tancar xat</string>
-  <string name="CONNECTION_FAILED">Error de connexió</string>
+    <string name="chat_viewer">Xat</string>
+    <string name="CONNECTION_FAILED">Error de connexió</string>
   <string name="contact_add">Afegeix contacte</string>
   <string name="contact_delete">Esborra</string>
   <string name="contact_block">Bloquejar contacte</string>
   <string name="contact_delete_confirm">Realment voleu esborrar el contacte %1$s del compte %2$s?</string>
-  <string name="contact_list">Llista de contactes</string>
-  <string name="discard_subscription">Rebutjar contacte</string>
+    <string name="discard_subscription">Rebutjar contacte</string>
   <string name="exit">Sortir</string>
   <string name="group_active_chat">Xats actius</string>
   <string name="group_none">No hi ha grups</string>
@@ -40,14 +36,7 @@
   <string name="request_subscription">Petició de subscripció</string>
   <string name="XMPP_EXCEPTION">Error en la transmissió</string>
   <string name="application_state_closing">Desant canvis...\nL\'aplicació es tancarà a continuació.</string>
-  <string name="certificate_details">\n\n\n Emès per a:\nNom (CN): %1$s\nOrganització (O): %2$s\nUnitat organitzativa (OU): %3$s\nNombre de série: %4$s\n\nEmès per:\nNom (CN): %5$s\nOrganització (O): %6$s\nUnitat organitzativa (OU): %7$s\n\nValidesa:\nEmès: %8$s\nExpira: %9$s.</string>
-  <string name="certificate_invalid_chane">Ha fallat la cadena de verificació de la signatura</string>
-  <string name="certificate_invalid_target">Ha fallat la verificació del destinatari</string>
-  <string name="certificate_self_signed">Certificat autosignat</string>
-  <string name="certificate_show_details">Detalls&#8230;</string>
-  <string name="close_chats">Tanqueu tots els xats</string>
-  <string name="contact_integration_suggest">Voleu que Xabber estigui integrat amb els contactes del sistema? \nAixò es pot canviar a \"Configuració\" → \"Comptes XMPP\" → el seu compte → \"Integració de contactes\". \nNota: Els contactes del sistema poden anar més lents durant uns minuts.</string>
-  <string name="group_room">Conferències</string>
+    <string name="group_room">Conferències</string>
   <string name="OTR_ERROR">Error d\'OTR</string>
   <string name="select_contact">Feu clic per seleccionar el contacte</string>
   <string name="show_offline_always">Mostrar sempre</string>
@@ -62,8 +51,7 @@
   <string name="block_list">Llista de contactes bloquejats</string>
   <string name="contact_blocked_successfully">Contacte bloquejat amb èxit</string>
   <string name="error_blocking_contact">Error bloquejant contacte</string>
-  <string name="unblock_contact">Desbloqueja el contacte</string>
-  <string name="contacts_unblocked_successfully">Contacte desbloquejat amb èxit</string>
+    <string name="contacts_unblocked_successfully">Contacte desbloquejat amb èxit</string>
   <string name="error_unblocking_contacts">Error desbloquejant el contacte</string>
   <string name="block_contact_confirm">Realment voleu bloquejar el contacte %1$s al compte %2$s?</string>
   <string name="unblock_all_contacts_confirm">Realment voleu desbloquejar tots els contactes al compte %1$s?</string>
@@ -75,13 +63,7 @@
   <string name="dark_theme_suggest_dialog_stay_on_light_side">Romandre en el costat de la llum</string>
   <string name="battery_optimization_disable_dialog_title">Optimització de bateria</string>
   <string name="battery_optimization_disable_dialog_message">El dispositiu està fent algunes optimitzacions de bateria pesades en Xabber que podria conduir a retards en les notificacions o fins i tot pèrdua de missatges.\n\n. Ara se us demanarà que els deshabiliteu.</string>
-  <string name="save_log_to_file">Desar en arxiu</string>
-  <string name="clear_log">Eliminar arxius vells de registre</string>
+    <string name="clear_log">Eliminar arxius vells de registre</string>
   <string name="open_log_file">Obrir</string>
   <string name="send_log_file">Enviar</string>
-  <string name="intro_welcome">Benvinguts a Xabber</string>
-  <string name="intro_xabber_description">Client de XMPP per Android de font oberta</string>
-  <string name="intro_register_account">Registrar compte XMPP</string>
-  <string name="intro_faq">Si no teniu un compte XMPP, si us plau <a href="https://www.xabber.com/faq/"> Llegiu el nostre f.a.q.</a> per saber com aconseguir un.</string>
-  <string name="intro_web_search_register_xmpp">Registrar compte XMPP</string>
 </resources>
diff --git a/xabber/src/main/res/values-ca-rES/contact_viewer.xml b/xabber/src/main/res/values-ca-rES/contact_viewer.xml
index f4694fa2aa..57133651bf 100644
--- a/xabber/src/main/res/values-ca-rES/contact_viewer.xml
+++ b/xabber/src/main/res/values-ca-rES/contact_viewer.xml
@@ -17,12 +17,9 @@
   <string name="vcard_organization_unit">Unitat d\'organització</string>
   <string name="vcard_title">Lloc de feina, funció</string>
   <string name="vcard_role">Rol</string>
-  <string name="vcard_other">Altres dades</string>
-  <string name="vcard_categories">Categories</string>
-  <string name="vcard_decsription">Descripció</string>
+    <string name="vcard_decsription">Descripció</string>
   <string name="vcard_note">Notes</string>
-  <string name="vcard_address">Adreça</string>
-  <string name="vcard_address_pobox">Codi Postal</string>
+    <string name="vcard_address_pobox">Codi Postal</string>
   <string name="vcard_address_extadr">Adreça completa</string>
   <string name="vcard_address_street">Carrer</string>
   <string name="vcard_address_locality">Localitat</string>
diff --git a/xabber/src/main/res/values-ca-rES/muc_editor.xml b/xabber/src/main/res/values-ca-rES/muc_editor.xml
index 8fc170905e..70c6e4a7d5 100644
--- a/xabber/src/main/res/values-ca-rES/muc_editor.xml
+++ b/xabber/src/main/res/values-ca-rES/muc_editor.xml
@@ -20,12 +20,10 @@
   <string name="muc_invite_confirm">%2$s t\'ha convidat a unir-te a la conferència %3$s. Vols unir-te amb el compte %1$s?</string>
   <string name="muc_invite_confirm_reason">%2$s t\'ha convidat a unir-te a la conferència %3$s: %4$s. Vols unir-te amb el compte %1$s?</string>
   <string name="muc_leave">Abandonar la conferència</string>
-  <string name="muc_save">Desar la conferència</string>
-  <string name="muc_choose_conference">Triar conferència</string>
+    <string name="muc_choose_conference">Triar conferència</string>
   <string name="muc_next">Següent</string>
   <string name="muc_get_hosted_conferences">Obtenir conferències organitzades</string>
   <string name="muc_error_getting_conferences">Error en obtenir conferències</string>
   <string name="muc_type_conference_name">Escriu el nom de la conferència</string>
-  <string name="contact_is_blocked">El contacte està bloquejat!</string>
-  <string name="conference_invitation">Invitació a una conferència</string>
+    <string name="conference_invitation">Invitació a una conferència</string>
 </resources>
diff --git a/xabber/src/main/res/values-ca-rES/notification_bar.xml b/xabber/src/main/res/values-ca-rES/notification_bar.xml
index c884269719..a1acde476a 100644
--- a/xabber/src/main/res/values-ca-rES/notification_bar.xml
+++ b/xabber/src/main/res/values-ca-rES/notification_bar.xml
@@ -34,10 +34,7 @@
   <!-- Used for plural form in russian. -->
   <string name="connection_state_waiting_5">-</string>
   <string name="connection_state_offline">%1$d %2$s fora de línia</string>
-  <string name="archive_available_request_message">Voleu emmagatzemar l\'Historial de missatges al servidor? \nAixò permet a Xabber carregar la història dels missatges en tots els dispositius que facin servir aquest compte. \nAquesta característica reduirà lleugerament la velocitat de connexió. \nATENCIÓ: s\'eliminarà tota la seva història local.</string>
-  <string name="archive_available_request_title">Habilita l\'arxivament de missatges?</string>
-  <string name="INVALID_CERTIFICATE">Certificat no vàlid</string>
-  <string name="muc_invite_message">Voleu entrar en la conferència?</string>
+    <string name="muc_invite_message">Voleu entrar en la conferència?</string>
   <string name="otr_verification_in_progress">Feu clic aquí per cancel·lar.</string>
   <string name="PASSWORD_REQUIRED">Es requereix la contrasenya</string>
   <string name="pay_attention">Prestar atenció</string>
diff --git a/xabber/src/main/res/values-ca-rES/preference_editor.xml b/xabber/src/main/res/values-ca-rES/preference_editor.xml
index 53a031c896..8720a3b426 100644
--- a/xabber/src/main/res/values-ca-rES/preference_editor.xml
+++ b/xabber/src/main/res/values-ca-rES/preference_editor.xml
@@ -8,14 +8,11 @@
   <string name="contacts_order_alphabet">Alfabètic</string>
   <string name="contacts_order_status">Per l\'estat</string>
   <string name="contacts_show_accounts">Agrupar per compte\nAgrupar el contactes per compte</string>
-  <string name="contacts_show_active_chats">Xats actius a dalt\nMostar els xats actius a la part superior de la llista de contactes</string>
-  <string name="contacts_show_avatars">Mostra avatars\nMostar l\'avatar dels usuaris a la llista de contactes</string>
+    <string name="contacts_show_avatars">Mostra avatars\nMostar l\'avatar dels usuaris a la llista de contactes</string>
   <string name="contacts_show_empty_groups">Mostra els grups buits\nMostra el grups amb cap contactes en línia</string>
   <string name="contacts_show_groups">Mostra els grups\nMostra el grups en llista de contactes</string>
   <string name="contacts_show_offline">Mostra els contactes fora de línia</string>
-  <string name="contacts_show_panel">Mostra els botons d\'acció de panel\nMostra els botons d\'acció amb els avatars en la cantonada de baix a la dreta de llista de contactes</string>
-  <string name="contacts_stay_active_chats">Duplicar xats actius\nEls xats actius apareixen a la part superior de la llista de contactes i en grups</string>
-  <string name="debug_log">Log de depuració de missatges\nEscriu els missatges al log de depuració (si us plau reinicieu l\'aplicació per aplicar els canvis)</string>
+    <string name="debug_log">Log de depuració de missatges\nEscriu els missatges al log de depuració (si us plau reinicieu l\'aplicació per aplicar els canvis)</string>
   <string name="debug_file_log_title">Escriu registre de depuració\nEscriu el registre de depuració a arxiu local (es pot compartir).</string>
   <string name="debug_log_files_title">Arxius de registre\nLlista de fitxers de registre escrits.</string>
   <string name="debug_log_files_activity_title">Fitxers de registre</string>
@@ -28,8 +25,7 @@
   <string name="events_persistent">Icona de la barra de tasques\nMostra notificació persistent. Aquesta opció impedeix que Android descarregui la app de la memòria</string>
   <string name="interface_theme_dark">Fosc</string>
   <string name="interface_theme_light">Suau</string>
-  <string name="interface_theme_normal">Predeterminat</string>
-  <string name="interface_smiles_android">Androide emoticones</string>
+    <string name="interface_smiles_android">Androide emoticones</string>
   <string name="interface_smiles_none">Deshabilitar emoticones gràfics</string>
   <string name="preference_connection">Configuració de la connexió\nConfiguració de la connexió</string>
   <string name="preference_contacts">Llista de contactes\nPersonalitzar la aparença de la llista de contactes</string>
@@ -44,8 +40,7 @@
   <string name="chats_font_size_small">Petit</string>
   <string name="chats_font_size_xlarge">Extra gran</string>
   <string name="chats_hide_keyboard_landscape">Mode apaïsat</string>
-  <string name="chats_receipt">Confirmació de lliurament de missatge\nEnviar i rebre confirmacions de lliurament dels missatges</string>
-  <string name="chats_show_avatars">Avatars als messages\nMostra el avatar en cada missatge</string>
+    <string name="chats_show_avatars">Avatars als messages\nMostra el avatar en cada missatge</string>
   <string name="chats_show_status_change_muc">En conferències</string>
   <string name="chats_state_notification">Enviar notificacions d\'escriptura\nNotificar l\'altre usuari que s\'està escrivint</string>
   <string name="connection_adjust_priority">Ajustar prioritat\nEstablir prioritat segons l\'estat seleccionat. La prioritat del compte se sobreescriurà.</string>
@@ -58,30 +53,19 @@
   <string name="contacts_reset_offline">Reinicialitza la configuració fora de línia\nEsborra la configuració individual per a grups i comptes</string>
   <string name="contacts_reset_offline_warning">Voleu realment esborrar configuracions individuals per a grups i comptes?</string>
   <string name="events_first_only">Alerta el primer message\nAlerta només en el primer missatge en un xat</string>
-  <string name="events_ignore_system_vibro">Ignorar configuració de la vibració del sistema\nActivar aquesta opció si la vibració del sistema no funciona</string>
-  <string name="events_message">Configuració de les notificació\nConfiguració de les notificacions entrants</string>
-  <string name="events_message_chat">Xats només</string>
-  <string name="events_message_chat_and_muc">Xerrades i conferències</string>
-  <string name="events_message_none">No Notificar</string>
-  <string name="events_visible_chat">Notificar en el xat actual\nNotificar els missatges entrants al xat actual</string>
-  <string name="events_suppress_100">Suprimir algunes messages\nNo obtenir missatges \"aquesta sala no és anònima\"</string>
+    <string name="events_suppress_100">Suprimir algunes messages\nNo obtenir missatges \"aquesta sala no és anònima\"</string>
   <string name="negative_priotiry_summary">%s (no rebreu missatges de qualsevol xat)</string>
   <string name="preference_accounts">Comptes XMPP\nGestionar comptes XMPP</string>
   <string name="preference_security">Configuració de la seguretat\nConfiguració de la seguretat</string>
   <string name="security_check_certificate">Comproveu el certificat del servidor\nNotificar problemes amb els certificats a les connexions encriptades</string>
-  <string name="security_clear_certificate">Treure certificats\nEsborrar llista de certificats ignorats</string>
-  <string name="security_otr_history">Emmagatzemar l\'Historial\nEmmagatzemar l\'Historial de xat per a les sessions d\'OTR</string>
-  <string name="security_otr_mode">Mode d\'OTR</string>
+    <string name="security_otr_mode">Mode d\'OTR</string>
   <string name="chats_attention">Atenció\nReact per a peticions d\'entrada</string>
   <string name="chats_attention_sound">So d\'atenció\nTriar so</string>
   <string name="connection_load_vcard">Càrrega vCard\nCàrrega i actualitza la informació de contacte i avatar. Desactivar per reduir l\'ús de trànsit.</string>
   <string name="connection_load_images">Carregar imatges\nCarregar URL del fitxer automàticament. Desactivar per reduir l\'ús de trànsit.</string>
   <string name="connection_use_carbons">Mode copia carbó\nPot ser inestable! Això compartirà les sessions pel mateix compte en aquest client. Desactivar per reduir l\'ús de trànsit.</string>
-  <string name="connection_dns_resolver_type">Tipus de resolució DNS</string>
-  <string name="connection_dns_resolver_type_dns_java_resolver">DNSJavaResolver</string>
+    <string name="connection_dns_resolver_type_dns_java_resolver">DNSJavaResolver</string>
   <string name="connection_dns_resolver_type_mini_dns_resolver">MiniDNSResolver (experimental)</string>
-  <string name="connection_use_plain_text_auth">Autenticació amb text sense format\nUsar text en clar per a tots els comptes. No es recomana.</string>
-  <string name="events_phrases">Phrases\nCreate clau personalitzat notificacions de missatges rebuts que contenen frases específiques</string>
-  <string name="security_clear_certificate_warning">Realment voleu eliminar tot ignorats certificats?</string>
-  <string name="account_error_settings">Configuració</string>
+    <string name="events_phrases">Phrases\nCreate clau personalitzat notificacions de missatges rebuts que contenen frases específiques</string>
+    <string name="account_error_settings">Configuració</string>
 </resources>
diff --git a/xabber/src/main/res/values-cs-rCZ/account_editor.xml b/xabber/src/main/res/values-cs-rCZ/account_editor.xml
index c8542a6719..68245cf1bb 100644
--- a/xabber/src/main/res/values-cs-rCZ/account_editor.xml
+++ b/xabber/src/main/res/values-cs-rCZ/account_editor.xml
@@ -2,40 +2,25 @@
 <!--Generated by crowdin.com-->
 <resources>
   <string name="account_compression">Použít kompresi</string>
-  <string name="account_enabled">Povoleno</string>
-  <string name="account_host">Hostitel</string>
+    <string name="account_host">Hostitel</string>
   <string name="account_password">Heslo</string>
   <string name="confirm_password">Ověření hesla</string>
   <string name="account_port">Port</string>
   <string name="account_priority">Priorita</string>
   <string name="account_resource">Zdroj</string>
   <string name="account_server_name">Server</string>
-  <string name="account_type">Typ účtu</string>
-  <string name="account_type_hints_gtalk">uživatelské jméno na gmail.com nebo Google Apps</string>
-  <string name="account_type_helps_gtalk">Pokud nemáte Google účet můžete si jej vytvořit na http://mail.google.com\nTaké můžete použít vaše_uživatelské_jméno@vaše_google_doména</string>
-  <string name="account_xmpp_register_warning">Musíte <a href="http://www.google.com/#q=register an XMPP account"> zaregistrovat účet XMPP</a> před přidáním do Xabber!</string>
-  <string name="account_type_helps_xmpp">Pokud se chcete dozvědět více o XMPP (Jabber) navštivte: https://xmpp.org</string>
-  <string name="account_user_name">Uživatelské jméno</string>
+    <string name="account_xmpp_register_warning">Musíte <a href="http://www.google.com/#q=register an XMPP account"> zaregistrovat účet XMPP</a> před přidáním do Xabber!</string>
+    <string name="account_user_name">Uživatelské jméno</string>
   <string name="EMPTY_SERVER_NAME">Uveďte jméno serveru</string>
   <string name="EMPTY_USER_NAME">Uveďte uživatelské jméno</string>
   <string name="CONFIRM_PASSWORD">Hesla se neshodují</string>
-  <string name="account_archive_mode">Ukládat historii zpráv</string>
-  <string name="account_archive_mode_available">Na serveru, pokud je to možné</string>
-  <string name="account_archive_mode_dont_store">Neukládat</string>
-  <string name="account_archive_mode_local">Lokálně na zařízení</string>
-  <string name="account_archive_mode_server">Na serveru</string>
-  <string name="account_archive_mode_unread">Lokálně pouze neodeslané a nepřečtené</string>
-  <string name="account_compression_summary">Zaškrtnutím povolíte kompresi dat</string>
+    <string name="account_compression_summary">Zaškrtnutím povolíte kompresi dat</string>
   <string name="account_custom">Vlastní hostitel</string>
   <string name="account_custom_summary">Namísto SRV záznamu použít vlastní nastavení hostitele</string>
-  <string name="account_enabled_summary">Přepnout pro povolení účtu</string>
-  <string name="account_invalid_port">Port musí být číslo (výchozí: 5222)</string>
+    <string name="account_invalid_port">Port musí být číslo (výchozí: 5222)</string>
   <string name="account_invalid_port_range">Port musí být mezi 1 a 65535 (výchozí: 5222)</string>
   <string name="account_invalid_priority">Hodnota priority musí být číslo od -128 do 127 (výchozí: 0)</string>
-  <string name="account_oauth">Autorizace</string>
-  <string name="account_oauth_invalidated">Neautorizováno</string>
-  <string name="account_oauth_summary">Nastavení OAuth</string>
-  <string name="account_proxy_host">Hostitel proxy</string>
+    <string name="account_proxy_host">Hostitel proxy</string>
   <string name="account_proxy_invalid_port_range">Port serveru proxy musí být mezi 1 a 65535 (výchozí: 8080)</string>
   <string name="account_proxy_invalid_port">Port serveru proxy musí být číslo (výchozí: 8080)</string>
   <string name="account_proxy_password">Heslo serveru proxy</string>
@@ -47,18 +32,14 @@
   <string name="account_sasl_summary">U velmi starých serverů zakázat</string>
   <string name="account_store_password">Uložit heslo</string>
   <string name="account_store_password_summary">Odškrkněte, pokud chcete zadávat heslo při každém přihlášení</string>
-  <string name="account_syncable">Integrovat do systémových kontaktů</string>
-  <string name="account_syncable_summary">Zobrazit Kontakty z tohoto účtu v seznamu kontaktů telefonu</string>
-  <string name="account_tls_enable">Povolit protokol TLS</string>
+    <string name="account_tls_enable">Povolit protokol TLS</string>
   <string name="account_tls_enable_summary">Pokud je to možné používat šifrování TLS při připojení k serveru</string>
   <string name="account_tls_legacy">Starší verze SSL</string>
   <string name="account_tls_legacy_summary">Použít starší šifrování SSL při připojení k serveru</string>
   <string name="account_tls_mode">Použití protokolu TLS/SSL</string>
   <string name="account_tls_require">Požadovat protokol TLS</string>
   <string name="account_tls_require_summary">Vyžadovat šifrování TLS při připojení k serveru</string>
-  <string name="account_use_orbot">Chat ptřednictvím sítě TOR Anonymita a přímé TLS šifrování protocol\nNedoporučujeme pro Google Talk</string>
-  <string name="confirm_cancellation">Jste si jisti, že chcete zrušit všechny změny?</string>
-  <string name="INCORRECT_USER_NAME">Špatné uživ. jméno. Pro podrobnosti zobrazte nápovědu níže.</string>
+    <string name="INCORRECT_USER_NAME">Špatné uživ. jméno. Pro podrobnosti zobrazte nápovědu níže.</string>
   <string name="orbot_required_message">K možnosti komunikace přes TOR musíte mít nainstalovaný Orbot a aktivované proxy pro tuto aplikaci. Chcete ho nainstalovat z Google Play?</string>
   <string name="orbot_required_title">Nainstalovat Orbot?</string>
   <string name="install_orbot">Nainstalovat Orbot</string>
diff --git a/xabber/src/main/res/values-cs-rCZ/chat_viewer.xml b/xabber/src/main/res/values-cs-rCZ/chat_viewer.xml
index ecbfcfca5e..b4593d71a6 100644
--- a/xabber/src/main/res/values-cs-rCZ/chat_viewer.xml
+++ b/xabber/src/main/res/values-cs-rCZ/chat_viewer.xml
@@ -21,11 +21,8 @@
   <string name="message_remove">Odstranit z historie</string>
   <string name="message_repeat">Znovu odeslat</string>
   <string name="message_otr_show_original">Zobrazit zprávu</string>
-  <string name="message_open_file">Otevřít</string>
-  <string name="message_save_file">Uložit</string>
-  <string name="save_history">Uložit lokální historii\nUložit historii zpráv lokálně</string>
-  <string name="show_history">Zobrazit historii</string>
-  <string name="action_attention_called">Žádost o pozornost odeslána</string>
+    <string name="save_history">Uložit lokální historii\nUložit historii zpráv lokálně</string>
+    <string name="action_attention_called">Žádost o pozornost odeslána</string>
   <string name="action_attention_requested">Jste žádán o pozornost</string>
   <string name="action_ban">%1$s byl zablokován</string>
   <string name="action_ban_by">%2$s zakázal %1$s</string>
@@ -73,8 +70,7 @@
   <string name="otr_refresh">Restartovat šifrování</string>
   <string name="otr_request">Bylo vyžádáno off-the-Record soukromý rozhovor, ale nemáte zásuvný modul podporující. Použít Pidgin, Gajim nebo Adium pro PC/Mac a Xabber, rozhovory nebo ChatSecure pro Android. Přejděte na http://otr.cypherpunks.ca/ pro další informace.</string>
   <string name="otr_start">Zahájit šifrování</string>
-  <string name="otr_unencrypted_message">Tato zpráva nebyla zašifrována</string>
-  <string name="otr_unreadable_message">Zašifrovaná zpráva, kterou jste odeslali, je nečitelná</string>
+    <string name="otr_unreadable_message">Zašifrovaná zpráva, kterou jste odeslali, je nečitelná</string>
   <string name="otr_not_decrypted_message">Zprávu není možné dešifrovat</string>
   <string name="otr_verification">OTR ověření</string>
   <string name="otr_verify_fingerprint">Ověření otiskem</string>
@@ -87,21 +83,13 @@
   <string name="otr_verification_progress_title">OTR ověření probíhá</string>
   <string name="otr_verification_notify_button">OTEVŘÍT</string>
   <string name="otr_verification_notify_button_cancel">ZRUŠIT</string>
-  <string name="under_construction">Tato funkce zatím není dostupná</string>
-  <string name="under_construction_message">Tato obrazovka je zatím nedostupná</string>
-  <string name="chat_events_show_text_global">Použít globální nastavení</string>
+    <string name="chat_events_show_text_global">Použít globální nastavení</string>
   <string name="chat_events_show_text_always">Zobrazit text zprávy</string>
   <string name="chat_events_show_text_never">Skrýt text zprávy</string>
-  <string name="sending_file">Odesílání souboru %s</string>
-  <string name="error_sending_file">Chyba při odesílání souboru %s</string>
-  <string name="no_application_to_open_file">K otevření toho souboru nebyla nalezena žádná aplikace</string>
-  <string name="could_not_save_file">Soubor nelze uložit</string>
-  <string name="file_saved_successfully">Soubor byl úspěšně uložen</string>
-  <string name="received_by">Přijaté od %s</string>
-  <string name="could_not_get_path_to_file">Nelze získat cestu k souboru</string>
+    <string name="error_sending_file">Chyba při odesílání souboru %s</string>
+    <string name="could_not_get_path_to_file">Nelze získat cestu k souboru</string>
   <string name="message_open_private_chat">Otevřít soukromý chat</string>
-  <string name="http_file_upload_slot_error">Soubor nelze nahrát. Příliš velký?</string>
-  <string name="no_permission_to_read_files">Nemáte povolení pro čtení souborů</string>
+    <string name="no_permission_to_read_files">Nemáte povolení pro čtení souborů</string>
   <string name="no_permission_to_write_files">Nemáte povolení pro zápis souborů</string>
   <string name="error_description_title">Popis chyby:</string>
   <string name="message_status_sent">Odesláno</string>
diff --git a/xabber/src/main/res/values-cs-rCZ/contact_editor.xml b/xabber/src/main/res/values-cs-rCZ/contact_editor.xml
index 19fc8cd0dd..e4ae42b4c3 100644
--- a/xabber/src/main/res/values-cs-rCZ/contact_editor.xml
+++ b/xabber/src/main/res/values-cs-rCZ/contact_editor.xml
@@ -17,12 +17,8 @@
   <string name="processing_image">Zpracování obrázku...</string>
   <string name="error_during_crop">Chyba při oříznutí obrázku</string>
   <string name="error_during_image_processing">Chyba při zpracování obrázku</string>
-  <string name="account_settings">Nastavení účtu</string>
-  <string name="account_user_info">Informace o účtu</string>
-  <string name="account_server_info">Informace o serveru</string>
+    <string name="account_server_info">Informace o serveru</string>
   <string name="account_server_info_description">Seznam funkční serveru</string>
   <string name="conference_private_chat_invitation">%1$s z %2$s s vámi chce zahájit soukromý chat</string>
   <string name="accept_muc_private_chat">Přijmout</string>
-  <string name="block_muc_private_chat">Blokovat</string>
-  <string name="no_permission_camera">Nemáte povolení k přístupu k fotoaparátu</string>
 </resources>
diff --git a/xabber/src/main/res/values-cs-rCZ/contact_list.xml b/xabber/src/main/res/values-cs-rCZ/contact_list.xml
index 7d274bace9..498bb97ba2 100644
--- a/xabber/src/main/res/values-cs-rCZ/contact_list.xml
+++ b/xabber/src/main/res/values-cs-rCZ/contact_list.xml
@@ -18,17 +18,13 @@
   <string name="application_state_roster">Připojeno.</string>
   <string name="application_state_starting">Spouštím aplikaci&#8230;</string>
   <string name="application_state_waiting">Čekám na připojení</string>
-  <string name="chat_list">Seznam konverzací</string>
-  <string name="chat_list_is_empty">Žádné aktivní konverzace</string>
-  <string name="chat_viewer">Konverzace</string>
-  <string name="close_chat">Zavřít konverzaci</string>
-  <string name="CONNECTION_FAILED">Chyba spojení</string>
+    <string name="chat_viewer">Konverzace</string>
+    <string name="CONNECTION_FAILED">Chyba spojení</string>
   <string name="contact_add">Přidat kontakt</string>
   <string name="contact_delete">Smazat</string>
   <string name="contact_block">Blokovat kontakt</string>
   <string name="contact_delete_confirm">Opravdu chcete odstranit kontakt %1$s z účtu %2$s?</string>
-  <string name="contact_list">Seznam kontaktů</string>
-  <string name="discard_subscription">Odmítnout kontakt</string>
+    <string name="discard_subscription">Odmítnout kontakt</string>
   <string name="exit">Ukončit</string>
   <string name="group_active_chat">Aktivní konverzace</string>
   <string name="group_none">Žádné skupiny</string>
@@ -40,15 +36,7 @@
   <string name="request_subscription">Požadavek na přihlášení</string>
   <string name="XMPP_EXCEPTION">Chyba proudu</string>
   <string name="application_state_closing">Ukládání změn...\nAplikace bude brzy ukončena.</string>
-  <string name="certificate_confirmation">%1$s.\nVydavatel používá zastaralý otisk (SHA-1), který nelze ověřit: %2$s? Chcete být informováni o tomto problému s tímto certifikátem?</string>
-  <string name="certificate_details">\n\nVydáno pro: \nNázev (CN): %1$s\nOrganizace (O): %2$s\nOrganizační jednotka (OU): %3$s\nSeriové číslo: %4$s\n\nVydavatel:\nNázev (CN): %5$s\nOrganizace (O): %6$s\nOrganizační jednotka (OU): %7$s\n\nPlatnost:\nZačátek: %8$s\nKonec: %9$s.</string>
-  <string name="certificate_invalid_chane">Ověření řetězce podpisu se nezdařilo</string>
-  <string name="certificate_invalid_target">Ověření cíle se nezdařilo</string>
-  <string name="certificate_self_signed">Certifikát podepsaný sám sebou</string>
-  <string name="certificate_show_details">Podrobnosti&#8230;</string>
-  <string name="close_chats">Zavřít všechny konverzace</string>
-  <string name="contact_integration_suggest">Přejete si integrovat Xabber do systémových kontaktů? \nLze změnit v \"Nastavení\" → \"XMPP účty\" → váš účet → \"Integrace kontaktů\". \nNB: Systémový seznam kontaktů může být na pár minut pomalejší.</string>
-  <string name="group_room">Konference</string>
+    <string name="group_room">Konference</string>
   <string name="OTR_ERROR">Chyba OTR</string>
   <string name="select_contact">Kliknutím vyberte kontakt</string>
   <string name="show_offline_always">Vždy zobrazovat</string>
@@ -63,8 +51,7 @@
   <string name="block_list">Seznam blokovaných kontaktů</string>
   <string name="contact_blocked_successfully">Kontakt úspěšně zablokován</string>
   <string name="error_blocking_contact">Chyba při blokování kontaktu</string>
-  <string name="unblock_contact">Odblokovat kontakt</string>
-  <string name="contacts_unblocked_successfully">Kontakty úspěšně odblokovány</string>
+    <string name="contacts_unblocked_successfully">Kontakty úspěšně odblokovány</string>
   <string name="error_unblocking_contacts">Chyba při odblokování kontaktů</string>
   <string name="block_contact_confirm">Opravdu chcete blokovat kontakt %1$s z účtu %2$s?</string>
   <string name="unblock_all_contacts_confirm">Opravdu chcete odblokovat všechny kontakty z účtu %1$s?</string>
@@ -76,19 +63,10 @@
   <string name="dark_theme_suggest_dialog_stay_on_light_side">Zůstat na Světlé straně</string>
   <string name="battery_optimization_disable_dialog_title">Optimalizace baterie</string>
   <string name="battery_optimization_disable_dialog_message">Vaše zařízení používá radikální optimalizaci spotřeby energie, které může vést ke zpožděným notifikacím i ztrátám zpráv.\n\nBudete nyní požádáni o jejich vypnutí.</string>
-  <string name="save_log_to_file">Ulož do souboru</string>
-  <string name="clear_log">Odstranit staré soubory protokolu</string>
+    <string name="clear_log">Odstranit staré soubory protokolu</string>
   <string name="open_log_file">Otevřít</string>
   <string name="send_log_file">Odeslat</string>
-  <string name="intro_welcome">Vítejte na Xabber</string>
-  <string name="intro_xabber_description">Open source Android XMPP klient</string>
-  <string name="intro_have_account">Přihlášení k účtu XMPP</string>
-  <string name="intro_register_account">Registrovat XMPP účet</string>
-  <string name="intro_create_xabber_account">Použít účet Xabber</string>
-  <string name="intro_use_third_party_accounts">použití účtů XMPP třetích stran</string>
-  <string name="intro_faq">Pokud nemáte XMPP účet, prosím přečtěte si naše <a href="https://www.xabber.com/faq/">odpovědi na časté otázky,</a> jak jej získat.</string>
-  <string name="intro_web_search_register_xmpp">Registrovat XMPP účet</string>
-  <string name="synchronize_bookmarks">Synchronizovat záložky</string>
+    <string name="synchronize_bookmarks">Synchronizovat záložky</string>
   <string name="remove_all_bookmarks">Odstranit vše</string>
   <string name="remove_selected_bookmarks">Odstranit vybrané</string>
   <string name="remove_all_bookmarks_confirm">Opravdu chcete odstranit všechny záložky z účtu %1$s?</string>
diff --git a/xabber/src/main/res/values-cs-rCZ/contact_viewer.xml b/xabber/src/main/res/values-cs-rCZ/contact_viewer.xml
index 8e74d1f434..3e16c65b4e 100644
--- a/xabber/src/main/res/values-cs-rCZ/contact_viewer.xml
+++ b/xabber/src/main/res/values-cs-rCZ/contact_viewer.xml
@@ -17,12 +17,9 @@
   <string name="vcard_organization_unit">Organizační jednotka</string>
   <string name="vcard_title">Název pozice, funkce</string>
   <string name="vcard_role">Role</string>
-  <string name="vcard_other">Další informace</string>
-  <string name="vcard_categories">Kategorie</string>
-  <string name="vcard_decsription">Popis</string>
+    <string name="vcard_decsription">Popis</string>
   <string name="vcard_note">Poznámka</string>
-  <string name="vcard_address">Adresa</string>
-  <string name="vcard_address_pobox">P.O. Box</string>
+    <string name="vcard_address_pobox">P.O. Box</string>
   <string name="vcard_address_extadr">Rozšířená adresa</string>
   <string name="vcard_address_street">Ulice</string>
   <string name="vcard_address_locality">Kraj</string>
diff --git a/xabber/src/main/res/values-cs-rCZ/muc_editor.xml b/xabber/src/main/res/values-cs-rCZ/muc_editor.xml
index 7939d65cb0..2d0106748c 100644
--- a/xabber/src/main/res/values-cs-rCZ/muc_editor.xml
+++ b/xabber/src/main/res/values-cs-rCZ/muc_editor.xml
@@ -20,12 +20,10 @@
   <string name="muc_invite_confirm">%2$s vás zve do konference %3$s. Připojte se z účtu %1$s?</string>
   <string name="muc_invite_confirm_reason">%2$s vás zve do konference %3$s: %4$s. Připojte se z účtu %1$s?</string>
   <string name="muc_leave">Odejít z konference</string>
-  <string name="muc_save">Uložit konferenci</string>
-  <string name="muc_choose_conference">Vyberte konferenci</string>
+    <string name="muc_choose_conference">Vyberte konferenci</string>
   <string name="muc_next">Další</string>
   <string name="muc_get_hosted_conferences">Získat seznam konferencí</string>
   <string name="muc_error_getting_conferences">Chyba při získávání seznamu konferencí</string>
   <string name="muc_type_conference_name">Zadejte název konference</string>
-  <string name="contact_is_blocked">Kontakt je zablokován!</string>
-  <string name="conference_invitation">Pozvánka na konferenci</string>
+    <string name="conference_invitation">Pozvánka na konferenci</string>
 </resources>
diff --git a/xabber/src/main/res/values-cs-rCZ/notification_bar.xml b/xabber/src/main/res/values-cs-rCZ/notification_bar.xml
index cee2cb4d9a..3b8619efac 100644
--- a/xabber/src/main/res/values-cs-rCZ/notification_bar.xml
+++ b/xabber/src/main/res/values-cs-rCZ/notification_bar.xml
@@ -34,10 +34,7 @@
   <!-- Used for plural form in russian. -->
   <string name="connection_state_waiting_5">-</string>
   <string name="connection_state_offline">%1$d %2$s offline</string>
-  <string name="archive_available_request_message">Přejete si uložit historii zpráv na serveru? \nXabber umožňuje načíst historii ze všech zařízení, které používají tento účet. \n Tato nastavení budou mít dopad na provoz a mírně sníží rychlost připojení. \nUpozornění: Všechna lokální historie bude odstraněna.</string>
-  <string name="archive_available_request_title">Povolit archiv zpráv?</string>
-  <string name="INVALID_CERTIFICATE">Neplatný certifikát</string>
-  <string name="muc_invite_message">Chcete vstoupit do konference?</string>
+    <string name="muc_invite_message">Chcete vstoupit do konference?</string>
   <string name="otr_verification_in_progress">Kliknutím zde zrušíte akci.</string>
   <string name="PASSWORD_REQUIRED">Heslo je vyžadováno</string>
   <string name="pay_attention">Věnujte pozornost</string>
diff --git a/xabber/src/main/res/values-cs-rCZ/preference_editor.xml b/xabber/src/main/res/values-cs-rCZ/preference_editor.xml
index eafb03f053..e8a39cd14d 100644
--- a/xabber/src/main/res/values-cs-rCZ/preference_editor.xml
+++ b/xabber/src/main/res/values-cs-rCZ/preference_editor.xml
@@ -12,14 +12,11 @@
   <string name="contacts_order_alphabet">Abecedně</string>
   <string name="contacts_order_status">Podle stavu</string>
   <string name="contacts_show_accounts">Seskupit podle účtu\nSeskupit kontakty v seznamu podle uživatelských účtů</string>
-  <string name="contacts_show_active_chats">Aktivní konverzace navrchu\nZobrazovat aktivní konverzace v horní části seznamu kontaktů</string>
-  <string name="contacts_show_avatars">Zobrazit avatary\nZobrazí obrázek uživatele v seznamu kontaktů</string>
+    <string name="contacts_show_avatars">Zobrazit avatary\nZobrazí obrázek uživatele v seznamu kontaktů</string>
   <string name="contacts_show_empty_groups">Zobrazovat prázdné skupiny\nZobrazí i skupiny, ve kterých nejsou žádné kontakty online</string>
   <string name="contacts_show_groups">Zobrazit skupiny\nZobrazí skupiny v seznamu kontaktů</string>
   <string name="contacts_show_offline">Zobrazovat odpojené kontakty</string>
-  <string name="contacts_show_panel">Zobrazit panel účtů\nZobrazí tlačítka účtů s avatary v pravém dolním rohu seznamu kontaktů</string>
-  <string name="contacts_stay_active_chats">Duplikovaná aktivní konverzace\nAktivní konverzace se zobrazí zároveň navrchu kontaktů a ve skupině</string>
-  <string name="debug_log">Debug log\nZapisuje zprávy do servisního záznamu (pro provedení změn restartujte aplikaci)</string>
+    <string name="debug_log">Debug log\nZapisuje zprávy do servisního záznamu (pro provedení změn restartujte aplikaci)</string>
   <string name="debug_file_log_title">Zapsat protokol ladění\nUložit protokol ladění do místního souboru (můžete jej sdílet).</string>
   <string name="debug_log_files_title">Soubory protokolu ladění\nSeznam zapsaných souborů protokolů ladění.</string>
   <string name="debug_log_files_activity_title">Soubory protokolů ladění</string>
@@ -36,8 +33,7 @@
   <string name="interface_theme">Téma</string>
   <string name="interface_theme_dark">Tmavé</string>
   <string name="interface_theme_light">Světlé</string>
-  <string name="interface_theme_normal">Výchozí</string>
-  <string name="interface_smiles">Emotikony</string>
+    <string name="interface_smiles">Emotikony</string>
   <string name="interface_smiles_android">Android emotikony</string>
   <string name="interface_smiles_none">Žádné grafické emotikony</string>
   <string name="preference_connection">Nastavení připojení\nNastavení připojení</string>
@@ -62,8 +58,7 @@
   <string name="chats_font_size_xlarge">Extra velké</string>
   <string name="chats_hide_keyboard">Skrýt klávesnici</string>
   <string name="chats_hide_keyboard_landscape">V režimu na šířku</string>
-  <string name="chats_receipt">Potvrzení o doručení\nOdesílát a přijímat potvrzení o doručení zprávy</string>
-  <string name="chats_show_avatars">Avatary ve zprávách\nZobrazí avatary uživatelů v každé zprávě</string>
+    <string name="chats_show_avatars">Avatary ve zprávách\nZobrazí avatary uživatelů v každé zprávě</string>
   <string name="chats_show_status_change">Zobrazit změny stavu</string>
   <string name="chats_show_status_change_muc">V konferencích</string>
   <string name="chats_state_notification">Upozorňovat na psaní zprávy\nUpozorní ostatní uživatele, že píšete zprávu</string>
@@ -77,37 +72,24 @@
   <string name="contacts_reset_offline">Resetovat offline nastavení\nSmaže individuální nastavení pro skupiny a účty</string>
   <string name="contacts_reset_offline_warning">Opravdu chcete smazat Vaše individuální nastavení skupin a účtů?</string>
   <string name="events_first_only">Upozornit na první zprávu\nUpozorní pouze na první zprávu v konverzaci</string>
-  <string name="events_ignore_system_vibro">Ignorovat nastavení vibrací systému\nPoužijte tuto možnost, pokud nefunguje systémové nastavení vibrací</string>
-  <string name="events_message">Nastavení upozornění\nNastavit upozornění pro příchozí zprávy</string>
-  <string name="events_message_chat">Pouze konverzace</string>
-  <string name="events_message_chat_and_muc">Konverzace a konference</string>
-  <string name="events_message_none">Neupozorňovat</string>
-  <string name="events_show_text">Náhledy zpráv\nZobrazit text zprávy v notifikační liště</string>
+    <string name="events_show_text">Náhledy zpráv\nZobrazit text zprávy v notifikační liště</string>
   <string name="events_show_text_muc">Náhled zprávy\nZobrazit text zprávy z konference v notifikační liště</string>
-  <string name="events_visible_chat">Upozorňovat v aktivní konverzaci\nUpozorní na příchozí zprávu v aktivní konverzaci</string>
-  <string name="events_suppress_100">Potlačit určité stavové zprávy\nNezobrazuje zprávu \"Tato místnost není anonymní\"</string>
+    <string name="events_suppress_100">Potlačit určité stavové zprávy\nNezobrazuje zprávu \"Tato místnost není anonymní\"</string>
   <string name="negative_priotiry_summary">%s (nebudete dostávat zprávy z žádné konverzace)</string>
   <string name="preference_accounts">XMPP účty\nNastavení účtů</string>
   <string name="preference_security">Zabezpečení\nNastavení zabezpečení</string>
   <string name="security_check_certificate">Ověřovat certifikát serveru\nUpozorňovat na problémy s certifikátem u šifrovaných spojení</string>
-  <string name="security_clear_certificate">Odebrat certifikáty\nVyčistí seznam ignorovaných certifikátů</string>
-  <string name="security_otr_history">Ukládat historii\nUloží historii konverzací OTR relací</string>
-  <string name="security_otr_mode">OTR režim</string>
+    <string name="security_otr_mode">OTR režim</string>
   <string name="chats_attention">Žádost o pozornost\nReagovat na příchozí žádosti o pozornost</string>
   <string name="chats_attention_sound">Zvuk upozornění\nVyberte tón pro upozornění</string>
   <string name="connection_load_vcard">Načítat vizitky\nStahovat a aktualizovat informace o kontaktech včetně avatarů. Zakažte pro snížení datových přenosů.</string>
   <string name="connection_load_images">Načítání obrázků\nAutomaticky načítat obrázky z URL. Zakažte pro snížení přenášených dat.</string>
   <string name="connection_use_carbons">Carbon-copied mód\nMůže způsobovat problémy! Umožňuje přijímat zprávy ve více klientech současně. Musí být podpora i na serveru.</string>
-  <string name="connection_dns_resolver_type">Typ překládání DNS</string>
-  <string name="connection_dns_resolver_type_dns_java_resolver">DNSJavaResolver</string>
+    <string name="connection_dns_resolver_type_dns_java_resolver">DNSJavaResolver</string>
   <string name="connection_dns_resolver_type_mini_dns_resolver">MiniDNSResolver (experimentální)</string>
-  <string name="connection_use_plain_text_auth">Autentizace prostým textem\nPoužít autentizaci prostým textem pro všechny účty. Nedoporučuje se.</string>
-  <string name="events_phrases">Notifikace dle klíčového slova\nVytvoří Vaši vlastní notifikaci, na základě specifické fráze v příchozí zprávě</string>
-  <string name="security_clear_certificate_warning">Opravdu chcete odstranit všechny ignorované certifikáty?</string>
-  <string name="account_error_settings">Nastavení</string>
-  <string name="category_xabber_account">Xabber účet</string>
-  <string name="category_xmpp_accounts">XMPP účty</string>
-  <string name="category_interface">Rozhraní</string>
+    <string name="events_phrases">Notifikace dle klíčového slova\nVytvoří Vaši vlastní notifikaci, na základě specifické fráze v příchozí zprávě</string>
+    <string name="account_error_settings">Nastavení</string>
+    <string name="category_interface">Rozhraní</string>
   <string name="category_settings">Nastavení</string>
   <string name="category_about">O aplikaci</string>
   <string name="category_appearance">Vzhled</string>
diff --git a/xabber/src/main/res/values-cs-rCZ/words.xml b/xabber/src/main/res/values-cs-rCZ/words.xml
index 0161d57169..0e05bc94b8 100644
--- a/xabber/src/main/res/values-cs-rCZ/words.xml
+++ b/xabber/src/main/res/values-cs-rCZ/words.xml
@@ -20,5 +20,4 @@
   <string name="settings">Nastavení</string>
   <string name="ok">OK</string>
   <string name="login">Přihlášení</string>
-  <string name="resume">Pokračovat</string>
 </resources>
diff --git a/xabber/src/main/res/values-de-rDE/account_editor.xml b/xabber/src/main/res/values-de-rDE/account_editor.xml
index 959f0601aa..95972f1e3b 100644
--- a/xabber/src/main/res/values-de-rDE/account_editor.xml
+++ b/xabber/src/main/res/values-de-rDE/account_editor.xml
@@ -2,40 +2,25 @@
 <!--Generated by crowdin.com-->
 <resources>
   <string name="account_compression">Kompression verwenden</string>
-  <string name="account_enabled">Konto aktiviert</string>
-  <string name="account_host">Server</string>
+    <string name="account_host">Server</string>
   <string name="account_password">Passwort</string>
   <string name="confirm_password">Passwort bestätigen</string>
   <string name="account_port">Port</string>
   <string name="account_priority">Priorität</string>
   <string name="account_resource">Ressource</string>
   <string name="account_server_name">Server</string>
-  <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="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_user_name">Benutzername</string>
   <string name="EMPTY_SERVER_NAME">Servername nicht angegeben</string>
   <string name="EMPTY_USER_NAME">Benutzername nicht angegeben</string>
   <string name="CONFIRM_PASSWORD">Die Passwörter stimmen nicht überein</string>
-  <string name="account_archive_mode">Speichern des Chatverlaufs</string>
-  <string name="account_archive_mode_available">Auf dem Server, wenn möglich</string>
-  <string name="account_archive_mode_dont_store">Nicht speichern</string>
-  <string name="account_archive_mode_local">Auf diesem Gerät</string>
-  <string name="account_archive_mode_server">Auf dem Server</string>
-  <string name="account_archive_mode_unread">Auf diesem Gerät (nur ungelesen/ungesendet)</string>
-  <string name="account_compression_summary">Auswählen um die Datenkompression zu aktivieren</string>
+    <string name="account_compression_summary">Auswählen um die Datenkompression zu aktivieren</string>
   <string name="account_custom">Benutzerdefinierter Server</string>
   <string name="account_custom_summary">Benutzerdefinierte Einstellungen statt SRV-Eintrag nutzen</string>
-  <string name="account_enabled_summary">Schalter zum Aktivieren des Kontos</string>
-  <string name="account_invalid_port">Der Port muss numerisch sein (Standard: 5222)</string>
+    <string name="account_invalid_port">Der Port muss numerisch sein (Standard: 5222)</string>
   <string name="account_invalid_port_range">Port muss ein Wert zwischen 1 und 65535 sein (Standard: 5222)</string>
   <string name="account_invalid_priority">Die Priorität muss ein numerischer Wert zwischen -128 und 127 sein (Standardwert: 10)</string>
-  <string name="account_oauth">Autorisierung</string>
-  <string name="account_oauth_invalidated">Nicht autorisiert</string>
-  <string name="account_oauth_summary">OAuth-Einstellungen</string>
-  <string name="account_proxy_host">Proxy-Server</string>
+    <string name="account_proxy_host">Proxy-Server</string>
   <string name="account_proxy_invalid_port_range">Proxy Port muss ein Wert zwischen 1 und 65535 sein (Standard: 8080)</string>
   <string name="account_proxy_invalid_port">Proxy Port muss eine Zahl sein (Standard: 8080)</string>
   <string name="account_proxy_password">Proxy-Passwort</string>
@@ -47,18 +32,14 @@
   <string name="account_sasl_summary">Für sehr alte Server deaktivieren</string>
   <string name="account_store_password">Kennwort speichern</string>
   <string name="account_store_password_summary">Deaktiviere diese Option, um dein Kennwort bei jedem Verbinden neu einzugeben</string>
-  <string name="account_syncable">Mit Telefonbuch synchronisieren</string>
-  <string name="account_syncable_summary">Kontakte dieses Kontos im Telefonbuch anzeigen</string>
-  <string name="account_tls_enable">TLS verwenden</string>
+    <string name="account_tls_enable">TLS verwenden</string>
   <string name="account_tls_enable_summary">TLS Verschlüsselung für die Serververbindung verwenden (falls möglich)</string>
   <string name="account_tls_legacy">Veraltetes SSL</string>
   <string name="account_tls_legacy_summary">Veraltete SSL-Verschlüsselung für die Serververbindung verwenden</string>
   <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">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="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>
   <string name="orbot_required_title">Soll Orbot installiert werden?</string>
   <string name="install_orbot">Orbot installieren</string>
diff --git a/xabber/src/main/res/values-de-rDE/chat_viewer.xml b/xabber/src/main/res/values-de-rDE/chat_viewer.xml
index 7b17e2862b..6c82000465 100644
--- a/xabber/src/main/res/values-de-rDE/chat_viewer.xml
+++ b/xabber/src/main/res/values-de-rDE/chat_viewer.xml
@@ -21,11 +21,8 @@
   <string name="message_remove">Aus dem Verlauf löschen</string>
   <string name="message_repeat">Erneut senden</string>
   <string name="message_otr_show_original">Nachricht anzeigen</string>
-  <string name="message_open_file">Öffnen</string>
-  <string name="message_save_file">Speichern</string>
-  <string name="save_history">Gesprächsverlauf speichern\nDen Gesprächsverlauf lokal speichern</string>
-  <string name="show_history">Gesprächsverlauf anzeigen</string>
-  <string name="action_attention_called">Aufmerksamkeitswunsch wurde versandt</string>
+    <string name="save_history">Gesprächsverlauf speichern\nDen Gesprächsverlauf lokal speichern</string>
+    <string name="action_attention_called">Aufmerksamkeitswunsch wurde versandt</string>
   <string name="action_attention_requested">Deine Aufmerksamkeit wird verlangt!</string>
   <string name="action_ban">%1$s wurde gebannt</string>
   <string name="action_ban_by">%1$s wurde von %2$s gebannt</string>
@@ -73,8 +70,7 @@
   <string name="otr_refresh">Verschlüsselung wieder beginnen</string>
   <string name="otr_request">Es wurde eine private Unterhaltung durch Off-The-Record angefordert, Sie haben das benötigte Plugin jedoch nicht installiert. Bitte benutzen Sie Pidgin, Gajim oder Adium für PC/Mac und Xabber oder ChatSecure für Android. Weitere Informationen finden Sie unter http://otr.cypherpunks.ca/.</string>
   <string name="otr_start">Verschlüsselung starten</string>
-  <string name="otr_unencrypted_message">Diese Nachricht wurde nicht verschlüsselt</string>
-  <string name="otr_unreadable_message">Die verschlüsselte Nachricht, die Sie gesendet haben, ist nicht lesbar</string>
+    <string name="otr_unreadable_message">Die verschlüsselte Nachricht, die Sie gesendet haben, ist nicht lesbar</string>
   <string name="otr_not_decrypted_message">Nachricht kann nicht entschlüsselt werden</string>
   <string name="otr_verification">OTR Verifikation</string>
   <string name="otr_verify_fingerprint">Mit virtuellem Fingerabdruck verifizieren</string>
@@ -87,21 +83,13 @@
   <string name="otr_verification_progress_title">OTR Verifizierung wird bearbeitet</string>
   <string name="otr_verification_notify_button">ÖFFNEN</string>
   <string name="otr_verification_notify_button_cancel">ABBRECHEN</string>
-  <string name="under_construction">Feature noch nicht verfügbar</string>
-  <string name="under_construction_message">Dieser Bildschirm ist noch nicht verfügbar</string>
-  <string name="chat_events_show_text_global">Globale Voreinstellungen verwenden</string>
+    <string name="chat_events_show_text_global">Globale Voreinstellungen verwenden</string>
   <string name="chat_events_show_text_always">Nachrichtentext anzeigen</string>
   <string name="chat_events_show_text_never">Nachrichtentext verbergen</string>
-  <string name="sending_file">Sende Datei %s</string>
-  <string name="error_sending_file">Fehler beim Senden der Datei %s</string>
-  <string name="no_application_to_open_file">Keine Anwendung zum Öffnen dieser Datei gefunden</string>
-  <string name="could_not_save_file">Die Datei konnte nicht gespeichert werden</string>
-  <string name="file_saved_successfully">Datei wurde erfolgreich gespeichert</string>
-  <string name="received_by">Empfangen von %s</string>
-  <string name="could_not_get_path_to_file">Pfad zur Datei konnte nicht gefunden werden</string>
+    <string name="error_sending_file">Fehler beim Senden der Datei %s</string>
+    <string name="could_not_get_path_to_file">Pfad zur Datei konnte nicht gefunden werden</string>
   <string name="message_open_private_chat">Privaten Chat öffnen</string>
-  <string name="http_file_upload_slot_error">Datei konnte nicht hochgeladen werden. Datei zu groß?</string>
-  <string name="no_permission_to_read_files">Keine Berechtigung zum Lesen der Dateien</string>
+    <string name="no_permission_to_read_files">Keine Berechtigung zum Lesen der Dateien</string>
   <string name="no_permission_to_write_files">Keine Berechtigung zum Schreiben von Dateien</string>
   <string name="error_description_title">Fehlerbeschreibung:</string>
   <string name="message_status_sent">Gesendet</string>
diff --git a/xabber/src/main/res/values-de-rDE/contact_editor.xml b/xabber/src/main/res/values-de-rDE/contact_editor.xml
index 59827f8d62..f0a6031088 100644
--- a/xabber/src/main/res/values-de-rDE/contact_editor.xml
+++ b/xabber/src/main/res/values-de-rDE/contact_editor.xml
@@ -17,12 +17,8 @@
   <string name="processing_image">Bild wird bearbeitet...</string>
   <string name="error_during_crop">Fehler beim Zuschneiden des Bildes</string>
   <string name="error_during_image_processing">Fehler bei der Bildverarbeitung</string>
-  <string name="account_settings">Kontoeinstellungen</string>
-  <string name="account_user_info">Kontoinformationen</string>
-  <string name="account_server_info">Serverinfo</string>
+    <string name="account_server_info">Serverinfo</string>
   <string name="account_server_info_description">Liste der Serverfunktionen</string>
   <string name="conference_private_chat_invitation">%1$s aus %2$s will mit Ihnen privat chatten</string>
   <string name="accept_muc_private_chat">Zustimmen</string>
-  <string name="block_muc_private_chat">Blockieren</string>
-  <string name="no_permission_camera">Keine Berechtigung zum Zugriff für Kamera</string>
 </resources>
diff --git a/xabber/src/main/res/values-de-rDE/contact_list.xml b/xabber/src/main/res/values-de-rDE/contact_list.xml
index d68a96a4e3..99623494ee 100644
--- a/xabber/src/main/res/values-de-rDE/contact_list.xml
+++ b/xabber/src/main/res/values-de-rDE/contact_list.xml
@@ -18,17 +18,13 @@
   <string name="application_state_roster">Verbunden.</string>
   <string name="application_state_starting">Anwendung wird gestartet... </string>
   <string name="application_state_waiting">Warte auf Verbindung&#8230;</string>
-  <string name="chat_list">Chatliste</string>
-  <string name="chat_list_is_empty">Keine aktiven Chats</string>
-  <string name="chat_viewer">Chat</string>
-  <string name="close_chat">Chat beenden</string>
-  <string name="CONNECTION_FAILED">Verbindungsfehler</string>
+    <string name="chat_viewer">Chat</string>
+    <string name="CONNECTION_FAILED">Verbindungsfehler</string>
   <string name="contact_add">Kontakt hinzufügen</string>
   <string name="contact_delete">Kontakt löschen</string>
   <string name="contact_block">Kontakt blockieren</string>
   <string name="contact_delete_confirm">Möchten Sie wirklich Kontakt %1$s aus dem Konto %2$s entfernen?</string>
-  <string name="contact_list">Kontaktliste</string>
-  <string name="discard_subscription">Kontakt ablehnen</string>
+    <string name="discard_subscription">Kontakt ablehnen</string>
   <string name="exit">Beenden</string>
   <string name="group_active_chat">Aktive Chats</string>
   <string name="group_none">Keine Gruppen</string>
@@ -40,15 +36,7 @@
   <string name="request_subscription">Abonnement anfordern</string>
   <string name="XMPP_EXCEPTION">Fehler im Datenstrom</string>
   <string name="application_state_closing">Einstellungen werden gespeichert...\nDie Anwendung wird beendet.</string>
-  <string name="certificate_confirmation">%1$s.\nVertrauen Sie dem Zertifikat mit folgendem SHA1 Fingerabdruck: %2$s?\nMöchten Sie nicht weiter über das Problem mit dem Zertifikat informiert werden?</string>
-  <string name="certificate_details">\n\nAusgestellt an:\nCommon Name (CN): %1$s\nOrganisation (O): %2$s\nOrganisationseinheit (OU): %3$s\nSeriennummer: %4$s\n\nErstellt durch:\nCommon Name (CN): %5$s\nOrganisation (O): %6$s\nOrganisationseinheit (OU): %7$s\n\nGültigkeit:\nErstellt am: %8$s\nAuflaufdatum: %9$s.</string>
-  <string name="certificate_invalid_chane">Verifizierung der Signaturkette fehlgeschlagen</string>
-  <string name="certificate_invalid_target">Ziel konnte nicht verifiziert werden</string>
-  <string name="certificate_self_signed">Selbst-signiertes Zertifikat</string>
-  <string name="certificate_show_details">Details</string>
-  <string name="close_chats">Alle Chats beenden</string>
-  <string name="contact_integration_suggest">Möchten Sie Xabber in ihre Kontaktliste integrieren?\nEs kann unter \"Einstellungen\" → \"XMPP Konten\" → Ihr Konto → \"Integration der Kontakte\" hinzugefügt werden.\nEs ist möglich, dass die Kontakliste für ein paar Minuten langsamer reagiert.</string>
-  <string name="group_room">Konferenzen</string>
+    <string name="group_room">Konferenzen</string>
   <string name="OTR_ERROR">OTR Fehler</string>
   <string name="select_contact">Bitte Kontakt auswählen</string>
   <string name="show_offline_always">Immer anzeigen</string>
@@ -63,8 +51,7 @@
   <string name="block_list">Sperrliste</string>
   <string name="contact_blocked_successfully">Kontakt erfolgreich blockiert</string>
   <string name="error_blocking_contact">Fehler beim Blockieren des Kontaktes</string>
-  <string name="unblock_contact">Kontakt entsperren</string>
-  <string name="contacts_unblocked_successfully">Kontakte erfolgreich entsperrt</string>
+    <string name="contacts_unblocked_successfully">Kontakte erfolgreich entsperrt</string>
   <string name="error_unblocking_contacts">Fehler beim Entsperren der Kontakte</string>
   <string name="block_contact_confirm">Wollen Sie wirklich Kontakt %1$s für das Konto %2$s sperren?</string>
   <string name="unblock_all_contacts_confirm">Wollen Sie wirklich alle Kontakte von %1$s Konto entsperren?</string>
@@ -76,19 +63,10 @@
   <string name="dark_theme_suggest_dialog_stay_on_light_side">Auf der hellen Seite bleiben</string>
   <string name="battery_optimization_disable_dialog_title">Batterieoptimierung</string>
   <string name="battery_optimization_disable_dialog_message">Ihr Gerät unternimmt einige schwere Batterie Optimierungen im Bezug auf Xabber. Das kann zu verspäteten Meldungen oder sogar Nachrichtenverlustführen.\n\nSie werden jetzt aufgefordert, diese Funktion zu deaktivieren.</string>
-  <string name="save_log_to_file">In Datei speichern</string>
-  <string name="clear_log">Alte Logdateien löschen</string>
+    <string name="clear_log">Alte Logdateien löschen</string>
   <string name="open_log_file">Öffnen</string>
   <string name="send_log_file">Senden</string>
-  <string name="intro_welcome">Willkommen bei Xabber</string>
-  <string name="intro_xabber_description">Open Source XMPP Client für Android</string>
-  <string name="intro_have_account">Mit XMPP Konto einloggen</string>
-  <string name="intro_register_account">Füge ein XMPP Konto hinzu</string>
-  <string name="intro_create_xabber_account">Xabber Konto benutzen</string>
-  <string name="intro_use_third_party_accounts">benutze Dritthersteller Kontos</string>
-  <string name="intro_faq">Wenn Sie kein XMPP Konto haben, lesen Sie bitte unsere <a href="https://www.xabber.com/faq/"> FAQ</a> um zu erfahren, wie man ein Konto erstellt.</string>
-  <string name="intro_web_search_register_xmpp">Füge ein XMPP Konto hinzu</string>
-  <string name="synchronize_bookmarks">Lesezeichen synchronisieren</string>
+    <string name="synchronize_bookmarks">Lesezeichen synchronisieren</string>
   <string name="remove_all_bookmarks">Alle entfernen</string>
   <string name="remove_selected_bookmarks">Ausgewählte entfernen</string>
   <string name="remove_all_bookmarks_confirm">Möchten Sie wirklich alle Lesezeichen vom Konto %1$s löschen?</string>
diff --git a/xabber/src/main/res/values-de-rDE/contact_viewer.xml b/xabber/src/main/res/values-de-rDE/contact_viewer.xml
index a5334e696e..8dfb26f88e 100644
--- a/xabber/src/main/res/values-de-rDE/contact_viewer.xml
+++ b/xabber/src/main/res/values-de-rDE/contact_viewer.xml
@@ -17,12 +17,9 @@
   <string name="vcard_organization_unit">Abteilung</string>
   <string name="vcard_title">Beruf</string>
   <string name="vcard_role">Titel</string>
-  <string name="vcard_other">Andere Informationen</string>
-  <string name="vcard_categories">Kategorien</string>
-  <string name="vcard_decsription">Beschreibung</string>
+    <string name="vcard_decsription">Beschreibung</string>
   <string name="vcard_note">Notizen</string>
-  <string name="vcard_address">Adresse</string>
-  <string name="vcard_address_pobox">Postfach</string>
+    <string name="vcard_address_pobox">Postfach</string>
   <string name="vcard_address_extadr">Adresszusatz</string>
   <string name="vcard_address_street">Straße</string>
   <string name="vcard_address_locality">Ort</string>
diff --git a/xabber/src/main/res/values-de-rDE/muc_editor.xml b/xabber/src/main/res/values-de-rDE/muc_editor.xml
index 7edbec73c1..5e5171a72e 100644
--- a/xabber/src/main/res/values-de-rDE/muc_editor.xml
+++ b/xabber/src/main/res/values-de-rDE/muc_editor.xml
@@ -20,12 +20,10 @@
   <string name="muc_invite_confirm">%2$s lädt dich zur Konferenz %3$s ein. Mit Konto %1$s beitreten?</string>
   <string name="muc_invite_confirm_reason">%2$s lädt Sie zur Konferenz %3$s: \"%4$s\" ein. Mit dem Konto %1$s beitreten?</string>
   <string name="muc_leave">Konferenz verlassen</string>
-  <string name="muc_save">Konferenz speichern</string>
-  <string name="muc_choose_conference">Konferenz auswählen</string>
+    <string name="muc_choose_conference">Konferenz auswählen</string>
   <string name="muc_next">Weiter</string>
   <string name="muc_get_hosted_conferences">Gehostete Konferenzen abrufen</string>
   <string name="muc_error_getting_conferences">Fehler beim Abrufen der Konferenzen</string>
   <string name="muc_type_conference_name">Konferenznamen eingeben</string>
-  <string name="contact_is_blocked">Kontakt ist blockiert!</string>
-  <string name="conference_invitation">Konferenzeinladung</string>
+    <string name="conference_invitation">Konferenzeinladung</string>
 </resources>
diff --git a/xabber/src/main/res/values-de-rDE/notification_bar.xml b/xabber/src/main/res/values-de-rDE/notification_bar.xml
index e88b11bacd..738db3a156 100644
--- a/xabber/src/main/res/values-de-rDE/notification_bar.xml
+++ b/xabber/src/main/res/values-de-rDE/notification_bar.xml
@@ -34,10 +34,7 @@
   <!-- Used for plural form in russian. -->
   <string name="connection_state_waiting_5">-</string>
   <string name="connection_state_offline">%1$d %2$s offline</string>
-  <string name="archive_available_request_message">Möchten Sie ihre Nachrichten auf dem Server speichern?\nDies ermöglicht Xabber ihren Verlauf auf jedem Gerät zu laden, welches diesen Account nutzt.\nDieses Feature wird zusätzlichen Netzwerkverkehr erzeugen und die Verbindungsgeschwindigkeit leicht reduzieren.\nWARNUNG: Alle lokalen Verläufe werden gelöscht.</string>
-  <string name="archive_available_request_title">Nachrichtenarchiv aktivieren?</string>
-  <string name="INVALID_CERTIFICATE">Ungültiges Zertifikat</string>
-  <string name="muc_invite_message">Möchtest du der Konferenz beitreten?</string>
+    <string name="muc_invite_message">Möchtest du der Konferenz beitreten?</string>
   <string name="otr_verification_in_progress">Hier klicken um abzubrechen.</string>
   <string name="PASSWORD_REQUIRED">Kennwort erforderlich</string>
   <string name="pay_attention">Achtung!</string>
diff --git a/xabber/src/main/res/values-de-rDE/preference_editor.xml b/xabber/src/main/res/values-de-rDE/preference_editor.xml
index b22a4debed..7a158f2ddc 100644
--- a/xabber/src/main/res/values-de-rDE/preference_editor.xml
+++ b/xabber/src/main/res/values-de-rDE/preference_editor.xml
@@ -12,14 +12,11 @@
   <string name="contacts_order_alphabet">Alphabetisch</string>
   <string name="contacts_order_status">Nach Status</string>
   <string name="contacts_show_accounts">Nach Konten gruppieren\nBenutzer in der Kontaktliste nach Konten gruppieren</string>
-  <string name="contacts_show_active_chats">Aktive Chats oben\nAktive Chats oben in der Kontaktliste anzeigen</string>
-  <string name="contacts_show_avatars">Avatare zeigen\nAvatare der Benutzer in Kontaktliste zeigen</string>
+    <string name="contacts_show_avatars">Avatare zeigen\nAvatare der Benutzer in Kontaktliste zeigen</string>
   <string name="contacts_show_empty_groups">Leere Gruppen anzeigen\nAnzeige der Gruppen ohne online Kontakte</string>
   <string name="contacts_show_groups">Gruppen anzeigen\nGruppen in der Kontaktliste anzeigen</string>
   <string name="contacts_show_offline">Offline Kontakte anzeigen</string>
-  <string name="contacts_show_panel">Konten Panel anzeigen\nAnzeigen der Aktions-Buttons mit Avatars in der unteren rechten Ecke der Kontaktliste</string>
-  <string name="contacts_stay_active_chats">Duplizieren der aktiven Chats\nAktive Chats werden sowohl am Beginn der Kontakteliste als auch in den Gruppen angezeigt</string>
-  <string name="debug_log">Debug Logging\nSchreibe Nachrichten in das Fehlerprotokoll (Um Änderungen zu aktivieren, muss die  Anwendung neugestartet werden)</string>
+    <string name="debug_log">Debug Logging\nSchreibe Nachrichten in das Fehlerprotokoll (Um Änderungen zu aktivieren, muss die  Anwendung neugestartet werden)</string>
   <string name="debug_file_log_title">Schreibe Logdaten\nSchreibe Debugdaten in lokale Datei (kann geteilt werden).</string>
   <string name="debug_log_files_title">Logdateien\nListe der geschriebenen Logdateien.</string>
   <string name="debug_log_files_activity_title">Logdateien</string>
@@ -36,8 +33,7 @@
   <string name="interface_theme">Design</string>
   <string name="interface_theme_dark">Dunkel</string>
   <string name="interface_theme_light">Hell</string>
-  <string name="interface_theme_normal">Standard</string>
-  <string name="interface_smiles">Emoticons</string>
+    <string name="interface_smiles">Emoticons</string>
   <string name="interface_smiles_android">Android Emoticons</string>
   <string name="interface_smiles_none">keine grafischen Emoticons</string>
   <string name="preference_connection">Verbindungseinstellungen\nVerbindungseinstellungen</string>
@@ -62,8 +58,7 @@
   <string name="chats_font_size_xlarge">Sehr groß</string>
   <string name="chats_hide_keyboard">Tastatur ausblenden</string>
   <string name="chats_hide_keyboard_landscape">Im Querformat</string>
-  <string name="chats_receipt">Nachrichten Quittierung\nSenden und Erhalten von Nachrichten Quittierungen</string>
-  <string name="chats_show_avatars">Avatare in Nachrichten\nAvatar in jeder Chat-Nachricht anzeigen</string>
+    <string name="chats_show_avatars">Avatare in Nachrichten\nAvatar in jeder Chat-Nachricht anzeigen</string>
   <string name="chats_show_status_change">Zeige Statuswechsel</string>
   <string name="chats_show_status_change_muc">In Gruppenchats</string>
   <string name="chats_state_notification">Benachrichtigung bei Eingabe\nDem Empfänger anzeigen, dass gerade getippt wird</string>
@@ -77,37 +72,24 @@
   <string name="contacts_reset_offline">Offline-Einstellungen zurücksetzen\nIndividuelle Einstellungen für Gruppen und Konten zurücksetzen.</string>
   <string name="contacts_reset_offline_warning">Sind Sie sicher, dass Sie alle individuellen Einstellungen für Gruppen und Konten zurücksetzen wollen?</string>
   <string name="events_first_only">Alarmieren bei der ersten Nachricht\nBenachrichtigung nur bei der ersten Nachricht in einem Chat</string>
-  <string name="events_ignore_system_vibro">System-Vibrationseinstellungen ignorieren\nDiese Option verwenden, falls die Vibration nicht funktioniert</string>
-  <string name="events_message">Benachrichtigungeinstellungen\nBenachrichtigungen für eingehenden Nachricht konfigurieren</string>
-  <string name="events_message_chat">Nur Gespräche</string>
-  <string name="events_message_chat_and_muc">Gespräche und Konferenzen</string>
-  <string name="events_message_none">Nicht benachrichtigen</string>
-  <string name="events_show_text">Nachrichten Vorschau\nZeige Nachrichten aus Chats in der Benachrichtungsleiste</string>
+    <string name="events_show_text">Nachrichten Vorschau\nZeige Nachrichten aus Chats in der Benachrichtungsleiste</string>
   <string name="events_show_text_muc">Nachrichten Vorschau\nZeige Nachrichten aus Konferenzen in Benachrichtungsleiste</string>
-  <string name="events_visible_chat">Benachrichtigung bei offenem Chat\nBenachrichtigung bei eingehender Nachricht im offenen Chat</string>
-  <string name="events_suppress_100">Statusmeldungen unterdrücken\nMeldung \'Dieser Raum ist nicht anonym\' ausschalten</string>
+    <string name="events_suppress_100">Statusmeldungen unterdrücken\nMeldung \'Dieser Raum ist nicht anonym\' ausschalten</string>
   <string name="negative_priotiry_summary">%s (Sie werden aus keinem Chat Nachrichten erhalten)</string>
   <string name="preference_accounts">XMPP-Konten\nKonten verwalten</string>
   <string name="preference_security">Sicherheit\nSicherheitseinstellungen</string>
   <string name="security_check_certificate">Server Zertifikat überprüfen\nBenachrichten, wenn Zertifikatsprobleme bei verschlüsselten Verbindungen auftreten</string>
-  <string name="security_clear_certificate">Zertifikate entfernen\nListe der ignorierten Zertifikate leeren</string>
-  <string name="security_otr_history">Verlauf speichern\nDen Chatverlauf bei OTR-Sitzungen speichern</string>
-  <string name="security_otr_mode">OTR Modus</string>
+    <string name="security_otr_mode">OTR Modus</string>
   <string name="chats_attention">Aufmerksamkeit\nAuf eingehende Aufmerksamkeitsanforderungen reagieren</string>
   <string name="chats_attention_sound">Aufmerksamkeitston\nAuswahl des Klingeltons</string>
   <string name="connection_load_vcard">Lade vCard\nLaden und Aktualisieren von Kontaktdaten und Avataren. Deaktivieren, um Netzwerkverkehr zu reduzieren.</string>
   <string name="connection_load_images">Bilder laden\nBilder von der Datei URL automatisch herunterladen. Deaktivieren um Netzwerkverkehr zu reduzieren.</string>
   <string name="connection_use_carbons">Carbon copy Mode\nMöglicherweise instabil! Wird Sitzungen für dasselbe Konto auf diesem Client teilen. Deaktivieren, um die Netzwerkverkehr zu reduzieren.</string>
-  <string name="connection_dns_resolver_type">DNS-Resolver Typ</string>
-  <string name="connection_dns_resolver_type_dns_java_resolver">DNSJavaResolver</string>
+    <string name="connection_dns_resolver_type_dns_java_resolver">DNSJavaResolver</string>
   <string name="connection_dns_resolver_type_mini_dns_resolver">MiniDNSResolver (experimentell)</string>
-  <string name="connection_use_plain_text_auth">Klartext Authentifizierung. Nur-Text-Authentifizierung für alle Konten. Nicht zu empfehlen.</string>
-  <string name="events_phrases">Schlüsselbegriffe\nBenachrichtigung wenn Nachrichten voreingestellte Begriffe enthalten und auswahl des dazugehörigen Klanges</string>
-  <string name="security_clear_certificate_warning">Wollen Sie wirklich alle ignorierten Zertifikate entfernen?</string>
-  <string name="account_error_settings">Einstellungen</string>
-  <string name="category_xabber_account">Xabber Konto</string>
-  <string name="category_xmpp_accounts">XMPP Konto</string>
-  <string name="category_interface">Benutzeroberfläche</string>
+    <string name="events_phrases">Schlüsselbegriffe\nBenachrichtigung wenn Nachrichten voreingestellte Begriffe enthalten und auswahl des dazugehörigen Klanges</string>
+    <string name="account_error_settings">Einstellungen</string>
+    <string name="category_interface">Benutzeroberfläche</string>
   <string name="category_settings">Einstellungen</string>
   <string name="category_about">Über</string>
   <string name="category_appearance">Aussehen</string>
diff --git a/xabber/src/main/res/values-de-rDE/words.xml b/xabber/src/main/res/values-de-rDE/words.xml
index cef6f33da8..839d0868c7 100644
--- a/xabber/src/main/res/values-de-rDE/words.xml
+++ b/xabber/src/main/res/values-de-rDE/words.xml
@@ -20,5 +20,4 @@
   <string name="settings">Einstellungen</string>
   <string name="ok">OK</string>
   <string name="login">Login</string>
-  <string name="resume">Fortsetzen</string>
 </resources>
diff --git a/xabber/src/main/res/values-el-rGR/account_editor.xml b/xabber/src/main/res/values-el-rGR/account_editor.xml
index cc6cf2739c..2ceeb64198 100644
--- a/xabber/src/main/res/values-el-rGR/account_editor.xml
+++ b/xabber/src/main/res/values-el-rGR/account_editor.xml
@@ -2,40 +2,25 @@
 <!--Generated by crowdin.com-->
 <resources>
   <string name="account_compression">Χρησιμοποίησε συμπίεση</string>
-  <string name="account_enabled">Ενεργό</string>
-  <string name="account_host">Διακομιστής</string>
+    <string name="account_host">Διακομιστής</string>
   <string name="account_password">Κωδικός</string>
   <string name="confirm_password">Επιβεβαίωσε κωδικό</string>
   <string name="account_port">Θύρα</string>
   <string name="account_priority">Προτεραιότητα</string>
   <string name="account_resource">Πόρος</string>
   <string name="account_server_name">Εξυπηρετητής</string>
-  <string name="account_type">Τύπος λογαριασμού</string>
-  <string name="account_type_hints_gtalk">όνομα χρήστη για gmail.com ή τομέα Google Apps</string>
-  <string name="account_type_helps_gtalk">Αν δεν έχετε λογαριασμό Google μπορείτε να δημιουργήσετε έναν στο http://mail.google.com \nΕπίσης μπορείτε να χρησιμοποιήσετε your_user_name@your_google_domain</string>
-  <string name="account_xmpp_register_warning">Πρέπει να<a href="http://www.google.com/#q=register an XMPP account">καταχωρήσετε έναν λογαριασμό XMPP</a> πριν τον προσθέσετε στο Xabber!</string>
-  <string name="account_type_helps_xmpp">Αν θέλετε να μάθετε περισσότερα για το XMPP (Jabber) εδώ: https://xmpp.org</string>
-  <string name="account_user_name">Όνομα χρήστη</string>
+    <string name="account_xmpp_register_warning">Πρέπει να<a href="http://www.google.com/#q=register an XMPP account">καταχωρήσετε έναν λογαριασμό XMPP</a> πριν τον προσθέσετε στο Xabber!</string>
+    <string name="account_user_name">Όνομα χρήστη</string>
   <string name="EMPTY_SERVER_NAME">Το όνομα του εξυπηρετητή δεν έχει καθοριστεί</string>
   <string name="EMPTY_USER_NAME">Το όνομα χρήστη δεν έχει καθοριστεί</string>
   <string name="CONFIRM_PASSWORD">Οι κωδικοί πρόσβασης δεν ταιριάζουν</string>
-  <string name="account_archive_mode">Αποθηκεύσετε το ιστορικό μηνυμάτων</string>
-  <string name="account_archive_mode_available">Στο διακομιστή εάν είναι διαθέσιμο</string>
-  <string name="account_archive_mode_dont_store">Μην αποθηκεύετε</string>
-  <string name="account_archive_mode_local">Τοπικά στη συσκευή</string>
-  <string name="account_archive_mode_server">Στο διακομιστή</string>
-  <string name="account_archive_mode_unread">Τοπικά μόνο μη απεσταλμένα και μη αναγνωσμένα</string>
-  <string name="account_compression_summary">Μαρκάρετε για να ενεργοποιήσετε τη συμπίεση δεδομένων</string>
+    <string name="account_compression_summary">Μαρκάρετε για να ενεργοποιήσετε τη συμπίεση δεδομένων</string>
   <string name="account_custom">Προσαρμοσμένος διακομιστής</string>
   <string name="account_custom_summary">Χρησιμοποιήστε τις προσαρμοσμένες ρυθμίσεις διακομιστή αντί για της εγγραφής SRV</string>
-  <string name="account_enabled_summary">Διακόπτης για να ενεργοποιήσετε τον λογαριασμού</string>
-  <string name="account_invalid_port">Η θύρα πρέπει να είναι ένας αριθμός (προεπιλογή: 5222)</string>
+    <string name="account_invalid_port">Η θύρα πρέπει να είναι ένας αριθμός (προεπιλογή: 5222)</string>
   <string name="account_invalid_port_range">Η θύρα πρέπει να είναι μεταξύ 1 και 65535 (προεπιλογή: 5222)</string>
   <string name="account_invalid_priority">Τιμή προτεραιότητας πρέπει να είναι ένας αριθμός μεταξύ -128 και 127 (προεπιλογή: 0)</string>
-  <string name="account_oauth">Εξουσιοδότηση</string>
-  <string name="account_oauth_invalidated">Μη εξουσιοδοτημένο</string>
-  <string name="account_oauth_summary">Ρυθμίσεις OAuth</string>
-  <string name="account_proxy_host">Διακομιστής μεσολάβησης</string>
+    <string name="account_proxy_host">Διακομιστής μεσολάβησης</string>
   <string name="account_proxy_invalid_port_range">Η θύρα διακομιστή μεσολάβησης πρέπει να είναι μεταξύ 1 και 65535 (προεπιλογή: 8080)</string>
   <string name="account_proxy_invalid_port">Η θύρα διακομιστή μεσολάβησης πρέπει να είναι ένας αριθμός (προεπιλογή: 8080)</string>
   <string name="account_proxy_password">Κωδικός πρόσβασης διακομιστή μεσολάβησης</string>
@@ -47,18 +32,14 @@
   <string name="account_sasl_summary">Απενεργοποίησε για πολύ παλιό διακομιστή</string>
   <string name="account_store_password">Αποθήκευση κωδικού πρόσβασης</string>
   <string name="account_store_password_summary">Απενεργοποιήστε αυτήν την επιλογή για αίτημα κωδικού πρόσβασης κάθε φορά που πηγαίνετε σε απευθείας σύνδεση</string>
-  <string name="account_syncable">Ενσωμάτωση σε επαφές συστήματος</string>
-  <string name="account_syncable_summary">Εμφανισε τις επαφές από αυτόν το λογαριασμό στη λίστα επαφών του τηλεφώνου</string>
-  <string name="account_tls_enable">Ενεργοποιήστε το TLS</string>
+    <string name="account_tls_enable">Ενεργοποιήστε το TLS</string>
   <string name="account_tls_enable_summary">Χρησιμοποίησε κρυπτογράφηση TLS όταν είναι δυνατό για να συνδεθείτε με διακομιστή</string>
   <string name="account_tls_legacy">Παλαιού τύπου SSL</string>
   <string name="account_tls_legacy_summary">Χρησιμοποίησε κρυπτογράφηση SSL όταν γίνεται η σύνδεση στον εξυπηρετητή</string>
   <string name="account_tls_mode">Χρήση TLS/SSL</string>
   <string name="account_tls_require">Απαίτησε TLS</string>
   <string name="account_tls_require_summary">Απαίτησε κρυπτογράφηση TLS όταν γίνεται η σύνδεση στον διακομιστή</string>
-  <string name="account_use_orbot">Συνομιλήστε μέσω δικτύου ανωνυμίας TOR και απαιτήστε κρυπτογράφηση πρωτοκόλου TLS \nΔεν ενδείκνυται για το Google Talk</string>
-  <string name="confirm_cancellation">Θέλετε σίγουρα να αγνοήσετε τις αλλαγές;</string>
-  <string name="INCORRECT_USER_NAME">Λανθασμένο όνομα χρήστη. Ελέγξτε το κείμενο βοήθειας παρακάτω για λεπτομέρειες.</string>
+    <string name="INCORRECT_USER_NAME">Λανθασμένο όνομα χρήστη. Ελέγξτε το κείμενο βοήθειας παρακάτω για λεπτομέρειες.</string>
   <string name="orbot_required_message">Προκειμένου να γίνει επεξεργασία με χρήση TOR πρέπει να έχετε εγκαταστημένο και ενεργοποιημένο το Orbot ώστε να γίνεται κυκλοφορία στον μεσολαβητή μέσω αυτού. Θα θέλατε να το εγκαταστήσετε από το Google Play;</string>
   <string name="orbot_required_title">Εγκατάσταση Orbot;</string>
   <string name="install_orbot">Εγκατέστησε το Orbot</string>
diff --git a/xabber/src/main/res/values-el-rGR/chat_viewer.xml b/xabber/src/main/res/values-el-rGR/chat_viewer.xml
index 531ec81090..af0af745aa 100644
--- a/xabber/src/main/res/values-el-rGR/chat_viewer.xml
+++ b/xabber/src/main/res/values-el-rGR/chat_viewer.xml
@@ -21,11 +21,8 @@
   <string name="message_remove">Αφαίρεσε από το ιστορικό</string>
   <string name="message_repeat">Επανάληψη αποστολής</string>
   <string name="message_otr_show_original">Εμφάνισε μήνυμα</string>
-  <string name="message_open_file">Άνοιγμα</string>
-  <string name="message_save_file">Αποθήκευση</string>
-  <string name="save_history">Αποθηκεύση του ιστορικού τοπικά\nΑποθήκευση ιστορικού μηνυμάτων τοπικά</string>
-  <string name="show_history">Εμφάνιση ιστορικού</string>
-  <string name="action_attention_called">Εστάλη κλήση για προσοχή</string>
+    <string name="save_history">Αποθηκεύση του ιστορικού τοπικά\nΑποθήκευση ιστορικού μηνυμάτων τοπικά</string>
+    <string name="action_attention_called">Εστάλη κλήση για προσοχή</string>
   <string name="action_attention_requested">Ζητήθηκε η προσοχή</string>
   <string name="action_ban">O/H %1$s κλωτσήθηκε</string>
   <string name="action_ban_by">O/H %1$s κλωτσήθηκε από %2$s</string>
@@ -73,8 +70,7 @@
   <string name="otr_refresh">Επανεκκίνηση κρυπτογράφησης</string>
   <string name="otr_request">Έχει ζητηθεί ιδιωτική συνομιλία εκτός καταγραφής αλλά δεν έχετε υποστηριζόμενο plugin. Χρησιμοποιήστε το Pidgin, Gajim ή Adium για PC/Mac και Xabber, Conversations ή ChatSecure για το Android. Πηγαίνετε στο http://otr.cypherpunks.ca/ για περισσότερες πληροφορίες.</string>
   <string name="otr_start">Έναρξη κρυπτογράφησης</string>
-  <string name="otr_unencrypted_message">Αυτό το μήνυμα δεν έχει κρυπτογραφηθεί</string>
-  <string name="otr_unreadable_message">Το κρυπτογραφημένο μήνυμα που στείλατε δεν είναι αναγνώσιμο</string>
+    <string name="otr_unreadable_message">Το κρυπτογραφημένο μήνυμα που στείλατε δεν είναι αναγνώσιμο</string>
   <string name="otr_not_decrypted_message">Το μήνυμα δε μπορεί να αποκρυπτογραφηθεί</string>
   <string name="otr_verification">Επαλήθευση OTR</string>
   <string name="otr_verify_fingerprint">Επαλήθευση με δακτυλικό αποτύπωμα</string>
@@ -87,21 +83,13 @@
   <string name="otr_verification_progress_title">Επαλήθευση OTR σε εξέλιξη</string>
   <string name="otr_verification_notify_button">ΑΝΟΙΓΜΑ</string>
   <string name="otr_verification_notify_button_cancel">ΑΚΥΡΩΣΗ</string>
-  <string name="under_construction">Υπό κατασκευή</string>
-  <string name="under_construction_message">Αυτή η οθόνη είναι υπό κατασκευή</string>
-  <string name="chat_events_show_text_global">Χρησιμοποίησε καθολικές ρυθμίσεις</string>
+    <string name="chat_events_show_text_global">Χρησιμοποίησε καθολικές ρυθμίσεις</string>
   <string name="chat_events_show_text_always">Εμφάνισε κείμενο μηνύματος</string>
   <string name="chat_events_show_text_never">Απέκρυψε κείμενο μηνύματος</string>
-  <string name="sending_file">Αποστολή αρχείου %s</string>
-  <string name="error_sending_file">Σφάλμα αποστολής του αρχείου %s</string>
-  <string name="no_application_to_open_file">Δεν βρέθηκε εφαρμογή για το άνοιγμα αυτού του αρχείου</string>
-  <string name="could_not_save_file">Δεν μπόρεσε να γίνει αποθήκευση του αρχείου</string>
-  <string name="file_saved_successfully">Το αρχείο αποθηκεύτηκε επιτυχώς</string>
-  <string name="received_by">Ελήφθη %s</string>
-  <string name="could_not_get_path_to_file">Δε βρέθηκε η διαδρομή στο αρχείο</string>
+    <string name="error_sending_file">Σφάλμα αποστολής του αρχείου %s</string>
+    <string name="could_not_get_path_to_file">Δε βρέθηκε η διαδρομή στο αρχείο</string>
   <string name="message_open_private_chat">Άνοιγμα ιδιωτικής συνομιλίας</string>
-  <string name="http_file_upload_slot_error">Δε μπόρεσε να γίνει η μεταφόρτωση του αρχείου. Πολύ μεγάλο;</string>
-  <string name="no_permission_to_read_files">Δεν υπάρχει άδεια για την ανάγνωση αρχείων</string>
+    <string name="no_permission_to_read_files">Δεν υπάρχει άδεια για την ανάγνωση αρχείων</string>
   <string name="no_permission_to_write_files">Δεν υπάρχει άδεια για την εγγραφή αρχείων</string>
   <string name="error_description_title">Περιγραφή σφάλματος:</string>
   <string name="message_status_sent">Απεσταλμένα</string>
diff --git a/xabber/src/main/res/values-el-rGR/contact_editor.xml b/xabber/src/main/res/values-el-rGR/contact_editor.xml
index 534913f653..68d4a28f61 100644
--- a/xabber/src/main/res/values-el-rGR/contact_editor.xml
+++ b/xabber/src/main/res/values-el-rGR/contact_editor.xml
@@ -17,12 +17,8 @@
   <string name="processing_image">Επεξεργασία εικόνας...</string>
   <string name="error_during_crop">Σφάλμα κατά την περικοπή εικόνας</string>
   <string name="error_during_image_processing">Σφάλμα κατά την επεξεργασία εικόνας</string>
-  <string name="account_settings">Ρυθμίσεις λογαριασμού</string>
-  <string name="account_user_info">Πληροφορίες λογαριασμού</string>
-  <string name="account_server_info">Πληροφορίες διακομιστή</string>
+    <string name="account_server_info">Πληροφορίες διακομιστή</string>
   <string name="account_server_info_description">Λίστα των δυνατοτήτων του διακομιστή</string>
   <string name="conference_private_chat_invitation">%1$s από %2$s θέλουν να ξεκινήσουν ιδιωτική συνομιλία μαζί σας</string>
   <string name="accept_muc_private_chat">Αποδοχή</string>
-  <string name="block_muc_private_chat">Αποκλεισμός</string>
-  <string name="no_permission_camera">Καμία άδεια για πρόσβαση της κάμερας</string>
 </resources>
diff --git a/xabber/src/main/res/values-el-rGR/contact_list.xml b/xabber/src/main/res/values-el-rGR/contact_list.xml
index b28ae70755..00ef499f4d 100644
--- a/xabber/src/main/res/values-el-rGR/contact_list.xml
+++ b/xabber/src/main/res/values-el-rGR/contact_list.xml
@@ -18,17 +18,13 @@
   <string name="application_state_roster">Συνδέθηκε.</string>
   <string name="application_state_starting">Εκκίνηση εφαρμογής&#8230;</string>
   <string name="application_state_waiting">Αναμονή για σύνδεση&#8230;</string>
-  <string name="chat_list">Λίστα συνομιλίας</string>
-  <string name="chat_list_is_empty">Καμία ενεργή συνομιλία</string>
-  <string name="chat_viewer">Συνομιλία</string>
-  <string name="close_chat">Κλείσιμο συνομιλίας</string>
-  <string name="CONNECTION_FAILED">Σφάλμα σύνδεσης</string>
+    <string name="chat_viewer">Συνομιλία</string>
+    <string name="CONNECTION_FAILED">Σφάλμα σύνδεσης</string>
   <string name="contact_add">Προσθήκη επαφής</string>
   <string name="contact_delete">Διαγραφή</string>
   <string name="contact_block">Αποκλεισμός επαφής</string>
   <string name="contact_delete_confirm">Θέλετε πραγματικά να διαγράψετε την επαφή %1$s από το λογαριασμό %2$s;</string>
-  <string name="contact_list">Λίστα επαφών</string>
-  <string name="discard_subscription">Άρνηση επαφής</string>
+    <string name="discard_subscription">Άρνηση επαφής</string>
   <string name="exit">Έξοδος</string>
   <string name="group_active_chat">Ενεργές συζητήσεις</string>
   <string name="group_none">Καμία ομάδα</string>
@@ -40,15 +36,7 @@
   <string name="request_subscription">Αίτηση συνδρομής</string>
   <string name="XMPP_EXCEPTION">Σφάλμα ροής</string>
   <string name="application_state_closing">Αποθήκευση αλλαγών&#8230;\nΗ εφαρμογή θα κλείσει σύντομα.</string>
-  <string name="certificate_confirmation">%1$s.\nΕμπιστεύεστε απόλυτα ένα πιστοποιητικό με δακτυλικό αποτύπωμα sha1: %2$s; Θέλετε να ειδοποιείστε σχετικά με αυτό το ζήτημα με αυτό το πιστοποιητικό;</string>
-  <string name="certificate_details">\n\nΕκδόθηκε για:\nCommon Name (CN): %1$s\nOrganization (O): %2$s\nOrganizational Unit (OU): %3$s\nSerial Number: %4$s\n\nIssued by:\nCommon Name (CN): %5$s\nOrganization (O): %6$s\nOrganizational Unit (OU): %7$s\n\nValidity:\nIssued on: %8$s\nExpires on: %9$s.</string>
-  <string name="certificate_invalid_chane">Η αλυσίδα επαλήθευση της υπογραφής απέτυχε</string>
-  <string name="certificate_invalid_target">Η επαλήθευση του στόχου απέτυχε</string>
-  <string name="certificate_self_signed">Αυτο-υπογεγραμμένο πιστοποιητικό</string>
-  <string name="certificate_show_details">Λεπτομέρειες&#8230;</string>
-  <string name="close_chats">Κλείσιμο όλων των συνομιλιών</string>
-  <string name="contact_integration_suggest">Θέλετε το Xabber να ενσωματωθεί στο σύστημα επαφών σας; \nΑυτό μπορεί να αλλάξει από «Ρυθμίσεις» → «Λογαριασμοί XMPP» → Ο λογαριασμός σας → «Ενσωμάτωση επαφών». \nNB: Η λίστα επαφών του συστήματος μπορεί να πάει λίγο πιο αργά για λίγα λεπτά.</string>
-  <string name="group_room">Συνδιασκέψεις</string>
+    <string name="group_room">Συνδιασκέψεις</string>
   <string name="OTR_ERROR">Σφάλμα OTR</string>
   <string name="select_contact">Παρακαλώ κάντε κλικ για να επιλέξετε την επαφή</string>
   <string name="show_offline_always">Εμφάνιση πάντα</string>
@@ -63,8 +51,7 @@
   <string name="block_list">Λίστα αποκλεισμένων</string>
   <string name="contact_blocked_successfully">Η επαφή αποκλείστηκε επιτυχώς</string>
   <string name="error_blocking_contact">Σφάλμα αποκλεισμού επαφής</string>
-  <string name="unblock_contact">Κατάργηση αποκλεισμού επαφής</string>
-  <string name="contacts_unblocked_successfully">Οι επαφές ξεμπλοκαρίστηκαν επιτυχώς</string>
+    <string name="contacts_unblocked_successfully">Οι επαφές ξεμπλοκαρίστηκαν επιτυχώς</string>
   <string name="error_unblocking_contacts">Σφάλμα ξεμπλοκαρίσματος επαφών</string>
   <string name="block_contact_confirm">Θέλετε πραγματικά να αποκλείσετε την επαφή %1$s από το λογαριασμό %2$s;</string>
   <string name="unblock_all_contacts_confirm">Θέλετε πραγματικά να ξεμπλοκάρετε όλες τις επαφές από το λογαριασμό %1$s;</string>
@@ -76,19 +63,10 @@
   <string name="dark_theme_suggest_dialog_stay_on_light_side">Μείνετε στη Σκοτεινή Πλευρά</string>
   <string name="battery_optimization_disable_dialog_title">Βελτιστοποίηση μπαταρίας</string>
   <string name="battery_optimization_disable_dialog_message">Η συσκευή σας κάνει κάποιες βαριές βελτιστοποιήσεις στη μπαταρία για το Xabber οι οποίες μπορεί να οδηγήσουν σε καθυστερημένες ειδοποιήσεις ή ακόμη και σε απώλεια μηνυμάτωνs.\n\nΘα σας ζητηθεί τώρα να τις απενεργοποιήσετε.</string>
-  <string name="save_log_to_file">Αποθήκευση σε αρχείο</string>
-  <string name="clear_log">Διέγραψε τα παλιά αρχεία καταγραφής</string>
+    <string name="clear_log">Διέγραψε τα παλιά αρχεία καταγραφής</string>
   <string name="open_log_file">Άνοιγμα</string>
   <string name="send_log_file">Αποστολή</string>
-  <string name="intro_welcome">Καλώς ήλθατε στο Xabber</string>
-  <string name="intro_xabber_description">Πρόγραμμα πελάτη ανοικτού κώδικα XMPP για το Android</string>
-  <string name="intro_have_account">Σύνδεση λογαριασμού XMPP</string>
-  <string name="intro_register_account">Κατοχύρωσε λογαριασμό XMPP</string>
-  <string name="intro_create_xabber_account">Χρησιμοποίησε λογαριασμό Xabber</string>
-  <string name="intro_use_third_party_accounts">χρησιμοποίησε λογαριασμό XMPP λογαριασμούς τρίτων</string>
-  <string name="intro_faq">Αν δεν έχετε λογαριασμό XMPP, παρακαλώ <a href="https://www.xabber.com/faq/">διαβάστε τις συχνές ερωτήσεις</a> για το πως να αποκτήσετε.</string>
-  <string name="intro_web_search_register_xmpp">Κατοχύρωσε λογαριασμό XMPP</string>
-  <string name="synchronize_bookmarks">Συγχρόνισε σελιδοδείκτες</string>
+    <string name="synchronize_bookmarks">Συγχρόνισε σελιδοδείκτες</string>
   <string name="remove_all_bookmarks">Αφαίρεση όλων</string>
   <string name="remove_selected_bookmarks">Αφαίρεσε τα επιλεγμένα</string>
   <string name="remove_all_bookmarks_confirm">Θέλετε πραγματικά να αφαιρέσετε όλους τους σελιδοδείκτες από το λογαριασμό %1$s;</string>
diff --git a/xabber/src/main/res/values-el-rGR/contact_viewer.xml b/xabber/src/main/res/values-el-rGR/contact_viewer.xml
index 47988e0928..b68f73b47a 100644
--- a/xabber/src/main/res/values-el-rGR/contact_viewer.xml
+++ b/xabber/src/main/res/values-el-rGR/contact_viewer.xml
@@ -17,12 +17,9 @@
   <string name="vcard_organization_unit">Οργανική μονάδα</string>
   <string name="vcard_title">Τίτλος εργασίας, θέση</string>
   <string name="vcard_role">Ρόλος</string>
-  <string name="vcard_other">Άλλες πληροφορίες</string>
-  <string name="vcard_categories">Κατηγορίες</string>
-  <string name="vcard_decsription">Περιγραφή</string>
+    <string name="vcard_decsription">Περιγραφή</string>
   <string name="vcard_note">Σημειώσεις</string>
-  <string name="vcard_address">Διεύθυνση</string>
-  <string name="vcard_address_pobox">Ταχυδρομική θυρίδα</string>
+    <string name="vcard_address_pobox">Ταχυδρομική θυρίδα</string>
   <string name="vcard_address_extadr">Εκτεταμένη διεύθυνση</string>
   <string name="vcard_address_street">Οδός</string>
   <string name="vcard_address_locality">Τοποθεσία</string>
diff --git a/xabber/src/main/res/values-el-rGR/muc_editor.xml b/xabber/src/main/res/values-el-rGR/muc_editor.xml
index b4b1881635..be63720423 100644
--- a/xabber/src/main/res/values-el-rGR/muc_editor.xml
+++ b/xabber/src/main/res/values-el-rGR/muc_editor.xml
@@ -20,12 +20,10 @@
   <string name="muc_invite_confirm">Ο/Η %2$s σας προσκαλεί να συμμετάσχετε στη συνδιάσκεψη %3$s. Συμμετοχή από το λογαριασμό %1$s;</string>
   <string name="muc_invite_confirm_reason">Ο/Η %2$s σας προσκαλεί να συμμετάσχετε στη συνδιάσκεψη %3$s: %4$s. Συμμετοχή από το λογαριασμό %1$s;</string>
   <string name="muc_leave">Αποχώρηση από τη συνδιάσκεψη</string>
-  <string name="muc_save">Αποθήκευση συνδιάσκεψης</string>
-  <string name="muc_choose_conference">Επιλέξτε συνδιάσκεψη</string>
+    <string name="muc_choose_conference">Επιλέξτε συνδιάσκεψη</string>
   <string name="muc_next">Επόμενο</string>
   <string name="muc_get_hosted_conferences">Λήψη φιλοξενούμενων συνδιασκέψεων</string>
   <string name="muc_error_getting_conferences">Σφάλμα κατά τη λήψη των συνδιασκέψεων</string>
   <string name="muc_type_conference_name">Πληκτρολογήστε το όνομα της συνδιάσκεψης</string>
-  <string name="contact_is_blocked">Η επαφή είναι αποκλεισμένη!</string>
-  <string name="conference_invitation">Πρόσκληση σε συνδιάσκεψη</string>
+    <string name="conference_invitation">Πρόσκληση σε συνδιάσκεψη</string>
 </resources>
diff --git a/xabber/src/main/res/values-el-rGR/notification_bar.xml b/xabber/src/main/res/values-el-rGR/notification_bar.xml
index 6260b54272..ffb54fe1c6 100644
--- a/xabber/src/main/res/values-el-rGR/notification_bar.xml
+++ b/xabber/src/main/res/values-el-rGR/notification_bar.xml
@@ -34,10 +34,7 @@
   <!-- Used for plural form in russian. -->
   <string name="connection_state_waiting_5">-</string>
   <string name="connection_state_offline">%1$d %2$s εκτός σύνδεσης</string>
-  <string name="archive_available_request_message">Θέλετε να αποθηκεύσετε το ιστορικό μηνυμάτων στο διακομιστή; \nΕπιτρέπει στο Xabber να φορτώσει ιστορικό μηνυμάτων από όλες τις συσκευές που χρησιμοποιούν αυτό το λογαριασμό. \nΑυτό θα προσθέσει κάποια επιπλέον κίνηση και θα μειώσει ελαφρώς την ταχύτητα σύνδεσης. \nΠΡΟΕΙΔΟΠΟΙΗΣΗ: Όλο το τοπικό ιστορικό θα αφαιρεθεί.</string>
-  <string name="archive_available_request_title">Ενεργοποίηση αρχειοθέτησης μηνύματος;</string>
-  <string name="INVALID_CERTIFICATE">Μη έγκυρο πιστοποιητικό</string>
-  <string name="muc_invite_message">Θέλετε να εισαγάγετε στη διάσκεψη;</string>
+    <string name="muc_invite_message">Θέλετε να εισαγάγετε στη διάσκεψη;</string>
   <string name="otr_verification_in_progress">Κάντε κλικ εδώ για την ματαίωση.</string>
   <string name="PASSWORD_REQUIRED">Απαιτείται κωδικός</string>
   <string name="pay_attention">Δώστε προσοχή</string>
diff --git a/xabber/src/main/res/values-el-rGR/preference_editor.xml b/xabber/src/main/res/values-el-rGR/preference_editor.xml
index 7f11f35d32..253972fe1c 100644
--- a/xabber/src/main/res/values-el-rGR/preference_editor.xml
+++ b/xabber/src/main/res/values-el-rGR/preference_editor.xml
@@ -12,14 +12,11 @@
   <string name="contacts_order_alphabet">Αλφαβητικά</string>
   <string name="contacts_order_status">Κατά κατάσταση</string>
   <string name="contacts_show_accounts">Ομαδοποίηση κατά λογαριασμό\nΟμαδοποίηση επαφών στη λίστα επαφών κατά λογαριασμό</string>
-  <string name="contacts_show_active_chats">Ενεργές συνομιλίες στην κορυφή\nΕμφάνισε τις ενεργές συνομιλίες στην κορυφή της λίστας επαφών</string>
-  <string name="contacts_show_avatars">Προβολή εικόνων επαφών\nΕμφάνισε τις εικόνες των χρηστών στη λίστα επαφών</string>
+    <string name="contacts_show_avatars">Προβολή εικόνων επαφών\nΕμφάνισε τις εικόνες των χρηστών στη λίστα επαφών</string>
   <string name="contacts_show_empty_groups">Δείξε τις άδεις ομάδες\nΔείξε τις ομάδες που δεν έχουν επαφές</string>
   <string name="contacts_show_groups">Δείξε τις ομάδες\nΔείξε τις ομάδες στη λίστα επαφών</string>
   <string name="contacts_show_offline">Δείξε της επαφές εκτός σύνδεσης</string>
-  <string name="contacts_show_panel">Δείξε τον πίνακα λογαριασμών\nΔείξε τα κουμπιά ενεργειών με τις εικόνεςχρηστών στην κάτω δεξιά γωνία στη λίστα επαφών</string>
-  <string name="contacts_stay_active_chats">Διπλές ενεργές συνομιλίες\nΟι ενεργές συνομιλίες εμφανίζονται στην κορυφή της λίστας επαφών και σε όλες τις ομάδες</string>
-  <string name="debug_log">Καταγραφικό αποσφαλμάτωσης\nΕγγραφή μηνυμάτων στο καταγραφικό απεσφαλμάτωσης (παρακαλώ επανεκκινήστε την εφαρμογή για να εφαρμοστούν οι αλλαγές)</string>
+    <string name="debug_log">Καταγραφικό αποσφαλμάτωσης\nΕγγραφή μηνυμάτων στο καταγραφικό απεσφαλμάτωσης (παρακαλώ επανεκκινήστε την εφαρμογή για να εφαρμοστούν οι αλλαγές)</string>
   <string name="debug_file_log_title">Γράψε το αρχείο καταγραφής\nΓράψε το αρχείο καταγραφής αποσφαλμάτωσης (μπορείς να το μοιραστείς).</string>
   <string name="debug_log_files_title">Αρχεία καταγραφής\nΛίστα εγγραμμένων αρχείων καταγραφής.</string>
   <string name="debug_log_files_activity_title">Αρχεία καταγραφής</string>
@@ -36,8 +33,7 @@
   <string name="interface_theme">Θέμα</string>
   <string name="interface_theme_dark">Σκοτεινό</string>
   <string name="interface_theme_light">Φωτεινό</string>
-  <string name="interface_theme_normal">Προεπιλεγμένο</string>
-  <string name="interface_smiles">Emoticons</string>
+    <string name="interface_smiles">Emoticons</string>
   <string name="interface_smiles_android">Emoticons του Android</string>
   <string name="interface_smiles_none">Μη γραφικά emoticons</string>
   <string name="preference_connection">Ρυθμίσεις σύνδεσης\nΡυθμίσεις σύνδεσης</string>
@@ -62,8 +58,7 @@
   <string name="chats_font_size_xlarge">Πολύ μεγάλο</string>
   <string name="chats_hide_keyboard">Απόκρυψη πληκτρολογίου</string>
   <string name="chats_hide_keyboard_landscape">Σε λειτουργία τοπίου</string>
-  <string name="chats_receipt">Αναφορά παράδοσης μηνύματος\nΑναφορά παράδοσης και παραλαβής μηνύματος</string>
-  <string name="chats_show_avatars">Εικόνες χρηστών στα μηνύματα\nΕμφάνιση εικόνων χρηστών σε κάθε μήνυμα</string>
+    <string name="chats_show_avatars">Εικόνες χρηστών στα μηνύματα\nΕμφάνιση εικόνων χρηστών σε κάθε μήνυμα</string>
   <string name="chats_show_status_change">Εμφάνιση αλλαγών κατάστασης</string>
   <string name="chats_show_status_change_muc">Σε συνδιασκέψεις</string>
   <string name="chats_state_notification">Αποστολή ειδοποιήσεων κατά την πληκτρολόγηση\nΕιδοποίηση του άλλου χρήστη πως πληκτρολογείτε</string>
@@ -77,37 +72,24 @@
   <string name="contacts_reset_offline">Επαναφορά ρυθμίσεων χωρίς σύνδεση\nΚαθαρισμός μεμονωμένων ρυθμίσεων για ομάδες και λογαριασμούς</string>
   <string name="contacts_reset_offline_warning">Θέλετε σίγουρα να καθαρίσετε μεμονωμένες ρυθμίσεις για ομάδες και λογαριασμούς;</string>
   <string name="events_first_only">Προειδοποίηση στο πρώτο μήνυμα\nΕιδοποίηση μόνο στο πρώτο μήνυμα σε μια συνομιλία</string>
-  <string name="events_ignore_system_vibro">Αγνόησε τη ρύθμιση συστήματος για τη δόνηση\nΧρησιμοποίησε αυτή την επιλογή εάν η ρύθμιση συστήματος δε λειτουργεί</string>
-  <string name="events_message">Ρυθμίσεις ειδοποίησης\nΡύμιση ειδοποιήσεων εισερχόμενων μηνυμάτων</string>
-  <string name="events_message_chat">Μόνο συνομιλίες</string>
-  <string name="events_message_chat_and_muc">Συνομιλίες και συζητήσεις</string>
-  <string name="events_message_none">Μην ειδοποιήσεις</string>
-  <string name="events_show_text">Προεπισκόπηση μηνύματος\nΕμφάνισε κείμενο μηνύματος στην περιοχή ειδοποίησης</string>
+    <string name="events_show_text">Προεπισκόπηση μηνύματος\nΕμφάνισε κείμενο μηνύματος στην περιοχή ειδοποίησης</string>
   <string name="events_show_text_muc">Προεπισκόπηση μηνύματος\nΕμφάνισε κείμενο μηνύματος από συνεδρία στην περιοχή ειδοποίησης</string>
-  <string name="events_visible_chat">Ειδοποίησε στη τρέχουσα συνομιλία\nΕιδοποίησε για εισερχόμενα μηνύματα στη τρέχουσα συνομιλία</string>
-  <string name="events_suppress_100">Καταστολή μερικών μηνυμάτων κατάστασης\nΑπόριψη των μηνυμάτων \'Αυτό το δωμάτιο δεν είναι ανώνυμο\'</string>
+    <string name="events_suppress_100">Καταστολή μερικών μηνυμάτων κατάστασης\nΑπόριψη των μηνυμάτων \'Αυτό το δωμάτιο δεν είναι ανώνυμο\'</string>
   <string name="negative_priotiry_summary">%s (δεν θα λάβετε μηνύματα από κάθε συνομιλία)</string>
   <string name="preference_accounts">Λογαριασμοί XMPP\nΔιαχείριση λογαριασμών</string>
   <string name="preference_security">Ασφάλεια\nΡυθμίσεις ασφάλειας</string>
   <string name="security_check_certificate">Έλεγξε το πιστοποιητικό του διακομιστή\nΕιδοποίησε για προβλήματα σε κρυπτογραφημένες συνδέσεις</string>
-  <string name="security_clear_certificate">Αφαίρεσε πιστοποιητικά\nΚαθαρισμός λίστας αγνοημένων πιστοποιητικών</string>
-  <string name="security_otr_history">Αποθήκευση ιστορικού\nΑποθήκευσε το ιστορικό των συνομιλιών για τις συνεδρίες με OTR</string>
-  <string name="security_otr_mode">Λειτουργία OTR</string>
+    <string name="security_otr_mode">Λειτουργία OTR</string>
   <string name="chats_attention">Προσοχή\nΧειριστείτε τις εισερχόμενες αιτήσεις για προσοχή</string>
   <string name="chats_attention_sound">Ήχος προσοχής\nΕπιλέξτε ήχο ειδοποίησης</string>
   <string name="connection_load_vcard">Φόρτωση vCard\nΦόρτωση και ενημέρωση προσωπικές πληροφορίες της επαφής και του εικονιδίου χρήστη. Απενεργοποίηση για μείωση της χρήσης της κυκλοφορίας.</string>
   <string name="connection_load_images">Φόρτωση εικόνων\nΑυτόματη φόρτωση εικόνων από διεύθυνση αρχείου. Απενεργοποίηση για μείωση της χρήσης της κυκλοφορίας.</string>
   <string name="connection_use_carbons">Κατάσταση αντιγράφου για παραλήπτη\nΊσως είναι ασταθής! Οι συνεδρίες θα μοιραστούν για τον ίδιο λογαριασμό σε αυτόν τον πελάτη. Απενεργοποίηση για μείωση της χρήσης της κυκλοφορίας.</string>
-  <string name="connection_dns_resolver_type">Τύπος επίλυσης DNS</string>
-  <string name="connection_dns_resolver_type_dns_java_resolver">DNSJavaResolver</string>
+    <string name="connection_dns_resolver_type_dns_java_resolver">DNSJavaResolver</string>
   <string name="connection_dns_resolver_type_mini_dns_resolver">MiniDNSResolver (πειραματικό)</string>
-  <string name="connection_use_plain_text_auth">Απλό κείμενο\nΧρησιμοποίησε έλεγχο ταυτότητας απλού κειμένου για όλους τους λογαριασμούς. Δε συνιστάται.</string>
-  <string name="events_phrases">Φράσεις κλειδιά\nΔημιουργία προσωποποιημένων ειδοποιήσεων για τα λαμβανόμενα μηνύματα που περιέχουν συγκεκριμένες φράσεις</string>
-  <string name="security_clear_certificate_warning">Θέλετε πραγματικά να αφαιρέσετε όλα τα αγνοημένα πιστοποιητικά;</string>
-  <string name="account_error_settings">Ρυθμίσεις</string>
-  <string name="category_xabber_account">Λογαριασμός Xabber</string>
-  <string name="category_xmpp_accounts">Λογαριασμοί XMPP</string>
-  <string name="category_interface">Διεπαφή</string>
+    <string name="events_phrases">Φράσεις κλειδιά\nΔημιουργία προσωποποιημένων ειδοποιήσεων για τα λαμβανόμενα μηνύματα που περιέχουν συγκεκριμένες φράσεις</string>
+    <string name="account_error_settings">Ρυθμίσεις</string>
+    <string name="category_interface">Διεπαφή</string>
   <string name="category_settings">Ρυθμίσεις</string>
   <string name="category_about">Σχετικά</string>
   <string name="category_appearance">Εμφάνιση</string>
diff --git a/xabber/src/main/res/values-el-rGR/words.xml b/xabber/src/main/res/values-el-rGR/words.xml
index e82a3ba62d..76f9216413 100644
--- a/xabber/src/main/res/values-el-rGR/words.xml
+++ b/xabber/src/main/res/values-el-rGR/words.xml
@@ -20,5 +20,4 @@
   <string name="settings">Ρυθμίσεις</string>
   <string name="ok">ΟΚ</string>
   <string name="login">Είσοδος</string>
-  <string name="resume">Συνέχιση</string>
 </resources>
diff --git a/xabber/src/main/res/values-es-rES/account_editor.xml b/xabber/src/main/res/values-es-rES/account_editor.xml
index d8a39ffbb7..3cac2d8d13 100644
--- a/xabber/src/main/res/values-es-rES/account_editor.xml
+++ b/xabber/src/main/res/values-es-rES/account_editor.xml
@@ -2,40 +2,25 @@
 <!--Generated by crowdin.com-->
 <resources>
   <string name="account_compression">Usar compresión</string>
-  <string name="account_enabled">Habilitada</string>
-  <string name="account_host">Servidor</string>
+    <string name="account_host">Servidor</string>
   <string name="account_password">Contraseña</string>
   <string name="confirm_password">Confirmar contraseña</string>
   <string name="account_port">Puerto</string>
   <string name="account_priority">Prioridad</string>
   <string name="account_resource">Dispositivo</string>
   <string name="account_server_name">Servidor</string>
-  <string name="account_type">Tipo de Cuenta</string>
-  <string name="account_type_hints_gtalk">Nombre de usuario para gmail.com o dominio de Google Apps</string>
-  <string name="account_type_helps_gtalk">Si no tienes una cuenta en Google puedes crear una en http://mail.google.com\nSi ya dispones de una, puedes usar tu_nombre_de_usuario@tu_dominio_en_Google</string>
-  <string name="account_xmpp_register_warning">¡Usted debe <a href="http://www.google.com/#q=register an XMPP account"> registrar una cuenta XMPP</a> antes de agregar a Xabber!</string>
-  <string name="account_type_helps_xmpp">Para saber más sobre XMPP (Jabber): https://xmpp.org</string>
-  <string name="account_user_name">Usuario</string>
+    <string name="account_xmpp_register_warning">¡Usted debe <a href="http://www.google.com/#q=register an XMPP account"> registrar una cuenta XMPP</a> antes de agregar a Xabber!</string>
+    <string name="account_user_name">Usuario</string>
   <string name="EMPTY_SERVER_NAME">Nombre de servidor no especificado</string>
   <string name="EMPTY_USER_NAME">Usuario no especificado</string>
   <string name="CONFIRM_PASSWORD">Las contraseñas no coinciden</string>
-  <string name="account_archive_mode">Guardar historial de mensajes</string>
-  <string name="account_archive_mode_available">En el servidor si es posible</string>
-  <string name="account_archive_mode_dont_store">No guardar</string>
-  <string name="account_archive_mode_local">Localmente en el dispositivo</string>
-  <string name="account_archive_mode_server">En el servidor</string>
-  <string name="account_archive_mode_unread">Localmente sólo si no se ha enviado ni leído</string>
-  <string name="account_compression_summary">Marcar para usar compresión de datos</string>
+    <string name="account_compression_summary">Marcar para usar compresión de datos</string>
   <string name="account_custom">Servidor manual</string>
   <string name="account_custom_summary">Usar un servidor manual en vez del registro SRV</string>
-  <string name="account_enabled_summary">Activar Cuenta</string>
-  <string name="account_invalid_port">El puerto debe ser un número (por defecto: 5222)</string>
+    <string name="account_invalid_port">El puerto debe ser un número (por defecto: 5222)</string>
   <string name="account_invalid_port_range">El puerto debe estar entre 1 y 65535 (predeterminado: 5222)</string>
   <string name="account_invalid_priority">El valor de la prioridad debe ser un número entre -128 y 127 (por defecto: 0)</string>
-  <string name="account_oauth">Autorización</string>
-  <string name="account_oauth_invalidated">No autorizado</string>
-  <string name="account_oauth_summary">Configuración de OAuth</string>
-  <string name="account_proxy_host">Direción del proxy</string>
+    <string name="account_proxy_host">Direción del proxy</string>
   <string name="account_proxy_invalid_port_range">El proxy debe estar entre 1 y 65535 (predeterminado: 8080)</string>
   <string name="account_proxy_invalid_port">El puerto proxy debe ser un número (predeterminado: 8080)</string>
   <string name="account_proxy_password">Contraseña del proxy</string>
@@ -47,18 +32,14 @@
   <string name="account_sasl_summary">Desactivar para servidores muy antiguos</string>
   <string name="account_store_password">Guardar contraseña</string>
   <string name="account_store_password_summary">Desactivar esta opción para pedir la contraseña cada vez que te conectes</string>
-  <string name="account_syncable">Integrar con los contactos del sistema</string>
-  <string name="account_syncable_summary">Mostrar los contactos de esta cuenta en la agenda del teléfono</string>
-  <string name="account_tls_enable">Activar TLS</string>
+    <string name="account_tls_enable">Activar TLS</string>
   <string name="account_tls_enable_summary">Usar el cifrado TLS para conectarse con el servidor siempre que sea posible</string>
   <string name="account_tls_legacy">SSL heredado</string>
   <string name="account_tls_legacy_summary">Usar el cifrado SSL heredado para conectarse con el servidor</string>
   <string name="account_tls_mode">Uso de TLS/SSL</string>
   <string name="account_tls_require">Requerir TLS</string>
   <string name="account_tls_require_summary">Requerir el uso de TLS al conectarse con el servidor</string>
-  <string name="account_use_orbot">Charlar a través de la red de anonimato TOR y forzar el protocolo criptográfico TLS\nNo recomentado para Google Talk</string>
-  <string name="confirm_cancellation">¿Seguro que quieres descartar los cambios?</string>
-  <string name="INCORRECT_USER_NAME">Nombre de usuario incorrecto. Comprueba los detalles en el texto de ayuda de abajo.</string>
+    <string name="INCORRECT_USER_NAME">Nombre de usuario incorrecto. Comprueba los detalles en el texto de ayuda de abajo.</string>
   <string name="orbot_required_message">Para usar TOR debe tener instalado Orbot y activarlo para pasar todo el tráfico a través de él. ¿Quieres instalarlo desde Google Play?</string>
   <string name="orbot_required_title">¿Instalar Orbot?</string>
   <string name="install_orbot">Instalar Orbot</string>
diff --git a/xabber/src/main/res/values-es-rES/chat_viewer.xml b/xabber/src/main/res/values-es-rES/chat_viewer.xml
index 30b7438428..5758689de9 100644
--- a/xabber/src/main/res/values-es-rES/chat_viewer.xml
+++ b/xabber/src/main/res/values-es-rES/chat_viewer.xml
@@ -21,11 +21,8 @@
   <string name="message_remove">Quitar del historial</string>
   <string name="message_repeat">Reintentar envío</string>
   <string name="message_otr_show_original">Mostrar mensaje</string>
-  <string name="message_open_file">Abrir</string>
-  <string name="message_save_file">Guardar</string>
-  <string name="save_history">Guardar historial localmente\nAlmacenar el historial de mensajes en el dispositivo</string>
-  <string name="show_history">Mostrar historial</string>
-  <string name="action_attention_called">Llamada de atención enviada</string>
+    <string name="save_history">Guardar historial localmente\nAlmacenar el historial de mensajes en el dispositivo</string>
+    <string name="action_attention_called">Llamada de atención enviada</string>
   <string name="action_attention_requested">Se recibió una llamada de atención</string>
   <string name="action_ban">%1$s ha sido bloqueado</string>
   <string name="action_ban_by">%1$s fue bloqueado por %2$s</string>
@@ -73,8 +70,7 @@
   <string name="otr_refresh">Reiniciar el cifrado</string>
   <string name="otr_request">Se ha pedido una conversación privada OTR (Off-the-Record) pero no tienes el complemento necesario. Usa Pidgin, Gajim o Adium para PC/Mac y Xabber o ChatSecure para Android. Más información en http://otr.cypherpunks.ca/.</string>
   <string name="otr_start">Iniciar cifrado</string>
-  <string name="otr_unencrypted_message">Este mensaje no ha sido cifrado</string>
-  <string name="otr_unreadable_message">El mensaje cifrado enviado es ilegible</string>
+    <string name="otr_unreadable_message">El mensaje cifrado enviado es ilegible</string>
   <string name="otr_not_decrypted_message">El mensaje no se ha podido descifrar</string>
   <string name="otr_verification">Verificación del cifrado OTR</string>
   <string name="otr_verify_fingerprint">Verificar con una huella de seguridad</string>
@@ -87,21 +83,13 @@
   <string name="otr_verification_progress_title">Verificación OTR en curso</string>
   <string name="otr_verification_notify_button">ABIERTO</string>
   <string name="otr_verification_notify_button_cancel">Cancelar</string>
-  <string name="under_construction">En construcción</string>
-  <string name="under_construction_message">Esta pantalla está en construcción</string>
-  <string name="chat_events_show_text_global">Usar ajustes generales</string>
+    <string name="chat_events_show_text_global">Usar ajustes generales</string>
   <string name="chat_events_show_text_always">Mostrar el mensaje de texto</string>
   <string name="chat_events_show_text_never">Ocultar el mensaje de texto</string>
-  <string name="sending_file">Enviando archivo %s</string>
-  <string name="error_sending_file">Error al enviar el archivo %s</string>
-  <string name="no_application_to_open_file">No se ha encontrado ninguna aplicación para abrir el archivo</string>
-  <string name="could_not_save_file">No se pudo guardar el archivo</string>
-  <string name="file_saved_successfully">Archivo guardado con éxito</string>
-  <string name="received_by">%s recibido</string>
-  <string name="could_not_get_path_to_file">No se encontró la dirección del archivo</string>
+    <string name="error_sending_file">Error al enviar el archivo %s</string>
+    <string name="could_not_get_path_to_file">No se encontró la dirección del archivo</string>
   <string name="message_open_private_chat">Abrir chat privado</string>
-  <string name="http_file_upload_slot_error">No se pudo enviar el archivo. ¿Demasiado grande?</string>
-  <string name="no_permission_to_read_files">Sin permisos para leer archivos</string>
+    <string name="no_permission_to_read_files">Sin permisos para leer archivos</string>
   <string name="no_permission_to_write_files">Sin permiso para editar archivos</string>
   <string name="error_description_title">Descripción del error:</string>
   <string name="message_status_sent">Enviado</string>
diff --git a/xabber/src/main/res/values-es-rES/contact_editor.xml b/xabber/src/main/res/values-es-rES/contact_editor.xml
index 1689a096f9..8a6018dc50 100644
--- a/xabber/src/main/res/values-es-rES/contact_editor.xml
+++ b/xabber/src/main/res/values-es-rES/contact_editor.xml
@@ -17,12 +17,8 @@
   <string name="processing_image">Procesando imagen...</string>
   <string name="error_during_crop">Error al ajustar la imagen</string>
   <string name="error_during_image_processing">Error al procesar la imagen</string>
-  <string name="account_settings">Ajustes de la cuenta</string>
-  <string name="account_user_info">Información de la cuenta</string>
-  <string name="account_server_info">Información del servidor</string>
+    <string name="account_server_info">Información del servidor</string>
   <string name="account_server_info_description">Lista de capacidades del servidor</string>
   <string name="conference_private_chat_invitation">%1$s de %2$s quiere empezar una conversación privada contigo</string>
   <string name="accept_muc_private_chat">Aceptar</string>
-  <string name="block_muc_private_chat">Bloquear</string>
-  <string name="no_permission_camera">Sin permiso para acceder a la cámara</string>
 </resources>
diff --git a/xabber/src/main/res/values-es-rES/contact_list.xml b/xabber/src/main/res/values-es-rES/contact_list.xml
index f46ce6c223..3340299f05 100644
--- a/xabber/src/main/res/values-es-rES/contact_list.xml
+++ b/xabber/src/main/res/values-es-rES/contact_list.xml
@@ -18,17 +18,13 @@
   <string name="application_state_roster">Conectado.</string>
   <string name="application_state_starting">Cargando aplicación... </string>
   <string name="application_state_waiting">Conectando...</string>
-  <string name="chat_list">Lista de conversaciones</string>
-  <string name="chat_list_is_empty">No hay conversaciones activas</string>
-  <string name="chat_viewer">Conversación</string>
-  <string name="close_chat">Cerrar conversación</string>
-  <string name="CONNECTION_FAILED">Error de conexión</string>
+    <string name="chat_viewer">Conversación</string>
+    <string name="CONNECTION_FAILED">Error de conexión</string>
   <string name="contact_add">Añadir contacto</string>
   <string name="contact_delete">Eliminar</string>
   <string name="contact_block">Bloquear contacto</string>
   <string name="contact_delete_confirm">¿Estás seguro de que quieres eliminar el contacto %1$s de la cuenta %2$s?</string>
-  <string name="contact_list">Lista de contactos</string>
-  <string name="discard_subscription">Rechazar contacto</string>
+    <string name="discard_subscription">Rechazar contacto</string>
   <string name="exit">Salir</string>
   <string name="group_active_chat">Conversaciones activas</string>
   <string name="group_none">Sin grupos</string>
@@ -40,15 +36,7 @@
   <string name="request_subscription">Solicitar suscripción</string>
   <string name="XMPP_EXCEPTION">Error en la transmisión</string>
   <string name="application_state_closing">Guardando cambios...\nLa aplicación se cerrará a continuación</string>
-  <string name="certificate_confirmation">%1$s.\n¿Confía totalmente en el certificado con huella sha1: %2$s? ¿Quiere que no se le notifique sobre este tema con el certificado?</string>
-  <string name="certificate_details">\n\n\nEmitido para:\nNombre (CN): %1$s\nOrganización (O): %2$s\nUnidad organizativa (OU): %3$s\nNúmero de serie: %4$s\n\nEmitido por:\nNombre (CN): %5$s\nOrganización (O): %6$s\nUnidad organizativa (OU): %7$s\n\nValidez:\nEmitido: %8$s\nExpira: %9$s</string>
-  <string name="certificate_invalid_chane">Falló la cadena de verificación de la firma</string>
-  <string name="certificate_invalid_target">Falló la verificación del destinatario</string>
-  <string name="certificate_self_signed">Certificado auto-firmado</string>
-  <string name="certificate_show_details">Detalles ...</string>
-  <string name="close_chats">Cerrar todas las conversaciones</string>
-  <string name="contact_integration_suggest">¿Quiere integrar Xabber con los contactos del sistema?\nEsto se puede configurar en \"Opciones\" → \"Cuentas XMPP\" → Tu cuenta → \"Integración con los contactos del sistema\".\nNota: Los contactos del sistema pueden ir más lentos durante unos minutos.</string>
-  <string name="group_room">Salas de charla</string>
+    <string name="group_room">Salas de charla</string>
   <string name="OTR_ERROR">Error de OTR</string>
   <string name="select_contact">Por favor, selecciona el contacto</string>
   <string name="show_offline_always">Mostrar contactos</string>
@@ -63,8 +51,7 @@
   <string name="block_list">Lista de contactos bloqueados</string>
   <string name="contact_blocked_successfully">Contacto bloqueado con éxito</string>
   <string name="error_blocking_contact">Error al bloquear contacto</string>
-  <string name="unblock_contact">Desbloquear contacto</string>
-  <string name="contacts_unblocked_successfully">Contactos desbloqueados correctamente</string>
+    <string name="contacts_unblocked_successfully">Contactos desbloqueados correctamente</string>
   <string name="error_unblocking_contacts">Error al desbloquear contactos</string>
   <string name="block_contact_confirm">¿Estás seguro de que quieres eliminar el contacto %1$s de la cuenta %2$s?</string>
   <string name="unblock_all_contacts_confirm">¿Quieres desbloquear todos los contactos de la cuenta %1$s?</string>
@@ -76,19 +63,10 @@
   <string name="dark_theme_suggest_dialog_stay_on_light_side">Claro</string>
   <string name="battery_optimization_disable_dialog_title">Optimización de la batería</string>
   <string name="battery_optimization_disable_dialog_message">El dispositivo está realizando importantes optimizaciones de la batería en Xabber lo que podría generar retraso en las notificaciones o incluso pérdida de mensajes\n\n Se le consultará ahora para desactivarlas.</string>
-  <string name="save_log_to_file">Guardar en un archivo</string>
-  <string name="clear_log">Eliminar archivos de registro antiguos</string>
+    <string name="clear_log">Eliminar archivos de registro antiguos</string>
   <string name="open_log_file">Abrir</string>
   <string name="send_log_file">Enviar</string>
-  <string name="intro_welcome">Bienvenido a Xabber</string>
-  <string name="intro_xabber_description">Cliente XMPP de código abierto para Android</string>
-  <string name="intro_have_account">Inicio de sesión en cuenta XMPP</string>
-  <string name="intro_register_account">Registrar una cuenta XMPP</string>
-  <string name="intro_create_xabber_account">Usar cuenta Xabber</string>
-  <string name="intro_use_third_party_accounts">utilizar cuentas XMPP de terceros</string>
-  <string name="intro_faq">Si no tienes una cuenta XMPP, por favor, <a href="https://www.xabber.com/faq/"> lea nuestras \"Preguntas Frecuentes\"</a> sobre cómo conseguirla.</string>
-  <string name="intro_web_search_register_xmpp">Registrar una cuenta XMPP</string>
-  <string name="synchronize_bookmarks">Sincronizar favoritos</string>
+    <string name="synchronize_bookmarks">Sincronizar favoritos</string>
   <string name="remove_all_bookmarks">Quitar todo</string>
   <string name="remove_selected_bookmarks">Eliminar los elementos seleccionados</string>
   <string name="remove_all_bookmarks_confirm">¿Realmente quiere quitar todos los marcadores de la cuenta %1$s?</string>
diff --git a/xabber/src/main/res/values-es-rES/contact_viewer.xml b/xabber/src/main/res/values-es-rES/contact_viewer.xml
index 17db384d1e..d571cca55d 100644
--- a/xabber/src/main/res/values-es-rES/contact_viewer.xml
+++ b/xabber/src/main/res/values-es-rES/contact_viewer.xml
@@ -17,12 +17,9 @@
   <string name="vcard_organization_unit">Tipo de empleo</string>
   <string name="vcard_title">Puesto de trabajo, función</string>
   <string name="vcard_role">Rol</string>
-  <string name="vcard_other">Más información</string>
-  <string name="vcard_categories">Categorías</string>
-  <string name="vcard_decsription">Descripción</string>
+    <string name="vcard_decsription">Descripción</string>
   <string name="vcard_note">Notas</string>
-  <string name="vcard_address">Dirección</string>
-  <string name="vcard_address_pobox">Apartado de correos</string>
+    <string name="vcard_address_pobox">Apartado de correos</string>
   <string name="vcard_address_extadr">Dirección completa</string>
   <string name="vcard_address_street">Calle</string>
   <string name="vcard_address_locality">Localidad</string>
diff --git a/xabber/src/main/res/values-es-rES/muc_editor.xml b/xabber/src/main/res/values-es-rES/muc_editor.xml
index 73544c0e4e..7dc9ab9e27 100644
--- a/xabber/src/main/res/values-es-rES/muc_editor.xml
+++ b/xabber/src/main/res/values-es-rES/muc_editor.xml
@@ -20,12 +20,10 @@
   <string name="muc_invite_confirm">%2$s te ha invitado a unirte a la sala %3$s. ¿Unirte con la cuenta %1$s?</string>
   <string name="muc_invite_confirm_reason">%2$s te ha invitado a unirte a la sala %3$s: %4$s. ¿Unirte con la cuenta %1$s?</string>
   <string name="muc_leave">Abandonar sala</string>
-  <string name="muc_save">Guardar sala de charla</string>
-  <string name="muc_choose_conference">Elegir sala de charla</string>
+    <string name="muc_choose_conference">Elegir sala de charla</string>
   <string name="muc_next">Siguiente</string>
   <string name="muc_get_hosted_conferences">Obtener salas de charla organizadas</string>
   <string name="muc_error_getting_conferences">Error al obtener la lista de salas de charla</string>
   <string name="muc_type_conference_name">Escribe el nombre de la sala de charla</string>
-  <string name="contact_is_blocked">¡El contacto está bloqueado!</string>
-  <string name="conference_invitation">Invitación a una sala</string>
+    <string name="conference_invitation">Invitación a una sala</string>
 </resources>
diff --git a/xabber/src/main/res/values-es-rES/notification_bar.xml b/xabber/src/main/res/values-es-rES/notification_bar.xml
index d2351474ab..6765135bc3 100644
--- a/xabber/src/main/res/values-es-rES/notification_bar.xml
+++ b/xabber/src/main/res/values-es-rES/notification_bar.xml
@@ -34,10 +34,7 @@
   <!-- Used for plural form in russian. -->
   <string name="connection_state_waiting_5">-</string>
   <string name="connection_state_offline">%1$d %2$s desconectado</string>
-  <string name="archive_available_request_message">¿Almacenar el histórico de mensaje en el servidor?\nEsto permite a Xabber cargar el historial desde todos los dispositivos que usen esta cuenta.\nEsta funcionalidad usará algo de tráfico adicional y reducirá ligeramente la velocidad de conexión.\nATENCIÓN: Todo el historial local será eliminado.</string>
-  <string name="archive_available_request_title">¿Activar archivado de mensajes?</string>
-  <string name="INVALID_CERTIFICATE">Certificado inválido</string>
-  <string name="muc_invite_message">¿Quiere entrar a la sala de charla?</string>
+    <string name="muc_invite_message">¿Quiere entrar a la sala de charla?</string>
   <string name="otr_verification_in_progress">Pulsar aquí para cancelarla.</string>
   <string name="PASSWORD_REQUIRED">Se necesita una contraseña</string>
   <string name="pay_attention">Prestar atención</string>
diff --git a/xabber/src/main/res/values-es-rES/preference_editor.xml b/xabber/src/main/res/values-es-rES/preference_editor.xml
index 4322fa50ed..e7906d3346 100644
--- a/xabber/src/main/res/values-es-rES/preference_editor.xml
+++ b/xabber/src/main/res/values-es-rES/preference_editor.xml
@@ -12,14 +12,11 @@
   <string name="contacts_order_alphabet">Alfabéticamente</string>
   <string name="contacts_order_status">Por estado</string>
   <string name="contacts_show_accounts">Agrupar por cuenta\nAgrupar los contactos por cuenta en la lista de contactos</string>
-  <string name="contacts_show_active_chats">Conversaciones en la parte superior\nMostrar conversaciones activas en la parte superior de la lista de contactos</string>
-  <string name="contacts_show_avatars">Mostrar avatares\nMostrar avatares de los usuarios en la lista de Contactos</string>
+    <string name="contacts_show_avatars">Mostrar avatares\nMostrar avatares de los usuarios en la lista de Contactos</string>
   <string name="contacts_show_empty_groups">Mostrar grupos vacíos\nMostrar grupos que no tengan contactos conectados</string>
   <string name="contacts_show_groups">Mostrar grupos\nMostrar grupos en la lista de contactos</string>
   <string name="contacts_show_offline">Mostrar contactos desconectados</string>
-  <string name="contacts_show_panel">Mostrar panel de cuentas\nMostrar los botones de acción con avatares en la esquina inferior derecha de la lista de contactos</string>
-  <string name="contacts_stay_active_chats">Duplicar conversaciones activas\nHace que aparezcan las conversaciones activas tanto en la parte superior de la lista de contactos como en los grupos</string>
-  <string name="debug_log">Depurar registro\nEscribir mensajes en el registro de depuración (para que los cambios se apliquen, por favor reinicia la aplicación)</string>
+    <string name="debug_log">Depurar registro\nEscribir mensajes en el registro de depuración (para que los cambios se apliquen, por favor reinicia la aplicación)</string>
   <string name="debug_file_log_title">Escribir archivo de registro\n Escribir archivo de depuración en archivo local (se puede compartir).</string>
   <string name="debug_log_files_title">Archivos de registro\n Lista de archivos de registro escritos.</string>
   <string name="debug_log_files_activity_title">Archivos de registro</string>
@@ -36,8 +33,7 @@
   <string name="interface_theme">Tema</string>
   <string name="interface_theme_dark">Oscuro</string>
   <string name="interface_theme_light">Claro</string>
-  <string name="interface_theme_normal">Por defecto</string>
-  <string name="interface_smiles">Emoticonos</string>
+    <string name="interface_smiles">Emoticonos</string>
   <string name="interface_smiles_android">Emitoconos de Android</string>
   <string name="interface_smiles_none">Sin emoticonos gráficos</string>
   <string name="preference_connection">Opciones de conexión\nOpciones de conexión</string>
@@ -62,8 +58,7 @@
   <string name="chats_font_size_xlarge">Muy grande</string>
   <string name="chats_hide_keyboard">Ocultar teclado</string>
   <string name="chats_hide_keyboard_landscape">En horizontal</string>
-  <string name="chats_receipt">Confirmaciones de entrega\nEnviar y procesar confirmaciones de entrega de mensajes</string>
-  <string name="chats_show_avatars">Avatares en mensajes\nMostrar los avatares en cada mensaje</string>
+    <string name="chats_show_avatars">Avatares en mensajes\nMostrar los avatares en cada mensaje</string>
   <string name="chats_show_status_change">Mostrar cambios de estado</string>
   <string name="chats_show_status_change_muc">En salas de charla</string>
   <string name="chats_state_notification">Mostrar notificación de escritura\nMostrar cuándo está escribiendo el otro usuario</string>
@@ -77,37 +72,24 @@
   <string name="contacts_reset_offline">Eliminar los ajustes de presencia\nBorrar los ajustes individuales para grupos y cuentas</string>
   <string name="contacts_reset_offline_warning">¿Realmente quieres borrar los ajustes individuales de grupos y cuentas?</string>
   <string name="events_first_only">Alertar del primer mensaje\nNotificar solamente el primer mensaje de una conversación</string>
-  <string name="events_ignore_system_vibro">Ignorar ajustes del sistema\nUsar esta opción si la configuración de vibración del sistema no funciona</string>
-  <string name="events_message">Ajustes de notificaciones\nConfigurar las notificaciones de los mensajes entrantes</string>
-  <string name="events_message_chat">Sólo conversaciones</string>
-  <string name="events_message_chat_and_muc">Conversaciones y salas de charla</string>
-  <string name="events_message_none">No notificar</string>
-  <string name="events_show_text">Vista previa de mensaje\nMostrar texto del mensaje de charlas en el área de notificación</string>
+    <string name="events_show_text">Vista previa de mensaje\nMostrar texto del mensaje de charlas en el área de notificación</string>
   <string name="events_show_text_muc">Vista previa de mensaje\nMostrar texto del mensaje de conferencias en el área de notificación</string>
-  <string name="events_visible_chat">Notificar en la conversación actual\nMuestra mensajes entrantes en la conversación actual</string>
-  <string name="events_suppress_100">Elimina algunos mensajes de estado\nNo se mostrarán los mensajes «Esta sala no es anónima»</string>
+    <string name="events_suppress_100">Elimina algunos mensajes de estado\nNo se mostrarán los mensajes «Esta sala no es anónima»</string>
   <string name="negative_priotiry_summary">%s (no recibirás ningún mensaje de ninguna conversación)</string>
   <string name="preference_accounts">Cuentas de XMPP\nConfigurar las cuentas</string>
   <string name="preference_security">Seguridad\nAjustes de seguridad</string>
   <string name="security_check_certificate">Comprobar certificado del servidor\nNotificar problemas de certificado en las conexiones cifradas</string>
-  <string name="security_clear_certificate">Eliminar certificados\nBorrar lista de los certificados ignorados</string>
-  <string name="security_otr_history">Almacenar historial\nAlmacenar el historial de conversaciones para sesiones con OTR</string>
-  <string name="security_otr_mode">Modo OTR</string>
+    <string name="security_otr_mode">Modo OTR</string>
   <string name="chats_attention">Llamadas de atención\nReaccionar ante las llamadas de atención</string>
   <string name="chats_attention_sound">Sonido para las llamadas de atención\nElegir tono</string>
   <string name="connection_load_vcard">Cargar vCard\nCargar y actualizar la información personal y el avatar del contacto. Desactivar para reducir el uso de red.</string>
   <string name="connection_load_images">Cargar imágenes\nCargar imágenes automáticamente desde el enlace del archivo. Deshabilitar para reducir el uso de tráfico de datos.</string>
   <string name="connection_use_carbons">Modo de copiado Carbon\n¡Puede ser inestable! Compartirá las sesiones de una misma cuenta con este cliente. Deshabilitar para reducir el uso de tráfico de datos.</string>
-  <string name="connection_dns_resolver_type">Tipo de resolución DNS</string>
-  <string name="connection_dns_resolver_type_dns_java_resolver">DNSJavaResolver</string>
+    <string name="connection_dns_resolver_type_dns_java_resolver">DNSJavaResolver</string>
   <string name="connection_dns_resolver_type_mini_dns_resolver">MiniDNSResolver (experimental)</string>
-  <string name="connection_use_plain_text_auth">Autentificación en texto plano\nUsa una autentificación de texto plano para todas las cuentas. No recomendado.</string>
-  <string name="events_phrases">Frases clave\nPersonalizar sonidos de notificaciones para mensajes que contienen determinadas frases</string>
-  <string name="security_clear_certificate_warning">¿Realmente quieres eliminar todos los certificados ignorados?</string>
-  <string name="account_error_settings">Ajustes</string>
-  <string name="category_xabber_account">Cuenta de Xabber</string>
-  <string name="category_xmpp_accounts">Cuentas de XMPP</string>
-  <string name="category_interface">Interfaz</string>
+    <string name="events_phrases">Frases clave\nPersonalizar sonidos de notificaciones para mensajes que contienen determinadas frases</string>
+    <string name="account_error_settings">Ajustes</string>
+    <string name="category_interface">Interfaz</string>
   <string name="category_settings">Ajustes</string>
   <string name="category_about">Acerca de</string>
   <string name="category_appearance">Aspecto</string>
diff --git a/xabber/src/main/res/values-es-rES/words.xml b/xabber/src/main/res/values-es-rES/words.xml
index 37273ad396..58b5dc1fcf 100644
--- a/xabber/src/main/res/values-es-rES/words.xml
+++ b/xabber/src/main/res/values-es-rES/words.xml
@@ -20,5 +20,4 @@
   <string name="settings">Ajustes</string>
   <string name="ok">Aceptar</string>
   <string name="login">Iniciar sesión</string>
-  <string name="resume">Continuar</string>
 </resources>
diff --git a/xabber/src/main/res/values-fa-rIR/account_editor.xml b/xabber/src/main/res/values-fa-rIR/account_editor.xml
index 965fa67cd2..307a3a98d4 100644
--- a/xabber/src/main/res/values-fa-rIR/account_editor.xml
+++ b/xabber/src/main/res/values-fa-rIR/account_editor.xml
@@ -2,16 +2,13 @@
 <!--Generated by crowdin.com-->
 <resources>
   <string name="account_compression">استفاده از فشرده سازی</string>
-  <string name="account_enabled">فعال</string>
-  <string name="account_host">هاست</string>
+    <string name="account_host">هاست</string>
   <string name="account_password">پسورد</string>
   <string name="account_port">درگاه</string>
   <string name="account_priority">اولویت</string>
   <string name="account_resource">وسیله</string>
   <string name="account_server_name">سرور</string>
-  <string name="account_type">نوع حساب</string>
-  <string name="account_type_hints_gtalk">نام کاربری شما در gmail.com یا دامین یکی از برنامه های گوگل</string>
-  <string name="account_user_name">نام کاربری</string>
+    <string name="account_user_name">نام کاربری</string>
   <string name="EMPTY_SERVER_NAME">نام سرور مشخص نشده است.</string>
   <string name="EMPTY_USER_NAME">نام کاربری مشخص نشده است</string>
   <string name="INCORRECT_USER_NAME">نام کاربری نادرست.برای جزئیات بیشترمتن راهنمای زیر را مطالعه کنید.</string>
diff --git a/xabber/src/main/res/values-fa-rIR/chat_viewer.xml b/xabber/src/main/res/values-fa-rIR/chat_viewer.xml
index b3a7653e7f..61d7ba1d67 100644
--- a/xabber/src/main/res/values-fa-rIR/chat_viewer.xml
+++ b/xabber/src/main/res/values-fa-rIR/chat_viewer.xml
@@ -17,8 +17,7 @@
   <string name="message_remove">حذف از تاریخچه</string>
   <string name="message_repeat">سعی مجدد برای ارسال</string>
   <string name="save_history">ذخیره تاریخچه محلی\nذخیره کردن پیام ها بصورت محلی</string>
-  <string name="show_history">نمایش تاریخچه</string>
-  <string name="action_ban">%1$s از ورود به روم منع شد</string>
+    <string name="action_ban">%1$s از ورود به روم منع شد</string>
   <string name="action_ban_by">%1$s بوسیله %2$s از ورود به چت روم منع شد</string>
   <string name="action_invite_error">%s دعوت را دریافت نکرد</string>
   <string name="action_invite_sent">دعوت برای %s ارسال شد</string>
diff --git a/xabber/src/main/res/values-fa-rIR/contact_list.xml b/xabber/src/main/res/values-fa-rIR/contact_list.xml
index d036daf989..ff01d29d05 100644
--- a/xabber/src/main/res/values-fa-rIR/contact_list.xml
+++ b/xabber/src/main/res/values-fa-rIR/contact_list.xml
@@ -18,16 +18,12 @@
   <string name="application_state_roster">متصل شد.</string>
   <string name="application_state_starting">درحال اجرای برنامه... </string>
   <string name="application_state_waiting">در انتظار اتصال...</string>
-  <string name="chat_list">لیست چت</string>
-  <string name="chat_list_is_empty">چت فعالی وجود ندارد</string>
-  <string name="chat_viewer">چت</string>
-  <string name="close_chat">بستن چت</string>
-  <string name="CONNECTION_FAILED">خطا در اتصال</string>
+    <string name="chat_viewer">چت</string>
+    <string name="CONNECTION_FAILED">خطا در اتصال</string>
   <string name="contact_add">اضافه کردن مخاطب</string>
   <string name="contact_delete">حذف</string>
   <string name="contact_delete_confirm">آیا مطمئنید میخواهید مخاطب %1$s را از حساب %2$s خود حذف کنید؟</string>
-  <string name="contact_list">لیست مخاطبین</string>
-  <string name="discard_subscription">رد درخواست دوستی</string>
+    <string name="discard_subscription">رد درخواست دوستی</string>
   <string name="exit">خروج</string>
   <string name="group_active_chat">چت های فعال</string>
   <string name="group_none">گروهی وجود ندارد</string>
diff --git a/xabber/src/main/res/values-fa-rIR/contact_viewer.xml b/xabber/src/main/res/values-fa-rIR/contact_viewer.xml
index 66b396da5f..991d3c7424 100644
--- a/xabber/src/main/res/values-fa-rIR/contact_viewer.xml
+++ b/xabber/src/main/res/values-fa-rIR/contact_viewer.xml
@@ -13,12 +13,9 @@
   <string name="vcard_organization">سازمان</string>
   <string name="vcard_title">عنوان شغل،وظیفه</string>
   <string name="vcard_role">نقش</string>
-  <string name="vcard_other">معلومات دیگر</string>
-  <string name="vcard_categories">دسته‌ها</string>
-  <string name="vcard_decsription">شرح</string>
+    <string name="vcard_decsription">شرح</string>
   <string name="vcard_note">یادداشت ها</string>
-  <string name="vcard_address">آدرس</string>
-  <string name="vcard_address_pobox">صندوق پستی</string>
+    <string name="vcard_address_pobox">صندوق پستی</string>
   <string name="vcard_address_extadr">آدرس کامل</string>
   <string name="vcard_address_street">خیابان</string>
   <string name="vcard_address_locality">محله</string>
diff --git a/xabber/src/main/res/values-fa-rIR/muc_editor.xml b/xabber/src/main/res/values-fa-rIR/muc_editor.xml
index 7cf5436cd5..b658047b94 100644
--- a/xabber/src/main/res/values-fa-rIR/muc_editor.xml
+++ b/xabber/src/main/res/values-fa-rIR/muc_editor.xml
@@ -19,5 +19,4 @@
   <string name="muc_invite_confirm">%2$s شما را به چت روم %3$s دعوت کرده است.آیا با حساب %1$s وارد میشوید؟</string>
   <string name="muc_invite_confirm_reason">%2$s شما را به کنفرانس %3$s: %4$s دعوت کرده است.آیا با حساب %1$s وارد میشوید؟</string>
   <string name="muc_leave">ترک چت روم</string>
-  <string name="muc_save">ذخیره چت روم</string>
 </resources>
diff --git a/xabber/src/main/res/values-fa-rIR/preference_editor.xml b/xabber/src/main/res/values-fa-rIR/preference_editor.xml
index 6e96988afc..b8f7cb7a08 100644
--- a/xabber/src/main/res/values-fa-rIR/preference_editor.xml
+++ b/xabber/src/main/res/values-fa-rIR/preference_editor.xml
@@ -11,8 +11,7 @@
   <string name="events_lightning">چراغ نشانگر\nچشمک زدن LED هنگام دریافت آگهداد</string>
   <string name="interface_theme_dark">تیره</string>
   <string name="interface_theme_light">روشن</string>
-  <string name="interface_theme_normal">پیش‌فرض</string>
-  <string name="interface_smiles_android">شکلک های اندروید</string>
+    <string name="interface_smiles_android">شکلک های اندروید</string>
   <string name="interface_smiles_none">شکلک های ساده</string>
   <string name="preference_connection">تنظیمات اتصال\nتنظیمات اتصال</string>
   <string name="preference_contacts">لیست مخاطبین \nظاهر لیست مخاطبین را سفارشی کنید</string>
@@ -30,9 +29,4 @@
   <string name="connection_go_away_immediately">به محض قفل شدن صفحه</string>
   <string name="contacts_reset_offline">تنظیم مجدد تنظیمات آفلاین\nپاک سازی تنظیمات شخصی موجود برای گروه ها و حساب ها</string>
   <string name="contacts_reset_offline_warning">آیا مطمئنید میخواهید تنظیمات شخصی برای گروه ها و حساب ها را پاک نمایید؟</string>
-  <string name="events_ignore_system_vibro">نادیده انگاری تنظیمات ویبره دستگاه \nدر صورتی که لرزش کار نمیکند از این گزینه استفاده کنید</string>
-  <string name="events_message_chat">فقط چت ها</string>
-  <string name="events_message_chat_and_muc">چت ها و چت روم ها</string>
-  <string name="events_message_none">اطلاع نده</string>
-  <string name="events_visible_chat">باخبر سازی در پنجره چت جاری \nباخبر سازی از پیام ورودی در پنجره چت جاری</string>
 </resources>
diff --git a/xabber/src/main/res/values-fr-rFR/account_editor.xml b/xabber/src/main/res/values-fr-rFR/account_editor.xml
index 054de9810f..199e681928 100644
--- a/xabber/src/main/res/values-fr-rFR/account_editor.xml
+++ b/xabber/src/main/res/values-fr-rFR/account_editor.xml
@@ -2,40 +2,25 @@
 <!--Generated by crowdin.com-->
 <resources>
   <string name="account_compression">Utiliser la compression</string>
-  <string name="account_enabled">Activé</string>
-  <string name="account_host">Hôte</string>
+    <string name="account_host">Hôte</string>
   <string name="account_password">Mot de passe</string>
   <string name="confirm_password">Confirmez le mot de passe</string>
   <string name="account_port">Port</string>
   <string name="account_priority">Priorité</string>
   <string name="account_resource">Ressource</string>
   <string name="account_server_name">Serveur</string>
-  <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=enregistrer un compte XMPP">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="account_xmpp_register_warning">Vous devez <a href="http://www.google.com/#q=enregistrer un compte XMPP">enregistrer un compte XMPP</a> avant de l\'ajouter à Xabber!</string>
+    <string name="account_user_name">Identifiant</string>
   <string name="EMPTY_SERVER_NAME">Le nom du serveur est manquant</string>
   <string name="EMPTY_USER_NAME">Identifiant manquant</string>
   <string name="CONFIRM_PASSWORD">Les mots de passe ne correspondent pas</string>
-  <string name="account_archive_mode">Enregistrer l\'historique des messages</string>
-  <string name="account_archive_mode_available">Sur le serveur si disponible</string>
-  <string name="account_archive_mode_dont_store">Ne pas conserver</string>
-  <string name="account_archive_mode_local">Localement sur l\'appareil</string>
-  <string name="account_archive_mode_server">Sur le serveur</string>
-  <string name="account_archive_mode_unread">Localement mais seulement non-envoyé et non-lu</string>
-  <string name="account_compression_summary">Cochez pour activer la compression des données</string>
+    <string name="account_compression_summary">Cochez pour activer la compression des données</string>
   <string name="account_custom">Hôte personnalisé</string>
   <string name="account_custom_summary">Utiliser les paramètres d\'hôte personnalisés au lieu des données SRV</string>
-  <string name="account_enabled_summary">Interrupteur pour activer le compte</string>
-  <string name="account_invalid_port">Le port doit être un nombre (défaut : 5222)</string>
+    <string name="account_invalid_port">Le port doit être un nombre (défaut : 5222)</string>
   <string name="account_invalid_port_range">Le port doit être compris entre 1 et 65535 (défaut : 5222)</string>
   <string name="account_invalid_priority">La priorité doit être un nombre compris entre -128 et 127 (défaut : 10)</string>
-  <string name="account_oauth">Autorisation</string>
-  <string name="account_oauth_invalidated">Autorisation refusée</string>
-  <string name="account_oauth_summary">Paramètres OAuth</string>
-  <string name="account_proxy_host">Adresse du proxy</string>
+    <string name="account_proxy_host">Adresse du proxy</string>
   <string name="account_proxy_invalid_port_range">Le port du proxy doit être compris entre 1 et 65535 (défaut : 8080)</string>
   <string name="account_proxy_invalid_port">Le port du proxy doit être un nombre (défaut : 8080)</string>
   <string name="account_proxy_password">Mot de passe du proxy</string>
@@ -47,18 +32,14 @@
   <string name="account_sasl_summary">Désactiver pour les serveurs obsolètes</string>
   <string name="account_store_password">Enregistrer le mot de passe</string>
   <string name="account_store_password_summary">Désactiver cette option pour demander le mot de passe à chaque connexion</string>
-  <string name="account_syncable">Intégration aux contacts du système</string>
-  <string name="account_syncable_summary">Afficher les contacts de ce compte dans la liste de contacts de l\'appareil</string>
-  <string name="account_tls_enable">Activer TLS</string>
+    <string name="account_tls_enable">Activer TLS</string>
   <string name="account_tls_enable_summary">Utiliser le chiffrement TLS si le serveur le permet</string>
   <string name="account_tls_legacy">SSL obsolète</string>
   <string name="account_tls_legacy_summary">Utiliser le chiffrement SSL obsolète lors de la connexion au serveur</string>
   <string name="account_tls_mode">Utilisation de TLS/SSL</string>
   <string name="account_tls_require">TLS requis</string>
   <string name="account_tls_require_summary">Chiffrement TLS obligatoire pour la connexion</string>
-  <string name="account_use_orbot">Discuter via le réseau anonymisant TOR et forcer le chiffrement TLS\nDéconseillé pour Google Talk</string>
-  <string name="confirm_cancellation">Êtes-vous sûr de vouloir annuler vos modifications ?</string>
-  <string name="INCORRECT_USER_NAME">Identifiant incorrect. Consultez le message ci-dessous pour plus de détails.</string>
+    <string name="INCORRECT_USER_NAME">Identifiant incorrect. Consultez le message ci-dessous pour plus de détails.</string>
   <string name="orbot_required_message">Afin d\'utiliser TOR, Orbot doit être installé et activé pour relayer les communications. Voulez-vous l\'installer à partir de Google Play ?</string>
   <string name="orbot_required_title">Installer Orbot ?</string>
   <string name="install_orbot">Installer Orbot</string>
diff --git a/xabber/src/main/res/values-fr-rFR/chat_viewer.xml b/xabber/src/main/res/values-fr-rFR/chat_viewer.xml
index 21f5c53c9e..ae96506b68 100644
--- a/xabber/src/main/res/values-fr-rFR/chat_viewer.xml
+++ b/xabber/src/main/res/values-fr-rFR/chat_viewer.xml
@@ -21,11 +21,8 @@
   <string name="message_remove">Supprimer de l\'historique</string>
   <string name="message_repeat">Retenter l\'envoi</string>
   <string name="message_otr_show_original">Voir le message</string>
-  <string name="message_open_file">Ouvrir</string>
-  <string name="message_save_file">Sauvegarder</string>
-  <string name="save_history">Stocker l\'historique localement\nSauvegarder l\'historique des messages localement</string>
-  <string name="show_history">Afficher l\'historique</string>
-  <string name="action_attention_called">Demande d\'attention envoyée</string>
+    <string name="save_history">Stocker l\'historique localement\nSauvegarder l\'historique des messages localement</string>
+    <string name="action_attention_called">Demande d\'attention envoyée</string>
   <string name="action_attention_requested">Une demande d\'attention a été reçue</string>
   <string name="action_ban">%1$s a été banni</string>
   <string name="action_ban_by">%1$s a été banni par %2$s</string>
@@ -73,8 +70,7 @@
   <string name="otr_refresh">Relancer le chiffrement</string>
   <string name="otr_request">Une conversation privée OTR (Off-The-Record) a été demandée mais vous n\'avez pas le plugin requis. Utilisez Pidgin, Gajim ou Adium sur PC / Mac, et Xabber, Conversations ou ChatSecure sur Android. Allez sur http://otr.cypherpunks.ca/ pour plus d\'informations.</string>
   <string name="otr_start">Démarrer le chiffrement</string>
-  <string name="otr_unencrypted_message">Ce message n\'a pas été chiffré</string>
-  <string name="otr_unreadable_message">Le message chiffré que vous avez envoyé est illisible</string>
+    <string name="otr_unreadable_message">Le message chiffré que vous avez envoyé est illisible</string>
   <string name="otr_not_decrypted_message">Le message n\'a pas pu être déchiffré</string>
   <string name="otr_verification">Vérification OTR</string>
   <string name="otr_verify_fingerprint">Vérifiez avec une empreinte</string>
@@ -87,21 +83,13 @@
   <string name="otr_verification_progress_title">Vérification d’OTR en cours</string>
   <string name="otr_verification_notify_button">OUVERT</string>
   <string name="otr_verification_notify_button_cancel">ANNULER</string>
-  <string name="under_construction">En travaux</string>
-  <string name="under_construction_message">Cet écran est en cours de construction</string>
-  <string name="chat_events_show_text_global">Utiliser les paramètres globaux</string>
+    <string name="chat_events_show_text_global">Utiliser les paramètres globaux</string>
   <string name="chat_events_show_text_always">Afficher le texte du message</string>
   <string name="chat_events_show_text_never">Masquer le texte du message</string>
-  <string name="sending_file">Envoi du fichier %s en cours</string>
-  <string name="error_sending_file">Erreur lors de l\'envoi de %s</string>
-  <string name="no_application_to_open_file">Pas d\'application disponible pour ouvrir ce fichier</string>
-  <string name="could_not_save_file">Sauvegarde du fichier impossible</string>
-  <string name="file_saved_successfully">Fichier sauvegardé avec succès</string>
-  <string name="received_by">Reçu par %s</string>
-  <string name="could_not_get_path_to_file">Impossible de trouver le chemin du fichier</string>
+    <string name="error_sending_file">Erreur lors de l\'envoi de %s</string>
+    <string name="could_not_get_path_to_file">Impossible de trouver le chemin du fichier</string>
   <string name="message_open_private_chat">Ouvrir une conversation privée</string>
-  <string name="http_file_upload_slot_error">L\'upload du fichier a échoué. Est-il trop volumineux ?</string>
-  <string name="no_permission_to_read_files">Permission de lire les fichiers refusée</string>
+    <string name="no_permission_to_read_files">Permission de lire les fichiers refusée</string>
   <string name="no_permission_to_write_files">Permission d\'écrire les fichiers refusée</string>
   <string name="error_description_title">Description de l’erreur :</string>
   <string name="message_status_sent">Envoyé</string>
diff --git a/xabber/src/main/res/values-fr-rFR/contact_editor.xml b/xabber/src/main/res/values-fr-rFR/contact_editor.xml
index c011539b59..021596f1f1 100644
--- a/xabber/src/main/res/values-fr-rFR/contact_editor.xml
+++ b/xabber/src/main/res/values-fr-rFR/contact_editor.xml
@@ -17,12 +17,8 @@
   <string name="processing_image">Traitement de l\'image en cours...</string>
   <string name="error_during_crop">Erreur durant le redimensionnement de l\'image</string>
   <string name="error_during_image_processing">Erreur durant le traitement de l\'image</string>
-  <string name="account_settings">Paramètres du compte</string>
-  <string name="account_user_info">Détails du compte</string>
-  <string name="account_server_info">Informations serveur</string>
+    <string name="account_server_info">Informations serveur</string>
   <string name="account_server_info_description">Liste des fonctionnalités du serveur</string>
   <string name="conference_private_chat_invitation">%1$s de %2$s désire discuter en privé</string>
   <string name="accept_muc_private_chat">Accepter</string>
-  <string name="block_muc_private_chat">Bloquer</string>
-  <string name="no_permission_camera">Permission d\'accéder à la caméra refusée</string>
 </resources>
diff --git a/xabber/src/main/res/values-fr-rFR/contact_list.xml b/xabber/src/main/res/values-fr-rFR/contact_list.xml
index 5aa6a6e7a2..f50628d645 100644
--- a/xabber/src/main/res/values-fr-rFR/contact_list.xml
+++ b/xabber/src/main/res/values-fr-rFR/contact_list.xml
@@ -18,17 +18,13 @@
   <string name="application_state_roster">Connecté.</string>
   <string name="application_state_starting">Démarrage en cours&#8230;</string>
   <string name="application_state_waiting">En attente de connexion...</string>
-  <string name="chat_list">Conversations récentes</string>
-  <string name="chat_list_is_empty">Pas de conversation active</string>
-  <string name="chat_viewer">Conversation</string>
-  <string name="close_chat">Fermer cette conversation</string>
-  <string name="CONNECTION_FAILED">Erreur de connexion</string>
+    <string name="chat_viewer">Conversation</string>
+    <string name="CONNECTION_FAILED">Erreur de connexion</string>
   <string name="contact_add">Ajouter un contact</string>
   <string name="contact_delete">Supprimer</string>
   <string name="contact_block">Bloquer le contact</string>
   <string name="contact_delete_confirm">Souhaitez vous vraiment supprimer le contact %1$s du compte %2$s ?</string>
-  <string name="contact_list">Liste de contacts</string>
-  <string name="discard_subscription">Refuser le contact</string>
+    <string name="discard_subscription">Refuser le contact</string>
   <string name="exit">Quitter</string>
   <string name="group_active_chat">Conversations actives</string>
   <string name="group_none">Pas de groupes</string>
@@ -40,15 +36,7 @@
   <string name="request_subscription">Demande de souscription</string>
   <string name="XMPP_EXCEPTION">Erreur de flux</string>
   <string name="application_state_closing">Enregistrement des modifications...\nL\'application va être fermée sous peu.</string>
-  <string name="certificate_confirmation">%1$s.\nL\'émetteur utilise une empreinte (SHA-1) dépréciée qui n’est pas fiable : %2$s ? Voulez-vous ne pas être informé de ce problème avec ce certificat ?</string>
-  <string name="certificate_details">\n\nÉmis pour :\nNom commun (CN) : %1$s\nOrganisation (O) : %2$s\nUnité d\'organisation (OU) : %3$s\nNuméro de série : %4$s\n\nÉmis par :\nNom commun (CN) : %5$s\nOrganisation (O) : %6$s\nUnité d\'organisation (OU) : %7$s\n\nValidité :\nÉmis le : %8$s\nExpire le : %9$s</string>
-  <string name="certificate_invalid_chane">La vérification de la chaîne des signatures a échoué</string>
-  <string name="certificate_invalid_target">La vérification de la cible a échoué</string>
-  <string name="certificate_self_signed">Certificat auto-signé</string>
-  <string name="certificate_show_details">Détails...</string>
-  <string name="close_chats">Fermer toutes les conversations</string>
-  <string name="contact_integration_suggest">Voulez-vous que Xabber soit intégré dans le gestionnaire de contacts du système ?\nCeci peut être changé dans \"Paramètres\" → \"Comptes XMPP\" → Votre compte → \"Intégration des contacts\".\nNote : La liste des contacts peut être ralentie pendant quelques minutes.</string>
-  <string name="group_room">Conférences</string>
+    <string name="group_room">Conférences</string>
   <string name="OTR_ERROR">Erreur OTR</string>
   <string name="select_contact">Appuyez pour sélectionner le contact</string>
   <string name="show_offline_always">Toujours afficher</string>
@@ -63,8 +51,7 @@
   <string name="block_list">Liste de blocage</string>
   <string name="contact_blocked_successfully">Le contact est maintenant bloqué</string>
   <string name="error_blocking_contact">Erreur lors du blocage du contact</string>
-  <string name="unblock_contact">Débloquer le contact</string>
-  <string name="contacts_unblocked_successfully">Le contact est maintenant débloqué</string>
+    <string name="contacts_unblocked_successfully">Le contact est maintenant débloqué</string>
   <string name="error_unblocking_contacts">Erreur lors du déblocage du contact</string>
   <string name="block_contact_confirm">Êtes-vous sûr de vouloir bloquer le contact %1$s du compte %2$s ?</string>
   <string name="unblock_all_contacts_confirm">Êtes-vous sûr de vouloir débloquer tous les contacts du compte %1$s ?</string>
@@ -76,19 +63,10 @@
   <string name="dark_theme_suggest_dialog_stay_on_light_side">Rester dans le côté Lumineux</string>
   <string name="battery_optimization_disable_dialog_title">Optimisation de la batterie</string>
   <string name="battery_optimization_disable_dialog_message">Votre appareil procède à l\'optimisation de la consommation d’énergie de Xabber, ce qui peut retarder les notifications ou mener à la perte de certains message.\n\nVous allez maintenant être invité à désactiver cette optimisation.</string>
-  <string name="save_log_to_file">Sauvegarder dans un fichier</string>
-  <string name="clear_log">Supprimer les anciens fichiers journaux</string>
+    <string name="clear_log">Supprimer les anciens fichiers journaux</string>
   <string name="open_log_file">Ouvrir</string>
   <string name="send_log_file">Envoyer</string>
-  <string name="intro_welcome">Bienvenue sur Xabber</string>
-  <string name="intro_xabber_description">Client XMPP Open source pour Android</string>
-  <string name="intro_have_account">Login XMPP</string>
-  <string name="intro_register_account">Créer un compte XMPP</string>
-  <string name="intro_create_xabber_account">Utiliser un compte Xabber</string>
-  <string name="intro_use_third_party_accounts">utiliser des comptes XMPP tiers</string>
-  <string name="intro_faq">Si vous n’avez pas un compte XMPP, veuillez <a href="https://www.xabber.com/faq/"> lire notre F.A.Q.</a> sur comment en obtenir un.</string>
-  <string name="intro_web_search_register_xmpp">Créer un compte XMPP</string>
-  <string name="synchronize_bookmarks">Synchroniser les marque-pages</string>
+    <string name="synchronize_bookmarks">Synchroniser les marque-pages</string>
   <string name="remove_all_bookmarks">Tout supprimer</string>
   <string name="remove_selected_bookmarks">Supprimer les éléments sélectionnés</string>
   <string name="remove_all_bookmarks_confirm">Voulez-vous vraiment supprimer tous les marque-pages du compte %1$s ?</string>
diff --git a/xabber/src/main/res/values-fr-rFR/contact_viewer.xml b/xabber/src/main/res/values-fr-rFR/contact_viewer.xml
index 942d6bceab..44495f29a4 100644
--- a/xabber/src/main/res/values-fr-rFR/contact_viewer.xml
+++ b/xabber/src/main/res/values-fr-rFR/contact_viewer.xml
@@ -17,12 +17,9 @@
   <string name="vcard_organization_unit">Unité organisationnelle</string>
   <string name="vcard_title">Titre de l\'emploi, fonction</string>
   <string name="vcard_role">Rôle</string>
-  <string name="vcard_other">Autres informations</string>
-  <string name="vcard_categories">Catégories</string>
-  <string name="vcard_decsription">Description</string>
+    <string name="vcard_decsription">Description</string>
   <string name="vcard_note">Notes</string>
-  <string name="vcard_address">Adresse</string>
-  <string name="vcard_address_pobox">Boîte postale</string>
+    <string name="vcard_address_pobox">Boîte postale</string>
   <string name="vcard_address_extadr">Adresse étendue</string>
   <string name="vcard_address_street">Rue</string>
   <string name="vcard_address_locality">Ville</string>
diff --git a/xabber/src/main/res/values-fr-rFR/muc_editor.xml b/xabber/src/main/res/values-fr-rFR/muc_editor.xml
index 9bc67719aa..4baf983aba 100644
--- a/xabber/src/main/res/values-fr-rFR/muc_editor.xml
+++ b/xabber/src/main/res/values-fr-rFR/muc_editor.xml
@@ -20,12 +20,10 @@
   <string name="muc_invite_confirm">%2$s vous a invité à rejoindre la conférence %3$s. Le rejoindre avec le compte %1$s ?</string>
   <string name="muc_invite_confirm_reason">%2$s vous a invité à rejoindre la conférence %3$s : %4$s. La rejoindre avec le compte %1$s ?</string>
   <string name="muc_leave">Quitter la conférence</string>
-  <string name="muc_save">Enregistrer la conférence</string>
-  <string name="muc_choose_conference">Choisir une conférence</string>
+    <string name="muc_choose_conference">Choisir une conférence</string>
   <string name="muc_next">Suivant</string>
   <string name="muc_get_hosted_conferences">Obtenir la liste des conférences hébergées</string>
   <string name="muc_error_getting_conferences">Erreur lors de l\'obtention de la liste des conférences</string>
   <string name="muc_type_conference_name">Entrez le nom de la conférence</string>
-  <string name="contact_is_blocked">Ce contact est bloqué!</string>
-  <string name="conference_invitation">Invitation à une conférence</string>
+    <string name="conference_invitation">Invitation à une conférence</string>
 </resources>
diff --git a/xabber/src/main/res/values-fr-rFR/notification_bar.xml b/xabber/src/main/res/values-fr-rFR/notification_bar.xml
index 8da0f2e53f..50030f45e6 100644
--- a/xabber/src/main/res/values-fr-rFR/notification_bar.xml
+++ b/xabber/src/main/res/values-fr-rFR/notification_bar.xml
@@ -27,10 +27,7 @@
   <string name="connection_state_waiting_2">%1$d %3$s sur %2$d en attente de connexion</string>
   <!-- Used for plural form in russian. -->
   <string name="connection_state_offline">%1$d %2$s hors-ligne</string>
-  <string name="archive_available_request_message">Souhaitez-vous stocker l\'historique des messages sur le serveur ?\nCela permet à Xabber d\'obtenir l\'historique des messages pour l\'ensemble des appareils qui utilisent ce compte.\nCette fonction génère un peu plus de trafic et réduit légèrement la vitesse de connexion.\nATTENTION : Tout votre historique local va être supprimé.</string>
-  <string name="archive_available_request_title">Activer l\'archivage des messages ?</string>
-  <string name="INVALID_CERTIFICATE">Certificat non-valide</string>
-  <string name="muc_invite_message">Souhaitez-vous rejoindre la conférence ?</string>
+    <string name="muc_invite_message">Souhaitez-vous rejoindre la conférence ?</string>
   <string name="otr_verification_in_progress">Appuyez ici pour annuler.</string>
   <string name="PASSWORD_REQUIRED">Mot de passe requis</string>
   <string name="pay_attention">Demande d\'attention</string>
diff --git a/xabber/src/main/res/values-fr-rFR/preference_editor.xml b/xabber/src/main/res/values-fr-rFR/preference_editor.xml
index 327f025c2d..00d421b3ae 100644
--- a/xabber/src/main/res/values-fr-rFR/preference_editor.xml
+++ b/xabber/src/main/res/values-fr-rFR/preference_editor.xml
@@ -12,14 +12,11 @@
   <string name="contacts_order_alphabet">Alphabétique</string>
   <string name="contacts_order_status">Par statut</string>
   <string name="contacts_show_accounts">Grouper par compte\nGroupe les contacts par compte dans la liste de contacts</string>
-  <string name="contacts_show_active_chats">Conversations actives en haut\nAffiche les conversations actives en haut de la liste de contacts</string>
-  <string name="contacts_show_avatars">Afficher les avatars\nAffiche les avatars des utilisateurs dans la liste de contacts</string>
+    <string name="contacts_show_avatars">Afficher les avatars\nAffiche les avatars des utilisateurs dans la liste de contacts</string>
   <string name="contacts_show_empty_groups">Afficher les groupes vides\nAfficher les groupes sans contact en ligne</string>
   <string name="contacts_show_groups">Afficher les groupes\nAffiche les groupes dans la liste de contacts</string>
   <string name="contacts_show_offline">Afficher les contacts hors-ligne</string>
-  <string name="contacts_show_panel">Boutons de compte\nAffiche des boutons d\'action avec avatar en bas et à droite de la liste de contacts</string>
-  <string name="contacts_stay_active_chats">Dupliquer les conversations actives\nLes conversations actives apparaissent à la fois en haut de la liste de contacts et dans les groupes</string>
-  <string name="debug_log">Journal de débogage\nÉcrire les messages dans le journal de débogage (redémarrez l\'application pour appliquer)</string>
+    <string name="debug_log">Journal de débogage\nÉcrire les messages dans le journal de débogage (redémarrez l\'application pour appliquer)</string>
   <string name="debug_file_log_title">Écrire le journal\nÉcrire le journal de débogage dans un fichier local (vous pouvez le partage).</string>
   <string name="debug_log_files_title">Fichier journaux\nListe des fichiers journaux enregistrés.</string>
   <string name="debug_log_files_activity_title">Fichiers journaux</string>
@@ -36,8 +33,7 @@
   <string name="interface_theme">Thème</string>
   <string name="interface_theme_dark">Foncé</string>
   <string name="interface_theme_light">Clair</string>
-  <string name="interface_theme_normal">Défaut</string>
-  <string name="interface_smiles">Émoticônes</string>
+    <string name="interface_smiles">Émoticônes</string>
   <string name="interface_smiles_android">Émoticônes Android</string>
   <string name="interface_smiles_none">Pas d\'émoticônes graphiques</string>
   <string name="preference_connection">Paramètres de connexion\nParamètres de connexion</string>
@@ -62,8 +58,7 @@
   <string name="chats_font_size_xlarge">Très grande</string>
   <string name="chats_hide_keyboard">Masquer le clavier</string>
   <string name="chats_hide_keyboard_landscape">En mode paysage</string>
-  <string name="chats_receipt">Accusés de réception\nEnvoyer et recevoir des accusés de réception</string>
-  <string name="chats_show_avatars">Avatars dans les messages\nAffiche les avatars dans chaque message</string>
+    <string name="chats_show_avatars">Avatars dans les messages\nAffiche les avatars dans chaque message</string>
   <string name="chats_show_status_change">Montre les changements de statut</string>
   <string name="chats_show_status_change_muc">Dans les conférences</string>
   <string name="chats_state_notification">Envoyer notifications d\'écriture\nNotifie vos interlocuteurs lorsque vous écrivez</string>
@@ -77,37 +72,24 @@
   <string name="contacts_reset_offline">Réinitialiser les paramètres hors-ligne\nEffacer les paramètres hors-ligne individuels des groupes et des comptes</string>
   <string name="contacts_reset_offline_warning">Êtes-vous sûr de vouloir effacer les paramètres hors-ligne individuels des groupes et des comptes ?</string>
   <string name="events_first_only">Notifier au 1er message\nAlerter uniquement à la réception du 1er message d\'une conversation</string>
-  <string name="events_ignore_system_vibro">Ignorer les paramètres système du vibreur\nUtilisez cette option si le vibreur ne fonctionne pas</string>
-  <string name="events_message">Paramètres de notification\nConfigurer les notifications des messages entrants</string>
-  <string name="events_message_chat">Conversations seulement</string>
-  <string name="events_message_chat_and_muc">Conversations et conférences</string>
-  <string name="events_message_none">Ne pas notifier</string>
-  <string name="events_show_text">Aperçu\nAffiche le texte des messages des discussions dans la zone de notification</string>
+    <string name="events_show_text">Aperçu\nAffiche le texte des messages des discussions dans la zone de notification</string>
   <string name="events_show_text_muc">Aperçu\nAffiche le texte des messages des Conférences dans la zone de notification</string>
-  <string name="events_visible_chat">Notifier pour la conversation affichée\nNotifier lorsqu\'un message est reçu dans la conversation affichée</string>
-  <string name="events_suppress_100">Masquer certaines notifications\nMasque les messages \"Cette conférence n\'est pas anonyme\"</string>
+    <string name="events_suppress_100">Masquer certaines notifications\nMasque les messages \"Cette conférence n\'est pas anonyme\"</string>
   <string name="negative_priotiry_summary">%s (Vous ne recevrez aucun message)</string>
   <string name="preference_accounts">Comptes XMPP\nGérer les comptes</string>
   <string name="preference_security">Sécurité\nParamètres de sécurité</string>
   <string name="security_check_certificate">Vérifier le certificat du server\nPrévenir en cas de problème de certificat sur les connections chiffrées</string>
-  <string name="security_clear_certificate">Supprimer les certificats\nSupprimer tous les certificats ignorés</string>
-  <string name="security_otr_history">Conserver l\'historique\nStocker l\'historique des conversations pour les sessions OTR</string>
-  <string name="security_otr_mode">Mode OTR</string>
+    <string name="security_otr_mode">Mode OTR</string>
   <string name="chats_attention">Demande d\'attention\nNotifier pour les demandes d\'attention reçues</string>
   <string name="chats_attention_sound">Sonnerie de demande d\'attention\nChoisir une sonnerie</string>
   <string name="connection_load_vcard">Charger les vCard\nTélécharger et mettre à jour les détails personnels et les avatars des contacts. Désactivez pour réduire l\'utilisation du réseau.</string>
   <string name="connection_load_images">Charger les images\nCharger les images depuis l\'URL du fichier automatiquement. Désactiver pour réduire l\'utilisation du réseau.</string>
   <string name="connection_use_carbons">Mode copie carbone\nPeut être instable ! Partagera les séances pour le même compte utilisant ce client. Désactiver pour réduire l\'utilisation du réseau.</string>
-  <string name="connection_dns_resolver_type">Type de résolveur DNS</string>
-  <string name="connection_dns_resolver_type_dns_java_resolver">DNSJavaResolver</string>
+    <string name="connection_dns_resolver_type_dns_java_resolver">DNSJavaResolver</string>
   <string name="connection_dns_resolver_type_mini_dns_resolver">MiniDNSResolver (expérimental)</string>
-  <string name="connection_use_plain_text_auth">Authentification non-chiffrée\nUtilise une authentification non-chiffrée pour tous les comptes. Déconseillé.</string>
-  <string name="events_phrases">Expressions clés\nCréer des notifications personnalisées pour les messages reçus contenant des formules spécifiques</string>
-  <string name="security_clear_certificate_warning">Êtes-vous sûr de vouloir supprimer tous les certificats ignorés ?</string>
-  <string name="account_error_settings">Paramètres</string>
-  <string name="category_xabber_account">Compte Xabber</string>
-  <string name="category_xmpp_accounts">Comptes XMPP</string>
-  <string name="category_interface">Interface</string>
+    <string name="events_phrases">Expressions clés\nCréer des notifications personnalisées pour les messages reçus contenant des formules spécifiques</string>
+    <string name="account_error_settings">Paramètres</string>
+    <string name="category_interface">Interface</string>
   <string name="category_settings">Paramètres</string>
   <string name="category_about">À propos</string>
   <string name="category_appearance">Apparence</string>
diff --git a/xabber/src/main/res/values-fr-rFR/words.xml b/xabber/src/main/res/values-fr-rFR/words.xml
index e7a98fd694..ac988e6ef4 100644
--- a/xabber/src/main/res/values-fr-rFR/words.xml
+++ b/xabber/src/main/res/values-fr-rFR/words.xml
@@ -20,5 +20,4 @@
   <string name="settings">Paramètres</string>
   <string name="ok">OK</string>
   <string name="login">Identifiant</string>
-  <string name="resume">Continuer</string>
 </resources>
diff --git a/xabber/src/main/res/values-hu-rHU/account_editor.xml b/xabber/src/main/res/values-hu-rHU/account_editor.xml
index 5d0e503b45..64a75bacc6 100644
--- a/xabber/src/main/res/values-hu-rHU/account_editor.xml
+++ b/xabber/src/main/res/values-hu-rHU/account_editor.xml
@@ -2,40 +2,25 @@
 <!--Generated by crowdin.com-->
 <resources>
   <string name="account_compression">Tömörítés használata</string>
-  <string name="account_enabled">Engedélyezve</string>
-  <string name="account_host">Gazdagép</string>
+    <string name="account_host">Gazdagép</string>
   <string name="account_password">Jelszó</string>
   <string name="confirm_password">Jelszó megerősítése</string>
   <string name="account_port">Port</string>
   <string name="account_priority">Prioritás</string>
   <string name="account_resource">Erőforrás</string>
   <string name="account_server_name">Szerver</string>
-  <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=Regisztrálj XMPP fiókot">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="account_xmpp_register_warning"><a href="http://www.google.com/#q=Regisztrálj XMPP fiókot">Regisztrálj XMPP fiókot</a>, azután tudod hozzáadni a Xabberhez!</string>
+    <string name="account_user_name">Felhasználónév</string>
   <string name="EMPTY_SERVER_NAME">A szervernév nincs megadva</string>
   <string name="EMPTY_USER_NAME">A felhasználónév nincs megadva</string>
   <string name="CONFIRM_PASSWORD">A jelszavak nem egyeznek</string>
-  <string name="account_archive_mode">Csevegési előzmények tárolása</string>
-  <string name="account_archive_mode_available">Szerveren, ha lehet</string>
-  <string name="account_archive_mode_dont_store">Ne tárolja</string>
-  <string name="account_archive_mode_local">Helyben az eszközön</string>
-  <string name="account_archive_mode_server">Szerveren</string>
-  <string name="account_archive_mode_unread">Helyben csak az elküldetlent és olvasatlant</string>
-  <string name="account_compression_summary">Jelöld be a tömörítés engedélyezéséhez</string>
+    <string name="account_compression_summary">Jelöld be a tömörítés engedélyezéséhez</string>
   <string name="account_custom">Egyedi gazdagép</string>
   <string name="account_custom_summary">Egyedi gazdagépbeállítások használata az SRV rekordok helyett</string>
-  <string name="account_enabled_summary">A kapcsolóval engedélyezhető a fiók</string>
-  <string name="account_invalid_port">A port egy szám (alapesetben: 5222)</string>
+    <string name="account_invalid_port">A port egy szám (alapesetben: 5222)</string>
   <string name="account_invalid_port_range">A port egy 1 és 65535 közötti szám (alapértelmezett: 5222)</string>
   <string name="account_invalid_priority">A prioritás egy szám -128 és 127 között (alapesetben: 10)</string>
-  <string name="account_oauth">Hitelesítés</string>
-  <string name="account_oauth_invalidated">Nincs hitelesítve</string>
-  <string name="account_oauth_summary">OAuth beállítások</string>
-  <string name="account_proxy_host">Proxy állomás</string>
+    <string name="account_proxy_host">Proxy állomás</string>
   <string name="account_proxy_invalid_port_range">A proxy-port egy 1 és 65535 közötti szám (alapértelmezett: 8080)</string>
   <string name="account_proxy_invalid_port">A proxy-port egy szám (alapértelmezett: 8080)</string>
   <string name="account_proxy_password">Proxy jelszó</string>
@@ -47,18 +32,14 @@
   <string name="account_sasl_summary">Kapcsold ki nagyon régi szerver esetén</string>
   <string name="account_store_password">Jelszó tárolása</string>
   <string name="account_store_password_summary">Tiltsd le ezt a lehetőséget, hogy minden bejelentkezéskor kérje a jelszót</string>
-  <string name="account_syncable">Beépülés a rendszernévjegyzékbe</string>
-  <string name="account_syncable_summary">A fiók kapcsolatainak megjelenítése a telefon névjegyzékében</string>
-  <string name="account_tls_enable">TLS engedélyezése</string>
+    <string name="account_tls_enable">TLS engedélyezése</string>
   <string name="account_tls_enable_summary">Hacsak lehetséges, TLS titkosítás használata a szerverhez csatlakozáskor</string>
   <string name="account_tls_legacy">Hagyományos SSL</string>
   <string name="account_tls_legacy_summary">Hagyományos SSL titkosítás használata a szerverhez csatlakozáskor</string>
   <string name="account_tls_mode">TLS/SSL használat</string>
   <string name="account_tls_require">TLS megkövetelése</string>
   <string name="account_tls_require_summary">TLS titkosítás megkövetelése a szerverhez csatlakozáskor</string>
-  <string name="account_use_orbot">TOR hálózaton keresztüli csevegés és TLS titkosítás kényszerítése\nnem ajánlott a Google Talk használatakor</string>
-  <string name="confirm_cancellation">Biztosan elvetsz minden változtatást?</string>
-  <string name="INCORRECT_USER_NAME">Hibás felhasználónév. Nézd meg az alábbi súgószöveget részletekért.</string>
+    <string name="INCORRECT_USER_NAME">Hibás felhasználónév. Nézd meg az alábbi súgószöveget részletekért.</string>
   <string name="orbot_required_message">TOR használatához szükséges az Orbot telepítése és aktiválása, hogy a proxyforgalom átmenjen rajta. Szeretnéd telepíteni a Google Play-ről?</string>
   <string name="orbot_required_title">Orbot telepítése?</string>
   <string name="install_orbot">Orbot telepítése</string>
diff --git a/xabber/src/main/res/values-hu-rHU/chat_viewer.xml b/xabber/src/main/res/values-hu-rHU/chat_viewer.xml
index 7ef218051c..310aa1c1f4 100644
--- a/xabber/src/main/res/values-hu-rHU/chat_viewer.xml
+++ b/xabber/src/main/res/values-hu-rHU/chat_viewer.xml
@@ -19,11 +19,8 @@
   <string name="message_quote">Idéz</string>
   <string name="message_remove">Törlés az előzményekből</string>
   <string name="message_repeat">Küldés ismétlése</string>
-  <string name="message_open_file">Megnyitás</string>
-  <string name="message_save_file">Mentés</string>
-  <string name="save_history">Előzmények helyi mentése\nAz üzenetelőzmények helyi tárolása</string>
-  <string name="show_history">Előzmények megjelenítése</string>
-  <string name="action_attention_called">Figyelmet kértél</string>
+    <string name="save_history">Előzmények helyi mentése\nAz üzenetelőzmények helyi tárolása</string>
+    <string name="action_attention_called">Figyelmet kértél</string>
   <string name="action_attention_requested">Figyelmet kért</string>
   <string name="action_ban">%1$s kitiltva</string>
   <string name="action_ban_by">%2$s kitiltotta %1$s felhasználót</string>
@@ -71,26 +68,17 @@
   <string name="otr_refresh">Titkosítás újraindítása</string>
   <string name="otr_request">Off-the-Record magánbeszélgetésre hívtak, de nincs bővítményed, amely ezt támogatná. PC-n/Macen használd a Pidgin, Gajim vagy Adium programot, illetve Androidon a Xabber, Conversations vagy ChatSecure alkalmazást. További információért keresd fel a http://otr.cypherpunks.ca/ webhelyet.</string>
   <string name="otr_start">Titkosítás indítása</string>
-  <string name="otr_unencrypted_message">Ez az üzenet nem titkosított</string>
-  <string name="otr_unreadable_message">Az elküldött titkosított üzeneted olvashatatlan</string>
+    <string name="otr_unreadable_message">Az elküldött titkosított üzeneted olvashatatlan</string>
   <string name="otr_verification">OTR ellenőrzés</string>
   <string name="otr_verify_fingerprint">Ellenőrzés ujjlenyomattal</string>
   <string name="otr_verify_question">Ellenőrzés kérdéssel</string>
   <string name="otr_verify_secret">Ellenőrzés közös titokkal</string>
-  <string name="under_construction">Fejlesztés alatt</string>
-  <string name="under_construction_message">Ez a képernyő fejlesztés alatt áll</string>
-  <string name="chat_events_show_text_global">Globális beállítások használata</string>
+    <string name="chat_events_show_text_global">Globális beállítások használata</string>
   <string name="chat_events_show_text_always">Üzenet szövegének megjelenítése</string>
   <string name="chat_events_show_text_never">Üzenet szövegének elrejtése</string>
-  <string name="sending_file">%s fájl küldése</string>
-  <string name="error_sending_file">%s fájl küldése nem sikerült</string>
-  <string name="no_application_to_open_file">Nem található alkalmazás a fájl megnyitásához</string>
-  <string name="could_not_save_file">A fájlt nem sikerült elmenteni</string>
-  <string name="file_saved_successfully">A fájl sikeresen elmentve</string>
-  <string name="received_by">%s alkalmazáson keresztül</string>
-  <string name="could_not_get_path_to_file">Nem sikerült beolvasni a fájl elérési útját</string>
+    <string name="error_sending_file">%s fájl küldése nem sikerült</string>
+    <string name="could_not_get_path_to_file">Nem sikerült beolvasni a fájl elérési útját</string>
   <string name="message_open_private_chat">Magánbeszélgetés megnyitása</string>
-  <string name="http_file_upload_slot_error">Nem sikerült feltölteni a fájlt. Túl nagy?</string>
-  <string name="no_permission_to_read_files">Nincs engedélyezve a fájlok olvasása</string>
+    <string name="no_permission_to_read_files">Nincs engedélyezve a fájlok olvasása</string>
   <string name="no_permission_to_write_files">Nincs engedélyezve a fájlok írása</string>
 </resources>
diff --git a/xabber/src/main/res/values-hu-rHU/contact_editor.xml b/xabber/src/main/res/values-hu-rHU/contact_editor.xml
index 90d8f43249..42c9a20d8d 100644
--- a/xabber/src/main/res/values-hu-rHU/contact_editor.xml
+++ b/xabber/src/main/res/values-hu-rHU/contact_editor.xml
@@ -17,12 +17,8 @@
   <string name="processing_image">Kép feldolgozása&#8230;</string>
   <string name="error_during_crop">Hiba a kép vágása közben</string>
   <string name="error_during_image_processing">Hiba a kép feldolgozás során</string>
-  <string name="account_settings">Fiókbeállítások</string>
-  <string name="account_user_info">Fiókinformációk</string>
-  <string name="account_server_info">Szerverinformációk</string>
+    <string name="account_server_info">Szerverinformációk</string>
   <string name="account_server_info_description">A szerver funkcióinak lekérése</string>
   <string name="conference_private_chat_invitation">%2$s beszélgetésből %1$s privát csevegésre hív</string>
   <string name="accept_muc_private_chat">Elfogadás</string>
-  <string name="block_muc_private_chat">Tiltás</string>
-  <string name="no_permission_camera">Nincs engedélyezve a hozzáférés a kamerához</string>
 </resources>
diff --git a/xabber/src/main/res/values-hu-rHU/contact_list.xml b/xabber/src/main/res/values-hu-rHU/contact_list.xml
index af945eb520..fce21a7071 100644
--- a/xabber/src/main/res/values-hu-rHU/contact_list.xml
+++ b/xabber/src/main/res/values-hu-rHU/contact_list.xml
@@ -18,17 +18,13 @@
   <string name="application_state_roster">Csatlakozva.</string>
   <string name="application_state_starting">Alkalmazás indítása&#8230;</string>
   <string name="application_state_waiting">Kapcsolódásra vár&#8230;</string>
-  <string name="chat_list">Csevegéslista</string>
-  <string name="chat_list_is_empty">Nincs aktív csevegés</string>
-  <string name="chat_viewer">Csevegés</string>
-  <string name="close_chat">Csevegés bezárása</string>
-  <string name="CONNECTION_FAILED">Csatlakozási hiba</string>
+    <string name="chat_viewer">Csevegés</string>
+    <string name="CONNECTION_FAILED">Csatlakozási hiba</string>
   <string name="contact_add">Partner hozzáadása</string>
   <string name="contact_delete">Törlés</string>
   <string name="contact_block">Partner tiltása</string>
   <string name="contact_delete_confirm">Valóban törlöd %1$s partnert %2$s fiókból?</string>
-  <string name="contact_list">Partnerlista</string>
-  <string name="discard_subscription">Partner elutasítása</string>
+    <string name="discard_subscription">Partner elutasítása</string>
   <string name="exit">Kilépés</string>
   <string name="group_active_chat">Aktív csevegések</string>
   <string name="group_none">Csoport nélkül</string>
@@ -40,14 +36,7 @@
   <string name="request_subscription">Feliratkozás kérése</string>
   <string name="XMPP_EXCEPTION">Adatfolyam hiba</string>
   <string name="application_state_closing">Változások mentése...\nAz alkalmazás hamarosan bezáródik.</string>
-  <string name="certificate_details">\n\nTulajdonos:\nÁltalános név (CN): %1$s\nSzervezet (O): %2$s\nSzervezeti egység (OU): %3$s\nSorozatszám: %4$s\n\nKibocsátó:\nÁltalános név (CN): %5$s\nSzervezet (O): %6$s\nSzervezeti egység (OU): %7$s\n\nÉrvényesség időtartama: \nKezdődik: %8$s \nLejárat dátuma: %9$s.</string>
-  <string name="certificate_invalid_chane">Aláíráslánc ellenőrzése sikertelen</string>
-  <string name="certificate_invalid_target">Cél ellenőrzése sikertelen</string>
-  <string name="certificate_self_signed">Önaláírt tanúsítvány</string>
-  <string name="certificate_show_details">Részletek&#8230;</string>
-  <string name="close_chats">Minden csevegés bezárása</string>
-  <string name="contact_integration_suggest">Szeretnéd a Xabbert integrálni a rendszer névjegyzékbe?\nEzt meg lehet változtatni: \"Beállítások\" → \"XMPP fiókok\" → Fiókod → \"Kapcsolatok integrálása\". \nMegj.: A rendszer névjegyzéke lassulhat kicsit pár percre.</string>
-  <string name="group_room">Konferenciák</string>
+    <string name="group_room">Konferenciák</string>
   <string name="OTR_ERROR">OTR hiba</string>
   <string name="select_contact">Érintéssel válassz névjegyet</string>
   <string name="show_offline_always">Mindig mutassa</string>
@@ -62,8 +51,7 @@
   <string name="block_list">Tiltólista</string>
   <string name="contact_blocked_successfully">Partner sikeresen letiltva</string>
   <string name="error_blocking_contact">Nem sikerült a partner tiltása</string>
-  <string name="unblock_contact">Tiltás feloldása</string>
-  <string name="contacts_unblocked_successfully">A partner tiltása sikeresen feloldva</string>
+    <string name="contacts_unblocked_successfully">A partner tiltása sikeresen feloldva</string>
   <string name="error_unblocking_contacts">Nem sikerült a partnertiltás feloldása</string>
   <string name="block_contact_confirm">Biztosan le szeretnéd tiltani %1$s partnert %2$s fiókon?</string>
   <string name="unblock_all_contacts_confirm">Biztosan feloldod az összes partner tiltását %1$s fiókon?</string>
@@ -75,13 +63,7 @@
   <string name="dark_theme_suggest_dialog_stay_on_light_side">Világos</string>
   <string name="battery_optimization_disable_dialog_title">Akkumulátoroptimalizálás</string>
   <string name="battery_optimization_disable_dialog_message">A készüléked akkumulátoroptimalizálása a Xabbert komolyan visszafogja, emiatt késhetnek az értesítések vagy akár üzenetek veszhetnek el.\n\nMost kikapcsolhatod ezt.</string>
-  <string name="save_log_to_file">Mentés fájlba</string>
-  <string name="clear_log">Régi naplófájlok törlése</string>
+    <string name="clear_log">Régi naplófájlok törlése</string>
   <string name="open_log_file">Megnyitás</string>
   <string name="send_log_file">Küldés</string>
-  <string name="intro_welcome">Üdvözlet a Xabberben!</string>
-  <string name="intro_xabber_description">Nyílt forráskódú XMPP kliens Androidra</string>
-  <string name="intro_register_account">XMPP-fiók regisztrálása</string>
-  <string name="intro_faq">Ha nincs még XMPP fiókod, <a href="https://www.xabber.com/faq/">olvasd el a GyIK-et</a>, hogy hogyan szerezhetsz.</string>
-  <string name="intro_web_search_register_xmpp">XMPP fiók regisztrálása</string>
 </resources>
diff --git a/xabber/src/main/res/values-hu-rHU/contact_viewer.xml b/xabber/src/main/res/values-hu-rHU/contact_viewer.xml
index 125bc755c0..4e7aaf3557 100644
--- a/xabber/src/main/res/values-hu-rHU/contact_viewer.xml
+++ b/xabber/src/main/res/values-hu-rHU/contact_viewer.xml
@@ -17,12 +17,9 @@
   <string name="vcard_organization_unit">Szervezeti egység</string>
   <string name="vcard_title">Munkakör</string>
   <string name="vcard_role">Beosztás</string>
-  <string name="vcard_other">Egyéb információ</string>
-  <string name="vcard_categories">Kategóriák</string>
-  <string name="vcard_decsription">Leírás</string>
+    <string name="vcard_decsription">Leírás</string>
   <string name="vcard_note">Jegyzet</string>
-  <string name="vcard_address">Cím</string>
-  <string name="vcard_address_pobox">Postafiók</string>
+    <string name="vcard_address_pobox">Postafiók</string>
   <string name="vcard_address_extadr">Bővebb cím</string>
   <string name="vcard_address_street">Utca</string>
   <string name="vcard_address_locality">Helység</string>
diff --git a/xabber/src/main/res/values-hu-rHU/muc_editor.xml b/xabber/src/main/res/values-hu-rHU/muc_editor.xml
index 32cbb65cc2..d34c14ba42 100644
--- a/xabber/src/main/res/values-hu-rHU/muc_editor.xml
+++ b/xabber/src/main/res/values-hu-rHU/muc_editor.xml
@@ -20,12 +20,10 @@
   <string name="muc_invite_confirm">%2$s szeretné, ha csatlakoznál %3$s konferenciabeszélgetéshez. Csatlakozol %1$s fiókkal?</string>
   <string name="muc_invite_confirm_reason">%2$s szeretné, ha csatlakoznál %3$s konferenciához: %4$s. Csatlakozol %1$s fiókkal?</string>
   <string name="muc_leave">Konferencia elhagyása</string>
-  <string name="muc_save">Konferencia mentése</string>
-  <string name="muc_choose_conference">Konferencia kiválasztása</string>
+    <string name="muc_choose_conference">Konferencia kiválasztása</string>
   <string name="muc_next">Tovább</string>
   <string name="muc_get_hosted_conferences">Szerver konferenciáinak lekérése</string>
   <string name="muc_error_getting_conferences">Konferenciák lekérése sikertelen</string>
   <string name="muc_type_conference_name">Konferencianév megadása</string>
-  <string name="contact_is_blocked">A partner le van tiltva!</string>
-  <string name="conference_invitation">Meghívás konferenciabeszélgetésre</string>
+    <string name="conference_invitation">Meghívás konferenciabeszélgetésre</string>
 </resources>
diff --git a/xabber/src/main/res/values-hu-rHU/notification_bar.xml b/xabber/src/main/res/values-hu-rHU/notification_bar.xml
index 3b2992d8a4..81143ac61d 100644
--- a/xabber/src/main/res/values-hu-rHU/notification_bar.xml
+++ b/xabber/src/main/res/values-hu-rHU/notification_bar.xml
@@ -34,10 +34,7 @@
   <!-- Used for plural form in russian. -->
   <string name="connection_state_waiting_5">-</string>
   <string name="connection_state_offline">%1$d %2$s kijelentkezve</string>
-  <string name="archive_available_request_message">A csevegési előzményeket a szerveren akarod tárolni?\nEz lehetővé teszi, hogy a Xabber betöltse a fiókhoz tartozó előzményeket egyéb eszközökről is.\nEz a lehetőség kissé megnöveli az adatforgalmat, és csökkentheti a kapcsolat sebességét.\nFIGYELEM: Minden helyben tárolt előzmény törölve lesz!</string>
-  <string name="archive_available_request_title">Engedélyezed az üzenetek archiválását?</string>
-  <string name="INVALID_CERTIFICATE">Hibás tanúsítvány</string>
-  <string name="muc_invite_message">Belépsz a konferenciába?</string>
+    <string name="muc_invite_message">Belépsz a konferenciába?</string>
   <string name="otr_verification_in_progress">Kopp ide a leállításhoz.</string>
   <string name="PASSWORD_REQUIRED">Jelszó szükséges</string>
   <string name="pay_attention">Figyelem</string>
diff --git a/xabber/src/main/res/values-hu-rHU/preference_editor.xml b/xabber/src/main/res/values-hu-rHU/preference_editor.xml
index 89bf6f1724..0c845d2f1e 100644
--- a/xabber/src/main/res/values-hu-rHU/preference_editor.xml
+++ b/xabber/src/main/res/values-hu-rHU/preference_editor.xml
@@ -8,14 +8,11 @@
   <string name="contacts_order_alphabet">Ábécé sorrend</string>
   <string name="contacts_order_status">Státusz alapján</string>
   <string name="contacts_show_accounts">Fiók szerinti csoportosítás\nA listán lévő kapcsolatok csoportosítása fiókok szerint</string>
-  <string name="contacts_show_active_chats">Aktív beszélgetések legfelül\nAktív beszélgetések megjelenítése a partnerlista tetején</string>
-  <string name="contacts_show_avatars">Avatarok megjelenítése\nFelhasználók képeinek megjelenítése a partnerek listáján</string>
+    <string name="contacts_show_avatars">Avatarok megjelenítése\nFelhasználók képeinek megjelenítése a partnerek listáján</string>
   <string name="contacts_show_empty_groups">Üres csoportok megjelenítése.\nMutassa azokat a csoportokat, ahol nincs bejelentkezett partner</string>
   <string name="contacts_show_groups">Csoportok megjelenítése\nCsoportok megjelenítése a névjegylistán</string>
   <string name="contacts_show_offline">Offline kapcsolatok megjelenítése</string>
-  <string name="contacts_show_panel">Fiókpanel mutatása\nMutassa a műveleti gombokat avatarokkal a névjegylista jobb alsó sarkában</string>
-  <string name="contacts_stay_active_chats">Aktív chat duplázása\nAz aktív beszélgetések megjelennek a névjegylista tetején és a csoporton belül is</string>
-  <string name="debug_log">Hibakeresési napló\nÜzeneteket ír a hibakeresési naplóba (az alkalmazást újra kell indítani, hogy a változás életbe lépjen)</string>
+    <string name="debug_log">Hibakeresési napló\nÜzeneteket ír a hibakeresési naplóba (az alkalmazást újra kell indítani, hogy a változás életbe lépjen)</string>
   <string name="debug_file_log_title">Naplófájl írása\nHibakeresési napló írása fájlba (megosztható).</string>
   <string name="debug_log_files_title">Naplófájlok\nNaplófájlok listája.</string>
   <string name="debug_log_files_activity_title">Naplófájlok</string>
@@ -28,8 +25,7 @@
   <string name="events_persistent">Tálca ikon\nFolyamatosan látszik az értesítési területen. Ez megakadályozza, hogy az Android törölje az alkalmazást a memóriából</string>
   <string name="interface_theme_dark">Sötét</string>
   <string name="interface_theme_light">Világos</string>
-  <string name="interface_theme_normal">Alapértelmezett</string>
-  <string name="interface_smiles_android">Android hangulatjelek</string>
+    <string name="interface_smiles_android">Android hangulatjelek</string>
   <string name="interface_smiles_none">Nincs grafikus hangulatjel</string>
   <string name="preference_connection">Csatlakozás beállításai\nCsatlakozás beállításai</string>
   <string name="preference_contacts">Névjegylista\nNévjegylista megjelenésének testreszabása</string>
@@ -44,8 +40,7 @@
   <string name="chats_font_size_small">Kicsi</string>
   <string name="chats_font_size_xlarge">Nagyon nagy</string>
   <string name="chats_hide_keyboard_landscape">Fekvő helyzetben</string>
-  <string name="chats_receipt">Kézbesítési jelentések\nVisszajelzések küldése és fogadása üzenetek kézbesítéséről</string>
-  <string name="chats_show_avatars">Avatarok üzenetekben\nMinden üzenetben megjeleníti az avatarokat</string>
+    <string name="chats_show_avatars">Avatarok üzenetekben\nMinden üzenetben megjeleníti az avatarokat</string>
   <string name="chats_show_status_change_muc">Konferenciákban</string>
   <string name="chats_state_notification">Gépelés jelzése\nJelzi a partnernek, hogy gépelsz</string>
   <string name="connection_adjust_priority">Prioritás beállítása\nIgazítsa a prioritást a kiválasztott állapothoz. A fiók prioritását felülírja.</string>
@@ -58,30 +53,19 @@
   <string name="contacts_reset_offline">Kapcsolat nélküli beállítások törlése\nCsoportok és fiókok egyedi beállításainak törlése</string>
   <string name="contacts_reset_offline_warning">Biztos törlöd a csoportok és fiókok egyedi beállításait?</string>
   <string name="events_first_only">Jelzés az első üzenetnél\nCsak a beszélgetés első üzeneténél jelezzen</string>
-  <string name="events_ignore_system_vibro">Rezgésbeállítás figyelmen kívül hagyása\nHa a rendszerben beállított rezgés nem működik, használd ezt az opciót</string>
-  <string name="events_message">Értesítési beállítások\nBejövő üzenetek értesítésének beállításai</string>
-  <string name="events_message_chat">Csak csevegések</string>
-  <string name="events_message_chat_and_muc">Csevegések és konferenciák</string>
-  <string name="events_message_none">Nincs értesítés</string>
-  <string name="events_visible_chat">Értesítés csevegésen belül\nÉrtesít a jelenlegi csevegésben bejövő üzenetekről</string>
-  <string name="events_suppress_100">Kihagy néhány állapotüzenetet\nNe mutassa az „Ez a szoba nem anonim” üzeneteket</string>
+    <string name="events_suppress_100">Kihagy néhány állapotüzenetet\nNe mutassa az „Ez a szoba nem anonim” üzeneteket</string>
   <string name="negative_priotiry_summary">%s (nem kapsz üzenetet semmilyen csevegésből)</string>
   <string name="preference_accounts">XMPP fiókok\nFiókok kezelése</string>
   <string name="preference_security">Biztonság\nBiztonsági beállítások</string>
   <string name="security_check_certificate">Szerver tanúsítványának ellenőrzése\nTitkosított kapcsolatok tanúsítványhibáiról értesít</string>
-  <string name="security_clear_certificate">Tanúsítványok törlése\nFigyelmen kívül hagyott tanúsítványok listájának törlése</string>
-  <string name="security_otr_history">Előzmények tárolása\nOTR beszélgetések tárolása</string>
-  <string name="security_otr_mode">OTR mód</string>
+    <string name="security_otr_mode">OTR mód</string>
   <string name="chats_attention">Figyelemkeltés\nReagál a figyelemkérésekre</string>
   <string name="chats_attention_sound">Figyelemkérés hangja\nVálassz csengőhangot</string>
   <string name="connection_load_vcard">vCard betöltése\nA partner személyes adatainak és képének betöltése és frissítése. Kapcsold ki az adatforgalom csökkentéséhez.</string>
   <string name="connection_load_images">Képek betöltése\nKépek automatikus betöltése URL-ből. Kikapcsolva csökken az adatforgalom.</string>
   <string name="connection_use_carbons">Másolat-mód\nBizonytalanul működik! Megosztja az adott fiók munkameneteit ebben a kliensben. A kikapcsolása csökkenti az adatforgalmat.</string>
-  <string name="connection_dns_resolver_type">DNS névfeloldó típusa</string>
-  <string name="connection_dns_resolver_type_dns_java_resolver">DNSJavaResolver</string>
+    <string name="connection_dns_resolver_type_dns_java_resolver">DNSJavaResolver</string>
   <string name="connection_dns_resolver_type_mini_dns_resolver">MiniDNSResolver (kísérleti)</string>
-  <string name="connection_use_plain_text_auth">Egyszerű szöveges hitelesítés\nEgyszerű szöveges hitelesítés minden fióknál. Nem javasolt.</string>
-  <string name="events_phrases">Kulcskifejezések\nKészíts egyedi értesítést azokhoz az üzenetekhez, amelyek bizonyos kifejezéseket tartalmaznak</string>
-  <string name="security_clear_certificate_warning">Biztos törlöd az összes figyelmen kívül hagyott tanúsítványt?</string>
-  <string name="account_error_settings">Beállítások</string>
+    <string name="events_phrases">Kulcskifejezések\nKészíts egyedi értesítést azokhoz az üzenetekhez, amelyek bizonyos kifejezéseket tartalmaznak</string>
+    <string name="account_error_settings">Beállítások</string>
 </resources>
diff --git a/xabber/src/main/res/values-hy-rAM/account_editor.xml b/xabber/src/main/res/values-hy-rAM/account_editor.xml
index 5ed107051b..fb277471f6 100644
--- a/xabber/src/main/res/values-hy-rAM/account_editor.xml
+++ b/xabber/src/main/res/values-hy-rAM/account_editor.xml
@@ -4,18 +4,9 @@
   <string name="account_password">Գաղտնաբառ</string>
   <string name="confirm_password">Գաղտնաբառի հաստատում</string>
   <string name="account_priority">Առաջնություն</string>
-  <string name="account_type">Հաշվի տեսակ</string>
-  <string name="account_type_helps_gtalk">Եթե դու չունես Գուգլ հաշիվ, կարող ես ստեղծել այն http://mail.google.com հասցեում։\nԲացի այդ կարող ես օգտագործել քո_օգտանունը@քո_ջիմեյլ_տիրույթում</string>
-  <string name="account_type_helps_xmpp">Եթե ուզում ես ավելին իմանալ ԻքսԷմՓիՓիի (Ջաբբեր) մասին, աչքի անցկացրու՝ https://xmpp.org</string>
-  <string name="account_user_name">Օգտանուն</string>
+    <string name="account_user_name">Օգտանուն</string>
   <string name="CONFIRM_PASSWORD">Գաղտնաբառերը չեն համընկնում</string>
-  <string name="account_archive_mode">Պահել նամակների պատմությունը</string>
-  <string name="account_archive_mode_available">Սպասարկչի վրա, եթե հասանելի է</string>
-  <string name="account_archive_mode_dont_store">Չպահել</string>
-  <string name="account_archive_mode_local">Տեղային՝ սարքի վրա</string>
-  <string name="account_archive_mode_server">Սպասարկչի վրա</string>
-  <string name="account_archive_mode_unread">Տեղային միայն չուղարկվածներն ու չկարդացվածները</string>
-  <string name="account_compression_summary">Ընտրիր՝ թույլատրելու տվյալների խտացումը</string>
+    <string name="account_compression_summary">Ընտրիր՝ թույլատրելու տվյալների խտացումը</string>
   <string name="account_invalid_priority">Առաջնության արժեքը պետք է լինի -128-ից 127 թվերի միջակայքում (լռելյայն` 0)</string>
   <string name="account_color">Հաշվի գույնը</string>
   <string name="account_color_name_green">Կանաչ</string>
diff --git a/xabber/src/main/res/values-hy-rAM/chat_viewer.xml b/xabber/src/main/res/values-hy-rAM/chat_viewer.xml
index 1c7d15323c..40260ae7cd 100644
--- a/xabber/src/main/res/values-hy-rAM/chat_viewer.xml
+++ b/xabber/src/main/res/values-hy-rAM/chat_viewer.xml
@@ -18,10 +18,7 @@
   <string name="message_copy">Պատճենել</string>
   <string name="message_quote">Մեջբերել</string>
   <string name="message_remove">Ջնջել պատմությունից</string>
-  <string name="message_open_file">Բացել</string>
-  <string name="message_save_file">Պահպանել</string>
-  <string name="show_history">Ցույց տալ պատմությունը</string>
-  <string name="action_attention_called">Ուշադրությունը գրավելու հրավերը ուղարկվեց</string>
+    <string name="action_attention_called">Ուշադրությունը գրավելու հրավերը ուղարկվեց</string>
   <string name="action_attention_requested">Ուշադրությունդ է հրավիրում</string>
   <string name="action_leave">%1$s դուրս եկավ չաթից</string>
   <string name="action_status_available">%1$s այժմ առցանց է</string>
diff --git a/xabber/src/main/res/values-hy-rAM/contact_list.xml b/xabber/src/main/res/values-hy-rAM/contact_list.xml
index b30a5e3992..a4621fe530 100644
--- a/xabber/src/main/res/values-hy-rAM/contact_list.xml
+++ b/xabber/src/main/res/values-hy-rAM/contact_list.xml
@@ -5,8 +5,7 @@
   <string name="application_action_empty">Հաշիվ ավելացնել</string>
   <string name="application_state_empty">Ոչ մի հաշիվ չունես</string>
   <string name="application_state_no_online">Առցանց մարդ չկա</string>
-  <string name="close_chat">Փակել չաթը</string>
-  <string name="exit">Դուրս գալ</string>
+    <string name="exit">Դուրս գալ</string>
   <string name="sender_is_you">Դու</string>
   <string name="block_list">Սեւ ցուցակ</string>
   <string name="dark_theme_suggest_dialog_title">Ընտրիր քո ճակատագիրը</string>
diff --git a/xabber/src/main/res/values-hy-rAM/contact_viewer.xml b/xabber/src/main/res/values-hy-rAM/contact_viewer.xml
index 4844c3ec0f..84a565c899 100644
--- a/xabber/src/main/res/values-hy-rAM/contact_viewer.xml
+++ b/xabber/src/main/res/values-hy-rAM/contact_viewer.xml
@@ -10,11 +10,9 @@
   <string name="vcard_birth_date">Ծննդյան ամսաթիվ</string>
   <string name="vcard_url">Կայք</string>
   <string name="vcard_organization">Կազմակերպություն</string>
-  <string name="vcard_other">Այլ տեղեկատվություն</string>
-  <string name="vcard_decsription">Նկարագրություն</string>
+    <string name="vcard_decsription">Նկարագրություն</string>
   <string name="vcard_note">Նշումներ</string>
-  <string name="vcard_address">Հասցե</string>
-  <string name="vcard_telephone">Հեռախոսահամար</string>
+    <string name="vcard_telephone">Հեռախոսահամար</string>
   <string name="vcard_email">Էլ.հասցե</string>
   <string name="saving">Պահպանվում է&#8230;</string>
   <string name="conference_name">Անվանում</string>
diff --git a/xabber/src/main/res/values-hy-rAM/preference_editor.xml b/xabber/src/main/res/values-hy-rAM/preference_editor.xml
index f840619087..618dde1845 100644
--- a/xabber/src/main/res/values-hy-rAM/preference_editor.xml
+++ b/xabber/src/main/res/values-hy-rAM/preference_editor.xml
@@ -11,8 +11,7 @@
   <string name="contacts_order_status">Ըստ կարգավիճակի</string>
   <string name="interface_theme_dark">Մուգ</string>
   <string name="interface_theme_light">Բաց</string>
-  <string name="interface_theme_normal">Լռելյայն</string>
-  <string name="interface_smiles">Հուզապատկերներ</string>
+    <string name="interface_smiles">Հուզապատկերներ</string>
   <string name="interface_smiles_android">Անդրոիդ հուզապատկերներ</string>
   <string name="preference_debug">Վրիպազերծման կարգավորումներ\nԿարգավորումներ, որ կօգնեն ծրագրավորողներին բարելավել Քսաբբերը</string>
   <string name="preference_editor">Կարգավորումներ</string>
diff --git a/xabber/src/main/res/values-in-rID/account_editor.xml b/xabber/src/main/res/values-in-rID/account_editor.xml
index 44e3f978e9..d65beadbeb 100644
--- a/xabber/src/main/res/values-in-rID/account_editor.xml
+++ b/xabber/src/main/res/values-in-rID/account_editor.xml
@@ -2,40 +2,25 @@
 <!--Generated by crowdin.com-->
 <resources>
   <string name="account_compression">Gunakan kompresi</string>
-  <string name="account_enabled">Diaktifkan</string>
-  <string name="account_host">Host</string>
+    <string name="account_host">Host</string>
   <string name="account_password">Kata sandi</string>
   <string name="confirm_password">Konfirmasi kata sandi</string>
   <string name="account_port">Port</string>
   <string name="account_priority">Prioritas</string>
   <string name="account_resource">Sumber daya</string>
   <string name="account_server_name">Server</string>
-  <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=mendaftar akun XMPP">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="account_xmpp_register_warning">Anda harus <a href="http://www.google.com/#q=mendaftar akun XMPP">mendaftar akun XMPP</a> sebelum menambahkannya dalam Xabber!</string>
+    <string name="account_user_name">Nama pengguna</string>
   <string name="EMPTY_SERVER_NAME">Nama server belum ditentukan</string>
   <string name="EMPTY_USER_NAME">Nama pengguna belum ditentukan</string>
   <string name="CONFIRM_PASSWORD">Kata sandi tidak cocok</string>
-  <string name="account_archive_mode">Simpan riwayat pesan</string>
-  <string name="account_archive_mode_available">Di server bila tersedia</string>
-  <string name="account_archive_mode_dont_store">Jangan simpan</string>
-  <string name="account_archive_mode_local">Di perangkat lokal</string>
-  <string name="account_archive_mode_server">Di server</string>
-  <string name="account_archive_mode_unread">Simpan lokal hanya pesan yang belum terkirim dan belum dibaca</string>
-  <string name="account_compression_summary">Centang untuk mengaktifkan kompresi data</string>
+    <string name="account_compression_summary">Centang untuk mengaktifkan kompresi data</string>
   <string name="account_custom">Custom host</string>
   <string name="account_custom_summary">Gunakan pengaturan custom host sebagai ganti rekaman SRV</string>
-  <string name="account_enabled_summary">Sentuh untuk mengaktifkan akun</string>
-  <string name="account_invalid_port">Port harus berupa angka (default: 5222)</string>
+    <string name="account_invalid_port">Port harus berupa angka (default: 5222)</string>
   <string name="account_invalid_port_range">Port harus antara 1 dan 65535 (default: 5222)</string>
   <string name="account_invalid_priority">Nilai prioritas harus angka antara -128 dan 127 (default: 0)</string>
-  <string name="account_oauth">Otorisasi</string>
-  <string name="account_oauth_invalidated">Tidak terotorisasi</string>
-  <string name="account_oauth_summary">Pengaturan OAuth</string>
-  <string name="account_proxy_host">Proxy host</string>
+    <string name="account_proxy_host">Proxy host</string>
   <string name="account_proxy_invalid_port_range">Port proxy harus antara 1 dan 65535 (default: 8080)</string>
   <string name="account_proxy_invalid_port">Port proxy harus dalam bentuk angka (default: 8080)</string>
   <string name="account_proxy_password">Kata sandi proxy</string>
@@ -47,18 +32,14 @@
   <string name="account_sasl_summary">Matikan untuk server versi lama</string>
   <string name="account_store_password">Simpan kata sandi</string>
   <string name="account_store_password_summary">Matikan opsi ini untuk meminta kata sandi setiap kali anda daring</string>
-  <string name="account_syncable">Integrasikan ke dalam sistem kontak</string>
-  <string name="account_syncable_summary">Tampilkan kontak dari akun ini dalam daftar kontak telepon</string>
-  <string name="account_tls_enable">Aktifkan TLS</string>
+    <string name="account_tls_enable">Aktifkan TLS</string>
   <string name="account_tls_enable_summary">Gunakan enkripsi TLS jika memungkinkan untuk menyambung ke server</string>
   <string name="account_tls_legacy">Legacy SSL</string>
   <string name="account_tls_legacy_summary">Menggunakan enkripsi SSL yang usang ketika terhubung ke server</string>
   <string name="account_tls_mode">Penggunaan TLS/SSL</string>
   <string name="account_tls_require">Memerlukan TLS</string>
   <string name="account_tls_require_summary">Memerlukan enkripsi TLS ketika terhubung ke server</string>
-  <string name="account_use_orbot">Mengobrol melalui jaringan TOR anonim dan paksa protokol kriptografi TLS\nTidak direkomendasikan untuk Google Talk</string>
-  <string name="confirm_cancellation">Apakah Anda yakin ingin membatalkan semua perubahan?</string>
-  <string name="INCORRECT_USER_NAME">Nama pengguna salah. Baca bantuan di bawah ini untuk penjelasan lebih lanjut.</string>
+    <string name="INCORRECT_USER_NAME">Nama pengguna salah. Baca bantuan di bawah ini untuk penjelasan lebih lanjut.</string>
   <string name="orbot_required_message">Untuk proses menggunakan TOR, Anda harus memiliki Orbot yang terpasang dan aktif untuk lalu lintas proxy yang dilaluinya. Anda ingin memasangnya dari Google Play?</string>
   <string name="orbot_required_title">Pasang Orbot?</string>
   <string name="install_orbot">Memasang Orbot</string>
diff --git a/xabber/src/main/res/values-in-rID/chat_viewer.xml b/xabber/src/main/res/values-in-rID/chat_viewer.xml
index 9532ee4c60..c9482401f7 100644
--- a/xabber/src/main/res/values-in-rID/chat_viewer.xml
+++ b/xabber/src/main/res/values-in-rID/chat_viewer.xml
@@ -21,11 +21,8 @@
   <string name="message_remove">Hapus dari riwayat</string>
   <string name="message_repeat">Kirim ulang</string>
   <string name="message_otr_show_original">Tampilkan pesan</string>
-  <string name="message_open_file">Buka</string>
-  <string name="message_save_file">Simpan</string>
-  <string name="save_history">Simpan riwayat lokal\nSimpan riwayat pesan secara lokal</string>
-  <string name="show_history">Tampilkan riwayat</string>
-  <string name="action_attention_called">Atensi pemanggilan telah dikirim</string>
+    <string name="save_history">Simpan riwayat lokal\nSimpan riwayat pesan secara lokal</string>
+    <string name="action_attention_called">Atensi pemanggilan telah dikirim</string>
   <string name="action_attention_requested">Atensi diterima</string>
   <string name="action_ban">%1$s diblokir</string>
   <string name="action_ban_by">%1$s diblokir oleh %2$s</string>
@@ -73,8 +70,7 @@
   <string name="otr_refresh">Mulai ulang enkripsi</string>
   <string name="otr_request">Percakapan pribadi off-the-record telah diminta namun Anda tidak memiliki plugin yang mendukung. Gunakan Pidgin, Gajim atau Adium untuk PC/Mac dan Xabber, Conversations atau ChatSecure untuk Android. Kunjungi http://otr.cypherpunks.ca/ untuk informasi lebih lanjut.</string>
   <string name="otr_start">Mulai enkripsi</string>
-  <string name="otr_unencrypted_message">Pesan ini tidak dienkripsi</string>
-  <string name="otr_unreadable_message">Pesan terenkripsi yang Anda kirim tidak dapat dibaca</string>
+    <string name="otr_unreadable_message">Pesan terenkripsi yang Anda kirim tidak dapat dibaca</string>
   <string name="otr_not_decrypted_message">Pesan tidak dapat didekripsi</string>
   <string name="otr_verification">Verifikasi OTR</string>
   <string name="otr_verify_fingerprint">Verifikasi dengan sidik jari</string>
@@ -87,21 +83,13 @@
   <string name="otr_verification_progress_title">Verifikasi OTR sedang diproses</string>
   <string name="otr_verification_notify_button">Buka</string>
   <string name="otr_verification_notify_button_cancel">Batal</string>
-  <string name="under_construction">Sedang dibuat</string>
-  <string name="under_construction_message">Layar ini sedang dibuat</string>
-  <string name="chat_events_show_text_global">Gunakan pengaturan global</string>
+    <string name="chat_events_show_text_global">Gunakan pengaturan global</string>
   <string name="chat_events_show_text_always">Tampilkan teks pesan</string>
   <string name="chat_events_show_text_never">Sembunyikan teks pesan</string>
-  <string name="sending_file">Mengirim berkas %s</string>
-  <string name="error_sending_file">Gagal mengirim berkas %s</string>
-  <string name="no_application_to_open_file">Tidak ada aplikasi untuk membuka berkas ini</string>
-  <string name="could_not_save_file">Tidak bisa menyimpan berkas</string>
-  <string name="file_saved_successfully">Berkas berhasil disimpan</string>
-  <string name="received_by">Diterima oleh %s</string>
-  <string name="could_not_get_path_to_file">Tidak dapat menemukan berkas</string>
+    <string name="error_sending_file">Gagal mengirim berkas %s</string>
+    <string name="could_not_get_path_to_file">Tidak dapat menemukan berkas</string>
   <string name="message_open_private_chat">Buka percakapan pribadi</string>
-  <string name="http_file_upload_slot_error">Tidak dapat mengunggah berkas. Terlalu besar?</string>
-  <string name="no_permission_to_read_files">Tidak ada izin untuk membaca berkas</string>
+    <string name="no_permission_to_read_files">Tidak ada izin untuk membaca berkas</string>
   <string name="no_permission_to_write_files">Tidak ada izin untuk menulis berkas</string>
   <string name="error_description_title">Deskripsi kesalahan:</string>
   <string name="message_status_sent">Terkirim</string>
diff --git a/xabber/src/main/res/values-in-rID/contact_editor.xml b/xabber/src/main/res/values-in-rID/contact_editor.xml
index 3ee02d0337..8587758074 100644
--- a/xabber/src/main/res/values-in-rID/contact_editor.xml
+++ b/xabber/src/main/res/values-in-rID/contact_editor.xml
@@ -17,12 +17,8 @@
   <string name="processing_image">Memproses gambar...</string>
   <string name="error_during_crop">Gagal memotong gambar</string>
   <string name="error_during_image_processing">Gagal memproses gambar</string>
-  <string name="account_settings">Pengaturan akun</string>
-  <string name="account_user_info">Informasi akun</string>
-  <string name="account_server_info">Informasi server</string>
+    <string name="account_server_info">Informasi server</string>
   <string name="account_server_info_description">Daftar kapabilitas server</string>
   <string name="conference_private_chat_invitation">%1$s dari %2$s ingin memulai obrolan pribadi</string>
   <string name="accept_muc_private_chat">Terima</string>
-  <string name="block_muc_private_chat">Blokir</string>
-  <string name="no_permission_camera">Tidak ada izin untuk mengakses kamera</string>
 </resources>
diff --git a/xabber/src/main/res/values-in-rID/contact_list.xml b/xabber/src/main/res/values-in-rID/contact_list.xml
index e7b36eeec0..5e4bf6c315 100644
--- a/xabber/src/main/res/values-in-rID/contact_list.xml
+++ b/xabber/src/main/res/values-in-rID/contact_list.xml
@@ -18,17 +18,13 @@
   <string name="application_state_roster">Terhubung.</string>
   <string name="application_state_starting">Menjalankan aplikasi&#8230;</string>
   <string name="application_state_waiting">Menunggu koneksi&#8230;</string>
-  <string name="chat_list">Daftar obrolan</string>
-  <string name="chat_list_is_empty">Tidak ada obrolan aktif</string>
-  <string name="chat_viewer">Obrolan</string>
-  <string name="close_chat">Tutup obrolan</string>
-  <string name="CONNECTION_FAILED">Koneksi bermasalah</string>
+    <string name="chat_viewer">Obrolan</string>
+    <string name="CONNECTION_FAILED">Koneksi bermasalah</string>
   <string name="contact_add">Tambah kontak</string>
   <string name="contact_delete">Hapus</string>
   <string name="contact_block">Blokir kontak</string>
   <string name="contact_delete_confirm">Apakah Anda yakin ingin menghapus kontak %1$s dari akun %2$s?</string>
-  <string name="contact_list">Daftar kontak</string>
-  <string name="discard_subscription">Tolak kontak</string>
+    <string name="discard_subscription">Tolak kontak</string>
   <string name="exit">Keluar</string>
   <string name="group_active_chat">Obrolan aktif</string>
   <string name="group_none">Tidak ada grup</string>
@@ -40,15 +36,7 @@
   <string name="request_subscription">Permohonan berlangganan</string>
   <string name="XMPP_EXCEPTION">Kesalahan jaringan</string>
   <string name="application_state_closing">Menyimpan perubahan...\nAplikasi akan segera ditutup.</string>
-  <string name="certificate_confirmation">%1$s.\nIssuer menggunakan sidik jari terdeprekasi (SHA-1) yang tidak dapat dipercaya: %2$s? Apakah Anda ingin menerima pemberitahuan tentang masalah dengan sertifikat ini?</string>
-  <string name="certificate_details">\n\nDiajukan kepada:\nNama Umum (NU): %1$s\nOrganisasi (O): %2$s\nUnit Organisasi (UO): %3$s\nNomor seri: %4$s\n\nDiajukan oleh:\nNama Umum (NU): %5$s\nOrganisasi (O): %6$s\nUnit Organisasu (UO): %7$s\n\nValiditas:\nDiajukan pada: %8$s\nBerakhir pada: %9$s.</string>
-  <string name="certificate_invalid_chane">Verifikasi rantai tanda tangan gagal</string>
-  <string name="certificate_invalid_target">Verifikasi tujuan gagal</string>
-  <string name="certificate_self_signed">Sertifikat tertanda otomatis</string>
-  <string name="certificate_show_details">Rincian&#8230;</string>
-  <string name="close_chats">Tutup semua obrolan</string>
-  <string name="contact_integration_suggest">Apakah anda ingin Xabber diintegrasikan ke dalam kontak sistem?\nIni dapat diubah di \"Pengaturan\" → \"Akun XMPP\" → Akun anda →\"Integrasi Kontak\".\nNB: Daftar kontak sistem akan menjadi lebih lambat selama beberapa menit.</string>
-  <string name="group_room">Konferensi</string>
+    <string name="group_room">Konferensi</string>
   <string name="OTR_ERROR">Kesalahan OTR</string>
   <string name="select_contact">Ketuk untuk memilih kontak</string>
   <string name="show_offline_always">Selalu tampilkan</string>
@@ -63,8 +51,7 @@
   <string name="block_list">Daftar blokir</string>
   <string name="contact_blocked_successfully">Kontak berhasil diblokir</string>
   <string name="error_blocking_contact">Pemblokiran kontak gagal</string>
-  <string name="unblock_contact">Buka blokir kontak</string>
-  <string name="contacts_unblocked_successfully">Kontak berhasil dihapus dari daftar blokir</string>
+    <string name="contacts_unblocked_successfully">Kontak berhasil dihapus dari daftar blokir</string>
   <string name="error_unblocking_contacts">Gagal membuka blokir kontak</string>
   <string name="block_contact_confirm">Apakah Anda yakin ingin memblokir %1$s dari kontak Anda %2$s?</string>
   <string name="unblock_all_contacts_confirm">Apakah Anda yakin ingin membuka semua kontak terblokir dari akun%1$s?</string>
@@ -76,19 +63,10 @@
   <string name="dark_theme_suggest_dialog_stay_on_light_side">Tetap dalam Sisi Terang</string>
   <string name="battery_optimization_disable_dialog_title">Optimasi baterai</string>
   <string name="battery_optimization_disable_dialog_message">Perangkat Anda sedang melakukan optimasi besar pada Xabber yang dapat memicu tertundanya notifikasi atau bahkan kehilangan pesan.\n\nAnda akan diminta untuk menonaktifkannya.</string>
-  <string name="save_log_to_file">Simpan berkas</string>
-  <string name="clear_log">Hapus berkas log lama</string>
+    <string name="clear_log">Hapus berkas log lama</string>
   <string name="open_log_file">Buka</string>
   <string name="send_log_file">Kirim</string>
-  <string name="intro_welcome">Selamat datang di Xabber</string>
-  <string name="intro_xabber_description">Klien XMPP sumber terbuka untuk Android</string>
-  <string name="intro_have_account">Login XMPP</string>
-  <string name="intro_register_account">Daftar akun XMPP</string>
-  <string name="intro_create_xabber_account">Gunakan akun Xabber</string>
-  <string name="intro_use_third_party_accounts">gunakan akun XMPP pihak ketiga</string>
-  <string name="intro_faq">Jika Anda tidak memiliki akun XMPP, silakan <a href="https://www.xabber.com/faq/">baca S.S.D. kami</a> untuk membuatnya.</string>
-  <string name="intro_web_search_register_xmpp">Daftar akun XMPP</string>
-  <string name="synchronize_bookmarks">Sinkronkan marka</string>
+    <string name="synchronize_bookmarks">Sinkronkan marka</string>
   <string name="remove_all_bookmarks">Hapus semua</string>
   <string name="remove_selected_bookmarks">Hapus yang ditandai</string>
   <string name="remove_all_bookmarks_confirm">Anda yakin ingin menghapus semua penanda dari akun %1$s?</string>
diff --git a/xabber/src/main/res/values-in-rID/contact_viewer.xml b/xabber/src/main/res/values-in-rID/contact_viewer.xml
index c509bd69c2..e15de07ccf 100644
--- a/xabber/src/main/res/values-in-rID/contact_viewer.xml
+++ b/xabber/src/main/res/values-in-rID/contact_viewer.xml
@@ -17,12 +17,9 @@
   <string name="vcard_organization_unit">Unit organisasi</string>
   <string name="vcard_title">Profesi, bagian</string>
   <string name="vcard_role">Jabatan</string>
-  <string name="vcard_other">Informasi lain</string>
-  <string name="vcard_categories">Kategori</string>
-  <string name="vcard_decsription">Deskripsi</string>
+    <string name="vcard_decsription">Deskripsi</string>
   <string name="vcard_note">Catatan</string>
-  <string name="vcard_address">Alamat</string>
-  <string name="vcard_address_pobox">PO Box</string>
+    <string name="vcard_address_pobox">PO Box</string>
   <string name="vcard_address_extadr">Alamat pelengkap</string>
   <string name="vcard_address_street">Jalan</string>
   <string name="vcard_address_locality">Tempat</string>
diff --git a/xabber/src/main/res/values-in-rID/muc_editor.xml b/xabber/src/main/res/values-in-rID/muc_editor.xml
index 9a00e07d17..067febfd0f 100644
--- a/xabber/src/main/res/values-in-rID/muc_editor.xml
+++ b/xabber/src/main/res/values-in-rID/muc_editor.xml
@@ -20,12 +20,10 @@
   <string name="muc_invite_confirm">%2$s mengundang Anda untuk bergabung dengan konferensi %3$s. Gabung dengan akun %1$s?</string>
   <string name="muc_invite_confirm_reason">%2$s mengundang Anda untuk bergabung dalam konferensi %3$s: %4$s. Gabung dengan akun %1$s?</string>
   <string name="muc_leave">Tinggalkan konferensi</string>
-  <string name="muc_save">Simpan konferensi</string>
-  <string name="muc_choose_conference">Pilih konferensi</string>
+    <string name="muc_choose_conference">Pilih konferensi</string>
   <string name="muc_next">Berikutnya</string>
   <string name="muc_get_hosted_conferences">Dapatkan konferensi dengan host</string>
   <string name="muc_error_getting_conferences">Gagal mendapatkan konferensi</string>
   <string name="muc_type_conference_name">Ketik nama konferensi</string>
-  <string name="contact_is_blocked">Kontak diblokir!</string>
-  <string name="conference_invitation">Undangan konferensi</string>
+    <string name="conference_invitation">Undangan konferensi</string>
 </resources>
diff --git a/xabber/src/main/res/values-in-rID/notification_bar.xml b/xabber/src/main/res/values-in-rID/notification_bar.xml
index 1612cd6495..2255c86334 100644
--- a/xabber/src/main/res/values-in-rID/notification_bar.xml
+++ b/xabber/src/main/res/values-in-rID/notification_bar.xml
@@ -34,10 +34,7 @@
   <!-- Used for plural form in russian. -->
   <string name="connection_state_waiting_5">-</string>
   <string name="connection_state_offline">%1$d %2$s tidak aktif</string>
-  <string name="archive_available_request_message">Apakah Anda Ingin menyimpan riwayat pesan ke server?\nIni mengizinkan Xabber memuat riwayat pesan dari semua perangkat dengan akun ini.\nFitur ini akan menggunakan data lebih banyak dan sedikit mengurangi kecepatan koneksi.\nPERINGATAN: Semua riwayat lokal Anda akan terhapus.</string>
-  <string name="archive_available_request_title">Aktifkan arsip pesan?</string>
-  <string name="INVALID_CERTIFICATE">Sertifikat tidak berlaku</string>
-  <string name="muc_invite_message">Apakah anda ingin memasuki konferensi?</string>
+    <string name="muc_invite_message">Apakah anda ingin memasuki konferensi?</string>
   <string name="otr_verification_in_progress">Klik di sini untuk membatalkannya.</string>
   <string name="PASSWORD_REQUIRED">Kata sandi diperlukan</string>
   <string name="pay_attention">Perhatikan</string>
diff --git a/xabber/src/main/res/values-in-rID/preference_editor.xml b/xabber/src/main/res/values-in-rID/preference_editor.xml
index cc2362585e..88ae752d0a 100644
--- a/xabber/src/main/res/values-in-rID/preference_editor.xml
+++ b/xabber/src/main/res/values-in-rID/preference_editor.xml
@@ -12,14 +12,11 @@
   <string name="contacts_order_alphabet">Sesuai Abjad</string>
   <string name="contacts_order_status">Sesuai status</string>
   <string name="contacts_show_accounts">Dikelompokkan menurut akun\nGrup kontak dalam daftar kontak oleh akun</string>
-  <string name="contacts_show_active_chats">Obrolan aktif di atas\nTampilkan obrolan aktif di atas daftar kontak</string>
-  <string name="contacts_show_avatars">Tampilakan avatar\nMenampilkan avatar pengguna dalam daftar kontak</string>
+    <string name="contacts_show_avatars">Tampilakan avatar\nMenampilkan avatar pengguna dalam daftar kontak</string>
   <string name="contacts_show_empty_groups">Menampilkan grup kosong\nMenampilkan grup tanpa kontak aktif</string>
   <string name="contacts_show_groups">Tampilkan grup\nTampilkan grup dalam daftar kontak</string>
   <string name="contacts_show_offline">Tampilkan kontak luring</string>
-  <string name="contacts_show_panel">Tampilkan panel akun\nTampilkan tombol aktivitas dengan avatar di kiri bawah daftar kontak</string>
-  <string name="contacts_stay_active_chats">Gandakan obrolan aktif\nObrolan aktif muncul di atas daftar kontak dan grup</string>
-  <string name="debug_log">Debug log\nTulis pesan untuk debug log (mohon restart aplikasi untuk menerapkan perubahan)</string>
+    <string name="debug_log">Debug log\nTulis pesan untuk debug log (mohon restart aplikasi untuk menerapkan perubahan)</string>
   <string name="debug_file_log_title">Simpan berkas log\nSimpan log debug dalam perangkat (dapat dibagikan).</string>
   <string name="debug_log_files_title">Berkas log\nDaftar berkas log tersimpan.</string>
   <string name="debug_log_files_activity_title">Berkas log</string>
@@ -36,8 +33,7 @@
   <string name="interface_theme">Tema</string>
   <string name="interface_theme_dark">Gelap</string>
   <string name="interface_theme_light">Terang</string>
-  <string name="interface_theme_normal">Pengaturan bawaan</string>
-  <string name="interface_smiles">Emotikon</string>
+    <string name="interface_smiles">Emotikon</string>
   <string name="interface_smiles_android">Emoticon Android</string>
   <string name="interface_smiles_none">Tanpa emoticon grafis</string>
   <string name="preference_connection">Pengaturan koneksi\nPengaturan koneksi</string>
@@ -62,8 +58,7 @@
   <string name="chats_font_size_xlarge">Ekstra besar</string>
   <string name="chats_hide_keyboard">Sembunyikan papan ketik</string>
   <string name="chats_hide_keyboard_landscape">Saat mode landskap</string>
-  <string name="chats_receipt">Catatan pengiriman pesan\nMengirim dan menerima pemberitahuan pengiriman</string>
-  <string name="chats_show_avatars">Avatar dalam pesan\nMenampilkan avatar pada setiap pesan</string>
+    <string name="chats_show_avatars">Avatar dalam pesan\nMenampilkan avatar pada setiap pesan</string>
   <string name="chats_show_status_change">Tampilkan perubahan status</string>
   <string name="chats_show_status_change_muc">Dalam konferensi</string>
   <string name="chats_state_notification">Kirim pemberitahuan menulis\nMemberitahu akun lain bahwa Anda sedang mengetik</string>
@@ -77,37 +72,24 @@
   <string name="contacts_reset_offline">Kembalikan pengaturan luring\nBersihkan pengaturan pribadi untuk grup dan akun</string>
   <string name="contacts_reset_offline_warning">Apakah Anda yakin ingin menghapus pengaturan pribadi untuk grup dan akun?</string>
   <string name="events_first_only">Pemberitahuan pesan pertama\nPemberitahuan hanya pada pesan pertama dalam sebuah obrolan</string>
-  <string name="events_ignore_system_vibro">Abaikan pengaturan getar sistem\nGunakan pilihan ini jika getar sistem tidak berfungsi</string>
-  <string name="events_message">Pengaturan pemberitahuan\nAtur pemberitahuan pesan masuk</string>
-  <string name="events_message_chat">Obrolan saja</string>
-  <string name="events_message_chat_and_muc">Obrolan dan konferensi</string>
-  <string name="events_message_none">Jangan beri tahu</string>
-  <string name="events_show_text">Pratinjau pesan\nTampilkan teks pesan dari percakapan pada area pemberitahuan</string>
+    <string name="events_show_text">Pratinjau pesan\nTampilkan teks pesan dari percakapan pada area pemberitahuan</string>
   <string name="events_show_text_muc">Pratinjau pesan\nTampilkan teks pesan dari konferensi pada area pemberitahuan</string>
-  <string name="events_visible_chat">Tampilkan obrolan saat ini\nMemberitahukan pesan masuk dalam obrolan saat ini</string>
-  <string name="events_suppress_100">Tahan beberapa pesan status\nJangan tampilkan pesan \'Obrolan ini tidak anonim\'</string>
+    <string name="events_suppress_100">Tahan beberapa pesan status\nJangan tampilkan pesan \'Obrolan ini tidak anonim\'</string>
   <string name="negative_priotiry_summary">%s (Anda tidak akan menerima pesan dari semua obrolan)</string>
   <string name="preference_accounts">Akun XMPP\nMengatur akun</string>
   <string name="preference_security">Keamanan\nPengaturan keamanan</string>
   <string name="security_check_certificate">Periksa sertifikat server\nPemberitahuan masalah sertifikat dalam koneksi terenkripsi</string>
-  <string name="security_clear_certificate">Hapus sertifikat\nBersihkan daftar sertifikat terabaikan</string>
-  <string name="security_otr_history">Simpan riwayat\nSimpan riwayat obrolan untuk sesi OTR</string>
-  <string name="security_otr_mode">Mode OTR</string>
+    <string name="security_otr_mode">Mode OTR</string>
   <string name="chats_attention">Perhatian\nTanggapi permohonan perhatian masuk</string>
   <string name="chats_attention_sound">Suara perhatian\nPilih nada dering</string>
   <string name="connection_load_vcard">Muat vCard\nMuat dan perbarui info dan avatar pribadi kontak. Matikan untuk mengurangi pemakaian data.</string>
   <string name="connection_load_images">Muat gambar\nMuat gambar dari tautan berkas secara otomatis. Matikan untuk mengurangi pemakaian data.</string>
   <string name="connection_use_carbons">Mode tembusan\nBisa tidak stabil! Fitur ini akan membagikan sesi untuk akun yang sama dalam klien ini. Matikan untuk mengurangi pemakaian data.</string>
-  <string name="connection_dns_resolver_type">Tipe resolver DNS</string>
-  <string name="connection_dns_resolver_type_dns_java_resolver">ResolverDNSJava</string>
+    <string name="connection_dns_resolver_type_dns_java_resolver">ResolverDNSJava</string>
   <string name="connection_dns_resolver_type_mini_dns_resolver">ResolverMiniDNS (uji coba)</string>
-  <string name="connection_use_plain_text_auth">Otorisasi teks sederhana\nGunakan otentikasi teks sederhana untuk semua akun. Tidak direkomendasikan.</string>
-  <string name="events_phrases">Frasa kunci\nBuat pemberitahuan pribadi untuk menerima pesan yang berisi frasa tertentu</string>
-  <string name="security_clear_certificate_warning">Apakah Anda yakin ingin menghapus semua sertifikat yang diabaikan?</string>
-  <string name="account_error_settings">Pengaturan</string>
-  <string name="category_xabber_account">Akun Xabber</string>
-  <string name="category_xmpp_accounts">Akun XMPP</string>
-  <string name="category_interface">Antarmuka</string>
+    <string name="events_phrases">Frasa kunci\nBuat pemberitahuan pribadi untuk menerima pesan yang berisi frasa tertentu</string>
+    <string name="account_error_settings">Pengaturan</string>
+    <string name="category_interface">Antarmuka</string>
   <string name="category_settings">Pengaturan</string>
   <string name="category_about">Tentang</string>
   <string name="category_appearance">Tampilan</string>
diff --git a/xabber/src/main/res/values-in-rID/words.xml b/xabber/src/main/res/values-in-rID/words.xml
index bc0ade23a9..64b02f78ca 100644
--- a/xabber/src/main/res/values-in-rID/words.xml
+++ b/xabber/src/main/res/values-in-rID/words.xml
@@ -20,5 +20,4 @@
   <string name="settings">Pengaturan</string>
   <string name="ok">OK</string>
   <string name="login">Masuk</string>
-  <string name="resume">Lanjutkan</string>
 </resources>
diff --git a/xabber/src/main/res/values-it-rIT/account_editor.xml b/xabber/src/main/res/values-it-rIT/account_editor.xml
index 44e85d849f..617a6207d1 100644
--- a/xabber/src/main/res/values-it-rIT/account_editor.xml
+++ b/xabber/src/main/res/values-it-rIT/account_editor.xml
@@ -2,41 +2,25 @@
 <!--Generated by crowdin.com-->
 <resources>
   <string name="account_compression">Utilizzare la compressione</string>
-  <string name="account_enabled">Abilitato</string>
-  <string name="account_host">Host</string>
+    <string name="account_host">Host</string>
   <string name="account_password">Password</string>
   <string name="confirm_password">Conferma password</string>
   <string name="account_port">Porta</string>
   <string name="account_priority">Priorità</string>
   <string name="account_resource">Fonte</string>
   <string name="account_server_name">Server</string>
-  <string name="account_type">Tipo di 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
-È 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">Username</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_user_name">Username</string>
   <string name="EMPTY_SERVER_NAME">Nome del server non specificato</string>
   <string name="EMPTY_USER_NAME">Username mancante</string>
   <string name="CONFIRM_PASSWORD">Le password non coincidono</string>
-  <string name="account_archive_mode">Memorizza la cronologia dei messaggi</string>
-  <string name="account_archive_mode_available">Sul server se disponibile</string>
-  <string name="account_archive_mode_dont_store">Non memorizzare</string>
-  <string name="account_archive_mode_local">Localmente sul dispositivo</string>
-  <string name="account_archive_mode_server">Sul server</string>
-  <string name="account_archive_mode_unread">Localmente solo non inviati e non letti</string>
-  <string name="account_compression_summary">Seleziona per abilitare la compressione dei dati</string>
+    <string name="account_compression_summary">Seleziona per abilitare la compressione dei dati</string>
   <string name="account_custom">Host personalizzato</string>
   <string name="account_custom_summary">Utilizza le impostazioni di host personalizzate invece del record SRV</string>
-  <string name="account_enabled_summary">Abilita per attivare l\'account</string>
-  <string name="account_invalid_port">La porta deve essere un numero (predefinita: 5222)</string>
+    <string name="account_invalid_port">La porta deve essere un numero (predefinita: 5222)</string>
   <string name="account_invalid_port_range">La porta deve essere compresa tra 1 e 65535 (predefinito: 5222)</string>
   <string name="account_invalid_priority">Il valore della priorità deve essere un numero compreso tra -128 e 127 (predefinito: 0)</string>
-  <string name="account_oauth">Autorizzazione</string>
-  <string name="account_oauth_invalidated">Non autorizzato</string>
-  <string name="account_oauth_summary">Impostazioni OAuth</string>
-  <string name="account_proxy_host">Host del proxy</string>
+    <string name="account_proxy_host">Host del proxy</string>
   <string name="account_proxy_invalid_port_range">La porta del proxy deve essere compresa tra 1 e 65535 (predefinito: 8080)</string>
   <string name="account_proxy_invalid_port">La porta del proxy deve essere un numero (predefinito: 8080)</string>
   <string name="account_proxy_password">Password del proxy</string>
@@ -48,18 +32,14 @@
   <string name="account_sasl_summary">Disabilita per il server molto vecchio</string>
   <string name="account_store_password">Memorizza password</string>
   <string name="account_store_password_summary">Disabilita questa opzione per richiedere l\'inserimento della password ogni volta che ti connetti</string>
-  <string name="account_syncable">Integra con i contatti di sistema</string>
-  <string name="account_syncable_summary">Mostra i contatti di questo account nella lista dei contatti del telefono</string>
-  <string name="account_tls_enable">Abilita TLS</string>
+    <string name="account_tls_enable">Abilita TLS</string>
   <string name="account_tls_enable_summary">Quando possibile, usa la crittografia TLS per connettersi al server</string>
   <string name="account_tls_legacy">SSL legacy</string>
   <string name="account_tls_legacy_summary">Usa crittografia SSL legacy quando ti connetti al server</string>
   <string name="account_tls_mode">Usa TLS/SSL</string>
   <string name="account_tls_require">Richiede TLS</string>
   <string name="account_tls_require_summary">Richiedi crittografia TLS quando ti connetti al server</string>
-  <string name="account_use_orbot">Chatta utilizzando la rete anonima TOR e forza il protocollo di crittografia TLS. Non consigliato per Google Talk</string>
-  <string name="confirm_cancellation">Sei sicuro di voler annullare tutte le modifiche?</string>
-  <string name="INCORRECT_USER_NAME">Nome utente non corretto. Controlla il testo di aiuto sottostante per maggiori dettagli.</string>
+    <string name="INCORRECT_USER_NAME">Nome utente non corretto. Controlla il testo di aiuto sottostante per maggiori dettagli.</string>
   <string name="orbot_required_message">Per poter utilizzare TOR è necessario aver installato Orbot ed attivare, mediante lo stesso, il traffico del proxy. Desideri installarlo tramite Google Play?</string>
   <string name="orbot_required_title">Installare Orbot?</string>
   <string name="install_orbot">Installa Orbot</string>
diff --git a/xabber/src/main/res/values-it-rIT/chat_viewer.xml b/xabber/src/main/res/values-it-rIT/chat_viewer.xml
index bc5ce0165e..ea25789d30 100644
--- a/xabber/src/main/res/values-it-rIT/chat_viewer.xml
+++ b/xabber/src/main/res/values-it-rIT/chat_viewer.xml
@@ -21,11 +21,8 @@
   <string name="message_remove">Rimuovi dalla cronologia</string>
   <string name="message_repeat">Ritenta invio</string>
   <string name="message_otr_show_original">Mostra messaggio</string>
-  <string name="message_open_file">Apri</string>
-  <string name="message_save_file">Salva</string>
-  <string name="save_history">Salva cronologia in locale \nMemorizza la cronologia dei messaggi localmente</string>
-  <string name="show_history">Mostra la cronologia</string>
-  <string name="action_attention_called">La richiesta d\'attenzione è stata inviata</string>
+    <string name="save_history">Salva cronologia in locale \nMemorizza la cronologia dei messaggi localmente</string>
+    <string name="action_attention_called">La richiesta d\'attenzione è stata inviata</string>
   <string name="action_attention_requested">Hai ricevuto una richiesta di attenzione</string>
   <string name="action_ban">%1$s è stato bandito</string>
   <string name="action_ban_by">%1$s è stato bandito da %2$s</string>
@@ -73,8 +70,7 @@
   <string name="otr_refresh">Riavvia crittografia</string>
   <string name="otr_request">È stata richiesta una conversazione privata Off-the-Record ma non è presente un plugin che la supporti. Utilizza Pidgin, Gajim o Adium per PC/Mac e Xabber o ChatSecure per Android. Visita http://otr.cypherpunks.ca/ per maggiori informazioni.</string>
   <string name="otr_start">Avvia crittografia</string>
-  <string name="otr_unencrypted_message">Questo messaggio non è stato crittografato</string>
-  <string name="otr_unreadable_message">Il messaggio crittografato che hai inviato è illeggibile</string>
+    <string name="otr_unreadable_message">Il messaggio crittografato che hai inviato è illeggibile</string>
   <string name="otr_not_decrypted_message">Il messaggio non può essere decrittato</string>
   <string name="otr_verification">Verifica OTR</string>
   <string name="otr_verify_fingerprint">Verifica con impronta digitale</string>
@@ -87,21 +83,13 @@
   <string name="otr_verification_progress_title">Verifica OTR in corso</string>
   <string name="otr_verification_notify_button">APERTO</string>
   <string name="otr_verification_notify_button_cancel">Annulla</string>
-  <string name="under_construction">In costruzione</string>
-  <string name="under_construction_message">Questa schermata è in costruzione</string>
-  <string name="chat_events_show_text_global">Usa impostazioni globali</string>
+    <string name="chat_events_show_text_global">Usa impostazioni globali</string>
   <string name="chat_events_show_text_always">Mostra il testo del messaggio</string>
   <string name="chat_events_show_text_never">Nascondi il testo del messaggio</string>
-  <string name="sending_file">Invio file %s</string>
-  <string name="error_sending_file">Errore nell\'invio del file %s</string>
-  <string name="no_application_to_open_file">Nessuna applicazione trovata per aprire questo file</string>
-  <string name="could_not_save_file">Impossibile salvare il file</string>
-  <string name="file_saved_successfully">File salvato con successo</string>
-  <string name="received_by">Ricevuto da %s</string>
-  <string name="could_not_get_path_to_file">Impossibile ottenere il percorso del file</string>
+    <string name="error_sending_file">Errore nell\'invio del file %s</string>
+    <string name="could_not_get_path_to_file">Impossibile ottenere il percorso del file</string>
   <string name="message_open_private_chat">Apri una chat privata</string>
-  <string name="http_file_upload_slot_error">Impossibile caricare il file. Troppo grande?</string>
-  <string name="no_permission_to_read_files">Non hai i permessi per leggere file</string>
+    <string name="no_permission_to_read_files">Non hai i permessi per leggere file</string>
   <string name="no_permission_to_write_files">Non hai i permessi per scrivere file</string>
   <string name="error_description_title">Descrizione di errore:</string>
   <string name="message_status_sent">Inviato</string>
diff --git a/xabber/src/main/res/values-it-rIT/contact_editor.xml b/xabber/src/main/res/values-it-rIT/contact_editor.xml
index 0c4e31d418..6814580673 100644
--- a/xabber/src/main/res/values-it-rIT/contact_editor.xml
+++ b/xabber/src/main/res/values-it-rIT/contact_editor.xml
@@ -17,12 +17,8 @@
   <string name="processing_image">Elaborazione immagine...</string>
   <string name="error_during_crop">Errore durante il ritaglio dell\'immagine</string>
   <string name="error_during_image_processing">Errore durante l\'elaborazione dell\'immagine</string>
-  <string name="account_settings">Impostazioni dell\'account</string>
-  <string name="account_user_info">Informazioni sull\'account</string>
-  <string name="account_server_info">Informazioni di server</string>
+    <string name="account_server_info">Informazioni di server</string>
   <string name="account_server_info_description">Lista delle funzionalità del server</string>
   <string name="conference_private_chat_invitation">%1$s da %2$s vuole avviare una chat privata con te</string>
   <string name="accept_muc_private_chat">Accetta</string>
-  <string name="block_muc_private_chat">Blocca</string>
-  <string name="no_permission_camera">Nessun permesso di accesso alla fotocamera</string>
 </resources>
diff --git a/xabber/src/main/res/values-it-rIT/contact_list.xml b/xabber/src/main/res/values-it-rIT/contact_list.xml
index aaef0ec920..c71f29beca 100644
--- a/xabber/src/main/res/values-it-rIT/contact_list.xml
+++ b/xabber/src/main/res/values-it-rIT/contact_list.xml
@@ -18,17 +18,13 @@
   <string name="application_state_roster">Connesso.</string>
   <string name="application_state_starting">Avvio applicazione&#8230; </string>
   <string name="application_state_waiting">In attesa di connessione&#8230;</string>
-  <string name="chat_list">Lista chat</string>
-  <string name="chat_list_is_empty">Nessuna chat attiva</string>
-  <string name="chat_viewer">Chat</string>
-  <string name="close_chat">Chiudi chat</string>
-  <string name="CONNECTION_FAILED">Errore di connessione</string>
+    <string name="chat_viewer">Chat</string>
+    <string name="CONNECTION_FAILED">Errore di connessione</string>
   <string name="contact_add">Aggiungi contatto</string>
   <string name="contact_delete">Cancella</string>
   <string name="contact_block">Blocca contatto</string>
   <string name="contact_delete_confirm">Vuoi davvero cancellare il contatto %1$s dall\'account %2$s?</string>
-  <string name="contact_list">Lista dei contatti</string>
-  <string name="discard_subscription">Rifiuta il contatto</string>
+    <string name="discard_subscription">Rifiuta il contatto</string>
   <string name="exit">Esci</string>
   <string name="group_active_chat">Chat attive</string>
   <string name="group_none">Nessun gruppo</string>
@@ -40,15 +36,7 @@
   <string name="request_subscription">Richiedi sottoscrizione</string>
   <string name="XMPP_EXCEPTION">Errore di sistema</string>
   <string name="application_state_closing">Salvataggio modifiche&#8230;\nL\'applicazione sarà chiusa a breve.</string>
-  <string name="certificate_confirmation">%1$s. \nTi fidi assolutamente del certificato con impronta digitale SHA-1: %2$s? Non vuoi essere avvisato in futuro di questo problema con il certificato?</string>
-  <string name="certificate_details">\n\n\nRilasciato a: \nRagione Sociale (CN): %1$s \nOrganizzazione (O): %2$s \nUnità Organizzativa (OU): %3$s \nSerial Number: %4$s \n\nRilasciato da: \nRagione Sociale (CN): %5$s \nOrganizzazione (O): %6$s \nUnità Organizzativa (OU): %7$s \n\nValidità: \nRilasciato il: %8$s \nScadenza: %9$s.</string>
-  <string name="certificate_invalid_chane">La verifica della catena delle firme è fallita</string>
-  <string name="certificate_invalid_target">Verifica certificato fallita</string>
-  <string name="certificate_self_signed">Certificato auto firmato</string>
-  <string name="certificate_show_details">Dettagli&#8230;</string>
-  <string name="close_chats">Chiudi tutte le chat</string>
-  <string name="contact_integration_suggest">Vuoi che Xabber sia integrato con i contatti di sistema?\nPuoi modificare la tua scelta in \"Impostazioni\" → \"Account XMPP\" → Tuo account → \"Integrazione contatti\".\nNB: la lista dei contatti di sistema potrebbe subire dei rallentamenti per alcuni minuti.</string>
-  <string name="group_room">Conferenze</string>
+    <string name="group_room">Conferenze</string>
   <string name="OTR_ERROR">Errore OTR</string>
   <string name="select_contact">Clicca per selezionare il contatto</string>
   <string name="show_offline_always">Mostra sempre</string>
@@ -63,8 +51,7 @@
   <string name="block_list">Lista bloccati</string>
   <string name="contact_blocked_successfully">Contatto bloccato con successo</string>
   <string name="error_blocking_contact">Errore durante il blocco del contatto</string>
-  <string name="unblock_contact">Sblocca contatto</string>
-  <string name="contacts_unblocked_successfully">Contatto sbloccato con successo</string>
+    <string name="contacts_unblocked_successfully">Contatto sbloccato con successo</string>
   <string name="error_unblocking_contacts">Errore durante lo sblocco del contatto</string>
   <string name="block_contact_confirm">Vuoi veramente bloccare il contatto %1$s dall\'account %2$s?</string>
   <string name="unblock_all_contacts_confirm">Vuoi veramente sbloccare tutti i contatti dall\'account %1$s?</string>
@@ -76,19 +63,10 @@
   <string name="dark_theme_suggest_dialog_stay_on_light_side">Tema chiaro</string>
   <string name="battery_optimization_disable_dialog_title">Ottimizzazione batteria</string>
   <string name="battery_optimization_disable_dialog_message">Il dispositivo sta facendo alcune pesanti ottimizzazioni di batteria su Xabber che potrebbero portare a ritardi nelle notifiche o anche a perdite di messaggi.\n\nOra ti verrà chiesto di disabilitare queste ottimizzazioni.</string>
-  <string name="save_log_to_file">Salva su file</string>
-  <string name="clear_log">Elimina i vecchi file di registro</string>
+    <string name="clear_log">Elimina i vecchi file di registro</string>
   <string name="open_log_file">Apri</string>
   <string name="send_log_file">Invia</string>
-  <string name="intro_welcome">Benvenuto in Xabber</string>
-  <string name="intro_xabber_description">Client XMPP open source per Android</string>
-  <string name="intro_have_account">Entra con l\'account XMPP</string>
-  <string name="intro_register_account">Registra un account XMPP</string>
-  <string name="intro_create_xabber_account">Usa l\'account Xabber</string>
-  <string name="intro_use_third_party_accounts">usa account XMPP di terze parti</string>
-  <string name="intro_faq">Se non hai un account XMPP, ti prego di <a href="https://www.xabber.com/faq/">leggere le nostre domande frequenti</a> su come ottenerne uno.</string>
-  <string name="intro_web_search_register_xmpp">Registra un account XMPP</string>
-  <string name="synchronize_bookmarks">Sincronizza preferiti</string>
+    <string name="synchronize_bookmarks">Sincronizza preferiti</string>
   <string name="remove_all_bookmarks">Rimuovi tutto</string>
   <string name="remove_selected_bookmarks">Rimuovi i selezionati</string>
   <string name="remove_all_bookmarks_confirm">Vuoi davvero rimuovere tutti i segnalibri per l\'account %1$s?</string>
diff --git a/xabber/src/main/res/values-it-rIT/contact_viewer.xml b/xabber/src/main/res/values-it-rIT/contact_viewer.xml
index a455b83c97..7b7a26ece4 100644
--- a/xabber/src/main/res/values-it-rIT/contact_viewer.xml
+++ b/xabber/src/main/res/values-it-rIT/contact_viewer.xml
@@ -17,12 +17,9 @@
   <string name="vcard_organization_unit">Unità organizzativa</string>
   <string name="vcard_title">Lavoro, funzione</string>
   <string name="vcard_role">Ruolo</string>
-  <string name="vcard_other">Altre informazioni</string>
-  <string name="vcard_categories">Categorie</string>
-  <string name="vcard_decsription">Descrizione</string>
+    <string name="vcard_decsription">Descrizione</string>
   <string name="vcard_note">Note</string>
-  <string name="vcard_address">Indirizzo</string>
-  <string name="vcard_address_pobox">Casella Postale</string>
+    <string name="vcard_address_pobox">Casella Postale</string>
   <string name="vcard_address_extadr">Indirizzo esteso</string>
   <string name="vcard_address_street">Via</string>
   <string name="vcard_address_locality">Località</string>
diff --git a/xabber/src/main/res/values-it-rIT/muc_editor.xml b/xabber/src/main/res/values-it-rIT/muc_editor.xml
index f0499104e7..d22f294453 100644
--- a/xabber/src/main/res/values-it-rIT/muc_editor.xml
+++ b/xabber/src/main/res/values-it-rIT/muc_editor.xml
@@ -20,12 +20,10 @@
   <string name="muc_invite_confirm">%2$s ti ha invitato ad entrare nella conferenza %3$s. Vuoi entrare con l\'account %1$s?</string>
   <string name="muc_invite_confirm_reason">%2$s ti ha invitato ad entrare nella conferenza %3$s: %4$s. Vuoi entrare con l\'account %1$s?</string>
   <string name="muc_leave">Abbandona conferenza</string>
-  <string name="muc_save">Salva conferenza</string>
-  <string name="muc_choose_conference">Scegli conferenza</string>
+    <string name="muc_choose_conference">Scegli conferenza</string>
   <string name="muc_next">Successivo</string>
   <string name="muc_get_hosted_conferences">Recupera le conversazioni di gruppo ospitate</string>
   <string name="muc_error_getting_conferences">Errore nell\'ottenere la lista delle conferenze</string>
   <string name="muc_type_conference_name">Inserire il nome di conferenza</string>
-  <string name="contact_is_blocked">Il contatto è bloccato!</string>
-  <string name="conference_invitation">Invito ad una conferenza</string>
+    <string name="conference_invitation">Invito ad una conferenza</string>
 </resources>
diff --git a/xabber/src/main/res/values-it-rIT/notification_bar.xml b/xabber/src/main/res/values-it-rIT/notification_bar.xml
index bdb3286f48..e761ee0afc 100644
--- a/xabber/src/main/res/values-it-rIT/notification_bar.xml
+++ b/xabber/src/main/res/values-it-rIT/notification_bar.xml
@@ -34,10 +34,7 @@
   <!-- Used for plural form in russian. -->
   <string name="connection_state_waiting_5">-</string>
   <string name="connection_state_offline">%1$d %2$s non è in linea</string>
-  <string name="archive_available_request_message">Vuoi memorizzare la cronologia sul server?\nQuesto permette a Xabber di condividere la cronologia dei messaggi fra tutti i dispositivi che usano questo account. \nQuesta caratteristica richiederà traffico aggiuntivo e ridurrà leggermente la velocità della connessione.\nATTENZIONE: Tutta la tua cronologia locale verrà rimossa.</string>
-  <string name="archive_available_request_title">Abilitare l\'archiviazione dei messaggi?</string>
-  <string name="INVALID_CERTIFICATE">Certificato non valido</string>
-  <string name="muc_invite_message">Vuoi entrare nella conferenza?</string>
+    <string name="muc_invite_message">Vuoi entrare nella conferenza?</string>
   <string name="otr_verification_in_progress">Clicca qui per annullare.</string>
   <string name="PASSWORD_REQUIRED">Password richiesta</string>
   <string name="pay_attention">Presta attenzione</string>
diff --git a/xabber/src/main/res/values-it-rIT/preference_editor.xml b/xabber/src/main/res/values-it-rIT/preference_editor.xml
index b1ea81dc81..a9f9147668 100644
--- a/xabber/src/main/res/values-it-rIT/preference_editor.xml
+++ b/xabber/src/main/res/values-it-rIT/preference_editor.xml
@@ -12,14 +12,11 @@
   <string name="contacts_order_alphabet">Alfabetico</string>
   <string name="contacts_order_status">Per stato</string>
   <string name="contacts_show_accounts">Raggruppa per account\nNella lista dei contatti, raggruppa i contatti per account</string>
-  <string name="contacts_show_active_chats">Chat attive in alto\nMostra le chat attive sopra la lista dei contatti</string>
-  <string name="contacts_show_avatars">Mostra avatar \nMostra gli avatar degli utenti nella lista dei contatti</string>
+    <string name="contacts_show_avatars">Mostra avatar \nMostra gli avatar degli utenti nella lista dei contatti</string>
   <string name="contacts_show_empty_groups">Mostra gruppi vuoti\nMostra gruppi senza contatti connessi</string>
   <string name="contacts_show_groups">Mostra gruppi \nMostra gruppi nella lista dei contatti</string>
   <string name="contacts_show_offline">Mostra i contatti non in linea</string>
-  <string name="contacts_show_panel">Mostra pannello account\nMostra pulsante d\'azione con gli avatar nell\'angolo in basso a destra della lista contatti</string>
-  <string name="contacts_stay_active_chats">Duplica chat attive\nLe chat attive appariranno sia in cima alla lista contatti che nei gruppi</string>
-  <string name="debug_log">Log debug \nScrive messaggi di debug nel log (riavviare l\'applicazione per applicare i cambiamenti)</string>
+    <string name="debug_log">Log debug \nScrive messaggi di debug nel log (riavviare l\'applicazione per applicare i cambiamenti)</string>
   <string name="debug_file_log_title">Scrivi il log\nScrivi il log di debug in un file locale (puoi condividerlo).</string>
   <string name="debug_log_files_title">File di log\nLista dei file di log scritti.</string>
   <string name="debug_log_files_activity_title">File di log</string>
@@ -36,8 +33,7 @@
   <string name="interface_theme">Tema</string>
   <string name="interface_theme_dark">Scuro</string>
   <string name="interface_theme_light">Chiaro</string>
-  <string name="interface_theme_normal">Predefinito</string>
-  <string name="interface_smiles">Emoticon</string>
+    <string name="interface_smiles">Emoticon</string>
   <string name="interface_smiles_android">Emoticon Android</string>
   <string name="interface_smiles_none">Emoticon testuali</string>
   <string name="preference_connection">Impostazioni di connessione \nImpostazioni di connessione</string>
@@ -62,8 +58,7 @@
   <string name="chats_font_size_xlarge">Molto grande</string>
   <string name="chats_hide_keyboard">Nascondi la tastiera</string>
   <string name="chats_hide_keyboard_landscape">In modalità orizzontale</string>
-  <string name="chats_receipt">Conferme di lettura \nInvia e ricevi conferme di lettura dei messaggi</string>
-  <string name="chats_show_avatars">Avatar nei messaggi \nMostra gli avatar in ogni messaggio</string>
+    <string name="chats_show_avatars">Avatar nei messaggi \nMostra gli avatar in ogni messaggio</string>
   <string name="chats_show_status_change">Mostrare i cambiamenti di stato</string>
   <string name="chats_show_status_change_muc">Nelle conferenze</string>
   <string name="chats_state_notification">Invia notifiche di scrittura\nNotifica gli altri utenti che stai scrivendo</string>
@@ -77,37 +72,24 @@
   <string name="contacts_reset_offline">Ripristina impostazione \"Mostra contatti offline\"\nCancella le impostazioni individuali per i gruppi e gli account</string>
   <string name="contacts_reset_offline_warning">Vuoi davvero cancellare le impostazioni individuali per i gruppi e gli account?</string>
   <string name="events_first_only">Avvisa al primo messaggio\nNotifica solo il primo messaggio ricevuto in una chat</string>
-  <string name="events_ignore_system_vibro">Ignora le impostazioni di sistema per la vibrazione \nUsa questa opzione se la vibrazione non funziona</string>
-  <string name="events_message">Impostazioni notifiche\nConfigura le notifiche per i messaggi in arrivo</string>
-  <string name="events_message_chat">Solo chat</string>
-  <string name="events_message_chat_and_muc">Chat e conferenze</string>
-  <string name="events_message_none">Nessuna notifica</string>
-  <string name="events_show_text">Anteprima messaggio\nVisualizza il testo del messaggio dalle conversazioni nell\'area di notifica</string>
+    <string name="events_show_text">Anteprima messaggio\nVisualizza il testo del messaggio dalle conversazioni nell\'area di notifica</string>
   <string name="events_show_text_muc">Anteprima messaggio\nVisualizza il testo del messaggio dalle conferenze nell\'area di notifica</string>
-  <string name="events_visible_chat">Notifiche nella chat corrente\nNotifica i messaggi in arrivo nella chat corrente</string>
-  <string name="events_suppress_100">Elimina alcuni messaggi di stato\nNon mostrare il messaggio \'questa stanza non è anonima\'</string>
+    <string name="events_suppress_100">Elimina alcuni messaggi di stato\nNon mostrare il messaggio \'questa stanza non è anonima\'</string>
   <string name="negative_priotiry_summary">%s (non riceverai messaggi da nessuna chat)</string>
   <string name="preference_accounts">Account XMPP\nGestisci account</string>
   <string name="preference_security">Sicurezza \nImpostazioni di sicurezza</string>
   <string name="security_check_certificate">Verifica certificato server\nNotifica problemi di certificato in connessioni cifrate</string>
-  <string name="security_clear_certificate">Rimuovi certificati\nPulisci la lista dei certificati ignorati</string>
-  <string name="security_otr_history">Conserva cronologia\nConserva la cronologia delle chat per le sessioni OTR</string>
-  <string name="security_otr_mode">Modalità OTR</string>
+    <string name="security_otr_mode">Modalità OTR</string>
   <string name="chats_attention">Attenzione\nNotifica le richieste d\'attenzione in arrivo</string>
   <string name="chats_attention_sound">Suono attenzione\nScegli suoneria</string>
   <string name="connection_load_vcard">Carica vCard\nCarica ed aggiorna le informazioni personali di contatto e l\'avatar. Disabilita per ridurre l\'utilizzo del traffico.</string>
   <string name="connection_load_images">Carica immagini\nCarica automaticamente le immagini dall\'URL del file. Disabilitare per ridurre l\'utilizzo del traffico dati.</string>
   <string name="connection_use_carbons">Modalità copia-carbone\nCondivide la medesima sessione con lo stesso account di ogni dispositivo connesso. Disabilitare per ridurre l\'utilizzo del traffico.</string>
-  <string name="connection_dns_resolver_type">Tipo di risolutore DNS</string>
-  <string name="connection_dns_resolver_type_dns_java_resolver">DNS Java Resolver</string>
+    <string name="connection_dns_resolver_type_dns_java_resolver">DNS Java Resolver</string>
   <string name="connection_dns_resolver_type_mini_dns_resolver">MiniDNSResolver (sperimentale)</string>
-  <string name="connection_use_plain_text_auth">Autenticazione in chiaro\nUsa l\'autenticazione in chiaro per tutti gli account. Sconsigliato.</string>
-  <string name="events_phrases">Frasi chiave\nCrea notifiche personalizzate per i messaggi ricevuti contenenti frasi specifiche</string>
-  <string name="security_clear_certificate_warning">Vuoi davvero rimuovere tutti i certificati ignorati?</string>
-  <string name="account_error_settings">Impostazioni</string>
-  <string name="category_xabber_account">Xabber Account</string>
-  <string name="category_xmpp_accounts">XMPP Accounts</string>
-  <string name="category_interface">Interfaccia</string>
+    <string name="events_phrases">Frasi chiave\nCrea notifiche personalizzate per i messaggi ricevuti contenenti frasi specifiche</string>
+    <string name="account_error_settings">Impostazioni</string>
+    <string name="category_interface">Interfaccia</string>
   <string name="category_settings">Impostazioni</string>
   <string name="category_about">Info</string>
   <string name="category_appearance">Aspetto</string>
diff --git a/xabber/src/main/res/values-it-rIT/words.xml b/xabber/src/main/res/values-it-rIT/words.xml
index 91e90b90ad..13ac815b5e 100644
--- a/xabber/src/main/res/values-it-rIT/words.xml
+++ b/xabber/src/main/res/values-it-rIT/words.xml
@@ -20,5 +20,4 @@
   <string name="settings">Impostazioni</string>
   <string name="ok">OK</string>
   <string name="login">Entra</string>
-  <string name="resume">Riprendi</string>
 </resources>
diff --git a/xabber/src/main/res/values-iw-rIL/account_editor.xml b/xabber/src/main/res/values-iw-rIL/account_editor.xml
index 935757f0c9..12a904f93c 100644
--- a/xabber/src/main/res/values-iw-rIL/account_editor.xml
+++ b/xabber/src/main/res/values-iw-rIL/account_editor.xml
@@ -2,41 +2,25 @@
 <!--Generated by crowdin.com-->
 <resources>
   <string name="account_compression">השתמש בדחיסה</string>
-  <string name="account_enabled">מאופשר</string>
-  <string name="account_host">מארח</string>
+    <string name="account_host">מארח</string>
   <string name="account_password">ססמה</string>
   <string name="confirm_password">אישור הססמה</string>
   <string name="account_port">יציאה</string>
   <string name="account_priority">עדיפות</string>
   <string name="account_resource">משאב</string>
   <string name="account_server_name">שרת</string>
-  <string name="account_type">סוג חשבון</string>
-  <string name="account_type_hints_gtalk">שם משתמש עבור gmail.com או מתחם Google Apps</string>
-  <string name="account_type_helps_gtalk">אם עדיין אין לך חשבון Google, ניתן ליצור חשבון בכתובת http://mail.google.com
-ניתן גם להשתמש בחשבון Google Apps בצורה זו: your_user_name@your_google_domain\n\n</string>
-  <string name="account_xmpp_register_warning">אתה חייב <a href="http://www.google.com/#q=register an XMPP account"> לרשום חשבון XMPP</a> לפני הוספתם Xabber!</string>
-  <string name="account_type_helps_xmpp">ניתן ללמוד עוד אודות XMPP (Jabber), כאן: https://xmpp.org</string>
-  <string name="account_user_name">שם משתמש</string>
+    <string name="account_xmpp_register_warning">אתה חייב <a href="http://www.google.com/#q=register an XMPP account"> לרשום חשבון XMPP</a> לפני הוספתם Xabber!</string>
+    <string name="account_user_name">שם משתמש</string>
   <string name="EMPTY_SERVER_NAME">שם שרת לא צוין</string>
   <string name="EMPTY_USER_NAME">שם משתמש לא צוין</string>
   <string name="CONFIRM_PASSWORD">הסיסמאות אינן תואמות</string>
-  <string name="account_archive_mode">אחסן היסטוריית הודעות</string>
-  <string name="account_archive_mode_available">על השרת כאשר זמין</string>
-  <string name="account_archive_mode_dont_store">לא לאחסן</string>
-  <string name="account_archive_mode_local">באופן מקומי על מכשיר זה</string>
-  <string name="account_archive_mode_server">על השרת</string>
-  <string name="account_archive_mode_unread">שמור באופן מקומי רק הודעות שלא נקראו או שלא נשלחו</string>
-  <string name="account_compression_summary">סמן כדי לאפשר דחיסת נתונים</string>
+    <string name="account_compression_summary">סמן כדי לאפשר דחיסת נתונים</string>
   <string name="account_custom">מארח מותאם</string>
   <string name="account_custom_summary">השתמש בהגדרות שרת מותאמות במקום ברשומת SRV</string>
-  <string name="account_enabled_summary">החלק להפעלת החשבון</string>
-  <string name="account_invalid_port">היציאה חייבת להיות מספר (ברירת מחדל: 5222)‎</string>
+    <string name="account_invalid_port">היציאה חייבת להיות מספר (ברירת מחדל: 5222)‎</string>
   <string name="account_invalid_port_range">יציאה חייבת להיות בין 1 ל-65535 (ברירת מחדל: 5222)</string>
   <string name="account_invalid_priority">ערך עדיפות חייב להיות מספר בין 128- לבין 127 (ברירת מחדל: 10)‎</string>
-  <string name="account_oauth">אימות</string>
-  <string name="account_oauth_invalidated">לא מאומת</string>
-  <string name="account_oauth_summary">הגדרות OAuth</string>
-  <string name="account_proxy_host">מארח Proxy</string>
+    <string name="account_proxy_host">מארח Proxy</string>
   <string name="account_proxy_invalid_port_range">יציאת Proxy חייבת להיות בין 1 ל-65535 (ברירת מחדל: 8080)</string>
   <string name="account_proxy_invalid_port">יציאת proxy חייבת להיות מספר (ברירת מחדל: 8080)</string>
   <string name="account_proxy_password">סיסמת Proxy</string>
@@ -48,18 +32,14 @@
   <string name="account_sasl_summary">נטרל עבור שרת ישן מאוד</string>
   <string name="account_store_password">אחסן סיסמה</string>
   <string name="account_store_password_summary">נטרל אפשרות זו כדי לבקש סיסמה בכל התחברות</string>
-  <string name="account_syncable">שלב לתוך רשימת אנשי קשר של מערכת</string>
-  <string name="account_syncable_summary">הצג אנשי קשר מתוך חשבון זה בתוך רשימת אנשי קשר של הטלפון</string>
-  <string name="account_tls_enable">אפשר TLS‎</string>
+    <string name="account_tls_enable">אפשר TLS‎</string>
   <string name="account_tls_enable_summary">השתמש בהצפנת TLS כאשר ניתן להתחבר לשרת</string>
   <string name="account_tls_legacy">SSL‎ ישן</string>
   <string name="account_tls_legacy_summary">השתמש בהצפנת SSL מדור קודם בעת התחברות אל השרת</string>
   <string name="account_tls_mode">השתמש ב-TLS/SSL</string>
   <string name="account_tls_require">דרוש TLS‎</string>
   <string name="account_tls_require_summary">דרוש הצפנת TLS בעת התחברות אל השרת</string>
-  <string name="account_use_orbot">שוחח מבעד לרשת אלמוניות TOR ואכוף פרוטוקול הצפנת TLS\n(לא מומלץ עבורGoogle Talk ‎)</string>
-  <string name="confirm_cancellation">האם אתה בטוח כי ברצונך למחוק את כל השינויים?‎</string>
-  <string name="INCORRECT_USER_NAME">שם משתמש לא תקין. למידע נוסף בדוק בטקסט עזרה בהמשך.</string>
+    <string name="INCORRECT_USER_NAME">שם משתמש לא תקין. למידע נוסף בדוק בטקסט עזרה בהמשך.</string>
   <string name="orbot_required_message">על מנת להתקדם באמצעות TOR, על המכשיר שלך חייבת להיות מותקנת תוכנת Orbot ופועלת כדי להעביר את המידע דרכו. האם ברצונך להתקינו מתוך Google Play?</string>
   <string name="orbot_required_title">האם להתקין Orbot?</string>
   <string name="install_orbot">מתקין Orbot</string>
diff --git a/xabber/src/main/res/values-iw-rIL/chat_viewer.xml b/xabber/src/main/res/values-iw-rIL/chat_viewer.xml
index a1228efded..17cfbe0d24 100644
--- a/xabber/src/main/res/values-iw-rIL/chat_viewer.xml
+++ b/xabber/src/main/res/values-iw-rIL/chat_viewer.xml
@@ -21,11 +21,8 @@
   <string name="message_remove">מחק מההיסטוריה</string>
   <string name="message_repeat">נסה לשלוח שוב</string>
   <string name="message_otr_show_original">הצג הודעה</string>
-  <string name="message_open_file">פתח</string>
-  <string name="message_save_file">שמור</string>
-  <string name="save_history">שמור היסטוריה מקומית\nאחסון מקומי של היסטוריית הודעות</string>
-  <string name="show_history">הצג היסטוריה</string>
-  <string name="action_attention_called">נשלחה קריאה לתשומת לב</string>
+    <string name="save_history">שמור היסטוריה מקומית\nאחסון מקומי של היסטוריית הודעות</string>
+    <string name="action_attention_called">נשלחה קריאה לתשומת לב</string>
   <string name="action_attention_requested">התקבלה בקשה לתשומת לב</string>
   <string name="action_ban">%1$s נחסם/מה</string>
   <string name="action_ban_by">%1$s נחסם/מה על ידי %2$s‎</string>
@@ -73,8 +70,7 @@
   <string name="otr_refresh">הצפנה מחדש</string>
   <string name="otr_request">דיון פרטי Off-the-Record התבקש אולם אין ברשותך את התוסף התומך. השתמש בלקוחות כגון Pidgin, Gajim או Adium למחשבי PC/Mac ובלקוח Xabber או ChatSecure לאנדרואיד. ראה http://otr.cypherpunks.ca/ למידע נוסף.</string>
   <string name="otr_start">הפעל הצפנה</string>
-  <string name="otr_unencrypted_message">הודעה זו לא הוצפנה</string>
-  <string name="otr_unreadable_message">ההודעה המוצפנת אשר התקבלה אינה קריאה</string>
+    <string name="otr_unreadable_message">ההודעה המוצפנת אשר התקבלה אינה קריאה</string>
   <string name="otr_not_decrypted_message">אי אפשר לפענח את ההודעה</string>
   <string name="otr_verification">אימות OTR</string>
   <string name="otr_verify_fingerprint">אמת בעזרת טביעת אצבע</string>
@@ -87,21 +83,13 @@
   <string name="otr_verification_progress_title">OTR האימות מתבצע</string>
   <string name="otr_verification_notify_button">פתוח</string>
   <string name="otr_verification_notify_button_cancel">ביטול</string>
-  <string name="under_construction">בבנייה</string>
-  <string name="under_construction_message">מסך זה בבניה</string>
-  <string name="chat_events_show_text_global">השתמש בהגדרות כלליות</string>
+    <string name="chat_events_show_text_global">השתמש בהגדרות כלליות</string>
   <string name="chat_events_show_text_always">הצג טקסט הודעה</string>
   <string name="chat_events_show_text_never">הסתר טקסט הודעה</string>
-  <string name="sending_file">שולח קובץ %s</string>
-  <string name="error_sending_file">שגיאה בשליחת הקובץ %s</string>
-  <string name="no_application_to_open_file">לא נמצא יישום מתאים לפתיחת קובץ זה</string>
-  <string name="could_not_save_file">לא ניתן לשמור את הקובץ</string>
-  <string name="file_saved_successfully">הקובץ נשמר בהצלחה</string>
-  <string name="received_by">התקבל מאת %s</string>
-  <string name="could_not_get_path_to_file">לא ניתן לקבל את הנתיב לקובץ</string>
+    <string name="error_sending_file">שגיאה בשליחת הקובץ %s</string>
+    <string name="could_not_get_path_to_file">לא ניתן לקבל את הנתיב לקובץ</string>
   <string name="message_open_private_chat">פתח שיחה פרטית</string>
-  <string name="http_file_upload_slot_error">לא ניתן להעלות את הקובץ. אולי הוא גדול מדי?</string>
-  <string name="no_permission_to_read_files">אין הרשאה לקריאת קבצים</string>
+    <string name="no_permission_to_read_files">אין הרשאה לקריאת קבצים</string>
   <string name="no_permission_to_write_files">אין הרשאה לשמירת קבצים</string>
   <string name="error_description_title">תיאור שגיאה:</string>
   <string name="message_status_sent">נשלח</string>
diff --git a/xabber/src/main/res/values-iw-rIL/contact_editor.xml b/xabber/src/main/res/values-iw-rIL/contact_editor.xml
index c49128de76..769bc7d49c 100644
--- a/xabber/src/main/res/values-iw-rIL/contact_editor.xml
+++ b/xabber/src/main/res/values-iw-rIL/contact_editor.xml
@@ -17,12 +17,8 @@
   <string name="processing_image">עיבוד תמונה...</string>
   <string name="error_during_crop">שגיאה בעת חיתוך תמונות</string>
   <string name="error_during_image_processing">שגיאה במהלך עיבוד תמונה</string>
-  <string name="account_settings">הגדרות חשבון</string>
-  <string name="account_user_info">פרטי חשבון</string>
-  <string name="account_server_info">שרת פרטי</string>
+    <string name="account_server_info">שרת פרטי</string>
   <string name="account_server_info_description">רשימה של יכולות שרת</string>
   <string name="conference_private_chat_invitation">%1$s מן %2$s רוצה להתחיל שיחה פרטית איתך</string>
   <string name="accept_muc_private_chat">אשר</string>
-  <string name="block_muc_private_chat">חסום</string>
-  <string name="no_permission_camera">אין אישור גישה למצלמה</string>
 </resources>
diff --git a/xabber/src/main/res/values-iw-rIL/contact_list.xml b/xabber/src/main/res/values-iw-rIL/contact_list.xml
index 99cb86e1ae..8e35eb2f42 100644
--- a/xabber/src/main/res/values-iw-rIL/contact_list.xml
+++ b/xabber/src/main/res/values-iw-rIL/contact_list.xml
@@ -18,17 +18,13 @@
   <string name="application_state_roster">מחובר.‎</string>
   <string name="application_state_starting">כעת משגר אפליקציה... </string>
   <string name="application_state_waiting">כעת ממתין לחיבור...‎</string>
-  <string name="chat_list">רשימת שיחה</string>
-  <string name="chat_list_is_empty">אין שיחות פעילות</string>
-  <string name="chat_viewer">שיחה</string>
-  <string name="close_chat">סגור שיחה</string>
-  <string name="CONNECTION_FAILED">שגיאת חיבור</string>
+    <string name="chat_viewer">שיחה</string>
+    <string name="CONNECTION_FAILED">שגיאת חיבור</string>
   <string name="contact_add">הוסף איש קשר</string>
   <string name="contact_delete">מחק</string>
   <string name="contact_block">חסום את איש הקשר</string>
   <string name="contact_delete_confirm">האם אכן ברצונך למחוק את איש קשר %1$s מתוך חשבון %2$s?‎</string>
-  <string name="contact_list">רשימת קשר</string>
-  <string name="discard_subscription">דחה איש קשר</string>
+    <string name="discard_subscription">דחה איש קשר</string>
   <string name="exit">יציאה</string>
   <string name="group_active_chat">שיחות פעילות</string>
   <string name="group_none">אין קבוצות</string>
@@ -40,15 +36,7 @@
   <string name="request_subscription">בקש הרשמה</string>
   <string name="XMPP_EXCEPTION">שגיאת זרם</string>
   <string name="application_state_closing">כעת שומר שינויים...\nאפליקציה תיסגר בקרוב. ‎</string>
-  <string name="certificate_confirmation">%1$s.\nIssuer שימושים בשימוש טביעות אצבע (SHA-1), שלא ניתן לסמוך: %2$s? האם ברצונך לא לקבל הודעה אודות בעיה זו באמצעות אישור זה?</string>
-  <string name="certificate_details">\n\nהונפקה למען:\nשם כללי (CN)&amp;rlm;: %1$s\nארגון (O)&amp;rlm;: %2$s\nיחידת ארגון (OU)&amp;rlm;: %3$s\nמספר סידורי: %4$s\n\nהונפקה על ידי:\nשם כללי (CN)&amp;rlm;: %5$s\nארגון (O)&amp;rlm;: %6$s\nיחידת ארגון (OU)&amp;rlm;: %7$s\n\nתקפות:\nהונפקה ביום: %8$s\nפוקעת ביום: %9$s.               ‎</string>
-  <string name="certificate_invalid_chane">אימות שרשרת חתימה נכשל</string>
-  <string name="certificate_invalid_target">היעד שהאימות נכשל</string>
-  <string name="certificate_self_signed">אישור בחתימה עצמית</string>
-  <string name="certificate_show_details">פרטים ...‎</string>
-  <string name="close_chats">סגור את כל השיחות</string>
-  <string name="contact_integration_suggest">האם ברצונך כי Xabber ישתלב אל תוך אנשי קשר של מערכת?\nזו ניתנת לשינוי בתוך \"הגדרות\" ← \"חשבונות XMPP\" ← החשבון שלך ← \"שילוב איש קשר\".\nהערה: רשימת קשר של מערכת יכולה לתפקד בצורה איטית יותר למשך כמה דקות.  ‎</string>
-  <string name="group_room">ועידות</string>
+    <string name="group_room">ועידות</string>
   <string name="OTR_ERROR">שגיאת OTR</string>
   <string name="select_contact">אנא לחץ כדי לברור איש קשר</string>
   <string name="show_offline_always">הצג תמיד</string>
@@ -63,8 +51,7 @@
   <string name="block_list">רשימת חסומים</string>
   <string name="contact_blocked_successfully">חסימת איש הקשר הצליחה</string>
   <string name="error_blocking_contact">אירעה שגיאה במהלך חסימת איש הקשר</string>
-  <string name="unblock_contact">בטל חסימת איש הקשר</string>
-  <string name="contacts_unblocked_successfully">ביטול חסימת איש הקשר הצליחה</string>
+    <string name="contacts_unblocked_successfully">ביטול חסימת איש הקשר הצליחה</string>
   <string name="error_unblocking_contacts">אירעה שגיאה בעת ביטול החסימה של אנשי הקשר</string>
   <string name="block_contact_confirm">האם אכן ברצונך לחסום את איש הקשר %1$s מתוך חשבון %2$s?‎?</string>
   <string name="unblock_all_contacts_confirm">האם אתה אכן מעוניין לבטל את החסימה של כל אנשי הקשר מחשבון %1$s?</string>
@@ -76,19 +63,10 @@
   <string name="dark_theme_suggest_dialog_stay_on_light_side">בהיר</string>
   <string name="battery_optimization_disable_dialog_title">אופטימיזציה של סוללה</string>
   <string name="battery_optimization_disable_dialog_message">המכשיר עושה כמה אופטימיזציות בסוללה על Xabber שעשויים להוביל הודעות מושהה או אפילו הודעה loss.\n\nYou עכשיו יתבקש לבטל אותם.</string>
-  <string name="save_log_to_file">שמור בקובץ</string>
-  <string name="clear_log">מחק קבצי יומן הרישום הישן</string>
+    <string name="clear_log">מחק קבצי יומן הרישום הישן</string>
   <string name="open_log_file">פתח</string>
   <string name="send_log_file">שלח</string>
-  <string name="intro_welcome">ברוכים הבאים לXabber</string>
-  <string name="intro_xabber_description">לקוח XMPP קוד פתוח עבור אנדרואיד</string>
-  <string name="intro_have_account">כניסה XMPP</string>
-  <string name="intro_register_account">רישום חשבון XMPP</string>
-  <string name="intro_create_xabber_account">השתמש בחשבון Xabber</string>
-  <string name="intro_use_third_party_accounts">להשתמש בחשבונות XMPP צד שלישי</string>
-  <string name="intro_faq">אם אין לך חשבון XMPP, אנא <a href="https://www.xabber.com/faq/"> קרא שלנו שאלות נפוצות</a> על איך להשיג אחת.</string>
-  <string name="intro_web_search_register_xmpp">רישום חשבון XMPP</string>
-  <string name="synchronize_bookmarks">לסנכרן את הסימניות</string>
+    <string name="synchronize_bookmarks">לסנכרן את הסימניות</string>
   <string name="remove_all_bookmarks">להסיר את כל</string>
   <string name="remove_selected_bookmarks">מחק נבחרים</string>
   <string name="remove_all_bookmarks_confirm">\? אתה באמת רוצה להסיר את כל הסימניות חשבון %1$s</string>
diff --git a/xabber/src/main/res/values-iw-rIL/contact_viewer.xml b/xabber/src/main/res/values-iw-rIL/contact_viewer.xml
index b8248958ed..ed988b24b6 100644
--- a/xabber/src/main/res/values-iw-rIL/contact_viewer.xml
+++ b/xabber/src/main/res/values-iw-rIL/contact_viewer.xml
@@ -17,12 +17,9 @@
   <string name="vcard_organization_unit">יחידה ארגונית</string>
   <string name="vcard_title">תואר משרה, תפקוד</string>
   <string name="vcard_role">תפקיד</string>
-  <string name="vcard_other">מידע אחר</string>
-  <string name="vcard_categories">קטגוריות</string>
-  <string name="vcard_decsription">תיאור</string>
+    <string name="vcard_decsription">תיאור</string>
   <string name="vcard_note">הערות</string>
-  <string name="vcard_address">כתובת</string>
-  <string name="vcard_address_pobox">PO Box</string>
+    <string name="vcard_address_pobox">PO Box</string>
   <string name="vcard_address_extadr">כתובת מורחבת</string>
   <string name="vcard_address_street">רחוב</string>
   <string name="vcard_address_locality">מקומיות</string>
diff --git a/xabber/src/main/res/values-iw-rIL/muc_editor.xml b/xabber/src/main/res/values-iw-rIL/muc_editor.xml
index a0d07b3bc0..81699f537a 100644
--- a/xabber/src/main/res/values-iw-rIL/muc_editor.xml
+++ b/xabber/src/main/res/values-iw-rIL/muc_editor.xml
@@ -20,12 +20,10 @@
   <string name="muc_invite_confirm">הוזמנת על ידי %2$s להצטרף לשיחת הועידה %3$s. ברצונך להצטרף מהחשבון %1$s?</string>
   <string name="muc_invite_confirm_reason">הוזמנת על ידי %2$s להצטרף לשיחת הועידה %3$s. ברצונך להצטרף מהחשבון %1$s?</string>
   <string name="muc_leave">עזוב את שיחת הועידה</string>
-  <string name="muc_save">שמור שיחת ועידה</string>
-  <string name="muc_choose_conference">בחר שיחת ועידה</string>
+    <string name="muc_choose_conference">בחר שיחת ועידה</string>
   <string name="muc_next">הבא</string>
   <string name="muc_get_hosted_conferences">קבל אירוח ועידה</string>
   <string name="muc_error_getting_conferences">אירעה שגיאה במהלך הוועידה</string>
   <string name="muc_type_conference_name">הקש שם לשיחת הועידה</string>
-  <string name="contact_is_blocked">איש הקשר חסום!</string>
-  <string name="conference_invitation">הזמנה לשיחת ועידה</string>
+    <string name="conference_invitation">הזמנה לשיחת ועידה</string>
 </resources>
diff --git a/xabber/src/main/res/values-iw-rIL/notification_bar.xml b/xabber/src/main/res/values-iw-rIL/notification_bar.xml
index b7dd673906..b223593c2d 100644
--- a/xabber/src/main/res/values-iw-rIL/notification_bar.xml
+++ b/xabber/src/main/res/values-iw-rIL/notification_bar.xml
@@ -34,10 +34,7 @@
   <!-- Used for plural form in russian. -->
   <string name="connection_state_waiting_5">-</string>
   <string name="connection_state_offline">%1$d %2$s בלתי מקוונים</string>
-  <string name="archive_available_request_message">האם ברצונך לאחסן הודעות היסטוריה בשרת?\nזו מתירה ל-Xabber לטעון היסטוריית הודעה מתוך כל המכשירים אשר משתמשים בחשבון זה.\nתכונה זו תצרוך תעבורה נוספת ותקטין מהירות חיבור במידת מה.\nאזהרה: כל ההיסטוריה המקומית שלך תוסר.   ‎</string>
-  <string name="archive_available_request_title">לאפשר ארכיב הודעה?</string>
-  <string name="INVALID_CERTIFICATE">אישור לא חוקי</string>
-  <string name="muc_invite_message">האם ברצונך להיכנס לועידה?</string>
+    <string name="muc_invite_message">האם ברצונך להיכנס לועידה?</string>
   <string name="otr_verification_in_progress">לחץ כאן כדי לבטל את זה.</string>
   <string name="PASSWORD_REQUIRED">נדרשת סיסמה</string>
   <string name="pay_attention">שימו לב</string>
diff --git a/xabber/src/main/res/values-iw-rIL/preference_editor.xml b/xabber/src/main/res/values-iw-rIL/preference_editor.xml
index 81c6bb96c5..bc00aad2ca 100644
--- a/xabber/src/main/res/values-iw-rIL/preference_editor.xml
+++ b/xabber/src/main/res/values-iw-rIL/preference_editor.xml
@@ -12,14 +12,11 @@
   <string name="contacts_order_alphabet">א-ת</string>
   <string name="contacts_order_status">לפי מצב</string>
   <string name="contacts_show_accounts">קבץ לפי חשבון\nקיבוץ אנשי קשר בתוך הרשימה לפי שיוכם לחשבון</string>
-  <string name="contacts_show_active_chats">שיחות פעילות בחלק העליון\nהצג שיחות פעילות בראש רשימת אנשי הקשר</string>
-  <string name="contacts_show_avatars">הצג אווטארים\nהצג אווטארים של משתמשים ברשימת אנשי הקשר</string>
+    <string name="contacts_show_avatars">הצג אווטארים\nהצג אווטארים של משתמשים ברשימת אנשי הקשר</string>
   <string name="contacts_show_empty_groups">הצג קבוצות ריקות\nהצג גם קבוצות שאין בהם אנשי קשר זמינים</string>
   <string name="contacts_show_groups">הצג קבוצות\nהצגת קבוצות בתוך רשימת קשר ‎</string>
   <string name="contacts_show_offline">הצג אנשי קשר לא מחוברים</string>
-  <string name="contacts_show_panel">הצג פנל חשבון\nהצג לחצני פעולה עם אווטרס בפינה הימנית התחתונה של רשימת אנשי קשר</string>
-  <string name="contacts_stay_active_chats">תצוגה כפולה של שיחות פעילות\nשיחות פעילות יוצגו גם בראש רשימת אנשי הקשר וגם בקבוצה שלהם</string>
-  <string name="debug_log">Log\nWrite הודעות כדי לאתר באגים יומן איתור באגים (בבקשה מחדש את היישום כדי להחיל שינויים)</string>
+    <string name="debug_log">Log\nWrite הודעות כדי לאתר באגים יומן איתור באגים (בבקשה מחדש את היישום כדי להחיל שינויים)</string>
   <string name="debug_file_log_title">לכתוב יומן רישום לאיתור באגים קובץ log\nWrite קובץ מקומי (אתה יכול לשתף את זה).</string>
   <string name="debug_log_files_title">להיכנס files\nList של קבצי יומן רישום בכתב.</string>
   <string name="debug_log_files_activity_title">קבצי יומן רישום</string>
@@ -36,8 +33,7 @@
   <string name="interface_theme">ערכת נושא</string>
   <string name="interface_theme_dark">כהה</string>
   <string name="interface_theme_light">בהיר</string>
-  <string name="interface_theme_normal">ברירת המחדל</string>
-  <string name="interface_smiles">סמלי הבעה</string>
+    <string name="interface_smiles">סמלי הבעה</string>
   <string name="interface_smiles_android">סמלי הבעה אנדרואיד</string>
   <string name="interface_smiles_none">בלי רגשונים גרפיים</string>
   <string name="preference_connection">הגדרות חיבור\nהגדרות חיבור</string>
@@ -62,8 +58,7 @@
   <string name="chats_font_size_xlarge">ענק</string>
   <string name="chats_hide_keyboard">הסתר מקשים</string>
   <string name="chats_hide_keyboard_landscape">בתצוגה רוחבית</string>
-  <string name="chats_receipt">קבלות מסירת הודעה\nשליחת וקבלת קבלות מסירת הודעה</string>
-  <string name="chats_show_avatars">אווטארים בתוך הודעות\nהצגת אווטארים בתוך כל הודעה</string>
+    <string name="chats_show_avatars">אווטארים בתוך הודעות\nהצגת אווטארים בתוך כל הודעה</string>
   <string name="chats_show_status_change">הצג מצב משתנה</string>
   <string name="chats_show_status_change_muc">בתוך ועידות</string>
   <string name="chats_state_notification">הצג הודעה שאתה מקליד\nהצג למשתמש האחר שאתה מקליד</string>
@@ -77,37 +72,24 @@
   <string name="contacts_reset_offline">איפוס הגדרות נפרדות settings\nClear במצב לא מקוון עבור חשבונות וקבוצות</string>
   <string name="contacts_reset_offline_warning">\? אתה באמת רוצה לנקות הגדרות נפרדות עבור חשבונות וקבוצות</string>
   <string name="events_first_only">התראה בהודעה הראשונה\nהצג התראה רק בהודעה הראשונה של השיחה</string>
-  <string name="events_ignore_system_vibro">התעלם מהגדרות רטט מערכת\nנצל את אפשרות זו רק אם רטט מערכת לא פועל</string>
-  <string name="events_message">הגדרות התראה\nהגדר התראות להודעה נכנסת</string>
-  <string name="events_message_chat">שיחות בלבד</string>
-  <string name="events_message_chat_and_muc">שיחות וגם ועידות</string>
-  <string name="events_message_none">אל תודיע</string>
-  <string name="events_show_text">טקסט הודעה preview\nShow הודעה מן השיחות באזור ההודעות</string>
+    <string name="events_show_text">טקסט הודעה preview\nShow הודעה מן השיחות באזור ההודעות</string>
   <string name="events_show_text_muc">טקסט הודעה preview\nShow הודעה מכנסים באזור ההודעות</string>
-  <string name="events_visible_chat">הודע ב- chat\nNotify הנוכחי על הודעות נכנסות בצ\'אט הנוכחי</string>
-  <string name="events_suppress_100">בטל חלק מהודעות המצב\nאל תציג את ההודעה \'חדר זה אינו אנונימי\'</string>
+    <string name="events_suppress_100">בטל חלק מהודעות המצב\nאל תציג את ההודעה \'חדר זה אינו אנונימי\'</string>
   <string name="negative_priotiry_summary">%s (אתה לא תקבל הודעות משום שיחה)</string>
   <string name="preference_accounts">חשבון XMPP\nניהול חשבונות</string>
   <string name="preference_security">אבטחה\nהגדרות אבטחה</string>
   <string name="security_check_certificate">בדוק תעודת אבטחה של השרת\nהצג התראה על תקלה בתעודת האבטחה בעת שימוש בחיבור מוצפן</string>
-  <string name="security_clear_certificate">הסר תעודות אבטחה\nנקה את רשימת האישורים שהתעלמת מהם</string>
-  <string name="security_otr_history">איחסון היסטוריה\n שמור היסטוריית צ\'אט עבור שיחות OTR</string>
-  <string name="security_otr_mode">מצב OTR</string>
+    <string name="security_otr_mode">מצב OTR</string>
   <string name="chats_attention">אזהרות\nהגב לבקשות ואזהרות</string>
   <string name="chats_attention_sound">צלילי אזהרה\nבחר צליל</string>
   <string name="connection_load_vcard">הטען vCard\nהטענת ועדכון מידע אישי ואווטאר של איש קשר. אפשר לנטרל כדי לחסוך בשימוש תעבורה.</string>
   <string name="connection_load_images">טען תמונה\n טען אוטומטית תמונות מקובץ URL. בטל כדי לצמצם את השימוש בתעבורת נתונים.</string>
   <string name="connection_use_carbons">מצב \'נייר פחם\'\nעלול להיות לא יציב! ההתכתבות בחשבונך תופיע גם כאן. בטל כדי לחסוך בתעבורת נתונים.</string>
-  <string name="connection_dns_resolver_type">סוג של פותרן DNS</string>
-  <string name="connection_dns_resolver_type_dns_java_resolver">DNSJavaResolver</string>
+    <string name="connection_dns_resolver_type_dns_java_resolver">DNSJavaResolver</string>
   <string name="connection_dns_resolver_type_mini_dns_resolver">MiniDNSResolver (ניסיוני)</string>
-  <string name="connection_use_plain_text_auth">אימות באמצעות טקסט רגיל\nהשתמש באימות של טקסט רגיל עבור כל החשבונות. לא מומלץ.</string>
-  <string name="events_phrases">ביטויי מפתח\nצור התראות להודעות נכנסות המכילות ביטויים מסויימים</string>
-  <string name="security_clear_certificate_warning">האם אכן ברצונך להסיר את כל תעודות האבטחה שאין להם אישור?</string>
-  <string name="account_error_settings">הגדרות</string>
-  <string name="category_xabber_account">חשבון Xabber</string>
-  <string name="category_xmpp_accounts">XMPP חשבונות</string>
-  <string name="category_interface">ממשק</string>
+    <string name="events_phrases">ביטויי מפתח\nצור התראות להודעות נכנסות המכילות ביטויים מסויימים</string>
+    <string name="account_error_settings">הגדרות</string>
+    <string name="category_interface">ממשק</string>
   <string name="category_settings">הגדרות</string>
   <string name="category_about">אודות</string>
   <string name="category_appearance">המראה</string>
diff --git a/xabber/src/main/res/values-iw-rIL/words.xml b/xabber/src/main/res/values-iw-rIL/words.xml
index 838f76b6ed..b2175670fb 100644
--- a/xabber/src/main/res/values-iw-rIL/words.xml
+++ b/xabber/src/main/res/values-iw-rIL/words.xml
@@ -20,5 +20,4 @@
   <string name="settings">הגדרות</string>
   <string name="ok">OK</string>
   <string name="login">כניסה</string>
-  <string name="resume">קורות חיים</string>
 </resources>
diff --git a/xabber/src/main/res/values-ja-rJP/account_editor.xml b/xabber/src/main/res/values-ja-rJP/account_editor.xml
index af61f99c8c..9d0a76d16e 100644
--- a/xabber/src/main/res/values-ja-rJP/account_editor.xml
+++ b/xabber/src/main/res/values-ja-rJP/account_editor.xml
@@ -2,40 +2,25 @@
 <!--Generated by crowdin.com-->
 <resources>
   <string name="account_compression">圧縮を使用</string>
-  <string name="account_enabled">有効</string>
-  <string name="account_host">ホスト</string>
+    <string name="account_host">ホスト</string>
   <string name="account_password">パスワード</string>
   <string name="confirm_password">パスワードをもう一度入力</string>
   <string name="account_port">ポート</string>
   <string name="account_priority">優先度</string>
   <string name="account_resource">リソース</string>
   <string name="account_server_name">サーバー</string>
-  <string name="account_type">アカウントの種類</string>
-  <string name="account_type_hints_gtalk">gmail.com または Google Apps ドメイン用のユーザー名</string>
-  <string name="account_type_helps_gtalk">Google アカウントを持っていない場合、http://mail.google.com で作成してください\nyour_user_name@your_google_domain を使用することもできます</string>
-  <string name="account_xmpp_register_warning">Xabber に追加する前に <a href="http://www.google.com/#q=register XMPP account">XMPP アカウントを登録</a> する必要があります!</string>
-  <string name="account_type_helps_xmpp">XMPP (Jabber) についての詳細は: https://xmpp.org</string>
-  <string name="account_user_name">ユーザー名</string>
+    <string name="account_xmpp_register_warning">Xabber に追加する前に <a href="http://www.google.com/#q=register XMPP account">XMPP アカウントを登録</a> する必要があります!</string>
+    <string name="account_user_name">ユーザー名</string>
   <string name="EMPTY_SERVER_NAME">サーバー名が指定されていません</string>
   <string name="EMPTY_USER_NAME">ユーザー名が指定されていません</string>
   <string name="CONFIRM_PASSWORD">パスワードが一致しません</string>
-  <string name="account_archive_mode">メッセージの履歴を保存</string>
-  <string name="account_archive_mode_available">利用可能な場合、サーバーで</string>
-  <string name="account_archive_mode_dont_store">保存しない</string>
-  <string name="account_archive_mode_local">デバイスのローカルで</string>
-  <string name="account_archive_mode_server">サーバーで</string>
-  <string name="account_archive_mode_unread">未送信および未読のみローカルで</string>
-  <string name="account_compression_summary">チェックするとデータ圧縮を有効にします</string>
+    <string name="account_compression_summary">チェックするとデータ圧縮を有効にします</string>
   <string name="account_custom">カスタム･ホスト</string>
   <string name="account_custom_summary">SRV レコードの代わりにカスタム・ホスト設定を使用します</string>
-  <string name="account_enabled_summary">アカウントを有効にするスイッチ</string>
-  <string name="account_invalid_port">ポートは数字で入力してください (デフォルト: 5222)</string>
+    <string name="account_invalid_port">ポートは数字で入力してください (デフォルト: 5222)</string>
   <string name="account_invalid_port_range">ポートは 1 から 65535 の間にする必要があります (デフォルト: 5222)</string>
   <string name="account_invalid_priority">優先度の値は -128 から 127 の間の数字で入力してください (デフォルト: 10)</string>
-  <string name="account_oauth">認証</string>
-  <string name="account_oauth_invalidated">認証されていません</string>
-  <string name="account_oauth_summary">OAuth 設定</string>
-  <string name="account_proxy_host">プロキシ・ホスト</string>
+    <string name="account_proxy_host">プロキシ・ホスト</string>
   <string name="account_proxy_invalid_port_range">プロキシ ポートは 1 から 65535 の間にする必要があります (デフォルト: 8080)</string>
   <string name="account_proxy_invalid_port">プロキシ ポート番号は数字にする必要があります (デフォルト: 8080)</string>
   <string name="account_proxy_password">プロキシ・パスワード</string>
@@ -47,18 +32,14 @@
   <string name="account_sasl_summary">古いサーバーでは無効にしてください</string>
   <string name="account_store_password">パスワードを保存</string>
   <string name="account_store_password_summary">このオプションを無効にすると、毎回オンラインにするたびにパスワードを要求します</string>
-  <string name="account_syncable">システムの連絡先に統合</string>
-  <string name="account_syncable_summary">電話の連絡先リストのアカウントから連絡先を表示します</string>
-  <string name="account_tls_enable">TLS を有効</string>
+    <string name="account_tls_enable">TLS を有効</string>
   <string name="account_tls_enable_summary">サーバーに接続時に、可能であれば TLS 暗号化を使用します</string>
   <string name="account_tls_legacy">レガシー SSL</string>
   <string name="account_tls_legacy_summary">サーバーに接続時、レガシー SSL 暗号化を使用します</string>
   <string name="account_tls_mode">TLS/SSL 使用方法</string>
   <string name="account_tls_require">TLS が必要</string>
   <string name="account_tls_require_summary">サーバーに接続時 TLS 暗号化を必要とします</string>
-  <string name="account_use_orbot">TOR 匿名ネットワークでチャットし, TLS 暗号プロトコルを強制的に使用\nGoogle Talk では推奨しません</string>
-  <string name="confirm_cancellation">すべての変更を取り消してもよろしいですか?</string>
-  <string name="INCORRECT_USER_NAME">ユーザー名が正しくありません. 詳細は下部のヘルプテキストを確認してください.</string>
+    <string name="INCORRECT_USER_NAME">ユーザー名が正しくありません. 詳細は下部のヘルプテキストを確認してください.</string>
   <string name="orbot_required_message">TOR を使用して処理するには Orbot をインストールし proxy のトラフィックを有効にする必要があります. Google Play からインストールしますか?</string>
   <string name="orbot_required_title">Orbot をインストールしますか?</string>
   <string name="install_orbot">Orbot をインストール</string>
diff --git a/xabber/src/main/res/values-ja-rJP/chat_viewer.xml b/xabber/src/main/res/values-ja-rJP/chat_viewer.xml
index 8809c4262a..813c6a7e23 100644
--- a/xabber/src/main/res/values-ja-rJP/chat_viewer.xml
+++ b/xabber/src/main/res/values-ja-rJP/chat_viewer.xml
@@ -21,11 +21,8 @@
   <string name="message_remove">履歴から削除</string>
   <string name="message_repeat">送信をリトライ</string>
   <string name="message_otr_show_original">メッセージを表示</string>
-  <string name="message_open_file">開く</string>
-  <string name="message_save_file">保存</string>
-  <string name="save_history">ローカルの履歴を保存\nメッセージの履歴をローカルに保存します</string>
-  <string name="show_history">履歴を表示</string>
-  <string name="action_attention_called">アテンション呼び出しが送信されました</string>
+    <string name="save_history">ローカルの履歴を保存\nメッセージの履歴をローカルに保存します</string>
+    <string name="action_attention_called">アテンション呼び出しが送信されました</string>
   <string name="action_attention_requested">アテンションが要求されました</string>
   <string name="action_ban">%1$s は禁止されました</string>
   <string name="action_ban_by">%1$s は %2$s によって禁止されました</string>
@@ -73,8 +70,7 @@
   <string name="otr_refresh">暗号化を再開</string>
   <string name="otr_request">オフレコのプライベートな会話が要求されましたが, サポートするプラグインありません. PC/Mac では Pidgin, Gajim か Adium を, Android では Xabber か ChatSecure を使用してください. さらに詳細な情報は http://otr.cypherpunks.ca/ を参照してください.</string>
   <string name="otr_start">暗号化を開始</string>
-  <string name="otr_unencrypted_message">このメッセージは暗号化されていません</string>
-  <string name="otr_unreadable_message">送信した暗号化されたメッセージは読むことができません</string>
+    <string name="otr_unreadable_message">送信した暗号化されたメッセージは読むことができません</string>
   <string name="otr_not_decrypted_message">メッセージを解読できません</string>
   <string name="otr_verification">オフレコ確認</string>
   <string name="otr_verify_fingerprint">フィンガープリントで確認</string>
@@ -87,21 +83,13 @@
   <string name="otr_verification_progress_title">OTR 検証中</string>
   <string name="otr_verification_notify_button">開く</string>
   <string name="otr_verification_notify_button_cancel">キャンセル</string>
-  <string name="under_construction">準備中</string>
-  <string name="under_construction_message">この画面は準備中です</string>
-  <string name="chat_events_show_text_global">グローバル設定を使用する</string>
+    <string name="chat_events_show_text_global">グローバル設定を使用する</string>
   <string name="chat_events_show_text_always">メッセージ テキストを表示する</string>
   <string name="chat_events_show_text_never">メッセージ テキストを非表示にする</string>
-  <string name="sending_file">ファイル %s を送信中</string>
-  <string name="error_sending_file">ファイル %s 送信時にエラー</string>
-  <string name="no_application_to_open_file">このファイルを開くアプリケーションがありません</string>
-  <string name="could_not_save_file">ファイルを保存できません</string>
-  <string name="file_saved_successfully">ファイルが正常に保存されました</string>
-  <string name="received_by">%s が受信しました</string>
-  <string name="could_not_get_path_to_file">ファイルのパスを取得できません</string>
+    <string name="error_sending_file">ファイル %s 送信時にエラー</string>
+    <string name="could_not_get_path_to_file">ファイルのパスを取得できません</string>
   <string name="message_open_private_chat">プライベート チャットを開く</string>
-  <string name="http_file_upload_slot_error">ファイルをアップロードできませんでした。大きすぎませんか?</string>
-  <string name="no_permission_to_read_files">ファイルを読み取る権限がありません</string>
+    <string name="no_permission_to_read_files">ファイルを読み取る権限がありません</string>
   <string name="no_permission_to_write_files">ファイルの書き込み権限がありません</string>
   <string name="error_description_title">エラーの説明:</string>
   <string name="message_status_sent">送信しました</string>
diff --git a/xabber/src/main/res/values-ja-rJP/contact_editor.xml b/xabber/src/main/res/values-ja-rJP/contact_editor.xml
index 170976c248..91d0d7a4fb 100644
--- a/xabber/src/main/res/values-ja-rJP/contact_editor.xml
+++ b/xabber/src/main/res/values-ja-rJP/contact_editor.xml
@@ -17,12 +17,8 @@
   <string name="processing_image">画像の処理中...</string>
   <string name="error_during_crop">画像のトリミング中にエラー</string>
   <string name="error_during_image_processing">画像の処理中にエラー</string>
-  <string name="account_settings">アカウント設定</string>
-  <string name="account_user_info">アカウント情報</string>
-  <string name="account_server_info">サーバー情報</string>
+    <string name="account_server_info">サーバー情報</string>
   <string name="account_server_info_description">サーバー機能の一覧</string>
   <string name="conference_private_chat_invitation">%2$s から %1$s があなたとプライベートチャットの開始を希望しています</string>
   <string name="accept_muc_private_chat">同意</string>
-  <string name="block_muc_private_chat">ブロック</string>
-  <string name="no_permission_camera">カメラ アクセスする権限がありません</string>
 </resources>
diff --git a/xabber/src/main/res/values-ja-rJP/contact_list.xml b/xabber/src/main/res/values-ja-rJP/contact_list.xml
index 330679f50b..be37f803b3 100644
--- a/xabber/src/main/res/values-ja-rJP/contact_list.xml
+++ b/xabber/src/main/res/values-ja-rJP/contact_list.xml
@@ -18,17 +18,13 @@
   <string name="application_state_roster">接続しました.</string>
   <string name="application_state_starting">アプリケーション起動中... </string>
   <string name="application_state_waiting">接続待機中...</string>
-  <string name="chat_list">チャットリスト</string>
-  <string name="chat_list_is_empty">アクティブなチャットはありません</string>
-  <string name="chat_viewer">チャット</string>
-  <string name="close_chat">チャットを閉じる</string>
-  <string name="CONNECTION_FAILED">接続エラー</string>
+    <string name="chat_viewer">チャット</string>
+    <string name="CONNECTION_FAILED">接続エラー</string>
   <string name="contact_add">連絡先を追加</string>
   <string name="contact_delete">削除</string>
   <string name="contact_block">連絡先をブロック</string>
   <string name="contact_delete_confirm">連絡先 %1$s をアカウント %2$s から削除してもよろしいですか?</string>
-  <string name="contact_list">連絡先リスト</string>
-  <string name="discard_subscription">連絡先を否認</string>
+    <string name="discard_subscription">連絡先を否認</string>
   <string name="exit">終了</string>
   <string name="group_active_chat">アクティブなチャット</string>
   <string name="group_none">グループはありません</string>
@@ -40,15 +36,7 @@
   <string name="request_subscription">サブスクリプションを要求</string>
   <string name="XMPP_EXCEPTION">ストリーム・エラー</string>
   <string name="application_state_closing">変更を保存中...\nアプリケーションはすぐに終了します.</string>
-  <string name="certificate_confirmation">%1$s.\nSHA-1 フィンガープリントの証明書を常に信頼しますか: %2$s? この証明書の問題について通知されないようにしますか?</string>
-  <string name="certificate_details">\n\n問題報告先:\n共通名 (CN): %1$s\n組織 (O): %2$s\n組織単位 (OU): %3$s\nシリアル番号: %4$s\n\n問題報告元:\n共通名 (CN): %5$s\n組織 (O): %6$s\n組織単位 (OU): %7$s\n\n妥当性:\n問題報告: %8$s\n有効期限: %9$s.</string>
-  <string name="certificate_invalid_chane">署名チェーンの確認に失敗しました</string>
-  <string name="certificate_invalid_target">対象の確認に失敗しました</string>
-  <string name="certificate_self_signed">自己署名証明書</string>
-  <string name="certificate_show_details">詳細 ...</string>
-  <string name="close_chats">すべてのチャットを閉じる</string>
-  <string name="contact_integration_suggest">Xabber をシステムの連絡先に統合しますか?\nこれは \"設定\" → \"XMPP アカウント\" → Your account → \"連絡先の統合\" で変更することができます.\n注: システムの連絡先リストは数分間遅くなることがあります.</string>
-  <string name="group_room">会議</string>
+    <string name="group_room">会議</string>
   <string name="OTR_ERROR">オフレコ・エラー</string>
   <string name="select_contact">クリックして連絡先を選択してください</string>
   <string name="show_offline_always">常に表示</string>
@@ -63,8 +51,7 @@
   <string name="block_list">ブロック リスト</string>
   <string name="contact_blocked_successfully">連絡先を正常にブロックしました</string>
   <string name="error_blocking_contact">連絡先のブロック時にエラー</string>
-  <string name="unblock_contact">連絡先のブロックを解除</string>
-  <string name="contacts_unblocked_successfully">連絡先のブロックを正常に解除しました</string>
+    <string name="contacts_unblocked_successfully">連絡先のブロックを正常に解除しました</string>
   <string name="error_unblocking_contacts">連絡先のブロック解除時にエラー</string>
   <string name="block_contact_confirm">連絡先 %1$s をアカウント %2$s からブロックしてもよろしいですか?</string>
   <string name="unblock_all_contacts_confirm">アカウント %1$s から、すべての連絡先のブロックを解除しますか?</string>
@@ -76,19 +63,10 @@
   <string name="dark_theme_suggest_dialog_stay_on_light_side">ライトサイドに留まる</string>
   <string name="battery_optimization_disable_dialog_title">バッテリーの最適化</string>
   <string name="battery_optimization_disable_dialog_message">お使いのデバイスでいくつかのバッテリー最適化を行うと Xabber の通知が遅延したり、メッセージを損失する可能性があります。\n\nそれらを無効にするかを確認します。</string>
-  <string name="save_log_to_file">ファイルへ保存</string>
-  <string name="clear_log">古いログファイルを削除</string>
+    <string name="clear_log">古いログファイルを削除</string>
   <string name="open_log_file">開く</string>
   <string name="send_log_file">送信</string>
-  <string name="intro_welcome">Xabber へようこそ</string>
-  <string name="intro_xabber_description">Android 用のオープンソース XMPP クライアント</string>
-  <string name="intro_have_account">XMPP アカウントにログイン</string>
-  <string name="intro_register_account">XMPP アカウントを登録</string>
-  <string name="intro_create_xabber_account">Xabber アカウントを使用する</string>
-  <string name="intro_use_third_party_accounts">サード パーティ XMPP アカウントを使用する</string>
-  <string name="intro_faq">XMPP のアカウントを持っていない場合に、取得する方法については <a href="https://www.xabber.com/faq/"> 私たちの FAQ をお読みください</a>。</string>
-  <string name="intro_web_search_register_xmpp">XMPP アカウントを登録</string>
-  <string name="synchronize_bookmarks">ブックマークを同期</string>
+    <string name="synchronize_bookmarks">ブックマークを同期</string>
   <string name="remove_all_bookmarks">すべて削除</string>
   <string name="remove_selected_bookmarks">選択した項目を削除</string>
   <string name="remove_all_bookmarks_confirm">アカウント %1$s からすべてのブックマークを削除してもよろしいですか?</string>
diff --git a/xabber/src/main/res/values-ja-rJP/contact_viewer.xml b/xabber/src/main/res/values-ja-rJP/contact_viewer.xml
index 1bed825244..f0838f1185 100644
--- a/xabber/src/main/res/values-ja-rJP/contact_viewer.xml
+++ b/xabber/src/main/res/values-ja-rJP/contact_viewer.xml
@@ -17,12 +17,9 @@
   <string name="vcard_organization_unit">組織単位</string>
   <string name="vcard_title">肩書, 役職</string>
   <string name="vcard_role">役割</string>
-  <string name="vcard_other">その他の情報</string>
-  <string name="vcard_categories">カテゴリー</string>
-  <string name="vcard_decsription">説明</string>
+    <string name="vcard_decsription">説明</string>
   <string name="vcard_note">注釈</string>
-  <string name="vcard_address">住所</string>
-  <string name="vcard_address_pobox">私書箱</string>
+    <string name="vcard_address_pobox">私書箱</string>
   <string name="vcard_address_extadr">追加の住所</string>
   <string name="vcard_address_street">番地</string>
   <string name="vcard_address_locality">市区町村</string>
diff --git a/xabber/src/main/res/values-ja-rJP/muc_editor.xml b/xabber/src/main/res/values-ja-rJP/muc_editor.xml
index 7c8db6d5b3..640bd38dc6 100644
--- a/xabber/src/main/res/values-ja-rJP/muc_editor.xml
+++ b/xabber/src/main/res/values-ja-rJP/muc_editor.xml
@@ -20,12 +20,10 @@
   <string name="muc_invite_confirm">%2$s があなたを会議 %3$s に参加するように招待しています. アカウント %1$s から参加しますか?</string>
   <string name="muc_invite_confirm_reason">%2$s があなたを会議 %3$s に参加するように招待しています: %4$s. アカウント %1$s から参加しますか?</string>
   <string name="muc_leave">会議を離れる</string>
-  <string name="muc_save">会議を保存</string>
-  <string name="muc_choose_conference">会議を選択</string>
+    <string name="muc_choose_conference">会議を選択</string>
   <string name="muc_next">次へ</string>
   <string name="muc_get_hosted_conferences">ホストされている会議を取得</string>
   <string name="muc_error_getting_conferences">会議の取得エラー</string>
   <string name="muc_type_conference_name">会議の種類名</string>
-  <string name="contact_is_blocked">連絡先をブロックしました!</string>
-  <string name="conference_invitation">会議の招待状</string>
+    <string name="conference_invitation">会議の招待状</string>
 </resources>
diff --git a/xabber/src/main/res/values-ja-rJP/notification_bar.xml b/xabber/src/main/res/values-ja-rJP/notification_bar.xml
index 0f8a0a36fb..59228afc6a 100644
--- a/xabber/src/main/res/values-ja-rJP/notification_bar.xml
+++ b/xabber/src/main/res/values-ja-rJP/notification_bar.xml
@@ -34,10 +34,7 @@
   <!-- Used for plural form in russian. -->
   <string name="connection_state_waiting_5">-</string>
   <string name="connection_state_offline">%1$d %2$s オフライン</string>
-  <string name="archive_available_request_message">サーバーにメッセージの履歴を保存しますか?\nこのアカウントを使用するすべてのデバイスで Xabber がメッセージの履歴をロードすることができるようになります.\nこの機能は追加の通信が発生し,　接続速度が少し低下することがあります.\n警告: ローカルの履歴はすべて削除されます.</string>
-  <string name="archive_available_request_title">メッセージのアーカイブを有効にしますか?</string>
-  <string name="INVALID_CERTIFICATE">証明書が正しくありません</string>
-  <string name="muc_invite_message">会議に入りますか?</string>
+    <string name="muc_invite_message">会議に入りますか?</string>
   <string name="otr_verification_in_progress">中断するにはここをクリックしてください.</string>
   <string name="PASSWORD_REQUIRED">パスワードが必要</string>
   <string name="pay_attention">ご注意ください</string>
diff --git a/xabber/src/main/res/values-ja-rJP/preference_editor.xml b/xabber/src/main/res/values-ja-rJP/preference_editor.xml
index 55fff0c5e5..60a0770ca5 100644
--- a/xabber/src/main/res/values-ja-rJP/preference_editor.xml
+++ b/xabber/src/main/res/values-ja-rJP/preference_editor.xml
@@ -12,14 +12,11 @@
   <string name="contacts_order_alphabet">アルファベット順</string>
   <string name="contacts_order_status">ステータス順</string>
   <string name="contacts_show_accounts">アカウントでグループ\n連絡先リストの連絡先をアカウントでグループ化します</string>
-  <string name="contacts_show_active_chats">アクティブなチャットを上部に\nアクティブなチャットを連絡先リストの上部に表示します</string>
-  <string name="contacts_show_avatars">アバターを表示\nユーザーのアバターを連絡先リストに表示します</string>
+    <string name="contacts_show_avatars">アバターを表示\nユーザーのアバターを連絡先リストに表示します</string>
   <string name="contacts_show_empty_groups">空のグループを表示\nオンラインの連絡先がいないグループを表示します</string>
   <string name="contacts_show_groups">グループを表示\n連絡先リストにグループを表示します</string>
   <string name="contacts_show_offline">ｵﾌﾗｲﾝの連絡先を表示</string>
-  <string name="contacts_show_panel">アカウントパネルを表示\n連絡先リストの右下隅にアバターと操作ボタンを表示します</string>
-  <string name="contacts_stay_active_chats">アクティブなチャットを複製\n連絡先リストの上部とグループの両方にアクティブなチャットを表示します</string>
-  <string name="debug_log">デバッグ・ログ\nメッセージをデバッグ･ログに書き込む (変更を適用するにはアプリケーションを再起動してください)</string>
+    <string name="debug_log">デバッグ・ログ\nメッセージをデバッグ･ログに書き込む (変更を適用するにはアプリケーションを再起動してください)</string>
   <string name="debug_file_log_title">ファイルにログを書き込み\nローカルファイルにデバッグログを書き込みます (それを共有できます)。</string>
   <string name="debug_log_files_title">ログファイル\n書き込まれたログファイルの一覧。</string>
   <string name="debug_log_files_activity_title">ログファイル</string>
@@ -36,8 +33,7 @@
   <string name="interface_theme">テーマ</string>
   <string name="interface_theme_dark">ダーク</string>
   <string name="interface_theme_light">ライト</string>
-  <string name="interface_theme_normal">デフォルト</string>
-  <string name="interface_smiles">絵文字</string>
+    <string name="interface_smiles">絵文字</string>
   <string name="interface_smiles_android">Android 顔文字</string>
   <string name="interface_smiles_none">グラフィカルな顔文字なし</string>
   <string name="preference_connection">接続設定\n接続設定</string>
@@ -62,8 +58,7 @@
   <string name="chats_font_size_xlarge">特大</string>
   <string name="chats_hide_keyboard">キーボードを隠す</string>
   <string name="chats_hide_keyboard_landscape">横置き(ランドスケープ)モード</string>
-  <string name="chats_receipt">メッセージ配送確認\n送信および受信メッセージの配送確認</string>
-  <string name="chats_show_avatars">メッセージのアバター\n各メッセージ中にアバターを表示します</string>
+    <string name="chats_show_avatars">メッセージのアバター\n各メッセージ中にアバターを表示します</string>
   <string name="chats_show_status_change">状態の変更を表示</string>
   <string name="chats_show_status_change_muc">会議中</string>
   <string name="chats_state_notification">入力中の通知を表示\n他のユーザーが入力していることを表示します</string>
@@ -77,37 +72,24 @@
   <string name="contacts_reset_offline">オフライン設定をリセット\nグループおよびアカウントに対する個々の設定をクリアします</string>
   <string name="contacts_reset_offline_warning">グループおよびアカウントに対する個々の設定をクリアしてもよろしいですか?</string>
   <string name="events_first_only">最初のメッセージでアラート\nチャットの最初のメッセージのみ通知します</string>
-  <string name="events_ignore_system_vibro">システムのバイブレーション設定を無視\nシステムのバイブレーション設定が動作しない場合にこのオプションを使用してください</string>
-  <string name="events_message">通知設定\n受信メッセージ通知の設定</string>
-  <string name="events_message_chat">チャットのみ</string>
-  <string name="events_message_chat_and_muc">チャットおよび会議</string>
-  <string name="events_message_none">通知しない</string>
-  <string name="events_show_text">メッセージプレビュー\n通知領域にチャットのメッセージテキストを表示します</string>
+    <string name="events_show_text">メッセージプレビュー\n通知領域にチャットのメッセージテキストを表示します</string>
   <string name="events_show_text_muc">メッセージプレビュー\n通知領域に会議のメッセージテキストを表示します</string>
-  <string name="events_visible_chat">現在のチャットに通知\n届いたメッセージを現在のチャットに通知します</string>
-  <string name="events_suppress_100">一部のステータスメッセージを抑制します\n\'この部屋は匿名ではありません\' のメッセージを取得しません</string>
+    <string name="events_suppress_100">一部のステータスメッセージを抑制します\n\'この部屋は匿名ではありません\' のメッセージを取得しません</string>
   <string name="negative_priotiry_summary">%s (チャットからメッセージを受け取りません)</string>
   <string name="preference_accounts">XMPP アカウント\nアカウントを管理します</string>
   <string name="preference_security">セキュリティ\nセキュリティ設定</string>
   <string name="security_check_certificate">サーバー証明書を確認\n暗号化された接続で証明書の問題を通知します</string>
-  <string name="security_clear_certificate">証明書を削除\n無視された証明書のリストをクリアします</string>
-  <string name="security_otr_history">履歴を保存\nOTR セッションのチャット履歴を保存します</string>
-  <string name="security_otr_mode">オフレコ・モード</string>
+    <string name="security_otr_mode">オフレコ・モード</string>
   <string name="chats_attention">注意\n受信注意リクエストに反応します</string>
   <string name="chats_attention_sound">注意サウンド\n着信音を選択します</string>
   <string name="connection_load_vcard">vCard をロード\n連絡先の個人情報およびアバターをロードして更新します. 無効にすると通信の使用量が減ります.</string>
   <string name="connection_load_images">画像をロード\nファイルの URL から自動的に画像を読み込みます。トラフィック使用量を削減するには、無効にします。</string>
   <string name="connection_use_carbons">カーボン コピー モード\n不安定になることがあります! このクライアントで同じアカウントのセッションを共有します。無効にすると、トラフィックの使用状況を削減します。</string>
-  <string name="connection_dns_resolver_type">DNS リゾルバーの種類</string>
-  <string name="connection_dns_resolver_type_dns_java_resolver">DNSJavaResolver</string>
+    <string name="connection_dns_resolver_type_dns_java_resolver">DNSJavaResolver</string>
   <string name="connection_dns_resolver_type_mini_dns_resolver">MiniDNSResolver (試験的)</string>
-  <string name="connection_use_plain_text_auth">平文認証\nすべてのアカウントに対して平文で認証します。お勧めできません。</string>
-  <string name="events_phrases">キーフレーズ\n指定したフレーズが含まれるメッセージを通知します</string>
-  <string name="security_clear_certificate_warning">無視された証明書をすべて削除してもよろしいですか?</string>
-  <string name="account_error_settings">設定</string>
-  <string name="category_xabber_account">Xabber アカウント</string>
-  <string name="category_xmpp_accounts">XMPP アカウント</string>
-  <string name="category_interface">インターフェイス</string>
+    <string name="events_phrases">キーフレーズ\n指定したフレーズが含まれるメッセージを通知します</string>
+    <string name="account_error_settings">設定</string>
+    <string name="category_interface">インターフェイス</string>
   <string name="category_settings">設定</string>
   <string name="category_about">Xabber について</string>
   <string name="category_appearance">外観</string>
diff --git a/xabber/src/main/res/values-ja-rJP/words.xml b/xabber/src/main/res/values-ja-rJP/words.xml
index 25f41d4e1c..73b9cc6f1a 100644
--- a/xabber/src/main/res/values-ja-rJP/words.xml
+++ b/xabber/src/main/res/values-ja-rJP/words.xml
@@ -20,5 +20,4 @@
   <string name="settings">設定</string>
   <string name="ok">OK</string>
   <string name="login">ログイン</string>
-  <string name="resume">再開</string>
 </resources>
diff --git a/xabber/src/main/res/values-lt-rLT/chat_viewer.xml b/xabber/src/main/res/values-lt-rLT/chat_viewer.xml
index 5c00ecebf1..7fc73041e8 100644
--- a/xabber/src/main/res/values-lt-rLT/chat_viewer.xml
+++ b/xabber/src/main/res/values-lt-rLT/chat_viewer.xml
@@ -17,11 +17,8 @@
   <string name="message_quote">Cituoti</string>
   <string name="message_remove">Pašalinti iš istorijos</string>
   <string name="message_repeat">Bandyti siųsti iš naujo</string>
-  <string name="message_open_file">Atidaryti</string>
-  <string name="message_save_file">Išsaugoti</string>
-  <string name="save_history">Išsaugoti vietinę istoriją\nIšsaugoti žinučių istoriją šiame įrenginyje</string>
-  <string name="show_history">Rodyti istoriją</string>
-  <string name="action_attention_called">Buvo išsiųstas dėmesio paprašymas</string>
+    <string name="save_history">Išsaugoti vietinę istoriją\nIšsaugoti žinučių istoriją šiame įrenginyje</string>
+    <string name="action_attention_called">Buvo išsiųstas dėmesio paprašymas</string>
   <string name="action_attention_requested">Buvo paprašyta dėmesio</string>
   <string name="action_ban">%1$s tapo užblokuotas</string>
   <string name="action_ban_by">%2$s užblokavo %1$s (gal.)</string>
@@ -69,23 +66,15 @@
   <string name="otr_refresh">Paleisti šifravimą iš naujo</string>
   <string name="otr_request">Buvo paprašyta \"ne oficialiuose įrašuose\" (off-the-record, OTR) privataus pokalbio, bet Jūs neturite to palaikančio įskiepio. Naudokite Pidgin, Gajim arba Adium asmeniniame ar macintosh kompiuteryje ir Xabber, Conversations arba ChatSecure Android platformoje. Aplankykite http://otr.cypherpunks.ca/ norėdami gauti daugiau informacijos.</string>
   <string name="otr_start">Pradėti šifravimą</string>
-  <string name="otr_unencrypted_message">Ši žinutė nebuvo šifruota</string>
-  <string name="otr_unreadable_message">Jūsų išsiųsta šifruota žinutė yra neperskaitoma</string>
+    <string name="otr_unreadable_message">Jūsų išsiųsta šifruota žinutė yra neperskaitoma</string>
   <string name="otr_verification">OTR patikrinimas</string>
   <string name="otr_verify_fingerprint">Patikrinti naudojant piršto antspaudą</string>
   <string name="otr_verify_question">Patikrinti naudojant klausimą</string>
   <string name="otr_verify_secret">Patikrinti naudojant bendrą paslaptį</string>
-  <string name="under_construction">Kuriama</string>
-  <string name="under_construction_message">Šis ekranas tebekuriamas</string>
-  <string name="chat_events_show_text_global">Naudoti globalius nustatymus</string>
+    <string name="chat_events_show_text_global">Naudoti globalius nustatymus</string>
   <string name="chat_events_show_text_always">Rodyti žinutės tekstą</string>
   <string name="chat_events_show_text_never">Paslėpti žinutės tekstą</string>
-  <string name="sending_file">Siunčiamas failas %s</string>
-  <string name="error_sending_file">Klaida siunčiant failą %s</string>
-  <string name="no_application_to_open_file">Nebuvo rasta nei viena aplikacija, su kuria būtų galima atidaryti šią bylą</string>
-  <string name="could_not_save_file">Nepavyko išsaugoti bylos</string>
-  <string name="file_saved_successfully">Byla sėkmingai išsaugota</string>
-  <string name="received_by">Gavo %s</string>
-  <string name="could_not_get_path_to_file">Nepavyko gauti kelio iki bylos</string>
+    <string name="error_sending_file">Klaida siunčiant failą %s</string>
+    <string name="could_not_get_path_to_file">Nepavyko gauti kelio iki bylos</string>
   <string name="message_open_private_chat">Atidaryti privatų pokalbį</string>
 </resources>
diff --git a/xabber/src/main/res/values-lt-rLT/contact_viewer.xml b/xabber/src/main/res/values-lt-rLT/contact_viewer.xml
index f9e0f16aaf..9cff3cf728 100644
--- a/xabber/src/main/res/values-lt-rLT/contact_viewer.xml
+++ b/xabber/src/main/res/values-lt-rLT/contact_viewer.xml
@@ -16,12 +16,9 @@
   <string name="vcard_organization_unit">Organizacijos padalinys</string>
   <string name="vcard_title">Darbo pavadinimas, funkcija</string>
   <string name="vcard_role">Vaidmuo</string>
-  <string name="vcard_other">Kita informacija</string>
-  <string name="vcard_categories">Kategorijos</string>
-  <string name="vcard_decsription">Aprašymas</string>
+    <string name="vcard_decsription">Aprašymas</string>
   <string name="vcard_note">Užrašai</string>
-  <string name="vcard_address">Adresas</string>
-  <string name="vcard_address_pobox">Nuotolinė paštadėžė</string>
+    <string name="vcard_address_pobox">Nuotolinė paštadėžė</string>
   <string name="vcard_address_extadr">Išplėstas adresas</string>
   <string name="vcard_address_street">Gatvė</string>
   <string name="vcard_address_locality">Vietovė</string>
diff --git a/xabber/src/main/res/values-nb-rNO/account_editor.xml b/xabber/src/main/res/values-nb-rNO/account_editor.xml
index 8199788519..b9c3e7cc2a 100644
--- a/xabber/src/main/res/values-nb-rNO/account_editor.xml
+++ b/xabber/src/main/res/values-nb-rNO/account_editor.xml
@@ -2,40 +2,25 @@
 <!--Generated by crowdin.com-->
 <resources>
   <string name="account_compression">Bruk komprimering</string>
-  <string name="account_enabled">Påskrudd</string>
-  <string name="account_host">Vert</string>
+    <string name="account_host">Vert</string>
   <string name="account_password">Passord</string>
   <string name="confirm_password">Bekreft passord</string>
   <string name="account_port">Port</string>
   <string name="account_priority">Prioritet</string>
   <string name="account_resource">Ressurs</string>
   <string name="account_server_name">Tjener</string>
-  <string name="account_type">Kontotype</string>
-  <string name="account_type_hints_gtalk">brukernavn for gmail.com eller Google Apps-domene</string>
-  <string name="account_type_helps_gtalk">Hvis du ikke har en Google-konto, kan du lage en ny på https://mail.google.com\nDu kan også bruke ditt_brukernavn@ditt_google_domene</string>
-  <string name="account_xmpp_register_warning">Du må <a href="http://www.google.com/#q=registrere en XMPP-konto">registrere en XMPP-konto</a> før du legger den til i Xabber.</string>
-  <string name="account_type_helps_xmpp">Du kan lære mer om XMPP (Jabber) her: https://xmpp.org</string>
-  <string name="account_user_name">Brukernavn</string>
+    <string name="account_xmpp_register_warning">Du må <a href="http://www.google.com/#q=registrere en XMPP-konto">registrere en XMPP-konto</a> før du legger den til i Xabber.</string>
+    <string name="account_user_name">Brukernavn</string>
   <string name="EMPTY_SERVER_NAME">Tjenernavn ikke angitt</string>
   <string name="EMPTY_USER_NAME">Brukernavn ikke angitt</string>
   <string name="CONFIRM_PASSWORD">Passordene samsvarer ikke</string>
-  <string name="account_archive_mode">Lagre meldingshistorikk</string>
-  <string name="account_archive_mode_available">På tjener, hvis tilgjengelig</string>
-  <string name="account_archive_mode_dont_store">Ikke lagre</string>
-  <string name="account_archive_mode_local">Lokalt på enheten</string>
-  <string name="account_archive_mode_server">På tjener</string>
-  <string name="account_archive_mode_unread">Lokalt, bare usendt og ulest</string>
-  <string name="account_compression_summary">Merk for å etablere datakomprimering</string>
+    <string name="account_compression_summary">Merk for å etablere datakomprimering</string>
   <string name="account_custom">Egendefinert vert</string>
   <string name="account_custom_summary">Bruk egendefinerte innstillinger for vert istedenfor SRV-post</string>
-  <string name="account_enabled_summary">Veksle på for å aktivere konto</string>
-  <string name="account_invalid_port">Port må være et nummer (forvalg: 5222)</string>
+    <string name="account_invalid_port">Port må være et nummer (forvalg: 5222)</string>
   <string name="account_invalid_port_range">Port må være mellom 1 og 65535 (forvalg: 5222)</string>
   <string name="account_invalid_priority">Prioritet må angis som et nummer mellom -128 og 127 (forvalg: 0)</string>
-  <string name="account_oauth">Godkjenning</string>
-  <string name="account_oauth_invalidated">Ikke godkjent</string>
-  <string name="account_oauth_summary">Innstillinger for OAuth</string>
-  <string name="account_proxy_host">Mellomtjeningsvert</string>
+    <string name="account_proxy_host">Mellomtjeningsvert</string>
   <string name="account_proxy_invalid_port_range">Mellomtjeningsporten må være mellom 1 og 65535 (forvalg: 8080)</string>
   <string name="account_proxy_invalid_port">Mellomtjeningsporten må være et nummer (forvalg: 8080)</string>
   <string name="account_proxy_password">Mellomtjeningspassord</string>
@@ -47,18 +32,14 @@
   <string name="account_sasl_summary">Skru av for veldig gamle tjenere</string>
   <string name="account_store_password">Lagre passord</string>
   <string name="account_store_password_summary">Skru av dette valget for å få spørsmål om passord hver gang du logger på</string>
-  <string name="account_syncable">Integrer med systemets kontakter</string>
-  <string name="account_syncable_summary">Vis kontakter fra denne kontoen i enhetens kontaktliste</string>
-  <string name="account_tls_enable">Aktiver TLS</string>
+    <string name="account_tls_enable">Aktiver TLS</string>
   <string name="account_tls_enable_summary">Bruk TLS-kryptering, der det er mulig, for å koble til tjener</string>
   <string name="account_tls_legacy">Gammeldags SSL</string>
   <string name="account_tls_legacy_summary">Bruk gammeldags SSL-kryptering ved tilkobling til tjener</string>
   <string name="account_tls_mode">TLS-/SSL -bruk</string>
   <string name="account_tls_require">Krev TLS</string>
   <string name="account_tls_require_summary">Krev TLS-kryptering ved tilkobling til tjener</string>
-  <string name="account_use_orbot">Prat via det anonyme TOR-nettverket og tving kryptering med TLS-krypteringsprotokoll</string>
-  <string name="confirm_cancellation">Er du sikker på at du vil forkaste alle endringene?</string>
-  <string name="INCORRECT_USER_NAME">Feil brukernavn. Sjekk detaljer i hjelpeteksten nedenfor.</string>
+    <string name="INCORRECT_USER_NAME">Feil brukernavn. Sjekk detaljer i hjelpeteksten nedenfor.</string>
   <string name="orbot_required_message">For å bruke Tor må du ha Orbot installert og aktivert til å sende trafikk gjennom den. Vil du installere det fra Google Play?</string>
   <string name="orbot_required_title">Installer Orbot?</string>
   <string name="install_orbot">Installer Orbot</string>
diff --git a/xabber/src/main/res/values-nb-rNO/chat_viewer.xml b/xabber/src/main/res/values-nb-rNO/chat_viewer.xml
index 81c949f8ed..1a5fc20e72 100644
--- a/xabber/src/main/res/values-nb-rNO/chat_viewer.xml
+++ b/xabber/src/main/res/values-nb-rNO/chat_viewer.xml
@@ -21,11 +21,8 @@
   <string name="message_remove">Fjern fra historikk</string>
   <string name="message_repeat">Prøv å sende på nytt</string>
   <string name="message_otr_show_original">Vis melding</string>
-  <string name="message_open_file">Åpne</string>
-  <string name="message_save_file">Lagre</string>
-  <string name="save_history">Lagre historikk lokalt\nLagre meldingshistorikk lokalt</string>
-  <string name="show_history">Vis historikk</string>
-  <string name="action_attention_called">Ønske om oppmerksomhet ble sendt</string>
+    <string name="save_history">Lagre historikk lokalt\nLagre meldingshistorikk lokalt</string>
+    <string name="action_attention_called">Ønske om oppmerksomhet ble sendt</string>
   <string name="action_attention_requested">Oppmerksomhet tilkalt</string>
   <string name="action_ban">%1$s ble bannlyst</string>
   <string name="action_ban_by">%1$s ble bannlyst av %2$s</string>
@@ -73,8 +70,7 @@
   <string name="otr_refresh">Omstart av kryptering</string>
   <string name="otr_request">Du er blitt forespurt om en \"Off-the-Record\" privat samtale, men klienten din har ikke noe tillegg som støtter dette. Du kan bruke Pidgin, Gajim eller Adium for PC/Mac og Xabber, Conversations eller ChatSecure for Android. Se http://otr.cypherpunks.ca/ for mer informasjon.</string>
   <string name="otr_start">Start kryptering</string>
-  <string name="otr_unencrypted_message">Denne meldingen har ikke blitt kryptert</string>
-  <string name="otr_unreadable_message">Den krypterte meldingen du sendte er uleselig</string>
+    <string name="otr_unreadable_message">Den krypterte meldingen du sendte er uleselig</string>
   <string name="otr_not_decrypted_message">Meldingen kan ikke krypteres</string>
   <string name="otr_verification">OTR-identitetsbekreftelse</string>
   <string name="otr_verify_fingerprint">Bekreft med fingeravtrykk</string>
@@ -87,21 +83,13 @@
   <string name="otr_verification_progress_title">OTR-bekreftelse underveis</string>
   <string name="otr_verification_notify_button">ÅPNE</string>
   <string name="otr_verification_notify_button_cancel">AVBRYT</string>
-  <string name="under_construction">Under arbeid</string>
-  <string name="under_construction_message">Dette skjermen er under utvikling</string>
-  <string name="chat_events_show_text_global">Bruk globale innstillinger</string>
+    <string name="chat_events_show_text_global">Bruk globale innstillinger</string>
   <string name="chat_events_show_text_always">Vis meldingstekst</string>
   <string name="chat_events_show_text_never">Skjul meldingstekst</string>
-  <string name="sending_file">Sender fil %s</string>
-  <string name="error_sending_file">Feil ved sending av fila %s</string>
-  <string name="no_application_to_open_file">Ingen programmer du har kunne åpne denne fila</string>
-  <string name="could_not_save_file">Kunne ikke lagre fil</string>
-  <string name="file_saved_successfully">Filen ble lagret</string>
-  <string name="received_by">Mottatt av %s</string>
-  <string name="could_not_get_path_to_file">Kunne ikke åpne stien til filen</string>
+    <string name="error_sending_file">Feil ved sending av fila %s</string>
+    <string name="could_not_get_path_to_file">Kunne ikke åpne stien til filen</string>
   <string name="message_open_private_chat">Start privat samtale</string>
-  <string name="http_file_upload_slot_error">Kunne ikke laste opp fil. For stor?</string>
-  <string name="no_permission_to_read_files">Ikke tillatelse til å lese filer</string>
+    <string name="no_permission_to_read_files">Ikke tillatelse til å lese filer</string>
   <string name="no_permission_to_write_files">Ikke tillatelse til å lagre filer</string>
   <string name="error_description_title">Feilbeskrivelse:</string>
   <string name="message_status_sent">Sendt</string>
diff --git a/xabber/src/main/res/values-nb-rNO/contact_editor.xml b/xabber/src/main/res/values-nb-rNO/contact_editor.xml
index 311a711aac..8a27b30841 100644
--- a/xabber/src/main/res/values-nb-rNO/contact_editor.xml
+++ b/xabber/src/main/res/values-nb-rNO/contact_editor.xml
@@ -17,12 +17,8 @@
   <string name="processing_image">Behandler bilde&#8230;</string>
   <string name="error_during_crop">Feil ved beskjæring av bilde</string>
   <string name="error_during_image_processing">Feil ved behandling av bilde</string>
-  <string name="account_settings">Kontoinnstillinger</string>
-  <string name="account_user_info">Kontoinformasjon</string>
-  <string name="account_server_info">Tjenerinfo</string>
+    <string name="account_server_info">Tjenerinfo</string>
   <string name="account_server_info_description">Liste over tjenerfunksjoner</string>
   <string name="conference_private_chat_invitation">%1$s fra %2$s ønsker å starte en private samtale med deg</string>
   <string name="accept_muc_private_chat">Godta</string>
-  <string name="block_muc_private_chat">Blokker</string>
-  <string name="no_permission_camera">Mangler tillatelse til å åpne kamera</string>
 </resources>
diff --git a/xabber/src/main/res/values-nb-rNO/contact_list.xml b/xabber/src/main/res/values-nb-rNO/contact_list.xml
index c6067292a9..7317c59540 100644
--- a/xabber/src/main/res/values-nb-rNO/contact_list.xml
+++ b/xabber/src/main/res/values-nb-rNO/contact_list.xml
@@ -18,17 +18,13 @@
   <string name="application_state_roster">Tilkoblet.</string>
   <string name="application_state_starting">Starter program&#8230;</string>
   <string name="application_state_waiting">Venter på forbindelse&#8230;</string>
-  <string name="chat_list">Samtaleliste</string>
-  <string name="chat_list_is_empty">Ingen aktive samtaler</string>
-  <string name="chat_viewer">Samtale</string>
-  <string name="close_chat">Lukk samtale</string>
-  <string name="CONNECTION_FAILED">Feil ved tilkobling</string>
+    <string name="chat_viewer">Samtale</string>
+    <string name="CONNECTION_FAILED">Feil ved tilkobling</string>
   <string name="contact_add">Legg til kontakt</string>
   <string name="contact_delete">Slett</string>
   <string name="contact_block">Blokker kontakt</string>
   <string name="contact_delete_confirm">Ønsker du virkelig å slette kontakten %1$s fra kontoen %2$s?</string>
-  <string name="contact_list">Kontaktliste</string>
-  <string name="discard_subscription">Avslå kontakt</string>
+    <string name="discard_subscription">Avslå kontakt</string>
   <string name="exit">Avslutt</string>
   <string name="group_active_chat">Aktive samtaler</string>
   <string name="group_none">Ingen grupper</string>
@@ -40,15 +36,7 @@
   <string name="request_subscription">Forespør abonnement</string>
   <string name="XMPP_EXCEPTION">Strøm-feil</string>
   <string name="application_state_closing">Lagrer endringer&#8230;\nProgrammet vil straks avsluttes.</string>
-  <string name="certificate_confirmation">%1$s.\nStoler du absolutt på et sertifikat med SHA-1-fingeravtrykk: %2$s? Ønsker du å ikke bli gjort oppmerksom på dette problemet med dette sertifikatet?</string>
-  <string name="certificate_details">\n\nIssued to:\nVanlig navn (CN): %1$s\nOrganisasjon (O): %2$s\nOrganisasjonsenhet (OU): %3$s\nSerienummer: %4$s\n\nUtstedt av:\nVanlig navn (CN): %5$s\nOrganisasjon (O): %6$s\nOrganisasjonsenhet (OU): %7$s\n\nGyldighet:\nUtstedt den: %8$s\nUtløper den: %9$s.</string>
-  <string name="certificate_invalid_chane">Bekreftelse av signaturkjede mislyktes</string>
-  <string name="certificate_invalid_target">Bekreftelse av mål mislyktes</string>
-  <string name="certificate_self_signed">Selv-signert sertifikat</string>
-  <string name="certificate_show_details">Detaljer&#8230;</string>
-  <string name="close_chats">Lukk alle samtaler</string>
-  <string name="contact_integration_suggest">Ønsker du å integrere Xabber med systemkontakter?\nDette kan endres i \"Innstillinger\" → \"XMPP-kontoer\" → Din konto → \"Kontaktintegrasjon\".\nNB: Systemets kontaktliste kan oppleves tregere i noen minutter.</string>
-  <string name="group_room">Konferanser</string>
+    <string name="group_room">Konferanser</string>
   <string name="OTR_ERROR">OTR-feil</string>
   <string name="select_contact">Trykk for å velge kontakt</string>
   <string name="show_offline_always">Alltid vis</string>
@@ -63,8 +51,7 @@
   <string name="block_list">Blokkerte kontakter</string>
   <string name="contact_blocked_successfully">Kontakten ble blokkert</string>
   <string name="error_blocking_contact">Feil ved blokkering av kontakt</string>
-  <string name="unblock_contact">Opphev blokkering av kontakt</string>
-  <string name="contacts_unblocked_successfully">Blokkering av kontakter er fjernet</string>
+    <string name="contacts_unblocked_successfully">Blokkering av kontakter er fjernet</string>
   <string name="error_unblocking_contacts">Feil ved oppheving av blokkering</string>
   <string name="block_contact_confirm">Ønsker du virkelig å blokkere kontakten %1$s fra kontoen %2$s?</string>
   <string name="unblock_all_contacts_confirm">Ønsker du virkelig å oppheve blokkering av alle kontaktene fra konto %1$s?</string>
@@ -76,19 +63,10 @@
   <string name="dark_theme_suggest_dialog_stay_on_light_side">Bli værende på lysets side</string>
   <string name="battery_optimization_disable_dialog_title">Batterioptimisering</string>
   <string name="battery_optimization_disable_dialog_message">Enheten din har iverksatt hissig batterioptimisering som kan lede til at merknader fra Xabber blir forsinket eller faktisk forsvinne.\n\nDu vil nå bli spurt om å skru av dette.</string>
-  <string name="save_log_to_file">Lagre til fil</string>
-  <string name="clear_log">Slett gamle loggfiler</string>
+    <string name="clear_log">Slett gamle loggfiler</string>
   <string name="open_log_file">Åpne</string>
   <string name="send_log_file">Send</string>
-  <string name="intro_welcome">Velkommen til Xabber</string>
-  <string name="intro_xabber_description">Friprog XMPP-klient for Android</string>
-  <string name="intro_have_account">Innlogging med XMPP-konto</string>
-  <string name="intro_register_account">Registrer XMPP-konto</string>
-  <string name="intro_create_xabber_account">Bruk Xabber-konto</string>
-  <string name="intro_use_third_party_accounts">bruk tredjeparts XMPP-kontoer</string>
-  <string name="intro_faq">Hvis du ikke har en XMPP-konto, <a href="https://www.xabber.com/faq/">les vår O-S-S</a> om hvordan du oppretter en.</string>
-  <string name="intro_web_search_register_xmpp">Registrer XMPP-konto</string>
-  <string name="synchronize_bookmarks">Synkroniser bokmerker</string>
+    <string name="synchronize_bookmarks">Synkroniser bokmerker</string>
   <string name="remove_all_bookmarks">Fjern alle</string>
   <string name="remove_selected_bookmarks">Fjern valgte</string>
   <string name="remove_all_bookmarks_confirm">Ønsker du virkelig å fjerne alle bokmerkene fra kontoen %1$s?</string>
diff --git a/xabber/src/main/res/values-nb-rNO/contact_viewer.xml b/xabber/src/main/res/values-nb-rNO/contact_viewer.xml
index dbae80c15c..7954172f25 100644
--- a/xabber/src/main/res/values-nb-rNO/contact_viewer.xml
+++ b/xabber/src/main/res/values-nb-rNO/contact_viewer.xml
@@ -17,12 +17,9 @@
   <string name="vcard_organization_unit">Avdeling</string>
   <string name="vcard_title">Jobbtittel, funksjon</string>
   <string name="vcard_role">Rolle</string>
-  <string name="vcard_other">Annen informasjon</string>
-  <string name="vcard_categories">Kategorier</string>
-  <string name="vcard_decsription">Beskrivelse</string>
+    <string name="vcard_decsription">Beskrivelse</string>
   <string name="vcard_note">Notater</string>
-  <string name="vcard_address">Adresse</string>
-  <string name="vcard_address_pobox">Postboks</string>
+    <string name="vcard_address_pobox">Postboks</string>
   <string name="vcard_address_extadr">Utvidet adresse</string>
   <string name="vcard_address_street">Gate</string>
   <string name="vcard_address_locality">Lokale</string>
diff --git a/xabber/src/main/res/values-nb-rNO/muc_editor.xml b/xabber/src/main/res/values-nb-rNO/muc_editor.xml
index 0cd7576962..bbbf2bfe95 100644
--- a/xabber/src/main/res/values-nb-rNO/muc_editor.xml
+++ b/xabber/src/main/res/values-nb-rNO/muc_editor.xml
@@ -20,12 +20,10 @@
   <string name="muc_invite_confirm">%2$s inviterer deg til å bli med i konferanseen %3$s. ta del med kontoen %1$s?</string>
   <string name="muc_invite_confirm_reason">%2$s inviterer deg til å bli med i konferansen %3$s: %4$s. ta del med kontoen %1$s?</string>
   <string name="muc_leave">Forlat konferansen</string>
-  <string name="muc_save">Lagre konferansen</string>
-  <string name="muc_choose_conference">Velg konferanse</string>
+    <string name="muc_choose_conference">Velg konferanse</string>
   <string name="muc_next">Neste</string>
   <string name="muc_get_hosted_conferences">Hent arrangerte konferanser</string>
   <string name="muc_error_getting_conferences">Feil ved innhenting av konferanser</string>
   <string name="muc_type_conference_name">Skriv navnet på konferansen</string>
-  <string name="contact_is_blocked">Kontakten er blokkert!</string>
-  <string name="conference_invitation">Konferanseinvitasjon</string>
+    <string name="conference_invitation">Konferanseinvitasjon</string>
 </resources>
diff --git a/xabber/src/main/res/values-nb-rNO/notification_bar.xml b/xabber/src/main/res/values-nb-rNO/notification_bar.xml
index eb7ef9c055..887ee25462 100644
--- a/xabber/src/main/res/values-nb-rNO/notification_bar.xml
+++ b/xabber/src/main/res/values-nb-rNO/notification_bar.xml
@@ -34,10 +34,7 @@
   <!-- Used for plural form in russian. -->
   <string name="connection_state_waiting_5">-</string>
   <string name="connection_state_offline">%1$d %2$s frakoblet</string>
-  <string name="archive_available_request_message">Ønsker du å lagre meldingshistorikken på tjeneren\nDette gir Xabber muligheten til å laste meldingshistorikk fra alle enheter som bruker denne kontoen\nDenne egenskapen vil medføre litt ekstra trafikk, og kan i noen grad påvirke tilkoblingshastigheten.\nADVARSEL: All lokal historikk vil bli fjernet.</string>
-  <string name="archive_available_request_title">Aktivere meldingsarkiv?</string>
-  <string name="INVALID_CERTIFICATE">Ugyldig sertifikat</string>
-  <string name="muc_invite_message">Ønsker du å ta del i konferansen?</string>
+    <string name="muc_invite_message">Ønsker du å ta del i konferansen?</string>
   <string name="otr_verification_in_progress">Trykk her for å avbryte den.</string>
   <string name="PASSWORD_REQUIRED">Passord påkrevet</string>
   <string name="pay_attention">Vær oppmerksom</string>
diff --git a/xabber/src/main/res/values-nb-rNO/preference_editor.xml b/xabber/src/main/res/values-nb-rNO/preference_editor.xml
index fe8f257997..1d40d96ec5 100644
--- a/xabber/src/main/res/values-nb-rNO/preference_editor.xml
+++ b/xabber/src/main/res/values-nb-rNO/preference_editor.xml
@@ -12,14 +12,11 @@
   <string name="contacts_order_alphabet">Alfabetisk</string>
   <string name="contacts_order_status">Etter status</string>
   <string name="contacts_show_accounts">Grupper etter konto\nGrupper kontakter i kontaktlisten etter konto</string>
-  <string name="contacts_show_active_chats">Aktive samtaler øverst\nVis aktive samtaler øverst i kontaktlisten</string>
-  <string name="contacts_show_avatars">Vis avatarer\nVis brukernes avatarer i kontaktlisten</string>
+    <string name="contacts_show_avatars">Vis avatarer\nVis brukernes avatarer i kontaktlisten</string>
   <string name="contacts_show_empty_groups">Vis tomme grupper\nVis grupper uten noen påloggede kontakter</string>
   <string name="contacts_show_groups">Vis grupper\nVis grupper i kontaktlisten</string>
   <string name="contacts_show_offline">Vis frakoblede kontakter</string>
-  <string name="contacts_show_panel">Vis kontopanel\nVis handlingsknapper med avatarer nederst til høyre i kontaktlisten</string>
-  <string name="contacts_stay_active_chats">Dupliser aktive samtaler\nAktive samtaler vises både øverst i kontaktlisten og i grupper</string>
-  <string name="debug_log">Feilsøkingslogg\nSkriv beskjeder til feilsøkingsloggen (du starte programmet på nytt for å ta endringene i bruk)</string>
+    <string name="debug_log">Feilsøkingslogg\nSkriv beskjeder til feilsøkingsloggen (du starte programmet på nytt for å ta endringene i bruk)</string>
   <string name="debug_file_log_title">Skriv fillogg\nSkriv feilrettingslogg til lokal fil (du kan dele den).</string>
   <string name="debug_log_files_title">Loggfiler\nListe over skrevne loggfiler.</string>
   <string name="debug_log_files_activity_title">Loggfiler</string>
@@ -36,8 +33,7 @@
   <string name="interface_theme">Drakt</string>
   <string name="interface_theme_dark">Mørk</string>
   <string name="interface_theme_light">Lys</string>
-  <string name="interface_theme_normal">Forvalg</string>
-  <string name="interface_smiles">Smilefjes</string>
+    <string name="interface_smiles">Smilefjes</string>
   <string name="interface_smiles_android">Android-uttrykksikoner</string>
   <string name="interface_smiles_none">Ingen grafiske uttrykksikoner</string>
   <string name="preference_connection">Tilkoblingsinnstillinger\nTilkoblingsinnstillinger</string>
@@ -62,8 +58,7 @@
   <string name="chats_font_size_xlarge">Ekstra stor</string>
   <string name="chats_hide_keyboard">Skjul tastatur</string>
   <string name="chats_hide_keyboard_landscape">I landskapsmodus</string>
-  <string name="chats_receipt">Kvitteringer for meldingsleveranser\nSend og motta kvitteringer når meldinger er levert</string>
-  <string name="chats_show_avatars">Avatarer i meldinger\nVis avatarer i hver melding</string>
+    <string name="chats_show_avatars">Avatarer i meldinger\nVis avatarer i hver melding</string>
   <string name="chats_show_status_change">Vis statusendringer</string>
   <string name="chats_show_status_change_muc">I konferanser</string>
   <string name="chats_state_notification">Send skrivevarsel\nVis den andre brukeren at du skriver</string>
@@ -77,37 +72,24 @@
   <string name="contacts_reset_offline">Tilbakestill frakoblede innstillinger\nSlett individuelle innstillinger for grupper og kontoer</string>
   <string name="contacts_reset_offline_warning">Ønsker du virkelig å slette individuelle innstillinger for grupper og kontoer?</string>
   <string name="events_first_only">Varsel ved første melding\nBare varsle første melding i en sludreøkt</string>
-  <string name="events_ignore_system_vibro">Ignorer systemets vibrasjonsinnstillinger\nBruk dette valget hvis systemvibrasjon ikke virker</string>
-  <string name="events_message">Varslingsinnstillinger\nSett opp innkommende meldingsvarsler</string>
-  <string name="events_message_chat">Kun samtaler</string>
-  <string name="events_message_chat_and_muc">Samtaler og konferanser</string>
-  <string name="events_message_none">Ingen varsling</string>
-  <string name="events_show_text">Meldingsforhåndsvisning\nVis meldinger fra sludring i merknadsområde</string>
+    <string name="events_show_text">Meldingsforhåndsvisning\nVis meldinger fra sludring i merknadsområde</string>
   <string name="events_show_text_muc">Meldingsforhåndsvisning\nVIs meldinger fra konferanser i merknadsområde</string>
-  <string name="events_visible_chat">Varsel for gjeldende samtale\nVarsle om innkommende meldinger i gjeldende samtale</string>
-  <string name="events_suppress_100">Undertrykk noen statusmeldinger\nUnngå alle meldinger av typen \'Dette rommet er ikke anonymt\'</string>
+    <string name="events_suppress_100">Undertrykk noen statusmeldinger\nUnngå alle meldinger av typen \'Dette rommet er ikke anonymt\'</string>
   <string name="negative_priotiry_summary">%s (du ikke vil motta meldinger fra noen samtaler)</string>
   <string name="preference_accounts">XMPP-kontoer\nBehandle kontoer</string>
   <string name="preference_security">Sikkerhet\nSikkerhetsinnstillinger</string>
   <string name="security_check_certificate">Sjekk sertifikatet til tjeneren\nMeld fra om sertifikatproblemer på krypterte tilkoblinger</string>
-  <string name="security_clear_certificate">Fjern sertifikater\nSlett listen over ignorerte sertifikater</string>
-  <string name="security_otr_history">Lagre historikken\nLagre samtaleloggen for OTR-økter</string>
-  <string name="security_otr_mode">OTR-modus</string>
+    <string name="security_otr_mode">OTR-modus</string>
   <string name="chats_attention">Rett oppmerksomheten hit\nReaksjon for innkommende oppmerksomhetsforespørsler</string>
   <string name="chats_attention_sound">Oppmerksomhetslyd\nVelg ringetone</string>
   <string name="connection_load_vcard">Last inn vCard\nLast og oppdater en kontaktens personinfo og avatar. Skru av for å redusere databruk.</string>
   <string name="connection_load_images">Last inn bilder\nLast bilder fra fil-nettadresse automatisk. Skru av for å redusere databruk.</string>
   <string name="connection_use_carbons">Kringkastingsmottak\nKan være ustabilt! Vil dele gjeldende økt med alle enheter som bruker denne kontoen. Skru av for å redusere databruk.</string>
-  <string name="connection_dns_resolver_type">Type DNS-fortolker</string>
-  <string name="connection_dns_resolver_type_dns_java_resolver">DNSJavaFortolker</string>
+    <string name="connection_dns_resolver_type_dns_java_resolver">DNSJavaFortolker</string>
   <string name="connection_dns_resolver_type_mini_dns_resolver">MiniDNSFortolker (eksperimentell)</string>
-  <string name="connection_use_plain_text_auth">Klartekstbekreftelse\nBruk klartekstbekreftelse for alle kontoer. Ikke anbefalt.</string>
-  <string name="events_phrases">Nøkkelsetninger\nOpprett egendefinert varsel for mottatte meldinger som inneholder gitte setninger</string>
-  <string name="security_clear_certificate_warning">Ønsker du virkelig å fjerne alle ignorerte sertifikater?</string>
-  <string name="account_error_settings">Innstillinger</string>
-  <string name="category_xabber_account">Xabber-konto</string>
-  <string name="category_xmpp_accounts">XMPP-kontoer</string>
-  <string name="category_interface">Grensesnitt</string>
+    <string name="events_phrases">Nøkkelsetninger\nOpprett egendefinert varsel for mottatte meldinger som inneholder gitte setninger</string>
+    <string name="account_error_settings">Innstillinger</string>
+    <string name="category_interface">Grensesnitt</string>
   <string name="category_settings">Innstillinger</string>
   <string name="category_about">Om</string>
   <string name="category_appearance">Utseende</string>
diff --git a/xabber/src/main/res/values-nb-rNO/words.xml b/xabber/src/main/res/values-nb-rNO/words.xml
index 7b9e78a3a3..0b45a2f057 100644
--- a/xabber/src/main/res/values-nb-rNO/words.xml
+++ b/xabber/src/main/res/values-nb-rNO/words.xml
@@ -20,5 +20,4 @@
   <string name="settings">Innstillinger</string>
   <string name="ok">OK</string>
   <string name="login">Innlogging</string>
-  <string name="resume">Fortsett</string>
 </resources>
diff --git a/xabber/src/main/res/values-nl-rNL/account_editor.xml b/xabber/src/main/res/values-nl-rNL/account_editor.xml
index aeabb59ead..58a3fa384c 100644
--- a/xabber/src/main/res/values-nl-rNL/account_editor.xml
+++ b/xabber/src/main/res/values-nl-rNL/account_editor.xml
@@ -2,40 +2,25 @@
 <!--Generated by crowdin.com-->
 <resources>
   <string name="account_compression">Gebruik compressie</string>
-  <string name="account_enabled">Actief</string>
-  <string name="account_host">Host</string>
+    <string name="account_host">Host</string>
   <string name="account_password">Wachtwoord</string>
   <string name="confirm_password">Bevestig wachtwoord</string>
   <string name="account_port">Poort</string>
   <string name="account_priority">Prioriteit</string>
   <string name="account_resource">Bron</string>
   <string name="account_server_name">Server</string>
-  <string name="account_type">Account-type</string>
-  <string name="account_type_hints_gtalk">gebruikersnaam voor gmail.com of Google Apps domein</string>
-  <string name="account_type_helps_gtalk">Als u geen Google account heeft kunt u er een aanmaken op: http://mail.google.com\nU kunt ook uw gebruikersnaam@uw_google_domein gebruiken</string>
-  <string name="account_xmpp_register_warning">U moet <a href="http://www.google.com/#q=register an XMPP account"> een XMPP account registreren</a> voordat u het toevoegt aan Xabber!</string>
-  <string name="account_type_helps_xmpp">Wilt u meer weten over XMPP (Jabber) kijk hier: https://xmpp.org</string>
-  <string name="account_user_name">Gebruikersnaam</string>
+    <string name="account_xmpp_register_warning">U moet <a href="http://www.google.com/#q=register an XMPP account"> een XMPP account registreren</a> voordat u het toevoegt aan Xabber!</string>
+    <string name="account_user_name">Gebruikersnaam</string>
   <string name="EMPTY_SERVER_NAME">Naam server niet gespecifieerd</string>
   <string name="EMPTY_USER_NAME">Gebruikersnaam niet gespecifieerd</string>
   <string name="CONFIRM_PASSWORD">Wachtwoord komt niet overeen</string>
-  <string name="account_archive_mode">Sla berichtengeschiedenis op</string>
-  <string name="account_archive_mode_available">Op server indien beschikbaar</string>
-  <string name="account_archive_mode_dont_store">Sla niet op</string>
-  <string name="account_archive_mode_local">Lokaal op apparaat</string>
-  <string name="account_archive_mode_server">Op de server</string>
-  <string name="account_archive_mode_unread">Lokaal alleen ongelezen en te verzenden</string>
-  <string name="account_compression_summary">Kies om datacompressie in te schakelen</string>
+    <string name="account_compression_summary">Kies om datacompressie in te schakelen</string>
   <string name="account_custom">Aangepaste host</string>
   <string name="account_custom_summary">Gebruik aangepaste hostinstellingen in plaats van SRV record</string>
-  <string name="account_enabled_summary">Schakel account aan of uit</string>
-  <string name="account_invalid_port">Poort moet een nummer zijn (standaard: 5222)</string>
+    <string name="account_invalid_port">Poort moet een nummer zijn (standaard: 5222)</string>
   <string name="account_invalid_port_range">Poortnummer moet tussen de 1 en 65535 liggen (standaard: 5222)</string>
   <string name="account_invalid_priority">Waarde prioriteit moet een nummer zijn tussen -128 en 127 (standaard: 10)</string>
-  <string name="account_oauth">Autorisatie</string>
-  <string name="account_oauth_invalidated">Niet geautoriseerd</string>
-  <string name="account_oauth_summary">OAuth instellingen</string>
-  <string name="account_proxy_host">Proxy-host</string>
+    <string name="account_proxy_host">Proxy-host</string>
   <string name="account_proxy_invalid_port_range">Proxy poort moet tussen de 1 en 65535 liggen (standaard: 8080)</string>
   <string name="account_proxy_invalid_port">Proxy poort moet een nummer zijn (standaard: 8080)</string>
   <string name="account_proxy_password">Proxy-wachtwoord</string>
@@ -47,18 +32,14 @@
   <string name="account_sasl_summary">Schakel uit voor oudere servers</string>
   <string name="account_store_password">Sla wachtwoord op</string>
   <string name="account_store_password_summary">Schakel deze optie uit om het wachtwoord telkens in te voeren bij het inloggen</string>
-  <string name="account_syncable">Integratie in systeem contactenlijst</string>
-  <string name="account_syncable_summary">Toon contacten van dit account in de contactenlijst van het toestel</string>
-  <string name="account_tls_enable">Schakel TLS in</string>
+    <string name="account_tls_enable">Schakel TLS in</string>
   <string name="account_tls_enable_summary">Gebruik TLS encryptie wanneer mogelijk om te connecteren met server</string>
   <string name="account_tls_legacy">Verouderde SSL</string>
   <string name="account_tls_legacy_summary">Verouderde SSL-versleuteling gebruiken bij verbinding maken met server</string>
   <string name="account_tls_mode">TLS/SSL gebruik</string>
   <string name="account_tls_require">TLS vereist</string>
   <string name="account_tls_require_summary">TLS encryptie vereist om te connecteren met server</string>
-  <string name="account_use_orbot">Chat via het anonieme TOR-netwerk en forceer het gebruik van TLS-versleuteling.\nWordt afgeraden voor Google Talk</string>
-  <string name="confirm_cancellation">Alle wijzigingen negeren?</string>
-  <string name="INCORRECT_USER_NAME">Gebruikersnaam niet correct. Raadpleeg help voor details.</string>
+    <string name="INCORRECT_USER_NAME">Gebruikersnaam niet correct. Raadpleeg help voor details.</string>
   <string name="orbot_required_message">Om TOR te kunnen gebruiken moet Orbot geïnstalleerd zijn, en moet het verkeer hier doorheen lopen. Wil je Orbot installeren vanaf Google Play?</string>
   <string name="orbot_required_title">Installeer Orbot?</string>
   <string name="install_orbot">Installeer Orbot</string>
diff --git a/xabber/src/main/res/values-nl-rNL/chat_viewer.xml b/xabber/src/main/res/values-nl-rNL/chat_viewer.xml
index 8a559bd8fd..a0409d2ae3 100644
--- a/xabber/src/main/res/values-nl-rNL/chat_viewer.xml
+++ b/xabber/src/main/res/values-nl-rNL/chat_viewer.xml
@@ -21,11 +21,8 @@
   <string name="message_remove">Uit geschiedenis verwijderen</string>
   <string name="message_repeat">Verzenden opnieuw proberen</string>
   <string name="message_otr_show_original">Bericht weergeven</string>
-  <string name="message_open_file">Openen</string>
-  <string name="message_save_file">Opslaan</string>
-  <string name="save_history">Bewaar lokale geschiedenis\nBewaar berichtengeschiedenis lokaal</string>
-  <string name="show_history">Geschiedenis weergeven</string>
-  <string name="action_attention_called">Vraag om aandacht is verzonden</string>
+    <string name="save_history">Bewaar lokale geschiedenis\nBewaar berichtengeschiedenis lokaal</string>
+    <string name="action_attention_called">Vraag om aandacht is verzonden</string>
   <string name="action_attention_requested">Aandacht gevraagd</string>
   <string name="action_ban">%1$s werd verbannen</string>
   <string name="action_ban_by">%1$s werd verbannen door %2$s</string>
@@ -73,8 +70,7 @@
   <string name="otr_refresh">Herbegin encryptie</string>
   <string name="otr_request">Off-the-Record private conversatie werd verzocht maar je hebt de vereiste plugin niet. Gebruik Pidgin, Gajim of Adium voor PC/Mac en Xabber of ChatSecure voor Android. Ga naar http://otr.cypherpunks.ca/ voor meer informatie.</string>
   <string name="otr_start">Start encryptie</string>
-  <string name="otr_unencrypted_message">Dit bericht werd niet geëncrypteerd</string>
-  <string name="otr_unreadable_message">Het geëncrypteerde bericht dat je verzond is niet leesbaar</string>
+    <string name="otr_unreadable_message">Het geëncrypteerde bericht dat je verzond is niet leesbaar</string>
   <string name="otr_not_decrypted_message">Kan bericht niet ontsleutelen</string>
   <string name="otr_verification">OTR verificatie</string>
   <string name="otr_verify_fingerprint">Verifieer met vingerafdruk</string>
@@ -87,21 +83,13 @@
   <string name="otr_verification_progress_title">Controleaanvraag voor OTR in behandeling</string>
   <string name="otr_verification_notify_button">OPENEN</string>
   <string name="otr_verification_notify_button_cancel">AFBREKEN</string>
-  <string name="under_construction">Wordt aan gewerkt</string>
-  <string name="under_construction_message">Dit scherm is in ontwikkeling</string>
-  <string name="chat_events_show_text_global">Gebruik globale instellingen</string>
+    <string name="chat_events_show_text_global">Gebruik globale instellingen</string>
   <string name="chat_events_show_text_always">Toon berichttekst</string>
   <string name="chat_events_show_text_never">Verberg tekst van bericht</string>
-  <string name="sending_file">Verzenden van bestand %s</string>
-  <string name="error_sending_file">Fout tijdens verzenden bestand %s</string>
-  <string name="no_application_to_open_file">Geen toepassing gevonden om dit bestand te openen</string>
-  <string name="could_not_save_file">Kan bestand niet opslaan</string>
-  <string name="file_saved_successfully">Bestand succesvol opgeslagen</string>
-  <string name="received_by">Ontvangen door %s</string>
-  <string name="could_not_get_path_to_file">Kon pad naar bestand niet opvragen</string>
+    <string name="error_sending_file">Fout tijdens verzenden bestand %s</string>
+    <string name="could_not_get_path_to_file">Kon pad naar bestand niet opvragen</string>
   <string name="message_open_private_chat">Privé chat openen</string>
-  <string name="http_file_upload_slot_error">Kan het bestand niet uploaden. Te groot?</string>
-  <string name="no_permission_to_read_files">Geen toestemming om bestanden te lezen</string>
+    <string name="no_permission_to_read_files">Geen toestemming om bestanden te lezen</string>
   <string name="no_permission_to_write_files">Geen toestemming om bestanden te schrijven</string>
   <string name="error_description_title">Foutbeschrijving:</string>
   <string name="message_status_sent">Verzonden</string>
diff --git a/xabber/src/main/res/values-nl-rNL/contact_editor.xml b/xabber/src/main/res/values-nl-rNL/contact_editor.xml
index 9d9d85f8d1..c867bdaf2c 100644
--- a/xabber/src/main/res/values-nl-rNL/contact_editor.xml
+++ b/xabber/src/main/res/values-nl-rNL/contact_editor.xml
@@ -17,12 +17,8 @@
   <string name="processing_image">Afbeelding verwerken...</string>
   <string name="error_during_crop">Fout tijdens bijsnijden afbeelding</string>
   <string name="error_during_image_processing">Fout tijdens verwerken afbeelding</string>
-  <string name="account_settings">Accountinstellingen</string>
-  <string name="account_user_info">Accountinfo</string>
-  <string name="account_server_info">Server info</string>
+    <string name="account_server_info">Server info</string>
   <string name="account_server_info_description">Lijst van server mogelijkheden</string>
   <string name="conference_private_chat_invitation">%1$s van %2$s wil privegesprek met u voeren</string>
   <string name="accept_muc_private_chat">Accepteer</string>
-  <string name="block_muc_private_chat">Blokkeer</string>
-  <string name="no_permission_camera">Geen toestemming voor gebruik camera</string>
 </resources>
diff --git a/xabber/src/main/res/values-nl-rNL/contact_list.xml b/xabber/src/main/res/values-nl-rNL/contact_list.xml
index 33be5dbcc8..efb33d5e80 100644
--- a/xabber/src/main/res/values-nl-rNL/contact_list.xml
+++ b/xabber/src/main/res/values-nl-rNL/contact_list.xml
@@ -18,17 +18,13 @@
   <string name="application_state_roster">Verbonden.</string>
   <string name="application_state_starting">Applicatie starten... </string>
   <string name="application_state_waiting">Wachten op verbinding...</string>
-  <string name="chat_list">Chatlijst</string>
-  <string name="chat_list_is_empty">Geen actieve chats</string>
-  <string name="chat_viewer">Chat</string>
-  <string name="close_chat">Sluit chat</string>
-  <string name="CONNECTION_FAILED">Verbindingsfout</string>
+    <string name="chat_viewer">Chat</string>
+    <string name="CONNECTION_FAILED">Verbindingsfout</string>
   <string name="contact_add">Voeg contact toe</string>
   <string name="contact_delete">Verwijderen</string>
   <string name="contact_block">Contactpersoon blokkeren</string>
   <string name="contact_delete_confirm">Wil je contact %1$s verwijderen uit account %2$s?</string>
-  <string name="contact_list">Contactenlijst</string>
-  <string name="discard_subscription">Weiger contact</string>
+    <string name="discard_subscription">Weiger contact</string>
   <string name="exit">Afsluiten</string>
   <string name="group_active_chat">Actieve chats</string>
   <string name="group_none">Geen groepen</string>
@@ -40,15 +36,7 @@
   <string name="request_subscription">Vraag abonnement aan</string>
   <string name="XMPP_EXCEPTION">Streamfout</string>
   <string name="application_state_closing">Wijzigingen opslaan...\nApplicatie wordt gesloten</string>
-  <string name="certificate_confirmation">%1$s.\nVerlener gebruikt een afgekeurde (SHA-1)vingerafdruk dat onbetrouwbaar is: %2$s. Wilt u meldingen over dit probleem met dit certificaat ontvangen?</string>
-  <string name="certificate_details">\n\nUitgegeven aan:\nNaam (CN): %1$s\nOrganisatie (O): %2$s\nAfdeling (OU): %3$s\nSerienummer: %4$s\n\nUitgegeven door:\nNaam (CN): %5$s\nOrganisatie (O): %6$s\nAfdeling (OU): %7$s\n\nGeldigheid:\nUitgegeven op: %8$s\nVerloopt op: %9$s.</string>
-  <string name="certificate_invalid_chane">Signature chain verificatie mislukt</string>
-  <string name="certificate_invalid_target">Doel certificaat mislukt</string>
-  <string name="certificate_self_signed">Zelfondertekend certificaat</string>
-  <string name="certificate_show_details">Meer informatie&#8230;</string>
-  <string name="close_chats">Sluit alle chats</string>
-  <string name="contact_integration_suggest">Wil je Xabber integreren in de systeem contactenlijst?\nDit kan ingestelw worden in \"Instellingen\" → \"XMPP accounts\" → je account → \"Integratie in systeem contactenlijst\".\nNB: Systeem contactenlijst kan even vertragen na het instellen.</string>
-  <string name="group_room">Conferenties</string>
+    <string name="group_room">Conferenties</string>
   <string name="OTR_ERROR">OTR fout</string>
   <string name="select_contact">Selecteer contact</string>
   <string name="show_offline_always">Altijd tonen</string>
@@ -63,8 +51,7 @@
   <string name="block_list">Blokkeerlijst</string>
   <string name="contact_blocked_successfully">Contact blokkeren geslaagd</string>
   <string name="error_blocking_contact">Contact blokkeren mislukt</string>
-  <string name="unblock_contact">Contact deblokkeren</string>
-  <string name="contacts_unblocked_successfully">Deblokkeren contacten geslaagd</string>
+    <string name="contacts_unblocked_successfully">Deblokkeren contacten geslaagd</string>
   <string name="error_unblocking_contacts">Deblokkeren contact mislukt</string>
   <string name="block_contact_confirm">Weet u zeker dat u contact %1$s van account %2$s wilt blokkeren?</string>
   <string name="unblock_all_contacts_confirm">Weet u zeker dat u alle contacten van account %1$s wilt deblokkeren?</string>
@@ -76,19 +63,10 @@
   <string name="dark_theme_suggest_dialog_stay_on_light_side">Blijf aan de Lichte Zijde</string>
   <string name="battery_optimization_disable_dialog_title">Batterij optimalisatie</string>
   <string name="battery_optimization_disable_dialog_message">Uw apparaat doet aan hevige energie optimalisaties voor Xabber welke kunnen leiden tot vertraagde of zelf verlies van berichten.\n\nU wordt verzocht deze uit te schakelen.</string>
-  <string name="save_log_to_file">Opslaan naar bestand</string>
-  <string name="clear_log">Oude logboekbestanden verwijderen</string>
+    <string name="clear_log">Oude logboekbestanden verwijderen</string>
   <string name="open_log_file">Openen</string>
   <string name="send_log_file">Verzend</string>
-  <string name="intro_welcome">Welkom bij Xabber</string>
-  <string name="intro_xabber_description">Open source XMPP-client voor Android</string>
-  <string name="intro_have_account">XMPP-aanmelding</string>
-  <string name="intro_register_account">Nieuw XMPP account aanmaken</string>
-  <string name="intro_create_xabber_account">Xabber-profiel gebruiken</string>
-  <string name="intro_use_third_party_accounts">XMPP-profielen van derden gebruiken</string>
-  <string name="intro_faq">Als u nog geen XMPP-account heeft, gelieve <a href="https://www.xabber.com/faq/"> onze F.A.Q. lezen</a> over hoe je deze kunt aanmaken.</string>
-  <string name="intro_web_search_register_xmpp">Nieuw XMPP account aanmaken</string>
-  <string name="synchronize_bookmarks">Bladwijzers gelijkschakelen</string>
+    <string name="synchronize_bookmarks">Bladwijzers gelijkschakelen</string>
   <string name="remove_all_bookmarks">Alles verwijderen</string>
   <string name="remove_selected_bookmarks">Gekozen bladwijzers verwijderen</string>
   <string name="remove_all_bookmarks_confirm">Weet u zeker dat u alle bladwijzers uit het profiel %1$s wilt verwijderen?</string>
diff --git a/xabber/src/main/res/values-nl-rNL/contact_viewer.xml b/xabber/src/main/res/values-nl-rNL/contact_viewer.xml
index d6f44ef500..7d9e9daa35 100644
--- a/xabber/src/main/res/values-nl-rNL/contact_viewer.xml
+++ b/xabber/src/main/res/values-nl-rNL/contact_viewer.xml
@@ -17,12 +17,9 @@
   <string name="vcard_organization_unit">Eenheid binnen organisatie</string>
   <string name="vcard_title">Werktitel, functie</string>
   <string name="vcard_role">Rol</string>
-  <string name="vcard_other">Overige informatie</string>
-  <string name="vcard_categories">Categorieën</string>
-  <string name="vcard_decsription">Omschrijving</string>
+    <string name="vcard_decsription">Omschrijving</string>
   <string name="vcard_note">Notities</string>
-  <string name="vcard_address">Adres</string>
-  <string name="vcard_address_pobox">Postbus</string>
+    <string name="vcard_address_pobox">Postbus</string>
   <string name="vcard_address_extadr">Uitgebreid adres</string>
   <string name="vcard_address_street">Straat</string>
   <string name="vcard_address_locality">Woonplaats</string>
diff --git a/xabber/src/main/res/values-nl-rNL/muc_editor.xml b/xabber/src/main/res/values-nl-rNL/muc_editor.xml
index fe2947dd8e..e0581a74f3 100644
--- a/xabber/src/main/res/values-nl-rNL/muc_editor.xml
+++ b/xabber/src/main/res/values-nl-rNL/muc_editor.xml
@@ -20,12 +20,10 @@
   <string name="muc_invite_confirm">%2$s inviteert je om lid te worden van conferentie %3$s. Lid worden vanop account %1$s?</string>
   <string name="muc_invite_confirm_reason">%2$s inviteert je om lid te worden van conferentie %3$s: %4$s.  Lid worden vanop account %1$s?</string>
   <string name="muc_leave">Verlaat conferentie</string>
-  <string name="muc_save">Sla conferentie op</string>
-  <string name="muc_choose_conference">Kies conferentie</string>
+    <string name="muc_choose_conference">Kies conferentie</string>
   <string name="muc_next">Volgende</string>
   <string name="muc_get_hosted_conferences">Gehoste conferenties opvragen</string>
   <string name="muc_error_getting_conferences">Fout bij opvragen conferenties</string>
   <string name="muc_type_conference_name">Conferentienaam typen</string>
-  <string name="contact_is_blocked">Contact is geblokkeerd!</string>
-  <string name="conference_invitation">Conferentie-uitnodiging</string>
+    <string name="conference_invitation">Conferentie-uitnodiging</string>
 </resources>
diff --git a/xabber/src/main/res/values-nl-rNL/notification_bar.xml b/xabber/src/main/res/values-nl-rNL/notification_bar.xml
index 203dfa9b71..4376708e02 100644
--- a/xabber/src/main/res/values-nl-rNL/notification_bar.xml
+++ b/xabber/src/main/res/values-nl-rNL/notification_bar.xml
@@ -34,10 +34,7 @@
   <!-- Used for plural form in russian. -->
   <string name="connection_state_waiting_5">-</string>
   <string name="connection_state_offline">%1$d %2$s offline</string>
-  <string name="archive_available_request_message">Wil je de berichtengeschiedenis opslaan op de server?\nDaarmee kan Xabber de berichtenhistorie laden van alle apparaten die dit account gebruiken.\nDeze optie gebruikt extra dataverkeer en kan de verbindingssnelheid negatief beïnvloeden.\nWAARSCHUWING: je lokale geschiedenis zal helemaal verwijderd worden.</string>
-  <string name="archive_available_request_title">Berichtenarchief aanzetten?</string>
-  <string name="INVALID_CERTIFICATE">Ongeldig certificaat</string>
-  <string name="muc_invite_message">Conferentie betreden?</string>
+    <string name="muc_invite_message">Conferentie betreden?</string>
   <string name="otr_verification_in_progress">Kies om af te breken.</string>
   <string name="PASSWORD_REQUIRED">Wachtwoord vereist</string>
   <string name="pay_attention">Geef aandacht</string>
diff --git a/xabber/src/main/res/values-nl-rNL/preference_editor.xml b/xabber/src/main/res/values-nl-rNL/preference_editor.xml
index 3f1edd8654..51ba0939b3 100644
--- a/xabber/src/main/res/values-nl-rNL/preference_editor.xml
+++ b/xabber/src/main/res/values-nl-rNL/preference_editor.xml
@@ -12,14 +12,11 @@
   <string name="contacts_order_alphabet">Alfabetisch</string>
   <string name="contacts_order_status">Op status</string>
   <string name="contacts_show_accounts">Groepeer op account\nGroepeer contacten op account in contactenlijst</string>
-  <string name="contacts_show_active_chats">Actieve chats op bovenaan\nToon actieve chats boven aan de lijst met contactpersonen</string>
-  <string name="contacts_show_avatars">Toon avatars\nToon avatars van contacten in contactenlijst</string>
+    <string name="contacts_show_avatars">Toon avatars\nToon avatars van contacten in contactenlijst</string>
   <string name="contacts_show_empty_groups">Toon lege groepen\nToon groepen met geen online contacten</string>
   <string name="contacts_show_groups">Toon groepen\nToon groepen in contactenlijst</string>
   <string name="contacts_show_offline">Toon offline contacten</string>
-  <string name="contacts_show_panel">Toon account paneel\nToon actieknoppen met avatars in de rechter onderkant van de contact lijst</string>
-  <string name="contacts_stay_active_chats">Dubbele actieve chats\nActive chats weergegeven zowel boven in de lijst met contactpersonen en groepen</string>
-  <string name="debug_log">Log foutopsporing\nSchrijf fouten naar log (herstart applicatie om wijzigingen door te voeren)</string>
+    <string name="debug_log">Log foutopsporing\nSchrijf fouten naar log (herstart applicatie om wijzigingen door te voeren)</string>
   <string name="debug_file_log_title">Logbestanden opslaan\nSchrijf debug log naar een lokaal bestand (dit kunt u delen).</string>
   <string name="debug_log_files_title">Log-bestanden\nLijst van geschreven log-bestanden.</string>
   <string name="debug_log_files_activity_title">Log-bestanden</string>
@@ -36,8 +33,7 @@
   <string name="interface_theme">Thema</string>
   <string name="interface_theme_dark">Donker</string>
   <string name="interface_theme_light">Licht</string>
-  <string name="interface_theme_normal">Standaard</string>
-  <string name="interface_smiles">Gezichtjes</string>
+    <string name="interface_smiles">Gezichtjes</string>
   <string name="interface_smiles_android">Android smilies</string>
   <string name="interface_smiles_none">Geen grafische emoticons</string>
   <string name="preference_connection">Verbindingsinstellingen\nVerbindingsinstellingen</string>
@@ -62,8 +58,7 @@
   <string name="chats_font_size_xlarge">Extra groot</string>
   <string name="chats_hide_keyboard">Toetsenbord verbergen</string>
   <string name="chats_hide_keyboard_landscape">In landschapsmodus</string>
-  <string name="chats_receipt">Ontvangstbevestigingen\nVerzend en ontvang ontvangstbevestigingen</string>
-  <string name="chats_show_avatars">Avatars in berichten\nToon avatars in elk bericht</string>
+    <string name="chats_show_avatars">Avatars in berichten\nToon avatars in elk bericht</string>
   <string name="chats_show_status_change">Statuswijzigingen weergeven</string>
   <string name="chats_show_status_change_muc">In conferenties</string>
   <string name="chats_state_notification">Verzenden typen notificaties\nInformeer de andere gebruiker die u aan het typen bent</string>
@@ -77,37 +72,24 @@
   <string name="contacts_reset_offline">Reset offline instellingen\nHerstel individuele instellingen voor groepen en accounts</string>
   <string name="contacts_reset_offline_warning">Individuele instellingen voor groepen en accounts herstellen?</string>
   <string name="events_first_only">Waarschuwen op eerste bericht\nWaarschuw alleen bij het eerste bericht in een chat</string>
-  <string name="events_ignore_system_vibro">Negeer trilinstellingen van het systeem.\nGebruik deze optie wanneer trillen niet werkt</string>
-  <string name="events_message">Notificaties instellingen\nConfigureer inkomende bericht notificaties</string>
-  <string name="events_message_chat">Chats</string>
-  <string name="events_message_chat_and_muc">Chats en conferenties</string>
-  <string name="events_message_none">Geen melding</string>
-  <string name="events_show_text">Voorbeeld van bericht\nBerichten uit gesprekken in het systeemvak weergeven</string>
+    <string name="events_show_text">Voorbeeld van bericht\nBerichten uit gesprekken in het systeemvak weergeven</string>
   <string name="events_show_text_muc">Voorbeeld van bericht\nBerichten uit vergaderingen in het systeemvak weergeven</string>
-  <string name="events_visible_chat">Melding voor actieve chat\nMelding voor berichten in huidige chat</string>
-  <string name="events_suppress_100">Onderdruk sommige status berichten\nKrijg geen \'Deze ruimte is niet anoniem\' berichten</string>
+    <string name="events_suppress_100">Onderdruk sommige status berichten\nKrijg geen \'Deze ruimte is niet anoniem\' berichten</string>
   <string name="negative_priotiry_summary">%s (je zal geen enkel bericht ontvangen)</string>
   <string name="preference_accounts">XMPP accounts\nBeheer accounts</string>
   <string name="preference_security">Beveiliging\nBeveiligingsinstellingen</string>
   <string name="security_check_certificate">Controleer server certificaat\nWaarschuw voor certificaat problemen op versleutelde verbindingen</string>
-  <string name="security_clear_certificate">Verwijder certificaten\nVerwijder lijst van genegeerde certificaten</string>
-  <string name="security_otr_history">History opslaan\nBerichtgeschiedenis opslaan voor OTR sessies</string>
-  <string name="security_otr_mode">OTR modus</string>
+    <string name="security_otr_mode">OTR modus</string>
   <string name="chats_attention">Waarschuwing\nReageer op inkomende aandacht verzoeken</string>
   <string name="chats_attention_sound">Attentie geluid\nSelecteer ringtone</string>
   <string name="connection_load_vcard">Laad vCard\nLaad en update persoonlijke informatie en avatar van contact. Zet uit om dataverkeer te besparen.</string>
   <string name="connection_load_images">Laadt afbeeldingen\nLaat afbeeldingen van bestands-URL automatisch. Uitschakelen om dataverkeer te reduceren.</string>
   <string name="connection_use_carbons">Carbon-copied modus\nKan instabiel zijn! Sessies voor dezelfde account op deze client delen. Uitschakelen om data verbruik te verminderen.</string>
-  <string name="connection_dns_resolver_type">DNS-resolver type</string>
-  <string name="connection_dns_resolver_type_dns_java_resolver">DNSJavaResolver</string>
+    <string name="connection_dns_resolver_type_dns_java_resolver">DNSJavaResolver</string>
   <string name="connection_dns_resolver_type_mini_dns_resolver">MiniDNSResolver (experimenteel)</string>
-  <string name="connection_use_plain_text_auth">Platte tekst authenticatie\nGebruik platte tekst authenticatie voor alle accounts. Niet aanbevolen.</string>
-  <string name="events_phrases">Belangrijke zin\nCreëer aangepaste meldingen voor ontvangen berichten die specifieke zinnen bevatten</string>
-  <string name="security_clear_certificate_warning">Wilt u echt alle genegeerde certificaten verwijderen?</string>
-  <string name="account_error_settings">Instellingen</string>
-  <string name="category_xabber_account">Xabber-profiel</string>
-  <string name="category_xmpp_accounts">XMPP-profielen</string>
-  <string name="category_interface">Omgeving</string>
+    <string name="events_phrases">Belangrijke zin\nCreëer aangepaste meldingen voor ontvangen berichten die specifieke zinnen bevatten</string>
+    <string name="account_error_settings">Instellingen</string>
+    <string name="category_interface">Omgeving</string>
   <string name="category_settings">Instellingen</string>
   <string name="category_about">Over</string>
   <string name="category_appearance">Vormgeving</string>
diff --git a/xabber/src/main/res/values-nl-rNL/words.xml b/xabber/src/main/res/values-nl-rNL/words.xml
index 6da7d263f0..46e1276a94 100644
--- a/xabber/src/main/res/values-nl-rNL/words.xml
+++ b/xabber/src/main/res/values-nl-rNL/words.xml
@@ -20,5 +20,4 @@
   <string name="settings">Instellingen</string>
   <string name="ok">Goed</string>
   <string name="login">Aanmelden</string>
-  <string name="resume">Hervatten</string>
 </resources>
diff --git a/xabber/src/main/res/values-oc-rFR/account_editor.xml b/xabber/src/main/res/values-oc-rFR/account_editor.xml
index 2c3b315ab3..0857ba5842 100644
--- a/xabber/src/main/res/values-oc-rFR/account_editor.xml
+++ b/xabber/src/main/res/values-oc-rFR/account_editor.xml
@@ -2,39 +2,24 @@
 <!--Generated by crowdin.com-->
 <resources>
   <string name="account_compression">Utilizar la compression</string>
-  <string name="account_enabled">Activat</string>
-  <string name="account_host">Òste</string>
+    <string name="account_host">Òste</string>
   <string name="account_password">Senhal</string>
   <string name="confirm_password">Confirmatz lo senhal</string>
   <string name="account_port">Pòrt</string>
   <string name="account_priority">Prioritat</string>
   <string name="account_resource">Ressorsa</string>
   <string name="account_server_name">Servidor</string>
-  <string name="account_type">Tipe de compte</string>
-  <string name="account_type_hints_gtalk">Identificant gmail.com o domeni Google Apps</string>
-  <string name="account_type_helps_gtalk">Pas de compte Google ? Ne podètz crear un sus http://mail.google.com\nPodètz tanben utilizar identificant@vòstredomenigoogle</string>
-  <string name="account_type_helps_xmpp">Ne podètz aprene mai sus XMPP (Jabber) aicí : https://xmpp.org</string>
-  <string name="account_user_name">Identificant</string>
+    <string name="account_user_name">Identificant</string>
   <string name="EMPTY_SERVER_NAME">Lo nom del servidor es mancant</string>
   <string name="EMPTY_USER_NAME">Identificant mancant</string>
   <string name="CONFIRM_PASSWORD">Los senhals correspondon pas</string>
-  <string name="account_archive_mode">Enregistrar l\'istoric dels messatges</string>
-  <string name="account_archive_mode_available">Sul servidor se disponible</string>
-  <string name="account_archive_mode_dont_store">Conservar pas</string>
-  <string name="account_archive_mode_local">Localament sus l\'aparelh</string>
-  <string name="account_archive_mode_server">Sul servidor</string>
-  <string name="account_archive_mode_unread">Localament mas solament pas mandat e pas legit</string>
-  <string name="account_compression_summary">Marcatz per activar la compression de las donadas</string>
+    <string name="account_compression_summary">Marcatz per activar la compression de las donadas</string>
   <string name="account_custom">Òste personalizat</string>
   <string name="account_custom_summary">Utilizar los paramètres d\'òste personalizats al luòc de las donadas SRV</string>
-  <string name="account_enabled_summary">Interruptor per activar lo compte</string>
-  <string name="account_invalid_port">Lo pòrt deu èsser un nombre (defaut : 5222)</string>
+    <string name="account_invalid_port">Lo pòrt deu èsser un nombre (defaut : 5222)</string>
   <string name="account_invalid_port_range">Lo pòrt deu èsser comprés entre 1 e 65535 (defaut : 5222)</string>
   <string name="account_invalid_priority">La prioritat deu èsser un nombre comprés entre -128 e 127 (defaut: 10)</string>
-  <string name="account_oauth">Autorizacion</string>
-  <string name="account_oauth_invalidated">Autorizacion refusada</string>
-  <string name="account_oauth_summary">Paramètres OAuth</string>
-  <string name="account_proxy_host">Adreça del proxy</string>
+    <string name="account_proxy_host">Adreça del proxy</string>
   <string name="account_proxy_invalid_port_range">Lo pòrt del proxy deu èsser comprés entre 1 e 65535 (defaut : 8080)</string>
   <string name="account_proxy_invalid_port">Lo pòrt del proxy deu èsser un nombre (defaut : 8080)</string>
   <string name="account_proxy_password">Senhal del proxy</string>
@@ -46,18 +31,14 @@
   <string name="account_sasl_summary">Desactivar pels servidors obsolèts</string>
   <string name="account_store_password">Enregistrar lo senhal</string>
   <string name="account_store_password_summary">Desactivar aquesta opcion per demandar lo senhal a cada connexion</string>
-  <string name="account_syncable">Integracion als contactes del sistèma</string>
-  <string name="account_syncable_summary">Afichar los contactes d\'aqueste compte dins la lista de contactes de l\'aparelh</string>
-  <string name="account_tls_enable">Activar TLS</string>
+    <string name="account_tls_enable">Activar TLS</string>
   <string name="account_tls_enable_summary">Utilizar lo chiframent TLS se lo servidor o permet</string>
   <string name="account_tls_legacy">SSL obsolèt</string>
   <string name="account_tls_legacy_summary">Utilizar lo chiframent SSL obsolèt al moment de la connexion al servidor</string>
   <string name="account_tls_mode">Utilizacion de TLS/SSL</string>
   <string name="account_tls_require">TLS requesit</string>
   <string name="account_tls_require_summary">Chiframent TLS obligatòri per la connexion</string>
-  <string name="account_use_orbot">Discutir via la ret anonimizant TOR e forçar lo chiframent TLS\nDesconselhat per Google Talk</string>
-  <string name="confirm_cancellation">Sètz segur que volètz anullar vòstras modificacions ?</string>
-  <string name="INCORRECT_USER_NAME">Identificant incorrècte. Consultatz lo messatge çaijós per mai de detalhs.</string>
+    <string name="INCORRECT_USER_NAME">Identificant incorrècte. Consultatz lo messatge çaijós per mai de detalhs.</string>
   <string name="orbot_required_message">Per fin d\'utilizar TOR, Orbot deu èsser installat e activat per relaiar las comunicacions. Lo volètz installar a partir de Google Play?</string>
   <string name="orbot_required_title">Installar Orbot ?</string>
   <string name="install_orbot">Installar Orbot</string>
diff --git a/xabber/src/main/res/values-oc-rFR/chat_viewer.xml b/xabber/src/main/res/values-oc-rFR/chat_viewer.xml
index 8db1520744..118b45ea59 100644
--- a/xabber/src/main/res/values-oc-rFR/chat_viewer.xml
+++ b/xabber/src/main/res/values-oc-rFR/chat_viewer.xml
@@ -17,11 +17,8 @@
   <string name="message_quote">Citar</string>
   <string name="message_remove">Suprimir de l\'istoric</string>
   <string name="message_repeat">Tornar ensajar lo mandadís</string>
-  <string name="message_open_file">Dobrir</string>
-  <string name="message_save_file">Salvar</string>
-  <string name="save_history">Emmagazinar l\'istoric localament\nSalvar l\'istoric dels messatges localament</string>
-  <string name="show_history">Afichar l\'istoric</string>
-  <string name="action_attention_called">Demanda d\'atencion mandada</string>
+    <string name="save_history">Emmagazinar l\'istoric localament\nSalvar l\'istoric dels messatges localament</string>
+    <string name="action_attention_called">Demanda d\'atencion mandada</string>
   <string name="action_attention_requested">Una demanda d\'atencion es estada recebuda</string>
   <string name="action_ban">%1$s es estat bandit</string>
   <string name="action_ban_by">%1$s es estat bandit per %2$s</string>
@@ -69,26 +66,17 @@
   <string name="otr_refresh">Reaviar lo chiframent</string>
   <string name="otr_request">Una conversacion privada OTR (Off-The-Record) es estat demandada mas avètz pas lo plugin requesit. Utilizatz Pidgin, Gajim o Adium sus PC / Mac, e Xabber, Conversacions o ChatSecure sus Android. Allez sus http://otr.cypherpunks.ca/ per plus d\'informations.</string>
   <string name="otr_start">Aviar lo chiframent</string>
-  <string name="otr_unencrypted_message">Aqueste messatge es pas estat chifrat</string>
-  <string name="otr_unreadable_message">Lo messatge chifrat qu\'avètz mandat es illegible</string>
+    <string name="otr_unreadable_message">Lo messatge chifrat qu\'avètz mandat es illegible</string>
   <string name="otr_verification">Verificacion OTR</string>
   <string name="otr_verify_fingerprint">Verificatz amb una emprenta</string>
   <string name="otr_verify_question">Verificatz amb una question</string>
   <string name="otr_verify_secret">Verificatz amb un secret partejat</string>
-  <string name="under_construction">En òbras</string>
-  <string name="under_construction_message">Aqueste ecran es en cors de construccion</string>
-  <string name="chat_events_show_text_global">Utilizar los paramètres globals</string>
+    <string name="chat_events_show_text_global">Utilizar los paramètres globals</string>
   <string name="chat_events_show_text_always">Afichar lo tèxte del messatge</string>
   <string name="chat_events_show_text_never">Amagar lo tèxte del messatge</string>
-  <string name="sending_file">Mandadís del fichièr %s en cors</string>
-  <string name="error_sending_file">Error al moment del mandadís de %s</string>
-  <string name="no_application_to_open_file">Pas d\'aplicacion disponibla per dobrir aqueste fichièr</string>
-  <string name="could_not_save_file">Salvament del fichièr impossible</string>
-  <string name="file_saved_successfully">Fichièr salvat amb succès</string>
-  <string name="received_by">Recebut per %s</string>
-  <string name="could_not_get_path_to_file">Impossible de trobar lo camin del fichièr</string>
+    <string name="error_sending_file">Error al moment del mandadís de %s</string>
+    <string name="could_not_get_path_to_file">Impossible de trobar lo camin del fichièr</string>
   <string name="message_open_private_chat">Dobrir una conversacion privada</string>
-  <string name="http_file_upload_slot_error">L\'upload del fichièr a fracassat. Es tròp voluminós ?</string>
-  <string name="no_permission_to_read_files">Permission de legir los fichièrs refusada</string>
+    <string name="no_permission_to_read_files">Permission de legir los fichièrs refusada</string>
   <string name="no_permission_to_write_files">Permission d\'escriure los fichièrs refusada</string>
 </resources>
diff --git a/xabber/src/main/res/values-oc-rFR/contact_editor.xml b/xabber/src/main/res/values-oc-rFR/contact_editor.xml
index 48ff593450..866b5f4302 100644
--- a/xabber/src/main/res/values-oc-rFR/contact_editor.xml
+++ b/xabber/src/main/res/values-oc-rFR/contact_editor.xml
@@ -17,10 +17,6 @@
   <string name="processing_image">Tractament de l\'imatge en cors...</string>
   <string name="error_during_crop">Error pendent lo redimensionament de l\'imatge</string>
   <string name="error_during_image_processing">Error pendent lo tractament de l\'imatge</string>
-  <string name="account_settings">Paramètres del compte</string>
-  <string name="account_user_info">Detalhs del compte</string>
-  <string name="conference_private_chat_invitation">%1$s de %2$s desira discutir en privat</string>
+    <string name="conference_private_chat_invitation">%1$s de %2$s desira discutir en privat</string>
   <string name="accept_muc_private_chat">Acceptar</string>
-  <string name="block_muc_private_chat">Blocar</string>
-  <string name="no_permission_camera">Permission d\'accedir a la camèra refusada</string>
 </resources>
diff --git a/xabber/src/main/res/values-oc-rFR/contact_list.xml b/xabber/src/main/res/values-oc-rFR/contact_list.xml
index 73696f5611..33dd5c7c70 100644
--- a/xabber/src/main/res/values-oc-rFR/contact_list.xml
+++ b/xabber/src/main/res/values-oc-rFR/contact_list.xml
@@ -18,17 +18,13 @@
   <string name="application_state_roster">Connectat.</string>
   <string name="application_state_starting">Aviada en cors&#8230;</string>
   <string name="application_state_waiting">En espèra de connexion...</string>
-  <string name="chat_list">Conversacions recentas</string>
-  <string name="chat_list_is_empty">Pas de conversacion activa</string>
-  <string name="chat_viewer">Conversacion</string>
-  <string name="close_chat">Tampar aquesta conversacion</string>
-  <string name="CONNECTION_FAILED">Error de connexion</string>
+    <string name="chat_viewer">Conversacion</string>
+    <string name="CONNECTION_FAILED">Error de connexion</string>
   <string name="contact_add">Apondre un contacte</string>
   <string name="contact_delete">Suprimir</string>
   <string name="contact_block">Blocar lo contacte</string>
   <string name="contact_delete_confirm">Sètz segur que volètz suprimir lo contacte %1$s del compte %2$s ?</string>
-  <string name="contact_list">Lista de contactes</string>
-  <string name="discard_subscription">Refusar lo contacte</string>
+    <string name="discard_subscription">Refusar lo contacte</string>
   <string name="exit">Quitar</string>
   <string name="group_active_chat">Conversacions activas</string>
   <string name="group_none">Pas de gropes</string>
@@ -40,14 +36,7 @@
   <string name="request_subscription">Demanda de soscripcion</string>
   <string name="XMPP_EXCEPTION">Error de flux</string>
   <string name="application_state_closing">Enregistrament de las modificacions...\nL\'aplicacion va èsser tampada dins pas gaire de temps.</string>
-  <string name="certificate_details">\n\nEmés per :\nNom comun (CN) : %1$s\nOrganizacion (O) : %2$s\nUnitat d\'organizacion (OU) : %3$s\nNumèro de série : %4$s\n\nÉmis per :\nNom commun (CN) : %5$s\nOrganizacion (O) : %6$s\nUnitat d\'organizacion (OU) : %7$s\n\nValiditat :\nEmés lo : %8$s\nExpira lo : %9$s</string>
-  <string name="certificate_invalid_chane">La verificacion de la cadena de las signaturas a fracassat</string>
-  <string name="certificate_invalid_target">La verificacion de la cibla a fracassat</string>
-  <string name="certificate_self_signed">Certificat autosignat</string>
-  <string name="certificate_show_details">Detalhs...</string>
-  <string name="close_chats">Tampar totas las conversacions</string>
-  <string name="contact_integration_suggest">Volètz que Xabber siá integrat dins lo gestionari de contactes del sistèma ?\nAquò pòt èsser cambiat dins \"Paramètres\" → \"Comptes XMPP\" → Vòstre compte → \"Integracion dels contactes\".\nNòta : La lista dels contactes pòt èsser alentida pendent qualques minutas.</string>
-  <string name="group_room">Conferéncias</string>
+    <string name="group_room">Conferéncias</string>
   <string name="OTR_ERROR">Error OTR</string>
   <string name="select_contact">Quichatz per seleccionar lo contacte</string>
   <string name="show_offline_always">Afichar totjorn</string>
@@ -62,8 +51,7 @@
   <string name="block_list">Lista de blocatge</string>
   <string name="contact_blocked_successfully">Lo contacte es ara blocat</string>
   <string name="error_blocking_contact">Error al moment del blocatge del contacte</string>
-  <string name="unblock_contact">Desblocar lo contacte</string>
-  <string name="contacts_unblocked_successfully">Lo contacte es ara desblocat</string>
+    <string name="contacts_unblocked_successfully">Lo contacte es ara desblocat</string>
   <string name="error_unblocking_contacts">Error al moment del desblocatge del contacte</string>
   <string name="block_contact_confirm">Sètz segur que volètz blocar lo contacte %1$s del compte %2$s ?</string>
   <string name="unblock_all_contacts_confirm">Sètz segur que volètz desblocar totes los contactes del compte %1$s ?</string>
diff --git a/xabber/src/main/res/values-oc-rFR/contact_viewer.xml b/xabber/src/main/res/values-oc-rFR/contact_viewer.xml
index b445f98abc..ea43d86dc8 100644
--- a/xabber/src/main/res/values-oc-rFR/contact_viewer.xml
+++ b/xabber/src/main/res/values-oc-rFR/contact_viewer.xml
@@ -16,12 +16,9 @@
   <string name="vcard_organization_unit">Unitat organizacionala</string>
   <string name="vcard_title">Títol de l\'emplec, foncion</string>
   <string name="vcard_role">Ròtle</string>
-  <string name="vcard_other">Autras informacions</string>
-  <string name="vcard_categories">Categorias</string>
-  <string name="vcard_decsription">Descripcion</string>
+    <string name="vcard_decsription">Descripcion</string>
   <string name="vcard_note">Nòtas</string>
-  <string name="vcard_address">Adreça</string>
-  <string name="vcard_address_pobox">Bóstia postala</string>
+    <string name="vcard_address_pobox">Bóstia postala</string>
   <string name="vcard_address_extadr">Adreça espandida</string>
   <string name="vcard_address_street">Carrièra</string>
   <string name="vcard_address_locality">Vila</string>
diff --git a/xabber/src/main/res/values-oc-rFR/muc_editor.xml b/xabber/src/main/res/values-oc-rFR/muc_editor.xml
index 322c45e139..fff5c295d7 100644
--- a/xabber/src/main/res/values-oc-rFR/muc_editor.xml
+++ b/xabber/src/main/res/values-oc-rFR/muc_editor.xml
@@ -20,12 +20,10 @@
   <string name="muc_invite_confirm">%2$s vos a convidat a rejónher la conferéncia %3$s. Lo rejónher amb lo compte %1$s ?</string>
   <string name="muc_invite_confirm_reason">%2$s vos a convidat a rejónher la conferéncia %3$s : %4$s. La rejónher amb lo compte %1$s ?</string>
   <string name="muc_leave">Quitar la conferéncia</string>
-  <string name="muc_save">Enregistrar la conferéncia</string>
-  <string name="muc_choose_conference">Causir una conferéncia</string>
+    <string name="muc_choose_conference">Causir una conferéncia</string>
   <string name="muc_next">Seguent</string>
   <string name="muc_get_hosted_conferences">Obténer la lista de las conferéncias albergadas</string>
   <string name="muc_error_getting_conferences">Error al moment de l\'obtencion de la lista de las conferéncias</string>
   <string name="muc_type_conference_name">Entratz lo nom de la conferéncia</string>
-  <string name="contact_is_blocked">Aqueste contacte es blocat !</string>
-  <string name="conference_invitation">Convit a una conferéncia</string>
+    <string name="conference_invitation">Convit a una conferéncia</string>
 </resources>
diff --git a/xabber/src/main/res/values-oc-rFR/notification_bar.xml b/xabber/src/main/res/values-oc-rFR/notification_bar.xml
index 95b265a54f..df44fa5634 100644
--- a/xabber/src/main/res/values-oc-rFR/notification_bar.xml
+++ b/xabber/src/main/res/values-oc-rFR/notification_bar.xml
@@ -27,10 +27,7 @@
   <string name="connection_state_waiting_2">%1$d %3$s sus %2$d en espèra de connexion</string>
   <!-- Used for plural form in russian. -->
   <string name="connection_state_offline">%1$d %2$s fòra linha</string>
-  <string name="archive_available_request_message">Volètz emmagazinar l\'istoric dels messatges sul servidor ?\nAquò permet a Xabber d\'obténer l\'istoric de messatges per l\'ensemble dels aparelhs qu\'utilizan aqueste compte.\nAquesta foncion genèra un pauc mai de trafic e redutz leugièrament la velocitat de connexion.\nATENCION : Tot vòstre istoric local va èsser suprimit.</string>
-  <string name="archive_available_request_title">Activar l\'archivatge dels messatges ?</string>
-  <string name="INVALID_CERTIFICATE">Certificat invalid</string>
-  <string name="muc_invite_message">Volètz rejónher la conferéncia ?</string>
+    <string name="muc_invite_message">Volètz rejónher la conferéncia ?</string>
   <string name="otr_verification_in_progress">Quichatz aicí per anullar.</string>
   <string name="PASSWORD_REQUIRED">Senhal requesit</string>
   <string name="pay_attention">Demanda d\'atencion</string>
diff --git a/xabber/src/main/res/values-oc-rFR/preference_editor.xml b/xabber/src/main/res/values-oc-rFR/preference_editor.xml
index f0b8b28816..b97588802f 100644
--- a/xabber/src/main/res/values-oc-rFR/preference_editor.xml
+++ b/xabber/src/main/res/values-oc-rFR/preference_editor.xml
@@ -8,21 +8,17 @@
   <string name="contacts_order_alphabet">Alfabetic</string>
   <string name="contacts_order_status">Per estatut</string>
   <string name="contacts_show_accounts">Gropar per compte\nGropa los contactes per compte dins la lista de contactes</string>
-  <string name="contacts_show_active_chats">Conversacions activas en naut\nAficha las conversacions activas en naut de la lista de contactes</string>
-  <string name="contacts_show_avatars">Afichar los avatars\nAficha los avatars dels utilizaires dins la lista de contactes</string>
+    <string name="contacts_show_avatars">Afichar los avatars\nAficha los avatars dels utilizaires dins la lista de contactes</string>
   <string name="contacts_show_empty_groups">Afichar los gropes voids\nAfichar los gropes sens contacte en linha</string>
   <string name="contacts_show_groups">Afichar los gropes\nAficha los gropes dins la lista de contactes</string>
   <string name="contacts_show_offline">Afichar los contactes fòra linha</string>
-  <string name="contacts_show_panel">Botons de compte\nAficha de botons d\'action amb avatar en bas e a dreita de la lista de contactes</string>
-  <string name="contacts_stay_active_chats">Duplicar las conversacions activas\nLas conversacions activas apareisson a l\'encòp en naut de la lista de contactes e dins los gropes</string>
-  <string name="debug_log">Jornal de desbugatge\nEscriure los messatges dins lo jornal de desbugatge (reaviatz l\'aplicacion per aplicar)</string>
+    <string name="debug_log">Jornal de desbugatge\nEscriure los messatges dins lo jornal de desbugatge (reaviatz l\'aplicacion per aplicar)</string>
   <string name="debug_connection_errors_title">Mostrar errors de connexion\nAficha las pop-ups d\'excepcion de connexion</string>
   <string name="events_lightning">Notificacion luminosa\nLa LED cluqueja al moment d\'una notificacion</string>
   <string name="events_persistent">Icòna de barra dels prètzfaits\nAficha una notificacion permanenta. Aquesta opcion fòrça Android a gardar l\'aplicacion en memòria</string>
   <string name="interface_theme_dark">Escur</string>
   <string name="interface_theme_light">Clar</string>
-  <string name="interface_theme_normal">Defaut</string>
-  <string name="interface_smiles_android">Emoticònas Android</string>
+    <string name="interface_smiles_android">Emoticònas Android</string>
   <string name="interface_smiles_none">Pas d\'emoticònas graficas</string>
   <string name="preference_connection">Paramètres de connexion\nParamètres de connexion</string>
   <string name="preference_contacts">Lista de contactes\nPersonalizar l\'aparéncia de la lista de contactes</string>
@@ -37,8 +33,7 @@
   <string name="chats_font_size_small">Pichona</string>
   <string name="chats_font_size_xlarge">Fòrça granda</string>
   <string name="chats_hide_keyboard_landscape">En mòde païsatge</string>
-  <string name="chats_receipt">Acusats de recepcion\nMandar e recebre d\'acusats de recepcion</string>
-  <string name="chats_show_avatars">Avatars dins los messatges\nAficha los avatars dins cada messatge</string>
+    <string name="chats_show_avatars">Avatars dins los messatges\nAficha los avatars dins cada messatge</string>
   <string name="chats_show_status_change_muc">Dins las conferéncias</string>
   <string name="chats_state_notification">Mandar notificacions d\'escritura\nNotifica vòstres interlocutors quand escrivètz</string>
   <string name="connection_adjust_priority">Ajustar la prioritat\nModifica la prioritat segon l\'estatut seleccionar. Aqueste paramètre l\'empòrta sus la prioritat globala del compte.</string>
@@ -51,26 +46,16 @@
   <string name="contacts_reset_offline">Reïnicializar los paramètres fòra linha\nEscafar los paramètres fòra linha individuals des groupes e des comptes</string>
   <string name="contacts_reset_offline_warning">Sètz segur que volètz escafar los paramètres fòra linha individuals des groupes e des comptes ?</string>
   <string name="events_first_only">Notificar al 1èr messatge\nAlertar unicament a la recepcion del 1èr messatge d\'una conversacion</string>
-  <string name="events_ignore_system_vibro">Ignorar los paramètres sistèma del vibrador\nUtilizatz aquesta opcion se lo vibrador fonciona pas</string>
-  <string name="events_message">Paramètres de notificacion\nConfigurar las notificacions dels messatges entrants</string>
-  <string name="events_message_chat">Conversacions solament</string>
-  <string name="events_message_chat_and_muc">Conversacions e conferéncias</string>
-  <string name="events_message_none">Notificar pas</string>
-  <string name="events_visible_chat">Notificar per la conversacion afichada\nNotificar quand un messatge es recebut dins la conversacion afichada</string>
-  <string name="events_suppress_100">Amagar certanas notificacions\nAmaga los messatges \"Aquesta conferéncia es pas anonima\"</string>
+    <string name="events_suppress_100">Amagar certanas notificacions\nAmaga los messatges \"Aquesta conferéncia es pas anonima\"</string>
   <string name="negative_priotiry_summary">%s (Recebrètz pas cap de messatge)</string>
   <string name="preference_accounts">Comptes XMPP\nGerir los comptes</string>
   <string name="preference_security">Seguretat\nParamètres de seguretat</string>
   <string name="security_check_certificate">Verificar lo certificat del servidor\nPrevenir en cas de problèma de certificat sus las connexions chifradas</string>
-  <string name="security_clear_certificate">Suprimir los certificats\nSuprimir totes los certificats ignorats</string>
-  <string name="security_otr_history">Conservar l\'istoric\nEmmagazinar l\'istoric de las conversacions per las sessions OTR</string>
-  <string name="security_otr_mode">Mòde OTR</string>
+    <string name="security_otr_mode">Mòde OTR</string>
   <string name="chats_attention">Demanda d\'atencion\nNotificar per las demandas d\'atencion recebudas</string>
   <string name="chats_attention_sound">Sonariá de demanda d\'atencion\nCausir una sonariá</string>
   <string name="connection_load_vcard">Cargar las vCard\nTelecargar e metre a jorn los detalhs personals e los avatars dels contactes. Desactivatz per reduire l\'utilizacion de la ret.</string>
   <string name="connection_load_images">Cargar los imatges\nCargar los imatges dempuèi l\'URL del fichièr automaticament. Desactivar per reduire l\'utilizacion de la ret.</string>
   <string name="connection_use_carbons">Mòde còpia carbòni\nPòt èsser instable ! Partejarà las sesilhas pel meteis compte qu\'utiliza aqueste client. Desactivar per reduire l\'utilizacion de la ret.</string>
-  <string name="connection_use_plain_text_auth">Autentificacion pas chifrada\nUtiliza una autentificacion pas chifrada per totes los comptes. Desconselhat.</string>
-  <string name="events_phrases">Expressions claus\nCrear de notificacions personalizadas pels messatges recebuts que contenon de formulas especificas</string>
-  <string name="security_clear_certificate_warning">Sètz segur que volètz suprimir totes los certificats ignorats ?</string>
+    <string name="events_phrases">Expressions claus\nCrear de notificacions personalizadas pels messatges recebuts que contenon de formulas especificas</string>
 </resources>
diff --git a/xabber/src/main/res/values-pl-rPL/account_editor.xml b/xabber/src/main/res/values-pl-rPL/account_editor.xml
index 58053e7b36..895996ad52 100644
--- a/xabber/src/main/res/values-pl-rPL/account_editor.xml
+++ b/xabber/src/main/res/values-pl-rPL/account_editor.xml
@@ -2,40 +2,25 @@
 <!--Generated by crowdin.com-->
 <resources>
   <string name="account_compression">Użyj kompresji</string>
-  <string name="account_enabled">Aktywne</string>
-  <string name="account_host">Serwer</string>
+    <string name="account_host">Serwer</string>
   <string name="account_password">Hasło</string>
   <string name="confirm_password">potwierdź hasło</string>
   <string name="account_port">Port</string>
   <string name="account_priority">Priorytet</string>
   <string name="account_resource">Zasób</string>
   <string name="account_server_name">Adres serwera</string>
-  <string name="account_type">Wybierz typ konta</string>
-  <string name="account_type_hints_gtalk">Nazwa użytkownika gmail.com</string>
-  <string name="account_type_helps_gtalk">Jeśli nie masz konta Google, możesz je założyć na http://mail.google.com\nMożesz też użyć twoja_nazwa_użytkownika@nazwa_twojej_domeny_google</string>
-  <string name="account_xmpp_register_warning">Musisz <a href="http://www.google.com/#q=zarejestruj+konto+XMPP">zarejestrować konto XMPP</a> przed dodaniem go do Xabbera!</string>
-  <string name="account_type_helps_xmpp">Jeśi chcesz się dowiedzieć więcej na temat XMPP (Jabber) możesz to zrobić na: https://xmpp.org</string>
-  <string name="account_user_name">Nazwa użytkownika</string>
+    <string name="account_xmpp_register_warning">Musisz <a href="http://www.google.com/#q=zarejestruj+konto+XMPP">zarejestrować konto XMPP</a> przed dodaniem go do Xabbera!</string>
+    <string name="account_user_name">Nazwa użytkownika</string>
   <string name="EMPTY_SERVER_NAME">Nazwa serwera nie została podana</string>
   <string name="EMPTY_USER_NAME">Nazwa użytkownika nie została podana</string>
   <string name="CONFIRM_PASSWORD">Hasła nie są takie same</string>
-  <string name="account_archive_mode">Zapisuj historię rozmowy</string>
-  <string name="account_archive_mode_available">Na serwerze jeśli możliwe</string>
-  <string name="account_archive_mode_dont_store">Nie zapisuj</string>
-  <string name="account_archive_mode_local">Lokalnie na urządzeniu</string>
-  <string name="account_archive_mode_server">Na serwerze</string>
-  <string name="account_archive_mode_unread">Lokalnie tylko niewysłane i nieprzeczytane</string>
-  <string name="account_compression_summary">Zaznacz, aby włączyć kompresję danych</string>
+    <string name="account_compression_summary">Zaznacz, aby włączyć kompresję danych</string>
   <string name="account_custom">Użyj niestandardowego adresu hosta</string>
   <string name="account_custom_summary">Użyj niestandardowego adresu hosta i portu zamiast rekordu SRV</string>
-  <string name="account_enabled_summary">Włącz konto</string>
-  <string name="account_invalid_port">Numer portu musi być liczbą (domyślnie: 5222)</string>
+    <string name="account_invalid_port">Numer portu musi być liczbą (domyślnie: 5222)</string>
   <string name="account_invalid_port_range">Port musi być od 1 do 65535 (domyślnie: 5222)</string>
   <string name="account_invalid_priority">Priorytet musi być liczbą pomiędzy -128 i 127 (domyślnie: 10)</string>
-  <string name="account_oauth">Autoryzacja</string>
-  <string name="account_oauth_invalidated">Brak autoryzacji</string>
-  <string name="account_oauth_summary">Ustawienia OAuth</string>
-  <string name="account_proxy_host">Adres serwera proxy</string>
+    <string name="account_proxy_host">Adres serwera proxy</string>
   <string name="account_proxy_invalid_port_range">Port serwera proxy musi być od 1 do 65535 (domyślnie: 8080)</string>
   <string name="account_proxy_invalid_port">Port serwera proxy musi być liczbą (domyślnie: 8080)</string>
   <string name="account_proxy_password">Hasło do serwera proxy</string>
@@ -47,18 +32,14 @@
   <string name="account_sasl_summary">Wyłącz dla bardzo starych serwerów</string>
   <string name="account_store_password">Zapamiętaj hasło</string>
   <string name="account_store_password_summary">Wyłącz tę opcję aby aplikacja zawsze prosiła o podanie hasła przy próbie logowania</string>
-  <string name="account_syncable">Integracja z kontaktami systemowymi</string>
-  <string name="account_syncable_summary">Pokaż kontakty z tego konta w kontaktach telefonu</string>
-  <string name="account_tls_enable">Włącz TLS</string>
+    <string name="account_tls_enable">Włącz TLS</string>
   <string name="account_tls_enable_summary">Użyj szyfrowania TLS gdy jest to możliwe podczas łączenia z serwerem</string>
   <string name="account_tls_legacy">Starszy SSL</string>
   <string name="account_tls_legacy_summary">Użyj starszego szyfrowania SSL podczas łączenia z serwerem</string>
   <string name="account_tls_mode">Użycie TLS/SSL</string>
   <string name="account_tls_require">Wymagaj TLS</string>
   <string name="account_tls_require_summary">Użycie TLS jest wymagane do połączenia</string>
-  <string name="account_use_orbot">Komunikuj się poprzez sieć anonymizującą TOR i wymuś szyfrowanie protokołem TLS\nNie polecane dla połaczeń z Google Talk</string>
-  <string name="confirm_cancellation">Czy na pewno chcesz porzucić wszelkie dokonane zmiany ?</string>
-  <string name="INCORRECT_USER_NAME">Błędna nazwa użytkownika. Przeczytaj informację poniżej.</string>
+    <string name="INCORRECT_USER_NAME">Błędna nazwa użytkownika. Przeczytaj informację poniżej.</string>
   <string name="orbot_required_message">Aby korzystać z TORa musisz mieć zainstalowanego Orbota i tunelować przez niego ruch sieciowy. Czy chcesz go zainstalować z Google Play?</string>
   <string name="orbot_required_title">Zainstalować Orbota?</string>
   <string name="install_orbot">Zainstaluj Orbot</string>
diff --git a/xabber/src/main/res/values-pl-rPL/chat_viewer.xml b/xabber/src/main/res/values-pl-rPL/chat_viewer.xml
index f517adc9db..d738bf6b14 100644
--- a/xabber/src/main/res/values-pl-rPL/chat_viewer.xml
+++ b/xabber/src/main/res/values-pl-rPL/chat_viewer.xml
@@ -21,11 +21,8 @@
   <string name="message_remove">Usuń z archiwum</string>
   <string name="message_repeat">Ponów wysyłanie</string>
   <string name="message_otr_show_original">Pokaż wiadomość</string>
-  <string name="message_open_file">Otwórz</string>
-  <string name="message_save_file">Zapisz</string>
-  <string name="save_history">Zachowaj historię rozmowy</string>
-  <string name="show_history">Pokaż archiwum</string>
-  <string name="action_attention_called">Prośba o uwagę wysłana</string>
+    <string name="save_history">Zachowaj historię rozmowy</string>
+    <string name="action_attention_called">Prośba o uwagę wysłana</string>
   <string name="action_attention_requested">Otrzymano prośbę o uwagę</string>
   <string name="action_ban">zbanowano %1$s</string>
   <string name="action_ban_by">%1$s został zbanowany przez %2$s</string>
@@ -73,8 +70,7 @@
   <string name="otr_refresh">Zrestartuj szyfrowanie</string>
   <string name="otr_request">Prywatna rozmowa Off-the-Record została zażądana, ale nie posiadasz odpowiedniej wtyczki. Użyj Pidgina, Gajim lub Adium dla PC/Mac albo Xabbera lub ChatSecure dla Androida. Wejdź na stronę http://otr.cypherpunks.ca/ by uzyskać więcej informacji.</string>
   <string name="otr_start">Rozpocznij szyfrowanie</string>
-  <string name="otr_unencrypted_message">Ta wiadomość nie została zaszyfrowana</string>
-  <string name="otr_unreadable_message">Zaszyfrowana wiadomość, którą wysłałeś, jest niemożliwa do odczytania</string>
+    <string name="otr_unreadable_message">Zaszyfrowana wiadomość, którą wysłałeś, jest niemożliwa do odczytania</string>
   <string name="otr_not_decrypted_message">Nie można odszyfrować wiadomości</string>
   <string name="otr_verification">Weryfikacja OTR</string>
   <string name="otr_verify_fingerprint">Zweryfikuj odciskiem palca</string>
@@ -87,21 +83,13 @@
   <string name="otr_verification_progress_title">Weryfikacja OTR w toku</string>
   <string name="otr_verification_notify_button">OTWÓRZ</string>
   <string name="otr_verification_notify_button_cancel">ANULUJ</string>
-  <string name="under_construction">W budowie</string>
-  <string name="under_construction_message">Ekran ten jest w budowie</string>
-  <string name="chat_events_show_text_global">Użyj ustawień globalnych</string>
+    <string name="chat_events_show_text_global">Użyj ustawień globalnych</string>
   <string name="chat_events_show_text_always">Pokaż tekst wiadomości</string>
   <string name="chat_events_show_text_never">Ukryj tekst wiadomości</string>
-  <string name="sending_file">Wysyłanie pliku %s</string>
-  <string name="error_sending_file">Błąd wysyłania pliku %s</string>
-  <string name="no_application_to_open_file">Nie znaleziono aplikacji dla tego typu pliku</string>
-  <string name="could_not_save_file">Nie udało się zapisać pliku</string>
-  <string name="file_saved_successfully">Plik zapisany pomyślnie</string>
-  <string name="received_by">Odebrano przez %s</string>
-  <string name="could_not_get_path_to_file">Nie udało się odnaleźć ścieżki do pliku</string>
+    <string name="error_sending_file">Błąd wysyłania pliku %s</string>
+    <string name="could_not_get_path_to_file">Nie udało się odnaleźć ścieżki do pliku</string>
   <string name="message_open_private_chat">Otwórz prywatny czat</string>
-  <string name="http_file_upload_slot_error">Nie można było załadować pliku. Za duży?</string>
-  <string name="no_permission_to_read_files">Brak uprawnień do odczytu</string>
+    <string name="no_permission_to_read_files">Brak uprawnień do odczytu</string>
   <string name="no_permission_to_write_files">Brak uprawnień do zapisu</string>
   <string name="error_description_title">Opis błędu:</string>
   <string name="message_status_sent">Wysłane</string>
diff --git a/xabber/src/main/res/values-pl-rPL/contact_editor.xml b/xabber/src/main/res/values-pl-rPL/contact_editor.xml
index 61bc9839f2..335e1ebe4d 100644
--- a/xabber/src/main/res/values-pl-rPL/contact_editor.xml
+++ b/xabber/src/main/res/values-pl-rPL/contact_editor.xml
@@ -17,12 +17,8 @@
   <string name="processing_image">Przetwarzam obrazek...</string>
   <string name="error_during_crop">Błąd podczas przycinania obrazu</string>
   <string name="error_during_image_processing">Błąd podczas przetwarzania obrazu</string>
-  <string name="account_settings">Ustawienia konta</string>
-  <string name="account_user_info">Informacje o koncie</string>
-  <string name="account_server_info">Informacje o serwerze</string>
+    <string name="account_server_info">Informacje o serwerze</string>
   <string name="account_server_info_description">Lista możliwości serwera</string>
   <string name="conference_private_chat_invitation">%1$s z %2$s chce rozpocząć prywatną rozmowę</string>
   <string name="accept_muc_private_chat">Zaakceptuj</string>
-  <string name="block_muc_private_chat">Zablokuj</string>
-  <string name="no_permission_camera">Brak uprawnień dostępu do kamery</string>
 </resources>
diff --git a/xabber/src/main/res/values-pl-rPL/contact_list.xml b/xabber/src/main/res/values-pl-rPL/contact_list.xml
index 5cf749bdc9..ab377a7db6 100644
--- a/xabber/src/main/res/values-pl-rPL/contact_list.xml
+++ b/xabber/src/main/res/values-pl-rPL/contact_list.xml
@@ -18,17 +18,13 @@
   <string name="application_state_roster">Połączono.</string>
   <string name="application_state_starting">Uruchamianie aplikacji...</string>
   <string name="application_state_waiting">Oczekiwanie na połączenie...</string>
-  <string name="chat_list">Lista rozmów</string>
-  <string name="chat_list_is_empty">Brak aktywnych rozmów</string>
-  <string name="chat_viewer">Rozmowa</string>
-  <string name="close_chat">Zamknij rozmowę</string>
-  <string name="CONNECTION_FAILED">Błąd połączenia</string>
+    <string name="chat_viewer">Rozmowa</string>
+    <string name="CONNECTION_FAILED">Błąd połączenia</string>
   <string name="contact_add">Dodaj kontakt</string>
   <string name="contact_delete">Usuń</string>
   <string name="contact_block">Zablokuj kontakt</string>
   <string name="contact_delete_confirm">Czy na pewno chcesz usunąć kontakt %1$s z konta %2$s?</string>
-  <string name="contact_list">Lista kontaktów</string>
-  <string name="discard_subscription">Odrzuć kontakt</string>
+    <string name="discard_subscription">Odrzuć kontakt</string>
   <string name="exit">Zamknij</string>
   <string name="group_active_chat">Aktywne rozmowy</string>
   <string name="group_none">Brak grup</string>
@@ -40,15 +36,7 @@
   <string name="request_subscription">Prośba o subskrypcję</string>
   <string name="XMPP_EXCEPTION">Błąd strumienia</string>
   <string name="application_state_closing">Trwa zapisywanie ustawień...\nAplikacja zostanie wkrótce zamknięta.</string>
-  <string name="certificate_confirmation">%1$s.\nCzy na pewno ufasz certyfikatowi z odciskiem palca SHA-1: %2$s? Czy nie chcesz być powiadamiany o tym problemie z tym certyfikatem?</string>
-  <string name="certificate_details">\n\nWydane dla:\nNazwa: %1$s\nOrganizacja: %2$s\nJednostka organizacyjna: %3$s\nNumer seryjny: %4$s\n\nWydane przez:\nNazwa: %5$s\nOrganizacja: %6$s\nJednostka organizacyjna: %7$s\n\nWażność:\nWydany: %8$s\nTraci ważność: %9$s.</string>
-  <string name="certificate_invalid_chane">Weryfikacja sygnatury nie powiodła się</string>
-  <string name="certificate_invalid_target">Weryfikacja celu nie powiodła się</string>
-  <string name="certificate_self_signed">Certyfikat podpisany przez siebie</string>
-  <string name="certificate_show_details">Szczegóły&#8230;</string>
-  <string name="close_chats">Zamknij wszystkie rozmowy</string>
-  <string name="contact_integration_suggest">Czy chcesz aby Xabber zintegrował się z systemowymi kontaktami?\nTo ustawienie możesz zmienić w menu Ustawienia → Konta XMPP → Twoje konta → Integracja z kontaktami</string>
-  <string name="group_room">Konferencje</string>
+    <string name="group_room">Konferencje</string>
   <string name="OTR_ERROR">Błąd OTR</string>
   <string name="select_contact">Kliknij, aby wybrać kontakt</string>
   <string name="show_offline_always">Pokaż kontakty niepołączone</string>
@@ -63,8 +51,7 @@
   <string name="block_list">Lista zablokowanych</string>
   <string name="contact_blocked_successfully">Kontakt zablokowany</string>
   <string name="error_blocking_contact">Błąd blokowania kontaktu</string>
-  <string name="unblock_contact">Odblokuj kontakt</string>
-  <string name="contacts_unblocked_successfully">Kontakty odblokowane pomyślnie</string>
+    <string name="contacts_unblocked_successfully">Kontakty odblokowane pomyślnie</string>
   <string name="error_unblocking_contacts">Błąd odblokowania kontaktów</string>
   <string name="block_contact_confirm">Czy na pewno chcesz zablokować kontakt %1$s z konta %2$s?</string>
   <string name="unblock_all_contacts_confirm">Czy na pewno chcesz odblokować wszystkie kontakty z konta %1$s?</string>
@@ -76,19 +63,10 @@
   <string name="dark_theme_suggest_dialog_stay_on_light_side">Pozostań na Jasnej Stronie</string>
   <string name="battery_optimization_disable_dialog_title">Optymalizacja baterii</string>
   <string name="battery_optimization_disable_dialog_message">Twoje urządzenie wykonuje intensywne optymalizacje baterii na Xabberze. Mogą one prowadzić do opóźnień w powiadomieniach, a nawet utraty wiadomości.\n\nZostaniesz teraz poproszony o ich wyłączenie.</string>
-  <string name="save_log_to_file">Zapisz do pliku</string>
-  <string name="clear_log">Usuń stare pliki dziennika</string>
+    <string name="clear_log">Usuń stare pliki dziennika</string>
   <string name="open_log_file">Otwórz</string>
   <string name="send_log_file">Wyślij</string>
-  <string name="intro_welcome">Witaj w Xabberze</string>
-  <string name="intro_xabber_description">Kliencie open source protokołu XMPP dla Androida</string>
-  <string name="intro_have_account">Zaloguj do konta XMPP</string>
-  <string name="intro_register_account">Zarejestruj konto XMPP</string>
-  <string name="intro_create_xabber_account">Użyj konta Xabber</string>
-  <string name="intro_use_third_party_accounts">użyj innych kont XMPP</string>
-  <string name="intro_faq">Jeśli nie masz konta XMPP, przeczytaj proszę <a href="https://www.xabber.com/faq/">nasze FAQ</a> jak je utworzyć.</string>
-  <string name="intro_web_search_register_xmpp">Zarejestruj konto XMPP</string>
-  <string name="synchronize_bookmarks">Synchronizuj zakładki</string>
+    <string name="synchronize_bookmarks">Synchronizuj zakładki</string>
   <string name="remove_all_bookmarks">Usuń wszystkie</string>
   <string name="remove_selected_bookmarks">Usuń zaznaczone</string>
   <string name="remove_all_bookmarks_confirm">Czy naprawdę chcesz usunąć wszystkie zakładki z konta %1$s?</string>
diff --git a/xabber/src/main/res/values-pl-rPL/contact_viewer.xml b/xabber/src/main/res/values-pl-rPL/contact_viewer.xml
index e3a45c5503..16cf0f07d1 100644
--- a/xabber/src/main/res/values-pl-rPL/contact_viewer.xml
+++ b/xabber/src/main/res/values-pl-rPL/contact_viewer.xml
@@ -17,12 +17,9 @@
   <string name="vcard_organization_unit">Organizacja</string>
   <string name="vcard_title">Praca, nazwa posady</string>
   <string name="vcard_role">Rola</string>
-  <string name="vcard_other">Inne informacje</string>
-  <string name="vcard_categories">Kategorie</string>
-  <string name="vcard_decsription">Opis</string>
+    <string name="vcard_decsription">Opis</string>
   <string name="vcard_note">Notatki</string>
-  <string name="vcard_address">Adres</string>
-  <string name="vcard_address_pobox">Kod pocztowy</string>
+    <string name="vcard_address_pobox">Kod pocztowy</string>
   <string name="vcard_address_extadr">Rozszerzony adres</string>
   <string name="vcard_address_street">Ulica</string>
   <string name="vcard_address_locality">Miejscowość</string>
diff --git a/xabber/src/main/res/values-pl-rPL/muc_editor.xml b/xabber/src/main/res/values-pl-rPL/muc_editor.xml
index c006844e16..4fd1318f10 100644
--- a/xabber/src/main/res/values-pl-rPL/muc_editor.xml
+++ b/xabber/src/main/res/values-pl-rPL/muc_editor.xml
@@ -20,12 +20,10 @@
   <string name="muc_invite_confirm">%2$s zaprosił cię do wzięcia udziału w konferencji %3$s. Dołączyć z konta %1$s?</string>
   <string name="muc_invite_confirm_reason">%2$s zaprosił cię do wzięcia udziału w konferencji %3$s: %4$s. Dołączyć z konta %1$s?</string>
   <string name="muc_leave">Wyjdź z konferencji</string>
-  <string name="muc_save">Zachowaj konferencję</string>
-  <string name="muc_choose_conference">Wybierz konferencję</string>
+    <string name="muc_choose_conference">Wybierz konferencję</string>
   <string name="muc_next">Dalej</string>
   <string name="muc_get_hosted_conferences">Pobierz konferencje</string>
   <string name="muc_error_getting_conferences">Błąd pobierania konferencji</string>
   <string name="muc_type_conference_name">Wpisz nazwę konferencji</string>
-  <string name="contact_is_blocked">Kontakt jest zablokowany!</string>
-  <string name="conference_invitation">Zaproszenie do konferencji</string>
+    <string name="conference_invitation">Zaproszenie do konferencji</string>
 </resources>
diff --git a/xabber/src/main/res/values-pl-rPL/notification_bar.xml b/xabber/src/main/res/values-pl-rPL/notification_bar.xml
index 57535446d6..b78148d6ce 100644
--- a/xabber/src/main/res/values-pl-rPL/notification_bar.xml
+++ b/xabber/src/main/res/values-pl-rPL/notification_bar.xml
@@ -34,10 +34,7 @@
   <!-- Used for plural form in russian. -->
   <string name="connection_state_waiting_5">-</string>
   <string name="connection_state_offline">%1$d %2$s niepołączone</string>
-  <string name="archive_available_request_message">Czy chciałbyś zapisywać historię wiadomości na serwerze?\nTo zezwala Xabberowi ładować historię rozmów z wszystkich urządzeń używających tego konta.\nTa funkcja może zwiększyć zużycie danych i lekko zredukować prędkość połączenia.\nUWAGA: Cała twoja lokalna historia zostanie usunięta.</string>
-  <string name="archive_available_request_title">Włączyć archiwum wiadomości?</string>
-  <string name="INVALID_CERTIFICATE">Nieprawidłowy certyfikat</string>
-  <string name="muc_invite_message">Czy chcesz dołączyć do konferencji?</string>
+    <string name="muc_invite_message">Czy chcesz dołączyć do konferencji?</string>
   <string name="otr_verification_in_progress">Kliknij tutaj, aby anulować.</string>
   <string name="PASSWORD_REQUIRED">Wymagane hasło</string>
   <string name="pay_attention">Zwróć uwagę</string>
diff --git a/xabber/src/main/res/values-pl-rPL/preference_editor.xml b/xabber/src/main/res/values-pl-rPL/preference_editor.xml
index c5fae57b9e..f289e0e24b 100644
--- a/xabber/src/main/res/values-pl-rPL/preference_editor.xml
+++ b/xabber/src/main/res/values-pl-rPL/preference_editor.xml
@@ -12,14 +12,11 @@
   <string name="contacts_order_alphabet">Alfabetyczna</string>
   <string name="contacts_order_status">Według statusu</string>
   <string name="contacts_show_accounts">Grupuj kontami\nGrupuj kontakty na liście kontaktów w ramach kont</string>
-  <string name="contacts_show_active_chats">Aktywne rozmowy na górze\nWyświetlaj aktywne rozmowy u góry listy kontaktów</string>
-  <string name="contacts_show_avatars">Pokazuj awatary\nPokazuj awatary użytkowników na liście kontaktów</string>
+    <string name="contacts_show_avatars">Pokazuj awatary\nPokazuj awatary użytkowników na liście kontaktów</string>
   <string name="contacts_show_empty_groups">Pokaż puste grupy\nPokaż grupy bez aktywnych kontaktów</string>
   <string name="contacts_show_groups">Pokazuj grupy\nPokazuj grupy na liście kontaktów</string>
   <string name="contacts_show_offline">Pokazuj niepołączone kontakty\nPokazuj niepołączone kontakty</string>
-  <string name="contacts_show_panel">Pokaż panel kont\nPokaż przyciski z avatarami w prawym dolnym rogu listy kontaktów</string>
-  <string name="contacts_stay_active_chats">Duplikuj aktywne rozmowy\nAktywne rozmowy będą się pojawiać na górze listy kontaktów i w grupach</string>
-  <string name="debug_log">Log debugowania\nWpisz wiadomość do logu debugowania (wymaga ponownego uruchomienia aplikacji)</string>
+    <string name="debug_log">Log debugowania\nWpisz wiadomość do logu debugowania (wymaga ponownego uruchomienia aplikacji)</string>
   <string name="debug_file_log_title">Zapisz plik dziennika\nZapisz plik dziennika debugowania do pliku lokalnego (można go udostępnić).</string>
   <string name="debug_log_files_title">Pliki dziennika\nLista zapisanych plików dziennika.</string>
   <string name="debug_log_files_activity_title">Pliki dziennika</string>
@@ -36,8 +33,7 @@
   <string name="interface_theme">Motyw</string>
   <string name="interface_theme_dark">Ciemna</string>
   <string name="interface_theme_light">Jasna</string>
-  <string name="interface_theme_normal">Domyślna</string>
-  <string name="interface_smiles">Emotikony</string>
+    <string name="interface_smiles">Emotikony</string>
   <string name="interface_smiles_android">Emotikony systemowe</string>
   <string name="interface_smiles_none">Bez emotikon</string>
   <string name="preference_connection">Ustawienia połączeń\nUstawienia połączeń</string>
@@ -62,8 +58,7 @@
   <string name="chats_font_size_xlarge">Ogromna</string>
   <string name="chats_hide_keyboard">Ukryj klawiaturę</string>
   <string name="chats_hide_keyboard_landscape">W trybie poziomym</string>
-  <string name="chats_receipt">Raport doręczenia\nWysyłaj i odbieraj raporty doręczenia wiadomości</string>
-  <string name="chats_show_avatars">Awatary w wiadomościach\nPokazuj awatary w każdej wiadomości</string>
+    <string name="chats_show_avatars">Awatary w wiadomościach\nPokazuj awatary w każdej wiadomości</string>
   <string name="chats_show_status_change">Pokaż zmiany statusu</string>
   <string name="chats_show_status_change_muc">W konferencjach</string>
   <string name="chats_state_notification">Wyślij powiadomienie o pisaniu\nPowiadamiaj innych o tym, że piszesz</string>
@@ -77,37 +72,24 @@
   <string name="contacts_reset_offline">Resetuj ustawienia offline\nWyczyść indywidualne ustawienia dla grup i kont</string>
   <string name="contacts_reset_offline_warning">Jesteś pewien, że chcesz wyczyścić indywidualne ustawienia dla grup i kont ?</string>
   <string name="events_first_only">Powiadamiaj o pierwszej wiadomości\nPowiadamiaj tylko o pierwszej wiadomości w rozmowie</string>
-  <string name="events_ignore_system_vibro">Ignoruj systemowe ustawienia wibracji\nUżyj tej opcji jeśli systemowa wibracja nie działa</string>
-  <string name="events_message">Ustawienia powiadomień\nUstawienia powiadomień o przychodzących wiadomościach</string>
-  <string name="events_message_chat">Tylko rozmowy</string>
-  <string name="events_message_chat_and_muc">Rozmowy i konferencje</string>
-  <string name="events_message_none">Nie powiadamiaj</string>
-  <string name="events_show_text">Podgląd wiadomości\nPokaż treść wiadomości chat w obszarze powiadomień</string>
+    <string name="events_show_text">Podgląd wiadomości\nPokaż treść wiadomości chat w obszarze powiadomień</string>
   <string name="events_show_text_muc">Podgląd wiadomości\nPokaż treść wiadomości z konferencji w obszarze powiadomień</string>
-  <string name="events_visible_chat">Powiadomienie w trakcie otwartej rozmowy\nPowiadom o przychodzących wiadomościach w aktywnych rozmowach</string>
-  <string name="events_suppress_100">Pomijanie niektórych zmian statusu\nZapobiega dostarczaniu wiadomości \"Ten pokój nie jest anonimowy\"</string>
+    <string name="events_suppress_100">Pomijanie niektórych zmian statusu\nZapobiega dostarczaniu wiadomości \"Ten pokój nie jest anonimowy\"</string>
   <string name="negative_priotiry_summary">%s (nie odebrałeś wiadomości z żadnego czatu)</string>
   <string name="preference_accounts">Konta xmpp\nZarządzaj kontami</string>
   <string name="preference_security">Zabezpieczenia\nUstawienia zabezpieczeń</string>
   <string name="security_check_certificate">Sprawdź certyfikat serwera\nPowiadamiaj o problemach z certyfikatem</string>
-  <string name="security_clear_certificate">Usuń certyfikaty\nWyczyść listę ignorowanych certyfikatów</string>
-  <string name="security_otr_history">Zapisuj historię\nZapisuj historię rozmów w sesjach OTR</string>
-  <string name="security_otr_mode">Tryb OTR</string>
+    <string name="security_otr_mode">Tryb OTR</string>
   <string name="chats_attention">Uwaga\nReaguj na prośby o uwagę</string>
   <string name="chats_attention_sound">Dźwięk uwagi\nWybierz dźwięk</string>
   <string name="connection_load_vcard">Wczytaj vCard\nWczytaj i uaktualnij dane personalne kontaktu i avatar. Wyłącz by zredukować zużycie danych.</string>
   <string name="connection_load_images">Załaduj obrazy\nZaładuj obrazy z URL automatycznie. Wyłącz żeby zmniejszyć zużycie danych.</string>
   <string name="connection_use_carbons">Tryb kopiowania\nNiestabilny! Udostępnianie sesji tego konta dla klienta. Może zwiększyć zużycie danych.</string>
-  <string name="connection_dns_resolver_type">Typ rozpoznawania nazw DNS</string>
-  <string name="connection_dns_resolver_type_dns_java_resolver">DNSJavaResolver</string>
+    <string name="connection_dns_resolver_type_dns_java_resolver">DNSJavaResolver</string>
   <string name="connection_dns_resolver_type_mini_dns_resolver">MiniDNSResolver (eksperymentalne)</string>
-  <string name="connection_use_plain_text_auth">Uwierzytelnienie czystym tekstem\nUżyj czystego tekstu uwierzytelnienie dla wszytkich kont. Nie zalecane.</string>
-  <string name="events_phrases">Słowa kluczowe\nUtwórz niestandardowe powiadomienia dla odebranych wiadomości zawierających słowa kluczowe</string>
-  <string name="security_clear_certificate_warning">Czy na pewno chcesz usunąć wszystkie ignorowane certyfikaty?</string>
-  <string name="account_error_settings">Ustawienia</string>
-  <string name="category_xabber_account">Konto Xabber</string>
-  <string name="category_xmpp_accounts">Konta XMPP</string>
-  <string name="category_interface">Interfejs</string>
+    <string name="events_phrases">Słowa kluczowe\nUtwórz niestandardowe powiadomienia dla odebranych wiadomości zawierających słowa kluczowe</string>
+    <string name="account_error_settings">Ustawienia</string>
+    <string name="category_interface">Interfejs</string>
   <string name="category_settings">Ustawienia</string>
   <string name="category_about">O programie</string>
   <string name="category_appearance">Wygląd</string>
diff --git a/xabber/src/main/res/values-pl-rPL/words.xml b/xabber/src/main/res/values-pl-rPL/words.xml
index 0758446671..ea2ac47c59 100644
--- a/xabber/src/main/res/values-pl-rPL/words.xml
+++ b/xabber/src/main/res/values-pl-rPL/words.xml
@@ -20,5 +20,4 @@
   <string name="settings">Ustawienia</string>
   <string name="ok">OK</string>
   <string name="login">Zaloguj się</string>
-  <string name="resume">Wznów</string>
 </resources>
diff --git a/xabber/src/main/res/values-pt-rBR/account_editor.xml b/xabber/src/main/res/values-pt-rBR/account_editor.xml
index aab6dfb60e..eeb3b57025 100644
--- a/xabber/src/main/res/values-pt-rBR/account_editor.xml
+++ b/xabber/src/main/res/values-pt-rBR/account_editor.xml
@@ -2,39 +2,24 @@
 <!--Generated by crowdin.com-->
 <resources>
   <string name="account_compression">Ativar compressão de dados</string>
-  <string name="account_enabled">Habilitado</string>
-  <string name="account_host">Host</string>
+    <string name="account_host">Host</string>
   <string name="account_password">Senha</string>
   <string name="confirm_password">Confirme a Senha</string>
   <string name="account_port">Porta</string>
   <string name="account_priority">Prioridade</string>
   <string name="account_resource">Recurso</string>
   <string name="account_server_name">Servidor</string>
-  <string name="account_type">Tipo de conta</string>
-  <string name="account_type_hints_gtalk">usuário do gmail.com ou domínio do Google Apps</string>
-  <string name="account_type_helps_gtalk">Se você não tiver conta Google,  você pode criar uma em https://accounts.google.com/SignUp você tambem pode usar \"user@your_google_domain\"</string>
-  <string name="account_type_helps_xmpp">Se você quer aprender mais sobre XMPP (Jabber) aqui: https://xmpp.org</string>
-  <string name="account_user_name">Nome de usuário</string>
+    <string name="account_user_name">Nome de usuário</string>
   <string name="EMPTY_SERVER_NAME">O nome do servidor não foi informado</string>
   <string name="EMPTY_USER_NAME">O usuário não foi informado</string>
   <string name="CONFIRM_PASSWORD">As senhas não conferem</string>
-  <string name="account_archive_mode">Armazenar histórico de mensagem</string>
-  <string name="account_archive_mode_available">No servidor se disponível</string>
-  <string name="account_archive_mode_dont_store">Não armazenar</string>
-  <string name="account_archive_mode_local">Localmente no dispositivo</string>
-  <string name="account_archive_mode_server">No servidor</string>
-  <string name="account_archive_mode_unread">Localmente apenas se não enviada e não lida</string>
-  <string name="account_compression_summary">Seleção para ativar a compactação de dados</string>
+    <string name="account_compression_summary">Seleção para ativar a compactação de dados</string>
   <string name="account_custom">Host personalizado</string>
   <string name="account_custom_summary">Usar configurações de host personalizado em vez de registro SRV</string>
-  <string name="account_enabled_summary">Ativar a conta</string>
-  <string name="account_invalid_port">A porta deve ser um número (padrão: 5222)</string>
+    <string name="account_invalid_port">A porta deve ser um número (padrão: 5222)</string>
   <string name="account_invalid_port_range">A porta deve ser um número entre 1 e 65535 (o padrão é: 5222)</string>
   <string name="account_invalid_priority">O valor da prioridade deve ser um número entre -128 e 127 (padrão: 10)</string>
-  <string name="account_oauth">Autorização</string>
-  <string name="account_oauth_invalidated">Não autorizado</string>
-  <string name="account_oauth_summary">Configuração de Autenticação</string>
-  <string name="account_proxy_host">Servidor proxy</string>
+    <string name="account_proxy_host">Servidor proxy</string>
   <string name="account_proxy_invalid_port_range">A porta de proxy deve ser um número entre 1 e 65535 (o padrão é: 8080)</string>
   <string name="account_proxy_invalid_port">A porta de proxy deve ser um número (o padrão é: 8080)</string>
   <string name="account_proxy_password">Senha do proxy</string>
@@ -46,18 +31,14 @@
   <string name="account_sasl_summary">Desabilitar para servidor muito antigo</string>
   <string name="account_store_password">Armazenar senha</string>
   <string name="account_store_password_summary">Desabilitar esta opção para solicitar a senha cada vez que você conectar</string>
-  <string name="account_syncable">Integração com os contatos do sistema</string>
-  <string name="account_syncable_summary">Exibir contatos desta conta na lista de contatos do telefone</string>
-  <string name="account_tls_enable">Habilitar TLS</string>
+    <string name="account_tls_enable">Habilitar TLS</string>
   <string name="account_tls_enable_summary">Use criptografia TLS quando possível para conectar ao servidor</string>
   <string name="account_tls_legacy">SSL legado</string>
   <string name="account_tls_legacy_summary">Use criptografia SSL legada quando conectar ao servidor</string>
   <string name="account_tls_mode">Usar TLS/SSL</string>
   <string name="account_tls_require">Requerer TLS</string>
   <string name="account_tls_require_summary">Requerer criptografia TLS quando conectar ao servidor</string>
-  <string name="account_use_orbot">Conversar via rede anônima TOR e forçar protocolo criptográfico TLS\nNão recomendado para Google Talk</string>
-  <string name="confirm_cancellation">Tem certeza de que deseja descartar todas as mudanças?</string>
-  <string name="INCORRECT_USER_NAME">Nome de usuário incorreto. Confira o texto de ajuda abaixo para obter detalhes.</string>
+    <string name="INCORRECT_USER_NAME">Nome de usuário incorreto. Confira o texto de ajuda abaixo para obter detalhes.</string>
   <string name="orbot_required_message">Para usar o TOR você deve possuir o Orbot instalado e ativado para tráfego de proxy nele. Você gostaria de instalá-lo pelo Google Play?</string>
   <string name="orbot_required_title">Instalar Orbot?</string>
   <string name="install_orbot">Instalar Orbot ?</string>
diff --git a/xabber/src/main/res/values-pt-rBR/chat_viewer.xml b/xabber/src/main/res/values-pt-rBR/chat_viewer.xml
index 5696dda498..c06e736714 100644
--- a/xabber/src/main/res/values-pt-rBR/chat_viewer.xml
+++ b/xabber/src/main/res/values-pt-rBR/chat_viewer.xml
@@ -18,8 +18,7 @@
   <string name="message_remove">Remover do histórico</string>
   <string name="message_repeat">Tente reenviar</string>
   <string name="save_history">Salvar histórico local\nArmazenar mensagem no histórico localmente</string>
-  <string name="show_history">Exibir histórico</string>
-  <string name="action_attention_called">Chamada de atenção foi enviada</string>
+    <string name="action_attention_called">Chamada de atenção foi enviada</string>
   <string name="action_attention_requested">Atenção solicitada</string>
   <string name="action_ban">%1$s foi banido</string>
   <string name="action_ban_by">%1$s foi banido por %2$s</string>
@@ -67,15 +66,12 @@
   <string name="otr_refresh">Reiniciar a criptografia</string>
   <string name="otr_request">Uma conversa privada Off-the-Record foi solicitada, mas você não tem suporte. Use o Pidgin, Gajim ou Adium para PC/Mac e Xabber ou ChatSecure para Android. Vá em http://otr.cypherpunks.ca/ para mais informações.</string>
   <string name="otr_start">Iniciar a criptografia</string>
-  <string name="otr_unencrypted_message">Esta mensagem não foi criptografada</string>
-  <string name="otr_unreadable_message">A mensagem criptografada que você enviou é ilegível</string>
+    <string name="otr_unreadable_message">A mensagem criptografada que você enviou é ilegível</string>
   <string name="otr_verification">Verificação de OTR</string>
   <string name="otr_verify_fingerprint">Verificar com impressão digital</string>
   <string name="otr_verify_question">Verificar com a pergunta</string>
   <string name="otr_verify_secret">Verificar com segredo partilhado</string>
-  <string name="under_construction">Em construção</string>
-  <string name="under_construction_message">Esta tela está em construção</string>
-  <string name="chat_events_show_text_global">Configurações gerais</string>
+    <string name="chat_events_show_text_global">Configurações gerais</string>
   <string name="chat_events_show_text_always">Mostrar mensagem de texto</string>
   <string name="chat_events_show_text_never">Esconder o texto da mensagem</string>
 </resources>
diff --git a/xabber/src/main/res/values-pt-rBR/contact_list.xml b/xabber/src/main/res/values-pt-rBR/contact_list.xml
index 314b81295b..42be7a9c7e 100644
--- a/xabber/src/main/res/values-pt-rBR/contact_list.xml
+++ b/xabber/src/main/res/values-pt-rBR/contact_list.xml
@@ -18,16 +18,12 @@
   <string name="application_state_roster">Conectado.</string>
   <string name="application_state_starting">Carregando aplicação... </string>
   <string name="application_state_waiting">Aguardando conexão...</string>
-  <string name="chat_list">Lista de conversas</string>
-  <string name="chat_list_is_empty">Nenhuma conversa aberta</string>
-  <string name="chat_viewer">Conversa</string>
-  <string name="close_chat">Fechar conversa</string>
-  <string name="CONNECTION_FAILED">Erro de conexão</string>
+    <string name="chat_viewer">Conversa</string>
+    <string name="CONNECTION_FAILED">Erro de conexão</string>
   <string name="contact_add">Adicionar contato</string>
   <string name="contact_delete">Apagar</string>
   <string name="contact_delete_confirm">Você realmente deseja apagar o contato %1$s da conta %2$s?</string>
-  <string name="contact_list">Lista de contatos</string>
-  <string name="discard_subscription">Recusar contato</string>
+    <string name="discard_subscription">Recusar contato</string>
   <string name="exit">Sair</string>
   <string name="group_active_chat">Conversas abertas</string>
   <string name="group_none">Sem grupos</string>
@@ -39,14 +35,7 @@
   <string name="request_subscription">Soliticitar autorização de inscrição</string>
   <string name="XMPP_EXCEPTION">Erro de fluxo de dados</string>
   <string name="application_state_closing">Salvando alterações...\nA aplicação será fechada em breve.</string>
-  <string name="certificate_details">\n\nExpedido para:\nNome Comum (CN): %1$s\nEmpresa (O): %2$s\nUnidade Organizacional (OU): %3$s\nNúmero de Série: %4$s\n\nExpedido por:\nNome Comum (CN): %5$s\nEmpresa (O): %6$s\nUnidade Organizacional (OU): %7$s\n\nValidade:\nExpedido em: %8$s\nVálido até: %9$s.</string>
-  <string name="certificate_invalid_chane">A verificação da cadeia de assinatura falhou</string>
-  <string name="certificate_invalid_target">Verificação de destino falhou</string>
-  <string name="certificate_self_signed">Certificado auto-assinado</string>
-  <string name="certificate_show_details">Detalhes...</string>
-  <string name="close_chats">Fechar todas as conversas</string>
-  <string name="contact_integration_suggest">Você deseja que o Xabber seja integrado aos seus contatos do sistema?\nIsso pode ser alterado em \"Configurações\" →\"Contas XMPP\" → Sua conta →\"Integração de contatos\"</string>
-  <string name="group_room">Conferências</string>
+    <string name="group_room">Conferências</string>
   <string name="OTR_ERROR">Erro no OTR</string>
   <string name="select_contact">Por favor clique para selecionar o contato</string>
   <string name="show_offline_always">Sempre exibir</string>
diff --git a/xabber/src/main/res/values-pt-rBR/contact_viewer.xml b/xabber/src/main/res/values-pt-rBR/contact_viewer.xml
index bb1ac5ecc4..5bf7a1f4da 100644
--- a/xabber/src/main/res/values-pt-rBR/contact_viewer.xml
+++ b/xabber/src/main/res/values-pt-rBR/contact_viewer.xml
@@ -15,12 +15,9 @@
   <string name="vcard_organization">Empresa</string>
   <string name="vcard_title">Função</string>
   <string name="vcard_role">Cargo</string>
-  <string name="vcard_other">Outras informações</string>
-  <string name="vcard_categories">Categorias</string>
-  <string name="vcard_decsription">Descrição</string>
+    <string name="vcard_decsription">Descrição</string>
   <string name="vcard_note">Notas</string>
-  <string name="vcard_address">Endereço</string>
-  <string name="vcard_address_pobox">Caixa postal</string>
+    <string name="vcard_address_pobox">Caixa postal</string>
   <string name="vcard_address_extadr">Endereço completo</string>
   <string name="vcard_address_street">Rua</string>
   <string name="vcard_address_locality">Cidade</string>
diff --git a/xabber/src/main/res/values-pt-rBR/muc_editor.xml b/xabber/src/main/res/values-pt-rBR/muc_editor.xml
index 0d3750b8cc..9c6c2b1270 100644
--- a/xabber/src/main/res/values-pt-rBR/muc_editor.xml
+++ b/xabber/src/main/res/values-pt-rBR/muc_editor.xml
@@ -20,7 +20,6 @@
   <string name="muc_invite_confirm">%2$s convidou você para entrar na conferência %3$s. Entrar pela conta %1$s?</string>
   <string name="muc_invite_confirm_reason">%2$s convidou você para entrar na conferência %3$s: %4$s. Entrar pela conta %1$s?</string>
   <string name="muc_leave">Sair da conferência</string>
-  <string name="muc_save">Salvar conferência</string>
-  <string name="muc_get_hosted_conferences">Baixar lista de conferências</string>
+    <string name="muc_get_hosted_conferences">Baixar lista de conferências</string>
   <string name="muc_error_getting_conferences">Erro ao baixar conferências</string>
 </resources>
diff --git a/xabber/src/main/res/values-pt-rBR/notification_bar.xml b/xabber/src/main/res/values-pt-rBR/notification_bar.xml
index 569c6d6cea..18c8245dde 100644
--- a/xabber/src/main/res/values-pt-rBR/notification_bar.xml
+++ b/xabber/src/main/res/values-pt-rBR/notification_bar.xml
@@ -34,10 +34,7 @@
   <!-- Used for plural form in russian. -->
   <string name="connection_state_waiting_5">-</string>
   <string name="connection_state_offline">%1$d %2$s desconectada(s)</string>
-  <string name="archive_available_request_message">Você deseja armazenar histórico de mensagem no servidor?\nHabilita o Xabber a carregar histórico de mensagem de todos os seus dispositivos usando esta conta.\nEstá funcionalidade tomará mais tráfego da sua rede e reduzirá a velocidade de sua conexão.\nATENÇÃO: Todo o seu histórico local será removido.</string>
-  <string name="archive_available_request_title">Ativar arquivamento de mensagem?</string>
-  <string name="INVALID_CERTIFICATE">Certificado inválido</string>
-  <string name="muc_invite_message">Você quer entrar na conferência?</string>
+    <string name="muc_invite_message">Você quer entrar na conferência?</string>
   <string name="otr_verification_in_progress">Clique aqui para abortar.</string>
   <string name="PASSWORD_REQUIRED">Senha obrigatória</string>
   <string name="pay_attention">Atenção</string>
diff --git a/xabber/src/main/res/values-pt-rBR/preference_editor.xml b/xabber/src/main/res/values-pt-rBR/preference_editor.xml
index ef853af20f..2e13c0f401 100644
--- a/xabber/src/main/res/values-pt-rBR/preference_editor.xml
+++ b/xabber/src/main/res/values-pt-rBR/preference_editor.xml
@@ -8,20 +8,16 @@
   <string name="contacts_order_alphabet">Alfabética</string>
   <string name="contacts_order_status">Por estado</string>
   <string name="contacts_show_accounts">Agrupar por conta\nAgrupa os contatos na lista de contatos por conta</string>
-  <string name="contacts_show_active_chats">Conversas ativas no topo\nMostra as conversas ativas no topo da lista de contatos</string>
-  <string name="contacts_show_avatars">Exibir avatares\nExibir os avatares dos usuários na lista de contatos</string>
+    <string name="contacts_show_avatars">Exibir avatares\nExibir os avatares dos usuários na lista de contatos</string>
   <string name="contacts_show_empty_groups">Mostrar grupos vazios\nExibir  grupos que nao tem contatos on-line</string>
   <string name="contacts_show_groups">Exibir grupos\nExibir grupos na lista de contatos</string>
   <string name="contacts_show_offline">Exibir contatos desconectados</string>
-  <string name="contacts_show_panel">Mostrar painel de conta\nMostra os avatares e ícones como botões de ação no canto inferior direito da lista de contatos</string>
-  <string name="contacts_stay_active_chats">Duplicar conversas ativas\nMostra as conversas ativas no topo da lista de contatos e nos grupos</string>
-  <string name="debug_log">Log de depuração\nEscrever mensagens para o log de depuração (reinicie a aplicação para aplicar esta mudança)</string>
+    <string name="debug_log">Log de depuração\nEscrever mensagens para o log de depuração (reinicie a aplicação para aplicar esta mudança)</string>
   <string name="events_lightning">Indicação luminosa\nPiscar LED na notificação</string>
   <string name="events_persistent">Ícone na barra de tarefas\nMostra uma notificação persistente. Esta opção previne que o Android deixe de usar a aplicação a partir da memória</string>
   <string name="interface_theme_dark">Escuro</string>
   <string name="interface_theme_light">Claro</string>
-  <string name="interface_theme_normal">Padrão</string>
-  <string name="interface_smiles_android">Emoticons do Android</string>
+    <string name="interface_smiles_android">Emoticons do Android</string>
   <string name="interface_smiles_none">Sem emoticons gráficos</string>
   <string name="preference_connection">Opções de conexão\nOpções de conexão</string>
   <string name="preference_contacts">Lista de contatos\nModifique a aparência da lista de contatos</string>
@@ -36,8 +32,7 @@
   <string name="chats_font_size_small">Pequena</string>
   <string name="chats_font_size_xlarge">Enorme</string>
   <string name="chats_hide_keyboard_landscape">Em modo paisagem</string>
-  <string name="chats_receipt">Avisos de entrega de mensagem\nEnviar e recebe avisos de entrega de mensagem</string>
-  <string name="chats_show_avatars">Avatares nas mensagens\nExibe avatares em cada mensagem</string>
+    <string name="chats_show_avatars">Avatares nas mensagens\nExibe avatares em cada mensagem</string>
   <string name="chats_show_status_change_muc">Em conferências</string>
   <string name="chats_state_notification">Mostrar notificação da escrita\nNotifica o interlocutor quando você está a escrever</string>
   <string name="connection_adjust_priority">Ajustar prioridades\nEstabelece as prioridades de acordo com o estado selecionado. A prioridade da conta será substituída.</string>
@@ -50,24 +45,15 @@
   <string name="contacts_reset_offline">Redefinir as configurações offline\nLimpar configurações individuais para grupos e contas</string>
   <string name="contacts_reset_offline_warning">Você deseja realmente limpar as configurações individuais para grupos e contas?</string>
   <string name="events_first_only">Alerta na primeira mensagem\nNotifica apenas quando recebe a primeira mensagem de uma conversa</string>
-  <string name="events_ignore_system_vibro">Ignorar opções de vibração do sistema\nUse esta opção se a vibração do sistema não funciona</string>
-  <string name="events_message">Definições de notificação\nConfigura as notificações para as mensagens recebidas</string>
-  <string name="events_message_chat">Apenas conversas</string>
-  <string name="events_message_chat_and_muc">Conversas e conferências</string>
-  <string name="events_message_none">Não avisar</string>
-  <string name="events_visible_chat">Notificação na conversa atual\nNotificar mensagens entregues na conversa atual</string>
-  <string name="events_suppress_100">Suprimir algumas mensagens de status\nNão receber a mensagem \'Essa sala não é anônima\"</string>
+    <string name="events_suppress_100">Suprimir algumas mensagens de status\nNão receber a mensagem \'Essa sala não é anônima\"</string>
   <string name="negative_priotiry_summary">%s (você não receberá mensagens de nenhuma conversa)</string>
   <string name="preference_accounts">Contas XMPP\nGerir contas</string>
   <string name="preference_security">Segurança\nConfigurações de segurança</string>
   <string name="security_check_certificate">Verifique o certificado do servidor\nNotificar quando houver problemas de certificado em conexões criptografadas</string>
-  <string name="security_clear_certificate">Apagar certificados\nApagar a lista dos certificados ignorados</string>
-  <string name="security_otr_history">Guardar histórico\nGuarda o histórico das conversas com a sessão encriptada</string>
-  <string name="security_otr_mode">Modo OTR</string>
+    <string name="security_otr_mode">Modo OTR</string>
   <string name="chats_attention">Pedidos de atenção\nNotificar os pedidos de atenção recebidos</string>
   <string name="chats_attention_sound">Som dos pedidos de atenção\nSelecione o som para os pedidos de atenção</string>
   <string name="connection_load_vcard">Carregar vCard\nCarrega e atualiza informação pessoa e o avatar. Disabilitar para reduzir o tráfego de rede.</string>
   <string name="connection_use_carbons">Modo partilhado / duplicar conta  cliente\nPode ser instável! Partilhará outras sessões abertas da mesma conta neste cliente. Desligar para reduzir o tráfego de rede.</string>
   <string name="events_phrases">Frases chave\nConfigura notificações para mensagens recebidas com as palavras ou frases especificadas</string>
-  <string name="security_clear_certificate_warning">Tem a certeza que deseja apagar todos os certificados ignorados?</string>
 </resources>
diff --git a/xabber/src/main/res/values-pt-rPT/account_editor.xml b/xabber/src/main/res/values-pt-rPT/account_editor.xml
index 70607b7c55..f3a72f9187 100644
--- a/xabber/src/main/res/values-pt-rPT/account_editor.xml
+++ b/xabber/src/main/res/values-pt-rPT/account_editor.xml
@@ -2,39 +2,24 @@
 <!--Generated by crowdin.com-->
 <resources>
   <string name="account_compression">Usar compressão</string>
-  <string name="account_enabled">Ativada</string>
-  <string name="account_host">Hospedeiro</string>
+    <string name="account_host">Hospedeiro</string>
   <string name="account_password">Senha</string>
   <string name="confirm_password">Contrassenha</string>
   <string name="account_port">Porta</string>
   <string name="account_priority">Prioridade</string>
   <string name="account_resource">Recurso</string>
   <string name="account_server_name">Servidor</string>
-  <string name="account_type">Tipo de conta</string>
-  <string name="account_type_hints_gtalk">nome de utilizador para gmail.com ou o domínio de Google Apps</string>
-  <string name="account_type_helps_gtalk">Se não tem uma conta Google, poderá criar uma em http://mail.google.com\nTambém pode usar o seu nome_de_utilizador@no_seu_dominio_google</string>
-  <string name="account_type_helps_xmpp">Se pretender saber mais sobre XMPP (Jabber) aqui: https://xmpp.org</string>
-  <string name="account_user_name">Nome de utilizador</string>
+    <string name="account_user_name">Nome de utilizador</string>
   <string name="EMPTY_SERVER_NAME">Nome do servidor não especificado</string>
   <string name="EMPTY_USER_NAME">Nome de utilizador não especificado</string>
   <string name="CONFIRM_PASSWORD">As senhas não coincidem</string>
-  <string name="account_archive_mode">Guardar histórico das mensagens</string>
-  <string name="account_archive_mode_available">Se disponível, no servidor</string>
-  <string name="account_archive_mode_dont_store">Não guardar</string>
-  <string name="account_archive_mode_local">Localmente, no dispositivo</string>
-  <string name="account_archive_mode_server">No servidor</string>
-  <string name="account_archive_mode_unread">Localmente, apenas as não enviadas e não lidas</string>
-  <string name="account_compression_summary">Selecione para ativar a compressão dos dados</string>
+    <string name="account_compression_summary">Selecione para ativar a compressão dos dados</string>
   <string name="account_custom">Hospedeiro personalizado</string>
   <string name="account_custom_summary">Usar definições de hospedeiro personalizado em vez de registo SRV</string>
-  <string name="account_enabled_summary">Mude para ativar a conta</string>
-  <string name="account_invalid_port">A porta deve ser um número (predefinição: 5222)</string>
+    <string name="account_invalid_port">A porta deve ser um número (predefinição: 5222)</string>
   <string name="account_invalid_port_range">A porta deve ser um número entre 1 e 65535 (predefinição: 5222)</string>
   <string name="account_invalid_priority">O valor da prioridade deve ser um número entre -128 e 127 (predefinição: 10)</string>
-  <string name="account_oauth">Autorização</string>
-  <string name="account_oauth_invalidated">Não autorizada</string>
-  <string name="account_oauth_summary">Definições OAuth</string>
-  <string name="account_proxy_host">Hospedeiro de Proxy</string>
+    <string name="account_proxy_host">Hospedeiro de Proxy</string>
   <string name="account_proxy_invalid_port_range">A porta do proxy deve ser um número entre 1 e 65535 (predefinição: 8080)</string>
   <string name="account_proxy_invalid_port">A porta do proxy deve ser um número (predefinição: 8080)</string>
   <string name="account_proxy_password">Senha do proxy</string>
@@ -46,18 +31,14 @@
   <string name="account_sasl_summary">Desativar para os servidores muito antigos</string>
   <string name="account_store_password">Guardar senha</string>
   <string name="account_store_password_summary">Desative esta opção para solicitar a senha de cada vez que for on-line</string>
-  <string name="account_syncable">Integrar com os contactos do sistema</string>
-  <string name="account_syncable_summary">Mostrar os contactos desta conta na lista de contactos do dispositivo</string>
-  <string name="account_tls_enable">Ativar TLS</string>
+    <string name="account_tls_enable">Ativar TLS</string>
   <string name="account_tls_enable_summary">Use a encriptação TLS quando possível, para ligar ao servidor</string>
   <string name="account_tls_legacy">SSL Legado</string>
   <string name="account_tls_legacy_summary">Usar a encriptação SSL legada quando ligar ao servidor</string>
   <string name="account_tls_mode">Usar TLS/SSL</string>
   <string name="account_tls_require">Requer TLS</string>
   <string name="account_tls_require_summary">Requer encriptação TLS quando liga ao servidor</string>
-  <string name="account_use_orbot">Conversar através da rede anónima TOR e forçar o protocolo de encriptação TLS\nNão é recomendado para Google Talk</string>
-  <string name="confirm_cancellation">Deseja ignorar todas as alterações?</string>
-  <string name="INCORRECT_USER_NAME">Nome de utilizador incorreto. Selecione em baixo o texto de ajuda para detalhes.</string>
+    <string name="INCORRECT_USER_NAME">Nome de utilizador incorreto. Selecione em baixo o texto de ajuda para detalhes.</string>
   <string name="orbot_required_message">Para poder processar usando o TOR, deve instalar o Orbot e ativar o tráfego de proxy. Gostaria de instalá-lo a partir do Google Play?</string>
   <string name="orbot_required_title">Instalar Orbot?</string>
   <string name="install_orbot">Instalar Orbot</string>
diff --git a/xabber/src/main/res/values-pt-rPT/chat_viewer.xml b/xabber/src/main/res/values-pt-rPT/chat_viewer.xml
index b9de200853..120ccabfd5 100644
--- a/xabber/src/main/res/values-pt-rPT/chat_viewer.xml
+++ b/xabber/src/main/res/values-pt-rPT/chat_viewer.xml
@@ -17,11 +17,8 @@
   <string name="message_quote">Citar</string>
   <string name="message_remove">Remover do histórico</string>
   <string name="message_repeat">Repetir envio</string>
-  <string name="message_open_file">Abrir</string>
-  <string name="message_save_file">Guardar</string>
-  <string name="save_history">Guardar histórico localmente\nGuardar o histórico de mensagens localmente</string>
-  <string name="show_history">Mostrar histórico</string>
-  <string name="action_attention_called">Chamada de atenção enviada</string>
+    <string name="save_history">Guardar histórico localmente\nGuardar o histórico de mensagens localmente</string>
+    <string name="action_attention_called">Chamada de atenção enviada</string>
   <string name="action_attention_requested">Atenção solicitada</string>
   <string name="action_ban">%1$s foi banido</string>
   <string name="action_ban_by">%1$s foi banido por %2$s</string>
@@ -69,26 +66,17 @@
   <string name="otr_refresh">Reiniciar encriptação</string>
   <string name="otr_request">Foi solicitada uma conversa privada \'Não Oficial\', mas não tem suporte para este plug-in de apoio. Use Adium, Gajim ou Pidgin para o PC/MAC e Xabber, Conversationsou ChatSecure para Android. Para mais informação vá a http://otr.cypherpunks.ca/.</string>
   <string name="otr_start">Iniciar encriptação</string>
-  <string name="otr_unencrypted_message">Esta mensagem não foi encriptada</string>
-  <string name="otr_unreadable_message">A mensagem encriptada enviada está ilegível</string>
+    <string name="otr_unreadable_message">A mensagem encriptada enviada está ilegível</string>
   <string name="otr_verification">Verificação OTR</string>
   <string name="otr_verify_fingerprint">Verificar com impressão digital</string>
   <string name="otr_verify_question">Verificar com pergunta</string>
   <string name="otr_verify_secret">Verificar com segredo partilhado</string>
-  <string name="under_construction">Em criação</string>
-  <string name="under_construction_message">Este ecrã está em construção</string>
-  <string name="chat_events_show_text_global">Usar definições globais</string>
+    <string name="chat_events_show_text_global">Usar definições globais</string>
   <string name="chat_events_show_text_always">Mostrar texto de mensagem</string>
   <string name="chat_events_show_text_never">Ocultar texto de mensagem</string>
-  <string name="sending_file">A enviar o ficheiro %s</string>
-  <string name="error_sending_file">Erro ao enviar o ficheiro %s</string>
-  <string name="no_application_to_open_file">Não foi encontrada nenhuma aplicação para abrir este ficheiro</string>
-  <string name="could_not_save_file">Não foi possível guardar o ficheiro</string>
-  <string name="file_saved_successfully">Ficheiro guardado com sucesso</string>
-  <string name="received_by">Recebida por %s</string>
-  <string name="could_not_get_path_to_file">Não foi possível obter o caminho para o ficheiro</string>
+    <string name="error_sending_file">Erro ao enviar o ficheiro %s</string>
+    <string name="could_not_get_path_to_file">Não foi possível obter o caminho para o ficheiro</string>
   <string name="message_open_private_chat">Abrir conversação privada</string>
-  <string name="http_file_upload_slot_error">Não foi possível enviar o ficheiro. Muito grande?</string>
-  <string name="no_permission_to_read_files">Sem permissão para ler ficheiros</string>
+    <string name="no_permission_to_read_files">Sem permissão para ler ficheiros</string>
   <string name="no_permission_to_write_files">Sem permissão para gravar ficheiros</string>
 </resources>
diff --git a/xabber/src/main/res/values-pt-rPT/contact_editor.xml b/xabber/src/main/res/values-pt-rPT/contact_editor.xml
index 971986bb83..3a34941d23 100644
--- a/xabber/src/main/res/values-pt-rPT/contact_editor.xml
+++ b/xabber/src/main/res/values-pt-rPT/contact_editor.xml
@@ -17,10 +17,6 @@
   <string name="processing_image">A processar a imagem...</string>
   <string name="error_during_crop">Erro durante o recorte da imagem</string>
   <string name="error_during_image_processing">Erro durante o processamento da imagem</string>
-  <string name="account_settings">Definições da conta</string>
-  <string name="account_user_info">Informação da conta</string>
-  <string name="conference_private_chat_invitation">%1$s de %2$s quer começar uma conversação privada consigo</string>
+    <string name="conference_private_chat_invitation">%1$s de %2$s quer começar uma conversação privada consigo</string>
   <string name="accept_muc_private_chat">Aceitar</string>
-  <string name="block_muc_private_chat">Bloquear</string>
-  <string name="no_permission_camera">Sem permissão para aceder à câmara</string>
 </resources>
diff --git a/xabber/src/main/res/values-pt-rPT/contact_list.xml b/xabber/src/main/res/values-pt-rPT/contact_list.xml
index d76ea89808..fb7e9c4c58 100644
--- a/xabber/src/main/res/values-pt-rPT/contact_list.xml
+++ b/xabber/src/main/res/values-pt-rPT/contact_list.xml
@@ -18,17 +18,13 @@
   <string name="application_state_roster">Ligado.</string>
   <string name="application_state_starting">A iniciar a aplicação&#8230;</string>
   <string name="application_state_waiting">A aguardar ligação&#8230;</string>
-  <string name="chat_list">Lista de conversações</string>
-  <string name="chat_list_is_empty">Nenhumas conversações ativas</string>
-  <string name="chat_viewer">Conversação</string>
-  <string name="close_chat">Fechar conversação</string>
-  <string name="CONNECTION_FAILED">Erro de ligação</string>
+    <string name="chat_viewer">Conversação</string>
+    <string name="CONNECTION_FAILED">Erro de ligação</string>
   <string name="contact_add">Adicionar contacto</string>
   <string name="contact_delete">Eliminar</string>
   <string name="contact_block">Bloquear contacto</string>
   <string name="contact_delete_confirm">Deseja eliminar o contacto %1$s da conta %2$s?</string>
-  <string name="contact_list">Lista de contactos</string>
-  <string name="discard_subscription">Declinar contacto</string>
+    <string name="discard_subscription">Declinar contacto</string>
   <string name="exit">Sair</string>
   <string name="group_active_chat">Conversações ativas</string>
   <string name="group_none">Sem grupos</string>
@@ -40,14 +36,7 @@
   <string name="request_subscription">Solicitar subscrição</string>
   <string name="XMPP_EXCEPTION">Erro na transmissão</string>
   <string name="application_state_closing">A guardar as alterações&#8230;\nA aplicação fechará em breve.</string>
-  <string name="certificate_details">\n\nEmitido para:\nNome Comum (CN): %1$s\nOrganização (O): %2$s\nUnidade Organizacional (OU): %3$s\nNúmero de Série: %4$s\n\nEmitido por:\nNome Comum (CN): %5$s\nOrganização (O): %6$s\nUnidade Organizacional (OU): %7$s\n\nValidade:\nEmitido em: %8$s\nExpira em: %9$s.</string>
-  <string name="certificate_invalid_chane">A verificação da cadeia de assinatura falhou</string>
-  <string name="certificate_invalid_target">A verificação de destino falhou</string>
-  <string name="certificate_self_signed">Certificado autoassinado</string>
-  <string name="certificate_show_details">Detalhes...</string>
-  <string name="close_chats">Fechar todas as conversações</string>
-  <string name="contact_integration_suggest">Deseja integrar a Xabber nos contactos do sistema?\nIsto pode ser alterado em \"Definições\" →\"Contas XMPP\" → A sua conta →\"Integração de contactos\".\nNota: A lista de contactos do sistema pode ficar mais lenta durante uns minutos.</string>
-  <string name="group_room">Conferências</string>
+    <string name="group_room">Conferências</string>
   <string name="OTR_ERROR">Erro do OTR</string>
   <string name="select_contact">Por favor, toque para selecionar o contacto</string>
   <string name="show_offline_always">Mostrar sempre</string>
@@ -62,8 +51,7 @@
   <string name="block_list">Lista de bloqueados</string>
   <string name="contact_blocked_successfully">Contacto bloqueado com sucesso</string>
   <string name="error_blocking_contact">Erro ao bloquear o contacto</string>
-  <string name="unblock_contact">Desbloquear contacto</string>
-  <string name="contacts_unblocked_successfully">Contactos desbloqueados com sucesso</string>
+    <string name="contacts_unblocked_successfully">Contactos desbloqueados com sucesso</string>
   <string name="error_unblocking_contacts">Erro ao desbloquear os contactos</string>
   <string name="block_contact_confirm">Deseja bloquear o contacto %1$s da conta %2$s?</string>
   <string name="unblock_all_contacts_confirm">Deseja desbloquear todos os contactos da conta %1$s?</string>
diff --git a/xabber/src/main/res/values-pt-rPT/contact_viewer.xml b/xabber/src/main/res/values-pt-rPT/contact_viewer.xml
index b8c0a2ed06..c423ad908f 100644
--- a/xabber/src/main/res/values-pt-rPT/contact_viewer.xml
+++ b/xabber/src/main/res/values-pt-rPT/contact_viewer.xml
@@ -16,12 +16,9 @@
   <string name="vcard_organization_unit">Unidade da organização</string>
   <string name="vcard_title">Título do trabalho, função</string>
   <string name="vcard_role">Função</string>
-  <string name="vcard_other">Outra informação</string>
-  <string name="vcard_categories">Categorias</string>
-  <string name="vcard_decsription">Descrição</string>
+    <string name="vcard_decsription">Descrição</string>
   <string name="vcard_note">Notas</string>
-  <string name="vcard_address">Morada</string>
-  <string name="vcard_address_pobox">Código postal</string>
+    <string name="vcard_address_pobox">Código postal</string>
   <string name="vcard_address_extadr">Morada completa</string>
   <string name="vcard_address_street">Rua</string>
   <string name="vcard_address_locality">Localidade</string>
diff --git a/xabber/src/main/res/values-pt-rPT/muc_editor.xml b/xabber/src/main/res/values-pt-rPT/muc_editor.xml
index 7736591a8f..32f4df5e8e 100644
--- a/xabber/src/main/res/values-pt-rPT/muc_editor.xml
+++ b/xabber/src/main/res/values-pt-rPT/muc_editor.xml
@@ -20,12 +20,10 @@
   <string name="muc_invite_confirm">%2$s convidou-o para juntar-se à conferência %3$s. Entrar com a conta %1$s?</string>
   <string name="muc_invite_confirm_reason">%2$s convidou-o para juntar-se À conferência %3$s: %4$s. Entrar com a conta %1$s?</string>
   <string name="muc_leave">Sair da conferência</string>
-  <string name="muc_save">Guardar conferência</string>
-  <string name="muc_choose_conference">Escolher conferência</string>
+    <string name="muc_choose_conference">Escolher conferência</string>
   <string name="muc_next">Seguinte</string>
   <string name="muc_get_hosted_conferences">Obter conferências hospedadas</string>
   <string name="muc_error_getting_conferences">Erro ao obter a lista de conferências</string>
   <string name="muc_type_conference_name">Escreva o nome da conferência</string>
-  <string name="contact_is_blocked">O contacto está bloqueado!</string>
-  <string name="conference_invitation">Convite de conferência</string>
+    <string name="conference_invitation">Convite de conferência</string>
 </resources>
diff --git a/xabber/src/main/res/values-pt-rPT/notification_bar.xml b/xabber/src/main/res/values-pt-rPT/notification_bar.xml
index ef2d0a789b..c636047b01 100644
--- a/xabber/src/main/res/values-pt-rPT/notification_bar.xml
+++ b/xabber/src/main/res/values-pt-rPT/notification_bar.xml
@@ -34,10 +34,7 @@
   <!-- Used for plural form in russian. -->
   <string name="connection_state_waiting_5">-</string>
   <string name="connection_state_offline">%1$d %2$s off-line</string>
-  <string name="archive_available_request_message">Deseja armazenar o histórico das mensagens no servidor?\nIsto permite que Xabber carregue o histórico das mensagens de todos os seus dispositivos que usam esta conta.\nEsta função usará mais tráfego adicional e reduzirá ligeiramente a velocidade da sua ligação.\nAVISO: será removido todo o histórico local.</string>
-  <string name="archive_available_request_title">Ativar o arquivo de mensagens?</string>
-  <string name="INVALID_CERTIFICATE">Certificado inválido</string>
-  <string name="muc_invite_message">Deseja entrar na conferência?</string>
+    <string name="muc_invite_message">Deseja entrar na conferência?</string>
   <string name="otr_verification_in_progress">Toque aqui para abortar.</string>
   <string name="PASSWORD_REQUIRED">Senha obrigatória</string>
   <string name="pay_attention">Prestar atenção</string>
diff --git a/xabber/src/main/res/values-pt-rPT/preference_editor.xml b/xabber/src/main/res/values-pt-rPT/preference_editor.xml
index 1a466408da..9bb60e03ff 100644
--- a/xabber/src/main/res/values-pt-rPT/preference_editor.xml
+++ b/xabber/src/main/res/values-pt-rPT/preference_editor.xml
@@ -8,21 +8,17 @@
   <string name="contacts_order_alphabet">Alfabeticamente</string>
   <string name="contacts_order_status">Por estado</string>
   <string name="contacts_show_accounts">Agrupar por conta\nAgrupa os contactos da lista de contactos por conta</string>
-  <string name="contacts_show_active_chats">Conversações ativas no topo\nExibe as conversações ativas no topo da lista de contactos</string>
-  <string name="contacts_show_avatars">Mostrar avatares\nMostra os avatares dos utilizadores na lista de contactos</string>
+    <string name="contacts_show_avatars">Mostrar avatares\nMostra os avatares dos utilizadores na lista de contactos</string>
   <string name="contacts_show_empty_groups">Mostrar grupos vazios\nMostra os grupos que não têm contactos on-line</string>
   <string name="contacts_show_groups">Mostrar grupos\nMostra os grupos na lista de contactos</string>
   <string name="contacts_show_offline">Mostrar contactos off-line</string>
-  <string name="contacts_show_panel">Mostrar painel de conta\nMostra os botões de ação com avatares no canto inferior direito da lista de contactos</string>
-  <string name="contacts_stay_active_chats">Duplicar conversações ativas\nMostra as conversações ativas no topo da lista de contactos e nos grupos</string>
-  <string name="debug_log">Registo de depuração\nGrava as mensagens no registo de depuração (por favor, reinicie a aplicação para aplicar as alterações)</string>
+    <string name="debug_log">Registo de depuração\nGrava as mensagens no registo de depuração (por favor, reinicie a aplicação para aplicar as alterações)</string>
   <string name="debug_connection_errors_title">Mostrar erros de ligação\nExibe as janelas de exceções de ligação</string>
   <string name="events_lightning">Luz de notificação\nPiscar o LED quando com notificação</string>
   <string name="events_persistent">Ícone na barra de tarefas\nMostra uma notificação persistente. Esta opção impede que o Android carregue a aplicação a partir da memória</string>
   <string name="interface_theme_dark">Escuro</string>
   <string name="interface_theme_light">Claro</string>
-  <string name="interface_theme_normal">Predefinição</string>
-  <string name="interface_smiles_android">Ícones de expressão de Android</string>
+    <string name="interface_smiles_android">Ícones de expressão de Android</string>
   <string name="interface_smiles_none">Sem ícones de expressão gráficos</string>
   <string name="preference_connection">Definições de ligação\nDefinições de ligação</string>
   <string name="preference_contacts">Lista de contactos\nPersonalize a a aparência da lista de contactos</string>
@@ -37,8 +33,7 @@
   <string name="chats_font_size_small">Pequena</string>
   <string name="chats_font_size_xlarge">Muito grande</string>
   <string name="chats_hide_keyboard_landscape">Na horizontal</string>
-  <string name="chats_receipt">Recibo da entrega de mensagem\nEnvia e recebe os recibos da entrega de mensagem</string>
-  <string name="chats_show_avatars">Avatares nas mensagens\nMostra os avatares em cada mensagem</string>
+    <string name="chats_show_avatars">Avatares nas mensagens\nMostra os avatares em cada mensagem</string>
   <string name="chats_show_status_change_muc">Em conferências</string>
   <string name="chats_state_notification">Enviar notificações de escrita\nNotifica o outro utilizador que está a escrever</string>
   <string name="connection_adjust_priority">Ajustar prioridades\nDefine a prioridade de acordo com o estado selecionado. A prioridade da conta será substituída.</string>
@@ -51,26 +46,16 @@
   <string name="contacts_reset_offline">Repor definições de off-line\nLimpe as definições individuais para os grupos e contas</string>
   <string name="contacts_reset_offline_warning">Deseja limpar as definições individuais para os grupos e contas?</string>
   <string name="events_first_only">Alertar na primeira mensagem\nSó notifica quando recebe a primeira mensagem numa conversação</string>
-  <string name="events_ignore_system_vibro">Ignorar as definições da vibração do sistema\nUse esta opção se a vibração do sistema não funcionar</string>
-  <string name="events_message">Definições de notificação\nConfigura as notificações da mensagem a receber</string>
-  <string name="events_message_chat">Apenas conversações</string>
-  <string name="events_message_chat_and_muc">Conversações e conferências</string>
-  <string name="events_message_none">Não notificar</string>
-  <string name="events_visible_chat">Notificar na conversa atual\nNotificar ao receber mensagens na conversação atual</string>
-  <string name="events_suppress_100">Suprimir algumas mensagens de estado\nNão receber mensagens \"Esta conferência não é anónima\"</string>
+    <string name="events_suppress_100">Suprimir algumas mensagens de estado\nNão receber mensagens \"Esta conferência não é anónima\"</string>
   <string name="negative_priotiry_summary">%s (não receberá mensagens de qualquer conversação)</string>
   <string name="preference_accounts">Contas XMPP\nGerir contas</string>
   <string name="preference_security">Segurança\nDefinições de Segurança</string>
   <string name="security_check_certificate">Verificar certificado do servidor\nNotifica para os problemas de certificado nas ligações encriptadas</string>
-  <string name="security_clear_certificate">Remover certificados\nLimpa a lista de certificados ignorados</string>
-  <string name="security_otr_history">Guardar histórico\nGuarde o histórico de conversação para as sessões OTR</string>
-  <string name="security_otr_mode">Modo OTR</string>
+    <string name="security_otr_mode">Modo OTR</string>
   <string name="chats_attention">Atenção\nNotifica para os pedidos de atenção a receber</string>
   <string name="chats_attention_sound">Som de chamadas de atenção\nEscolha o toque</string>
   <string name="connection_load_vcard">Carregar vCard\nCarrega e atualiza a informação pessoal de contacto e o avatar. Desative para reduzir a utilização de tráfego de rede.</string>
   <string name="connection_load_images">Carregar imagens\nCarregar automaticamente as imagens do URL do ficheiro. Desativar para reduzir o uso de tráfego.</string>
   <string name="connection_use_carbons">Modo papel químico\nPoderá ser instável! Irá partilhar as sessões para a mesma conta neste cliente. Desative para reduzir a utilização do tráfego de rede.</string>
-  <string name="connection_use_plain_text_auth">Autorização de texto simples\nUsar a autenticação de texto simples para todas as contas. Não recomendado.</string>
-  <string name="events_phrases">Frases chave\nConfigura as notificações personalizadas para as mensagens recebidas que contenham frases especificas</string>
-  <string name="security_clear_certificate_warning">Deseja remover todos os certificados ignorados?</string>
+    <string name="events_phrases">Frases chave\nConfigura as notificações personalizadas para as mensagens recebidas que contenham frases especificas</string>
 </resources>
diff --git a/xabber/src/main/res/values-ro-rRO/account_editor.xml b/xabber/src/main/res/values-ro-rRO/account_editor.xml
index a2f7b42890..e68c18f7c6 100644
--- a/xabber/src/main/res/values-ro-rRO/account_editor.xml
+++ b/xabber/src/main/res/values-ro-rRO/account_editor.xml
@@ -2,40 +2,25 @@
 <!--Generated by crowdin.com-->
 <resources>
   <string name="account_compression">Utilizare compresie</string>
-  <string name="account_enabled">Activ</string>
-  <string name="account_host">Gazdă</string>
+    <string name="account_host">Gazdă</string>
   <string name="account_password">Parolă</string>
   <string name="confirm_password">Confirmă parola</string>
   <string name="account_port">Port</string>
   <string name="account_priority">Prioritate</string>
   <string name="account_resource">Resursă</string>
   <string name="account_server_name">Server</string>
-  <string name="account_type">Tipul contului</string>
-  <string name="account_type_hints_gtalk">numele de utilizator pentru gmail.com sau domeniu Google Apps</string>
-  <string name="account_type_helps_gtalk">Dacă nu aveţi un cont Google, puteţi crea unul la http://mail.Google.com?hl=ro \nDeasemenea poţi folosi numele_de_utilizator@domeniul_tau_google</string>
-  <string name="account_xmpp_register_warning">Înainte de a te conecta prin Xabber, trebuie să <a href="http://www.google.com/#q=register an XMPP account">creezi un cont</a>!</string>
-  <string name="account_type_helps_xmpp">Dacă doriţi să aflaţi mai multe despre XMPP (Jabber) gasiţi aici: https://xmpp.org</string>
-  <string name="account_user_name">Nume de utilizator</string>
+    <string name="account_xmpp_register_warning">Înainte de a te conecta prin Xabber, trebuie să <a href="http://www.google.com/#q=register an XMPP account">creezi un cont</a>!</string>
+    <string name="account_user_name">Nume de utilizator</string>
   <string name="EMPTY_SERVER_NAME">Numele server-ului nu este specificat</string>
   <string name="EMPTY_USER_NAME">Numele de utilizator nu este specificat</string>
   <string name="CONFIRM_PASSWORD">Parolele nu coincid</string>
-  <string name="account_archive_mode">Salvează istoricul mesajelor</string>
-  <string name="account_archive_mode_available">Pe server, dacă acesta suportă</string>
-  <string name="account_archive_mode_dont_store">Nu salva</string>
-  <string name="account_archive_mode_local">Local pe dispozitiv</string>
-  <string name="account_archive_mode_server">Pe server</string>
-  <string name="account_archive_mode_unread">Local, numai pe cele netrimise şi necitite</string>
-  <string name="account_compression_summary">Bifaţi pentru a permite comprimarea datelor</string>
+    <string name="account_compression_summary">Bifaţi pentru a permite comprimarea datelor</string>
   <string name="account_custom">Personalizează domeniul sau adresa</string>
   <string name="account_custom_summary">Utilizaţi setările personalizate de domeniu sau adresă în loc de înregistrările din SRV</string>
-  <string name="account_enabled_summary">Glisaţi pentru activarea contului</string>
-  <string name="account_invalid_port">Portul trebuie să fie un număr (implicit: 5222)</string>
+    <string name="account_invalid_port">Portul trebuie să fie un număr (implicit: 5222)</string>
   <string name="account_invalid_port_range">Portul trebuie să fie între 1 și 65535 (implicit: 5222)</string>
   <string name="account_invalid_priority">Valoarea priorităţii trebuie să fie un număr între -128 şi 127 (implicit: 0)</string>
-  <string name="account_oauth">Autorizare</string>
-  <string name="account_oauth_invalidated">Nu sunteți autorizat</string>
-  <string name="account_oauth_summary">Setări OAuth</string>
-  <string name="account_proxy_host">Domeniul sau adresa proxy-ului</string>
+    <string name="account_proxy_host">Domeniul sau adresa proxy-ului</string>
   <string name="account_proxy_invalid_port_range">Numărul proxy-ului trebuie să fie între 1 și 65535 (implicit: 8080)</string>
   <string name="account_proxy_invalid_port">Portul pentru proxy trebuie să fie un număr (implicit: 8080)</string>
   <string name="account_proxy_password">Parolă proxy</string>
@@ -47,18 +32,14 @@
   <string name="account_sasl_summary">Debifaţi pentru un server foarte vechi</string>
   <string name="account_store_password">Salvează parola</string>
   <string name="account_store_password_summary">Debifează această opţiune pentru a solicita parola la fiecare conectare iniţială</string>
-  <string name="account_syncable">Integrarează cu contactele din telefon</string>
-  <string name="account_syncable_summary">Arată contactele acestui cont în lista de contacte a telefonului</string>
-  <string name="account_tls_enable">Permite TLS</string>
+    <string name="account_tls_enable">Permite TLS</string>
   <string name="account_tls_enable_summary">Utilizaţi criptarea TLS atunci când este posibil pentru a te conecta la server</string>
   <string name="account_tls_legacy">Permite SSL (Legacy)</string>
   <string name="account_tls_legacy_summary">Utilizaţi criptarea SSL (legacy) când eşti conectat la server</string>
   <string name="account_tls_mode">Utilizare TLS/SSL</string>
   <string name="account_tls_require">Necesită TLS</string>
   <string name="account_tls_require_summary">Solicită criptarea TLS când eşti conectat la server</string>
-  <string name="account_use_orbot">Conversaţie prin TOR, reţeaua de anonimat, şi forţează protocolul de criptare TLS\nNu se recomandă pentru Google Talk</string>
-  <string name="confirm_cancellation">Eşti sigur ca vrei să renunți la toate modificările?</string>
-  <string name="INCORRECT_USER_NAME">Nume de utilizator incorect. Verificaţi indicaţiile de mai jos pentru detalii.</string>
+    <string name="INCORRECT_USER_NAME">Nume de utilizator incorect. Verificaţi indicaţiile de mai jos pentru detalii.</string>
   <string name="orbot_required_message">Pentru a continua folosind TOR, trebuie să aveţi Orbot instalat şi să activaţi traficul prin proxy-ul acestuia. Doriţi să-l instalaţi de pe Google Play?</string>
   <string name="orbot_required_title">Instalez Orbot?</string>
   <string name="install_orbot">Instalează Orbot</string>
diff --git a/xabber/src/main/res/values-ro-rRO/chat_viewer.xml b/xabber/src/main/res/values-ro-rRO/chat_viewer.xml
index aa1b72c247..3a66054dd8 100644
--- a/xabber/src/main/res/values-ro-rRO/chat_viewer.xml
+++ b/xabber/src/main/res/values-ro-rRO/chat_viewer.xml
@@ -21,11 +21,8 @@
   <string name="message_remove">Ștergeți din istoric</string>
   <string name="message_repeat">Reîncearcă trimiterea</string>
   <string name="message_otr_show_original">Arată mesaj</string>
-  <string name="message_open_file">Deschide</string>
-  <string name="message_save_file">Salvează</string>
-  <string name="save_history">Salveaza Istoricul de mesaje history\nPastreaza mesajele la nivel local</string>
-  <string name="show_history">Arătați istoricul</string>
-  <string name="action_attention_called">Alertă trimisă</string>
+    <string name="save_history">Salveaza Istoricul de mesaje history\nPastreaza mesajele la nivel local</string>
+    <string name="action_attention_called">Alertă trimisă</string>
   <string name="action_attention_requested">Alertă primită</string>
   <string name="action_ban">%1$s a fost banat</string>
   <string name="action_ban_by">%1$s a fost banat de %2$s</string>
@@ -73,8 +70,7 @@
   <string name="otr_refresh">Reinițiază encripție</string>
   <string name="otr_request">Encripția OTR a fost solicitată însă nu există niciun plugin să o suporte. Utilizați Pidgin, Gajim, Adium pentru PC/Mac și Xabber sau ChatSecure pentru Android. Accesați adresa http://otr.cypherpunks.ca/ pentru informații suplimentare.</string>
   <string name="otr_start">Activează encripție</string>
-  <string name="otr_unencrypted_message">Mesajul nu a fost encriptat</string>
-  <string name="otr_unreadable_message">Mesajul encriptat trimis nu este valabil</string>
+    <string name="otr_unreadable_message">Mesajul encriptat trimis nu este valabil</string>
   <string name="otr_not_decrypted_message">Mesajul nu poate fi decriptat</string>
   <string name="otr_verification">Verificare OTR</string>
   <string name="otr_verify_fingerprint">Verificare prin fingerprint</string>
@@ -84,21 +80,13 @@
   <string name="otr_verification_progress_title">Verificare în curs a cererii OTR</string>
   <string name="otr_verification_notify_button">Deschide</string>
   <string name="otr_verification_notify_button_cancel">Revocă</string>
-  <string name="under_construction">În construcție</string>
-  <string name="under_construction_message">Afișaj în construcție</string>
-  <string name="chat_events_show_text_global">Utilizare setări globale</string>
+    <string name="chat_events_show_text_global">Utilizare setări globale</string>
   <string name="chat_events_show_text_always">Afișare mesaje text</string>
   <string name="chat_events_show_text_never">Ascunde conținut mesaj</string>
-  <string name="sending_file">Se trimite %s</string>
-  <string name="error_sending_file">Eroare trimitere %s</string>
-  <string name="no_application_to_open_file">Nicio aplicație disponibilă pentru deschiderea acestui tip de fișier</string>
-  <string name="could_not_save_file">Nu am putut salva fișierul</string>
-  <string name="file_saved_successfully">Fișier salvat</string>
-  <string name="received_by">Recepționat de %s</string>
-  <string name="could_not_get_path_to_file">Imposibil de obținut cale fișier</string>
+    <string name="error_sending_file">Eroare trimitere %s</string>
+    <string name="could_not_get_path_to_file">Imposibil de obținut cale fișier</string>
   <string name="message_open_private_chat">Deschide conversație privată</string>
-  <string name="http_file_upload_slot_error">Fișierul nu a fost încărcat. Dimensiune prea mare?</string>
-  <string name="no_permission_to_read_files">Citirea de fișiere nu a fost permisă</string>
+    <string name="no_permission_to_read_files">Citirea de fișiere nu a fost permisă</string>
   <string name="no_permission_to_write_files">Scriere fișiere nepermisă</string>
   <string name="error_description_title">Descrierea erorii:</string>
   <string name="message_status_sent">Trimis</string>
diff --git a/xabber/src/main/res/values-ro-rRO/contact_editor.xml b/xabber/src/main/res/values-ro-rRO/contact_editor.xml
index fe2495e203..9914edee02 100644
--- a/xabber/src/main/res/values-ro-rRO/contact_editor.xml
+++ b/xabber/src/main/res/values-ro-rRO/contact_editor.xml
@@ -17,12 +17,8 @@
   <string name="processing_image">Procesare imagine&#8230;</string>
   <string name="error_during_crop">Eroare decupare imagine</string>
   <string name="error_during_image_processing">Eroare în timpul procesării</string>
-  <string name="account_settings">Setări cont</string>
-  <string name="account_user_info">Informații cont</string>
-  <string name="account_server_info">Informații server</string>
+    <string name="account_server_info">Informații server</string>
   <string name="account_server_info_description">Afișare opțiuni server</string>
   <string name="conference_private_chat_invitation">%1$s de la %2$s dorește inițierea unei conversații private cu tine</string>
   <string name="accept_muc_private_chat">Acceptă</string>
-  <string name="block_muc_private_chat">Blochează</string>
-  <string name="no_permission_camera">Accesul la cameră nu a fost permis</string>
 </resources>
diff --git a/xabber/src/main/res/values-ro-rRO/contact_list.xml b/xabber/src/main/res/values-ro-rRO/contact_list.xml
index c8449f86eb..fa8383d27d 100644
--- a/xabber/src/main/res/values-ro-rRO/contact_list.xml
+++ b/xabber/src/main/res/values-ro-rRO/contact_list.xml
@@ -18,17 +18,13 @@
   <string name="application_state_roster">Conectat.</string>
   <string name="application_state_starting">Lansare aplicaţie&#8230;</string>
   <string name="application_state_waiting">Se așteaptă conexiunea la rețea&#8230;</string>
-  <string name="chat_list">Listă chat</string>
-  <string name="chat_list_is_empty">Nicio conversație activă</string>
-  <string name="chat_viewer">Conversație</string>
-  <string name="close_chat">Închidere conversație</string>
-  <string name="CONNECTION_FAILED">Eroare de conexiune</string>
+    <string name="chat_viewer">Conversație</string>
+    <string name="CONNECTION_FAILED">Eroare de conexiune</string>
   <string name="contact_add">Adăugare contact</string>
   <string name="contact_delete">Ștergeți</string>
   <string name="contact_block">Blochează contact</string>
   <string name="contact_delete_confirm">Doriți ștergera contacutlui %1$s din contul %2$s?</string>
-  <string name="contact_list">Listă contacte</string>
-  <string name="discard_subscription">Declină</string>
+    <string name="discard_subscription">Declină</string>
   <string name="exit">Ieșire</string>
   <string name="group_active_chat">Conversații active</string>
   <string name="group_none">Nu există grupuri</string>
@@ -40,14 +36,7 @@
   <string name="request_subscription">Abonare</string>
   <string name="XMPP_EXCEPTION">Eroare Stream</string>
   <string name="application_state_closing">Salvare modificări&#8230;\nAplicația se va închide.</string>
-  <string name="certificate_details">\n\nIssued to:\nCommon Name (CN): %1$s\nOrganization (O): %2$s\nOrganizational Unit (OU): %3$s\nSerial Number: %4$s\n\nIssued by:\nCommon Name (CN): %5$s\nOrganization (O): %6$s\nOrganizational Unit (OU): %7$s\n\nValidity:\nIssued on: %8$s\nExpires on: %9$s.</string>
-  <string name="certificate_invalid_chane">Verificarea lanțului de semnături a eșuat</string>
-  <string name="certificate_invalid_target">Verificare eșuată</string>
-  <string name="certificate_self_signed">Certificat auto-semnat</string>
-  <string name="certificate_show_details">Detalii&#8230;</string>
-  <string name="close_chats">Închideți toate conversațiile</string>
-  <string name="contact_integration_suggest">Doriți ca Xabber să fie integrat în lista de contacte?\nPuteți schimba opțiunea în \"Setări\" → \"Conturi XMPP\" → \"Cont curent\" → \"Integrare contacte\".\n PS: Lista de contacte va fi încetinită pentru câteva minute.</string>
-  <string name="group_room">Conferințe</string>
+    <string name="group_room">Conferințe</string>
   <string name="OTR_ERROR">Eroare OTR</string>
   <string name="select_contact">Click pentru a selecta contactul</string>
   <string name="show_offline_always">Arată mereu</string>
@@ -62,8 +51,7 @@
   <string name="block_list">Contacte blocate</string>
   <string name="contact_blocked_successfully">Contact blocat cu succes</string>
   <string name="error_blocking_contact">Eroare blocare contact</string>
-  <string name="unblock_contact">Deblochează contact</string>
-  <string name="contacts_unblocked_successfully">Contact deblocat cu succes</string>
+    <string name="contacts_unblocked_successfully">Contact deblocat cu succes</string>
   <string name="error_unblocking_contacts">Eroare deblocare contacte</string>
   <string name="block_contact_confirm">Chiar vrei să blocheze %1$s din contul %2$s?</string>
   <string name="unblock_all_contacts_confirm">Chiar vrei să debloca toate contactele din contul %1$s?</string>
@@ -75,16 +63,10 @@
   <string name="dark_theme_suggest_dialog_stay_on_light_side">Deschis</string>
   <string name="battery_optimization_disable_dialog_title">Optimizare baterie</string>
   <string name="battery_optimization_disable_dialog_message">Dispozitivul dumneavoastră utiizează optimizări pentru conservarea bateriei, care poate rezulta în notificări neafișate sau mesaje nerecepționate.\n\nVa trebui să dezactivați aceste optimizări.</string>
-  <string name="save_log_to_file">Salvare în fișier</string>
-  <string name="clear_log">Ştergeţi fişierele de jurnal vechi</string>
+    <string name="clear_log">Ştergeţi fişierele de jurnal vechi</string>
   <string name="open_log_file">Deschideţi</string>
   <string name="send_log_file">Trimiteţi</string>
-  <string name="intro_welcome">Bine ati venit la Xabber</string>
-  <string name="intro_xabber_description">Client XMPP open source pentru Android</string>
-  <string name="intro_register_account">Inregistreaza cont XMPP</string>
-  <string name="intro_faq">Dacă nu aveţi un cont XMPP, vă rugăm să <a href="https://www.xabber.com/faq/"> Citiţi Întrebările noastre frecvente</a> despre cum să obţineţi unul.</string>
-  <string name="intro_web_search_register_xmpp">Inregistreaza cont XMPP</string>
-  <string name="remove_all_bookmarks">Ștergele pe toate</string>
+    <string name="remove_all_bookmarks">Ștergele pe toate</string>
   <string name="remove_selected_bookmarks">Șterge ce am selectat</string>
   <string name="remove_all_bookmarks_confirm">Ești sigur că vrei să ștergi toate semnele de carte din contul %1$s?</string>
   <string name="remove_selected_bookmarks_confirm">Ești sigur că vrei să ștergi semnele de carte selectate din contul %1$s?</string>
diff --git a/xabber/src/main/res/values-ro-rRO/contact_viewer.xml b/xabber/src/main/res/values-ro-rRO/contact_viewer.xml
index 16c44dfbfd..4be4d6365c 100644
--- a/xabber/src/main/res/values-ro-rRO/contact_viewer.xml
+++ b/xabber/src/main/res/values-ro-rRO/contact_viewer.xml
@@ -17,12 +17,9 @@
   <string name="vcard_organization_unit">Suborganizație</string>
   <string name="vcard_title">Ocupație/Funcție</string>
   <string name="vcard_role">Rol</string>
-  <string name="vcard_other">Alte informații</string>
-  <string name="vcard_categories">Categorii</string>
-  <string name="vcard_decsription">Descriere</string>
+    <string name="vcard_decsription">Descriere</string>
   <string name="vcard_note">Note</string>
-  <string name="vcard_address">Adresă</string>
-  <string name="vcard_address_pobox">Casuță poștală</string>
+    <string name="vcard_address_pobox">Casuță poștală</string>
   <string name="vcard_address_extadr">Adresă adițională</string>
   <string name="vcard_address_street">Stradă</string>
   <string name="vcard_address_locality">Localitate</string>
diff --git a/xabber/src/main/res/values-ro-rRO/muc_editor.xml b/xabber/src/main/res/values-ro-rRO/muc_editor.xml
index 7bf6c147a7..dc5b0875bb 100644
--- a/xabber/src/main/res/values-ro-rRO/muc_editor.xml
+++ b/xabber/src/main/res/values-ro-rRO/muc_editor.xml
@@ -20,12 +20,10 @@
   <string name="muc_invite_confirm">%2$s te-a invitat în conferința %3$s. Doriți să o accesați utilizând contul %1$s?</string>
   <string name="muc_invite_confirm_reason">%2$s te-a invitat în conferința %3$s: %4$s. Doriți să o accesați utilizând contul %1$s?</string>
   <string name="muc_leave">Părăsește conferința</string>
-  <string name="muc_save">Salvare conferință</string>
-  <string name="muc_choose_conference">Selectare conferință</string>
+    <string name="muc_choose_conference">Selectare conferință</string>
   <string name="muc_next">Continuare</string>
   <string name="muc_get_hosted_conferences">Obține conferințe existente</string>
   <string name="muc_error_getting_conferences">Eroare obținere conferințe</string>
   <string name="muc_type_conference_name">Introdu nume conferiță</string>
-  <string name="contact_is_blocked">Contact blocat!</string>
-  <string name="conference_invitation">Invitație în conferință</string>
+    <string name="conference_invitation">Invitație în conferință</string>
 </resources>
diff --git a/xabber/src/main/res/values-ro-rRO/notification_bar.xml b/xabber/src/main/res/values-ro-rRO/notification_bar.xml
index 79f6915b3b..35b0155f29 100644
--- a/xabber/src/main/res/values-ro-rRO/notification_bar.xml
+++ b/xabber/src/main/res/values-ro-rRO/notification_bar.xml
@@ -34,10 +34,7 @@
   <!-- Used for plural form in russian. -->
   <string name="connection_state_waiting_5">-</string>
   <string name="connection_state_offline">%1$d %2$s offline</string>
-  <string name="archive_available_request_message">Doriți salvarea istoricului conversațiilor pe server?\nAceastă opțiune pemite accesarea istoricului de pe toate dispozitivele care utilizează contul, cu costul unui trafic de date adițional și reducerea vitezei conexiunii. ATENȚIE: Tot istoricul local va fi șters.</string>
-  <string name="archive_available_request_title">Activați arhivarea mesajelor?</string>
-  <string name="INVALID_CERTIFICATE">Certificat invalid</string>
-  <string name="muc_invite_message">Doriți să intrați în conferință?</string>
+    <string name="muc_invite_message">Doriți să intrați în conferință?</string>
   <string name="otr_verification_in_progress">Click aici pentru anulare.</string>
   <string name="PASSWORD_REQUIRED">Parolă necesară</string>
   <string name="pay_attention">Atenție</string>
diff --git a/xabber/src/main/res/values-ro-rRO/preference_editor.xml b/xabber/src/main/res/values-ro-rRO/preference_editor.xml
index 32c519f0b1..eae0b5f38e 100644
--- a/xabber/src/main/res/values-ro-rRO/preference_editor.xml
+++ b/xabber/src/main/res/values-ro-rRO/preference_editor.xml
@@ -8,14 +8,11 @@
   <string name="contacts_order_alphabet">Alfabetic</string>
   <string name="contacts_order_status">După status</string>
   <string name="contacts_show_accounts">Grupare după cont\nGrupare contecte în listă în funcție de cont</string>
-  <string name="contacts_show_active_chats">Conversații active evidențiate\nAfișează contactele online în topul listei</string>
-  <string name="contacts_show_avatars">Afișează avatar\nAfișează poza de profil a utilizatorilor în lista de contacte</string>
+    <string name="contacts_show_avatars">Afișează avatar\nAfișează poza de profil a utilizatorilor în lista de contacte</string>
   <string name="contacts_show_empty_groups">Afișează grupuri nepopulate\nAfișează grupurile fără contace online</string>
   <string name="contacts_show_groups">Afișare grupuri\nAfișare grupui în lista de contacte</string>
   <string name="contacts_show_offline">Arată contactele offline</string>
-  <string name="contacts_show_panel">Afișează panou contacte\nAfișează butoane cu avatare în colțul din dreapta jos a listei de contacte</string>
-  <string name="contacts_stay_active_chats">Conversații duplicate\nConversațiile active sunt afișate atât în lista de contacte cât și în grupuri</string>
-  <string name="debug_log">Logare dezvoltator\nSalvează mesajele destinate dezvoltatorilor (necesită restartarea aplicației)</string>
+    <string name="debug_log">Logare dezvoltator\nSalvează mesajele destinate dezvoltatorilor (necesită restartarea aplicației)</string>
   <string name="debug_file_log_title">Salvare jurnal\nScrie jurnal într-un fișier local (poate fi partajat).</string>
   <string name="debug_log_files_title">Fișiere log\nListă cu fișiere de tip jurnal.</string>
   <string name="debug_log_files_activity_title">Fișiere jurnal</string>
@@ -28,8 +25,7 @@
   <string name="events_persistent">Icon notificare\nArată notificare persistentă. Această opțiune previne închiderea aplicației de către sistem</string>
   <string name="interface_theme_dark">Întunecat</string>
   <string name="interface_theme_light">Luminos</string>
-  <string name="interface_theme_normal">Implicit</string>
-  <string name="interface_smiles_android">Emoticoane ale sistemului Android</string>
+    <string name="interface_smiles_android">Emoticoane ale sistemului Android</string>
   <string name="interface_smiles_none">Fără emoticoane</string>
   <string name="preference_connection">Conexiune\nSetări conexiune</string>
   <string name="preference_contacts">Listă contacte\nCustomizează lista de contacte</string>
@@ -49,8 +45,7 @@
   <string name="chats_font_size_small">Mic</string>
   <string name="chats_font_size_xlarge">Foarte mare</string>
   <string name="chats_hide_keyboard_landscape">În mod peisaj</string>
-  <string name="chats_receipt">Notificări livrare\nTrimite și primește confirmări de livrare a mesajelor</string>
-  <string name="chats_show_avatars">Avatar în mesaje\nArată avatar în fiecare mesaj</string>
+    <string name="chats_show_avatars">Avatar în mesaje\nArată avatar în fiecare mesaj</string>
   <string name="chats_show_status_change_muc">În conferințe</string>
   <string name="chats_state_notification">Arată notificări la tastare\nAnunță interlocutorul atunci când scrii un mesaj destinat lui</string>
   <string name="connection_adjust_priority">Setare prioritate\nSchimbă prioritate cont în funcție de status-ul selectat. Prioritatea contului va fi suprascrisă.</string>
@@ -63,30 +58,19 @@
   <string name="contacts_reset_offline">Resetare setări offline\nȘterge setările individuale pentru conturi și grupuri</string>
   <string name="contacts_reset_offline_warning">Sunteți sigur(ă) că doriți să ștergeți setările individuale pentru grupuri și conturi?</string>
   <string name="events_first_only">Alertă la primul mesaj\nNotifică doar la primirea primului mesaj al unei conversații</string>
-  <string name="events_ignore_system_vibro">Ignoră setări vibrații ale sistemului\nUtilizați această opțiune dacă vibrația nu funcționează</string>
-  <string name="events_message">Setări notificări\nConfigurează notificările de primire a mesajelor</string>
-  <string name="events_message_chat">Doar pentru conversații</string>
-  <string name="events_message_chat_and_muc">Conversații și conferințe</string>
-  <string name="events_message_none">Fără notificări</string>
-  <string name="events_visible_chat">Notificări conversație activă\nNotifică la primirea mesajelor în conversația curentă</string>
-  <string name="events_suppress_100">Ascunde unele statusuri\nNu primi mesaje de tip \"Această cameră de discuții nu este anonimă\"</string>
+    <string name="events_suppress_100">Ascunde unele statusuri\nNu primi mesaje de tip \"Această cameră de discuții nu este anonimă\"</string>
   <string name="negative_priotiry_summary">%s (nu veți primi mesaje de la nicio conversație)</string>
   <string name="preference_accounts">Conturi XMPP\nAdministrează conturi</string>
   <string name="preference_security">Securitate\nSetări de securitate</string>
   <string name="security_check_certificate">Verifică certificat server\nNotifică cu privire la probleme legate de certificat sau encripție</string>
-  <string name="security_clear_certificate">Șterge certificate\nȘtergere lista cu certificate ignorate</string>
-  <string name="security_otr_history">Stocare istoric\nStochează istoric conversații de tip OTR</string>
-  <string name="security_otr_mode">OTR</string>
+    <string name="security_otr_mode">OTR</string>
   <string name="chats_attention">Alertare\nAlertă la primirea mesajelor de atenționare</string>
   <string name="chats_attention_sound">Notificări audio\nAlegeți sunet</string>
   <string name="connection_load_vcard">Încărcare vCard\nDescarcă și actualizează informațiile și avatarele contactelor.</string>
   <string name="connection_load_images">Încărcare imagini\nÎncarcă imaginile din URL-uri în mod automat. Dezactivează pentru a reduce traficul de date.</string>
   <string name="connection_use_carbons">Mod CC (Carbon-copied)\nPartajare sesiuni pentru același client. Dezactivați pentru a reduce traficul.</string>
-  <string name="connection_dns_resolver_type">Mod rezolvare DNS</string>
-  <string name="connection_dns_resolver_type_dns_java_resolver">DNSJavaResolver</string>
+    <string name="connection_dns_resolver_type_dns_java_resolver">DNSJavaResolver</string>
   <string name="connection_dns_resolver_type_mini_dns_resolver">MiniDNSResolver (experimental)</string>
-  <string name="connection_use_plain_text_auth">Autentificare text\nUtilizați autenticare fără encriptie. Nu este racomandat.</string>
-  <string name="events_phrases">Notificări-cheie\nCrează notificări personalizate la primirea mesajelor care conțin anumite cuvinte-cheie</string>
-  <string name="security_clear_certificate_warning">Doriți ștergerea tuturor certificatelor nevalide?</string>
-  <string name="account_error_settings">Setări</string>
+    <string name="events_phrases">Notificări-cheie\nCrează notificări personalizate la primirea mesajelor care conțin anumite cuvinte-cheie</string>
+    <string name="account_error_settings">Setări</string>
 </resources>
diff --git a/xabber/src/main/res/values-ru-rRU/account_editor.xml b/xabber/src/main/res/values-ru-rRU/account_editor.xml
index 26f1aa4017..e63a7a9b62 100644
--- a/xabber/src/main/res/values-ru-rRU/account_editor.xml
+++ b/xabber/src/main/res/values-ru-rRU/account_editor.xml
@@ -2,40 +2,25 @@
 <!--Generated by crowdin.com-->
 <resources>
   <string name="account_compression">Использовать сжатие</string>
-  <string name="account_enabled">Учетная запись включена</string>
-  <string name="account_host">Хост</string>
+    <string name="account_host">Хост</string>
   <string name="account_password">Пароль</string>
   <string name="confirm_password">Подтверждение пароля</string>
   <string name="account_port">Порт</string>
   <string name="account_priority">Приоритет</string>
   <string name="account_resource">Ресурс</string>
   <string name="account_server_name">Сервер</string>
-  <string name="account_type">Тип учетной записи</string>
-  <string name="account_type_hints_gtalk">учетная запись gmail.com или службы google</string>
-  <string name="account_type_helps_gtalk">Если у Вас нет учётной записи Google, её можно создать на сайте http://mail.google.com/\nТакже вы можете использовать ваше_имя@ваш_гугло_домен</string>
-  <string name="account_xmpp_register_warning">Вы должны <a href="http://www.google.com/#q=зарегистрировать учётную запись XMPP">зарегистрировать учётную запись XMPP</a> перед тем, как добавить её в Xabber!</string>
-  <string name="account_type_helps_xmpp">Подробную информацию об XMPP (Jabber) можно найти по адресу https://xmpp.org\nЗарегистрировать новую учетную запись можно тут https://register.jabber.org или тут http://jabber.ru</string>
-  <string name="account_user_name">Имя пользователя</string>
+    <string name="account_xmpp_register_warning">Вы должны <a href="http://www.google.com/#q=зарегистрировать учётную запись XMPP">зарегистрировать учётную запись XMPP</a> перед тем, как добавить её в Xabber!</string>
+    <string name="account_user_name">Имя пользователя</string>
   <string name="EMPTY_SERVER_NAME">Не указано имя сервера</string>
   <string name="EMPTY_USER_NAME">Не указано имя пользователя</string>
   <string name="CONFIRM_PASSWORD">Пароли не совпадают</string>
-  <string name="account_archive_mode">Хранить историю сообщений</string>
-  <string name="account_archive_mode_available">На сервере, если возможно</string>
-  <string name="account_archive_mode_dont_store">Не хранить</string>
-  <string name="account_archive_mode_local">На устройстве</string>
-  <string name="account_archive_mode_server">На сервере</string>
-  <string name="account_archive_mode_unread">Только не отправленные и не прочитанные сообщения</string>
-  <string name="account_compression_summary">Отметьте для включения сжатия данных</string>
+    <string name="account_compression_summary">Отметьте для включения сжатия данных</string>
   <string name="account_custom">Указать хост вручную</string>
   <string name="account_custom_summary">Указать хост для подключения вручную вместо использования SRV записи</string>
-  <string name="account_enabled_summary">Переключите, чтобы включить учетную запись</string>
-  <string name="account_invalid_port">Порт должен быть числом (значение по умолчанию: 5222)</string>
+    <string name="account_invalid_port">Порт должен быть числом (значение по умолчанию: 5222)</string>
   <string name="account_invalid_port_range">Порт должен быть числом между 1 и 65535 (значение по умолчанию: 5222)</string>
   <string name="account_invalid_priority">Приоритет должен быть между -128 и 127 (значение по умолчанию: 0)</string>
-  <string name="account_oauth">Авторизация</string>
-  <string name="account_oauth_invalidated">Не авторизован</string>
-  <string name="account_oauth_summary">Настройки авторизации OAuth</string>
-  <string name="account_proxy_host">Хост для прокси</string>
+    <string name="account_proxy_host">Хост для прокси</string>
   <string name="account_proxy_invalid_port_range">Порт для прокси должен быть числом между 1 и 65535 (по-умолчанию 8080)</string>
   <string name="account_proxy_invalid_port">Порт для прокси должен быть числом (по-умолчанию 8080)</string>
   <string name="account_proxy_password">Пароль для прокси</string>
@@ -47,18 +32,14 @@
   <string name="account_sasl_summary">Отключите эту опцию для подключения к очень старому серверу</string>
   <string name="account_store_password">Хранить пароль</string>
   <string name="account_store_password_summary">Отключение приведет к запросу пароля при каждом подключении</string>
-  <string name="account_syncable">Интеграция с контактами в телефоне</string>
-  <string name="account_syncable_summary">Отображать контакты этой учетной записи в списке контактов в телефоне</string>
-  <string name="account_tls_enable">Использовать TLS</string>
+    <string name="account_tls_enable">Использовать TLS</string>
   <string name="account_tls_enable_summary">Использовать TLS шифрование если поддерживается сервером</string>
   <string name="account_tls_legacy">Старый SSL</string>
   <string name="account_tls_legacy_summary">Использовать старый SSL метод шифрования соединения с сервером</string>
   <string name="account_tls_mode">Использование TLS/SSL</string>
   <string name="account_tls_require">Требовать TLS</string>
   <string name="account_tls_require_summary">Требовать TLS шифрование при подключении к серверу</string>
-  <string name="account_use_orbot">Использовать анонимное соединение через TOR и требовать TLS шифрование</string>
-  <string name="confirm_cancellation">Вы уверены, что хотите отменить все не сохраненные изменения?</string>
-  <string name="INCORRECT_USER_NAME">Неправильное имя пользователя. Просмотрите подсказку внизу экрана</string>
+    <string name="INCORRECT_USER_NAME">Неправильное имя пользователя. Просмотрите подсказку внизу экрана</string>
   <string name="orbot_required_message">Для использования TOR необходимо установить приложение Orbot и активировать в нём передачу данных. Вы хотите установить его из Google Play?</string>
   <string name="orbot_required_title">Установить Orbot?</string>
   <string name="install_orbot">Установить Orbot</string>
diff --git a/xabber/src/main/res/values-ru-rRU/chat_viewer.xml b/xabber/src/main/res/values-ru-rRU/chat_viewer.xml
index e2c0f29fbf..f357801c3e 100644
--- a/xabber/src/main/res/values-ru-rRU/chat_viewer.xml
+++ b/xabber/src/main/res/values-ru-rRU/chat_viewer.xml
@@ -21,11 +21,8 @@
   <string name="message_remove">Удалить из истории</string>
   <string name="message_repeat">Повторить отправку</string>
   <string name="message_otr_show_original">Показать сообщение</string>
-  <string name="message_open_file">Открыть</string>
-  <string name="message_save_file">Сохранить</string>
-  <string name="save_history">Сохранять локальную историю сообщений\nХранить историю переписки на устройстве</string>
-  <string name="show_history">Показать историю сообщений</string>
-  <string name="action_attention_called">Сообщение для привлечения внимания было отправлено</string>
+    <string name="save_history">Сохранять локальную историю сообщений\nХранить историю переписки на устройстве</string>
+    <string name="action_attention_called">Сообщение для привлечения внимания было отправлено</string>
   <string name="action_attention_requested">Вас окликнули</string>
   <string name="action_ban">%1$s был забанен</string>
   <string name="action_ban_by">%2$s забанил %1$s</string>
@@ -74,8 +71,7 @@
   <string name="otr_refresh">Заново начать шифрование</string>
   <string name="otr_request">Собеседник запросил OTR шифрование беседы, но у вас не установлен плагин, который его поддерживает. Используйте Pidgin или Adium для PC/Mac и Xabber или GibberBot для Android. Посетите http://otr.cypherpunks.ca/ для получения более полной информации.</string>
   <string name="otr_start">Начать шифрование</string>
-  <string name="otr_unencrypted_message">Это сообщние не было зашифровано.</string>
-  <string name="otr_unreadable_message">Зашифрованное сообщение, отправленное Вами, невозможно прочитать</string>
+    <string name="otr_unreadable_message">Зашифрованное сообщение, отправленное Вами, невозможно прочитать</string>
   <string name="otr_not_decrypted_message">Сообщение не может быть расшифровано</string>
   <string name="otr_verification">Проверка личности OTR</string>
   <string name="otr_verify_fingerprint">Проверка отпечатком пальца</string>
@@ -88,21 +84,13 @@
   <string name="otr_verification_progress_title">Идёт подтверждение подлинности сеанса OTR</string>
   <string name="otr_verification_notify_button">ОТКРЫТЬ</string>
   <string name="otr_verification_notify_button_cancel">ОТМЕНИТЬ</string>
-  <string name="under_construction">В разработке</string>
-  <string name="under_construction_message">Этот экран находится в разработке</string>
-  <string name="chat_events_show_text_global">Использовать глобальные настройки</string>
+    <string name="chat_events_show_text_global">Использовать глобальные настройки</string>
   <string name="chat_events_show_text_always">Отображать текст сообщения</string>
   <string name="chat_events_show_text_never">Скрывать текст сообщения</string>
-  <string name="sending_file">Отправка файла %s</string>
-  <string name="error_sending_file">Ошибка при отправке файла %s</string>
-  <string name="no_application_to_open_file">Не удалось найти подходящее приложение для открытия файла</string>
-  <string name="could_not_save_file">Не удалось сохранить файл</string>
-  <string name="file_saved_successfully">Файл успешно сохранён</string>
-  <string name="received_by">Получен с помощью %s</string>
-  <string name="could_not_get_path_to_file">Не удалось найти путь к файлу</string>
+    <string name="error_sending_file">Ошибка при отправке файла %s</string>
+    <string name="could_not_get_path_to_file">Не удалось найти путь к файлу</string>
   <string name="message_open_private_chat">Начать личный чат</string>
-  <string name="http_file_upload_slot_error">Не удалось загрузить файл. Слишком большой?</string>
-  <string name="no_permission_to_read_files">Нет разрешения на чтение файлов</string>
+    <string name="no_permission_to_read_files">Нет разрешения на чтение файлов</string>
   <string name="no_permission_to_write_files">Нет разрешения на сохранение файлов</string>
   <string name="error_description_title">Сообщение об ошибке:</string>
   <string name="message_status_sent">Отправлено</string>
diff --git a/xabber/src/main/res/values-ru-rRU/contact_editor.xml b/xabber/src/main/res/values-ru-rRU/contact_editor.xml
index 0faf16cc17..e9159cbc70 100644
--- a/xabber/src/main/res/values-ru-rRU/contact_editor.xml
+++ b/xabber/src/main/res/values-ru-rRU/contact_editor.xml
@@ -17,12 +17,8 @@
   <string name="processing_image">Обработка изображения...</string>
   <string name="error_during_crop">Ошибка во время кадрирования изображения</string>
   <string name="error_during_image_processing">Ошибка во время обработки изображения</string>
-  <string name="account_settings">Настройки учётной записи</string>
-  <string name="account_user_info">Информация об учетной записи</string>
-  <string name="account_server_info">Информация о сервере</string>
+    <string name="account_server_info">Информация о сервере</string>
   <string name="account_server_info_description">Список возможностей сервера</string>
   <string name="conference_private_chat_invitation">%1$s из %2$s хочет начать личный чат с вами</string>
   <string name="accept_muc_private_chat">Принять</string>
-  <string name="block_muc_private_chat">Заблокировать</string>
-  <string name="no_permission_camera">Нет разрешения на доступ к камере</string>
 </resources>
diff --git a/xabber/src/main/res/values-ru-rRU/contact_list.xml b/xabber/src/main/res/values-ru-rRU/contact_list.xml
index 56f75ed2a7..e1f89f7592 100644
--- a/xabber/src/main/res/values-ru-rRU/contact_list.xml
+++ b/xabber/src/main/res/values-ru-rRU/contact_list.xml
@@ -19,17 +19,13 @@
   <string name="application_state_roster">Подключено...</string>
   <string name="application_state_starting">Идет запуск приложения ...</string>
   <string name="application_state_waiting">Ожидание подключения...</string>
-  <string name="chat_list">Список чатов</string>
-  <string name="chat_list_is_empty">Нет активных чатов</string>
-  <string name="chat_viewer">Чат</string>
-  <string name="close_chat">Закрыть чат</string>
-  <string name="CONNECTION_FAILED">Ошибка подключения</string>
+    <string name="chat_viewer">Чат</string>
+    <string name="CONNECTION_FAILED">Ошибка подключения</string>
   <string name="contact_add">Добавить контакт</string>
   <string name="contact_delete">Удалить</string>
   <string name="contact_block">Заблокировать контакт</string>
   <string name="contact_delete_confirm">Вы действительно хотите удалить контакт %1$s из учетной записи %2$s?</string>
-  <string name="contact_list">Список контактов</string>
-  <string name="discard_subscription">Запретить подписку</string>
+    <string name="discard_subscription">Запретить подписку</string>
   <string name="archive_chat">Архивировать</string>
   <string name="unarchive_chat">Разархивировать</string>
   <string name="mute_chat">Выключить уведомления</string>
@@ -47,15 +43,7 @@
   <string name="action_send_contact">Отправить контакт</string>
   <string name="XMPP_EXCEPTION">Ошибка соединения</string>
   <string name="application_state_closing">Сохранение изменений...\nПриложение скоро закроется.</string>
-  <string name="certificate_confirmation">%1$s. \nВы доверяете сертификату с цифровым отпечатком SHA-1: %2$s?\nНе уведомлять о подобных проблемах с этим сертификатом?</string>
-  <string name="certificate_details">\n\nКому выдан:\nИмя (CN): %1$s\nОрганизация (O): %2$s\nПодразделение (OU): %3$s\nСерийный номер: %4$s\n\nКем выдан:\nИмя (CN): %5$s\nОрганизация (O): %6$s\nПодразделение (OU): %7$s\n\nСрок действия:\nВступает в силу: %8$s\nИстекает: %9$s.</string>
-  <string name="certificate_invalid_chane">Ошибка при проверке цепочки подписей</string>
-  <string name="certificate_invalid_target">Сертификат выдан другому домену</string>
-  <string name="certificate_self_signed">Самоподписанный сертификат</string>
-  <string name="certificate_show_details">Подробнее ...</string>
-  <string name="close_chats">Закрыть все чаты</string>
-  <string name="contact_integration_suggest">Вы хотите, чтобы Xabber интегрировался в список контактов в телефоне?\nВы можете отключить эту опцию: \"Настройки\" → \"Учетные записи XMPP\" → Ваша учетная запись → \"Интеграция с системными контактами\".\nNB: На несколько минут приложение списка контактов может замедлить свою работу.</string>
-  <string name="group_room">Конференции</string>
+    <string name="group_room">Конференции</string>
   <string name="OTR_ERROR">Ошибка OTR</string>
   <string name="select_contact">Выберите нужный контакт</string>
   <string name="show_offline_always">Всегда отображать</string>
@@ -70,8 +58,7 @@
   <string name="block_list">Черный список</string>
   <string name="contact_blocked_successfully">Контакт успешно заблокирован</string>
   <string name="error_blocking_contact">Не удалось заблокировать контакт</string>
-  <string name="unblock_contact">Разблокировать контакт</string>
-  <string name="contacts_unblocked_successfully">Контакты успешно разблокированы</string>
+    <string name="contacts_unblocked_successfully">Контакты успешно разблокированы</string>
   <string name="error_unblocking_contacts">Не удалось разблокировать контакты</string>
   <string name="block_contact_confirm">Вы действительно хотите удалить контакт %1$s из учетной записи %2$s?</string>
   <string name="unblock_all_contacts_confirm">Вы действительно хотите разблокировать все контакты из аккаунта %1$s?</string>
@@ -83,19 +70,10 @@
   <string name="dark_theme_suggest_dialog_stay_on_light_side">Светлая</string>
   <string name="battery_optimization_disable_dialog_title">Оптимизация расхода аккумулятора</string>
   <string name="battery_optimization_disable_dialog_message">Ваше устройство оптимизирует расход батареи, что может привести к задержкам в доставке сообщений или их потере.\n\nСейчас вам предложат отключить оптимизацию.</string>
-  <string name="save_log_to_file">Сохранить в файл</string>
-  <string name="clear_log">Удалить старые файлы журнала</string>
+    <string name="clear_log">Удалить старые файлы журнала</string>
   <string name="open_log_file">Открыть</string>
   <string name="send_log_file">Отправить</string>
-  <string name="intro_welcome">Добро пожаловать в Xabber</string>
-  <string name="intro_xabber_description">XMPP-клиент для Android с открытым исходным кодом</string>
-  <string name="intro_have_account">Войти в XMPP аккаунт</string>
-  <string name="intro_register_account">Зарегистрировать учётную запись XMPP</string>
-  <string name="intro_create_xabber_account">Использовать аккаунт Xabber</string>
-  <string name="intro_use_third_party_accounts">сторонние XMPP аккаунты</string>
-  <string name="intro_faq">Если у вас нет учётной записи XMPP, пожалуйста, <a href="https://www.xabber.com/faq/">прочтите наш F.A.Q.</a> о том, как зарегистрироваться.</string>
-  <string name="intro_web_search_register_xmpp">Зарегистрировать учётную запись XMPP</string>
-  <string name="synchronize_bookmarks">Синхронизировать закладки</string>
+    <string name="synchronize_bookmarks">Синхронизировать закладки</string>
   <string name="remove_all_bookmarks">Удалить все</string>
   <string name="remove_selected_bookmarks">Удалить выбранные</string>
   <string name="remove_all_bookmarks_confirm">Вы действительно хотите удалить все закладки учётной записи %1$s?</string>
diff --git a/xabber/src/main/res/values-ru-rRU/contact_viewer.xml b/xabber/src/main/res/values-ru-rRU/contact_viewer.xml
index bd0451fceb..379e000a5b 100644
--- a/xabber/src/main/res/values-ru-rRU/contact_viewer.xml
+++ b/xabber/src/main/res/values-ru-rRU/contact_viewer.xml
@@ -17,12 +17,9 @@
   <string name="vcard_organization_unit">Отдел</string>
   <string name="vcard_title">Должность</string>
   <string name="vcard_role">Должностные функции</string>
-  <string name="vcard_other">Общая информация</string>
-  <string name="vcard_categories">Рубрики</string>
-  <string name="vcard_decsription">Описание</string>
+    <string name="vcard_decsription">Описание</string>
   <string name="vcard_note">Заметки</string>
-  <string name="vcard_address">Адрес</string>
-  <string name="vcard_address_pobox">Почтовый ящик</string>
+    <string name="vcard_address_pobox">Почтовый ящик</string>
   <string name="vcard_address_extadr">Дополнительный адрес</string>
   <string name="vcard_address_street">Улица</string>
   <string name="vcard_address_locality">Город</string>
diff --git a/xabber/src/main/res/values-ru-rRU/muc_editor.xml b/xabber/src/main/res/values-ru-rRU/muc_editor.xml
index 81f467b4bf..f012262e97 100644
--- a/xabber/src/main/res/values-ru-rRU/muc_editor.xml
+++ b/xabber/src/main/res/values-ru-rRU/muc_editor.xml
@@ -20,12 +20,10 @@
   <string name="muc_invite_confirm">%2$s приглашает вас подключиться к конференции %3$s. Подключиться с учетной записи %1$s?</string>
   <string name="muc_invite_confirm_reason">%2$s приглашает вас подключиться к конференции %3$s: %4$s. Подключить к учетной записи %1$s?</string>
   <string name="muc_leave">Покинуть конференцию</string>
-  <string name="muc_save">Сохранить конференцию</string>
-  <string name="muc_choose_conference">Выберите конференцию</string>
+    <string name="muc_choose_conference">Выберите конференцию</string>
   <string name="muc_next">Далее</string>
   <string name="muc_get_hosted_conferences">Получить список конференций</string>
   <string name="muc_error_getting_conferences">Ошибка при получении списка конференций</string>
   <string name="muc_type_conference_name">Введите имя конференции</string>
-  <string name="contact_is_blocked">Контакт заблокирован!</string>
-  <string name="conference_invitation">Приглашение в конференцию</string>
+    <string name="conference_invitation">Приглашение в конференцию</string>
 </resources>
diff --git a/xabber/src/main/res/values-ru-rRU/notification_bar.xml b/xabber/src/main/res/values-ru-rRU/notification_bar.xml
index 12de115ba8..afd581152a 100644
--- a/xabber/src/main/res/values-ru-rRU/notification_bar.xml
+++ b/xabber/src/main/res/values-ru-rRU/notification_bar.xml
@@ -34,10 +34,7 @@
   <!-- Used for plural form in russian. -->
   <string name="connection_state_waiting_5">%1$d из %2$d %3$s ожидают переподключения </string>
   <string name="connection_state_offline">%1$d %2$s не в сети</string>
-  <string name="archive_available_request_message">Сохранять историю сообщений на сервере?\nЭто позволит Xabber загружать историю переписки со всех устройств, использующих данную учётную запись.\nИспользование архива сообщений приведет к дополнительному расходу трафика и незначительно замедлит подключение.\nВНИМАНИЕ: Вся локальная история сообщений будет удалена.</string>
-  <string name="archive_available_request_title">Включить архив сообщений?</string>
-  <string name="INVALID_CERTIFICATE">Неверный сертификат</string>
-  <string name="muc_invite_message">Вы хотите подключиться к конференции?</string>
+    <string name="muc_invite_message">Вы хотите подключиться к конференции?</string>
   <string name="otr_verification_in_progress">Нажмите, чтобы прервать.</string>
   <string name="PASSWORD_REQUIRED">Требуется ввести пароль</string>
   <string name="pay_attention">Вас окликнули</string>
diff --git a/xabber/src/main/res/values-ru-rRU/preference_editor.xml b/xabber/src/main/res/values-ru-rRU/preference_editor.xml
index 5754043596..835b3ec4cd 100644
--- a/xabber/src/main/res/values-ru-rRU/preference_editor.xml
+++ b/xabber/src/main/res/values-ru-rRU/preference_editor.xml
@@ -12,15 +12,12 @@
   <string name="contacts_order_alphabet">По алфавиту</string>
   <string name="contacts_order_status">По статусу</string>
   <string name="contacts_show_accounts">Группировать по учетным записям\nПозволяет группировать собеседников по учетным записям</string>
-  <string name="contacts_show_active_chats">Активные чаты в начале\nОтображать активные чаты в начале списка контактов</string>
-  <string name="contacts_show_avatars">Отображать аватары\nПозволяет видеть аватары собеседников в списке контактов</string>
+    <string name="contacts_show_avatars">Отображать аватары\nПозволяет видеть аватары собеседников в списке контактов</string>
   <string name="contacts_show_messages">Отображать сообщения\nПозволяет видеть сообщения пользователей в списке контактов</string>
   <string name="contacts_show_empty_groups">Отображать пустые группы\nОтображать группы даже если в них нет контактов</string>
   <string name="contacts_show_groups">Отображать группы\nПозволяет группировать собеседников по группам</string>
   <string name="contacts_show_offline">Отображать оффлайн контакты\nОтображать собеседников не в сети</string>
-  <string name="contacts_show_panel">Отображать панель учетных записей\nПозволяет видеть кнопки с изображениями учетных записей в правом нижнем углу списка контактов</string>
-  <string name="contacts_stay_active_chats">Дублировать активные чаты\nОтображать контакты с активными чатами не только в начале списка контактов, но и в основном списке</string>
-  <string name="debug_log">Журнал отладки\nВыводить отладочные сообщения в журнал отладки (перезапустите приложение для применения настройки)</string>
+    <string name="debug_log">Журнал отладки\nВыводить отладочные сообщения в журнал отладки (перезапустите приложение для применения настройки)</string>
   <string name="debug_file_log_title">Вести журнал\nЗаписывать отладочную информацию в файл на устройстве (вы можете им поделится).</string>
   <string name="debug_log_files_title">Файлы журнала\nСписок записанных файлов журнала.</string>
   <string name="debug_log_files_activity_title">Файлы журнала</string>
@@ -37,8 +34,7 @@
   <string name="interface_theme">Тема</string>
   <string name="interface_theme_dark">Темная</string>
   <string name="interface_theme_light">Светлая</string>
-  <string name="interface_theme_normal">Стандартная</string>
-  <string name="interface_smiles">Графические смайлы</string>
+    <string name="interface_smiles">Графические смайлы</string>
   <string name="interface_smiles_android">Стандартные смайлы</string>
   <string name="interface_smiles_none">Отключить графические смайлы</string>
   <string name="preference_connection">Настройки подключения\nНастройки вариантов подключения</string>
@@ -63,8 +59,7 @@
   <string name="chats_font_size_xlarge">Огромный</string>
   <string name="chats_hide_keyboard">Скрывать клавиатуру</string>
   <string name="chats_hide_keyboard_landscape">В ландшафтном режиме</string>
-  <string name="chats_receipt">Уведомления о доставке сообщений\nОтправлять и получать уведомления о доставке сообщений</string>
-  <string name="chats_show_avatars">Аватары в сообщениях\nОтображать пользовательские изображения в каждом сообщении</string>
+    <string name="chats_show_avatars">Аватары в сообщениях\nОтображать пользовательские изображения в каждом сообщении</string>
   <string name="chats_show_status_change">Отображать изменения статуса</string>
   <string name="chats_show_status_change_muc">В конференциях</string>
   <string name="chats_state_notification">Уведомлять о наборе текста\nУведомлять собеседника о наборе текста</string>
@@ -78,38 +73,24 @@
   <string name="contacts_reset_offline">Сброс настроек оффлайн\nОчистить индивидуальные настройки отображения контактов не в сети для групп и учетных записей</string>
   <string name="contacts_reset_offline_warning">Вы действительно хотите очистить индивидуальные настройки отображения контактов не в сети для групп и учетных записей?</string>
   <string name="events_first_only">Извещение только о первом сообщении в чате\nИзвещать только о первом входящем сообщении в чате</string>
-  <string name="events_ignore_system_vibro">Игнорировать системные настройки\nВключите если у вас не работает системная вибрация</string>
-  <string name="events_message">Настройки уведомлений\nНастройка уведомлений о входящих сообщениях</string>
-  <string name="events_message_chat">Только в чатах</string>
-  <string name="events_message_chat_and_muc">В чатах и конференциях</string>
-  <string name="events_message_none">Не уведомлять</string>
-  <string name="events_show_text">Предпросмотр сообщений\nОтображать текст сообщений</string>
+    <string name="events_show_text">Предпросмотр сообщений\nОтображать текст сообщений</string>
   <string name="events_show_text_muc">Предпросмотр сообщений\nОтображать текст сообщений из групповых чатов</string>
-  <string name="events_visible_chat">Извещение в текущем чате\nИзвещать о входящих сообщениях в текущем чате</string>
-  <string name="events_suppress_100">Игнорировать некоторые сообщения\nНе получать служебные сообщения о неанонимности конференции</string>
+    <string name="events_suppress_100">Игнорировать некоторые сообщения\nНе получать служебные сообщения о неанонимности конференции</string>
   <string name="negative_priotiry_summary">%s (вы не будете получать сообщения)</string>
   <string name="preference_accounts">Учетные записи XMPP\nУправление учетными записями</string>
   <string name="preference_security">Безопасность\nНастройки безопасности</string>
   <string name="security_check_certificate">Проверка сертификата сервера\nОповещать о проблемах с сертификатами во время шифрованного подключения</string>
-  <string name="security_clear_certificate">Удалить сертификаты\nОчистить список игнорируемых сертификатов</string>
-  <string name="security_otr_history">Сохранять историю\nСохранять историю если OTR шифрование включено</string>
-  <string name="security_otr_mode">Режим OTR шифрования</string>
+    <string name="security_otr_mode">Режим OTR шифрования</string>
   <string name="chats_attention">Привлечение внимания\nОтзываться на запросы привлечения внимания</string>
   <string name="chats_attention_sound">Звук привлечения внимания\nВыберите мелодию звонка</string>
   <string name="connection_load_vcard">Загружать vCard\nЗагружать и обновлять персональную информацию и аватары контактов. Отключение поможет сэкономить трафик.</string>
   <string name="connection_load_images">Загружать изображения\nЗагружать изображения по ссылкам автоматически. Отключите для экономии трафика.</string>
   <string name="connection_use_carbons">Сообщения carbons\nПринимать сообщения других сессий Вашей учетной записи. Отключение поможет сэкономить трафик.</string>
-  <string name="connection_dns_resolver_type">Тип DNS-клиента</string>
-  <string name="connection_dns_resolver_type_dns_java_resolver">DNSJavaResolver</string>
+    <string name="connection_dns_resolver_type_dns_java_resolver">DNSJavaResolver</string>
   <string name="connection_dns_resolver_type_mini_dns_resolver">MiniDNSResolver (экспериментальный)</string>
-  <string name="connection_use_plain_text_auth">Аутентификация открытым текстом\n
-Использовать открытую аутентификацию для всех аккаунтов. Не рекомендуется.</string>
-  <string name="events_phrases">Ключевые фразы\nНастройки уведомлений о сообщениях содержащих ключевые фразы</string>
-  <string name="security_clear_certificate_warning">Вы действительно хотите удалить все игнорируемые сертификаты?</string>
-  <string name="account_error_settings">Настройки</string>
-  <string name="category_xabber_account">Аккаунт Xabber</string>
-  <string name="category_xmpp_accounts">Учётные записи XMPP</string>
-  <string name="category_interface">Интерфейс</string>
+    <string name="events_phrases">Ключевые фразы\nНастройки уведомлений о сообщениях содержащих ключевые фразы</string>
+    <string name="account_error_settings">Настройки</string>
+    <string name="category_interface">Интерфейс</string>
   <string name="category_settings">Настройки</string>
   <string name="category_about">О программе</string>
   <string name="category_appearance">Внешний вид</string>
diff --git a/xabber/src/main/res/values-ru-rRU/words.xml b/xabber/src/main/res/values-ru-rRU/words.xml
index f2c43f2d4f..05ea028e9d 100644
--- a/xabber/src/main/res/values-ru-rRU/words.xml
+++ b/xabber/src/main/res/values-ru-rRU/words.xml
@@ -20,8 +20,7 @@
   <string name="settings">Настройки</string>
   <string name="ok">ОК</string>
   <string name="login">Вход</string>
-  <string name="resume">Продолжить</string>
-  <string name="share">Поделиться</string>
+    <string name="share">Поделиться</string>
   <string name="send_to">Отправить:</string>
   <string name="got_it">Понял</string>
 </resources>
diff --git a/xabber/src/main/res/values-ru-rRU/xabber_account.xml b/xabber/src/main/res/values-ru-rRU/xabber_account.xml
index 599133d887..d3530aa0ed 100644
--- a/xabber/src/main/res/values-ru-rRU/xabber_account.xml
+++ b/xabber/src/main/res/values-ru-rRU/xabber_account.xml
@@ -4,62 +4,39 @@
   <string name="xabber_account_info">Аккаунт Xabber требуется для использования сервисов Xabber и синхронизации настроек устройств.</string>
   <string name="social_sign_in">Социальная Авторизация</string>
   <string name="email_hint">Email</string>
-  <string name="username_hint">Имя пользователя Xabber или email</string>
-  <string name="pass_hint">Пароль</string>
-  <string name="forgot_pass">ЗАБЫЛИ ПАРОЛЬ?</string>
-  <string name="agrees">Я согласен иногда получать информацию от разработчиков Xabber. Мы обещаем не злоупотреблять этим.</string>
-  <string name="sync_success">Синхронизация прошла успешно</string>
+    <string name="forgot_pass">ЗАБЫЛИ ПАРОЛЬ?</string>
+    <string name="sync_success">Синхронизация прошла успешно</string>
   <string name="sync_fail">Ошибка синхронизации</string>
   <string name="quit_success">Вы вышли из аккаунта</string>
-  <string name="quit_fail">Ошибка выхода</string>
-  <string name="confirm_success">Email был успешно подтвержден</string>
-  <string name="confirm_fail">Ошибка подтверждения email</string>
-  <string name="complete_success">Регистрация успешно завершена</string>
-  <string name="complete_fail">Ошибка регистрации</string>
-  <string name="resend_success">Email с подтверждением отправлен</string>
-  <string name="resend_fail">Ошибка отправки email с подтверждением</string>
-  <string name="social_auth_fail">Ошибка социальной авторизации</string>
+    <string name="confirm_success">Email был успешно подтвержден</string>
+    <string name="resend_success">Email с подтверждением отправлен</string>
+    <string name="social_auth_fail">Ошибка социальной авторизации</string>
   <string name="settings_delete_success">Настройки удалены</string>
-  <string name="toast_email_already_confirm">Email уже подтверждён</string>
-  <string name="toast_not_authorized">Вы не авторизованы</string>
-  <string name="toast_no_internet">Нет подключения к Интернет</string>
+    <string name="toast_no_internet">Нет подключения к Интернет</string>
   <string name="progress_message">Пожалуйста, подождите</string>
   <string name="progress_title_sync">Синхронизация</string>
   <string name="progress_title_quit">Выход</string>
   <string name="progress_title_login">Вход</string>
   <string name="progress_title_signup">Регистрация</string>
   <string name="progress_title_confirm">Подтверждение</string>
-  <string name="progress_title_complete">Завершение регистрации</string>
-  <string name="progress_title_resend">Повторная отправка email</string>
+    <string name="progress_title_resend">Повторная отправка email</string>
   <string name="progress_title_delete_settings">Удаление настроек</string>
   <string name="hint_username">username</string>
-  <string name="label_first_name">Имя</string>
-  <string name="hint_first_name">Иван</string>
-  <string name="label_last_name">Фамилия</string>
-  <string name="hint_last_name">Иванов</string>
-  <string name="hint_code">код</string>
-  <string name="title_xabber_account">Аккаунт Xabber</string>
-  <string name="title_xmpp_account">XMPP аккаунты</string>
-  <string name="title_email_confirm">Подтвердите адрес email</string>
-  <string name="title_email_confirmed">Адрес email подтверждён</string>
-  <string name="title_complete_register">Завершение регистрации</string>
-  <string name="title_completed_register">Регистрация завершена</string>
-  <string name="title_start_messaging">Начните общение!</string>
+    <string name="title_xabber_account">Аккаунт Xabber</string>
+    <string name="title_email_confirm">Подтвердите адрес email</string>
+    <string name="title_complete_register">Завершение регистрации</string>
+    <string name="title_start_messaging">Начните общение!</string>
   <string name="title_reordering_account">Порядок аккаунтов</string>
   <string name="title_sync">Синхронизированные аккаунты</string>
   <string name="title_login_xabber_account">Авторизация</string>
   <string name="title_register_xabber_account">Регистрация</string>
   <string name="summary_xabber_account_in_login">Аккаунт Xabber требуется для использования сервисов Xabber и синхронизации настроек устройств.</string>
-  <string name="summary_username">Имя пользователя Xabber также является XMPP id</string>
-  <string name="button_quit">Выход</string>
+    <string name="button_quit">Выход</string>
   <string name="button_login">ВХОД</string>
   <string name="button_registration">РЕГИСТРАЦИЯ</string>
   <string name="button_resend_link">ОТПРАВИТЬ КОД</string>
-  <string name="button_complete_registration">ЗАРЕГИСТРИРОВАТЬ</string>
-  <string name="button_confirm">подтвердить</string>
-  <string name="button_cancel_registration">Прервать регистрацию</string>
-  <string name="button_continue">продолжить</string>
-  <string name="button_sync">Синхронизировать</string>
+    <string name="button_confirm">подтвердить</string>
+    <string name="button_sync">Синхронизировать</string>
   <string name="btn_done">закончить</string>
   <string name="not_login">Вход не выполнен</string>
   <string name="enter_password">Пожалуйста, введите пароль для этого аккаунта</string>
@@ -67,8 +44,7 @@
   <string name="last_sync_date">Последняя синхронизация: %1$s</string>
   <string name="last_sync_date_never">никогда</string>
   <string name="sync_all">Синхронизировать все</string>
-  <string name="no_email">email не указан</string>
-  <string name="no_username">нет имени пользователя</string>
+    <string name="no_username">нет имени пользователя</string>
   <string name="empty_field">Поле не заполнено</string>
   <string name="pass_too_short">Пароль должен быть длиннее 4 символов</string>
   <string name="passwords_not_match">Пароли не совпадают</string>
@@ -81,18 +57,8 @@
   <string name="delete_settings">Удалить синхронизированные настройки этого XMPP аккаунта с сервера Xabber?</string>
   <string name="logout_summary">Вы выйдете из аккаунта Xabber. Вы не сможете использовать расширенные сервисы Xabber, но обычные XMPP аккаунты будут работать как обычно.</string>
   <string name="delete_settings_summary">Синхронизированные настройки этого XMPP аккаунта будут удалены с сервера Xabber</string>
-  <string name="sign_up_email_social">Регистрация с помощью соцсетей или Email</string>
-  <string name="signed_up_email">Регистрация с помощью Email</string>
-  <string name="signed_up_google">Регистрация с помощью Google+</string>
-  <string name="signed_up_facebook">Регистрация с помощью Facebook</string>
-  <string name="signed_up_github">Регистрация с помощью GitHub</string>
-  <string name="signed_up_twitter">Регистрация с помощью Twitter</string>
-  <string name="reorder_summary">Для синхронизации порядка аккаунтов необходимо активировать опцию «Синхронизировать все» в настройках аккаунта Xabber</string>
-  <string name="cancel_registration_progress">Прервать регистрацию</string>
-  <string name="cancel_registration_dialog_message">Аккаунт Xabber улучшает работу чата, но не необходим для использования приложения. Вы сможете завершить регистрацию позже.</string>
-  <string name="cancel_registration_dialog_cancel">Прервать</string>
-  <string name="cancel_registration_dialog_resume">Продолжить</string>
-  <string name="delete_settings_button">Удалить настройки</string>
+    <string name="reorder_summary">Для синхронизации порядка аккаунтов необходимо активировать опцию «Синхронизировать все» в настройках аккаунта Xabber</string>
+    <string name="delete_settings_button">Удалить настройки</string>
   <string name="account_sync_enable_summary">Включить синхронизацию</string>
   <string name="sync_status_no">Не синхронизован</string>
   <string name="sync_status_local">Локальные настройки будут загружены на сервер</string>
@@ -103,18 +69,6 @@
   <string name="sync_status_enabled">Синхронизация включена</string>
   <string name="sync_status_disabled">Синхронизация выключена</string>
   <string name="account_deleted">Используемый аккаунт Xabber был удалён</string>
-  <string name="login_without_xabber_account">обычный xmpp</string>
-  <string name="sync_not_allowed_summary">Аккаунты с нестандартными настройками (нестандартный порт, старый SSL, прокси) не могут быть синхронизированы.</string>
-  <string name="github_alert">Авторизация GitHub пока недоступна</string>
-  <string name="complete_register_summary">Вы хотите добавить %1$s в список Ваших XMPP аккаунтов?</string>
-  <string name="complete_register_add">Добавить</string>
-  <string name="complete_register_no">Нет</string>
-  <string name="confirm_phone_success">Номер телефона успешно подтвержден</string>
-  <string name="set_phone_success">Код подтверждения отправлен</string>
-  <string name="title_phone_confirm">Подтверждение номера телефона</string>
-  <string name="title_phone_confirmed">Номер телефона подтвержден</string>
-  <string name="progress_title_set_phone">Регистрация номера телефона</string>
-  <string name="progress_title_confirm_phone">Подтверждение</string>
-  <string name="no_phone">телефон не указан</string>
-  <string name="code_length_wrong">Код должен быть не менее 6 символов</string>
+    <string name="sync_not_allowed_summary">Аккаунты с нестандартными настройками (нестандартный порт, старый SSL, прокси) не могут быть синхронизированы.</string>
+    <string name="no_phone">телефон не указан</string>
 </resources>
diff --git a/xabber/src/main/res/values-sk-rSK/account_editor.xml b/xabber/src/main/res/values-sk-rSK/account_editor.xml
index 5cf1f2b960..9ff638fe6b 100644
--- a/xabber/src/main/res/values-sk-rSK/account_editor.xml
+++ b/xabber/src/main/res/values-sk-rSK/account_editor.xml
@@ -2,40 +2,25 @@
 <!--Generated by crowdin.com-->
 <resources>
   <string name="account_compression">Použiť kompresiu</string>
-  <string name="account_enabled">Povolený</string>
-  <string name="account_host">Server</string>
+    <string name="account_host">Server</string>
   <string name="account_password">Heslo</string>
   <string name="confirm_password">Potvrďte heslo</string>
   <string name="account_port">Port</string>
   <string name="account_priority">Priorita</string>
   <string name="account_resource">Zdroj</string>
   <string name="account_server_name">Server</string>
-  <string name="account_type">Typ účtu</string>
-  <string name="account_type_hints_gtalk">užívateľské meno pre gmail.com alebo Google Apps</string>
-  <string name="account_type_helps_gtalk">Ak nemáte Google účet môžete si ho vytvoriť na http://mail.google.com\nTiež môžete použiť vaše_používateľské_meno@vaša_google_doména</string>
-  <string name="account_xmpp_register_warning">Musíte si<a href="http://www.google.com/#q=register an XMPP account"> zaregistrovať účet XMPP</a> pred pridaním do Xabber!</string>
-  <string name="account_type_helps_xmpp">Ak sa chcete dozvedieť viac informácií o XMPP (Jabber): https://xmpp.org</string>
-  <string name="account_user_name">Používateľské meno</string>
+    <string name="account_xmpp_register_warning">Musíte si<a href="http://www.google.com/#q=register an XMPP account"> zaregistrovať účet XMPP</a> pred pridaním do Xabber!</string>
+    <string name="account_user_name">Používateľské meno</string>
   <string name="EMPTY_SERVER_NAME">Meno servera nie je špecifikované</string>
   <string name="EMPTY_USER_NAME">Používateľské meno nie je špecifikované</string>
   <string name="CONFIRM_PASSWORD">Heslá sa nezhodujú</string>
-  <string name="account_archive_mode">Ukladať históriu správ</string>
-  <string name="account_archive_mode_available">Na serveri, ak je dostupný</string>
-  <string name="account_archive_mode_dont_store">Neukladať</string>
-  <string name="account_archive_mode_local">Lokálne na zariadení</string>
-  <string name="account_archive_mode_server">Na serveri</string>
-  <string name="account_archive_mode_unread">Lokálne iba neodoslané a neprečítané</string>
-  <string name="account_compression_summary">Zaškrtnite pre povolenie kompresie dát</string>
+    <string name="account_compression_summary">Zaškrtnite pre povolenie kompresie dát</string>
   <string name="account_custom">Vlastný hostiteľ</string>
   <string name="account_custom_summary">Použiť vlastné nastavenie servera namiesto SRV záznamu</string>
-  <string name="account_enabled_summary">Prepnúť pre povolenie účtu</string>
-  <string name="account_invalid_port">Port musí byť číslo (predvolené: 5222)</string>
+    <string name="account_invalid_port">Port musí byť číslo (predvolené: 5222)</string>
   <string name="account_invalid_port_range">Port musí byť v rozsahu medzi 1 a 65535 (predvolené: 5222)</string>
   <string name="account_invalid_priority">Hodnota priority musí byť v intervale od -128 do 127 (predvolené: 0)</string>
-  <string name="account_oauth">Autorizácia</string>
-  <string name="account_oauth_invalidated">Neautorizovaný</string>
-  <string name="account_oauth_summary">Nastavenia OAuth</string>
-  <string name="account_proxy_host">Proxy server</string>
+    <string name="account_proxy_host">Proxy server</string>
   <string name="account_proxy_invalid_port_range">Port servera proxy musí byť v rozsahu od 1 do 65535 (predvolené: 8080)</string>
   <string name="account_proxy_invalid_port">Port servera proxy musí byť číslo (predvolené: 8080)</string>
   <string name="account_proxy_password">Heslo proxy</string>
@@ -47,18 +32,14 @@
   <string name="account_sasl_summary">Vypnúť pre veľmi starý server</string>
   <string name="account_store_password">Uložiť heslo</string>
   <string name="account_store_password_summary">Vypnite túto možnosť pre zadávanie hesla každý krát pri pripojení</string>
-  <string name="account_syncable">Integrácia do systémových kontaktov</string>
-  <string name="account_syncable_summary">Zobraziť kontakty z tohoto účtu v zozname kontaktov telefónu</string>
-  <string name="account_tls_enable">Povoliť TLS</string>
+    <string name="account_tls_enable">Povoliť TLS</string>
   <string name="account_tls_enable_summary">Použiť TLS šifrovanie ak je možné sa pripojiť na server</string>
   <string name="account_tls_legacy">Zastarané SSL</string>
   <string name="account_tls_legacy_summary">Použiť Legacy SSL šifrovanie pri pripojení na server</string>
   <string name="account_tls_mode">TLS/SSL využtie</string>
   <string name="account_tls_require">Vyžadovať TLS</string>
   <string name="account_tls_require_summary">Požadovať TLS šifrovanie pri pripojení na server</string>
-  <string name="account_use_orbot">Chatovať cez anonymnú sieť TOR a vynútiť TLS kryptografický protokol\nNeodporúčame pre Google Talk</string>
-  <string name="confirm_cancellation">Ste si istý, že chcete zrušiť všetky zmeny?</string>
-  <string name="INCORRECT_USER_NAME">Chybné užívateľské meno. Pozrite pomocný text dole pre detaily.</string>
+    <string name="INCORRECT_USER_NAME">Chybné užívateľské meno. Pozrite pomocný text dole pre detaily.</string>
   <string name="orbot_required_message">Aby ste mohli používať TOR musíte mať nainštalovaný Orbot a cez neho aktivovaný proxy prenos. Chceli by ste ho nainštalovať z Google Play?</string>
   <string name="orbot_required_title">Nainštalovať Orbot?</string>
   <string name="install_orbot">Nainštalovať Orbot</string>
diff --git a/xabber/src/main/res/values-sk-rSK/chat_viewer.xml b/xabber/src/main/res/values-sk-rSK/chat_viewer.xml
index af7fb4df82..028c037d66 100644
--- a/xabber/src/main/res/values-sk-rSK/chat_viewer.xml
+++ b/xabber/src/main/res/values-sk-rSK/chat_viewer.xml
@@ -21,11 +21,8 @@
   <string name="message_remove">Odstrániť z histórie</string>
   <string name="message_repeat">Znovu poslať</string>
   <string name="message_otr_show_original">Zobraziť správu</string>
-  <string name="message_open_file">Otvoriť</string>
-  <string name="message_save_file">Uložiť</string>
-  <string name="save_history">Ukladať lokálnu históriu\nUložiť históriu správ lokálne</string>
-  <string name="show_history">Zobraziť históriu</string>
-  <string name="action_attention_called">Žiadosť o pozornosť bola zaslaná</string>
+    <string name="save_history">Ukladať lokálnu históriu\nUložiť históriu správ lokálne</string>
+    <string name="action_attention_called">Žiadosť o pozornosť bola zaslaná</string>
   <string name="action_attention_requested">Pozornosť bola vyžiadaná</string>
   <string name="action_ban">%1$s bol/a zablokovaný/á</string>
   <string name="action_ban_by">%1$s bol/a zablokovaný/á od %2$s</string>
@@ -73,8 +70,7 @@
   <string name="otr_refresh">Reštartovať šifrovanie</string>
   <string name="otr_request">Privátna konverzácia mimo záznam bola požadovaná, ale nemáte potrebné rozšírenie. Použite Pidgin, Gajim alebo Adium pre PC/Mac a Xabber alebo ChatSecure pre Android. Navštívte http://otr.cypherpunks.ca/ pre viac informácií.</string>
   <string name="otr_start">Spustiť šifrovanie</string>
-  <string name="otr_unencrypted_message">Táto správa nebola šifrovaná</string>
-  <string name="otr_unreadable_message">Šifrovaná správa, ktorú ste poslali, je nečitateľná</string>
+    <string name="otr_unreadable_message">Šifrovaná správa, ktorú ste poslali, je nečitateľná</string>
   <string name="otr_not_decrypted_message">Nie je možné dešifrovať správu</string>
   <string name="otr_verification">OTR overenie</string>
   <string name="otr_verify_fingerprint">Overiť odtlačkom</string>
@@ -87,21 +83,13 @@
   <string name="otr_verification_progress_title">Požiadavka na overenie OTR</string>
   <string name="otr_verification_notify_button">OTVORENÉ</string>
   <string name="otr_verification_notify_button_cancel">ZRUŠIŤ</string>
-  <string name="under_construction">Na tomto sa pracuje</string>
-  <string name="under_construction_message">Na tejto obrazovke sa pracuje</string>
-  <string name="chat_events_show_text_global">Použiť globálne nastavenia</string>
+    <string name="chat_events_show_text_global">Použiť globálne nastavenia</string>
   <string name="chat_events_show_text_always">Zobraziť text správy</string>
   <string name="chat_events_show_text_never">Skryť text správy</string>
-  <string name="sending_file">Odosielam súbor %s</string>
-  <string name="error_sending_file">Chyba pri odosielaní súboru %s</string>
-  <string name="no_application_to_open_file">Na otvorenie tohto typu súboru nebola nájdená žiadna aplikácia</string>
-  <string name="could_not_save_file">Nepodarilo sa uložiť súbor</string>
-  <string name="file_saved_successfully">Súbor úspešne uložený</string>
-  <string name="received_by">Prijatá %s</string>
-  <string name="could_not_get_path_to_file">Nepodarilo sa nájsť cestu k súboru</string>
+    <string name="error_sending_file">Chyba pri odosielaní súboru %s</string>
+    <string name="could_not_get_path_to_file">Nepodarilo sa nájsť cestu k súboru</string>
   <string name="message_open_private_chat">Otvoriť súkromný rozhovor</string>
-  <string name="http_file_upload_slot_error">Nepodarilo sa odovzdať súbor. Nie je príliš veľký?</string>
-  <string name="no_permission_to_read_files">Nemáte povolenie pre čítanie súborov</string>
+    <string name="no_permission_to_read_files">Nemáte povolenie pre čítanie súborov</string>
   <string name="no_permission_to_write_files">Nemáte povolenie pre zápis súborov</string>
   <string name="error_description_title">Popis chyby</string>
   <string name="message_status_sent">Odoslané</string>
diff --git a/xabber/src/main/res/values-sk-rSK/contact_editor.xml b/xabber/src/main/res/values-sk-rSK/contact_editor.xml
index 64990e468d..0e827f9ea3 100644
--- a/xabber/src/main/res/values-sk-rSK/contact_editor.xml
+++ b/xabber/src/main/res/values-sk-rSK/contact_editor.xml
@@ -17,12 +17,8 @@
   <string name="processing_image">Zpracovávam obrázok...</string>
   <string name="error_during_crop">Chyba počas orezávania obrázku</string>
   <string name="error_during_image_processing">Chyba počas spracovania obrazku</string>
-  <string name="account_settings">Nastavenia účtu</string>
-  <string name="account_user_info">Informácie o účte</string>
-  <string name="account_server_info">Informácie o serveri</string>
+    <string name="account_server_info">Informácie o serveri</string>
   <string name="account_server_info_description">Zoznam schopností servra</string>
   <string name="conference_private_chat_invitation">%1$s z %2$s chce s vami začať súkromný rozhovor</string>
   <string name="accept_muc_private_chat">Prijať</string>
-  <string name="block_muc_private_chat">Blokovať</string>
-  <string name="no_permission_camera">Nemáte povolenie pre prístup k fotoaparátu</string>
 </resources>
diff --git a/xabber/src/main/res/values-sk-rSK/contact_list.xml b/xabber/src/main/res/values-sk-rSK/contact_list.xml
index 82ecb41415..95ebc327b1 100644
--- a/xabber/src/main/res/values-sk-rSK/contact_list.xml
+++ b/xabber/src/main/res/values-sk-rSK/contact_list.xml
@@ -18,17 +18,13 @@
   <string name="application_state_roster">Pripojený.</string>
   <string name="application_state_starting">Spúšťam aplikáciu... </string>
   <string name="application_state_waiting">Čakám na pripojenie...</string>
-  <string name="chat_list">Zoznam rozhovorov</string>
-  <string name="chat_list_is_empty">Žiadne aktívne rozhovory</string>
-  <string name="chat_viewer">Rozhovor</string>
-  <string name="close_chat">Zavrieť rozhovor</string>
-  <string name="CONNECTION_FAILED">Chyba pripojenia</string>
+    <string name="chat_viewer">Rozhovor</string>
+    <string name="CONNECTION_FAILED">Chyba pripojenia</string>
   <string name="contact_add">Pridať kontakt</string>
   <string name="contact_delete">Zmazať</string>
   <string name="contact_block">Zablokovať kontakt</string>
   <string name="contact_delete_confirm">Naozaj chcete odstrániť kontakt %1$s z účtu %2$s?</string>
-  <string name="contact_list">Zoznam kontaktov</string>
-  <string name="discard_subscription">Odmietnuť kontakt</string>
+    <string name="discard_subscription">Odmietnuť kontakt</string>
   <string name="exit">Koniec</string>
   <string name="group_active_chat">Aktívne rozhovory</string>
   <string name="group_none">Žiadne skupiny</string>
@@ -40,15 +36,7 @@
   <string name="request_subscription">Požiadať o odber</string>
   <string name="XMPP_EXCEPTION">Chyba dátového toku</string>
   <string name="application_state_closing">Ukladám zmeny...\nAplikácia bude čoskoro zatvorená.</string>
-  <string name="certificate_confirmation">%1$s.\nÚplne veríte certifikátu s otlačkom prsta SHA-1: %2$s? Nechcete byť do budúcna oboznámovaný s týmto problém s týmto certifikátom?</string>
-  <string name="certificate_details">\n\nVydaný pre:\nZnáme meno (CN): %1$s\nOrganizácia (O): %2$s\nOrganizačná jednotka (OU): %3$s\nSériové číslo: %4$s\n\nVydaný od:\nZnáme meno (CN): %5$s\nOrganizácia (O): %6$s\nOrganizačná jednotka (OU): %7$s\n\nPlatnosť:\nDátum vydania: %8$s\nPlatnosť vyprší: %9$s.</string>
-  <string name="certificate_invalid_chane">Proces overenia podpisu zlyhal</string>
-  <string name="certificate_invalid_target">Cieľové overenie zlyhalo</string>
-  <string name="certificate_self_signed">Samopodpísaný certifikát</string>
-  <string name="certificate_show_details">Detaily ...</string>
-  <string name="close_chats">Zavrieť všetky rozhovory</string>
-  <string name="contact_integration_suggest">Chcete, aby bol Xabber integrovaný do systémových kontaktov?\nMôžete to zmeniť v \"Nastavenia\" → \"XMPP účty\" → Váš účet → \"Integrácia kontaktov\".\nPozn.: Systémové kontakty môžu byť pár minút spomalené.</string>
-  <string name="group_room">Konferencie</string>
+    <string name="group_room">Konferencie</string>
   <string name="OTR_ERROR">Chyba OTR</string>
   <string name="select_contact">Prosím kliknite pre zvolenie kontaktu</string>
   <string name="show_offline_always">Vždy zobraz</string>
@@ -63,8 +51,7 @@
   <string name="block_list">Zoznam blokovaných kontaktov</string>
   <string name="contact_blocked_successfully">Kontakt úspešne zablokovaný</string>
   <string name="error_blocking_contact">Chyba pri zablokovaní kontaktu</string>
-  <string name="unblock_contact">Odblokovať kontakt</string>
-  <string name="contacts_unblocked_successfully">Kontakt úspešne odblokovaný</string>
+    <string name="contacts_unblocked_successfully">Kontakt úspešne odblokovaný</string>
   <string name="error_unblocking_contacts">Chyba pri odblokovaní kontaktu</string>
   <string name="block_contact_confirm">Naozaj chcete zablokovať kontakt %1$s z účtu %2$s?</string>
   <string name="unblock_all_contacts_confirm">Naozaj chcete odblokovať všetky kontakty z účtu %1$s?</string>
@@ -76,19 +63,10 @@
   <string name="dark_theme_suggest_dialog_stay_on_light_side">Ostať na svetlej strane</string>
   <string name="battery_optimization_disable_dialog_title">Optimalizácia batérie</string>
   <string name="battery_optimization_disable_dialog_message">Vaše zariadenie vykonáva prílišné optimalizácie batérie voči Xabber-u, čo môže viesť k oneskoreným hláseniam, prípradne aj k ich strate.\n\nTeraz budete požiadaný o ich vypnutie.</string>
-  <string name="save_log_to_file">Uložiť do súboru</string>
-  <string name="clear_log">Odstrániť staré súbory denníka</string>
+    <string name="clear_log">Odstrániť staré súbory denníka</string>
   <string name="open_log_file">Otvoriť</string>
   <string name="send_log_file">Odoslať</string>
-  <string name="intro_welcome">Vitajte na Xabber</string>
-  <string name="intro_xabber_description">Open source XMPP klient pre Android</string>
-  <string name="intro_have_account">Prihlásiť do XMPP účtu</string>
-  <string name="intro_register_account">Zaregistruj nový účet</string>
-  <string name="intro_create_xabber_account">Použi Xabber účet</string>
-  <string name="intro_use_third_party_accounts">použiť treťostranný XMPP účet</string>
-  <string name="intro_faq">Ak nemáte XMPP účet, prosím, <a href="https://www.xabber.com/faq/"> Prečítajte si naše najčastejšie otázky</a> o tom, ako dostať jeden.</string>
-  <string name="intro_web_search_register_xmpp">Zaregistruj nový účet</string>
-  <string name="synchronize_bookmarks">Synchronizovať záložky</string>
+    <string name="synchronize_bookmarks">Synchronizovať záložky</string>
   <string name="remove_all_bookmarks">Odstrániť všetko</string>
   <string name="remove_selected_bookmarks">Odstrániť vybrané</string>
   <string name="remove_all_bookmarks_confirm">Naozaj chcete odblokovať všetky kontakty z účtu %1$s?</string>
diff --git a/xabber/src/main/res/values-sk-rSK/contact_viewer.xml b/xabber/src/main/res/values-sk-rSK/contact_viewer.xml
index 0a075461a2..b934210518 100644
--- a/xabber/src/main/res/values-sk-rSK/contact_viewer.xml
+++ b/xabber/src/main/res/values-sk-rSK/contact_viewer.xml
@@ -17,12 +17,9 @@
   <string name="vcard_organization_unit">Pracovná funkcia</string>
   <string name="vcard_title">Zamestnanie, funkcia</string>
   <string name="vcard_role">Funkcia</string>
-  <string name="vcard_other">Iné informácie</string>
-  <string name="vcard_categories">Kategórie</string>
-  <string name="vcard_decsription">Popis</string>
+    <string name="vcard_decsription">Popis</string>
   <string name="vcard_note">Poznámky</string>
-  <string name="vcard_address">Adresa</string>
-  <string name="vcard_address_pobox">PO Box</string>
+    <string name="vcard_address_pobox">PO Box</string>
   <string name="vcard_address_extadr">Rozšírená adresa</string>
   <string name="vcard_address_street">Ulica</string>
   <string name="vcard_address_locality">Lokalita</string>
diff --git a/xabber/src/main/res/values-sk-rSK/muc_editor.xml b/xabber/src/main/res/values-sk-rSK/muc_editor.xml
index f90ca765c2..7f3659adc4 100644
--- a/xabber/src/main/res/values-sk-rSK/muc_editor.xml
+++ b/xabber/src/main/res/values-sk-rSK/muc_editor.xml
@@ -20,12 +20,10 @@
   <string name="muc_invite_confirm">%2$s vás pozýva do konferencie %3$s. Pripojiť sa z účtu %1$s?</string>
   <string name="muc_invite_confirm_reason">%2$s vás pozýva do konferencie %3$s: %4$s. Pripojiť sa z účtu %1$s?</string>
   <string name="muc_leave">Opustiť konferenciu</string>
-  <string name="muc_save">Uložiť konferenciu</string>
-  <string name="muc_choose_conference">Vyberte konferenciu</string>
+    <string name="muc_choose_conference">Vyberte konferenciu</string>
   <string name="muc_next">Ďalej</string>
   <string name="muc_get_hosted_conferences">Získať zoznam konferencií</string>
   <string name="muc_error_getting_conferences">Chyba pri získavaní zoznamu konferencií</string>
   <string name="muc_type_conference_name">Zadajte názov konferencie</string>
-  <string name="contact_is_blocked">Kontakt je zablokovaný!</string>
-  <string name="conference_invitation">Pozvánka na konferenciu</string>
+    <string name="conference_invitation">Pozvánka na konferenciu</string>
 </resources>
diff --git a/xabber/src/main/res/values-sk-rSK/notification_bar.xml b/xabber/src/main/res/values-sk-rSK/notification_bar.xml
index d4156c9111..6916aec647 100644
--- a/xabber/src/main/res/values-sk-rSK/notification_bar.xml
+++ b/xabber/src/main/res/values-sk-rSK/notification_bar.xml
@@ -34,10 +34,7 @@
   <!-- Used for plural form in russian. -->
   <string name="connection_state_waiting_5">čakajúcich</string>
   <string name="connection_state_offline">%1$d %2$s odpojených</string>
-  <string name="archive_available_request_message">Chcete ukladať históriu správ na serveri?\nDovoluje to Xabberu načítať históriu správ zo všetkých zariadení používajúcich tento účet.\nTáto funkcia si vezme trochu viac dátového objemu a mierne spomalí rýchlosť pripojenia.\nVAROVANIE: Všetka vaša lokálna história bude odstránená .</string>
-  <string name="archive_available_request_title">Povoliť archív správ?</string>
-  <string name="INVALID_CERTIFICATE">Neplatný certifikát</string>
-  <string name="muc_invite_message">Chcete vstúpiť do konferencie?</string>
+    <string name="muc_invite_message">Chcete vstúpiť do konferencie?</string>
   <string name="otr_verification_in_progress">Kliknite sem pre jeho prerušenie.</string>
   <string name="PASSWORD_REQUIRED">Heslo požadované</string>
   <string name="pay_attention">Dávať pozor</string>
diff --git a/xabber/src/main/res/values-sk-rSK/preference_editor.xml b/xabber/src/main/res/values-sk-rSK/preference_editor.xml
index 6084c9f44b..35f5d0c33d 100644
--- a/xabber/src/main/res/values-sk-rSK/preference_editor.xml
+++ b/xabber/src/main/res/values-sk-rSK/preference_editor.xml
@@ -12,14 +12,11 @@
   <string name="contacts_order_alphabet">Abecedne</string>
   <string name="contacts_order_status">Podľa stavu</string>
   <string name="contacts_show_accounts">Zoskupiť podľa účtu\nZoskupiť kontakty v zozname podľa účtu</string>
-  <string name="contacts_show_active_chats">Aktívne konverzácie na vrchu\nZobraziť aktívne konverzácie na vrchu zoznamu kontaktov</string>
-  <string name="contacts_show_avatars">Zobraziť avatary\nZobraziť avatary používateľov v zozname kontaktov</string>
+    <string name="contacts_show_avatars">Zobraziť avatary\nZobraziť avatary používateľov v zozname kontaktov</string>
   <string name="contacts_show_empty_groups">Zobraziť prázdne skupiny\nZobraziť skupiny bez online kontaktov</string>
   <string name="contacts_show_groups">Zobraziť skupiny\nZobraziť skupiny v zozname kontaktov</string>
   <string name="contacts_show_offline">Zobraziť odpojené kontakty</string>
-  <string name="contacts_show_panel">Zobraziť panel účty\nZobraziť akčné tlačidlá s miniatúrami v pravom dolnom rohu zoznamu kontaktov</string>
-  <string name="contacts_stay_active_chats">Duplikovať aktívne konverzácie\nAktívne konverzácie sa zobrazia aj na vrchu zoznamu kontaktov aj v skupinách</string>
-  <string name="debug_log">Ladiaci záznam\nZapisovať správy do ladiaceho záznamu (prosím reštartujte aplikáciu pre uplatnenie zmeny)</string>
+    <string name="debug_log">Ladiaci záznam\nZapisovať správy do ladiaceho záznamu (prosím reštartujte aplikáciu pre uplatnenie zmeny)</string>
   <string name="debug_file_log_title">Zapísať log súbor\nZapíše ladiaci log do lokálneho súboru (môžete ho zdieľať).</string>
   <string name="debug_log_files_title">Log súbory\nZoznam zapísaných log súborov.</string>
   <string name="debug_log_files_activity_title">Súbory denníka</string>
@@ -36,8 +33,7 @@
   <string name="interface_theme">Vzhľad</string>
   <string name="interface_theme_dark">Tmavá</string>
   <string name="interface_theme_light">Svetlá</string>
-  <string name="interface_theme_normal">Predvolená</string>
-  <string name="interface_smiles">Smajlíky</string>
+    <string name="interface_smiles">Smajlíky</string>
   <string name="interface_smiles_android">Androidové emotikony</string>
   <string name="interface_smiles_none">Bez grafických emotikon</string>
   <string name="preference_connection">Nastavenia pripojenia\nNastavenia pripojenia</string>
@@ -62,8 +58,7 @@
   <string name="chats_font_size_xlarge">Extra veľké</string>
   <string name="chats_hide_keyboard">Skryť klávesnicu</string>
   <string name="chats_hide_keyboard_landscape">V režime na ležato</string>
-  <string name="chats_receipt">Potvrdenie o doručení správ\nPosielať a prijímať potvrdenia o doručení správ</string>
-  <string name="chats_show_avatars">Avatary v správach\nZobraziť avatary v správach</string>
+    <string name="chats_show_avatars">Avatary v správach\nZobraziť avatary v správach</string>
   <string name="chats_show_status_change">Zobraziť zmeny stavu</string>
   <string name="chats_show_status_change_muc">V konferenciách</string>
   <string name="chats_state_notification">Zasielať \"píše...\" notifikácie\nUpozorniť ďalších používateľov na to, že píšete</string>
@@ -77,37 +72,24 @@
   <string name="contacts_reset_offline">Vyresetovať offline nastavenia\nVyčistiť individuálne nastavenia pre skupiny a účty</string>
   <string name="contacts_reset_offline_warning">Chcete naozaj vymazať individuálne nastavenia pre skupiny a účty?</string>
   <string name="events_first_only">Upozornenie na prvú správu\nUpozorní iba na prvú správu v konverzácii</string>
-  <string name="events_ignore_system_vibro">Ignorovať systémové nastavenia vibrácií\nPoužite túto možnosť ak systémové vibrácie nefungujú</string>
-  <string name="events_message">Nastavenia notifikácií\nNastavte notifikácie pre prichádzajúce správy</string>
-  <string name="events_message_chat">Iba rozhovory</string>
-  <string name="events_message_chat_and_muc">Rozhovory a konferencie</string>
-  <string name="events_message_none">Neupozorňovať</string>
-  <string name="events_show_text">Náhľad správy\nZobraz text správy z chatu v oblásti upozornení</string>
+    <string name="events_show_text">Náhľad správy\nZobraz text správy z chatu v oblásti upozornení</string>
   <string name="events_show_text_muc">Náhľad správy\nZobraz text správy z konferencií v oblásti upozornení</string>
-  <string name="events_visible_chat">Upozorniť v aktuálnom rozhovore\nUpozorniť na prichádzajúcu správu v aktuálnom rozhovore</string>
-  <string name="events_suppress_100">Potlačiť niektoré správy o stavoch\nNedostávať správy \'Táto miestnosť nie je anonymná\'</string>
+    <string name="events_suppress_100">Potlačiť niektoré správy o stavoch\nNedostávať správy \'Táto miestnosť nie je anonymná\'</string>
   <string name="negative_priotiry_summary">%s (neobdržíte správy zo žiadneho rozhovoru)</string>
   <string name="preference_accounts">XMPP účty\nSpravovať účty</string>
   <string name="preference_security">Ochrana\nNastavenie ochrany</string>
   <string name="security_check_certificate">Skontrolovať certifikát servera\nUpozorniť na problémy certifikátu počas šifrovaných spojení</string>
-  <string name="security_clear_certificate">Odstrániť certifikáty\nVyčistí zoznam ignorovaných certifikátov</string>
-  <string name="security_otr_history">Ukladať históriu\nUkladať históriu OTR konverzácií</string>
-  <string name="security_otr_mode">Režim OTR</string>
+    <string name="security_otr_mode">Režim OTR</string>
   <string name="chats_attention">Pozornosť\nReagovať na prichádzajúce žiadosti o pozornosť</string>
   <string name="chats_attention_sound">Zvuk pozornosti\nZvoľte vyzváňanie</string>
   <string name="connection_load_vcard">Načítať vCard\nNačítať a aktualizovať osobné informácie kontaktu a avatar. Vypnite pre zmenšenie objemu dátového prenosu</string>
   <string name="connection_load_images">Načítať obrázky\nNačítať automaticky obrazky z URL adresy. Zakázom sa zníži prenos dát.</string>
   <string name="connection_use_carbons">Režim kópie\nMôže byť nestabilný! Bude zdieľať relácie pre rovnaký účet na tomto klientovi. Vypnite pre zníženie spotreby dát.</string>
-  <string name="connection_dns_resolver_type">DNS resolver typu</string>
-  <string name="connection_dns_resolver_type_dns_java_resolver">DNSJavaResolver</string>
+    <string name="connection_dns_resolver_type_dns_java_resolver">DNSJavaResolver</string>
   <string name="connection_dns_resolver_type_mini_dns_resolver">MiniDNSResolver (experimentálne)</string>
-  <string name="connection_use_plain_text_auth">Overenie obyčajným textom\nPoužiť obyčajný text pre overenie na všetkých účtoch. Neodporúčané.</string>
-  <string name="events_phrases">Kľúčové frázy\nVytvorte vlastné notifikácie pre prijaté správy, ktoré obsahujú špecifické frázy</string>
-  <string name="security_clear_certificate_warning">Naozaj chcete odstrániť všetky ignorované certifikáty?</string>
-  <string name="account_error_settings">Nastavenia</string>
-  <string name="category_xabber_account">Xabber účet</string>
-  <string name="category_xmpp_accounts">XMPP účty</string>
-  <string name="category_interface">Rozhranie</string>
+    <string name="events_phrases">Kľúčové frázy\nVytvorte vlastné notifikácie pre prijaté správy, ktoré obsahujú špecifické frázy</string>
+    <string name="account_error_settings">Nastavenia</string>
+    <string name="category_interface">Rozhranie</string>
   <string name="category_settings">Nastavenia</string>
   <string name="category_about">O programe</string>
   <string name="category_appearance">Vzhľad</string>
diff --git a/xabber/src/main/res/values-sk-rSK/words.xml b/xabber/src/main/res/values-sk-rSK/words.xml
index 1d692b87ec..e6bc7237f7 100644
--- a/xabber/src/main/res/values-sk-rSK/words.xml
+++ b/xabber/src/main/res/values-sk-rSK/words.xml
@@ -20,5 +20,4 @@
   <string name="settings">Nastavenia</string>
   <string name="ok">OK</string>
   <string name="login">Prihlásenie</string>
-  <string name="resume">Obnoviť</string>
 </resources>
diff --git a/xabber/src/main/res/values-sr-rSP/account_editor.xml b/xabber/src/main/res/values-sr-rSP/account_editor.xml
index 08a67c9858..870ab96e55 100644
--- a/xabber/src/main/res/values-sr-rSP/account_editor.xml
+++ b/xabber/src/main/res/values-sr-rSP/account_editor.xml
@@ -2,39 +2,24 @@
 <!--Generated by crowdin.com-->
 <resources>
   <string name="account_compression">Користи компресију</string>
-  <string name="account_enabled">Укључен</string>
-  <string name="account_host">Домаћин</string>
+    <string name="account_host">Домаћин</string>
   <string name="account_password">Лозинка</string>
   <string name="confirm_password">Потврда лозинке</string>
   <string name="account_port">Порт</string>
   <string name="account_priority">Приоритет</string>
   <string name="account_resource">Ресурс</string>
   <string name="account_server_name">Сервер</string>
-  <string name="account_type">Тип налога</string>
-  <string name="account_type_hints_gtalk">корисничко име за gmail.com или Google Apps домен</string>
-  <string name="account_type_helps_gtalk">Ако немате Гугл налог можете да га направите на http://mail.google.com\nТакође можете да користите vase_korisnicko_ime@vas_google_domen</string>
-  <string name="account_type_helps_xmpp">Сазнајте више о ИксМПП (Џаберу) овде: https://xmpp.org</string>
-  <string name="account_user_name">Корисничко име</string>
+    <string name="account_user_name">Корисничко име</string>
   <string name="EMPTY_SERVER_NAME">Није наведено име сервера</string>
   <string name="EMPTY_USER_NAME">Није наведено корисничко име</string>
   <string name="CONFIRM_PASSWORD">Лозинке се не поклапају</string>
-  <string name="account_archive_mode">Складишти историјат порука</string>
-  <string name="account_archive_mode_available">на серверу ако је могуће</string>
-  <string name="account_archive_mode_dont_store">не складишти</string>
-  <string name="account_archive_mode_local">локално на уређају</string>
-  <string name="account_archive_mode_server">на серверу</string>
-  <string name="account_archive_mode_unread">локално, непослате и непрочитане</string>
-  <string name="account_compression_summary">Укључује компресију података</string>
+    <string name="account_compression_summary">Укључује компресију података</string>
   <string name="account_custom">Прилагођени домаћин</string>
   <string name="account_custom_summary">Користи посебне поставке домаћина уместо СРВ записа</string>
-  <string name="account_enabled_summary">Кликните да укључите налог</string>
-  <string name="account_invalid_port">Порт мора бити број (подразумевано: 5222)</string>
+    <string name="account_invalid_port">Порт мора бити број (подразумевано: 5222)</string>
   <string name="account_invalid_port_range">Порт мора бити између 1 и 65535 (подразумевани: 5222)</string>
   <string name="account_invalid_priority">Приоритет мора бити број између -128 и 127 (подразумевано: 10)</string>
-  <string name="account_oauth">Овлашћење</string>
-  <string name="account_oauth_invalidated">Без овлашћења</string>
-  <string name="account_oauth_summary">ОАут поставке</string>
-  <string name="account_proxy_host">Домаћин проксија</string>
+    <string name="account_proxy_host">Домаћин проксија</string>
   <string name="account_proxy_invalid_port_range">Порт проксија мора бити између 1 и 65535 (подразумевани: 8080)</string>
   <string name="account_proxy_invalid_port">Порт проксија мора бити број (подразумевано: 8080)</string>
   <string name="account_proxy_password">Лозинка проксија</string>
@@ -46,18 +31,14 @@
   <string name="account_sasl_summary">Искључите за старије сервере</string>
   <string name="account_store_password">Запамти лозинку</string>
   <string name="account_store_password_summary">Искључите ову опцију да би се лозинка тражила сваки пут кад се повезујете</string>
-  <string name="account_syncable">Интеграција са системским контактима</string>
-  <string name="account_syncable_summary">Прикажи контакте из овог налога у системској листи контаката</string>
-  <string name="account_tls_enable">Укључи ТЛС</string>
+    <string name="account_tls_enable">Укључи ТЛС</string>
   <string name="account_tls_enable_summary">Користи ТЛС шифровање при повезивању кад је могуће</string>
   <string name="account_tls_legacy">Застарели ССЛ</string>
   <string name="account_tls_legacy_summary">Користи застарело ССЛ шифровање при повезивању кад је могуће</string>
   <string name="account_tls_mode">Употреба ТЛС/ССЛ</string>
   <string name="account_tls_require">Захтевај ТЛС</string>
   <string name="account_tls_require_summary">Захтевај ТЛС шифровање при повезивању са сервером</string>
-  <string name="account_use_orbot">Ћаскање преко ТОР анонимне мреже и присила ТЛС криптографског протокола\nНије препоручиво за Гугл Talk</string>
-  <string name="confirm_cancellation">Желите ли заиста да одбаците све измене?</string>
-  <string name="INCORRECT_USER_NAME">Неисправно корисничко име. За детаље погледајте помоћ испод.</string>
+    <string name="INCORRECT_USER_NAME">Неисправно корисничко име. За детаље погледајте помоћ испод.</string>
   <string name="orbot_required_message">Да бисте користили ТОР посредника морате имати инсталиран Орбот и активиран прокси саобраћај кроз њега. Желите ли да га инсталирате са Гугл Плеја?</string>
   <string name="orbot_required_title">Инсталирати Орбот?</string>
   <string name="install_orbot">Инсталирај Орбот</string>
diff --git a/xabber/src/main/res/values-sr-rSP/chat_viewer.xml b/xabber/src/main/res/values-sr-rSP/chat_viewer.xml
index 5f2d69f1df..3769c822d9 100644
--- a/xabber/src/main/res/values-sr-rSP/chat_viewer.xml
+++ b/xabber/src/main/res/values-sr-rSP/chat_viewer.xml
@@ -19,11 +19,8 @@
   <string name="message_quote">Цитирај</string>
   <string name="message_remove">Уклони из историјата</string>
   <string name="message_repeat">Поново покушај слање</string>
-  <string name="message_open_file">Отвори</string>
-  <string name="message_save_file">Сачувај</string>
-  <string name="save_history">Сачувај историјат локално\nИсторијат порука се чува локално</string>
-  <string name="show_history">Прикажи историјат</string>
-  <string name="action_attention_called">Позив за пажњу је послат</string>
+    <string name="save_history">Сачувај историјат локално\nИсторијат порука се чува локално</string>
+    <string name="action_attention_called">Позив за пажњу је послат</string>
   <string name="action_attention_requested">Тражена је пажња</string>
   <string name="action_ban">корисник %1$s је блокиран</string>
   <string name="action_ban_by">%2$s блокира %1$s</string>
@@ -71,26 +68,17 @@
   <string name="otr_refresh">Поново почни шифровање</string>
   <string name="otr_request">Поверљива (ОТР) лична преписка се захтева од вас али немате могућности за то. Користите Пиџин, Гаџим или Адијум за рачунар и Ксабер, Конверзацију или Сигурно ћаскање за Андроид. Посетите http://otr.cypherpunks.ca/ за више података.</string>
   <string name="otr_start">Почни шифровање</string>
-  <string name="otr_unencrypted_message">Ова порука није шифрована</string>
-  <string name="otr_unreadable_message">Шифрована порука коју сте послали није читљива</string>
+    <string name="otr_unreadable_message">Шифрована порука коју сте послали није читљива</string>
   <string name="otr_verification">ОТР потврђивање</string>
   <string name="otr_verify_fingerprint">Провери помоћу отиска</string>
   <string name="otr_verify_question">Провери помоћу питања</string>
   <string name="otr_verify_secret">Провери помоћу заједничке тајне</string>
-  <string name="under_construction">У изградњи</string>
-  <string name="under_construction_message">Овај екран је у изградњи</string>
-  <string name="chat_events_show_text_global">Користи опште поставке</string>
+    <string name="chat_events_show_text_global">Користи опште поставке</string>
   <string name="chat_events_show_text_always">Прикажи текст поруке</string>
   <string name="chat_events_show_text_never">Сакриј текст поруке</string>
-  <string name="sending_file">Шаљем фајл %s</string>
-  <string name="error_sending_file">Грешка при слању фајла %s</string>
-  <string name="no_application_to_open_file">Нема апликације за отварање овог фајла</string>
-  <string name="could_not_save_file">Не могу да сачувам фајл</string>
-  <string name="file_saved_successfully">Фајл успешно сачуван</string>
-  <string name="received_by">Посла %s</string>
-  <string name="could_not_get_path_to_file">Не могу да добијем путању фајла</string>
+    <string name="error_sending_file">Грешка при слању фајла %s</string>
+    <string name="could_not_get_path_to_file">Не могу да добијем путању фајла</string>
   <string name="message_open_private_chat">Отвори приватно ћаскање</string>
-  <string name="http_file_upload_slot_error">Нисам могао да отпремим фајл. Да није превелик?</string>
-  <string name="no_permission_to_read_files">Немам дозволу за читање фајлова</string>
+    <string name="no_permission_to_read_files">Немам дозволу за читање фајлова</string>
   <string name="no_permission_to_write_files">Немам дозволу за упис фајлова</string>
 </resources>
diff --git a/xabber/src/main/res/values-sr-rSP/contact_editor.xml b/xabber/src/main/res/values-sr-rSP/contact_editor.xml
index 951b542366..83e6a57a37 100644
--- a/xabber/src/main/res/values-sr-rSP/contact_editor.xml
+++ b/xabber/src/main/res/values-sr-rSP/contact_editor.xml
@@ -17,12 +17,8 @@
   <string name="processing_image">Обрађујем слику...</string>
   <string name="error_during_crop">Грешка током опсецања слике</string>
   <string name="error_during_image_processing">Грешка током обраде слике</string>
-  <string name="account_settings">Поставке налога</string>
-  <string name="account_user_info">Подаци о налогу</string>
-  <string name="account_server_info">Подаци о серверу</string>
+    <string name="account_server_info">Подаци о серверу</string>
   <string name="account_server_info_description">Списак могућности сервера</string>
   <string name="conference_private_chat_invitation">%1$s са %2$s жели да почне приватно ћаскање са вама</string>
   <string name="accept_muc_private_chat">Прихвати</string>
-  <string name="block_muc_private_chat">Блокирај</string>
-  <string name="no_permission_camera">Немам дозволу за приступ камери</string>
 </resources>
diff --git a/xabber/src/main/res/values-sr-rSP/contact_list.xml b/xabber/src/main/res/values-sr-rSP/contact_list.xml
index 90e1960761..2416e88cb0 100644
--- a/xabber/src/main/res/values-sr-rSP/contact_list.xml
+++ b/xabber/src/main/res/values-sr-rSP/contact_list.xml
@@ -18,17 +18,13 @@
   <string name="application_state_roster">Повезан.</string>
   <string name="application_state_starting">Покрећем апликацију... </string>
   <string name="application_state_waiting">Чекам везу...</string>
-  <string name="chat_list">Списак преписки</string>
-  <string name="chat_list_is_empty">Нема активних преписки</string>
-  <string name="chat_viewer">Ћаскање</string>
-  <string name="close_chat">Затвори ћаскање</string>
-  <string name="CONNECTION_FAILED">Грешка при повезивању</string>
+    <string name="chat_viewer">Ћаскање</string>
+    <string name="CONNECTION_FAILED">Грешка при повезивању</string>
   <string name="contact_add">Додај контакт</string>
   <string name="contact_delete">Обриши</string>
   <string name="contact_block">Блокирај контакт</string>
   <string name="contact_delete_confirm">Желите ли заиста да обришете контакт %1$s са налога %2$s?</string>
-  <string name="contact_list">Списак контаката</string>
-  <string name="discard_subscription">Одбиј контакт</string>
+    <string name="discard_subscription">Одбиј контакт</string>
   <string name="exit">Изађи</string>
   <string name="group_active_chat">Активне преписке</string>
   <string name="group_none">Нема група</string>
@@ -40,14 +36,7 @@
   <string name="request_subscription">Затражи претплату</string>
   <string name="XMPP_EXCEPTION">Грешка тока</string>
   <string name="application_state_closing">Уписујем измене&#8230;\nАпликација ће да се затвори ускоро.</string>
-  <string name="certificate_details">\n\nИздат за:\nУобичајени назив (CN): %1$s\nОрганизација (O): %2$s\nОрганизациона јединица (OU): %3$s\nСеријски број: %4$s\n\nИздавач:\nУобичајени назив (CN): %5$s\nОрганизација (O): %6$s\nОрганизациона јединица (OU): %7$s\n\nВажност:\nИздат: %8$s\nИстиче: %9$s.</string>
-  <string name="certificate_invalid_chane">Потврђивање потписа ланца није успело</string>
-  <string name="certificate_invalid_target">Потврђивање мете није успело</string>
-  <string name="certificate_self_signed">Самопотписан сертификат</string>
-  <string name="certificate_show_details">Детаљи...</string>
-  <string name="close_chats">Затвори све преписке</string>
-  <string name="contact_integration_suggest">Желите ли да се Ксабер интегрише у системске контакте?\nОво се може изменити у „Поставке“ → „ИксМПП налози“ → Ваш налог → „Интеграција контаката“.\nНапомена: Листање системских контаката биће спорије неколико минута.</string>
-  <string name="group_room">Групна ћаскања</string>
+    <string name="group_room">Групна ћаскања</string>
   <string name="OTR_ERROR">ОТР грешка</string>
   <string name="select_contact">Тапните за избор контакта</string>
   <string name="show_offline_always">увек</string>
@@ -62,8 +51,7 @@
   <string name="block_list">Блокирај листу</string>
   <string name="contact_blocked_successfully">Контакт успешно блокиран</string>
   <string name="error_blocking_contact">Грешка при блокирању контакта</string>
-  <string name="unblock_contact">Одблокирај контакт</string>
-  <string name="contacts_unblocked_successfully">Контакт успешно одблокирана</string>
+    <string name="contacts_unblocked_successfully">Контакт успешно одблокирана</string>
   <string name="error_unblocking_contacts">Грешка при одблокирању контакта</string>
   <string name="block_contact_confirm">Желите ли заиста да блокирате %1$s са налога %2$s?</string>
   <string name="unblock_all_contacts_confirm">Желите ли заиста да одблокирате све контакте са налога %1$s?</string>
@@ -74,12 +62,6 @@
   <string name="dark_theme_suggest_dialog_join_dark_side">Придружи се Тамној страни</string>
   <string name="dark_theme_suggest_dialog_stay_on_light_side">Остани на Светлој страни</string>
   <string name="battery_optimization_disable_dialog_title">Оптимизација батерије</string>
-  <string name="save_log_to_file">Сачувај у фајл</string>
-  <string name="open_log_file">Отвори</string>
+    <string name="open_log_file">Отвори</string>
   <string name="send_log_file">Пошаљи</string>
-  <string name="intro_welcome">Добро дошли у Ксабер</string>
-  <string name="intro_xabber_description">ИксМПП клијент за Андроид отвореног кôда</string>
-  <string name="intro_register_account">Региструј ИксМПП налог</string>
-  <string name="intro_faq">Ако немате ИксМПП налог <a href="https://www.xabber.com/faq/">прочитајте честа питања</a> како да га набавите.</string>
-  <string name="intro_web_search_register_xmpp">Региструј ИксМПП налог</string>
 </resources>
diff --git a/xabber/src/main/res/values-sr-rSP/contact_viewer.xml b/xabber/src/main/res/values-sr-rSP/contact_viewer.xml
index 84c2c47ce2..ae7e154ffc 100644
--- a/xabber/src/main/res/values-sr-rSP/contact_viewer.xml
+++ b/xabber/src/main/res/values-sr-rSP/contact_viewer.xml
@@ -17,12 +17,9 @@
   <string name="vcard_organization_unit">Организациона јединица</string>
   <string name="vcard_title">Радно место, функција</string>
   <string name="vcard_role">Улога</string>
-  <string name="vcard_other">Остали подаци</string>
-  <string name="vcard_categories">Категорије</string>
-  <string name="vcard_decsription">Опис</string>
+    <string name="vcard_decsription">Опис</string>
   <string name="vcard_note">Белешке</string>
-  <string name="vcard_address">Адреса</string>
-  <string name="vcard_address_pobox">Поштански фах</string>
+    <string name="vcard_address_pobox">Поштански фах</string>
   <string name="vcard_address_extadr">Проширена адреса</string>
   <string name="vcard_address_street">Улица</string>
   <string name="vcard_address_locality">Локалитет</string>
diff --git a/xabber/src/main/res/values-sr-rSP/muc_editor.xml b/xabber/src/main/res/values-sr-rSP/muc_editor.xml
index b76881bb66..cdc968f655 100644
--- a/xabber/src/main/res/values-sr-rSP/muc_editor.xml
+++ b/xabber/src/main/res/values-sr-rSP/muc_editor.xml
@@ -20,12 +20,10 @@
   <string name="muc_invite_confirm">%2$s вас позива у групно ћаскање %3$s. Да се придружим се са налога %1$s?</string>
   <string name="muc_invite_confirm_reason">%2$s вас позива у групно ћаскање %3$s: %4$s. Да се придружим се са налога %1$s?</string>
   <string name="muc_leave">Напусти групно ћаскање</string>
-  <string name="muc_save">Сачувај групно ћаскање</string>
-  <string name="muc_choose_conference">Изаберите групно ћаскање</string>
+    <string name="muc_choose_conference">Изаберите групно ћаскање</string>
   <string name="muc_next">Следеће</string>
   <string name="muc_get_hosted_conferences">Добави хостована групна ћаскања</string>
   <string name="muc_error_getting_conferences">Грешка при добављању групних ћаскања</string>
   <string name="muc_type_conference_name">Укуцајте назив групног ћаскања</string>
-  <string name="contact_is_blocked">Контакт је блокиран!</string>
-  <string name="conference_invitation">Позивница за групно ћаскање</string>
+    <string name="conference_invitation">Позивница за групно ћаскање</string>
 </resources>
diff --git a/xabber/src/main/res/values-sr-rSP/notification_bar.xml b/xabber/src/main/res/values-sr-rSP/notification_bar.xml
index 9005116073..8ecb25ed33 100644
--- a/xabber/src/main/res/values-sr-rSP/notification_bar.xml
+++ b/xabber/src/main/res/values-sr-rSP/notification_bar.xml
@@ -34,10 +34,7 @@
   <!-- Used for plural form in russian. -->
   <string name="connection_state_waiting_5">%1$d од %2$d %3$s чекају на повезивање</string>
   <string name="connection_state_offline">%1$d %2$s ван везе</string>
-  <string name="archive_available_request_message">Желите ли да складиштите историјат порука на серверу?\nОво омогућује Ксаберу да учита историјат порука са свих уређаја који користе овај налог.\nОва функција ће повући нешто више података са интернета и лагано смањити брзину везе.\nУПОЗОРЕЊЕ: Читав ваш локални историјат ће бити уклоњен.</string>
-  <string name="archive_available_request_title">Омогућити архивисање порука?</string>
-  <string name="INVALID_CERTIFICATE">Неисправан сертификат</string>
-  <string name="muc_invite_message">Желите ли да се прикључите групном ћаскању?</string>
+    <string name="muc_invite_message">Желите ли да се прикључите групном ћаскању?</string>
   <string name="otr_verification_in_progress">Кликните овде за прекид.</string>
   <string name="PASSWORD_REQUIRED">Потребна је лозинка</string>
   <string name="pay_attention">Обратите пажњу</string>
diff --git a/xabber/src/main/res/values-sr-rSP/preference_editor.xml b/xabber/src/main/res/values-sr-rSP/preference_editor.xml
index 83b173584e..7d5d825c61 100644
--- a/xabber/src/main/res/values-sr-rSP/preference_editor.xml
+++ b/xabber/src/main/res/values-sr-rSP/preference_editor.xml
@@ -8,14 +8,11 @@
   <string name="contacts_order_alphabet">по имену</string>
   <string name="contacts_order_status">по стању</string>
   <string name="contacts_show_accounts">Групиши по налогу\nГруписање контаката у листи по налозима</string>
-  <string name="contacts_show_active_chats">Активна ћаскања на врху\nПриказ активних ћаскања изнад листе контаката</string>
-  <string name="contacts_show_avatars">Прикажи аватаре\nПриказ аватара корисника у листи</string>
+    <string name="contacts_show_avatars">Прикажи аватаре\nПриказ аватара корисника у листи</string>
   <string name="contacts_show_empty_groups">Прикажи празне групе\nПриказ група без контаката на вези</string>
   <string name="contacts_show_groups">Прикажи групе\nПриказ групе у листи контаката</string>
   <string name="contacts_show_offline">Прикажи неповезане контакте</string>
-  <string name="contacts_show_panel">Прикажи панел налога\nПриказ дугмади радњи са аватарима у доњем десном углу листе</string>
-  <string name="contacts_stay_active_chats">Дупликати активног ћаскања\nАктивна ћаскања се приказују и изнад листе и у групама</string>
-  <string name="debug_log">Дневник грешака\nУпис порука у дневник за отклањање грешака (потребан рестарт)</string>
+    <string name="debug_log">Дневник грешака\nУпис порука у дневник за отклањање грешака (потребан рестарт)</string>
   <string name="debug_log_files_activity_title">Фајлови дневника</string>
   <string name="debug_connection_errors_title">Приказ грешака везе\nИскачуће поруке при грешкама повезивања</string>
   <string name="debug_crash_reports_dialog_settings_button">Поставке</string>
@@ -23,8 +20,7 @@
   <string name="events_persistent">Икона траке задатака\nПриказује стално обавештење. Ова опција спречава Андроид да избаци програм из меморије</string>
   <string name="interface_theme_dark">тамна</string>
   <string name="interface_theme_light">светла</string>
-  <string name="interface_theme_normal">подразумевана</string>
-  <string name="interface_smiles_android">Андроидови емотикони</string>
+    <string name="interface_smiles_android">Андроидови емотикони</string>
   <string name="interface_smiles_none">без графичких емотикона</string>
   <string name="preference_connection">Поставке везе\nПоставке везе</string>
   <string name="preference_contacts">Списак контаката\nПрилагођавање изгледа списка контаката</string>
@@ -39,8 +35,7 @@
   <string name="chats_font_size_small">мали</string>
   <string name="chats_font_size_xlarge">веома велики</string>
   <string name="chats_hide_keyboard_landscape">у положеном режиму</string>
-  <string name="chats_receipt">Потврда о пријему поруке\nШаљи и примај потврде о пријему поруке</string>
-  <string name="chats_show_avatars">Аватари у порукама\nПриказ аватара у свакој поруци</string>
+    <string name="chats_show_avatars">Аватари у порукама\nПриказ аватара у свакој поруци</string>
   <string name="chats_show_status_change_muc">у групним ћаскањима</string>
   <string name="chats_state_notification">Прикажи обавештење о куцању\nПриказује кад други корисник куца поруку</string>
   <string name="connection_adjust_priority">Подеси важност\nПодеси важност на основу изабраног стања. Важност налога биће занемарена.</string>
@@ -53,27 +48,17 @@
   <string name="contacts_reset_offline">Ресетуј поставке „ван везе“\nБрише појединачне поставке за групе и налоге за приказ неповезаних контаката</string>
   <string name="contacts_reset_offline_warning">Заиста желите да очистите појединачне поставке за групе и налоге?</string>
   <string name="events_first_only">Упозори само на прву поруку\nОбавештење само за прву поруку у ћаскању</string>
-  <string name="events_ignore_system_vibro">Занемари системске поставке вибрације\nКористите ову опцију ако вам вибрација не ради</string>
-  <string name="events_message">Поставке обавештења\nПоставке обавештења за долазне поруке</string>
-  <string name="events_message_chat">само ћаскања</string>
-  <string name="events_message_chat_and_muc">и за групна ћаскања</string>
-  <string name="events_message_none">не обавештавај</string>
-  <string name="events_visible_chat">Обавештење у текућем ћаскању\nОбавештава о долазним порукама текућег ћаскања</string>
-  <string name="events_suppress_100">Потискуј неке поруке стања\nБез порука „Ова соба није анонимна“</string>
+    <string name="events_suppress_100">Потискуј неке поруке стања\nБез порука „Ова соба није анонимна“</string>
   <string name="negative_priotiry_summary">%s (нећете примати никакве поруке)</string>
   <string name="preference_accounts">ИксМПП налози\nУправљање налозима</string>
   <string name="preference_security">Безбедност\nПоставке безбедности</string>
   <string name="security_check_certificate">Провери сертификат сервера\nОбавештава о проблематичним сертификатима за шифроване везе</string>
-  <string name="security_clear_certificate">Уклони сертификате\nОчисти листу занемарених сертификата</string>
-  <string name="security_otr_history">Бележи историјат\nБележење историјата за ОТР сесије</string>
-  <string name="security_otr_mode">ОТР режим</string>
+    <string name="security_otr_mode">ОТР режим</string>
   <string name="chats_attention">Пажња\nРеаговаће се на долазне захтеве за пажњом</string>
   <string name="chats_attention_sound">Звук за пажњу\nИзаберите звоно</string>
   <string name="connection_load_vcard">Учитај вКарту\nУчитава и освежава личне податке контакта. Искључите да смањите пренос података.</string>
   <string name="connection_load_images">Учитај слике\nАутоматски учитава слике са УРЛ-а. Искључите да смањите пренос података.</string>
   <string name="connection_use_carbons">Индиго режим\nМоже бити нестабилан! Делиће сесије истог налога у свим програмима. Искључите да смањите пренос података.</string>
-  <string name="connection_use_plain_text_auth">Аутентификација обичним текстом\nАутентификација обичним текстом за све налоге. Није препоручљиво.</string>
-  <string name="events_phrases">Кључне речи\nНаправите посебна обавештења кад примљене поруке садрже наведене речи</string>
-  <string name="security_clear_certificate_warning">Желите ли заиста да уклоните све игнорисане сертификате?</string>
-  <string name="account_error_settings">Поставке</string>
+    <string name="events_phrases">Кључне речи\nНаправите посебна обавештења кад примљене поруке садрже наведене речи</string>
+    <string name="account_error_settings">Поставке</string>
 </resources>
diff --git a/xabber/src/main/res/values-sv-rSE/account_editor.xml b/xabber/src/main/res/values-sv-rSE/account_editor.xml
index 2aec53b070..d6b611457d 100644
--- a/xabber/src/main/res/values-sv-rSE/account_editor.xml
+++ b/xabber/src/main/res/values-sv-rSE/account_editor.xml
@@ -2,41 +2,25 @@
 <!--Generated by crowdin.com-->
 <resources>
   <string name="account_compression">Använd komprimering</string>
-  <string name="account_enabled">Aktiverad</string>
-  <string name="account_host">Värd</string>
+    <string name="account_host">Värd</string>
   <string name="account_password">Lösenord</string>
   <string name="confirm_password">Bekräfta lösenord</string>
   <string name="account_port">Port</string>
   <string name="account_priority">Prioritet</string>
   <string name="account_resource">Resurs</string>
   <string name="account_server_name">Server</string>
-  <string name="account_type">Kontotyp</string>
-  <string name="account_type_hints_gtalk">användarnamn för gmail.com eller Google Appsdomänen</string>
-  <string name="account_type_helps_gtalk">Om du ännu inte har ett Googlekonto kan du skapa ett på: http://mail.google.com\n
-Du kan även välja att använda ditt_konto_namn@din_google_domän</string>
-  <string name="account_xmpp_register_warning">Du måste <a href="http://www.google.com/#q=register an XMPP account"> registrera ett XMPP konto</a> innan du lägger till det i Xabber!</string>
-  <string name="account_type_helps_xmpp">Om du vill veta mer om XMPP (Jabber) gå till: https://xmpp.org</string>
-  <string name="account_user_name">Användarnamn</string>
+    <string name="account_xmpp_register_warning">Du måste <a href="http://www.google.com/#q=register an XMPP account"> registrera ett XMPP konto</a> innan du lägger till det i Xabber!</string>
+    <string name="account_user_name">Användarnamn</string>
   <string name="EMPTY_SERVER_NAME">Servernamn har inte angetts</string>
   <string name="EMPTY_USER_NAME">Användarnamn saknas</string>
   <string name="CONFIRM_PASSWORD">Lösenorden stämmer inte överens</string>
-  <string name="account_archive_mode">Lagra meddelandehistorik</string>
-  <string name="account_archive_mode_available">På server om den finns tillgänglig</string>
-  <string name="account_archive_mode_dont_store">Spara inte</string>
-  <string name="account_archive_mode_local">Lokalt på enheten</string>
-  <string name="account_archive_mode_server">På server</string>
-  <string name="account_archive_mode_unread">Lokalt men bara ej skickade och olästa</string>
-  <string name="account_compression_summary">Markera för att aktivera datakomprimering</string>
+    <string name="account_compression_summary">Markera för att aktivera datakomprimering</string>
   <string name="account_custom">Anpassad värd</string>
   <string name="account_custom_summary">Använd den anpassade värdens inställningar istället för SRV-post</string>
-  <string name="account_enabled_summary">Knapp för att aktivera kontot</string>
-  <string name="account_invalid_port">Port måste anges som ett tal (förvalt: 5222)</string>
+    <string name="account_invalid_port">Port måste anges som ett tal (förvalt: 5222)</string>
   <string name="account_invalid_port_range">Port måste vara mellan 1 och 65535 (standard: 5222)</string>
   <string name="account_invalid_priority">Prioritet måste anges som en siffra mellan -128 och 127 (default: 10)</string>
-  <string name="account_oauth">Auktorisering</string>
-  <string name="account_oauth_invalidated">Ej auktoriserad</string>
-  <string name="account_oauth_summary">Inställningar för OAuth</string>
-  <string name="account_proxy_host">Proxyserver</string>
+    <string name="account_proxy_host">Proxyserver</string>
   <string name="account_proxy_invalid_port_range">Proxy-porten måste vara mellan 1 och 65535 (förvald: 8080)</string>
   <string name="account_proxy_invalid_port">Proxy-porten måste vara ett tal (förvalt: 8080)</string>
   <string name="account_proxy_password">Lösenord för proxyserver</string>
@@ -48,18 +32,14 @@ Du kan även välja att använda ditt_konto_namn@din_google_domän</string>
   <string name="account_sasl_summary">Avaktivera på gamla servrar</string>
   <string name="account_store_password">Spara lösenord</string>
   <string name="account_store_password_summary">Avmarkera denna för att få fråga om lösenord varje gång du loggar in</string>
-  <string name="account_syncable">Integrera med systemets kontakter</string>
-  <string name="account_syncable_summary">Visa kontakter från detta konto i telefonens kontaktbok</string>
-  <string name="account_tls_enable">Aktivera TLS</string>
+    <string name="account_tls_enable">Aktivera TLS</string>
   <string name="account_tls_enable_summary">Använd TLS-kryptering när det är möjligt för att ansluta till server</string>
   <string name="account_tls_legacy">Äldre SSL</string>
   <string name="account_tls_legacy_summary">Använd äldre SSL-kryptering för att ansluta till servern</string>
   <string name="account_tls_mode">TLS/SSL-användning</string>
   <string name="account_tls_require">Kräv TLS</string>
   <string name="account_tls_require_summary">Kräv TLS vid anslutning till servern</string>
-  <string name="account_use_orbot">Chatta via anonymiseringstjänsten TOR och tvinga kryptering med TLS.\nRekommenderas inte för Google Talk</string>
-  <string name="confirm_cancellation">Är du säker på att du vill slänga alla ändringar?</string>
-  <string name="INCORRECT_USER_NAME">Felaktigt användarnamn. Kolla hjälptexten nedan för detaljer.</string>
+    <string name="INCORRECT_USER_NAME">Felaktigt användarnamn. Kolla hjälptexten nedan för detaljer.</string>
   <string name="orbot_required_message">För att kunna använda TOR måste du ha Orbot installerad och aktiverad. Vill du installera Orbot från Google Play?</string>
   <string name="orbot_required_title">Installera Orbot?</string>
   <string name="install_orbot">Installera Orbot</string>
diff --git a/xabber/src/main/res/values-sv-rSE/chat_viewer.xml b/xabber/src/main/res/values-sv-rSE/chat_viewer.xml
index 27e7c06721..2608a37fd7 100644
--- a/xabber/src/main/res/values-sv-rSE/chat_viewer.xml
+++ b/xabber/src/main/res/values-sv-rSE/chat_viewer.xml
@@ -19,11 +19,8 @@
   <string name="message_quote">Citera</string>
   <string name="message_remove">Ta bort från historik</string>
   <string name="message_repeat">Försök skicka igen</string>
-  <string name="message_open_file">Öppna</string>
-  <string name="message_save_file">Spara</string>
-  <string name="save_history">Spara historik lokalt\nLagra meddelandehistorik lokalt</string>
-  <string name="show_history">Visa historik</string>
-  <string name="action_attention_called">Begäran om uppmärksamhet skickades</string>
+    <string name="save_history">Spara historik lokalt\nLagra meddelandehistorik lokalt</string>
+    <string name="action_attention_called">Begäran om uppmärksamhet skickades</string>
   <string name="action_attention_requested">Begäran om uppmärksamhet skickades</string>
   <string name="action_ban">%1$s bannlystes</string>
   <string name="action_ban_by">%1$s bannlystes av %2$s</string>
@@ -71,26 +68,17 @@
   <string name="otr_refresh">Starta om kryptering</string>
   <string name="otr_request">Off-the-record-konversation har begärts men du saknar en plugin för det. Använd Pidgin, Gajim eller Adium för PC/Mac och Xabber,Conversations eller ChatSecure för Android. Besök http://otr.cypherpunks.ca/ för mer information.</string>
   <string name="otr_start">Starta kryptering</string>
-  <string name="otr_unencrypted_message">Meddelandet har inte krypterats</string>
-  <string name="otr_unreadable_message">Det krypterade meddelandet du skickade är oläsbart</string>
+    <string name="otr_unreadable_message">Det krypterade meddelandet du skickade är oläsbart</string>
   <string name="otr_verification">OTR-verifiering</string>
   <string name="otr_verify_fingerprint">Verifiera med fingeravtryck</string>
   <string name="otr_verify_question">Verifiera med fråga</string>
   <string name="otr_verify_secret">Verifiera med delad hemlighet</string>
-  <string name="under_construction">Under uppbyggnad</string>
-  <string name="under_construction_message">Denna skärm är under uppbyggnad</string>
-  <string name="chat_events_show_text_global">Använd globala inställningar</string>
+    <string name="chat_events_show_text_global">Använd globala inställningar</string>
   <string name="chat_events_show_text_always">Visa meddelandetext</string>
   <string name="chat_events_show_text_never">Dölj meddelandetext</string>
-  <string name="sending_file">Skicka filen %s</string>
-  <string name="error_sending_file">Ett fel uppstod när filen %s skickades</string>
-  <string name="no_application_to_open_file">Inget program hittades som kan öppna denna fil</string>
-  <string name="could_not_save_file">Kunde inte spara filen</string>
-  <string name="file_saved_successfully">Filen har sparats</string>
-  <string name="received_by">Togs emot av %s</string>
-  <string name="could_not_get_path_to_file">Gick inte att hämta sökvägen till filen</string>
+    <string name="error_sending_file">Ett fel uppstod när filen %s skickades</string>
+    <string name="could_not_get_path_to_file">Gick inte att hämta sökvägen till filen</string>
   <string name="message_open_private_chat">Öppna privat chatt</string>
-  <string name="http_file_upload_slot_error">Det gick inte att ladda upp filen. Är den för stor?</string>
-  <string name="no_permission_to_read_files">Saknar behörighet att läsa filer</string>
+    <string name="no_permission_to_read_files">Saknar behörighet att läsa filer</string>
   <string name="no_permission_to_write_files">Saknar behörighet att skriva filer</string>
 </resources>
diff --git a/xabber/src/main/res/values-sv-rSE/contact_editor.xml b/xabber/src/main/res/values-sv-rSE/contact_editor.xml
index 371e8c3957..080ca43be0 100644
--- a/xabber/src/main/res/values-sv-rSE/contact_editor.xml
+++ b/xabber/src/main/res/values-sv-rSE/contact_editor.xml
@@ -17,12 +17,8 @@
   <string name="processing_image">Bearbetar foto...</string>
   <string name="error_during_crop">Fel vid beskärning</string>
   <string name="error_during_image_processing">Något gick fel när bilden processades</string>
-  <string name="account_settings">Kontoinställningar</string>
-  <string name="account_user_info">Kontaktinfo</string>
-  <string name="account_server_info">Serverinformation</string>
+    <string name="account_server_info">Serverinformation</string>
   <string name="account_server_info_description">Lista med serverns funktioner</string>
   <string name="conference_private_chat_invitation">%1$s från %2$s vill starta en privat chatt med dig</string>
   <string name="accept_muc_private_chat">Bekräfta</string>
-  <string name="block_muc_private_chat">Blockera</string>
-  <string name="no_permission_camera">Saknar rättigheter för kameraåtkomst</string>
 </resources>
diff --git a/xabber/src/main/res/values-sv-rSE/contact_list.xml b/xabber/src/main/res/values-sv-rSE/contact_list.xml
index 9101c69a32..2c6de8fa91 100644
--- a/xabber/src/main/res/values-sv-rSE/contact_list.xml
+++ b/xabber/src/main/res/values-sv-rSE/contact_list.xml
@@ -18,17 +18,13 @@
   <string name="application_state_roster">Ansluten.</string>
   <string name="application_state_starting">Startar applikation... </string>
   <string name="application_state_waiting">Väntar på anslutning...</string>
-  <string name="chat_list">Chattlista</string>
-  <string name="chat_list_is_empty">Inga aktiva chattar</string>
-  <string name="chat_viewer">Chatt</string>
-  <string name="close_chat">Stäng chatt</string>
-  <string name="CONNECTION_FAILED">Anslutningsfel</string>
+    <string name="chat_viewer">Chatt</string>
+    <string name="CONNECTION_FAILED">Anslutningsfel</string>
   <string name="contact_add">Lägg till kontakt</string>
   <string name="contact_delete">Radera</string>
   <string name="contact_block">Blockera kontakt</string>
   <string name="contact_delete_confirm">Vill du verkligen radera kontakt %1$s från konto %2$s?</string>
-  <string name="contact_list">Kontaktlista</string>
-  <string name="discard_subscription">Avvisa kontakt</string>
+    <string name="discard_subscription">Avvisa kontakt</string>
   <string name="exit">Avsluta</string>
   <string name="group_active_chat">Aktiva chattar</string>
   <string name="group_none">Inga grupper</string>
@@ -40,14 +36,7 @@
   <string name="request_subscription">Begär prenumeration</string>
   <string name="XMPP_EXCEPTION">Fel i XMPP-stream</string>
   <string name="application_state_closing">Sparar inställningar...\nApplikationen avslutas snart.</string>
-  <string name="certificate_details">\n \nUtfärdad till: \nCommon Name (CN): %1$s \nOrganization (O): %2$s \nOrganizational Unit (OU): %3$s \nSerienummer: %4$s \n \nUtfärdad av: \nCommon Name (CN): %5$s \nOrganization (O): %6$s \nOrganizational Unit (OU): %7$s \n \nGiltighet: \nUtfärdad: %8$s \nGiltigt till: %9$s.</string>
-  <string name="certificate_invalid_chane">Misslyckades med att verifiera certifikatkedja</string>
-  <string name="certificate_invalid_target">Verifiering misslyckades</string>
-  <string name="certificate_self_signed">Självsignerat certifikat</string>
-  <string name="certificate_show_details">Detaljer...</string>
-  <string name="close_chats">Stäng alla chattar</string>
-  <string name="contact_integration_suggest">Vill du att Xabber ska vara integrerat med kontaktboken?\nDetta kan ändras i \"Inställningar\" → \"XMPP-konton\" → Ditt konto → \"Kontaktintegration\". \nOBS: Kontaktlistan på din telefon kan uppträdda långsamt under ett par minuter.</string>
-  <string name="group_room">Konferenser</string>
+    <string name="group_room">Konferenser</string>
   <string name="OTR_ERROR">OTR-fel</string>
   <string name="select_contact">Klicka för att välja kontakt</string>
   <string name="show_offline_always">Visa alltid</string>
@@ -62,8 +51,7 @@
   <string name="block_list">Blockeringslistan</string>
   <string name="contact_blocked_successfully">Kontakten är nu blockerad</string>
   <string name="error_blocking_contact">Det gick inte att blockera kontakten</string>
-  <string name="unblock_contact">Avblockera kontakt</string>
-  <string name="contacts_unblocked_successfully">Kontakten är nu avblockerad</string>
+    <string name="contacts_unblocked_successfully">Kontakten är nu avblockerad</string>
   <string name="error_unblocking_contacts">Det gick inte att avblockera kontakten</string>
   <string name="block_contact_confirm">Vill du verkligen blockera kontakt %1$s från konto %2$s?</string>
   <string name="unblock_all_contacts_confirm">Vill du avblockera alla kontakter från konto %1$s?</string>
@@ -75,13 +63,7 @@
   <string name="dark_theme_suggest_dialog_stay_on_light_side">Bli kvar på den ljusa sidan</string>
   <string name="battery_optimization_disable_dialog_title">Batterioptimering</string>
   <string name="battery_optimization_disable_dialog_message">Enheten gör några tunga batterioptimeringar på Xabber som kan leda till försenade statusuppdateringar eller i värsta fall att meddelanden försvinner. \n\nDu blir nu tillfrågad om du vill stänga av batterioptimeringar.</string>
-  <string name="save_log_to_file">Spara till fil</string>
-  <string name="clear_log">Ta bort gamla loggfiler</string>
+    <string name="clear_log">Ta bort gamla loggfiler</string>
   <string name="open_log_file">Öppna</string>
   <string name="send_log_file">Skicka</string>
-  <string name="intro_welcome">Välkommen till Xabber</string>
-  <string name="intro_xabber_description">Öppen källkods XMPP-klient för Android</string>
-  <string name="intro_register_account">Registrera ett XMPP konto</string>
-  <string name="intro_faq">Om du inte har ett XMPP konto, vänligen <a href="https://www.xabber.com/faq/"> Läs vår FAQ</a> om hur du skapar ett.</string>
-  <string name="intro_web_search_register_xmpp">Registrera ett XMPP konto</string>
 </resources>
diff --git a/xabber/src/main/res/values-sv-rSE/contact_viewer.xml b/xabber/src/main/res/values-sv-rSE/contact_viewer.xml
index c51ec004d9..ec84f2371b 100644
--- a/xabber/src/main/res/values-sv-rSE/contact_viewer.xml
+++ b/xabber/src/main/res/values-sv-rSE/contact_viewer.xml
@@ -17,12 +17,9 @@
   <string name="vcard_organization_unit">Avdelning</string>
   <string name="vcard_title">Titel (jobb), funktion</string>
   <string name="vcard_role">Roll</string>
-  <string name="vcard_other">Övrig information</string>
-  <string name="vcard_categories">Kategorier</string>
-  <string name="vcard_decsription">Beskrivning</string>
+    <string name="vcard_decsription">Beskrivning</string>
   <string name="vcard_note">Anteckning</string>
-  <string name="vcard_address">Adress</string>
-  <string name="vcard_address_pobox">Boxadress</string>
+    <string name="vcard_address_pobox">Boxadress</string>
   <string name="vcard_address_extadr">Utökad adress</string>
   <string name="vcard_address_street">Gata</string>
   <string name="vcard_address_locality">Område</string>
diff --git a/xabber/src/main/res/values-sv-rSE/muc_editor.xml b/xabber/src/main/res/values-sv-rSE/muc_editor.xml
index 30cc6ebf6f..82be2c5539 100644
--- a/xabber/src/main/res/values-sv-rSE/muc_editor.xml
+++ b/xabber/src/main/res/values-sv-rSE/muc_editor.xml
@@ -20,12 +20,10 @@
   <string name="muc_invite_confirm">%2$s bjuder in dig att ansluta till konferens %3$s. Anslut med konto %1$s?</string>
   <string name="muc_invite_confirm_reason">%2$s bjuder in dig att ansluta till konferens %3$s: %4$s. Anslut med konto %1$s?</string>
   <string name="muc_leave">Lämna konferens</string>
-  <string name="muc_save">Spara konferens</string>
-  <string name="muc_choose_conference">Välj konferens</string>
+    <string name="muc_choose_conference">Välj konferens</string>
   <string name="muc_next">Nästa</string>
   <string name="muc_get_hosted_conferences">Hämta hostade konferenser</string>
   <string name="muc_error_getting_conferences">Fel vid hämtning av konferenser</string>
   <string name="muc_type_conference_name">Ange namn på konferens</string>
-  <string name="contact_is_blocked">Kontakten är blockerad!</string>
-  <string name="conference_invitation">Konferensinbjudan</string>
+    <string name="conference_invitation">Konferensinbjudan</string>
 </resources>
diff --git a/xabber/src/main/res/values-sv-rSE/notification_bar.xml b/xabber/src/main/res/values-sv-rSE/notification_bar.xml
index 018c57c8bb..ae58250629 100644
--- a/xabber/src/main/res/values-sv-rSE/notification_bar.xml
+++ b/xabber/src/main/res/values-sv-rSE/notification_bar.xml
@@ -34,10 +34,7 @@
   <!-- Used for plural form in russian. -->
   <string name="connection_state_waiting_5">-</string>
   <string name="connection_state_offline">%1$d %2$s frånkopplad</string>
-  <string name="archive_available_request_message">Vill du lagra meddelandehistorik på servern?\nDet gör det möjligt att ladda meddelandehistorik från alla enheter som använder detta konto.\nDenna funktion kräver lite extra datatrafik och kommer påverka uppkopplingshastigheten.\nVARNING: All din lokalt sparade historik raderas.</string>
-  <string name="archive_available_request_title">Aktivera meddelandearkiv?</string>
-  <string name="INVALID_CERTIFICATE">Ogiltigt certifikat</string>
-  <string name="muc_invite_message">Vill du ansluta till konferensen?</string>
+    <string name="muc_invite_message">Vill du ansluta till konferensen?</string>
   <string name="otr_verification_in_progress">Klicka för att avbryta.</string>
   <string name="PASSWORD_REQUIRED">Lösenord krävs</string>
   <string name="pay_attention">Observera</string>
diff --git a/xabber/src/main/res/values-sv-rSE/preference_editor.xml b/xabber/src/main/res/values-sv-rSE/preference_editor.xml
index c780bd18b5..9c0f0009b6 100644
--- a/xabber/src/main/res/values-sv-rSE/preference_editor.xml
+++ b/xabber/src/main/res/values-sv-rSE/preference_editor.xml
@@ -8,14 +8,11 @@
   <string name="contacts_order_alphabet">Alfabetisk</string>
   <string name="contacts_order_status">Efter status</string>
   <string name="contacts_show_accounts">Gruppera per konto\nGruppera kontakter i kontaktlistan per konto</string>
-  <string name="contacts_show_active_chats">Aktiva chattar högst upp\nVisa aktiva chattar överst i kontaktlistan</string>
-  <string name="contacts_show_avatars">Visa profilbilder \nVisa användares profilbilder i kontaktlistan</string>
+    <string name="contacts_show_avatars">Visa profilbilder \nVisa användares profilbilder i kontaktlistan</string>
   <string name="contacts_show_empty_groups">Visa Tomma grupper\nVisa grupper utan onlinekontakter</string>
   <string name="contacts_show_groups">Visa grupper \nVisa grupper i kontaktlistan</string>
   <string name="contacts_show_offline">Visa offlinekontakter</string>
-  <string name="contacts_show_panel">Visa kontopanel\nVisa händelseknappar med avatarer i det nedre högra hörnet av kontaktlistan</string>
-  <string name="contacts_stay_active_chats">Dubbla aktiva chattar\nAktiva chattar visas både på kontaktlista och i grupper</string>
-  <string name="debug_log">Debug-logg\nSkriv meddelanden till debugloggen (starta om för att aktivera denna inställning)</string>
+    <string name="debug_log">Debug-logg\nSkriv meddelanden till debugloggen (starta om för att aktivera denna inställning)</string>
   <string name="debug_file_log_title">Spara loggfilen\nWrite felsökningsloggen till lokal fil (du kan dela den).</string>
   <string name="debug_log_files_title">Loggfiler\n Lista med sparade loggfiler.</string>
   <string name="debug_log_files_activity_title">Loggfiler</string>
@@ -24,8 +21,7 @@
   <string name="events_persistent">Aktivitetsfältets ikon\nVisa ständigt meddelande. Detta alternativ hindrar Android från att rensa appen från minnet</string>
   <string name="interface_theme_dark">Mörk</string>
   <string name="interface_theme_light">Ljus</string>
-  <string name="interface_theme_normal">Förval</string>
-  <string name="interface_smiles_android">Androidemotikoner</string>
+    <string name="interface_smiles_android">Androidemotikoner</string>
   <string name="interface_smiles_none">Inga grafiska emoticons</string>
   <string name="preference_connection">Anslutningsinställningar \nAnslutningsinställningar</string>
   <string name="preference_contacts">Kontaktlista \nAnpassa kontaktlistans utseende</string>
@@ -40,8 +36,7 @@
   <string name="chats_font_size_small">Liten</string>
   <string name="chats_font_size_xlarge">Extra stor</string>
   <string name="chats_hide_keyboard_landscape">I landskapsläge</string>
-  <string name="chats_receipt">Leveranskvitto\nSkicka och ta emot leveranskvitton för meddelanden</string>
-  <string name="chats_show_avatars">Profilbilder i meddelanden \nVisa profilbilder i varje meddelande</string>
+    <string name="chats_show_avatars">Profilbilder i meddelanden \nVisa profilbilder i varje meddelande</string>
   <string name="chats_show_status_change_muc">I konferenser</string>
   <string name="chats_state_notification">Skicka skriver notifikationer\nVisa andra användare att du skriver</string>
   <string name="connection_adjust_priority">Ändra prioritet\nAnge prioritet enligt vald status. Kontots angivna prioritering åsidosätts.</string>
@@ -54,27 +49,17 @@
   <string name="contacts_reset_offline">Återställ offlineinställningar\nRensa individuella inställningar för grupper och konton</string>
   <string name="contacts_reset_offline_warning">Vill du verkligen rensa individuella inställningar för grupper och konton?</string>
   <string name="events_first_only">Larma vid första meddelande\nNotifiera endast på det första meddelandet i en chatt</string>
-  <string name="events_ignore_system_vibro">Ignorera systemets inställning för vibration \nAnvänd denna inställning om systemets vibration inte fungerar</string>
-  <string name="events_message">Notifikationsinställningar\nKonfigurera notifikationer av inkommande meddelanden</string>
-  <string name="events_message_chat">Bara chattar</string>
-  <string name="events_message_chat_and_muc">Chattar och konferenser</string>
-  <string name="events_message_none">Meddela inte</string>
-  <string name="events_visible_chat">Meddela i pågående chatt \nVisa notifiering för inkommande meddelanden i pågående chatt</string>
-  <string name="events_suppress_100">Hindra vissa statusmeddelanden\nFå inga \"Detta rum är inte anonymt\" meddelanden</string>
+    <string name="events_suppress_100">Hindra vissa statusmeddelanden\nFå inga \"Detta rum är inte anonymt\" meddelanden</string>
   <string name="negative_priotiry_summary">%s (du kommer inte ta emot några meddelanden från någon chatt)</string>
   <string name="preference_accounts">XMPP konton\nHantera konton</string>
   <string name="preference_security">Säkerhet \nSäkerhetsinställningar</string>
   <string name="security_check_certificate">Kontrollera serverns certifikat\nMeddela vid certifikatproblem med krypterade anslutningar</string>
-  <string name="security_clear_certificate">Ta bort certifikat\nRensa lista över ignorerade certifikat</string>
-  <string name="security_otr_history">Lagra historik\nSpara chatthistorik för OTR sessioner</string>
-  <string name="security_otr_mode">OTR-läge</string>
+    <string name="security_otr_mode">OTR-läge</string>
   <string name="chats_attention">Uppmärksamhet\nReagera på inkommande begäran om uppmärksamhet</string>
   <string name="chats_attention_sound">Uppmärksamhet ljud\nVälj ringsignal</string>
   <string name="connection_load_vcard">Ladda in vCard \nHämta och uppdatera kontaktens information och profilbild. Avmarkera för att minska datatrafik.</string>
   <string name="connection_load_images">Läs in bilder\nLäs n bilder från fil URL: er automatiskt. Inaktivera för att minska trafikmängden.</string>
   <string name="connection_use_carbons">Kopieringsläge\nKan vara instabilt! Kommer att dela sessioner för samma konto på den här klienten. Inaktivera för att minska trafikanvändning.</string>
-  <string name="connection_use_plain_text_auth">Klartextsautentisiering\nAnvänd klartextautentisiering för alla konton. Rekommenderas ej.</string>
-  <string name="events_phrases">Nyckelfraser\nSkapa anpassade notifikationer för mottagna meddelanden som innehåller särskilda fraser</string>
-  <string name="security_clear_certificate_warning">Vill du verkligen ta bort alla ignorerade certifikat?</string>
-  <string name="account_error_settings">Inställningar</string>
+    <string name="events_phrases">Nyckelfraser\nSkapa anpassade notifikationer för mottagna meddelanden som innehåller särskilda fraser</string>
+    <string name="account_error_settings">Inställningar</string>
 </resources>
diff --git a/xabber/src/main/res/values-ta-rIN/chat_viewer.xml b/xabber/src/main/res/values-ta-rIN/chat_viewer.xml
index 7243e142e4..96f364f154 100644
--- a/xabber/src/main/res/values-ta-rIN/chat_viewer.xml
+++ b/xabber/src/main/res/values-ta-rIN/chat_viewer.xml
@@ -17,10 +17,7 @@
   <string name="message_quote">மேற்கோளிடு</string>
   <string name="message_remove">வரலாற்றிலிருந்து அகற்று</string>
   <string name="message_repeat">மீண்டும் அனுப்ப முயற்சிக்கவும்</string>
-  <string name="message_open_file">திற</string>
-  <string name="message_save_file">சேமிக்கவும்</string>
-  <string name="show_history">வரலாற்றைக் காண்பி</string>
-  <string name="chat_state_composing">தட்டச்சு செய்கிறார்&#8230;</string>
+    <string name="chat_state_composing">தட்டச்சு செய்கிறார்&#8230;</string>
   <string name="chat_state_paused">செய்தி எழுதியுள்ளார். அனுப்பவில்லை&#8230;</string>
   <string name="chat_typed">அனுப்பிய நேரம் %s</string>
   <string name="export_chat_send">காப்புப் பிரதி அல்லது ஏற்றுமதிக்குப் பின் அனுப்பவும்</string>
@@ -32,12 +29,8 @@
   <string name="otr_end">மறையாக்கத்தை நிறுத்து</string>
   <string name="otr_refresh">மறையாக்கத்தை மீண்டும் துவக்கு</string>
   <string name="otr_start">மறையாக்கத்தை தொடங்கு</string>
-  <string name="under_construction">வேலை நடந்து கொண்டு இருக்கிறது</string>
-  <string name="chat_events_show_text_global">பொதுவான அமைப்புகளைப் பயன்படுத்தவும்</string>
+    <string name="chat_events_show_text_global">பொதுவான அமைப்புகளைப் பயன்படுத்தவும்</string>
   <string name="chat_events_show_text_always">குறுஞ்செய்தி உரையைக் காட்டு</string>
   <string name="chat_events_show_text_never">குறுஞ்செய்தி உரையை மறை</string>
-  <string name="sending_file">கோப்பு %s அனுப்பப்படுகிறது</string>
-  <string name="error_sending_file">கோப்பு%s அனுப்புவதில் பிழை நேர்ந்துள்ளது</string>
-  <string name="could_not_save_file">கோப்பைச் சேமிக்க முடியவில்லை</string>
-  <string name="file_saved_successfully">கோப்பு வெற்றிகரமாகச் சேமிக்கப்பட்டது</string>
+    <string name="error_sending_file">கோப்பு%s அனுப்புவதில் பிழை நேர்ந்துள்ளது</string>
 </resources>
diff --git a/xabber/src/main/res/values-ta-rIN/contact_viewer.xml b/xabber/src/main/res/values-ta-rIN/contact_viewer.xml
index 99bcbedcdd..6481cfabc8 100644
--- a/xabber/src/main/res/values-ta-rIN/contact_viewer.xml
+++ b/xabber/src/main/res/values-ta-rIN/contact_viewer.xml
@@ -16,12 +16,9 @@
   <string name="vcard_organization_unit">நிறுவன பிரிவு</string>
   <string name="vcard_title">வேலை தலைப்பு, செயல்பாடு</string>
   <string name="vcard_role">செயல்பங்கு</string>
-  <string name="vcard_other">பிற தகவல்</string>
-  <string name="vcard_categories">பிரிவுகள்</string>
-  <string name="vcard_decsription">விளக்கம்</string>
+    <string name="vcard_decsription">விளக்கம்</string>
   <string name="vcard_note">குறிப்பு</string>
-  <string name="vcard_address">முகவரி</string>
-  <string name="vcard_address_pobox">அஞ்சல் பெட்டி</string>
+    <string name="vcard_address_pobox">அஞ்சல் பெட்டி</string>
   <string name="vcard_address_extadr">விரிவாக்கப்பட்ட முகவரி</string>
   <string name="vcard_address_street">தெரு</string>
   <string name="vcard_address_locality">உள்ளூர் பகுதி</string>
diff --git a/xabber/src/main/res/values-tr-rTR/account_editor.xml b/xabber/src/main/res/values-tr-rTR/account_editor.xml
index 567fd709bc..0138d873e9 100644
--- a/xabber/src/main/res/values-tr-rTR/account_editor.xml
+++ b/xabber/src/main/res/values-tr-rTR/account_editor.xml
@@ -2,40 +2,25 @@
 <!--Generated by crowdin.com-->
 <resources>
   <string name="account_compression">Sıkıştırma kullan</string>
-  <string name="account_enabled">Etkin</string>
-  <string name="account_host">Sunucu</string>
+    <string name="account_host">Sunucu</string>
   <string name="account_password">Parola</string>
   <string name="confirm_password">Şifreyi tekrarlayın</string>
   <string name="account_port">Bağlantı noktası</string>
   <string name="account_priority">Öncelik</string>
   <string name="account_resource">Kaynak</string>
   <string name="account_server_name">Sunucu</string>
-  <string name="account_type">Hesap tipi</string>
-  <string name="account_type_hints_gtalk">gmail.com veya Google Apps için kullanıcı adı</string>
-  <string name="account_type_helps_gtalk">Eğer bir Google hesabınız yoksa http://mail.google.com adresinden oluşturabilirsiniz.\nAyrıca kullanici_adiniz@google_domaininiz şeklinde de kullanabilirsiniz</string>
-  <string name="account_xmpp_register_warning">Xabber eklemeden önce bir <a href="http://www.google.com/#q=register an XMPP account">XMPP hesabına kayıt </a> olmalısınız!</string>
-  <string name="account_type_helps_xmpp">XMPP (Jabber) hakkında daha fazla bilgi için: https://xmpp.org</string>
-  <string name="account_user_name">Kullanıcı adı</string>
+    <string name="account_xmpp_register_warning">Xabber eklemeden önce bir <a href="http://www.google.com/#q=register an XMPP account">XMPP hesabına kayıt </a> olmalısınız!</string>
+    <string name="account_user_name">Kullanıcı adı</string>
   <string name="EMPTY_SERVER_NAME">Sunucu adı belirtilmemiş</string>
   <string name="EMPTY_USER_NAME">Kullanıcı adı belirtilmemiş</string>
   <string name="CONFIRM_PASSWORD">Şifreler uyuşmuyor</string>
-  <string name="account_archive_mode">Mesaj tarihcesini sakla</string>
-  <string name="account_archive_mode_available">Uygunsa sunucuda</string>
-  <string name="account_archive_mode_dont_store">Saklama</string>
-  <string name="account_archive_mode_local">Yerel olarak aygıt üzerinde</string>
-  <string name="account_archive_mode_server">Sunucuda</string>
-  <string name="account_archive_mode_unread">Yerel olarak sadece gönderilmemiş ve okunmamışlar</string>
-  <string name="account_compression_summary">Veri sıkıştırma için seçin</string>
+    <string name="account_compression_summary">Veri sıkıştırma için seçin</string>
   <string name="account_custom">Özel sunucu</string>
   <string name="account_custom_summary">SRV kaydı yerine özel sunucu ayarlarını kullan</string>
-  <string name="account_enabled_summary">Hesabı aktifleştir</string>
-  <string name="account_invalid_port">Port bir numara olmalı (ön tanımlı: 5222)</string>
+    <string name="account_invalid_port">Port bir numara olmalı (ön tanımlı: 5222)</string>
   <string name="account_invalid_port_range">Bağlantı noktası 1 ile 65535 arasında olmalıdır (varsayılan: 5222)</string>
   <string name="account_invalid_priority">Öncelik değeri, -128 ile 127 arasında bir numara olmalı. (ön tanımlı: 10)</string>
-  <string name="account_oauth">Yetkilendirme</string>
-  <string name="account_oauth_invalidated">Yetkilendirilmemiş</string>
-  <string name="account_oauth_summary">OAuth ayarları</string>
-  <string name="account_proxy_host">Vekil sunucu</string>
+    <string name="account_proxy_host">Vekil sunucu</string>
   <string name="account_proxy_invalid_port_range">Vekil sunucu bağlantı noktası 1 ile 65535 arasında olmalıdır (varsayılan: 8080)</string>
   <string name="account_proxy_invalid_port">Vekil sunucu bağlantı noktası bir sayı olmalıdır (varsayılan: 8080)</string>
   <string name="account_proxy_password">Vekil sunucu parolası</string>
@@ -47,18 +32,14 @@
   <string name="account_sasl_summary">çok eski sunucu için kapalı</string>
   <string name="account_store_password">Parolayı sakla</string>
   <string name="account_store_password_summary">Çevrim içi olduğunuz her seferde parola sorulması için bu seçeneği devre dışı bırakın</string>
-  <string name="account_syncable">Sistem bağlantıları ile birleştir</string>
-  <string name="account_syncable_summary">Bu hesabın bağlantılarını telefon\'un adres defterinde  göster</string>
-  <string name="account_tls_enable">TLS etkin</string>
+    <string name="account_tls_enable">TLS etkin</string>
   <string name="account_tls_enable_summary">Sunucuya bağlanmak için mümkünse TLS şifrelemesi kullan</string>
   <string name="account_tls_legacy">Eski SSL</string>
   <string name="account_tls_legacy_summary">Sunucuya bağlanırken eski SSL şifrelemesi kullan.</string>
   <string name="account_tls_mode">TLS/SSL kullanımı</string>
   <string name="account_tls_require">TLS zorunlu</string>
   <string name="account_tls_require_summary">Sunucuya bağlanırken TLS şifreleme zorunlu</string>
-  <string name="account_use_orbot">TOR anononim ağı üzerinden sohbet et ve TLS şifreleme yöntemini kullanmaya zorla\nGoogle Talk için önerilmez</string>
-  <string name="confirm_cancellation">Bütün değişiklikleri iptal etmek istediğinize emin misiniz?</string>
-  <string name="INCORRECT_USER_NAME">Yanlış kullanıcı adı. Ayrıntılar için aşağıdaki yardım metnine bakın.</string>
+    <string name="INCORRECT_USER_NAME">Yanlış kullanıcı adı. Ayrıntılar için aşağıdaki yardım metnine bakın.</string>
   <string name="orbot_required_message">TOR ile işlem yapmak için Orbot kurulmuş ve vekil sunucu trafiğini üzerinden geçiriyor olmalı. Google Play\'den kurmak ister misiniz?</string>
   <string name="orbot_required_title">Orbot kur?</string>
   <string name="install_orbot">Orbot Kur</string>
diff --git a/xabber/src/main/res/values-tr-rTR/chat_viewer.xml b/xabber/src/main/res/values-tr-rTR/chat_viewer.xml
index e3f3043de9..44b94f0f67 100644
--- a/xabber/src/main/res/values-tr-rTR/chat_viewer.xml
+++ b/xabber/src/main/res/values-tr-rTR/chat_viewer.xml
@@ -21,11 +21,8 @@
   <string name="message_remove">Geçmişten sil</string>
   <string name="message_repeat">Yeniden göndermeyi dene</string>
   <string name="message_otr_show_original">Mesajları göster</string>
-  <string name="message_open_file">Aç</string>
-  <string name="message_save_file">Kaydet</string>
-  <string name="save_history">Lokal geçmişi kaydet \nMesaj geçmişini lokal olarak kaydet</string>
-  <string name="show_history">Geçmişi göster</string>
-  <string name="action_attention_called">Çağrı uyarısı gönderildi.</string>
+    <string name="save_history">Lokal geçmişi kaydet \nMesaj geçmişini lokal olarak kaydet</string>
+    <string name="action_attention_called">Çağrı uyarısı gönderildi.</string>
   <string name="action_attention_requested">Uyarı istendi</string>
   <string name="action_ban">%1$s yasaklandı</string>
   <string name="action_ban_by">%1$s, %2$s tarafından yasaklandı</string>
@@ -73,8 +70,7 @@
   <string name="otr_refresh">Şifrelemeyi yeniden başlat</string>
   <string name="otr_request">Kayıt dışı özel konuşma isteniyor ama bunu destekleyen ek sizde yok. PC/Mac\'de Pidgin, Gajim veya Adium; Android\'de Xabber veya ChatSecure kullanın. Daha fazla bilgi için http://otr.cypherpunks.ca adresine gidin.</string>
   <string name="otr_start">Şifrelemeyi başlat</string>
-  <string name="otr_unencrypted_message">Bu mesaj şifrelenmemiş</string>
-  <string name="otr_unreadable_message">Gönderdiğiniz şifreli mesaj okunabilir değil</string>
+    <string name="otr_unreadable_message">Gönderdiğiniz şifreli mesaj okunabilir değil</string>
   <string name="otr_not_decrypted_message">Mesaj boş olamaz</string>
   <string name="otr_verification">OTR doğrulama</string>
   <string name="otr_verify_fingerprint">Parmak izi ile doğrula</string>
@@ -87,21 +83,13 @@
   <string name="otr_verification_progress_title">Doğrulama işlemi sürüyor</string>
   <string name="otr_verification_notify_button">AÇIK</string>
   <string name="otr_verification_notify_button_cancel">İptal</string>
-  <string name="under_construction">Yapım aşamasında</string>
-  <string name="under_construction_message">Bu ekran yapım aşamasındadır</string>
-  <string name="chat_events_show_text_global">Genel ayarları kullan</string>
+    <string name="chat_events_show_text_global">Genel ayarları kullan</string>
   <string name="chat_events_show_text_always">İleti metnini göster</string>
   <string name="chat_events_show_text_never">İleti metnini gizle</string>
-  <string name="sending_file">%s Dosya gönderiliyor</string>
-  <string name="error_sending_file">%s Dosya gönderiminde hata</string>
-  <string name="no_application_to_open_file">Dosyayı açmak için uygulama bulunamadı</string>
-  <string name="could_not_save_file">Dosya kaydedilemedi</string>
-  <string name="file_saved_successfully">Dosya başarıyla kaydedildi</string>
-  <string name="received_by">%s Alındı</string>
-  <string name="could_not_get_path_to_file">Dosyanın yolu alınamadı</string>
+    <string name="error_sending_file">%s Dosya gönderiminde hata</string>
+    <string name="could_not_get_path_to_file">Dosyanın yolu alınamadı</string>
   <string name="message_open_private_chat">Özel Sohbet aç</string>
-  <string name="http_file_upload_slot_error">Dosya upload değil. Çok büyük?</string>
-  <string name="no_permission_to_read_files">Dosyayı okuma izni yok</string>
+    <string name="no_permission_to_read_files">Dosyayı okuma izni yok</string>
   <string name="no_permission_to_write_files">Dosyayı okuma izni yok</string>
   <string name="error_description_title">Hata açıklaması:</string>
   <string name="message_status_sent">Gönderildi</string>
diff --git a/xabber/src/main/res/values-tr-rTR/contact_editor.xml b/xabber/src/main/res/values-tr-rTR/contact_editor.xml
index ec6242bf34..410bfc0962 100644
--- a/xabber/src/main/res/values-tr-rTR/contact_editor.xml
+++ b/xabber/src/main/res/values-tr-rTR/contact_editor.xml
@@ -17,12 +17,8 @@
   <string name="processing_image">Görüntü İşleniyor...</string>
   <string name="error_during_crop">Görüntü kırpma sırasında hata oluştu</string>
   <string name="error_during_image_processing">Görüntü işleme sırasında hata oluştu</string>
-  <string name="account_settings">Hesap ayarları</string>
-  <string name="account_user_info">Hesap bilgisi</string>
-  <string name="account_server_info">Sunucu bilgisi (Automatic Translation)</string>
+    <string name="account_server_info">Sunucu bilgisi (Automatic Translation)</string>
   <string name="account_server_info_description">Server capabilities listesi</string>
   <string name="conference_private_chat_invitation">%1$s kişisi %2$s sizinle özel sohbet başlamak istiyor</string>
   <string name="accept_muc_private_chat">Kabut Et</string>
-  <string name="block_muc_private_chat">Engelle</string>
-  <string name="no_permission_camera">Kameraya erişim izni yok</string>
 </resources>
diff --git a/xabber/src/main/res/values-tr-rTR/contact_list.xml b/xabber/src/main/res/values-tr-rTR/contact_list.xml
index 48991763fa..9b48cf71f8 100644
--- a/xabber/src/main/res/values-tr-rTR/contact_list.xml
+++ b/xabber/src/main/res/values-tr-rTR/contact_list.xml
@@ -18,17 +18,13 @@
   <string name="application_state_roster">Bağlandı.</string>
   <string name="application_state_starting">Uygulama başlatılıyor... </string>
   <string name="application_state_waiting">Bağlantı bekleniyor...</string>
-  <string name="chat_list">Sohbet listesi</string>
-  <string name="chat_list_is_empty">Aktif sohbet yok</string>
-  <string name="chat_viewer">Sohbet</string>
-  <string name="close_chat">Sohbeti kapat</string>
-  <string name="CONNECTION_FAILED">Bağlantı hatası</string>
+    <string name="chat_viewer">Sohbet</string>
+    <string name="CONNECTION_FAILED">Bağlantı hatası</string>
   <string name="contact_add">Kişi ekle</string>
   <string name="contact_delete">Sil</string>
   <string name="contact_block">Kişiyi engelle</string>
   <string name="contact_delete_confirm">%1$s kullanıcısını %2$s hesabından gerçekten silmek istiyor musunuz?</string>
-  <string name="contact_list">Kişi listesi</string>
-  <string name="discard_subscription">Bağlantıyı reddet</string>
+    <string name="discard_subscription">Bağlantıyı reddet</string>
   <string name="exit">Çıkış</string>
   <string name="group_active_chat">Aktif sohbetler</string>
   <string name="group_none">Grubu olmayanlar</string>
@@ -40,15 +36,7 @@
   <string name="request_subscription">Abonelik isteği</string>
   <string name="XMPP_EXCEPTION">Akış hatası</string>
   <string name="application_state_closing">Değişiklikler kaydediliyor...\nUygulama birazdan kapatılacak.</string>
-  <string name="certificate_confirmation">%1$s.\nIsorun çıkarsa (SHA-1) güvenilmeyen kaynaklardan alınan sertifikaya: %2$s? Güvendiğinizin ve sonucuna katlanacağınızın farkında mısınız? Eğer bir sorun olursa?</string>
-  <string name="certificate_details">\n\nIssued to: \nCommon Name (CN): %1$s \nOrganization (O): %2$s \nOrganizationl Unit (OU): %3$s \nSerial Number: %4$s \n\nIssued by: \nCommon Name (CN): %5$s \nOrganization (O): %6$s \nOrganizationl Unit (OU): %7$s \n \nValidity: \nIssued on: %8$s \nExpires on: %9$s.</string>
-  <string name="certificate_invalid_chane">İmza zinciri doğrulanmadı</string>
-  <string name="certificate_invalid_target">Hedef doğrulanmadı</string>
-  <string name="certificate_self_signed">Kendinden imzalı sertifika</string>
-  <string name="certificate_show_details">Ayrıntılar...</string>
-  <string name="close_chats">Bütün sobhetleri kapat</string>
-  <string name="contact_integration_suggest">Xabber\'in sistemdeki bağlantılarla birleşmesini istiyor musunuz?\nBu, \"Ayarlar\" → \"XMPP hesapları\" →\"Hesabınız\" →\"Bağlantıları birleştirme\" den yapılabilir.\nNot: Sistem bağlantıları listesi bir kaç dakika yavaş çalışabilir.</string>
-  <string name="group_room">Konferanslar</string>
+    <string name="group_room">Konferanslar</string>
   <string name="OTR_ERROR">OTR hatası</string>
   <string name="select_contact">Kişi seçmek için lütfen tıklayın</string>
   <string name="show_offline_always">Her zaman göster</string>
@@ -63,8 +51,7 @@
   <string name="block_list">Engelli listesi</string>
   <string name="contact_blocked_successfully">Kişi başarıyla engellendi</string>
   <string name="error_blocking_contact">Kişi engelenirken hata oluştu</string>
-  <string name="unblock_contact">Kişinin engelini kaldır</string>
-  <string name="contacts_unblocked_successfully">Kişinin engeli başarıyla kaldırıldı</string>
+    <string name="contacts_unblocked_successfully">Kişinin engeli başarıyla kaldırıldı</string>
   <string name="error_unblocking_contacts">Kişi engeli kaldırılırken hata oluştu</string>
   <string name="block_contact_confirm">%1$s kullanıcısının %2$s hesabını gerçekten engellemek istiyor musunuz?</string>
   <string name="unblock_all_contacts_confirm">%1$s kullanıcısının engelini gerçekten kaldırmak istiyor musunuz?</string>
@@ -76,19 +63,10 @@
   <string name="dark_theme_suggest_dialog_stay_on_light_side">Aydınlık Tarafta Kalın</string>
   <string name="battery_optimization_disable_dialog_title">Pil optimizasyonu</string>
   <string name="battery_optimization_disable_dialog_message">Galiba cihazınızda batarya seviyesi düşmeye başladı yahut ihtiyacınız olan ortalama batarya seviyesinin altına inmeye başladınız.\n\nGecikmeler yaşayabilirsiniz, hala uyarı almak istediğinizden emin misiniz.</string>
-  <string name="save_log_to_file">Dosyayı kaydet</string>
-  <string name="clear_log">Eski günlük dosyalarını sil</string>
+    <string name="clear_log">Eski günlük dosyalarını sil</string>
   <string name="open_log_file">Aç</string>
   <string name="send_log_file">Gönder</string>
-  <string name="intro_welcome">Xabber\'a Hoşgeldiniz</string>
-  <string name="intro_xabber_description">Android için açık kaynak XMPP istemcisi</string>
-  <string name="intro_have_account">XMPP girişi</string>
-  <string name="intro_register_account">XMPP hesabı kaydı</string>
-  <string name="intro_create_xabber_account">Xabber hesabı kullanın</string>
-  <string name="intro_use_third_party_accounts">3. kullanıcı XMPP üyelikleri kullanın</string>
-  <string name="intro_faq">Eğer XMPP üyeliğiniz yoksa, lütfen <a href="https://www.xabber.com/faq/"> SSS sayfasına gidiniz</a> Ve nasıl edineceğinizi öğreniniz.</string>
-  <string name="intro_web_search_register_xmpp">XMPP hesabı kaydı</string>
-  <string name="synchronize_bookmarks">Yer imleri senkronize et</string>
+    <string name="synchronize_bookmarks">Yer imleri senkronize et</string>
   <string name="remove_all_bookmarks">Tümünü kaldır</string>
   <string name="remove_selected_bookmarks">Seçilenleri Kaldır</string>
   <string name="remove_all_bookmarks_confirm">%1$s Gerçekten tüm yer imlerini silmek istediğinizden emin misiniz?</string>
diff --git a/xabber/src/main/res/values-tr-rTR/contact_viewer.xml b/xabber/src/main/res/values-tr-rTR/contact_viewer.xml
index 312582205f..201e1d5cee 100644
--- a/xabber/src/main/res/values-tr-rTR/contact_viewer.xml
+++ b/xabber/src/main/res/values-tr-rTR/contact_viewer.xml
@@ -17,12 +17,9 @@
   <string name="vcard_organization_unit">Kurum birimi</string>
   <string name="vcard_title">İş tanımı</string>
   <string name="vcard_role">Görev</string>
-  <string name="vcard_other">Diğer bilgiler</string>
-  <string name="vcard_categories">Kategoriler</string>
-  <string name="vcard_decsription">Açıklama</string>
+    <string name="vcard_decsription">Açıklama</string>
   <string name="vcard_note">Notlar</string>
-  <string name="vcard_address">Adres</string>
-  <string name="vcard_address_pobox">Posta kutusu</string>
+    <string name="vcard_address_pobox">Posta kutusu</string>
   <string name="vcard_address_extadr">Açık adres</string>
   <string name="vcard_address_street">Cadde</string>
   <string name="vcard_address_locality">Bölge</string>
diff --git a/xabber/src/main/res/values-tr-rTR/muc_editor.xml b/xabber/src/main/res/values-tr-rTR/muc_editor.xml
index 3ded4fdfa8..12543e4fd7 100644
--- a/xabber/src/main/res/values-tr-rTR/muc_editor.xml
+++ b/xabber/src/main/res/values-tr-rTR/muc_editor.xml
@@ -20,12 +20,10 @@
   <string name="muc_invite_confirm">%2$s, sizi %3$s konferansına katılmaya davet ediyor. %1$s hesabı ile katılır mısın?</string>
   <string name="muc_invite_confirm_reason">%2$s sizi bu konferansa katılmaya davet ediyor %3$s:%4$s. %1$s hesabı ile katılır mısın?</string>
   <string name="muc_leave">Konferanstan ayrıl</string>
-  <string name="muc_save">Konferansı kaydet</string>
-  <string name="muc_choose_conference">Konferans seçin</string>
+    <string name="muc_choose_conference">Konferans seçin</string>
   <string name="muc_next">İleri</string>
   <string name="muc_get_hosted_conferences">Barındırılan konferansları al</string>
   <string name="muc_error_getting_conferences">Konferanslar alınırken hata oluştu</string>
   <string name="muc_type_conference_name">Konferans adını yazın</string>
-  <string name="contact_is_blocked">İlgili kişi engellendi!</string>
-  <string name="conference_invitation">Konferansa davet</string>
+    <string name="conference_invitation">Konferansa davet</string>
 </resources>
diff --git a/xabber/src/main/res/values-tr-rTR/notification_bar.xml b/xabber/src/main/res/values-tr-rTR/notification_bar.xml
index 9788fcd6a4..61747eab12 100644
--- a/xabber/src/main/res/values-tr-rTR/notification_bar.xml
+++ b/xabber/src/main/res/values-tr-rTR/notification_bar.xml
@@ -34,10 +34,7 @@
   <!-- Used for plural form in russian. -->
   <string name="connection_state_waiting_5">-</string>
   <string name="connection_state_offline">%1$d %2$s hesap çevrimdışı</string>
-  <string name="archive_available_request_message">Mesaj arşivini sunucuda tutmak istiyor musunuz?\nBu durumda, Xabber mesaj arşivini bu hasabı kullanan bütün cihazlardan yükleyebilir.\nBu özellik, biraz trafik yaratır ve bağlantı hızında biraz düşmeye neden olur. \nUYARI: Yerel arşivin tamamı silinecektir.</string>
-  <string name="archive_available_request_title">Mesaj deposu etkin ?</string>
-  <string name="INVALID_CERTIFICATE">Geçersiz sertifika</string>
-  <string name="muc_invite_message">Konferansa katılmak istiyormusunuz?</string>
+    <string name="muc_invite_message">Konferansa katılmak istiyormusunuz?</string>
   <string name="otr_verification_in_progress">İptal etmek için buraya tıkla.</string>
   <string name="PASSWORD_REQUIRED">Parola gerekli</string>
   <string name="pay_attention">Dikkat edin</string>
diff --git a/xabber/src/main/res/values-tr-rTR/preference_editor.xml b/xabber/src/main/res/values-tr-rTR/preference_editor.xml
index 93783ca829..d0986a9719 100644
--- a/xabber/src/main/res/values-tr-rTR/preference_editor.xml
+++ b/xabber/src/main/res/values-tr-rTR/preference_editor.xml
@@ -12,14 +12,11 @@
   <string name="contacts_order_alphabet">Alfabetik</string>
   <string name="contacts_order_status">Durumuna göre</string>
   <string name="contacts_show_accounts">Hesaba göre grupla \nKişi listesindeki kişileri hesaba göre grupla</string>
-  <string name="contacts_show_active_chats">Aktif sohbetler üstte\nAktif sohbetleri kişi listesinin üstünde göster</string>
-  <string name="contacts_show_avatars">Avatarları göster\nKullanıcıların avatarlarını bağlantı listesinde göster</string>
+    <string name="contacts_show_avatars">Avatarları göster\nKullanıcıların avatarlarını bağlantı listesinde göster</string>
   <string name="contacts_show_empty_groups">Boş grupları göster\nÇevrimiçi üyesi olmayan grupları göster</string>
   <string name="contacts_show_groups">Grupları göster\nGrupları kişi listesinde göster</string>
   <string name="contacts_show_offline">Çevrimdışı kişileri göster</string>
-  <string name="contacts_show_panel">Hesap panelini göster\nKişi listesinin sağ alt köşesinde avatarlar ile birlikte eylem butonlarını göster</string>
-  <string name="contacts_stay_active_chats">Etkin sohbetleri çoğaltın.\nAktif sohbetler kişi ve grup listesinin üstünde görünür</string>
-  <string name="debug_log">Hata ayıklama kaydı\nMesajları hata ayıklama kaydına yaz (değişikliklerin geçerli olması için uygulamayı yeniden başlatın)</string>
+    <string name="debug_log">Hata ayıklama kaydı\nMesajları hata ayıklama kaydına yaz (değişikliklerin geçerli olması için uygulamayı yeniden başlatın)</string>
   <string name="debug_file_log_title">Dosya geçmişi\nhata ayıklama günlüğü oluşturulsun (bu sayede bize gönderebilirsiniz).</string>
   <string name="debug_log_files_title">Geçmiş saklama dosyası \n görüntüleniyor.</string>
   <string name="debug_log_files_activity_title">&amp;Günlük Dosyaları</string>
@@ -36,8 +33,7 @@
   <string name="interface_theme">Tema</string>
   <string name="interface_theme_dark">Koyu</string>
   <string name="interface_theme_light">Açık</string>
-  <string name="interface_theme_normal">Ön tanımlı</string>
-  <string name="interface_smiles">İfadeler</string>
+    <string name="interface_smiles">İfadeler</string>
   <string name="interface_smiles_android">Android ifadeleri</string>
   <string name="interface_smiles_none">Grafik ifade yok</string>
   <string name="preference_connection">Bağlantı ayarları\nBağlantı ayarları</string>
@@ -62,8 +58,7 @@
   <string name="chats_font_size_xlarge">Çok büyük</string>
   <string name="chats_hide_keyboard">Klavyeyi gizle</string>
   <string name="chats_hide_keyboard_landscape">Yatay görünümde</string>
-  <string name="chats_receipt">Mesaj gitti bilgisi\nMesaj gitti bilgilerini gönder ve al</string>
-  <string name="chats_show_avatars">Mesaj içinde avatar\nAvatarları her mesajda göster</string>
+    <string name="chats_show_avatars">Mesaj içinde avatar\nAvatarları her mesajda göster</string>
   <string name="chats_show_status_change">Değişiklik durumlarını göster</string>
   <string name="chats_show_status_change_muc">Konferanslarda</string>
   <string name="chats_state_notification">Yazma bildirimini göster\nDiğer kullanıcının yazıyor olduğunu göster</string>
@@ -77,37 +72,24 @@
   <string name="contacts_reset_offline">Çevrim dışı ayarları sıfırla\nGruplar ve hesaplar için kişisel ayarları sil</string>
   <string name="contacts_reset_offline_warning">Gruplar ve hesapların ayarlarını silmeyi gerçekten istiyor musunuz?</string>
   <string name="events_first_only">İlk iletide uyar\nBir sohbette sadece ilk ileti geldiğinde bildirim yapar</string>
-  <string name="events_ignore_system_vibro">Sistemin titreşim ayarlarını göz ardı et\nSistemin titreşimi çalışmıyorsa bu seçeneği kullanın</string>
-  <string name="events_message">Bildirim ayarları\nGelen ileti bildirimlerini ayarla</string>
-  <string name="events_message_chat">Sadece sohbetler</string>
-  <string name="events_message_chat_and_muc">Sohbetler ve konferanslar</string>
-  <string name="events_message_none">Uyarma</string>
-  <string name="events_show_text">Mesaj önizlemesi\n bildirimler bölümünden mesjaları göster</string>
+    <string name="events_show_text">Mesaj önizlemesi\n bildirimler bölümünden mesjaları göster</string>
   <string name="events_show_text_muc">Mesaj önizlemesi\n bildirimler bölümünden mesjaları göster</string>
-  <string name="events_visible_chat">Şu anki konuşma içinde uyar.\nŞu anki konuşma içinde gelen mesajlar için uyarı yap.</string>
-  <string name="events_suppress_100">Bazı durum mesajlarını bastır\n\'Bu oda anonim değildir\' mesajlarını almazsınız</string>
+    <string name="events_suppress_100">Bazı durum mesajlarını bastır\n\'Bu oda anonim değildir\' mesajlarını almazsınız</string>
   <string name="negative_priotiry_summary">%s (Hiçbir sohbetten mesaj alınmaz)</string>
   <string name="preference_accounts">XMPP hesapları\nHesapları yönet</string>
   <string name="preference_security">Güvenlik\nGüvenlik ayarları</string>
   <string name="security_check_certificate">Sunucu sertifikasını kontrol et\nŞifreli bağlantılarda sertifika problemlerini bildir</string>
-  <string name="security_clear_certificate">Sertifikaları sil\nYoksayılan sertifikaların listesini sil</string>
-  <string name="security_otr_history">Geçmişi sakla\nOTR oturumları için sohbet geçmişini sakla</string>
-  <string name="security_otr_mode">OTR mod</string>
+    <string name="security_otr_mode">OTR mod</string>
   <string name="chats_attention">Dikkat\nGelen dikkat isteklerine tepki ver</string>
   <string name="chats_attention_sound">Dikkat sesi\nZil sesi seçin</string>
   <string name="connection_load_vcard">vCard yükle\nKişinin bilgileri ve avatarını yükle ve güncelle. Trafiği azaltmak için kapatın.</string>
   <string name="connection_load_images">Görüntüleri yükle\nGörüntüleri URL den otomatik olarak yükle. İnternet kullanımını azatlmak için devre dışı bırakınız.</string>
   <string name="connection_use_carbons">Karbon-kağıdı modu\nKararsız çalışabilir! Aynı hesap için bu istemcideki hesap oturumunu paylaşır. Trafik kullanımını azaltmak için devre dışı bırakın.</string>
-  <string name="connection_dns_resolver_type">DNS çözümleyici türü</string>
-  <string name="connection_dns_resolver_type_dns_java_resolver">DNSJavaResolver</string>
+    <string name="connection_dns_resolver_type_dns_java_resolver">DNSJavaResolver</string>
   <string name="connection_dns_resolver_type_mini_dns_resolver">MiniDNSResolver (deneysel)</string>
-  <string name="connection_use_plain_text_auth">Düz metin auth\nUse düz metin kimlik doğrulaması tüm hesaplar için. Tavsiye edilmez.</string>
-  <string name="events_phrases">Anahtar kelimeler\nGelen mesajların içeriğinde geçen kelimeler için özel bildirim oluşturun</string>
-  <string name="security_clear_certificate_warning">Tüm yoksayılan sertifikaları kaldırmak istiyor musunuz?</string>
-  <string name="account_error_settings">Ayarlar</string>
-  <string name="category_xabber_account">Xabber hesabı kullanın</string>
-  <string name="category_xmpp_accounts">XMPP hesapları</string>
-  <string name="category_interface">Arayüz</string>
+    <string name="events_phrases">Anahtar kelimeler\nGelen mesajların içeriğinde geçen kelimeler için özel bildirim oluşturun</string>
+    <string name="account_error_settings">Ayarlar</string>
+    <string name="category_interface">Arayüz</string>
   <string name="category_settings">Ayarlar</string>
   <string name="category_about">Hakkında</string>
   <string name="category_appearance">Görünüm</string>
diff --git a/xabber/src/main/res/values-tr-rTR/words.xml b/xabber/src/main/res/values-tr-rTR/words.xml
index 3765043c5d..a487bb4e92 100644
--- a/xabber/src/main/res/values-tr-rTR/words.xml
+++ b/xabber/src/main/res/values-tr-rTR/words.xml
@@ -20,5 +20,4 @@
   <string name="settings">Ayarlar</string>
   <string name="ok">TAMAM</string>
   <string name="login">Oturum aç</string>
-  <string name="resume">Devam et</string>
 </resources>
diff --git a/xabber/src/main/res/values-uk-rUA/account_editor.xml b/xabber/src/main/res/values-uk-rUA/account_editor.xml
index 66948cd691..8d3edc16e2 100644
--- a/xabber/src/main/res/values-uk-rUA/account_editor.xml
+++ b/xabber/src/main/res/values-uk-rUA/account_editor.xml
@@ -2,40 +2,25 @@
 <!--Generated by crowdin.com-->
 <resources>
   <string name="account_compression">Використовувати стиснення</string>
-  <string name="account_enabled">Активна</string>
-  <string name="account_host">Хост</string>
+    <string name="account_host">Хост</string>
   <string name="account_password">Пароль</string>
   <string name="confirm_password">Підтвердіть пароль</string>
   <string name="account_port">Порт</string>
   <string name="account_priority">Пріоритет</string>
   <string name="account_resource">Ресурс</string>
   <string name="account_server_name">Сервер</string>
-  <string name="account_type">Тип облікового запису</string>
-  <string name="account_type_hints_gtalk">обліковий запис gmail.com чи служби google</string>
-  <string name="account_type_helps_gtalk">Якщо ви не маєте облікового запису Google, ви можете створити його на http://mail.google.com\nАбо ви можете використати  your_user_name@your_google_domain</string>
-  <string name="account_xmpp_register_warning">Вам необхідно <a href="http://www.google.com/#q=register an XMPP account"> зареєструвати XMPP акаунт</a> перед додаванням його до Xabber!</string>
-  <string name="account_type_helps_xmpp">Якщо ви хочете дізнатися більше про XMPP (Jabber) тут: https://xmpp.org</string>
-  <string name="account_user_name">Ім’я користувача</string>
+    <string name="account_xmpp_register_warning">Вам необхідно <a href="http://www.google.com/#q=register an XMPP account"> зареєструвати XMPP акаунт</a> перед додаванням його до Xabber!</string>
+    <string name="account_user_name">Ім’я користувача</string>
   <string name="EMPTY_SERVER_NAME">Не вказано ім’я сервера</string>
   <string name="EMPTY_USER_NAME">Не вказано ім’я користувача</string>
   <string name="CONFIRM_PASSWORD">Паролі не збігаються</string>
-  <string name="account_archive_mode">Зберігати історію повідомлень</string>
-  <string name="account_archive_mode_available">На сервері, за можливістю</string>
-  <string name="account_archive_mode_dont_store">Не зберігати</string>
-  <string name="account_archive_mode_local">На пристрої</string>
-  <string name="account_archive_mode_server">На сервері</string>
-  <string name="account_archive_mode_unread">Лише не відправлені і не прочитані повідомлення</string>
-  <string name="account_compression_summary">Позначте для включення стиснення даних</string>
+    <string name="account_compression_summary">Позначте для включення стиснення даних</string>
   <string name="account_custom">Вказати хост вручну</string>
   <string name="account_custom_summary">Вказати хост для підключення вручну, замість використання SRV запису</string>
-  <string name="account_enabled_summary">Перемикніть, щоб увімкнути обліковий запис</string>
-  <string name="account_invalid_port">Порт має бути числом (типове значення: 5222)</string>
+    <string name="account_invalid_port">Порт має бути числом (типове значення: 5222)</string>
   <string name="account_invalid_port_range">Порт має бути від 1 до 65535 (за замовчуванням: 5222)</string>
   <string name="account_invalid_priority">Пріоритет має бути в діапазоні між -128 і 127 (типове значення: 10)</string>
-  <string name="account_oauth">Авторизація</string>
-  <string name="account_oauth_invalidated">Не авторизований</string>
-  <string name="account_oauth_summary">Налаштування OAuth</string>
-  <string name="account_proxy_host">Вузол проксі</string>
+    <string name="account_proxy_host">Вузол проксі</string>
   <string name="account_proxy_invalid_port_range">Проксі порт має бути від 1 до 65535 (за замовчуванням: 8080)</string>
   <string name="account_proxy_invalid_port">Порт проксі-сервера має бути числом (за замовчуванням: 8080)</string>
   <string name="account_proxy_password">Пароль</string>
@@ -47,18 +32,14 @@
   <string name="account_sasl_summary">Відключіть цей параметр при підключені до дуже старого серверу</string>
   <string name="account_store_password">Зберігати пароль</string>
   <string name="account_store_password_summary">Відключення призведе до запиту пароля, під час кожного під\'єднання</string>
-  <string name="account_syncable">Інтеграція із контактами в телефоні</string>
-  <string name="account_syncable_summary">Показувати контакти з даного облікового запису в телефонній книзі</string>
-  <string name="account_tls_enable">Використовувати TLS</string>
+    <string name="account_tls_enable">Використовувати TLS</string>
   <string name="account_tls_enable_summary">Використовувати TLS шифрування, якщо сервер підтримує</string>
   <string name="account_tls_legacy">Старий SSL</string>
   <string name="account_tls_legacy_summary">Використовувати старий SSL метод шифрування з’єднання із сервером</string>
   <string name="account_tls_mode">Використання TLS/SSL</string>
   <string name="account_tls_require">Вимагати TLS</string>
   <string name="account_tls_require_summary">Вимагати TLS шифрування при підключені до серверу</string>
-  <string name="account_use_orbot">Вести балачку через анонімну мережу TOR використовуючи TLS протокол шифрування\nНе рекомендується для Google Talk</string>
-  <string name="confirm_cancellation">Ви впевнені, що бажаєте скасувати всі не збережені зміни?</string>
-  <string name="INCORRECT_USER_NAME">Неправильне ім’я користувача. Перегляньте підказку в нижній частині екрану</string>
+    <string name="INCORRECT_USER_NAME">Неправильне ім’я користувача. Перегляньте підказку в нижній частині екрану</string>
   <string name="orbot_required_message">Для використання TOR має бути встановлений Orbot і використаний як проксі сервер. Бажаєте встановити його із Google Play?</string>
   <string name="orbot_required_title">Встановити Orbot?</string>
   <string name="install_orbot">Встановити Orbot</string>
diff --git a/xabber/src/main/res/values-uk-rUA/chat_viewer.xml b/xabber/src/main/res/values-uk-rUA/chat_viewer.xml
index c2cbc388a3..cc3003aaec 100644
--- a/xabber/src/main/res/values-uk-rUA/chat_viewer.xml
+++ b/xabber/src/main/res/values-uk-rUA/chat_viewer.xml
@@ -21,11 +21,8 @@
   <string name="message_remove">Вилучити з історії</string>
   <string name="message_repeat">Повторити надсилання</string>
   <string name="message_otr_show_original">Показати повідомлення</string>
-  <string name="message_open_file">Відкрити</string>
-  <string name="message_save_file">Зберегти</string>
-  <string name="save_history">Зберегти локальну історію\nЗберігати історію повідомлень локально</string>
-  <string name="show_history">Показати історію</string>
-  <string name="action_attention_called">Виклик уваги було відправлено</string>
+    <string name="save_history">Зберегти локальну історію\nЗберігати історію повідомлень локально</string>
+    <string name="action_attention_called">Виклик уваги було відправлено</string>
   <string name="action_attention_requested">Увагу було звернуто</string>
   <string name="action_ban">%1$s був заблокований</string>
   <string name="action_ban_by">%2$s заблокував %1$s</string>
@@ -73,8 +70,7 @@
   <string name="otr_refresh">Почати шифрування спочатку</string>
   <string name="otr_request">Співрозмовник відправив запит на OTR шифрування розмови, але у Вас не встановлено додаток, який його підтримує. Використайте Pidgin, Gajim чи Adium для PC/Mac та Xabber чи ChatSecure для Android. Завітайте на http://otr.cypherpunks.ca/ для отримання більш детальної інформації.</string>
   <string name="otr_start">Почати шифрування</string>
-  <string name="otr_unencrypted_message">Це повідомлення не було зашифровано</string>
-  <string name="otr_unreadable_message">Зашифроване повідомлення, відправлено Вами, неможливо прочитати</string>
+    <string name="otr_unreadable_message">Зашифроване повідомлення, відправлено Вами, неможливо прочитати</string>
   <string name="otr_not_decrypted_message">Повідомлення не може бути розшифроване</string>
   <string name="otr_verification">Перевірка особистості OTR</string>
   <string name="otr_verify_fingerprint">Перевірка цифровим відбитком</string>
@@ -84,21 +80,13 @@
   <string name="otr_verification_progress_title">OTR підтвердження виконується</string>
   <string name="otr_verification_notify_button">ВІДКРИТИ</string>
   <string name="otr_verification_notify_button_cancel">СКАСУВАТИ</string>
-  <string name="under_construction">В розробці</string>
-  <string name="under_construction_message">Цей екран у розробці</string>
-  <string name="chat_events_show_text_global">Використовувати глобальні параметри</string>
+    <string name="chat_events_show_text_global">Використовувати глобальні параметри</string>
   <string name="chat_events_show_text_always">Показати текст повідомлення</string>
   <string name="chat_events_show_text_never">Приховати текст повідомлення</string>
-  <string name="sending_file">Надсилання файлу %s</string>
-  <string name="error_sending_file">Помилка при надсиланні файлу %s</string>
-  <string name="no_application_to_open_file">Не знайдено додатку для відкриття цього файлу</string>
-  <string name="could_not_save_file">Не вдалося зберегти файл</string>
-  <string name="file_saved_successfully">Файл успішно збережений</string>
-  <string name="received_by">Отримано за допомогою %s</string>
-  <string name="could_not_get_path_to_file">Не вдалося отримати шлях до файлу</string>
+    <string name="error_sending_file">Помилка при надсиланні файлу %s</string>
+    <string name="could_not_get_path_to_file">Не вдалося отримати шлях до файлу</string>
   <string name="message_open_private_chat">Почати особистий чат</string>
-  <string name="http_file_upload_slot_error">Не вдається вивантажити файл. Завеликий?</string>
-  <string name="no_permission_to_read_files">Немає дозволу на читання файлів</string>
+    <string name="no_permission_to_read_files">Немає дозволу на читання файлів</string>
   <string name="no_permission_to_write_files">Немає дозволу на зберігання файлів</string>
   <string name="error_description_title">Опис помилки:</string>
   <string name="message_status_sent">Відправлено</string>
diff --git a/xabber/src/main/res/values-uk-rUA/contact_editor.xml b/xabber/src/main/res/values-uk-rUA/contact_editor.xml
index 82621df7a0..ea430d21d8 100644
--- a/xabber/src/main/res/values-uk-rUA/contact_editor.xml
+++ b/xabber/src/main/res/values-uk-rUA/contact_editor.xml
@@ -17,12 +17,8 @@
   <string name="processing_image">Опрацювання зображення...</string>
   <string name="error_during_crop">Виникла помилка при обрізанні зображення</string>
   <string name="error_during_image_processing">Error during image processing</string>
-  <string name="account_settings">Налаштування облікового запису</string>
-  <string name="account_user_info">Інформація облікового запису</string>
-  <string name="account_server_info">Інформація про сервер</string>
+    <string name="account_server_info">Інформація про сервер</string>
   <string name="account_server_info_description">Перелік можливостей сервера</string>
   <string name="conference_private_chat_invitation">%1$s з %2$s хоче розпочати особистий чат з вами</string>
   <string name="accept_muc_private_chat">Прийняти</string>
-  <string name="block_muc_private_chat">Заблокувати</string>
-  <string name="no_permission_camera">Немає дозволу на доступ до камери</string>
 </resources>
diff --git a/xabber/src/main/res/values-uk-rUA/contact_list.xml b/xabber/src/main/res/values-uk-rUA/contact_list.xml
index bd7f7b26f8..3bd6c731b2 100644
--- a/xabber/src/main/res/values-uk-rUA/contact_list.xml
+++ b/xabber/src/main/res/values-uk-rUA/contact_list.xml
@@ -18,17 +18,13 @@
   <string name="application_state_roster">Підключено.</string>
   <string name="application_state_starting">Запуск додатку... </string>
   <string name="application_state_waiting">Очікування підключення...</string>
-  <string name="chat_list">Перелік чатів</string>
-  <string name="chat_list_is_empty">Відсутні активні чати</string>
-  <string name="chat_viewer">Балачка</string>
-  <string name="close_chat">Закрити балачку</string>
-  <string name="CONNECTION_FAILED">Помилка підключення</string>
+    <string name="chat_viewer">Балачка</string>
+    <string name="CONNECTION_FAILED">Помилка підключення</string>
   <string name="contact_add">Додати контакт</string>
   <string name="contact_delete">Стерти</string>
   <string name="contact_block">Заблокувати контакт</string>
   <string name="contact_delete_confirm">Ви дійсно бажаєте вилучити контакт %1$s з облікового запису %2$s?</string>
-  <string name="contact_list">Перелік контактів</string>
-  <string name="discard_subscription">Відхилити контакт</string>
+    <string name="discard_subscription">Відхилити контакт</string>
   <string name="exit">Вийти</string>
   <string name="group_active_chat">Активні чати</string>
   <string name="group_none">Поза групами</string>
@@ -40,14 +36,7 @@
   <string name="request_subscription">Запросити підпис</string>
   <string name="XMPP_EXCEPTION">Помилка з\'єднання</string>
   <string name="application_state_closing">Збереження змін...\nДодаток скоро закриється.</string>
-  <string name="certificate_details">\n\nКому виданий:\nІм\'я (CN): %1$s\nОрганізація (O): %2$s\nПідрозділ (OU): %3$s\nСерійний номер: %4$s\n\nКим виданий:\nІм\'я (CN): %5$s\nОрганізація (O): %6$s\nПідрозділ (OU): %7$s\n\nСтрок дії:\nНабуває чинності: %8$s\nСпливає: %9$s.</string>
-  <string name="certificate_invalid_chane">Помилка під час перевірки ланцюга підписів</string>
-  <string name="certificate_invalid_target">Помилка цільової верифікацію</string>
-  <string name="certificate_self_signed">Само-підписаний сертифікат</string>
-  <string name="certificate_show_details">Докладніше...</string>
-  <string name="close_chats">Закрити всі чати</string>
-  <string name="contact_integration_suggest">Бажаєте інтегрувати Xabber із системними контактами?\nЦе можна змінити в \"Налаштування\" → \"XMPP облікові записи\" → Ваш обліковий запис → \"Інтеграція контактів\".\nУвага: Системний список контактів може стати повільнішим на декілька хвилин.</string>
-  <string name="group_room">Конференції</string>
+    <string name="group_room">Конференції</string>
   <string name="OTR_ERROR">Помилка OTR</string>
   <string name="select_contact">Оберіть потрібний контакт</string>
   <string name="show_offline_always">Завжди показувати</string>
@@ -62,8 +51,7 @@
   <string name="block_list">Список заблокованих</string>
   <string name="contact_blocked_successfully">Контакт успішно заблоковано</string>
   <string name="error_blocking_contact">Помилка блокування контакту</string>
-  <string name="unblock_contact">Розблокувати контакт</string>
-  <string name="contacts_unblocked_successfully">Контакт успішно розблоковано</string>
+    <string name="contacts_unblocked_successfully">Контакт успішно розблоковано</string>
   <string name="error_unblocking_contacts">Помилка розблокування контакту</string>
   <string name="block_contact_confirm">Ви дійсно бажаєте заблокувати контакт %1$s з облікового запису %2$s?</string>
   <string name="unblock_all_contacts_confirm">Ви дійсно бажаєте розблокувати усі контакти з облікового запису %1$s?</string>
@@ -75,16 +63,10 @@
   <string name="dark_theme_suggest_dialog_stay_on_light_side">Світла</string>
   <string name="battery_optimization_disable_dialog_title">Оптимізація витрат акумулятора</string>
   <string name="battery_optimization_disable_dialog_message">Ваш пристрій оптимізує витрати батареї, що може призвести до затримок в доставці повідомлень чи їх втрати.\n\nЗараз вам запропонують відключити оптимізацію.</string>
-  <string name="save_log_to_file">Зберегти до файлу</string>
-  <string name="clear_log">Видалити старі файли журналу</string>
+    <string name="clear_log">Видалити старі файли журналу</string>
   <string name="open_log_file">Відкрити</string>
   <string name="send_log_file">Надіслати</string>
-  <string name="intro_welcome">Ласкаво просимо у Xabber</string>
-  <string name="intro_xabber_description">XMPP-клієнт для Android з відкритим вихідним кодом</string>
-  <string name="intro_register_account">Зареєструвати обліковий запис XMPP</string>
-  <string name="intro_faq">Якщо у вас немає облікового запису XMPP, будь ласка, <a href="https://www.xabber.com/faq/">прочитайте наш F.A.Q.</a> про те, як зареєструватися.</string>
-  <string name="intro_web_search_register_xmpp">Зареєструвати обліковий запис XMPP</string>
-  <string name="remove_all_bookmarks">Видалити всі</string>
+    <string name="remove_all_bookmarks">Видалити всі</string>
   <string name="remove_selected_bookmarks">Вилучити вибрані</string>
   <string name="remove_all_bookmarks_confirm">Ви дійсно хочете видалити всі закладки з облікового запису %1$s?</string>
   <string name="remove_selected_bookmarks_confirm">Ви дійсно хочете видалити обрані закладки з облікового запису %1$s?</string>
diff --git a/xabber/src/main/res/values-uk-rUA/contact_viewer.xml b/xabber/src/main/res/values-uk-rUA/contact_viewer.xml
index c624d75ea4..42152edc99 100644
--- a/xabber/src/main/res/values-uk-rUA/contact_viewer.xml
+++ b/xabber/src/main/res/values-uk-rUA/contact_viewer.xml
@@ -17,12 +17,9 @@
   <string name="vcard_organization_unit">Організаційна одиниця</string>
   <string name="vcard_title">Посада</string>
   <string name="vcard_role">Роль</string>
-  <string name="vcard_other">Інша інформація</string>
-  <string name="vcard_categories">Категорії</string>
-  <string name="vcard_decsription">Опис</string>
+    <string name="vcard_decsription">Опис</string>
   <string name="vcard_note">Нотатки</string>
-  <string name="vcard_address">Адреса</string>
-  <string name="vcard_address_pobox">Абонентська скринька</string>
+    <string name="vcard_address_pobox">Абонентська скринька</string>
   <string name="vcard_address_extadr">Розширена адреса</string>
   <string name="vcard_address_street">Вулиця</string>
   <string name="vcard_address_locality">Місто</string>
diff --git a/xabber/src/main/res/values-uk-rUA/muc_editor.xml b/xabber/src/main/res/values-uk-rUA/muc_editor.xml
index 7dc493dac4..0692bd43e6 100644
--- a/xabber/src/main/res/values-uk-rUA/muc_editor.xml
+++ b/xabber/src/main/res/values-uk-rUA/muc_editor.xml
@@ -20,12 +20,10 @@
   <string name="muc_invite_confirm">%2$s запрошує Вас до конференції %3$s. Приєднатись з облікового запису %1$s?</string>
   <string name="muc_invite_confirm_reason">%2$s запрошує Вас до конференції %3$s: %4$s. Приєднатись з облікового запису %1$s?</string>
   <string name="muc_leave">Покинути конференцію</string>
-  <string name="muc_save">Зберегти конференцію</string>
-  <string name="muc_choose_conference">Вибрати конференцію</string>
+    <string name="muc_choose_conference">Вибрати конференцію</string>
   <string name="muc_next">Далі</string>
   <string name="muc_get_hosted_conferences">Отримати відкриті конференції</string>
   <string name="muc_error_getting_conferences">Помилка отримання конференцій</string>
   <string name="muc_type_conference_name">Введіть назву конференції</string>
-  <string name="contact_is_blocked">Контакт заблоковано!</string>
-  <string name="conference_invitation">Запрошення у конференцію</string>
+    <string name="conference_invitation">Запрошення у конференцію</string>
 </resources>
diff --git a/xabber/src/main/res/values-uk-rUA/notification_bar.xml b/xabber/src/main/res/values-uk-rUA/notification_bar.xml
index 69e9deeb31..f68c37cab0 100644
--- a/xabber/src/main/res/values-uk-rUA/notification_bar.xml
+++ b/xabber/src/main/res/values-uk-rUA/notification_bar.xml
@@ -34,10 +34,7 @@
   <!-- Used for plural form in russian. -->
   <string name="connection_state_waiting_5">-</string>
   <string name="connection_state_offline">%1$d %2$s поза мережею</string>
-  <string name="archive_available_request_message">Ви бажаєте зберігати історію повідомлень на сервері?\nЦе дозволить Xabber завантажувати історію на будь-якому пристрої, використовуючи Ваш обліковий запис.\nЦя можливість призведе до збільшення трафіку і може суттєво зменшити швидкість підключення.\nУВАГА: Вся Ваша локальна історія буде вилучена.</string>
-  <string name="archive_available_request_title">Дозволити архівування повідомлень?</string>
-  <string name="INVALID_CERTIFICATE">Недійсний сертифікат</string>
-  <string name="muc_invite_message">Бажаєте підключитись до конференції?</string>
+    <string name="muc_invite_message">Бажаєте підключитись до конференції?</string>
   <string name="otr_verification_in_progress">Натисніть, щоб перервати</string>
   <string name="PASSWORD_REQUIRED">Необхідний пароль</string>
   <string name="pay_attention">Зверніть увагу</string>
diff --git a/xabber/src/main/res/values-uk-rUA/preference_editor.xml b/xabber/src/main/res/values-uk-rUA/preference_editor.xml
index 135ddb24db..a997c47a0b 100644
--- a/xabber/src/main/res/values-uk-rUA/preference_editor.xml
+++ b/xabber/src/main/res/values-uk-rUA/preference_editor.xml
@@ -8,14 +8,11 @@
   <string name="contacts_order_alphabet">За абеткою</string>
   <string name="contacts_order_status">По статусу</string>
   <string name="contacts_show_accounts">Групувати по обліковим записам\nДозволяє групувати співрозмовників по обліковим записам</string>
-  <string name="contacts_show_active_chats">Активні чати на горі\nВідображати активні чати у верхній частині списку контактів</string>
-  <string name="contacts_show_avatars">Показувати аватарки\nПоказувати аватарки користувачів в переліку контактів</string>
+    <string name="contacts_show_avatars">Показувати аватарки\nПоказувати аватарки користувачів в переліку контактів</string>
   <string name="contacts_show_empty_groups">Показати порожні групи\nПоказати групи в яких немає онлайн-контактів</string>
   <string name="contacts_show_groups">Показувати групи\nПоказувати групи в переліку контактів</string>
   <string name="contacts_show_offline">Показувати контакти які не в мережі</string>
-  <string name="contacts_show_panel">Показати панель облікових записів\nПоказати облікові записи з аватарами в нижньому правому куті списку контактів</string>
-  <string name="contacts_stay_active_chats">Дублювати активні чати\nАктивні чати, з\'являються з верху списку контактів і груп</string>
-  <string name="debug_log">Журнал зневадження\nВиводити повідомлення для для зневадження в окремий журнал\n(перезапустіть додаток, для набуття чинності параметру)</string>
+    <string name="debug_log">Журнал зневадження\nВиводити повідомлення для для зневадження в окремий журнал\n(перезапустіть додаток, для набуття чинності параметру)</string>
   <string name="debug_file_log_title">Записати файл журналу\nЗаписати журнал налагодження у локальний файл (його можна надіслати).</string>
   <string name="debug_log_files_title">Файли журналу\nСписок записаних файлів журналу.</string>
   <string name="debug_log_files_activity_title">Файли журналу</string>
@@ -28,8 +25,7 @@
   <string name="events_persistent">Піктограма на Taskbar\nВідображати постійне повідомлення. Цей параметр запобігає Android вигружати програму з пам\'яті</string>
   <string name="interface_theme_dark">Темний</string>
   <string name="interface_theme_light">Світлий</string>
-  <string name="interface_theme_normal">Типовий</string>
-  <string name="interface_smiles_android">Стандартні смайли</string>
+    <string name="interface_smiles_android">Стандартні смайли</string>
   <string name="interface_smiles_none">Відключити графічні смайли</string>
   <string name="preference_connection">Налаштування підключення\nВстановлення параметрів підключення</string>
   <string name="preference_contacts">Перелік контактів\nПараметри показу переліку контактів</string>
@@ -49,8 +45,7 @@
   <string name="chats_font_size_small">Малий</string>
   <string name="chats_font_size_xlarge">Збільшений</string>
   <string name="chats_hide_keyboard_landscape">В ландшафтному режимі</string>
-  <string name="chats_receipt">Сповіщення про доставку повідомлення\nВідправляти і отримувати сповіщення про доставку повідомлення</string>
-  <string name="chats_show_avatars">Аватарки в повідомленнях\nПоказувати аватарки в кожному повідомленні</string>
+    <string name="chats_show_avatars">Аватарки в повідомленнях\nПоказувати аватарки в кожному повідомленні</string>
   <string name="chats_show_status_change_muc">В конференціях</string>
   <string name="chats_state_notification">Показати статус набору\nПоказати коли інший користувач набирає</string>
   <string name="connection_adjust_priority">Настроїти пріоритет\nВстановити відповідно до вибраного стану. Пріоритет облікового запису буде перевизначено.</string>
@@ -63,31 +58,19 @@
   <string name="contacts_reset_offline">Скинути поза мережеві параметри\nОчистити індивідуальні параметри для груп і облікових записів</string>
   <string name="contacts_reset_offline_warning">Ви дійсно хочете очистити індивідуальні налаштування для груп та облікових записів?</string>
   <string name="events_first_only">Попередити про перше повідомлення\nПовідомити тільки про перше повідомлення в чаті</string>
-  <string name="events_ignore_system_vibro">Ігнорувати системні налаштування\nВключіть, якщо не працює системна вібрація</string>
-  <string name="events_message">Налаштування повідомлень\nНалаштувати сповіщення про вхідні повідомлення</string>
-  <string name="events_message_chat">Тільки в чаті</string>
-  <string name="events_message_chat_and_muc">В чатах і конференціях</string>
-  <string name="events_message_none">Не сповіщати</string>
-  <string name="events_visible_chat">Сповіщення в поточному чаті\nСповіщати о вхідних повідомлення в поточному чаті</string>
-  <string name="events_suppress_100">Приховати деякі повідомлення статусу\nНе отримувати \'Ця кімната не анонімна\' повідомлення</string>
+    <string name="events_suppress_100">Приховати деякі повідомлення статусу\nНе отримувати \'Ця кімната не анонімна\' повідомлення</string>
   <string name="negative_priotiry_summary">%s (Ви не зможете отримувати повідомлення із будь-яких балачок)</string>
   <string name="preference_accounts">XMPP аккаунти\nУправління аккаунтами</string>
   <string name="preference_security">Безпека\nНалаштування безпеки</string>
   <string name="security_check_certificate">Перевірте сертифікат сервера\nСповістити про проблеми з сертифікатом при шифрованому підключенні</string>
-  <string name="security_clear_certificate">Видалити сертифікати\nОчистити список ігнорованих сертифікатів</string>
-  <string name="security_otr_history">Зберігати історію\nЗберігати історію чату для OTR сесій</string>
-  <string name="security_otr_mode">Режим OTR шифрування</string>
+    <string name="security_otr_mode">Режим OTR шифрування</string>
   <string name="chats_attention">Увага\nРеагувати на вхідні запити уваги</string>
   <string name="chats_attention_sound">Звуки уваги\nОберіть рингтон</string>
   <string name="connection_load_vcard">Завантажувати vCard\nЗавантажувати і оновлювати персональну інформацію контактів. Відключення параметру допоможе зекономити трафік.</string>
   <string name="connection_load_images">Завантажувати зображення\nЗавантаження зображень з URL-адрес автоматично. Вимкнення зменшить використання трафіку.</string>
   <string name="connection_use_carbons">Режим Всіх\nМоже бути нестабільним! Ділиться сеансами для того ж облікового запису на цьому клієнті. Вимкніть для зменшення трафіку.</string>
-  <string name="connection_dns_resolver_type">Тип DNS-клієнта</string>
-  <string name="connection_dns_resolver_type_dns_java_resolver">DNSJavaResolver</string>
+    <string name="connection_dns_resolver_type_dns_java_resolver">DNSJavaResolver</string>
   <string name="connection_dns_resolver_type_mini_dns_resolver">MiniDNSResolver (експериментально)</string>
-  <string name="connection_use_plain_text_auth">Аутентифікація відкритим текстом\n
-Використовувати відкриту аутентифікацію для всіх акаунтів. Не рекомендується.</string>
-  <string name="events_phrases">Ключові слова\nСтворити спеціальні сповіщення для отриманих повідомлень, які містять спеціальні фрази</string>
-  <string name="security_clear_certificate_warning">Ви дійсно хочете видалити всі ігноровані сертифікати?</string>
-  <string name="account_error_settings">Налаштування</string>
+    <string name="events_phrases">Ключові слова\nСтворити спеціальні сповіщення для отриманих повідомлень, які містять спеціальні фрази</string>
+    <string name="account_error_settings">Налаштування</string>
 </resources>
diff --git a/xabber/src/main/res/values-vi-rVN/account_editor.xml b/xabber/src/main/res/values-vi-rVN/account_editor.xml
index e5f4f5031f..ad3fd3b502 100644
--- a/xabber/src/main/res/values-vi-rVN/account_editor.xml
+++ b/xabber/src/main/res/values-vi-rVN/account_editor.xml
@@ -2,40 +2,25 @@
 <!--Generated by crowdin.com-->
 <resources>
   <string name="account_compression">Sử dụng nén</string>
-  <string name="account_enabled">Đã bật</string>
-  <string name="account_host">Máy chủ</string>
+    <string name="account_host">Máy chủ</string>
   <string name="account_password">Mật khẩu</string>
   <string name="confirm_password">Xác nhận mật khẩu</string>
   <string name="account_port">Cổng</string>
   <string name="account_priority">Mức độ ưu tiên</string>
   <string name="account_resource">Tên nguồn</string>
   <string name="account_server_name">Máy chủ</string>
-  <string name="account_type">Loại tài khoản</string>
-  <string name="account_type_hints_gtalk">tên đăng nhập vào miền gmail.com hoặc Google Apps</string>
-  <string name="account_type_helps_gtalk">Nếu chưa có tài khoản Google, bạn có thể tạo mới tại http://mail.google.com\nBạn cũng có thể sử dụng tên_người_dùng_của_bạn@miền_google_của_bạn</string>
-  <string name="account_xmpp_register_warning">Bạn phải <a href="http://www.google.com/#q=register an XMPP account"> đăng ký một tài khoản XMPP</a> trước khi thêm nó vào Xabber!</string>
-  <string name="account_type_helps_xmpp">Nếu bạn muốn tìm hiểu thêm về XMPP (Jabber): https://xmpp.org</string>
-  <string name="account_user_name">Tên người dùng</string>
+    <string name="account_xmpp_register_warning">Bạn phải <a href="http://www.google.com/#q=register an XMPP account"> đăng ký một tài khoản XMPP</a> trước khi thêm nó vào Xabber!</string>
+    <string name="account_user_name">Tên người dùng</string>
   <string name="EMPTY_SERVER_NAME">Chưa xác định tên máy chủ</string>
   <string name="EMPTY_USER_NAME">Chưa xác định tên người dùng</string>
   <string name="CONFIRM_PASSWORD">Sai mật khẩu</string>
-  <string name="account_archive_mode">Lưu lịch sử tin nhắn</string>
-  <string name="account_archive_mode_available">Trên máy chủ nếu có thể</string>
-  <string name="account_archive_mode_dont_store">Không lưu trữ</string>
-  <string name="account_archive_mode_local">Cục bộ trên thiết bị</string>
-  <string name="account_archive_mode_server">Trên máy chủ</string>
-  <string name="account_archive_mode_unread">Cục bộ, nhưng chỉ chưa gửi và chưa đọc</string>
-  <string name="account_compression_summary">Kiểm tra để cho phép nén dữ liệu</string>
+    <string name="account_compression_summary">Kiểm tra để cho phép nén dữ liệu</string>
   <string name="account_custom">Máy chủ tuỳ chọn</string>
   <string name="account_custom_summary">Dùng cài đặt máy chủ tuỳ chọn thay cho bản ghi SRV</string>
-  <string name="account_enabled_summary">Chuyển đổi để kích hoạt tài khoản</string>
-  <string name="account_invalid_port">Cổng phải là một con số (mặc định: 5222)</string>
+    <string name="account_invalid_port">Cổng phải là một con số (mặc định: 5222)</string>
   <string name="account_invalid_port_range">Cổng phải từ 1 đến 65535 (mặc định: 5222)</string>
   <string name="account_invalid_priority">Giá trị mức độ ưu tiên phải là một con số từ -128 đến 127 (mặc định: 0)</string>
-  <string name="account_oauth">Xác thực</string>
-  <string name="account_oauth_invalidated">Chưa được xác thực</string>
-  <string name="account_oauth_summary">Cài đặt OAuth</string>
-  <string name="account_proxy_host">Máy chủ proxy</string>
+    <string name="account_proxy_host">Máy chủ proxy</string>
   <string name="account_proxy_invalid_port_range">Cổng proxy phải từ 1 đến 65535 (mặc định: 8080)</string>
   <string name="account_proxy_invalid_port">Cổng proxy phải là một con số (mặc định: 8080)</string>
   <string name="account_proxy_password">Mật khẩu proxy</string>
@@ -47,18 +32,14 @@
   <string name="account_sasl_summary">Tắt với những máy chủ quá cũ</string>
   <string name="account_store_password">Lưu mật khẩu</string>
   <string name="account_store_password_summary">Tắt tuỳ chọn này để yêu cầu mật khẩu mỗi khi bạn trực tuyến</string>
-  <string name="account_syncable">Tích hợp vào danh bạ hệ thống</string>
-  <string name="account_syncable_summary">Hiển thị danh bạ từ tài khoản này trên danh bạ của thiết bị</string>
-  <string name="account_tls_enable">Bật TLS</string>
+    <string name="account_tls_enable">Bật TLS</string>
   <string name="account_tls_enable_summary">Sử dụng mã hoá TLS khi có thể để kết nối với máy chủ</string>
   <string name="account_tls_legacy">SSL lỗi thời</string>
   <string name="account_tls_legacy_summary">Sử dụng mã hoá SSL lỗi thời khi kết nối đến máy chủ</string>
   <string name="account_tls_mode">Sử dụng TLS/SSL</string>
   <string name="account_tls_require">Yêu cầu TLS</string>
   <string name="account_tls_require_summary">Yêu cầu mã hoá TLS khi kết nối đến máy chủ</string>
-  <string name="account_use_orbot">Chat thông qua mạng ẩn danh TOR và buộc thực thi giao thức mật mã TLS\nKhông nên dùng với Google Talk</string>
-  <string name="confirm_cancellation">Có chắc là bạn muốn huỷ tất cả thay đổi?</string>
-  <string name="INCORRECT_USER_NAME">Sai tên người dùng. Xem văn bản hỗ trợ bên dưới để biết thêm chi tiết.</string>
+    <string name="INCORRECT_USER_NAME">Sai tên người dùng. Xem văn bản hỗ trợ bên dưới để biết thêm chi tiết.</string>
   <string name="orbot_required_message">Để tiến hành sử dụng TOR, bạn phải cài đặt Orbot và kích hoạt luồng giao thông proxy qua nó. Bạn có muốn cài đặt nó từ Google Play?</string>
   <string name="orbot_required_title">Cài đặt Orbot?</string>
   <string name="install_orbot">Cài đặt Orbot</string>
diff --git a/xabber/src/main/res/values-vi-rVN/chat_viewer.xml b/xabber/src/main/res/values-vi-rVN/chat_viewer.xml
index 8fd45c2910..25d7f2e16b 100644
--- a/xabber/src/main/res/values-vi-rVN/chat_viewer.xml
+++ b/xabber/src/main/res/values-vi-rVN/chat_viewer.xml
@@ -17,11 +17,8 @@
   <string name="message_quote">Trích dẫn</string>
   <string name="message_remove">Xóa khỏi lịch sử</string>
   <string name="message_repeat">Thử gửi đi</string>
-  <string name="message_open_file">Mở</string>
-  <string name="message_save_file">Lưu</string>
-  <string name="save_history">Lưu lịch sử cục bộ\nLưu lịch sử tin nhắn cục bộ</string>
-  <string name="show_history">Hiển thị lịch sử</string>
-  <string name="action_attention_called">Đã gửi yêu cầu chú ý</string>
+    <string name="save_history">Lưu lịch sử cục bộ\nLưu lịch sử tin nhắn cục bộ</string>
+    <string name="action_attention_called">Đã gửi yêu cầu chú ý</string>
   <string name="action_attention_requested">Yêu cầu bạn chú ý</string>
   <string name="action_ban">%1$s đã bị cấm</string>
   <string name="action_ban_by">%1$s đã bị cấm bởi %2$s</string>
@@ -69,26 +66,17 @@
   <string name="otr_refresh">Khởi động lại mã hoá</string>
   <string name="otr_request">Đã yêu cầu hội thoại riêng tư nhưng bạn lại không có tiện ích hỗ trợ. Hãy dùng Pidgin, Gajim hoặc Adium cho PC/Mac và Xabber, Conversations hoặc ChatSecure cho Android. Ghé trang http://otr.cypherpunks.ca/ để biết thêm thông tin.</string>
   <string name="otr_start">Bắt đầu mã hoá</string>
-  <string name="otr_unencrypted_message">Tin nhắn này chưa được mã hoá</string>
-  <string name="otr_unreadable_message">Không thể đọc được tin nhắn mã hoá mà bạn gửi</string>
+    <string name="otr_unreadable_message">Không thể đọc được tin nhắn mã hoá mà bạn gửi</string>
   <string name="otr_verification">Xác minh OTR</string>
   <string name="otr_verify_fingerprint">Xác minh bằng dấu vân tay</string>
   <string name="otr_verify_question">Xác minh bằng câu hỏi</string>
   <string name="otr_verify_secret">Xác minh bằng bí mật đã chia sẻ</string>
-  <string name="under_construction">Đang xây dựng</string>
-  <string name="under_construction_message">Màn hình này đang được xây dựng</string>
-  <string name="chat_events_show_text_global">Dùng cài đặt toàn cầu</string>
+    <string name="chat_events_show_text_global">Dùng cài đặt toàn cầu</string>
   <string name="chat_events_show_text_always">Hiện văn bản tin nhắn</string>
   <string name="chat_events_show_text_never">Ẩn văn bản tin nhắn</string>
-  <string name="sending_file">Đang gửi tập tin %s</string>
-  <string name="error_sending_file">Lỗi khi gửi tập tin %s</string>
-  <string name="no_application_to_open_file">Không có ứng dụng nào mở được tập tin này</string>
-  <string name="could_not_save_file">Không thể lưu tập tin</string>
-  <string name="file_saved_successfully">Đã lưu tập tin thành công</string>
-  <string name="received_by">Đã nhận bởi %s</string>
-  <string name="could_not_get_path_to_file">Không thấy đường dẫn đến tập tin</string>
+    <string name="error_sending_file">Lỗi khi gửi tập tin %s</string>
+    <string name="could_not_get_path_to_file">Không thấy đường dẫn đến tập tin</string>
   <string name="message_open_private_chat">Mở chat riêng tư</string>
-  <string name="http_file_upload_slot_error">Không thể tải lên tập tin. Quá lớn?</string>
-  <string name="no_permission_to_read_files">Không được phép đọc tập tin</string>
+    <string name="no_permission_to_read_files">Không được phép đọc tập tin</string>
   <string name="no_permission_to_write_files">Không được phép chép tập tin</string>
 </resources>
diff --git a/xabber/src/main/res/values-vi-rVN/contact_editor.xml b/xabber/src/main/res/values-vi-rVN/contact_editor.xml
index 63b1a6f93e..607b25f94b 100644
--- a/xabber/src/main/res/values-vi-rVN/contact_editor.xml
+++ b/xabber/src/main/res/values-vi-rVN/contact_editor.xml
@@ -17,10 +17,6 @@
   <string name="processing_image">Đang xử lý ảnh...</string>
   <string name="error_during_crop">Lỗi khi cắt ảnh</string>
   <string name="error_during_image_processing">Lỗi khi xử lý ảnh</string>
-  <string name="account_settings">Cài đặt tài khoản</string>
-  <string name="account_user_info">Thông tin tài khoản</string>
-  <string name="conference_private_chat_invitation">%1$s từ %2$s muốn bắt đầu chat riêng tư với bạn</string>
+    <string name="conference_private_chat_invitation">%1$s từ %2$s muốn bắt đầu chat riêng tư với bạn</string>
   <string name="accept_muc_private_chat">Chấp nhận</string>
-  <string name="block_muc_private_chat">Chặn</string>
-  <string name="no_permission_camera">Không trao quyền sử dụng camera</string>
 </resources>
diff --git a/xabber/src/main/res/values-vi-rVN/contact_list.xml b/xabber/src/main/res/values-vi-rVN/contact_list.xml
index 9a56dfed42..3dd6bac904 100644
--- a/xabber/src/main/res/values-vi-rVN/contact_list.xml
+++ b/xabber/src/main/res/values-vi-rVN/contact_list.xml
@@ -18,17 +18,13 @@
   <string name="application_state_roster">Đã kết nối.</string>
   <string name="application_state_starting">Đang khởi chạy ứng dụng&#8230;</string>
   <string name="application_state_waiting">Đang chờ kết nối&#8230;</string>
-  <string name="chat_list">Danh sách chat</string>
-  <string name="chat_list_is_empty">Không có chat hiện hữu</string>
-  <string name="chat_viewer">Chat</string>
-  <string name="close_chat">Đóng chat</string>
-  <string name="CONNECTION_FAILED">Lỗi kết nối</string>
+    <string name="chat_viewer">Chat</string>
+    <string name="CONNECTION_FAILED">Lỗi kết nối</string>
   <string name="contact_add">Thêm liên hệ</string>
   <string name="contact_delete">Xoá</string>
   <string name="contact_block">Chặn liên hệ</string>
   <string name="contact_delete_confirm">Có chắc là bạn muốn xoá liên hệ %1$s từ tài khoản %2$s?</string>
-  <string name="contact_list">Danh bạ</string>
-  <string name="discard_subscription">Từ chối liên hệ</string>
+    <string name="discard_subscription">Từ chối liên hệ</string>
   <string name="exit">Thoát</string>
   <string name="group_active_chat">Chat hiện hữu</string>
   <string name="group_none">Không có nhóm nào</string>
@@ -40,14 +36,7 @@
   <string name="request_subscription">Yêu cầu đăng ký</string>
   <string name="XMPP_EXCEPTION">Lỗi truyền tải</string>
   <string name="application_state_closing">Đang lưu các thay đổi&#8230;\nỨng dụng sẽ sớm được đóng.</string>
-  <string name="certificate_details">\n\nĐã xuất đến:\nTên Thường (CN): %1$s\nTổ Chức (O): %2$s\nĐơn vị thuộc Tổ chức (OU): %3$s\nSố Seri: %4$s\n\nĐã xuất bởi:\nTên Thường (CN): %5$s\nTổ Chức (O): %6$s\nĐơn vị thuộc Tổ chức (OU): %7$s\n\nHiệu lực:\nĐã xuất vào: %8$s\nHết hạn vào: %9$s.</string>
-  <string name="certificate_invalid_chane">Xác minh chuỗi chữ ký thất bại</string>
-  <string name="certificate_invalid_target">Xác minh đối tượng thất bại</string>
-  <string name="certificate_self_signed">Chứng chỉ tự ký</string>
-  <string name="certificate_show_details">Chi tiết&#8230;</string>
-  <string name="close_chats">Đóng tất cả chat</string>
-  <string name="contact_integration_suggest">Bạn có muốn Xabber được tích hợp vào danh bạ hệ thống?\nCó thể thay đổi tính năng này trong \"Cài đặt\"→ \"Tài khoản XMPP\" → Tài khoản của bạn → \"Tích hợp danh bạ\".\nLƯU Ý: Danh bạ hệ thống có thể bị chậm đi trong vài phút.</string>
-  <string name="group_room">Các diễn đàn</string>
+    <string name="group_room">Các diễn đàn</string>
   <string name="OTR_ERROR">Lỗi OTR</string>
   <string name="select_contact">Xin chạm để chọn liên hệ</string>
   <string name="show_offline_always">Luôn hiển thị</string>
@@ -62,8 +51,7 @@
   <string name="block_list">Danh sách chặn</string>
   <string name="contact_blocked_successfully">Chặn liên hệ thành công</string>
   <string name="error_blocking_contact">Lỗi khi chặn liên hệ</string>
-  <string name="unblock_contact">Bỏ chặn liên hệ</string>
-  <string name="contacts_unblocked_successfully">Bỏ chặn liên hệ thành công</string>
+    <string name="contacts_unblocked_successfully">Bỏ chặn liên hệ thành công</string>
   <string name="error_unblocking_contacts">Lỗi khi bỏ chặn liên hệ</string>
   <string name="block_contact_confirm">Có chắc là bạn muốn chặn liên hệ %1$s từ tài khoản %2$s?</string>
   <string name="unblock_all_contacts_confirm">Có chắc là bạn muốn bỏ chặn tất cả liên hệ từ tài khoản %1$s?</string>
diff --git a/xabber/src/main/res/values-vi-rVN/contact_viewer.xml b/xabber/src/main/res/values-vi-rVN/contact_viewer.xml
index b68cd5256f..ce1198160c 100644
--- a/xabber/src/main/res/values-vi-rVN/contact_viewer.xml
+++ b/xabber/src/main/res/values-vi-rVN/contact_viewer.xml
@@ -16,12 +16,9 @@
   <string name="vcard_organization_unit">Đơn vị trực thuộc</string>
   <string name="vcard_title">Chức vị</string>
   <string name="vcard_role">Phận sự</string>
-  <string name="vcard_other">Các thông tin khác</string>
-  <string name="vcard_categories">Danh mục</string>
-  <string name="vcard_decsription">Mô tả</string>
+    <string name="vcard_decsription">Mô tả</string>
   <string name="vcard_note">Ghi chú</string>
-  <string name="vcard_address">Địa chỉ</string>
-  <string name="vcard_address_pobox">Hộp thư</string>
+    <string name="vcard_address_pobox">Hộp thư</string>
   <string name="vcard_address_extadr">Địa chỉ mở rộng</string>
   <string name="vcard_address_street">Đường</string>
   <string name="vcard_address_locality">Phường/Xã/Thị trấn</string>
diff --git a/xabber/src/main/res/values-vi-rVN/muc_editor.xml b/xabber/src/main/res/values-vi-rVN/muc_editor.xml
index 9e2c262252..be507610f1 100644
--- a/xabber/src/main/res/values-vi-rVN/muc_editor.xml
+++ b/xabber/src/main/res/values-vi-rVN/muc_editor.xml
@@ -20,12 +20,10 @@
   <string name="muc_invite_confirm">%2$s mời bạn tham gia diễn đàn %3$s. Tham gia từ tài khoản %1$s?</string>
   <string name="muc_invite_confirm_reason">%2$s mời bạn tham gia diễn đàn %3$s: %4$s. Tham gia từ tài khoản %1$s?</string>
   <string name="muc_leave">Rời diễn đàn</string>
-  <string name="muc_save">Lưu diễn đàn</string>
-  <string name="muc_choose_conference">Chọn diễn đàn</string>
+    <string name="muc_choose_conference">Chọn diễn đàn</string>
   <string name="muc_next">Tiếp theo</string>
   <string name="muc_get_hosted_conferences">Tiếp nhận diễn đàn đã mở</string>
   <string name="muc_error_getting_conferences">Lỗi khi tiếp nhận diễn đàn</string>
   <string name="muc_type_conference_name">Gõ tên diễn đàn</string>
-  <string name="contact_is_blocked">Liên hệ đã bị chặn!</string>
-  <string name="conference_invitation">Lời mời diễn đàn</string>
+    <string name="conference_invitation">Lời mời diễn đàn</string>
 </resources>
diff --git a/xabber/src/main/res/values-vi-rVN/notification_bar.xml b/xabber/src/main/res/values-vi-rVN/notification_bar.xml
index ceea2144f5..151e1bfc57 100644
--- a/xabber/src/main/res/values-vi-rVN/notification_bar.xml
+++ b/xabber/src/main/res/values-vi-rVN/notification_bar.xml
@@ -34,10 +34,7 @@
   <!-- Used for plural form in russian. -->
   <string name="connection_state_waiting_5">-</string>
   <string name="connection_state_offline">%1$d %2$s đang ngoại tuyến</string>
-  <string name="archive_available_request_message">Bạn có muốn lưu lịch sử tin nhắn trên máy chủ?\nNó cho phép Xabber tải lịch sử tin nhắn từ tất cả thiết bị sử dụng tài khoản này.\nTính năng này sẽ chiếm một ít lưu lượng và làm giảm nhẹ tốc độ kết nối.\nCẢNH BÁO: Tất cả lịch sử cục bộ sẽ bị xoá.</string>
-  <string name="archive_available_request_title">Bật lưu trữ tin nhắn?</string>
-  <string name="INVALID_CERTIFICATE">Chứng chỉ không hợp lệ</string>
-  <string name="muc_invite_message">Bạn có muốn vào diễn đàn?</string>
+    <string name="muc_invite_message">Bạn có muốn vào diễn đàn?</string>
   <string name="otr_verification_in_progress">Nhấn vào đây để tắt.</string>
   <string name="PASSWORD_REQUIRED">Yêu cầu mật khẩu</string>
   <string name="pay_attention">Chú ý</string>
diff --git a/xabber/src/main/res/values-vi-rVN/preference_editor.xml b/xabber/src/main/res/values-vi-rVN/preference_editor.xml
index bd1cffe4e9..4bdee3953a 100644
--- a/xabber/src/main/res/values-vi-rVN/preference_editor.xml
+++ b/xabber/src/main/res/values-vi-rVN/preference_editor.xml
@@ -8,21 +8,17 @@
   <string name="contacts_order_alphabet">A-Z</string>
   <string name="contacts_order_status">Theo trạng thái</string>
   <string name="contacts_show_accounts">Nhóm theo tài khoản\nNhóm danh bạ theo tài khoản</string>
-  <string name="contacts_show_active_chats">Chat hiện hữu nằm trên cùng\nHiển thị các chat hiện hữu lên đầu danh sách liên hệ</string>
-  <string name="contacts_show_avatars">Hiện ảnh đại diện\nHiển thị ảnh đại diện người dùng trong danh bạ</string>
+    <string name="contacts_show_avatars">Hiện ảnh đại diện\nHiển thị ảnh đại diện người dùng trong danh bạ</string>
   <string name="contacts_show_empty_groups">Hiện nhóm rỗng\nHiển thị các nhóm không có liên hệ trực tuyến nào</string>
   <string name="contacts_show_groups">Hiện nhóm\nHiển thị các nhóm trong danh bạ</string>
   <string name="contacts_show_offline">Hiện các liên hệ ngoại tuyến</string>
-  <string name="contacts_show_panel">Hiện khung tài khoản\nHiển thị các nút thao tác với ảnh đại diện ở góc dưới bên phải danh bạ</string>
-  <string name="contacts_stay_active_chats">Nhân đôi chat hiện hữu\nCác chat hiện hữu sẽ xuất hiện cả trong danh bạ lẫn trong nhóm</string>
-  <string name="debug_log">Dò lỗi nhật ký\nSoạn tin nhắn để dò lỗi nhật ký (xin khởi động lại ứng dụng để áp dụng thay đổi)</string>
+    <string name="debug_log">Dò lỗi nhật ký\nSoạn tin nhắn để dò lỗi nhật ký (xin khởi động lại ứng dụng để áp dụng thay đổi)</string>
   <string name="debug_connection_errors_title">Hiện lỗi kết nối\nHiển thị thông báo nổi cho lỗi kết nối</string>
   <string name="events_lightning">Đèn hiệu\nNháy đèn LED khi thông báo</string>
   <string name="events_persistent">Biểu tượng thanh tác vụ\nHiển thị thông báo cố định. Tuỳ chọn này ngăn không cho Android tắt ứng dụng khỏi bộ nhớ</string>
   <string name="interface_theme_dark">Tối</string>
   <string name="interface_theme_light">Sáng</string>
-  <string name="interface_theme_normal">Mặc định</string>
-  <string name="interface_smiles_android">Biểu tượng cảm xúc Android</string>
+    <string name="interface_smiles_android">Biểu tượng cảm xúc Android</string>
   <string name="interface_smiles_none">Không dùng biểu tượng cảm xúc đồ hoạ</string>
   <string name="preference_connection">Cài đặt kết nối\nCài đặt kết nối</string>
   <string name="preference_contacts">Danh bạ\nTuỳ chỉnh diện mạo danh bạ</string>
@@ -37,8 +33,7 @@
   <string name="chats_font_size_small">Nhỏ</string>
   <string name="chats_font_size_xlarge">Cực lớn</string>
   <string name="chats_hide_keyboard_landscape">Trên màn hình ngang</string>
-  <string name="chats_receipt">Báo báo chuyển tin nhắn\nGửi và nhận báo báo chuyển tin nhắn</string>
-  <string name="chats_show_avatars">Ảnh đại diện trong tin nhắn\nHiển thị ảnh đại diện trong từng tin nhắn</string>
+    <string name="chats_show_avatars">Ảnh đại diện trong tin nhắn\nHiển thị ảnh đại diện trong từng tin nhắn</string>
   <string name="chats_show_status_change_muc">Trong các diễn đàn</string>
   <string name="chats_state_notification">Gửi thông báo gõ phím\nThông báo cho đối phương rằng bạn đang gõ phím</string>
   <string name="connection_adjust_priority">Chỉnh mức ưu tiên\nĐặt mức ưu tiên theo trạng thái đã chọn. Sẽ ghi đè lên mức ưu tiên tài khoản.</string>
@@ -51,26 +46,16 @@
   <string name="contacts_reset_offline">Thiết lập lại cài đặt ngoại tuyến\nXoá cài đặt riêng lẻ cho các nhóm và tài khoản</string>
   <string name="contacts_reset_offline_warning">Có chắc là bạn muốn xoá cài đặt riêng lẻ cho các nhóm và tài khoản?</string>
   <string name="events_first_only">Thông báo tin nhắn đầu tiên\nChỉ gửi thông báo tin nhắn đầu tiên trong khi chat</string>
-  <string name="events_ignore_system_vibro">Bỏ qua cài đặt rung hệ thống\nDùng tuỳ chọn này khi báo rung hệ thống không hoạt động</string>
-  <string name="events_message">Cài đặt thông báo\nCấu hình thông báo cho tin nhắn đến</string>
-  <string name="events_message_chat">Chỉ chat thôi</string>
-  <string name="events_message_chat_and_muc">Cả chat và diễn đàn</string>
-  <string name="events_message_none">Đừng thông báo</string>
-  <string name="events_visible_chat">Thông báo cho chat hiện tại\nThông báo các tin nhắn đến trong chat hiện tại</string>
-  <string name="events_suppress_100">Tắt đi vài thông điệp trạng thái\nĐừng hiện thông điệp \'Phòng này không ẩn danh\'</string>
+    <string name="events_suppress_100">Tắt đi vài thông điệp trạng thái\nĐừng hiện thông điệp \'Phòng này không ẩn danh\'</string>
   <string name="negative_priotiry_summary">%s (bạn sẽ không nhận được tin nhắn từ bất kỳ cuộc chat nào)</string>
   <string name="preference_accounts">Tài khoản XMPP\nQuản lý tài khoản</string>
   <string name="preference_security">Bảo mật\nCài đặt bảo mật</string>
   <string name="security_check_certificate">Kiểm tra chứng chỉ máy chủ\nThông báo vấn đề về chứng chỉ của các kết nối được mã hoá</string>
-  <string name="security_clear_certificate">Xoá chứng chỉ\nXoá danh sách các chứng chỉ bị bỏ qua</string>
-  <string name="security_otr_history">Lưu lịch sử\nLưu lịch sử chat của các phiên OTR</string>
-  <string name="security_otr_mode">Chế độ OTR</string>
+    <string name="security_otr_mode">Chế độ OTR</string>
   <string name="chats_attention">Thông báo chú ý\nHồi đáp yêu cầu chú ý nhận được</string>
   <string name="chats_attention_sound">Âm báo chú ý\nChọn âm báo</string>
   <string name="connection_load_vcard">Tải vCard\nTải và cập nhật thông tin cá nhân và ảnh đại diện của liên hệ. Tắt để giảm lưu lượng mạng sử dụng.</string>
   <string name="connection_load_images">Tải hình\nTự động tải hình từ URL tập tin. Tắt để giảm lưu lượng mạng sử dụng.</string>
   <string name="connection_use_carbons">Chế độ sao chép giấy than\nCó thể không ổn định! Chia sẻ các phiên cho cùng tài khoản trên máy trạm này. Tắt để giảm lưu lượng sử dụng.</string>
-  <string name="connection_use_plain_text_auth">Xác minh bằng văn bản thường\nXác minh bằng văn bản không mã hoá. Không khuyên dùng.</string>
-  <string name="events_phrases">Cụm từ then chốt\nTạo thông báo tuỳ chọn cho những tin nhắn chứa các cụm từ cụ thể</string>
-  <string name="security_clear_certificate_warning">Có chắc là bạn muốn xoá toàn bộ chứng chỉ bị bỏ qua?</string>
+    <string name="events_phrases">Cụm từ then chốt\nTạo thông báo tuỳ chọn cho những tin nhắn chứa các cụm từ cụ thể</string>
 </resources>
diff --git a/xabber/src/main/res/values-zh-rCN/account_editor.xml b/xabber/src/main/res/values-zh-rCN/account_editor.xml
index 93b4cd930d..1eb0c9f79b 100644
--- a/xabber/src/main/res/values-zh-rCN/account_editor.xml
+++ b/xabber/src/main/res/values-zh-rCN/account_editor.xml
@@ -2,40 +2,25 @@
 <!--Generated by crowdin.com-->
 <resources>
   <string name="account_compression">使用压缩</string>
-  <string name="account_enabled">启用</string>
-  <string name="account_host">服务器</string>
+    <string name="account_host">服务器</string>
   <string name="account_password">密码</string>
   <string name="confirm_password">确认密码</string>
   <string name="account_port">端口</string>
   <string name="account_priority">优先级</string>
   <string name="account_resource">资源</string>
   <string name="account_server_name">域</string>
-  <string name="account_type">账户类型</string>
-  <string name="account_type_hints_gtalk">gmail.com或Google Apps域上的用户名</string>
-  <string name="account_type_helps_gtalk">如果没有Google账户，你可以在 http://mail.google.com 创建一个\n你也可以使用your_user_name@your_google_domain</string>
-  <string name="account_xmpp_register_warning">在添加到 Xabber 之前，你必须 <a href="http://www.google.com/#q=register XMPP account"> 注册 XMPP 帐户</a>！</string>
-  <string name="account_type_helps_xmpp">如果你想了解更多关于XMPP（Jabber）的信息，请参阅： https://xmpp.org</string>
-  <string name="account_user_name">用户名</string>
+    <string name="account_xmpp_register_warning">在添加到 Xabber 之前，你必须 <a href="http://www.google.com/#q=register XMPP account"> 注册 XMPP 帐户</a>！</string>
+    <string name="account_user_name">用户名</string>
   <string name="EMPTY_SERVER_NAME">域未指定</string>
   <string name="EMPTY_USER_NAME">用户名未指定</string>
   <string name="CONFIRM_PASSWORD">密码不匹配</string>
-  <string name="account_archive_mode">保存聊天记录</string>
-  <string name="account_archive_mode_available">于服务器，如可能</string>
-  <string name="account_archive_mode_dont_store">不存储</string>
-  <string name="account_archive_mode_local">于本地</string>
-  <string name="account_archive_mode_server">于服务器</string>
-  <string name="account_archive_mode_unread">于本地，仅未发和未读</string>
-  <string name="account_compression_summary">勾选以启用数据压缩</string>
+    <string name="account_compression_summary">勾选以启用数据压缩</string>
   <string name="account_custom">自定义服务器</string>
   <string name="account_custom_summary">使用自定义服务器而不是SRV记录</string>
-  <string name="account_enabled_summary">切换以启用帐户</string>
-  <string name="account_invalid_port">端口必须是整数（默认：5222）</string>
+    <string name="account_invalid_port">端口必须是整数（默认：5222）</string>
   <string name="account_invalid_port_range">端口必须介于 1 和 65535 之间 (默认: 5222)</string>
   <string name="account_invalid_priority">优先级必须是-128至127间的整数（默认：10）</string>
-  <string name="account_oauth">授权</string>
-  <string name="account_oauth_invalidated">未授权</string>
-  <string name="account_oauth_summary">OAuth设置</string>
-  <string name="account_proxy_host">代理主机</string>
+    <string name="account_proxy_host">代理主机</string>
   <string name="account_proxy_invalid_port_range">代理服务器端口必须介于 1 和 65535 之间 (默认: 8080)</string>
   <string name="account_proxy_invalid_port">代理服务器端口必须是一个数字 (默认: 8080)</string>
   <string name="account_proxy_password">代理密码</string>
@@ -47,18 +32,14 @@
   <string name="account_sasl_summary">旧服务器请勿启用</string>
   <string name="account_store_password">保存密码</string>
   <string name="account_store_password_summary">禁用此选项以在每次登录时输入密码</string>
-  <string name="account_syncable">与系统联系人整合</string>
-  <string name="account_syncable_summary">在电话的联系人列表中显示此账户的联系人</string>
-  <string name="account_tls_enable">启用TLS</string>
+    <string name="account_tls_enable">启用TLS</string>
   <string name="account_tls_enable_summary">在连接服务器时尽可能使用TLS加密</string>
   <string name="account_tls_legacy">传统SSL</string>
   <string name="account_tls_legacy_summary">在连接服务器时使用传统SSL</string>
   <string name="account_tls_mode">TLS/SSL用法</string>
   <string name="account_tls_require">要求TLS</string>
   <string name="account_tls_require_summary">在连接服务器时要求TLS加密</string>
-  <string name="account_use_orbot">通过TOR匿名网络聊天并要求TLS加密\n不推荐应用于Google Talk</string>
-  <string name="confirm_cancellation">你确实要放弃所有修改吗？</string>
-  <string name="INCORRECT_USER_NAME">错误的用户名，请参考下方的帮助文本。</string>
+    <string name="INCORRECT_USER_NAME">错误的用户名，请参考下方的帮助文本。</string>
   <string name="orbot_required_message">要使用TOR，你必须安装并激活Orbot。想要从Google Play安装吗？</string>
   <string name="orbot_required_title">安装Orbot？</string>
   <string name="install_orbot">安装Orbot</string>
diff --git a/xabber/src/main/res/values-zh-rCN/chat_viewer.xml b/xabber/src/main/res/values-zh-rCN/chat_viewer.xml
index 8053c7d994..ba1e4ee784 100644
--- a/xabber/src/main/res/values-zh-rCN/chat_viewer.xml
+++ b/xabber/src/main/res/values-zh-rCN/chat_viewer.xml
@@ -21,11 +21,8 @@
   <string name="message_remove">从历史中移除</string>
   <string name="message_repeat">重试发送</string>
   <string name="message_otr_show_original">显示消息</string>
-  <string name="message_open_file">打开</string>
-  <string name="message_save_file">保存</string>
-  <string name="save_history">保存本地历史\n在本地保存消息历史</string>
-  <string name="show_history">显示历史</string>
-  <string name="action_attention_called">已发送注意</string>
+    <string name="save_history">保存本地历史\n在本地保存消息历史</string>
+    <string name="action_attention_called">已发送注意</string>
   <string name="action_attention_requested">被请求注意</string>
   <string name="action_ban">%1$s被禁言</string>
   <string name="action_ban_by">%1$s被%2$s禁言</string>
@@ -73,8 +70,7 @@
   <string name="otr_refresh">重启加密</string>
   <string name="otr_request">Off-the-Record私人对话已被请求，但你没有支持此功能的组件。在PC/Mac上请使用Pidgin，Gajim或Adium，在Android上请使用Xabber或ChatSecure。请参见http://otr.cypherpunks.ca/</string>
   <string name="otr_start">开始加密</string>
-  <string name="otr_unencrypted_message">信息未被加密</string>
-  <string name="otr_unreadable_message">你发送的加密信息不可读</string>
+    <string name="otr_unreadable_message">你发送的加密信息不可读</string>
   <string name="otr_not_decrypted_message">无法解密信息</string>
   <string name="otr_verification">OTR验证</string>
   <string name="otr_verify_fingerprint">以指纹验证</string>
@@ -87,21 +83,13 @@
   <string name="otr_verification_progress_title">OTR 验证正在进行中</string>
   <string name="otr_verification_notify_button">打开</string>
   <string name="otr_verification_notify_button_cancel">取消</string>
-  <string name="under_construction">建设中</string>
-  <string name="under_construction_message">此屏幕正在建设中</string>
-  <string name="chat_events_show_text_global">使用全局设置</string>
+    <string name="chat_events_show_text_global">使用全局设置</string>
   <string name="chat_events_show_text_always">显示消息文本</string>
   <string name="chat_events_show_text_never">隐藏消息文本</string>
-  <string name="sending_file">正在发送文件 %s</string>
-  <string name="error_sending_file">发送文件错误 %s</string>
-  <string name="no_application_to_open_file">没有找到可打开此文件的应用程序</string>
-  <string name="could_not_save_file">无法保存文件</string>
-  <string name="file_saved_successfully">已成功保存文件</string>
-  <string name="received_by">已接收 %s</string>
-  <string name="could_not_get_path_to_file">无法获取文件路径</string>
+    <string name="error_sending_file">发送文件错误 %s</string>
+    <string name="could_not_get_path_to_file">无法获取文件路径</string>
   <string name="message_open_private_chat">打开私人聊天</string>
-  <string name="http_file_upload_slot_error">不能上传文件。太大吗？</string>
-  <string name="no_permission_to_read_files">没有读取文件的权限</string>
+    <string name="no_permission_to_read_files">没有读取文件的权限</string>
   <string name="no_permission_to_write_files">没有写入文件的权限</string>
   <string name="error_description_title">错误描述</string>
   <string name="message_status_sent">已发送</string>
diff --git a/xabber/src/main/res/values-zh-rCN/contact_editor.xml b/xabber/src/main/res/values-zh-rCN/contact_editor.xml
index ce7b317625..724ae3ad33 100644
--- a/xabber/src/main/res/values-zh-rCN/contact_editor.xml
+++ b/xabber/src/main/res/values-zh-rCN/contact_editor.xml
@@ -17,12 +17,8 @@
   <string name="processing_image">正在处理图像...</string>
   <string name="error_during_crop">图像裁切时出错</string>
   <string name="error_during_image_processing">在图像处理过程中的错误</string>
-  <string name="account_settings">帐户设置</string>
-  <string name="account_user_info">帐户信息</string>
-  <string name="account_server_info">服务器信息</string>
+    <string name="account_server_info">服务器信息</string>
   <string name="account_server_info_description">服务器功能列表</string>
   <string name="conference_private_chat_invitation">来自 %2$s 的 %1$s 想要与你开始私人聊天</string>
   <string name="accept_muc_private_chat">接受</string>
-  <string name="block_muc_private_chat">阻止</string>
-  <string name="no_permission_camera">没有访问相机的权限</string>
 </resources>
diff --git a/xabber/src/main/res/values-zh-rCN/contact_list.xml b/xabber/src/main/res/values-zh-rCN/contact_list.xml
index a72c0e3c7b..cf34c30100 100644
--- a/xabber/src/main/res/values-zh-rCN/contact_list.xml
+++ b/xabber/src/main/res/values-zh-rCN/contact_list.xml
@@ -18,17 +18,13 @@
   <string name="application_state_roster">已连接</string>
   <string name="application_state_starting">启动程序&#8230;</string>
   <string name="application_state_waiting">等待连接&#8230;</string>
-  <string name="chat_list">聊天列表</string>
-  <string name="chat_list_is_empty">没有进行中的聊天</string>
-  <string name="chat_viewer">聊天</string>
-  <string name="close_chat">结束聊天</string>
-  <string name="CONNECTION_FAILED">连接错误</string>
+    <string name="chat_viewer">聊天</string>
+    <string name="CONNECTION_FAILED">连接错误</string>
   <string name="contact_add">添加联系人</string>
   <string name="contact_delete">删除</string>
   <string name="contact_block">屏蔽联系人</string>
   <string name="contact_delete_confirm">你希望从账户%2$s中删除联系人%1$s吗？</string>
-  <string name="contact_list">联系人列表</string>
-  <string name="discard_subscription">拒绝订阅请求</string>
+    <string name="discard_subscription">拒绝订阅请求</string>
   <string name="exit">退出</string>
   <string name="group_active_chat">进行中的聊天</string>
   <string name="group_none">未分组</string>
@@ -40,15 +36,7 @@
   <string name="request_subscription">订阅请求</string>
   <string name="XMPP_EXCEPTION">流错误</string>
   <string name="application_state_closing">正在保存设置&#8230;\n应用程序将很快关闭。</string>
-  <string name="certificate_confirmation">%1$s.\n发布者使用被弃用的不被信任的指纹 (SHA-1): %2$s? 你想不被通知关于使用此证书的问题吗？</string>
-  <string name="certificate_details">\n\n颁发给：\n通用名（CN）：%1$s\n组织（O）：%2$s\n组织单位（OU）：%3$s\n序列号：%4$s\n\n颁发者：\n通用名（CN）：%5$s\n组织（O）：%6$s\n组织单位（OU）：%7$s\n\n有效期：\n有效起始日期：%8$s\n有效终止日期：%9$s</string>
-  <string name="certificate_invalid_chane">签名链验证失败</string>
-  <string name="certificate_invalid_target">目标验证失败</string>
-  <string name="certificate_self_signed">自签名证书</string>
-  <string name="certificate_show_details">详情&#8230;</string>
-  <string name="close_chats">结束所有聊天</string>
-  <string name="contact_integration_suggest">你希望将Xabber整合进系统联系人吗？\n可在“设置”→“XMPP账户”→你的账户→“与系统联系人整合”处修改。\n注：系统联系人列表可能有几分钟变得迟缓</string>
-  <string name="group_room">会议</string>
+    <string name="group_room">会议</string>
   <string name="OTR_ERROR">OTR错误</string>
   <string name="select_contact">点击以选择联系人</string>
   <string name="show_offline_always">总是显示</string>
@@ -63,8 +51,7 @@
   <string name="block_list">屏蔽列表</string>
   <string name="contact_blocked_successfully">成功地屏蔽了联系人</string>
   <string name="error_blocking_contact">屏蔽联系人出错</string>
-  <string name="unblock_contact">取消屏蔽联系人</string>
-  <string name="contacts_unblocked_successfully">成功地取消屏蔽联系人</string>
+    <string name="contacts_unblocked_successfully">成功地取消屏蔽联系人</string>
   <string name="error_unblocking_contacts">取消屏蔽联系人出错</string>
   <string name="block_contact_confirm">你真的想要从帐户 %2$s 中屏蔽联系人 %1$s 吗？</string>
   <string name="unblock_all_contacts_confirm">确实要取消屏蔽帐户 %1$s 中的所有联系人吗？</string>
@@ -76,19 +63,10 @@
   <string name="dark_theme_suggest_dialog_stay_on_light_side">留在光明的一面</string>
   <string name="battery_optimization_disable_dialog_title">电池优化</string>
   <string name="battery_optimization_disable_dialog_message">您的设备针对 Xabber 做了一些重度的电池优化，这可能导致通知的延迟或者甚至丢失消息。\n\n你现在将被要求禁用那些优化。</string>
-  <string name="save_log_to_file">保存到文件</string>
-  <string name="clear_log">删除旧的日志文件</string>
+    <string name="clear_log">删除旧的日志文件</string>
   <string name="open_log_file">打开</string>
   <string name="send_log_file">发送</string>
-  <string name="intro_welcome">欢迎使用 Xabber</string>
-  <string name="intro_xabber_description">安卓开源 XMPP 客户端</string>
-  <string name="intro_have_account">XMPP 登录</string>
-  <string name="intro_register_account">注册 XMPP 帐户</string>
-  <string name="intro_create_xabber_account">使用 Xabber 帐户</string>
-  <string name="intro_use_third_party_accounts">使用第三方 XMPP 帐户</string>
-  <string name="intro_faq">如果你没有 XMPP 帐户，请 <a href="https://www.xabber.com/faq/"> 阅读我们的常见问题</a> 如何获得一个。</string>
-  <string name="intro_web_search_register_xmpp">注册 XMPP 帐户</string>
-  <string name="synchronize_bookmarks">同步书签</string>
+    <string name="synchronize_bookmarks">同步书签</string>
   <string name="remove_all_bookmarks">全部删除</string>
   <string name="remove_selected_bookmarks">删除所选项</string>
   <string name="remove_all_bookmarks_confirm">你真的想要从帐户 %1$s 中删除所有书签吗？</string>
diff --git a/xabber/src/main/res/values-zh-rCN/contact_viewer.xml b/xabber/src/main/res/values-zh-rCN/contact_viewer.xml
index 324a4bc82f..dda07befd0 100644
--- a/xabber/src/main/res/values-zh-rCN/contact_viewer.xml
+++ b/xabber/src/main/res/values-zh-rCN/contact_viewer.xml
@@ -17,12 +17,9 @@
   <string name="vcard_organization_unit">组织单位</string>
   <string name="vcard_title">职衔</string>
   <string name="vcard_role">角色</string>
-  <string name="vcard_other">其他信息</string>
-  <string name="vcard_categories">分类</string>
-  <string name="vcard_decsription">描述</string>
+    <string name="vcard_decsription">描述</string>
   <string name="vcard_note">备注</string>
-  <string name="vcard_address">地址</string>
-  <string name="vcard_address_pobox">信箱</string>
+    <string name="vcard_address_pobox">信箱</string>
   <string name="vcard_address_extadr">扩展地址</string>
   <string name="vcard_address_street">街道</string>
   <string name="vcard_address_locality">地点</string>
diff --git a/xabber/src/main/res/values-zh-rCN/muc_editor.xml b/xabber/src/main/res/values-zh-rCN/muc_editor.xml
index 8094904ebc..0a79fd4c0c 100644
--- a/xabber/src/main/res/values-zh-rCN/muc_editor.xml
+++ b/xabber/src/main/res/values-zh-rCN/muc_editor.xml
@@ -20,12 +20,10 @@
   <string name="muc_invite_confirm">%2$s邀请你加入会议%3$s，以账户%1$s加入？</string>
   <string name="muc_invite_confirm_reason">%2$s邀请你加入会议%3$s：%4$s，以账户%1$s加入？</string>
   <string name="muc_leave">离开会议</string>
-  <string name="muc_save">保存会议</string>
-  <string name="muc_choose_conference">选择会议</string>
+    <string name="muc_choose_conference">选择会议</string>
   <string name="muc_next">下一个</string>
   <string name="muc_get_hosted_conferences">获取承载的会议</string>
   <string name="muc_error_getting_conferences">获取会议时出错</string>
   <string name="muc_type_conference_name">输入会议名称</string>
-  <string name="contact_is_blocked">联系人被屏蔽！</string>
-  <string name="conference_invitation">会议邀请</string>
+    <string name="conference_invitation">会议邀请</string>
 </resources>
diff --git a/xabber/src/main/res/values-zh-rCN/notification_bar.xml b/xabber/src/main/res/values-zh-rCN/notification_bar.xml
index 2590ccb096..57da93d8e3 100644
--- a/xabber/src/main/res/values-zh-rCN/notification_bar.xml
+++ b/xabber/src/main/res/values-zh-rCN/notification_bar.xml
@@ -34,10 +34,7 @@
   <!-- Used for plural form in russian. -->
   <string name="connection_state_waiting_5">-</string>
   <string name="connection_state_offline">%1$d个%2$s离线</string>
-  <string name="archive_available_request_message">你想要在服务器上保存聊天记录吗？\n这会使Xabber可加载使用此账户的所有设备的聊天记录。\n此功能会带来一些额外流量并会稍许降低连接速度。\n警告：你的所有本地历史会被删除。</string>
-  <string name="archive_available_request_title">启用消息存档？</string>
-  <string name="INVALID_CERTIFICATE">无效证书</string>
-  <string name="muc_invite_message">你要加入会议吗？</string>
+    <string name="muc_invite_message">你要加入会议吗？</string>
   <string name="otr_verification_in_progress">点击此处放弃</string>
   <string name="PASSWORD_REQUIRED">需要密码</string>
   <string name="pay_attention">注意</string>
diff --git a/xabber/src/main/res/values-zh-rCN/preference_editor.xml b/xabber/src/main/res/values-zh-rCN/preference_editor.xml
index 1da2341d2d..7b74d0d1a6 100644
--- a/xabber/src/main/res/values-zh-rCN/preference_editor.xml
+++ b/xabber/src/main/res/values-zh-rCN/preference_editor.xml
@@ -12,14 +12,11 @@
   <string name="contacts_order_alphabet">按字母排序</string>
   <string name="contacts_order_status">按状态</string>
   <string name="contacts_show_accounts">依账户分组\n在联系人列表中依账户分组</string>
-  <string name="contacts_show_active_chats">置顶进行中的聊天\n在联系人列表顶部显示进行中的聊天</string>
-  <string name="contacts_show_avatars">显示头像\n在联系人列表中显示用户的头像</string>
+    <string name="contacts_show_avatars">显示头像\n在联系人列表中显示用户的头像</string>
   <string name="contacts_show_empty_groups">显示空分组\n显示没有在线联系人的分组</string>
   <string name="contacts_show_groups">显示分组\n在联系人列表中显示分组</string>
   <string name="contacts_show_offline">显示离线的联系人</string>
-  <string name="contacts_show_panel">显示账户面板\n在联系人列表的右下角显示带有头像的动作按钮</string>
-  <string name="contacts_stay_active_chats">重复显示进行中的聊天\n同时在联系人列表顶部和分组中显示进行中聊天</string>
-  <string name="debug_log">调试日志\n将消息写入调试日志（请重启程序来应用设置）</string>
+    <string name="debug_log">调试日志\n将消息写入调试日志（请重启程序来应用设置）</string>
   <string name="debug_file_log_title">写文件日志\n写调试日志到本地文件(你可以共享它)。</string>
   <string name="debug_log_files_title">日志文件\n写入的日志文件列表。</string>
   <string name="debug_log_files_activity_title">日志文件</string>
@@ -36,8 +33,7 @@
   <string name="interface_theme">主题</string>
   <string name="interface_theme_dark">暗色</string>
   <string name="interface_theme_light">亮色</string>
-  <string name="interface_theme_normal">默认</string>
-  <string name="interface_smiles">表情符号</string>
+    <string name="interface_smiles">表情符号</string>
   <string name="interface_smiles_android">Android表情</string>
   <string name="interface_smiles_none">无图像表情</string>
   <string name="preference_connection">连接设置\n连接设置</string>
@@ -62,8 +58,7 @@
   <string name="chats_font_size_xlarge">特大</string>
   <string name="chats_hide_keyboard">隐藏键盘</string>
   <string name="chats_hide_keyboard_landscape">在横向模式</string>
-  <string name="chats_receipt">消息送达通知\n发送和接收消息送达通知</string>
-  <string name="chats_show_avatars">在消息中显示头像\n在每条消息旁显示头像</string>
+    <string name="chats_show_avatars">在消息中显示头像\n在每条消息旁显示头像</string>
   <string name="chats_show_status_change">显示状态变化</string>
   <string name="chats_show_status_change_muc">在会议中</string>
   <string name="chats_state_notification">显示输入通知\n显示其他用户正在输入</string>
@@ -77,37 +72,24 @@
   <string name="contacts_reset_offline">重设离线设置\n清除对某一账户或群组所作的设置</string>
   <string name="contacts_reset_offline_warning">你真的要清除对某一账户或群组所作的设置吗？</string>
   <string name="events_first_only">在首条消息时通知\n仅在聊天中收到第一条消息时通知</string>
-  <string name="events_ignore_system_vibro">忽略系统振动设置\n在系统振动无法正常使用时请启用此选项</string>
-  <string name="events_message">通知设置\n设置接收消息通知</string>
-  <string name="events_message_chat">仅聊天</string>
-  <string name="events_message_chat_and_muc">聊天和会议</string>
-  <string name="events_message_none">不通知</string>
-  <string name="events_show_text">消息预览\n在通知区域显示聊天中的消息文字</string>
+    <string name="events_show_text">消息预览\n在通知区域显示聊天中的消息文字</string>
   <string name="events_show_text_muc">消息预览\n在通知区域显示会议中的消息文字</string>
-  <string name="events_visible_chat">在当前聊天中通知\n对当前聊天中收到的消息通知</string>
-  <string name="events_suppress_100">抑制一些状态消息\n不要获取“这个房间不是匿名的”消息</string>
+    <string name="events_suppress_100">抑制一些状态消息\n不要获取“这个房间不是匿名的”消息</string>
   <string name="negative_priotiry_summary">%s（你将不会收到任何消息）</string>
   <string name="preference_accounts">XMPP账户\n管理账户</string>
   <string name="preference_security">安全\n安全设置</string>
   <string name="security_check_certificate">检查服务器证书\n在加密连接有证书问题时通知</string>
-  <string name="security_clear_certificate">移除证书\n清除忽略的证书列表</string>
-  <string name="security_otr_history">存储历史\n存储OTR会话的聊天记录</string>
-  <string name="security_otr_mode">OTR模式</string>
+    <string name="security_otr_mode">OTR模式</string>
   <string name="chats_attention">注意\n响应收到的注意请求</string>
   <string name="chats_attention_sound">注意声音\n选择铃声</string>
   <string name="connection_load_vcard">加载vCard\n加载和更新联系人的个人信息和头像，禁用以减少流量</string>
   <string name="connection_load_images">加载图像\n自动从文件URL加载图像。禁用以降低带宽使用率。</string>
   <string name="connection_use_carbons">复写模式\n将为此客户端上的相同账户共享会话，禁用以减少流量使用。</string>
-  <string name="connection_dns_resolver_type">DNS 解析程序类型</string>
-  <string name="connection_dns_resolver_type_dns_java_resolver">DNSJavaResolver</string>
+    <string name="connection_dns_resolver_type_dns_java_resolver">DNSJavaResolver</string>
   <string name="connection_dns_resolver_type_mini_dns_resolver">MiniDNSResolver (实验)</string>
-  <string name="connection_use_plain_text_auth">纯文本身份验证\n对所有账户使用纯文本认证。 不建议。</string>
-  <string name="events_phrases">关键短语\n通知某些包含预设短语的消息并选择声音</string>
-  <string name="security_clear_certificate_warning">你确实要删除所有忽略的证书吗？</string>
-  <string name="account_error_settings">设置</string>
-  <string name="category_xabber_account">Xabber 帐户</string>
-  <string name="category_xmpp_accounts">XMPP 帐户</string>
-  <string name="category_interface">界面</string>
+    <string name="events_phrases">关键短语\n通知某些包含预设短语的消息并选择声音</string>
+    <string name="account_error_settings">设置</string>
+    <string name="category_interface">界面</string>
   <string name="category_settings">设置</string>
   <string name="category_about">关于</string>
   <string name="category_appearance">外观</string>
diff --git a/xabber/src/main/res/values-zh-rCN/words.xml b/xabber/src/main/res/values-zh-rCN/words.xml
index f880edab06..2ac1513144 100644
--- a/xabber/src/main/res/values-zh-rCN/words.xml
+++ b/xabber/src/main/res/values-zh-rCN/words.xml
@@ -20,5 +20,4 @@
   <string name="settings">设置</string>
   <string name="ok">确定</string>
   <string name="login">登录</string>
-  <string name="resume">恢复</string>
 </resources>
diff --git a/xabber/src/main/res/values-zh-rTW/account_editor.xml b/xabber/src/main/res/values-zh-rTW/account_editor.xml
index 8ec60ff9a0..33cffe8d00 100644
--- a/xabber/src/main/res/values-zh-rTW/account_editor.xml
+++ b/xabber/src/main/res/values-zh-rTW/account_editor.xml
@@ -2,37 +2,23 @@
 <!--Generated by crowdin.com-->
 <resources>
   <string name="account_compression">使用壓縮</string>
-  <string name="account_enabled">啟用</string>
-  <string name="account_host">伺服器</string>
+    <string name="account_host">伺服器</string>
   <string name="account_password">密碼</string>
   <string name="confirm_password">確認密碼</string>
   <string name="account_port">埠</string>
   <string name="account_priority">優先順序</string>
   <string name="account_resource">資源</string>
   <string name="account_server_name">域</string>
-  <string name="account_type">帳號類別</string>
-  <string name="account_type_hints_gtalk">gmail.com或Google Apps上的使用者名稱</string>
-  <string name="account_type_helps_gtalk">如果您沒有Google帳戶，您可以在 http://mail.google.com 建立一個\n您也可以使用your_user_name@your_google_domain</string>
-  <string name="account_type_helps_xmpp">如果您想了解更多關於XMPP（Jabber）的資訊，請參閱： https://xmpp.org</string>
-  <string name="account_user_name">使用者名稱</string>
+    <string name="account_user_name">使用者名稱</string>
   <string name="EMPTY_SERVER_NAME">域未指定</string>
   <string name="EMPTY_USER_NAME">使用者名稱未指定</string>
   <string name="CONFIRM_PASSWORD">密碼不匹配</string>
-  <string name="account_archive_mode">儲存聊天記錄</string>
-  <string name="account_archive_mode_available">於伺服器，如可能</string>
-  <string name="account_archive_mode_dont_store">不儲存</string>
-  <string name="account_archive_mode_local">於本地</string>
-  <string name="account_archive_mode_server">於伺服器</string>
-  <string name="account_archive_mode_unread">於本地，僅未發和未讀</string>
-  <string name="account_compression_summary">勾選以啟用資料壓縮</string>
+    <string name="account_compression_summary">勾選以啟用資料壓縮</string>
   <string name="account_custom">自訂伺服器</string>
   <string name="account_custom_summary">使用自訂伺服器而不是SRV記錄</string>
   <string name="account_invalid_port">埠必須是整數（預設：5222）</string>
   <string name="account_invalid_priority">優先順序必須是-128至127間的整數（預設：10）</string>
-  <string name="account_oauth">授權</string>
-  <string name="account_oauth_invalidated">未授權</string>
-  <string name="account_oauth_summary">OAuth設定</string>
-  <string name="account_proxy_host">代理主機</string>
+    <string name="account_proxy_host">代理主機</string>
   <string name="account_proxy_password">代理密碼</string>
   <string name="account_proxy_port">代理埠</string>
   <string name="account_proxy_type">代理型別</string>
@@ -42,18 +28,14 @@
   <string name="account_sasl_summary">舊伺服器請勿啟用</string>
   <string name="account_store_password">儲存密碼</string>
   <string name="account_store_password_summary">禁用此選項，您將每次登入時都需輸入密碼</string>
-  <string name="account_syncable">與系統聯絡人整合</string>
-  <string name="account_syncable_summary">在電話的聯絡人清單中顯示此帳號的聯絡人</string>
-  <string name="account_tls_enable">啟用TLS</string>
+    <string name="account_tls_enable">啟用TLS</string>
   <string name="account_tls_enable_summary">在連線伺服器時儘可能使用TLS加密</string>
   <string name="account_tls_legacy">傳統SSL</string>
   <string name="account_tls_legacy_summary">在連線伺服器時使用傳統SSL</string>
   <string name="account_tls_mode">TLS/SSL用法</string>
   <string name="account_tls_require">要求TLS</string>
   <string name="account_tls_require_summary">在連線伺服器時要求TLS加密</string>
-  <string name="account_use_orbot">透過TOR匿名網路聊天並要求TLS加密\n不推薦應用於Google Talk</string>
-  <string name="confirm_cancellation">你確實要放棄所有修改嗎？</string>
-  <string name="INCORRECT_USER_NAME">錯誤的使用者名稱，請參考下方的說明。</string>
+    <string name="INCORRECT_USER_NAME">錯誤的使用者名稱，請參考下方的說明。</string>
   <string name="orbot_required_message">要使用TOR，您必須安裝並啟用Orbot。想要從Google Play安裝嗎？</string>
   <string name="orbot_required_title">安裝Orbot？</string>
   <string name="ACCOUNT_REGISTER_FAILED">未能在伺服器上註冊帳戶。</string>
diff --git a/xabber/src/main/res/values-zh-rTW/chat_viewer.xml b/xabber/src/main/res/values-zh-rTW/chat_viewer.xml
index 0d36954207..b1ffc61f6d 100644
--- a/xabber/src/main/res/values-zh-rTW/chat_viewer.xml
+++ b/xabber/src/main/res/values-zh-rTW/chat_viewer.xml
@@ -18,8 +18,7 @@
   <string name="message_remove">從歷史中移除</string>
   <string name="message_repeat">重試發送</string>
   <string name="save_history">儲存本地歷史\n在本地儲存訊息歷史</string>
-  <string name="show_history">顯示歷史</string>
-  <string name="action_attention_called">已發送提醒</string>
+    <string name="action_attention_called">已發送提醒</string>
   <string name="action_attention_requested">被請求提醒</string>
   <string name="action_ban">%1$s被禁言</string>
   <string name="action_ban_by">%1$s被%2$s禁言</string>
@@ -67,15 +66,12 @@
   <string name="otr_refresh">重新加密</string>
   <string name="otr_request">已被請求Off-the-Record私人對話，但已啟用沒有支援此功能的元件。在PC/Mac上請使用Pidgin，Gajim或Adium，在Android上請使用Xabber或ChatSecure。請參見http://otr.cypherpunks.ca/</string>
   <string name="otr_start">開始加密</string>
-  <string name="otr_unencrypted_message">訊息未被加密</string>
-  <string name="otr_unreadable_message">無法讀取您發送的加密訊息</string>
+    <string name="otr_unreadable_message">無法讀取您發送的加密訊息</string>
   <string name="otr_verification">OTR驗證</string>
   <string name="otr_verify_fingerprint">以指紋驗證</string>
   <string name="otr_verify_question">以問題驗證</string>
   <string name="otr_verify_secret">已共享的金鑰驗證</string>
-  <string name="under_construction">建設中</string>
-  <string name="under_construction_message">此螢幕正在建設中</string>
-  <string name="chat_events_show_text_global">使用全局設定</string>
+    <string name="chat_events_show_text_global">使用全局設定</string>
   <string name="chat_events_show_text_always">顯示訊息文字</string>
   <string name="chat_events_show_text_never">隱藏訊息文字</string>
 </resources>
diff --git a/xabber/src/main/res/values-zh-rTW/contact_list.xml b/xabber/src/main/res/values-zh-rTW/contact_list.xml
index 3f1cdd1c65..1770060417 100644
--- a/xabber/src/main/res/values-zh-rTW/contact_list.xml
+++ b/xabber/src/main/res/values-zh-rTW/contact_list.xml
@@ -18,16 +18,12 @@
   <string name="application_state_roster">已連線</string>
   <string name="application_state_starting">啟動程式&#8230;</string>
   <string name="application_state_waiting">等待連線&#8230;</string>
-  <string name="chat_list">聊天清單</string>
-  <string name="chat_list_is_empty">沒有進行中的聊天</string>
-  <string name="chat_viewer">聊天</string>
-  <string name="close_chat">結束聊天</string>
-  <string name="CONNECTION_FAILED">連線錯誤</string>
+    <string name="chat_viewer">聊天</string>
+    <string name="CONNECTION_FAILED">連線錯誤</string>
   <string name="contact_add">新增聯絡人</string>
   <string name="contact_delete">刪除</string>
   <string name="contact_delete_confirm">您確定要從帳號%2$s中刪除聯絡人%1$s嗎？</string>
-  <string name="contact_list">聯絡人清單</string>
-  <string name="discard_subscription">拒絕訂閱請求</string>
+    <string name="discard_subscription">拒絕訂閱請求</string>
   <string name="exit">結束</string>
   <string name="group_active_chat">進行中的聊天</string>
   <string name="group_none">未分組</string>
@@ -39,14 +35,7 @@
   <string name="request_subscription">訂閱請求</string>
   <string name="XMPP_EXCEPTION">串流錯誤</string>
   <string name="application_state_closing">正在儲存設定&#8230;\n應用程式將很快關閉。</string>
-  <string name="certificate_details">\n\n頒發給：\n通用名（CN）：%1$s\n組織（O）：%2$s\n組織單位（OU）：%3$s\n序列號：%4$s\n\n頒發者：\n通用名（CN）：%5$s\n組織（O）：%6$s\n組織單位（OU）：%7$s\n\n有效期：\n有效起始日期：%8$s\n有效終止日期：%9$s</string>
-  <string name="certificate_invalid_chane">簽名鏈驗證失敗</string>
-  <string name="certificate_invalid_target">目標驗證失敗</string>
-  <string name="certificate_self_signed">自簽名證書</string>
-  <string name="certificate_show_details">詳情&#8230;</string>
-  <string name="close_chats">結束所有聊天</string>
-  <string name="contact_integration_suggest">您希望將Xabber整合進系統的聯絡人嗎？\n可在「設定」→「XMPP帳號」→您的帳號→「聯絡人與系統整合」處修改。\n註：系統聯絡人可能會有幾分鐘變得遲緩</string>
-  <string name="group_room">會議</string>
+    <string name="group_room">會議</string>
   <string name="OTR_ERROR">OTR錯誤</string>
   <string name="select_contact">點選以選擇聯絡人</string>
   <string name="show_offline_always">總是顯示</string>
diff --git a/xabber/src/main/res/values-zh-rTW/contact_viewer.xml b/xabber/src/main/res/values-zh-rTW/contact_viewer.xml
index 2b2e9587ae..c7209d1ce9 100644
--- a/xabber/src/main/res/values-zh-rTW/contact_viewer.xml
+++ b/xabber/src/main/res/values-zh-rTW/contact_viewer.xml
@@ -15,12 +15,9 @@
   <string name="vcard_organization">機構</string>
   <string name="vcard_title">職銜</string>
   <string name="vcard_role">角色</string>
-  <string name="vcard_other">其他資訊</string>
-  <string name="vcard_categories">分類</string>
-  <string name="vcard_decsription">描述</string>
+    <string name="vcard_decsription">描述</string>
   <string name="vcard_note">備註</string>
-  <string name="vcard_address">地址</string>
-  <string name="vcard_address_pobox">信箱</string>
+    <string name="vcard_address_pobox">信箱</string>
   <string name="vcard_address_extadr">地址補充</string>
   <string name="vcard_address_street">街道</string>
   <string name="vcard_address_locality">地點</string>
diff --git a/xabber/src/main/res/values-zh-rTW/muc_editor.xml b/xabber/src/main/res/values-zh-rTW/muc_editor.xml
index e2be2c9729..69f021c247 100644
--- a/xabber/src/main/res/values-zh-rTW/muc_editor.xml
+++ b/xabber/src/main/res/values-zh-rTW/muc_editor.xml
@@ -20,5 +20,4 @@
   <string name="muc_invite_confirm">%2$s邀請你加入會議%3$s，以帳號%1$s加入？</string>
   <string name="muc_invite_confirm_reason">%2$s邀請你加入會議%3$s：%4$s，以帳號%1$s加入？</string>
   <string name="muc_leave">離開會議</string>
-  <string name="muc_save">儲存會議</string>
 </resources>
diff --git a/xabber/src/main/res/values-zh-rTW/notification_bar.xml b/xabber/src/main/res/values-zh-rTW/notification_bar.xml
index 7e2746186a..782b2424d6 100644
--- a/xabber/src/main/res/values-zh-rTW/notification_bar.xml
+++ b/xabber/src/main/res/values-zh-rTW/notification_bar.xml
@@ -34,10 +34,7 @@
   <!-- Used for plural form in russian. -->
   <string name="connection_state_waiting_5">-</string>
   <string name="connection_state_offline">%1$d個%2$s離線</string>
-  <string name="archive_available_request_message">您想要在伺服器上保存聊天記錄嗎？\n這會使Xabber可載入使用此帳號的所有裝置的聊天記錄。\n此功能會帶來一些額外流量並會稍許降低連線速度。\n警告：您的所有本地歷史會被刪除。</string>
-  <string name="archive_available_request_title">啟用訊息存檔？</string>
-  <string name="INVALID_CERTIFICATE">無效證書</string>
-  <string name="muc_invite_message">你要加入會議嗎？</string>
+    <string name="muc_invite_message">你要加入會議嗎？</string>
   <string name="otr_verification_in_progress">點選此處放棄</string>
   <string name="PASSWORD_REQUIRED">需要密碼</string>
   <string name="pay_attention">注意</string>
diff --git a/xabber/src/main/res/values-zh-rTW/preference_editor.xml b/xabber/src/main/res/values-zh-rTW/preference_editor.xml
index 751000b410..f0911e7d1f 100644
--- a/xabber/src/main/res/values-zh-rTW/preference_editor.xml
+++ b/xabber/src/main/res/values-zh-rTW/preference_editor.xml
@@ -8,20 +8,16 @@
   <string name="contacts_order_alphabet">按字母排序</string>
   <string name="contacts_order_status">依狀態</string>
   <string name="contacts_show_accounts">依帳號分組\n在聯絡人清單中依帳號分組</string>
-  <string name="contacts_show_active_chats">置頂進行中的聊天\n在聯絡人清單頂部顯示進行中的聊天</string>
-  <string name="contacts_show_avatars">顯示大頭貼\n在聯絡人清單中顯示使用者的大頭貼</string>
+    <string name="contacts_show_avatars">顯示大頭貼\n在聯絡人清單中顯示使用者的大頭貼</string>
   <string name="contacts_show_empty_groups">顯示空分組\n顯示沒有線上聯絡人的分組</string>
   <string name="contacts_show_groups">顯示群組\n在聯絡人清單中顯示群組</string>
   <string name="contacts_show_offline">顯示離線的聯絡人</string>
-  <string name="contacts_show_panel">顯示帳戶面板\n在聯絡人清單的右下角顯示帶有頭像的動作按鈕</string>
-  <string name="contacts_stay_active_chats">重複顯示進行中的聊天\n同時在聯絡人清單頂部和分組中顯示進行中聊天</string>
-  <string name="debug_log">偵錯日誌\n將訊息寫入偵錯日誌（請重新開機程式來應用設定）</string>
+    <string name="debug_log">偵錯日誌\n將訊息寫入偵錯日誌（請重新開機程式來應用設定）</string>
   <string name="events_lightning">燈光提示\n通知時閃爍LED</string>
   <string name="events_persistent">工作列圖示\n顯示永續性通知，此選項可防止Android從記憶體中解除安裝該程式</string>
   <string name="interface_theme_dark">暗色</string>
   <string name="interface_theme_light">亮色</string>
-  <string name="interface_theme_normal">預設</string>
-  <string name="interface_smiles_android">Android表情</string>
+    <string name="interface_smiles_android">Android表情</string>
   <string name="interface_smiles_none">無圖像表情</string>
   <string name="preference_connection">連線設定\n連線設定</string>
   <string name="preference_contacts">聯絡人清單\n自訂聯絡人清單外觀</string>
@@ -36,8 +32,7 @@
   <string name="chats_font_size_small">小</string>
   <string name="chats_font_size_xlarge">特大</string>
   <string name="chats_hide_keyboard_landscape">在橫向模式</string>
-  <string name="chats_receipt">訊息送達通知\n發送和接收訊息送達通知</string>
-  <string name="chats_show_avatars">在訊息中顯示大頭貼\n在每條訊息旁顯示大頭貼</string>
+    <string name="chats_show_avatars">在訊息中顯示大頭貼\n在每條訊息旁顯示大頭貼</string>
   <string name="chats_show_status_change_muc">在會議中</string>
   <string name="chats_state_notification">顯示輸入通知\n顯示其他使用者正在輸入</string>
   <string name="connection_adjust_priority">調整優先順序\n根據選擇的狀態設定優先順序，會覆蓋帳戶優先順序。</string>
@@ -50,23 +45,14 @@
   <string name="contacts_reset_offline">重設離線設定\n清除對某一帳號或群組所作的設定</string>
   <string name="contacts_reset_offline_warning">您真的要清除對某一帳號或群組所作的設定嗎？</string>
   <string name="events_first_only">在首條訊息時通知\n僅在聊天中收到第一條訊息時通知</string>
-  <string name="events_ignore_system_vibro">忽略系統振動設定\n在系統振動無法正常作用時請啟用此選項</string>
-  <string name="events_message">通知設定\n設定接收訊息通知</string>
-  <string name="events_message_chat">僅聊天</string>
-  <string name="events_message_chat_and_muc">聊天和會議</string>
-  <string name="events_message_none">不通知</string>
-  <string name="events_visible_chat">接收當前聊天中通知\n接收當前聊天中收到的訊息通知</string>
-  <string name="negative_priotiry_summary">%s（你將不會收到任何訊息）</string>
+    <string name="negative_priotiry_summary">%s（你將不會收到任何訊息）</string>
   <string name="preference_accounts">XMPP帳戶\n管理帳戶</string>
   <string name="preference_security">安全\n安全設定</string>
   <string name="security_check_certificate">檢查伺服器證書\n在加密連線有證書問題時通知</string>
-  <string name="security_clear_certificate">移除證書\n清除忽略的證書清單</string>
-  <string name="security_otr_history">儲存歷史\n儲存OTR會話的聊天記錄</string>
-  <string name="security_otr_mode">OTR模式</string>
+    <string name="security_otr_mode">OTR模式</string>
   <string name="chats_attention">注意\n響應收到的注意請求</string>
   <string name="chats_attention_sound">注意聲音\n選擇鈴聲</string>
   <string name="connection_load_vcard">載入vCard\n載入和更新聯絡人的個人訊息和大頭貼，禁用可減少流量</string>
   <string name="connection_use_carbons">複寫模式\n可能不穩定！將為此客戶端上的相同帳戶共享會話，禁用以減少流量使用。</string>
   <string name="events_phrases">關鍵短語\n通知某些包含預設短語的訊息並選擇聲音</string>
-  <string name="security_clear_certificate_warning">您確實要刪除所有忽略的證書嗎？</string>
 </resources>
diff --git a/xabber/src/main/res/values/account_editor.xml b/xabber/src/main/res/values/account_editor.xml
index 851e8ad6d8..1fc2c44e25 100644
--- a/xabber/src/main/res/values/account_editor.xml
+++ b/xabber/src/main/res/values/account_editor.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="account_compression">Use compression</string>
-    <string name="account_enabled">Enabled</string>
     <string name="account_host">Host</string>
     <string name="account_password">Password</string>
     <string name="confirm_password">Confirm password</string>
@@ -9,32 +8,18 @@
     <string name="account_priority">Priority</string>
     <string name="account_resource">Resource</string>
     <string name="account_server_name">Server</string>
-    <string name="account_type">Account type</string>
-    <string name="account_type_hints_gtalk">username for gmail.com or Google Apps domain</string>
-    <string name="account_type_helps_gtalk">If you don\'t have Google account you may create one at http://mail.google.com\nAlso you can use your_user_name@your_google_domain</string>
     <string name="account_xmpp_register_warning">You must&#160;<a href="http://www.google.com/#q=register an XMPP account">register an XMPP account</a> before adding it to Xabber!</string>
-    <string name="account_type_helps_xmpp">If you want to learn more about XMPP (Jabber) here: https://xmpp.org</string>
     <string name="account_user_name">Username</string>
     <string name="EMPTY_SERVER_NAME">Server name is not specified</string>
     <string name="EMPTY_USER_NAME">Username is not specified</string>
     <string name="CONFIRM_PASSWORD">Passwords do not match</string>
     <string name="ACCOUNT_EXIST">This account already exist</string>
-    <string name="account_archive_mode">Store message history</string>
-    <string name="account_archive_mode_available">On server if available</string>
-    <string name="account_archive_mode_dont_store">Don\'t store</string>
-    <string name="account_archive_mode_local">Locally on device</string>
-    <string name="account_archive_mode_server">On server</string>
-    <string name="account_archive_mode_unread">Locally only unsent and unread</string>
     <string name="account_compression_summary">Check to enable data compression</string>
     <string name="account_custom">Custom host</string>
     <string name="account_custom_summary">Use custom host settings instead of SRV record</string>
-    <string name="account_enabled_summary">Switch to enable account</string>
     <string name="account_invalid_port">Port must be a number (default: 5222)</string>
     <string name="account_invalid_port_range">Port must be between 1 and 65535 (default: 5222)</string>
     <string name="account_invalid_priority">Priority value must be a number between -128 and 127 (default: 0)</string>
-    <string name="account_oauth">Authorization</string>
-    <string name="account_oauth_invalidated">Not authorized</string>
-    <string name="account_oauth_summary">OAuth settings</string>
     <string name="account_proxy_host">Proxy host</string>
     <string name="account_proxy_invalid_port_range">Proxy port must be between 1 and 65535 (default: 8080)</string>
     <string name="account_proxy_invalid_port">Proxy port must be a number (default: 8080)</string>
@@ -47,8 +32,6 @@
     <string name="account_sasl_summary">Disable for very old server</string>
     <string name="account_store_password">Store password</string>
     <string name="account_store_password_summary">Disable this option to request password each time you go online</string>
-    <string name="account_syncable">Integrate into system contacts</string>
-    <string name="account_syncable_summary">Show contacts from this account in phone`s contact list</string>
     <string name="account_tls_enable">Enable TLS</string>
     <string name="account_tls_enable_summary">Use TLS encryption when possible to connect to server</string>
     <string name="account_tls_legacy">Legacy SSL</string>
@@ -56,10 +39,8 @@
     <string name="account_tls_mode">TLS/SSL usage</string>
     <string name="account_tls_require">Require TLS</string>
     <string name="account_tls_require_summary">Require TLS encryption when connect to server</string>
-    <string name="account_use_orbot">Chat through TOR anonymity network and force TLS cryptographic protocol</string>
     <string name="account_enable_tls">Enable TLS cryptographic protocol</string>
     <string name="account_use_tor">Use TOR anonymity network (requires Orbot proxy)</string>
-    <string name="confirm_cancellation">Are you sure you want to discard all the changes?</string>
     <string name="INCORRECT_USER_NAME">Incorrect user name. Check help text below for details.</string>
     <string name="orbot_required_message">In order to process using TOR you must have Orbot installed and activated to proxy traffic through it. Would you like to install it from Google Play?</string>
     <string name="orbot_required_title">Install Orbot?</string>
diff --git a/xabber/src/main/res/values/chat_viewer.xml b/xabber/src/main/res/values/chat_viewer.xml
index f789e90afc..7e47ea2364 100644
--- a/xabber/src/main/res/values/chat_viewer.xml
+++ b/xabber/src/main/res/values/chat_viewer.xml
@@ -20,10 +20,7 @@
     <string name="message_remove">Remove from history</string>
     <string name="message_repeat">Retry sending</string>
     <string name="message_otr_show_original">Show message</string>
-    <string name="message_open_file">Open</string>
-    <string name="message_save_file">Save</string>
     <string name="save_history">Save local history\nStore message history locally</string>
-    <string name="show_history">Show history</string>
     <string name="action_attention_called">Call attention was sent</string>
     <string name="action_attention_requested">Attention was requested</string>
     <string name="action_ban">%1$s was banned</string>
@@ -73,7 +70,6 @@
     <string name="otr_refresh">Restart encryption</string>
     <string name="otr_request">Off-The-Record private conversation has been requested but you do not have a supportive plugin. Use Pidgin, Gajim or Adium for PC/Mac and Xabber, Conversations or ChatSecure for Android. Go to http://otr.cypherpunks.ca/ for more information.</string>
     <string name="otr_start">Start encryption</string>
-    <string name="otr_unencrypted_message">This message has not been encrypted</string>
     <string name="otr_unreadable_message">The encrypted message you sent is unreadable</string>
     <string name="otr_not_decrypted_message">Message cannot be decrypted</string>
     <string name="otr_verification">OTR verification</string>
@@ -88,22 +84,13 @@
     <string name="otr_verification_notify_button">OPEN</string>
     <string name="otr_verification_notify_button_cancel">CANCEL</string>
 
-    <string name="under_construction">Under construction</string>
-    <string name="under_construction_message">This screen is under construction</string>
-
     <string name="chat_events_show_text_global">Use global settings</string>
     <string name="chat_events_show_text_always">Show message text</string>
     <string name="chat_events_show_text_never">Hide message text</string>
 
-    <string name="sending_file">Sending file %s</string>
     <string name="error_sending_file">Error sending file %s</string>
-    <string name="no_application_to_open_file">No application found to open this file</string>
-    <string name="could_not_save_file">Could not save file</string>
-    <string name="file_saved_successfully">File saved successfully</string>
-    <string name="received_by">Received by %s</string>
     <string name="could_not_get_path_to_file">Could not get path to file</string>
     <string name="message_open_private_chat">Open private chat</string>
-    <string name="http_file_upload_slot_error">Could not upload file. Too large?</string>
     <string name="no_permission_to_read_files">No permission to read files</string>
     <string name="no_permission_to_write_files">No permission to write files</string>
     <string name="no_permission_to_camera">No permission for camera</string>
diff --git a/xabber/src/main/res/values/contact_editor.xml b/xabber/src/main/res/values/contact_editor.xml
index fb76975c30..afb15ffb41 100644
--- a/xabber/src/main/res/values/contact_editor.xml
+++ b/xabber/src/main/res/values/contact_editor.xml
@@ -16,13 +16,9 @@
     <string name="processing_image">Processing image…</string>
     <string name="error_during_crop">Error during image crop</string>
     <string name="error_during_image_processing">Error during image processing</string>
-    <string name="account_settings">Account settings</string>
-    <string name="account_user_info">Account info</string>
     <string name="account_server_info">Server info</string>
     <string name="account_server_info_description">List of server capabilities</string>
 
     <string name="conference_private_chat_invitation">%1$s from %2$s wants to start private chat with you</string>
     <string name="accept_muc_private_chat">Accept</string>
-    <string name="block_muc_private_chat">Block</string>
-    <string name="no_permission_camera">No permission to access camera</string>
 </resources>
\ No newline at end of file
diff --git a/xabber/src/main/res/values/contact_list.xml b/xabber/src/main/res/values/contact_list.xml
index 29f3327909..984df3df22 100644
--- a/xabber/src/main/res/values/contact_list.xml
+++ b/xabber/src/main/res/values/contact_list.xml
@@ -18,16 +18,12 @@
     <string name="application_state_roster">Connected.</string>
     <string name="application_state_starting">Launching application…</string>
     <string name="application_state_waiting">Waiting for connection…</string>
-    <string name="chat_list">Chat list</string>
-    <string name="chat_list_is_empty">No active chats</string>
     <string name="chat_viewer">Chat</string>
-    <string name="close_chat">Close chat</string>
     <string name="CONNECTION_FAILED">Connection error</string>
     <string name="contact_add">Add contact</string>
     <string name="contact_delete">Delete</string>
     <string name="contact_block">Block contact</string>
     <string name="contact_delete_confirm">Do you really want to delete contact %1$s from account %2$s?</string>
-    <string name="contact_list">Contact list</string>
     <string name="discard_subscription">Decline contact</string>
     <string name="archive_chat">Archive</string>
     <string name="unarchive_chat">Unarchive</string>
@@ -46,14 +42,6 @@
     <string name="action_send_contact">Send contact</string>
     <string name="XMPP_EXCEPTION">Stream error</string>
     <string name="application_state_closing">Saving changes…\nApplication will be closed soon.</string>
-    <string name="certificate_confirmation">%1$s.\nIssuer uses deprecated (SHA-1) fingerprint that can\'t be trusted: %2$s? Do you want to not be notified about this issue with this certificate?</string>
-    <string name="certificate_details">\n\nIssued to:\nCommon Name (CN): %1$s\nOrganization (O): %2$s\nOrganizational Unit (OU): %3$s\nSerial Number: %4$s\n\nIssued by:\nCommon Name (CN): %5$s\nOrganization (O): %6$s\nOrganizational Unit (OU): %7$s\n\nValidity:\nIssued on: %8$s\nExpires on: %9$s.</string>
-    <string name="certificate_invalid_chane">Signature chain verification failed</string>
-    <string name="certificate_invalid_target">Target verification failed</string>
-    <string name="certificate_self_signed">Self-signed certificate</string>
-    <string name="certificate_show_details">Details…</string>
-    <string name="close_chats">Close all chats</string>
-    <string name="contact_integration_suggest">Do you want Xabber to be integrated into system contacts?\nThis can be changed in "Settings" → "XMPP accounts" → Your account → "Contact integration".\nNB: System contact list can go slower for a few minutes.</string>
     <string name="group_room">Conferences</string>
     <string name="OTR_ERROR">OTR error</string>
     <string name="select_contact">Please click to select contact</string>
@@ -69,7 +57,6 @@
     <string name="block_list">Block list</string>
     <string name="contact_blocked_successfully">Contact blocked successfully</string>
     <string name="error_blocking_contact">Error blocking contact</string>
-    <string name="unblock_contact">Unblock contact</string>
     <string name="contacts_unblocked_successfully">Contacts unblocked successfully</string>
     <string name="error_unblocking_contacts">Error unblocking contacts</string>
     <string name="block_contact_confirm">Do you really want to block contact %1$s from account %2$s?</string>
@@ -84,23 +71,10 @@
     <string name="battery_optimization_disable_dialog_title">Battery optimization</string>
     <string name="battery_optimization_disable_dialog_message">Your device is doing some heavy battery optimizations on Xabber that might lead to delayed notifications or even message loss.\n\nYou will now be asked to disable those.</string>
 
-    <string name="save_log_to_file">Save to file</string>
     <string name="clear_log">Delete old log files</string>
     <string name="open_log_file">Open</string>
     <string name="send_log_file">Send</string>
 
-    <string name="intro_welcome">Welcome to Xabber</string>
-    <string name="intro_xabber_description">Open source XMPP client for Android</string>
-    <string name="intro_signin">Sign In</string>
-    <string name="intro_signup">Sign Up</string>
-    <string name="intro_have_account">XMPP login</string>
-    <string name="intro_register_account">Register XMPP account</string>
-    <string name="intro_create_xabber_account">Use Xabber Account</string>
-    <string name="intro_use_third_party_accounts">use third party XMPP accounts</string>
-
-    <string name="intro_faq">If you do not have an XMPP account, please <a href="https://www.xabber.com/faq/">read our F.A.Q.</a> on how to get one.</string>
-    <string name="intro_web_search_register_xmpp">Register XMPP Account</string>
-
     <string name="synchronize_bookmarks">Synchronize bookmarks</string>
     <string name="remove_all_bookmarks">Remove all</string>
     <string name="remove_selected_bookmarks">Remove selected</string>
diff --git a/xabber/src/main/res/values/contact_viewer.xml b/xabber/src/main/res/values/contact_viewer.xml
index 35d4a85bd3..2b70f877cb 100644
--- a/xabber/src/main/res/values/contact_viewer.xml
+++ b/xabber/src/main/res/values/contact_viewer.xml
@@ -16,11 +16,8 @@
     <string name="vcard_organization_unit">Organization unit</string>
     <string name="vcard_title">Job title, function</string>
     <string name="vcard_role">Role</string>
-    <string name="vcard_other">Other information</string>
-    <string name="vcard_categories">Categories</string>
     <string name="vcard_decsription">Description</string>
     <string name="vcard_note">Notes</string>
-    <string name="vcard_address">Address</string>
     <string name="vcard_address_pobox">PO Box</string>
     <string name="vcard_address_extadr">Extended Address</string>
     <string name="vcard_address_street">Street</string>
diff --git a/xabber/src/main/res/values/muc_editor.xml b/xabber/src/main/res/values/muc_editor.xml
index f6fe1cecab..c828ccd6ed 100644
--- a/xabber/src/main/res/values/muc_editor.xml
+++ b/xabber/src/main/res/values/muc_editor.xml
@@ -19,14 +19,12 @@
     <string name="muc_invite_confirm">%2$s invites you to join conference %3$s. Join from account %1$s?</string>
     <string name="muc_invite_confirm_reason">%2$s invites you to join conference %3$s: %4$s. Join from account %1$s?</string>
     <string name="muc_leave">Leave conference</string>
-    <string name="muc_save">Save conference</string>
 
     <string name="muc_choose_conference">Choose conference</string>
     <string name="muc_next">Next</string>
     <string name="muc_get_hosted_conferences">Get hosted conferences</string>
     <string name="muc_error_getting_conferences">Error getting conferences</string>
     <string name="muc_type_conference_name">Type conference name</string>
-    <string name="contact_is_blocked">Contact is blocked!</string>
     <string name="conference_invitation">Conference invitation</string>
 
     <string name="domen_part" translatable="false">conference.%1$s</string>
diff --git a/xabber/src/main/res/values/notification_bar.xml b/xabber/src/main/res/values/notification_bar.xml
index aea6e646c4..75c9f94690 100644
--- a/xabber/src/main/res/values/notification_bar.xml
+++ b/xabber/src/main/res/values/notification_bar.xml
@@ -33,9 +33,6 @@
     <!-- Used for plural form in russian. -->
     <string name="connection_state_waiting_5">-</string>
     <string name="connection_state_offline">%1$d %2$s offline</string>
-    <string name="archive_available_request_message">Do you want to store message history on server?\nIt allows Xabber to load message history from all the devices using this account.\nThis feature will take some additional traffic and will slightly reduce connection speed.\nWARNING: All your local history will be removed.</string>
-    <string name="archive_available_request_title">Enable message archive?</string>
-    <string name="INVALID_CERTIFICATE">Invalid certificate</string>
     <string name="muc_invite_message">Do you want to enter conference?</string>
     <string name="otr_verification_in_progress">Click here to abort it.</string>
     <string name="PASSWORD_REQUIRED">Password required</string>
diff --git a/xabber/src/main/res/values/preference_editor.xml b/xabber/src/main/res/values/preference_editor.xml
index 7c893864c9..361c6d84e1 100644
--- a/xabber/src/main/res/values/preference_editor.xml
+++ b/xabber/src/main/res/values/preference_editor.xml
@@ -13,14 +13,11 @@
     <string name="contacts_order_alphabet">Alphabetic</string>
     <string name="contacts_order_status">By status</string>
     <string name="contacts_show_accounts">Group by account\nGroup contacts in contact list by account</string>
-    <string name="contacts_show_active_chats">Active chats on top\nDisplay active chats at the top of the contact list</string>
     <string name="contacts_show_avatars">Show avatars\nShows users\' avatars in contact list</string>
     <string name="contacts_show_messages">Show messages\nShows users\' messages in contact list</string>
     <string name="contacts_show_empty_groups">Show empty groups\nShow groups with no online contacts</string>
     <string name="contacts_show_groups">Show groups\nShow groups in contact list</string>
     <string name="contacts_show_offline">Show offline contacts</string>
-    <string name="contacts_show_panel">Show accounts panel\nShow action buttons with avatars in the bottom right corner of contact list</string>
-    <string name="contacts_stay_active_chats">Duplicate active chats\nActive chats appear both on top of contact list and in groups</string>
 
     <string name="debug_log">Debug log\nWrite messages to debug log (please restart application to apply changes)</string>
     <string name="debug_file_log_title">Write file log\nWrite debug log to local file (you can share it).</string>
@@ -43,7 +40,6 @@
     <string name="interface_theme">Theme</string>
     <string name="interface_theme_dark">Dark</string>
     <string name="interface_theme_light">Light</string>
-    <string name="interface_theme_normal">Default</string>
     <string name="interface_smiles">Emoticons</string>
     <string name="interface_smiles_android">Android emoticons</string>
     <string name="interface_smiles_none">No graphical emoticons</string>
@@ -73,7 +69,6 @@
     <string name="chats_font_size_xlarge">Extra large</string>
     <string name="chats_hide_keyboard">Hide keyboard</string>
     <string name="chats_hide_keyboard_landscape">In landscape mode</string>
-    <string name="chats_receipt">Message delivery receipts\nSend and receive message delivery receipts</string>
     <string name="chats_show_avatars">Avatars in chat\nShow avatars in each message inside chat</string>
     <string name="chats_show_avatars_muc">Avatars in conference\nShow avatars in each message inside conference</string>
     <string name="chats_show_status_change">Show status changes</string>
@@ -92,21 +87,13 @@
     <string name="contacts_reset_offline_warning">Do you really want to clear individual settings for groups and accounts?</string>
 
     <string name="events_first_only">Alert on first message\nNotify only on the first message in a chat</string>
-    <string name="events_ignore_system_vibro">Ignore system vibration settings\nUse this option if system vibration does not work</string>
-    <string name="events_message">Notification settings\nConfigure incoming message notifications</string>
-    <string name="events_message_chat">Chats only</string>
-    <string name="events_message_chat_and_muc">Chats and conferences</string>
-    <string name="events_message_none">Don\'t notify</string>
     <string name="events_show_text">Message preview\nShow message text from chats in notification area</string>
     <string name="events_show_text_muc">Message preview\nShow message text from conferences in notification area</string>
-    <string name="events_visible_chat">Notify in current chat\nNotify on incoming messages in current chat</string>
     <string name="events_suppress_100">Suppress some status messages\nDon\'t get \'This room is not anonymous\' messages</string>
     <string name="negative_priotiry_summary">%s (you won\'t receive messages from any chat)</string>
     <string name="preference_accounts">XMPP accounts\nManage accounts</string>
     <string name="preference_security">Security\nSecurity settings</string>
     <string name="security_check_certificate">Check server certificate\nNotify for certificate problems on encrypted connections</string>
-    <string name="security_clear_certificate">Remove certificates\nClear list of ignored certificates</string>
-    <string name="security_otr_history">Store history\nStore chat history for OTR sessions</string>
     <string name="security_otr_mode">OTR mode</string>
     <string name="chats_attention">Attention\nReact for incoming attention requests</string>
     <string name="chats_attention_sound">Attention sound\nChoose ringtone</string>
@@ -114,19 +101,13 @@
     <string name="connection_load_vcard">Load vCard\nLoad and update contact\'s personal info and avatar. Disable to reduce traffic usage.</string>
     <string name="connection_load_images">Load images\nLoad images from file URL automatically. Disable to reduce traffic usage.</string>
     <string name="connection_use_carbons">Carbon-copied mode\nWill share sessions for the same account on this client. Disable to reduce traffic usage.</string>
-    <string name="connection_dns_resolver_type">DNS resolver type</string>
     <string name="connection_dns_resolver_type_dns_java_resolver">DNSJavaResolver</string>
     <string name="connection_dns_resolver_type_mini_dns_resolver">MiniDNSResolver (experimental)</string>
 
-    <string name="connection_use_plain_text_auth">Plain text auth\nUse plain text authentication for all accounts. Not recommended.</string>
-
     <string name="events_phrases">Key phrases\nCreate custom notifications for received messages that contain specific phrases</string>
-    <string name="security_clear_certificate_warning">Do you really want to remove all ignored certificates?</string>
 
     <string name="account_error_settings">Settings</string>
 
-    <string name="category_xabber_account">Xabber Account</string>
-    <string name="category_xmpp_accounts">XMPP Accounts</string>
     <string name="category_interface">Interface</string>
     <string name="category_settings">Settings</string>
     <string name="category_about">About</string>
diff --git a/xabber/src/main/res/values/preferences.xml b/xabber/src/main/res/values/preferences.xml
index 1c79267353..7ae956bfc6 100644
--- a/xabber/src/main/res/values/preferences.xml
+++ b/xabber/src/main/res/values/preferences.xml
@@ -84,8 +84,6 @@
     <string name="interface_smiles_default">@string/interface_smiles_android_value</string>
 
 <!-- preference_contacts -->
-    <string name="contacts_show_panel_key">contacts_show_panel</string>
-    <bool name="contacts_show_panel_default">true</bool>
 
     <string name="contacts_show_avatars_key">contacts_show_avatars</string>
     <bool name="contacts_show_avatars_default">true</bool>
@@ -102,12 +100,6 @@
     <string name="contacts_show_accounts_key">contacts_show_accounts</string>
     <bool name="contacts_show_accounts_default">true</bool>
 
-    <string name="contacts_show_active_chats_key">contacts_show_active_chats</string>
-    <bool name="contacts_show_active_chats_default">true</bool>
-
-    <string name="contacts_stay_active_chats_key">contacts_stay_active_chats</string>
-    <bool name="contacts_stay_active_chats_default">true</bool>
-
     <string name="contacts_show_empty_groups_key">contacts_show_empty_groups</string>
     <bool name="contacts_show_empty_groups_default">false</bool>
 
@@ -355,14 +347,6 @@
     <string name="connection_dns_resolver_type_dns_java_resolver_value">connection_dns_resolver_type_dns_java_resolver</string>
     <string name="connection_dns_resolver_type_mini_dns_resolver_value">connection_dns_resolver_type_mini_dns_resolver</string>
 
-    <string-array name="connection_dns_resolver_type_entries">
-        <item>@string/connection_dns_resolver_type_dns_java_resolver</item>
-        <item>@string/connection_dns_resolver_type_mini_dns_resolver</item>
-    </string-array>
-    <string-array name="connection_dns_resolver_type_entry_values">
-        <item>@string/connection_dns_resolver_type_dns_java_resolver_value</item>
-        <item>@string/connection_dns_resolver_type_mini_dns_resolver_value</item>
-    </string-array>
     <string name="connection_dns_resolver_type_default">@string/connection_dns_resolver_type_dns_java_resolver_value</string>
 
     <string name="connection_use_plain_text_auth_key">connection_use_plain_text_auth</string>
@@ -393,11 +377,9 @@
     <string name="preference_about_key">preference_about</string>
 
 <!-- preference_account -->
-    <string name="preference_accounts_key">preference_accounts</string>
 
     <string name="account_enabled_key">account_enabled</string>
     <string name="account_syncable_key">account_syncable</string>
-    <string name="account_oauth_key">account_oauth</string>
     <string name="account_username_key">account_username</string>
     <string name="account_store_password_key">account_store_password</string>
     <string name="account_password_key">account_password</string>
@@ -447,25 +429,9 @@
         <item>@string/orbot</item>
     </string-array>
 
-    <string-array name="account_archive_mode_entries">
-        <item>@string/account_archive_mode_server</item>
-        <item>@string/account_archive_mode_available</item>
-        <item>@string/account_archive_mode_local</item>
-        <item>@string/account_archive_mode_unread</item>
-        <item>@string/account_archive_mode_dont_store</item>
-    </string-array>
-    <string-array name="account_archive_mode_entryvalues">
-        <item>@string/account_archive_mode_server</item>
-        <item>@string/account_archive_mode_available</item>
-        <item>@string/account_archive_mode_local</item>
-        <item>@string/account_archive_mode_unread</item>
-        <item>@string/account_archive_mode_dont_store</item>
-    </string-array>
-
     <string name="account_archive_mode_default_value">local</string>
 
     <string name="account_clear_history_on_exit_key">account_clear_history_on_exit</string>
-    <bool name="account_clear_history_on_exit_default_value">false</bool>
 
     <string name="account_mam_default_behavior_key">account_mam_default_behavior</string>
 
@@ -499,8 +465,6 @@
     <string name="security_check_certificate_key">security_check_certificate</string>
     <bool name="security_check_certificate_default">true</bool>
 
-    <string name="security_clear_certificate_key">security_clear_certificate</string>
-
     <string name="security_otr_mode_key">security_otr_mode</string>
     <string name="security_otr_mode_disabled_value">disabled</string>
     <string name="security_otr_mode_manual_value">manual</string>
@@ -532,22 +496,6 @@
 
 <!-- preference_chat -->
     <string name="chat_notification_settings_key">chat_notification_settings_key</string>
-    <string-array name="chat_notification_settings_entries">
-        <item>@string/chat_notification_settings_enabled</item>
-        <item>@string/chat_notification_settings_bydefault</item>
-        <item>@string/chat_notification_settings_disabled</item>
-    </string-array>
-    <string name="chat_notification_settings_enabled">Enabled</string>
-    <string name="chat_notification_settings_bydefault">Default</string>
-    <string name="chat_notification_settings_disabled">Disabled</string>
-    <string-array name="chat_notification_settings_entryvalues">
-        <item>@string/chat_notification_settings_bydefault_value</item>
-        <item>@string/chat_notification_settings_enabled_value</item>
-        <item>@string/chat_notification_settings_disabled_value</item>
-    </string-array>
-    <string name="chat_notification_settings_bydefault_value">chat_notification_settings_bydefault_value</string>
-    <string name="chat_notification_settings_enabled_value">chat_notification_settings_enabled_value</string>
-    <string name="chat_notification_settings_disabled_value">chat_notification_settings_disabled_value</string>
 
     <string name="chat_save_history_key">chat_save_history</string>
     <string name="chat_events_sound_key">chat_events_sound</string>
@@ -577,9 +525,8 @@
     <bool name="chat_events_suppress_100_default">false</bool>
 
 <!-- preference_xabber -->
-    <string name="preference_xabber_key">preference_xabber</string>
 
-<!-- common values -->
+    <!-- common values -->
     <bool name="landscape">false</bool>
     <string name="status_mode_key">status_mode</string>
     <string name="status_text_key">status_text</string>
@@ -589,7 +536,6 @@
     <string name="translation_suggested_key">translation_suggested</string>
     <string name="dark_theme_suggested_key">dark_theme_suggested</string>
     <string name="battery_optimization_disable_suggested_key">battery_optimization_disable_suggested</string>
-    <string name="sync_account_type">@string/application_package</string>
     <string name="contact_viewer_mime_type">vnd.android.cursor.item/vnd.com.xabber.view</string>
     <string name="chat_showcase_suggested_key">chat_showcase_suggested_key</string>
     <string name="contact_showcase_suggested_key">contact_showcase_suggested_key</string>
diff --git a/xabber/src/main/res/values/untraslatable_words.xml b/xabber/src/main/res/values/untraslatable_words.xml
index 2bf95b7a12..0031edbb59 100644
--- a/xabber/src/main/res/values/untraslatable_words.xml
+++ b/xabber/src/main/res/values/untraslatable_words.xml
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">
-    <string name="xmpp">XMPP</string>
-    <string name="google_talk">Google Talk</string>
     <string name="http">HTTP</string>
     <string name="orbot">Orbot</string>
     <string name="socks4">SOCKS4</string>
diff --git a/xabber/src/main/res/values/words.xml b/xabber/src/main/res/values/words.xml
index bb1d5e7c7b..f848e83b59 100644
--- a/xabber/src/main/res/values/words.xml
+++ b/xabber/src/main/res/values/words.xml
@@ -23,7 +23,6 @@
     <string name="settings">Settings</string>
     <string name="ok">OK</string>
     <string name="login">Login</string>
-    <string name="resume">Resume</string>
 
     <string name="share">Share</string>
     <string name="send_to">Send to:</string>
diff --git a/xabber/src/main/res/values/xabber_account.xml b/xabber/src/main/res/values/xabber_account.xml
index ac829b54ae..2709ac8cb3 100644
--- a/xabber/src/main/res/values/xabber_account.xml
+++ b/xabber/src/main/res/values/xabber_account.xml
@@ -5,34 +5,22 @@
     <string name="social_sign_in">Social Sign In</string>
 
     <string name="email_hint">Email</string>
-    <string name="username_hint">Xabber username or email</string>
-    <string name="pass_hint">Password</string>
     <string name="forgot_pass">FORGOT PASSWORD?</string>
-    <string name="agrees">I agree to receive occasional newsletter from Xabber team. We promise not to bother you too often with it.</string>
 
     <string name="sync_success">Synchronized</string>
     <string name="sync_fail">Synchronization failed</string>
     <string name="quit_success">Quit successful</string>
-    <string name="quit_fail">Quit failed</string>
     <string name="confirm_success">Email verified</string>
-    <string name="confirm_fail">Email verification failed</string>
     <string name="delete_success">Email deleted</string>
-    <string name="complete_success">Registration completed</string>
-    <string name="complete_fail">Registration failed</string>
     <string name="resend_success">Verification email sent</string>
-    <string name="resend_fail">Failed to send verification email</string>
     <string name="social_auth_fail">Social authentication failed</string>
     <string name="settings_delete_success">Settings deleted</string>
-    <string name="confirm_phone_success">Phone number successfully confirmed</string>
-    <string name="set_phone_success">Confirmation code sent</string>
 
     <string name="social_bind_success">Social network linked successfully</string>
     <string name="social_bind_fail">This account is already linked with different Xabber Account</string>
     <string name="social_unbind_success">Social network unlink successfully</string>
     <string name="social_unbind_fail">Social network unlink failed</string>
 
-    <string name="toast_email_already_confirm">Email already verified</string>
-    <string name="toast_not_authorized">You are not authorized</string>
     <string name="toast_no_internet">No internet connection</string>
 
     <string name="progress_message">Please wait</string>
@@ -41,14 +29,9 @@
     <string name="progress_title_login">Login</string>
     <string name="progress_title_signup">Registration</string>
     <string name="progress_title_confirm">Verification</string>
-    <string name="progress_title_complete">Registration completion</string>
     <string name="progress_title_resend">Resending email</string>
     <string name="progress_title_delete">Deleting email</string>
-    <string name="progress_title_set_phone">Setting phone number</string>
-    <string name="progress_title_confirm_phone">Confirming phone number</string>
     <string name="progress_title_delete_settings">Delete settings</string>
-    <string name="progress_title_request_xmpp_auth">Request XMPP auth-code</string>
-    <string name="progress_title_confirm_xmpp">Verify XMPP-account with code</string>
     <string name="progress_title_bind_social">Authenticating..</string>
     <string name="progress_title_unbind_social">Unlink social network</string>
     <string name="progress_title_account_list">Loading list of accounts..</string>
@@ -56,29 +39,17 @@
 
     <string name="hint_username">Username</string>
 
-    <string name="label_first_name">First name</string>
-    <string name="hint_first_name">John</string>
-    <string name="label_last_name">Last name</string>
-    <string name="hint_last_name">Doe</string>
     <string name="hint_old_pass">Old password</string>
     <string name="hint_pass">New password</string>
     <string name="hint_confirm_pass">Confirm password</string>
 
     <string name="label_xmpp_id">Existing XMPP ID</string>
 
-    <string name="hint_code">code</string>
-
-    <string name="default_host" translatable="false">\@xabber.org</string>
     <string name="host" translatable="false">\@</string>
 
     <string name="title_xabber_account">Xabber Account</string>
-    <string name="title_xmpp_account">XMPP Accounts</string>
     <string name="title_email_confirm">Verify email address</string>
-    <string name="title_email_confirmed">Email address verified</string>
-    <string name="title_phone_confirm">Confirm phone number</string>
-    <string name="title_phone_confirmed">Phone number confirmed</string>
     <string name="title_complete_register">Complete registration</string>
-    <string name="title_completed_register">Registration completed</string>
     <string name="title_start_messaging">Start messaging!</string>
     <string name="title_reordering_account">Reorder accounts</string>
     <string name="title_sync">Synchronized accounts</string>
@@ -97,20 +68,15 @@
     <string name="title_register_xabber_account">Sign Up</string>
 
     <string name="summary_xabber_account_in_login">Xabber account is required to use Xabber services and sync device settings.</string>
-    <string name="summary_username">Xabber username will also act as a free XMPP ID</string>
 
     <string name="button_connect">CONNECT</string>
     <string name="button_advanced_options">ADVANCED OPTIONS</string>
     <string name="button_hide_options">HIDE OPTIONS</string>
-    <string name="button_terms_of_service">TERMS OF SERVICE</string>
     <string name="button_quit">Quit</string>
     <string name="button_login">SIGN IN</string>
     <string name="button_registration">SIGN UP</string>
     <string name="button_resend_link">RESEND CODE</string>
-    <string name="button_complete_registration">REGISTER</string>
     <string name="button_confirm">verify</string>
-    <string name="button_cancel_registration">Cancel registration</string>
-    <string name="button_continue">continue</string>
     <string name="button_sync">Sync now</string>
     <string name="button_change_pass">Change password</string>
     <string name="button_reset_pass">Reset password</string>
@@ -125,11 +91,9 @@
     <string name="last_sync_date_never">never</string>
     <string name="sync_all">Synchronize all</string>
     <string name="sync_all_description">Settings of all accounts and account order will be automatically synced with other devices</string>
-    <string name="no_email">no email</string>
     <string name="no_username">no username</string>
     <string name="no_phone">no phone</string>
     <string name="empty_field">Empty field</string>
-    <string name="code_length_wrong">Code length must be 6</string>
     <string name="pass_too_short">Password must be longer than 4 characters</string>
     <string name="passwords_not_match">Passwords do not match</string>
     <string name="username_rules">Username may contain only lowercase latin letters, numbers and dots</string>
@@ -147,12 +111,6 @@
     <string name="delete_settings_summary">Synchronized settings for this XMPP account will be deleted from Xabber Account</string>
     <string name="logout_error">Logout failed</string>
 
-    <string name="sign_up_email_social">Sign up with Social account or Email</string>
-    <string name="signed_up_email">Signed up with Email</string>
-    <string name="signed_up_google">Signed up with Google+</string>
-    <string name="signed_up_facebook">Signed up with Facebook</string>
-    <string name="signed_up_github">Signed up with GitHub</string>
-    <string name="signed_up_twitter">Signed up with Twitter</string>
     <string name="signup_with_social">Your %1$s account will be linked to create account</string>
 
     <string name="auth_google_error">Authorization via Google failed</string>
@@ -166,11 +124,6 @@
 
     <string name="reorder_summary">To synchronize accounts order between devices you need to enable "Synchronize all" option in Xabber Account settings</string>
 
-    <string name="cancel_registration_progress">Cancel registration</string>
-    <string name="cancel_registration_dialog_message">Xabber account greatly improves chat experience, but is not required to use Xabber. You may complete registration later.</string>
-    <string name="cancel_registration_dialog_cancel">Cancel</string>
-    <string name="cancel_registration_dialog_resume">Resume</string>
-
     <string name="delete_settings_button">Delete settings</string>
     <string name="account_sync_enable_summary">Enable synchronization</string>
 
@@ -205,14 +158,7 @@
 
     <string name="account_deleted">This Xabber Account was deleted</string>
 
-    <string name="login_without_xabber_account">basic xmpp experience</string>
-
     <string name="sync_not_allowed_summary">Accounts with non-standard settings (custom host, legacy SSL, proxy) can not be synchronized.</string>
-    <string name="github_alert">Authorization with GitHub is not available yet</string>
-
-    <string name="complete_register_summary">Do you want to add %1$s to your XMPP accounts?</string>
-    <string name="complete_register_add">Add</string>
-    <string name="complete_register_no">No</string>
 
     <string name="patreon_title" translatable="false">Support Xabber on Patreon!</string>
     <string name="patreon_pledged" translatable="false">$%1$d of $%2$d pledged per month.</string>

From e5c4ba5651b61d74daec10a8e1f0d163dfe1fcfb Mon Sep 17 00:00:00 2001
From: Valery Miller <valera_miller94@mail.ru>
Date: Thu, 11 Oct 2018 17:45:59 +0500
Subject: [PATCH 230/251] Up version to 528

---
 xabber/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/xabber/build.gradle b/xabber/build.gradle
index 3af554556c..c5ecd9c95f 100644
--- a/xabber/build.gradle
+++ b/xabber/build.gradle
@@ -10,8 +10,8 @@ android {
     defaultConfig {
         minSdkVersion 15
         targetSdkVersion 28
-        versionCode 527
-        versionName '2.4.2(527)'
+        versionCode 528
+        versionName '2.4.2(528)'
     }
 
     lintOptions {

From 2144998b5d64709d489d0bbe115837e58ca831a0 Mon Sep 17 00:00:00 2001
From: Valery Miller <valera_miller94@mail.ru>
Date: Fri, 12 Oct 2018 11:27:37 +0500
Subject: [PATCH 231/251] Changed items order in Xabber Account toolbar-menu.

---
 .../ui/activity/XabberAccountActivity.java       | 16 +++++++++++-----
 .../res/menu/toolbar_xabber_account_info.xml     | 10 ++++++++--
 xabber/src/main/res/values/xabber_account.xml    |  2 +-
 3 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/xabber/src/main/java/com/xabber/android/ui/activity/XabberAccountActivity.java b/xabber/src/main/java/com/xabber/android/ui/activity/XabberAccountActivity.java
index 9a141963b9..07c19d17d1 100644
--- a/xabber/src/main/java/com/xabber/android/ui/activity/XabberAccountActivity.java
+++ b/xabber/src/main/java/com/xabber/android/ui/activity/XabberAccountActivity.java
@@ -108,6 +108,9 @@ public boolean onMenuItemClick(MenuItem item) {
             case R.id.action_set_pass:
                 onResetPassClick();
                 return true;
+            case R.id.action_reset_pass:
+                onResetPassClick();
+                return true;
             case R.id.action_change_pass:
                 if (!dialogShowed) {
                     dialogShowed = true;
@@ -264,7 +267,10 @@ private void setupMenu(boolean show) {
         if (account != null) {
             if (account.hasPassword())
                 menu.findItem(R.id.action_set_pass).setVisible(false);
-            else menu.findItem(R.id.action_change_pass).setVisible(false);
+            else {
+                menu.findItem(R.id.action_change_pass).setVisible(false);
+                menu.findItem(R.id.action_reset_pass).setVisible(false);
+            }
 
         }
     }
@@ -489,7 +495,7 @@ private void onResetPassClick() {
         else if (checkInternetOrShowError()) requestResetPass(email);
     }
 
-    private void requestResetPass(String email) {
+    private void requestResetPass(final String email) {
         showProgress("");
         compositeSubscription.add(AuthManager.requestResetPassword(email)
             .subscribeOn(Schedulers.io())
@@ -497,7 +503,7 @@ private void requestResetPass(String email) {
             .subscribe(new Action1<ResponseBody>() {
                 @Override
                 public void call(ResponseBody s) {
-                    handleSuccessResetPass();
+                    handleSuccessResetPass(email);
                 }
             }, new Action1<Throwable>() {
                 @Override
@@ -507,8 +513,8 @@ public void call(Throwable throwable) {
             }));
     }
 
-    private void handleSuccessResetPass() {
-        Toast.makeText(this, R.string.password_reset_success, Toast.LENGTH_SHORT).show();
+    private void handleSuccessResetPass(String email) {
+        Toast.makeText(this, getString(R.string.password_reset_success, email), Toast.LENGTH_LONG).show();
         hideProgress();
     }
 
diff --git a/xabber/src/main/res/menu/toolbar_xabber_account_info.xml b/xabber/src/main/res/menu/toolbar_xabber_account_info.xml
index 2b854a271e..b253f0f0b6 100644
--- a/xabber/src/main/res/menu/toolbar_xabber_account_info.xml
+++ b/xabber/src/main/res/menu/toolbar_xabber_account_info.xml
@@ -3,6 +3,12 @@
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <group android:id="@+id/group1">
+
+        <item android:id="@+id/action_sync"
+            android:title="@string/button_sync"
+            app:showAsAction="never"
+            />
+
         <item android:id="@+id/action_set_pass"
             android:title="@string/button_set_pass"
             app:showAsAction="never"
@@ -13,8 +19,8 @@
             app:showAsAction="never"
             />
 
-        <item android:id="@+id/action_sync"
-            android:title="@string/button_sync"
+        <item android:id="@+id/action_reset_pass"
+            android:title="@string/button_reset_pass"
             app:showAsAction="never"
             />
 
diff --git a/xabber/src/main/res/values/xabber_account.xml b/xabber/src/main/res/values/xabber_account.xml
index 2709ac8cb3..73a3f8569d 100644
--- a/xabber/src/main/res/values/xabber_account.xml
+++ b/xabber/src/main/res/values/xabber_account.xml
@@ -183,7 +183,7 @@
     <string name="password_changed_success">Password changed</string>
     <string name="password_changed_fail">Password change failed</string>
 
-    <string name="password_reset_success">Request for reset password sent</string>
+    <string name="password_reset_success">Request for reset password sent. Check: %1$s</string>
     <string name="password_reset_fail">Request for reset password failed</string>
     <string name="password_reset_need_email">For reset password need at least one confirmed email</string>
 </resources>
\ No newline at end of file

From 5daee8bbc081fe5bd6370dc52f51c73e2dba3f64 Mon Sep 17 00:00:00 2001
From: Valery Miller <valera_miller94@mail.ru>
Date: Fri, 12 Oct 2018 15:07:55 +0500
Subject: [PATCH 232/251] Refactoring of httpclient creation

---
 .../android/service/DownloadService.java      | 38 +--------------
 .../xabber/android/service/UploadService.java | 24 ++--------
 .../android/utils/HttpClientWithMTM.java      | 46 +++++++++++++++++++
 3 files changed, 52 insertions(+), 56 deletions(-)
 create mode 100644 xabber/src/main/java/com/xabber/android/utils/HttpClientWithMTM.java

diff --git a/xabber/src/main/java/com/xabber/android/service/DownloadService.java b/xabber/src/main/java/com/xabber/android/service/DownloadService.java
index 8b80aadd67..f28f1e6c7c 100644
--- a/xabber/src/main/java/com/xabber/android/service/DownloadService.java
+++ b/xabber/src/main/java/com/xabber/android/service/DownloadService.java
@@ -8,24 +8,16 @@
 import android.support.annotation.Nullable;
 import android.util.Log;
 
-import com.xabber.android.data.connection.CertificateManager;
 import com.xabber.android.data.database.MessageDatabaseManager;
 import com.xabber.android.data.database.messagerealm.Attachment;
 import com.xabber.android.data.entity.AccountJid;
 import com.xabber.android.data.extension.file.FileManager;
+import com.xabber.android.utils.HttpClientWithMTM;
 
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
-import java.security.KeyManagementException;
-import java.security.NoSuchAlgorithmException;
-import java.util.concurrent.TimeUnit;
 
-import javax.net.ssl.SSLContext;
-import javax.net.ssl.SSLSocketFactory;
-import javax.net.ssl.X509TrustManager;
-
-import de.duenndns.ssl.MemorizingTrustManager;
 import io.realm.Realm;
 import okhttp3.OkHttpClient;
 import okhttp3.Request;
@@ -68,7 +60,7 @@ protected void onHandleIntent(@Nullable Intent intent) {
         AccountJid accountJid = intent.getParcelableExtra(KEY_ACCOUNT_JID);
 
         // build http client
-        OkHttpClient client = createHttpClient(accountJid);
+        OkHttpClient client = HttpClientWithMTM.getClient(accountJid);
 
         // start download
         if (client != null) requestFileDownload(fileName, fileSize, url, client);
@@ -81,32 +73,6 @@ public void onDestroy() {
         needStop = true;
     }
 
-    private static OkHttpClient createHttpClient(AccountJid accountJid) {
-        // create ssl verification
-        SSLSocketFactory sslSocketFactory = null;
-        MemorizingTrustManager mtm = CertificateManager.getInstance().getNewFileUploadManager(accountJid);
-
-        final SSLContext sslContext;
-        try {
-            sslContext = SSLContext.getInstance("SSL");
-            sslContext.init(null, new X509TrustManager[]{mtm}, new java.security.SecureRandom());
-            sslSocketFactory = sslContext.getSocketFactory();
-        } catch (NoSuchAlgorithmException | KeyManagementException e) {
-            return null;
-        }
-
-        // build http client
-        final OkHttpClient client = new OkHttpClient().newBuilder()
-                .sslSocketFactory(sslSocketFactory)
-                .hostnameVerifier(mtm.wrapHostnameVerifier(new org.apache.http.conn.ssl.StrictHostnameVerifier()))
-                .writeTimeout(5, TimeUnit.MINUTES)
-                .connectTimeout(5, TimeUnit.MINUTES)
-                .readTimeout(5, TimeUnit.MINUTES)
-                .build();
-
-        return client;
-    }
-
     private void requestFileDownload(final String fileName, final long fileSize, String url, OkHttpClient client) {
         Request request = new Request.Builder().url(url).build();
         try {
diff --git a/xabber/src/main/java/com/xabber/android/service/UploadService.java b/xabber/src/main/java/com/xabber/android/service/UploadService.java
index dc1ba308f4..289a0c5ab2 100644
--- a/xabber/src/main/java/com/xabber/android/service/UploadService.java
+++ b/xabber/src/main/java/com/xabber/android/service/UploadService.java
@@ -13,7 +13,6 @@
 
 import com.xabber.android.data.account.AccountItem;
 import com.xabber.android.data.account.AccountManager;
-import com.xabber.android.data.connection.CertificateManager;
 import com.xabber.android.data.entity.AccountJid;
 import com.xabber.android.data.entity.UserJid;
 import com.xabber.android.data.extension.file.FileManager;
@@ -21,6 +20,7 @@
 import com.xabber.android.data.extension.httpfileupload.ImageCompressor;
 import com.xabber.android.data.log.LogManager;
 import com.xabber.android.data.message.MessageManager;
+import com.xabber.android.utils.HttpClientWithMTM;
 import com.xabber.xmpp.httpfileupload.Slot;
 
 import org.apache.commons.io.FilenameUtils;
@@ -45,13 +45,7 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.UUID;
-import java.util.concurrent.TimeUnit;
 
-import javax.net.ssl.SSLContext;
-import javax.net.ssl.SSLSocketFactory;
-import javax.net.ssl.X509TrustManager;
-
-import de.duenndns.ssl.MemorizingTrustManager;
 import okhttp3.MediaType;
 import okhttp3.OkHttpClient;
 import okhttp3.Request;
@@ -312,25 +306,15 @@ private <I extends IQ> I sendIqRequestAndWaitForResponse(AbstractXMPPConnection
     private Response uploadFileToSlot(final AccountJid account, final Slot slot, final File file)
             throws IOException, NoSuchAlgorithmException, KeyManagementException {
 
-        MemorizingTrustManager mtm = CertificateManager.getInstance().getNewFileUploadManager(account);
-        SSLContext sslContext = SSLContext.getInstance("SSL");
-        sslContext.init(null, new X509TrustManager[]{mtm}, new java.security.SecureRandom());
-        SSLSocketFactory sslSocketFactory = sslContext.getSocketFactory();
-
-        OkHttpClient client = new OkHttpClient().newBuilder()
-                .sslSocketFactory(sslSocketFactory)
-                .hostnameVerifier(mtm.wrapHostnameVerifier(new org.apache.http.conn.ssl.StrictHostnameVerifier()))
-                .writeTimeout(5, TimeUnit.MINUTES)
-                .connectTimeout(5, TimeUnit.MINUTES)
-                .readTimeout(5, TimeUnit.MINUTES)
-                .build();
+        OkHttpClient client = HttpClientWithMTM.getClient(account);
 
         Request request = new Request.Builder()
                 .url(slot.getPutUrl())
                 .put(RequestBody.create(CONTENT_TYPE, file))
                 .build();
 
-        return client.newCall(request).execute();
+        if (client != null) return client.newCall(request).execute();
+        else throw new IOException("Upload failed: failed to create httpclient");
     }
 
     private static String getCompressedDirPath() {
diff --git a/xabber/src/main/java/com/xabber/android/utils/HttpClientWithMTM.java b/xabber/src/main/java/com/xabber/android/utils/HttpClientWithMTM.java
new file mode 100644
index 0000000000..80d03f9c0c
--- /dev/null
+++ b/xabber/src/main/java/com/xabber/android/utils/HttpClientWithMTM.java
@@ -0,0 +1,46 @@
+package com.xabber.android.utils;
+
+import com.xabber.android.data.connection.CertificateManager;
+import com.xabber.android.data.entity.AccountJid;
+
+import java.security.KeyManagementException;
+import java.security.NoSuchAlgorithmException;
+import java.util.concurrent.TimeUnit;
+
+import javax.net.ssl.SSLContext;
+import javax.net.ssl.SSLSocketFactory;
+import javax.net.ssl.X509TrustManager;
+
+import de.duenndns.ssl.MemorizingTrustManager;
+import okhttp3.OkHttpClient;
+
+public class HttpClientWithMTM {
+
+    public static OkHttpClient getClient(AccountJid accountJid) {
+
+        // create ssl verification factory
+        SSLSocketFactory sslSocketFactory = null;
+        MemorizingTrustManager mtm = CertificateManager.getInstance().getNewFileUploadManager(accountJid);
+
+        final SSLContext sslContext;
+        try {
+            sslContext = SSLContext.getInstance("SSL");
+            sslContext.init(null, new X509TrustManager[]{mtm}, new java.security.SecureRandom());
+            sslSocketFactory = sslContext.getSocketFactory();
+        } catch (NoSuchAlgorithmException | KeyManagementException e) {
+            return null;
+        }
+
+        // build http client
+        final OkHttpClient client = new OkHttpClient().newBuilder()
+                .sslSocketFactory(sslSocketFactory)
+                .hostnameVerifier(mtm.wrapHostnameVerifier(new org.apache.http.conn.ssl.StrictHostnameVerifier()))
+                .writeTimeout(5, TimeUnit.MINUTES)
+                .connectTimeout(5, TimeUnit.MINUTES)
+                .readTimeout(5, TimeUnit.MINUTES)
+                .build();
+
+        return client;
+    }
+
+}

From 925b223da5cfa5ad22e89aa98ac5605db0088de2 Mon Sep 17 00:00:00 2001
From: Valery Miller <valera_miller94@mail.ru>
Date: Fri, 12 Oct 2018 15:55:07 +0500
Subject: [PATCH 233/251] Change password dialog replaced with activity

---
 xabber/src/main/AndroidManifest.xml           |   1 +
 .../ui/activity/XAChangePassActivity.java     | 177 ++++++++++++++++++
 .../ui/activity/XabberAccountActivity.java    | 121 +-----------
 .../res/layout/activity_change_xa_pass.xml    | 116 ++++++++++++
 .../main/res/layout/dialog_change_pass.xml    |  65 -------
 5 files changed, 295 insertions(+), 185 deletions(-)
 create mode 100644 xabber/src/main/java/com/xabber/android/ui/activity/XAChangePassActivity.java
 create mode 100644 xabber/src/main/res/layout/activity_change_xa_pass.xml
 delete mode 100644 xabber/src/main/res/layout/dialog_change_pass.xml

diff --git a/xabber/src/main/AndroidManifest.xml b/xabber/src/main/AndroidManifest.xml
index b2c0101908..d1c8496b36 100644
--- a/xabber/src/main/AndroidManifest.xml
+++ b/xabber/src/main/AndroidManifest.xml
@@ -541,6 +541,7 @@
             </intent-filter>
 
         </activity>
+        <activity android:name=".ui.activity.XAChangePassActivity" />
         <activity android:name=".ui.activity.PatreonAppealActivity"
             android:theme="@style/ThemeDark">
             <meta-data
diff --git a/xabber/src/main/java/com/xabber/android/ui/activity/XAChangePassActivity.java b/xabber/src/main/java/com/xabber/android/ui/activity/XAChangePassActivity.java
new file mode 100644
index 0000000000..90278e885b
--- /dev/null
+++ b/xabber/src/main/java/com/xabber/android/ui/activity/XAChangePassActivity.java
@@ -0,0 +1,177 @@
+package com.xabber.android.ui.activity;
+
+import android.content.Context;
+import android.content.Intent;
+import android.os.Bundle;
+import android.support.annotation.NonNull;
+import android.support.design.widget.TextInputLayout;
+import android.support.v7.widget.Toolbar;
+import android.view.View;
+import android.widget.Button;
+import android.widget.EditText;
+import android.widget.ProgressBar;
+import android.widget.Toast;
+
+import com.xabber.android.R;
+import com.xabber.android.data.connection.NetworkManager;
+import com.xabber.android.data.xaccount.AuthManager;
+import com.xabber.android.ui.color.BarPainter;
+
+import okhttp3.ResponseBody;
+import rx.android.schedulers.AndroidSchedulers;
+import rx.functions.Action1;
+import rx.schedulers.Schedulers;
+import rx.subscriptions.CompositeSubscription;
+
+public class XAChangePassActivity extends ManagedActivity {
+
+    private Toolbar toolbar;
+
+    private EditText edtOldPass;
+    private TextInputLayout tilOldPass;
+    private EditText edtPass;
+    private TextInputLayout tilPass;
+    private EditText edtConfirmPass;
+    private TextInputLayout tilConfirmPass;
+    private Button btnChange;
+    private ProgressBar progressBar;
+
+    protected CompositeSubscription compositeSubscription = new CompositeSubscription();
+
+    @NonNull
+    public static Intent createIntent(Context context) {
+        return new Intent(context, XAChangePassActivity.class);
+    }
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        setTheme(R.style.Theme_LightToolbar);
+        setContentView(R.layout.activity_change_xa_pass);
+
+        toolbar = (Toolbar) findViewById(R.id.toolbar_default);
+        toolbar.setNavigationIcon(R.drawable.ic_arrow_left);
+        toolbar.setNavigationOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                finish();
+            }
+        });
+        toolbar.setTitleTextColor(getResources().getColor(R.color.black_text));
+        toolbar.setTitle(R.string.button_change_pass);
+        BarPainter barPainter = new BarPainter(this, toolbar);
+        barPainter.setLiteGrey();
+
+        progressBar = findViewById(R.id.progressBar);
+        edtOldPass = findViewById(R.id.edtOldPass);
+        tilOldPass = findViewById(R.id.tilOldPass);
+        edtPass = findViewById(R.id.edtPass);
+        tilPass = findViewById(R.id.tilPass);
+        edtConfirmPass = findViewById(R.id.edtConfirmPass);
+        tilConfirmPass = findViewById(R.id.tilConfirmPass);
+        btnChange = findViewById(R.id.btnChange);
+        btnChange.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                onChangePassClick(edtOldPass, edtPass, edtConfirmPass);
+            }
+        });
+    }
+
+    @Override
+    protected void onPause() {
+        super.onPause();
+        compositeSubscription.clear();
+    }
+
+    public void onChangePassClick(EditText edtOldPass, EditText edtPass, EditText edtConfirmPass) {
+        String oldPass = edtOldPass.getText().toString();
+        oldPass = oldPass.trim();
+
+        String pass = edtPass.getText().toString();
+        pass = pass.trim();
+
+        String confirmPass = edtConfirmPass.getText().toString();
+        confirmPass = confirmPass.trim();
+
+        if (oldPass.isEmpty()) {
+            tilOldPass.setError(getString(R.string.empty_field));
+            return;
+        } else tilOldPass.setError(null);
+
+        if (oldPass.length() < 4) {
+            tilOldPass.setError(getString(R.string.pass_too_short));
+            return;
+        } else tilOldPass.setError(null);
+
+        if (pass.isEmpty()) {
+            tilPass.setError(getString(R.string.empty_field));
+            return;
+        } else tilPass.setError(null);
+
+        if (pass.length() < 4) {
+            tilPass.setError(getString(R.string.pass_too_short));
+            return;
+        } else tilPass.setError(null);
+
+        if (confirmPass.isEmpty()) {
+            tilConfirmPass.setError(getString(R.string.empty_field));
+            return;
+        } else tilConfirmPass.setError(null);
+
+        if (confirmPass.length() < 4) {
+            tilConfirmPass.setError(getString(R.string.pass_too_short));
+            return;
+        } else tilConfirmPass.setError(null);
+
+        if (!pass.equals(confirmPass)) {
+            tilConfirmPass.setError(getString(R.string.passwords_not_match));
+            return;
+        } else tilConfirmPass.setError(null);
+
+        if (checkInternetOrShowError()) changePass(oldPass, pass, confirmPass);
+    }
+
+    private void changePass(String oldPass, String pass, String confirmPass) {
+        showProgress(true);
+        compositeSubscription.add(AuthManager.changePassword(oldPass, pass, confirmPass)
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(new Action1<ResponseBody>() {
+                    @Override
+                    public void call(ResponseBody s) {
+                        handleSuccessChangePass();
+                    }
+                }, new Action1<Throwable>() {
+                    @Override
+                    public void call(Throwable throwable) {
+                        handleErrorChangePass();
+                    }
+                }));
+    }
+
+    private void handleSuccessChangePass() {
+        Toast.makeText(this, R.string.password_changed_success, Toast.LENGTH_SHORT).show();
+        showProgress(false);
+        finish();
+    }
+
+    private void handleErrorChangePass() {
+        Toast.makeText(this, R.string.password_changed_fail, Toast.LENGTH_SHORT).show();
+        showProgress(false);
+    }
+
+    private boolean checkInternetOrShowError() {
+        if (NetworkManager.isNetworkAvailable()) return true;
+        else {
+            Toast.makeText(this, R.string.toast_no_internet, Toast.LENGTH_LONG).show();
+            return false;
+        }
+    }
+
+    private void showProgress(boolean show) {
+        progressBar.setVisibility(show ? View.VISIBLE : View.GONE);
+        btnChange.setEnabled(!show);
+    }
+}
diff --git a/xabber/src/main/java/com/xabber/android/ui/activity/XabberAccountActivity.java b/xabber/src/main/java/com/xabber/android/ui/activity/XabberAccountActivity.java
index 07c19d17d1..4da17e5b68 100644
--- a/xabber/src/main/java/com/xabber/android/ui/activity/XabberAccountActivity.java
+++ b/xabber/src/main/java/com/xabber/android/ui/activity/XabberAccountActivity.java
@@ -15,9 +15,7 @@
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
-import android.widget.Button;
 import android.widget.CheckBox;
-import android.widget.EditText;
 import android.widget.Toast;
 
 import com.xabber.android.R;
@@ -112,10 +110,7 @@ public boolean onMenuItemClick(MenuItem item) {
                 onResetPassClick();
                 return true;
             case R.id.action_change_pass:
-                if (!dialogShowed) {
-                    dialogShowed = true;
-                    showChangePassDialog();
-                }
+                startActivity(XAChangePassActivity.createIntent(this));
                 return true;
             case R.id.action_quit:
                 if (!dialogShowed) {
@@ -362,120 +357,6 @@ private void handleErrorLogout(Throwable throwable) {
         hideProgress();
     }
 
-    /** CHANGE\RESET PASS DIALOG */
-
-    private void showChangePassDialog() {
-        LayoutInflater inflater = getLayoutInflater();
-        View view = inflater.inflate(R.layout.dialog_change_pass, null);
-        final EditText edtOldPass = view.findViewById(R.id.edtOldPass);
-        final EditText edtPass = view.findViewById(R.id.edtPass);
-        final EditText edtConfirmPass = view.findViewById(R.id.edtConfirmPass);
-        Button btnOk = view.findViewById(R.id.btnOk);
-        Button btnResetPass = view.findViewById(R.id.btnResetPass);
-
-        btnOk.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                onChangePassClick(edtOldPass, edtPass, edtConfirmPass);
-            }
-        });
-
-        btnResetPass.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                onResetPassClick();
-                dialog.dismiss();
-            }
-        });
-
-        AlertDialog.Builder builder = new AlertDialog.Builder(this);
-        builder.setTitle(R.string.button_change_pass).setView(view);
-        dialog = builder.create();
-        dialog.show();
-        dialogShowed = false;
-    }
-
-    public void onChangePassClick(EditText edtOldPass, EditText edtPass, EditText edtConfirmPass) {
-        String oldPass = edtOldPass.getText().toString();
-        oldPass = oldPass.trim();
-
-        String pass = edtPass.getText().toString();
-        pass = pass.trim();
-
-        String confirmPass = edtConfirmPass.getText().toString();
-        confirmPass = confirmPass.trim();
-
-        if (oldPass.isEmpty()) {
-            edtOldPass.setError(getString(R.string.empty_field));
-            return;
-        }
-
-        if (oldPass.length() < 4) {
-            edtOldPass.setError(getString(R.string.pass_too_short));
-            return;
-        }
-
-        if (pass.isEmpty()) {
-            edtPass.setError(getString(R.string.empty_field));
-            return;
-        }
-
-        if (pass.length() < 4) {
-            edtPass.setError(getString(R.string.pass_too_short));
-            return;
-        }
-
-        if (confirmPass.isEmpty()) {
-            edtConfirmPass.setError(getString(R.string.empty_field));
-            return;
-        }
-
-        if (confirmPass.length() < 4) {
-            edtConfirmPass.setError(getString(R.string.pass_too_short));
-            return;
-        }
-
-        if (!pass.equals(confirmPass)) {
-            edtConfirmPass.setError(getString(R.string.passwords_not_match));
-            return;
-        }
-
-        if (checkInternetOrShowError()) {
-            changePass(oldPass, pass, confirmPass);
-            dialog.dismiss();
-        }
-    }
-
-    /** CHANGE PASS */
-
-    private void changePass(String oldPass, String pass, String confirmPass) {
-        showProgress("");
-        compositeSubscription.add(AuthManager.changePassword(oldPass, pass, confirmPass)
-            .subscribeOn(Schedulers.io())
-            .observeOn(AndroidSchedulers.mainThread())
-            .subscribe(new Action1<ResponseBody>() {
-                @Override
-                public void call(ResponseBody s) {
-                    handleSuccessChangePass();
-                }
-            }, new Action1<Throwable>() {
-                @Override
-                public void call(Throwable throwable) {
-                    handleErrorChangePass();
-                }
-            }));
-    }
-
-    private void handleSuccessChangePass() {
-        Toast.makeText(this, R.string.password_changed_success, Toast.LENGTH_SHORT).show();
-        hideProgress();
-    }
-
-    private void handleErrorChangePass() {
-        Toast.makeText(this, R.string.password_changed_fail, Toast.LENGTH_SHORT).show();
-        hideProgress();
-    }
-
     /** RESET PASS */
 
     private void onResetPassClick() {
diff --git a/xabber/src/main/res/layout/activity_change_xa_pass.xml b/xabber/src/main/res/layout/activity_change_xa_pass.xml
new file mode 100644
index 0000000000..685be47eca
--- /dev/null
+++ b/xabber/src/main/res/layout/activity_change_xa_pass.xml
@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="?attr/settings_background_color"
+    android:focusableInTouchMode="true"
+    >
+
+    <include layout="@layout/toolbar_default" />
+
+    <android.support.v7.widget.CardView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <LinearLayout
+            android:orientation="vertical"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:paddingRight="16dp"
+            android:paddingLeft="16dp"
+            android:paddingTop="32dp"
+            >
+
+        <android.support.design.widget.TextInputLayout
+            android:id="@+id/tilOldPass"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:errorEnabled="true"
+            >
+
+            <EditText
+                android:id="@+id/edtOldPass"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:hint="@string/hint_old_pass"
+                android:imeOptions="actionNext"
+                android:singleLine="true"
+                android:inputType="textPassword"
+                />
+
+        </android.support.design.widget.TextInputLayout>
+
+        <android.support.design.widget.TextInputLayout
+            android:id="@+id/tilPass"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:errorEnabled="true"
+            >
+
+            <EditText
+                android:id="@+id/edtPass"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:hint="@string/hint_pass"
+                android:imeOptions="actionNext"
+                android:singleLine="true"
+                android:inputType="textPassword"
+                />
+
+        </android.support.design.widget.TextInputLayout>
+
+        <android.support.design.widget.TextInputLayout
+            android:id="@+id/tilConfirmPass"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="8dp"
+            app:errorEnabled="true"
+            >
+
+            <EditText
+                android:id="@+id/edtConfirmPass"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:hint="@string/hint_confirm_pass"
+                android:imeOptions="actionDone"
+                android:singleLine="true"
+                android:inputType="textPassword"
+                />
+
+        </android.support.design.widget.TextInputLayout>
+
+        <LinearLayout
+            android:orientation="horizontal"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="right"
+            android:layout_marginBottom="16dp"
+            >
+
+            <ProgressBar
+                android:id="@+id/progressBar"
+                android:layout_width="32dp"
+                android:layout_height="32dp"
+                android:layout_gravity="center_vertical"
+                android:layout_marginRight="8dp"
+                android:visibility="gone"
+                />
+
+            <Button
+                android:id="@+id/btnChange"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/change"
+                style="@style/Widget.AppCompat.Button.Colored"
+                android:theme="@style/BlueButton"
+                />
+
+        </LinearLayout>
+
+        </LinearLayout>
+
+    </android.support.v7.widget.CardView>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/xabber/src/main/res/layout/dialog_change_pass.xml b/xabber/src/main/res/layout/dialog_change_pass.xml
deleted file mode 100644
index 3fe77e09de..0000000000
--- a/xabber/src/main/res/layout/dialog_change_pass.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:paddingTop="8dp"
-    android:paddingLeft="16dp"
-    android:paddingRight="16dp">
-
-    <EditText
-        android:id="@+id/edtOldPass"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:hint="@string/hint_old_pass"
-        android:layout_marginLeft="8dp"
-        android:layout_marginRight="8dp"
-        />
-
-    <EditText
-        android:id="@+id/edtPass"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:hint="@string/hint_pass"
-        android:layout_marginLeft="8dp"
-        android:layout_marginRight="8dp"
-        />
-
-    <EditText
-        android:id="@+id/edtConfirmPass"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:hint="@string/hint_confirm_pass"
-        android:layout_marginLeft="8dp"
-        android:layout_marginRight="8dp"
-        />
-
-    <LinearLayout
-        android:orientation="horizontal"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:gravity="right"
-        android:layout_marginTop="8dp"
-        android:layout_marginBottom="8dp"
-        >
-
-        <Button
-            android:id="@+id/btnResetPass"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/button_reset_pass"
-            style="@style/Widget.AppCompat.Button.Borderless.Colored"
-            />
-
-        <Button
-            android:id="@+id/btnOk"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/ok"
-            style="@style/Widget.AppCompat.Button.Borderless.Colored"
-            />
-
-    </LinearLayout>
-
-</LinearLayout>
\ No newline at end of file

From 9b7a213daa4a9ed214687fd7ca7e48dc7d3c4238 Mon Sep 17 00:00:00 2001
From: Valery Miller <valera_miller94@mail.ru>
Date: Fri, 12 Oct 2018 17:00:59 +0500
Subject: [PATCH 234/251] Fixed fragment onAttach for android < 23

---
 .../fragment/ContactListDrawerFragment.java   |  6 +++++-
 .../fragment/ContactVcardViewerFragment.java  | 10 +++++++---
 .../ui/fragment/OccupantListFragment.java     |  5 ++++-
 .../ui/fragment/RecentChatFragment.java       | 10 +++++++---
 .../fragment/XAccountEmailLoginFragment.java  | 15 +++++++-------
 .../ui/fragment/XAccountLinksFragment.java    | 13 ++++++------
 .../ui/fragment/XAccountLoginFragment.java    | 20 +++++++++----------
 .../ui/fragment/XAccountSignUpFragment4.java  | 11 +++++-----
 .../fragment/XAccountXMPPLoginFragment.java   |  9 +++++----
 9 files changed, 59 insertions(+), 40 deletions(-)

diff --git a/xabber/src/main/java/com/xabber/android/ui/fragment/ContactListDrawerFragment.java b/xabber/src/main/java/com/xabber/android/ui/fragment/ContactListDrawerFragment.java
index ad8604e4e2..07dc9039e7 100644
--- a/xabber/src/main/java/com/xabber/android/ui/fragment/ContactListDrawerFragment.java
+++ b/xabber/src/main/java/com/xabber/android/ui/fragment/ContactListDrawerFragment.java
@@ -2,6 +2,7 @@
 
 
 import android.app.Activity;
+import android.content.Context;
 import android.content.pm.PackageManager;
 import android.content.res.TypedArray;
 import android.os.Build;
@@ -78,7 +79,10 @@ public static ContactListDrawerFragment newInstance() {
     @Override
     public void onAttach(Activity activity) {
         super.onAttach(activity);
-        listener = (ContactListDrawerListener) activity;
+        if (activity instanceof ContactListDrawerListener)
+            listener = (ContactListDrawerListener) activity;
+        else throw new RuntimeException(activity.toString()
+                + " must implement ContactListDrawerFragment.ContactListDrawerListener");
     }
 
     @Override
diff --git a/xabber/src/main/java/com/xabber/android/ui/fragment/ContactVcardViewerFragment.java b/xabber/src/main/java/com/xabber/android/ui/fragment/ContactVcardViewerFragment.java
index 14e909ed91..fc5866c056 100644
--- a/xabber/src/main/java/com/xabber/android/ui/fragment/ContactVcardViewerFragment.java
+++ b/xabber/src/main/java/com/xabber/android/ui/fragment/ContactVcardViewerFragment.java
@@ -2,6 +2,7 @@
 
 import android.app.Activity;
 import android.app.Fragment;
+import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
 import android.support.annotation.Nullable;
@@ -99,9 +100,12 @@ public static ContactVcardViewerFragment newInstance(AccountJid account) {
     @Override
     public void onAttach(Activity activity) {
         super.onAttach(activity);
-
-        listener = (Listener) activity;
-        listener.registerVCardFragment(this);
+        if (activity instanceof Listener) {
+            listener = (Listener) activity;
+            listener.registerVCardFragment(this);
+        }
+        else throw new RuntimeException(activity.toString()
+                + " must implement ContactVcardViewerFragment.Listener");
     }
 
     @Override
diff --git a/xabber/src/main/java/com/xabber/android/ui/fragment/OccupantListFragment.java b/xabber/src/main/java/com/xabber/android/ui/fragment/OccupantListFragment.java
index 63b4425a74..9a536e605b 100644
--- a/xabber/src/main/java/com/xabber/android/ui/fragment/OccupantListFragment.java
+++ b/xabber/src/main/java/com/xabber/android/ui/fragment/OccupantListFragment.java
@@ -2,6 +2,7 @@
 
 import android.app.Activity;
 import android.app.Fragment;
+import android.content.Context;
 import android.os.Bundle;
 import android.support.annotation.Nullable;
 import android.view.LayoutInflater;
@@ -145,7 +146,9 @@ public void onItemClick(AdapterView<?> parent, View view, int position, long id)
     @Override
     public void onAttach(Activity activity) {
         super.onAttach(activity);
-        listener = (Listener) activity;
+        if (activity instanceof Listener) listener = (Listener) activity;
+        else throw new RuntimeException(activity.toString()
+                + " must implement OccupantListFragment.Listener");
     }
 
     @Override
diff --git a/xabber/src/main/java/com/xabber/android/ui/fragment/RecentChatFragment.java b/xabber/src/main/java/com/xabber/android/ui/fragment/RecentChatFragment.java
index 03a581c9e2..8a40bd7582 100644
--- a/xabber/src/main/java/com/xabber/android/ui/fragment/RecentChatFragment.java
+++ b/xabber/src/main/java/com/xabber/android/ui/fragment/RecentChatFragment.java
@@ -2,6 +2,7 @@
 
 import android.app.Activity;
 import android.app.Fragment;
+import android.content.Context;
 import android.content.Intent;
 import android.graphics.Color;
 import android.os.Bundle;
@@ -79,9 +80,12 @@ public static RecentChatFragment newInstance() {
     @Override
     public void onAttach(Activity activity) {
         super.onAttach(activity);
-
-        listener = (Listener) activity;
-        listener.registerRecentChatFragment(this);
+        if (activity instanceof Listener) {
+            listener = (Listener) activity;
+            listener.registerRecentChatFragment(this);
+        }
+        else throw new RuntimeException(activity.toString()
+                + " must implement RecentChatFragment.Listener");
     }
 
     @Override
diff --git a/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountEmailLoginFragment.java b/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountEmailLoginFragment.java
index 1c481933c2..2fbd2db88a 100644
--- a/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountEmailLoginFragment.java
+++ b/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountEmailLoginFragment.java
@@ -1,5 +1,6 @@
 package com.xabber.android.ui.fragment;
 
+import android.app.Activity;
 import android.app.Fragment;
 import android.content.Context;
 import android.os.Bundle;
@@ -61,15 +62,15 @@ public void onClick(View v) {
     }
 
     @Override
-    public void onAttach(Context context) {
-        super.onAttach(context);
-        if (context instanceof Listener) listener = (Listener) context;
-        else throw new RuntimeException(context.toString()
+    public void onAttach(Activity activity) {
+        super.onAttach(activity);
+        if (activity instanceof Listener) listener = (Listener) activity;
+        else throw new RuntimeException(activity.toString()
                 + " must implement XAccountEmailLoginFragment.Listener");
 
-        if (context instanceof XAccountLoginFragment.ForgotPassClickListener)
-            forgotPassListener = (XAccountLoginFragment.ForgotPassClickListener) context;
-        else throw new RuntimeException(context.toString()
+        if (activity instanceof XAccountLoginFragment.ForgotPassClickListener)
+            forgotPassListener = (XAccountLoginFragment.ForgotPassClickListener) activity;
+        else throw new RuntimeException(activity.toString()
                 + " must implement ForgotPassClickListener");
     }
 
diff --git a/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountLinksFragment.java b/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountLinksFragment.java
index f31c3511d8..c239e1be53 100644
--- a/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountLinksFragment.java
+++ b/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountLinksFragment.java
@@ -1,5 +1,6 @@
 package com.xabber.android.ui.fragment;
 
+import android.app.Activity;
 import android.app.AlertDialog;
 import android.app.Fragment;
 import android.content.Context;
@@ -136,14 +137,14 @@ public void onClick(View v) {
     }
 
     @Override
-    public void onAttach(Context context) {
-        super.onAttach(context);
-        if (context instanceof Listener) listener = (Listener) context;
-        else throw new RuntimeException(context.toString()
+    public void onAttach(Activity activity) {
+        super.onAttach(activity);
+        if (activity instanceof Listener) listener = (Listener) activity;
+        else throw new RuntimeException(activity.toString()
                 + " must implement XAccountLinksFragment.Listener");
 
-        if (context instanceof OnSocialBindListener) bindListener = (OnSocialBindListener) context;
-        else throw new RuntimeException(context.toString()
+        if (activity instanceof OnSocialBindListener) bindListener = (OnSocialBindListener) activity;
+        else throw new RuntimeException(activity.toString()
                 + " must implement OnSocialBindListener");
     }
 
diff --git a/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountLoginFragment.java b/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountLoginFragment.java
index 4640d83207..b341c5dbfd 100644
--- a/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountLoginFragment.java
+++ b/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountLoginFragment.java
@@ -1,5 +1,6 @@
 package com.xabber.android.ui.fragment;
 
+import android.app.Activity;
 import android.app.Fragment;
 import android.content.Context;
 import android.os.Bundle;
@@ -100,20 +101,19 @@ public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container,
     }
 
     @Override
-    public void onAttach(Context context) {
-        super.onAttach(context);
-
-        if (context instanceof OnSocialBindListener) listener = (OnSocialBindListener) context;
-        else throw new RuntimeException(context.toString()
+    public void onAttach(Activity activity) {
+        super.onAttach(activity);
+        if (activity instanceof OnSocialBindListener) listener = (OnSocialBindListener) activity;
+        else throw new RuntimeException(activity.toString()
                 + " must implement OnSocialBindListener");
 
-        if (context instanceof EmailClickListener) emailListener = (EmailClickListener) context;
-        else throw new RuntimeException(context.toString()
+        if (activity instanceof EmailClickListener) emailListener = (EmailClickListener) activity;
+        else throw new RuntimeException(activity.toString()
                 + " must implement EmailClickListener");
 
-        if (context instanceof ForgotPassClickListener)
-            forgotPassListener = (ForgotPassClickListener) context;
-        else throw new RuntimeException(context.toString()
+        if (activity instanceof ForgotPassClickListener)
+            forgotPassListener = (ForgotPassClickListener) activity;
+        else throw new RuntimeException(activity.toString()
                 + " must implement ForgotPassClickListener");
     }
 
diff --git a/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountSignUpFragment4.java b/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountSignUpFragment4.java
index 6d62c62901..81bcd7eb8e 100644
--- a/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountSignUpFragment4.java
+++ b/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountSignUpFragment4.java
@@ -1,5 +1,6 @@
 package com.xabber.android.ui.fragment;
 
+import android.app.Activity;
 import android.app.AlertDialog;
 import android.app.Dialog;
 import android.app.Fragment;
@@ -70,11 +71,11 @@ public void onClick(View v) {
     }
 
     @Override
-    public void onAttach(Context context) {
-        super.onAttach(context);
-        if (context instanceof Listener) listener = (Listener) context;
-        else throw new RuntimeException(context.toString()
-                    + " must implement XAccountSignUpFragment4.Listener");
+    public void onAttach(Activity activity) {
+        super.onAttach(activity);
+        if (activity instanceof Listener) listener = (Listener) activity;
+        else throw new RuntimeException(activity.toString()
+                + " must implement XAccountSignUpFragment4.Listener");
     }
 
     @Override
diff --git a/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountXMPPLoginFragment.java b/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountXMPPLoginFragment.java
index 2dfe76c499..e159ceb0be 100644
--- a/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountXMPPLoginFragment.java
+++ b/xabber/src/main/java/com/xabber/android/ui/fragment/XAccountXMPPLoginFragment.java
@@ -1,5 +1,6 @@
 package com.xabber.android.ui.fragment;
 
+import android.app.Activity;
 import android.app.Fragment;
 import android.content.Context;
 import android.os.Bundle;
@@ -79,10 +80,10 @@ public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
     }
 
     @Override
-    public void onAttach(Context context) {
-        super.onAttach(context);
-        if (context instanceof Listener) listener = (Listener) context;
-        else throw new RuntimeException(context.toString()
+    public void onAttach(Activity activity) {
+        super.onAttach(activity);
+        if (activity instanceof Listener) listener = (Listener) activity;
+        else throw new RuntimeException(activity.toString()
                 + " must implement XAccountXMPPLoginFragment.Listener");
     }
 

From 83153048f549907c52aa369c5a052f9926366e75 Mon Sep 17 00:00:00 2001
From: Valery Miller <valera_miller94@mail.ru>
Date: Fri, 12 Oct 2018 17:52:26 +0500
Subject: [PATCH 235/251] Fixed updating account info after success verifying
 email

---
 .../java/com/xabber/android/ui/activity/BaseLoginActivity.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/xabber/src/main/java/com/xabber/android/ui/activity/BaseLoginActivity.java b/xabber/src/main/java/com/xabber/android/ui/activity/BaseLoginActivity.java
index e296686cc2..3c5e898c6b 100644
--- a/xabber/src/main/java/com/xabber/android/ui/activity/BaseLoginActivity.java
+++ b/xabber/src/main/java/com/xabber/android/ui/activity/BaseLoginActivity.java
@@ -413,7 +413,7 @@ public void call(Throwable throwable) {
     private void handleSuccessConfirm(XabberAccount response) {
         hideProgress();
         Toast.makeText(this, R.string.confirm_success, Toast.LENGTH_SHORT).show();
-        updateAccountInfo(response);
+        synchronize(false);
     }
 
     private void handleErrorConfirm(Throwable throwable) {

From 143d75c88ef57b5677040a965f073c2ddfa2c5a1 Mon Sep 17 00:00:00 2001
From: Valery Miller <valera_miller94@mail.ru>
Date: Fri, 12 Oct 2018 18:17:51 +0500
Subject: [PATCH 236/251] Added check for fromToken field in push receiving to
 prevent extra http requests

---
 .../src/main/java/com/xabber/android/service/PushService.java  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/xabber/src/main/java/com/xabber/android/service/PushService.java b/xabber/src/main/java/com/xabber/android/service/PushService.java
index 1719e6eca3..0d6414fc54 100644
--- a/xabber/src/main/java/com/xabber/android/service/PushService.java
+++ b/xabber/src/main/java/com/xabber/android/service/PushService.java
@@ -56,7 +56,8 @@ private void onXAccountPushReceived(String target, String body) {
         if (xabberAccount != null && xabberAccount.getFullUsername().equals(target)) {
             XAccountPushData data = gson.fromJson(body, XAccountPushData.class);
 
-            if (data != null && xabberAccount.getFullUsername().equals(data.getUsername())) {
+            if (data != null && xabberAccount.getFullUsername().equals(data.getUsername())
+                    && !xabberAccount.getToken().equals(data.getFromToken())) {
                 switch (data.getAction()) {
                     case ACTION_SETTINGS_UPDATED:
                         XabberAccountManager.getInstance().updateAccountSettings();

From fc35b14de758e5d3225abf431db24316b7e08caa Mon Sep 17 00:00:00 2001
From: Valery Miller <valera_miller94@mail.ru>
Date: Fri, 12 Oct 2018 18:37:59 +0500
Subject: [PATCH 237/251] Up version to 529

---
 xabber/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/xabber/build.gradle b/xabber/build.gradle
index c5ecd9c95f..fc70819f8e 100644
--- a/xabber/build.gradle
+++ b/xabber/build.gradle
@@ -10,8 +10,8 @@ android {
     defaultConfig {
         minSdkVersion 15
         targetSdkVersion 28
-        versionCode 528
-        versionName '2.4.2(528)'
+        versionCode 529
+        versionName '2.4.2(529)'
     }
 
     lintOptions {

From 8ff9c8cf62570732576223e7fe0bb07aa194acb2 Mon Sep 17 00:00:00 2001
From: Valery Miller <valera_miller94@mail.ru>
Date: Mon, 15 Oct 2018 11:34:07 +0500
Subject: [PATCH 238/251] Removed extra http requests on push received

---
 .../android/data/xaccount/XabberAccountManager.java  | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/xabber/src/main/java/com/xabber/android/data/xaccount/XabberAccountManager.java b/xabber/src/main/java/com/xabber/android/data/xaccount/XabberAccountManager.java
index b308a0841f..6094a57da6 100644
--- a/xabber/src/main/java/com/xabber/android/data/xaccount/XabberAccountManager.java
+++ b/xabber/src/main/java/com/xabber/android/data/xaccount/XabberAccountManager.java
@@ -213,16 +213,16 @@ public void onLoad() {
         this.accountsSyncState = loadSyncStatesFromRealm();
 
         if (account != null) {
-            getAccountFromNet(account.getToken());
+            getAccountFromNet(account.getToken(), true);
         }
     }
 
-    private void getAccountFromNet(String token) {
+    private void getAccountFromNet(String token, final boolean needUpdateSettings) {
         Subscription getAccountSubscription = AuthManager.getAccount(token)
                 .subscribe(new Action1<XabberAccount>() {
                     @Override
                     public void call(XabberAccount xabberAccount) {
-                        handleSuccessGetAccount(xabberAccount);
+                        handleSuccessGetAccount(xabberAccount, needUpdateSettings);
                     }
                 }, new Action1<Throwable>() {
                     @Override
@@ -234,7 +234,7 @@ public void call(Throwable throwable) {
     }
 
     public void updateAccountInfo() {
-        getAccountFromNet(account.getToken());
+        getAccountFromNet(account.getToken(), false);
     }
 
     public void updateAccountSettings() {
@@ -265,10 +265,10 @@ public void call(Throwable throwable) {
         }
     }
 
-    private void handleSuccessGetAccount(@NonNull XabberAccount xabberAccount) {
+    private void handleSuccessGetAccount(@NonNull XabberAccount xabberAccount, boolean needUpdateSettings) {
         Log.d(LOG_TAG, "Xabber account loading from net: successfully");
         setAccount(xabberAccount);
-        updateAccountSettings();
+        if (needUpdateSettings) updateAccountSettings();
     }
 
     private void handleErrorGetAccount(Throwable throwable) {

From b7a9d7520e511cbbe82fd970e383245cc17af852 Mon Sep 17 00:00:00 2001
From: Valery Miller <valera_miller94@mail.ru>
Date: Mon, 15 Oct 2018 13:17:28 +0500
Subject: [PATCH 239/251] Fixed travis settings

---
 .travis.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index 136b29158e..a3dc6ec87b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,10 +3,12 @@ android:
   components:
     - platform-tools
     - tools
+    - build-tools-28.0.3
     - build-tools-27.0.3
     - build-tools-26.0.2
     - build-tools-25.0.2
     - build-tools-25.0.0
+    - android-28
     - android-27
     - android-26
     - android-25

From 0509b0bd68141605f3a0faceda07dfec978a3621 Mon Sep 17 00:00:00 2001
From: Valery Miller <valera_miller94@mail.ru>
Date: Mon, 15 Oct 2018 14:13:03 +0500
Subject: [PATCH 240/251] Fixed travis settings

---
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.travis.yml b/.travis.yml
index a3dc6ec87b..ac9f7ea3ac 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,6 +4,7 @@ android:
     - platform-tools
     - tools
     - build-tools-28.0.3
+    - build-tools-28.0.2
     - build-tools-27.0.3
     - build-tools-26.0.2
     - build-tools-25.0.2

From bd561d989fd026c68844cbd43baaad9bc5180f9d Mon Sep 17 00:00:00 2001
From: Valery Miller <valera_miller94@mail.ru>
Date: Mon, 15 Oct 2018 17:05:12 +0500
Subject: [PATCH 241/251] Update russian translations

---
 .../main/res/values-ru-rRU/account_editor.xml |  26 ++--
 .../main/res/values-ru-rRU/chat_viewer.xml    |  22 +++-
 .../main/res/values-ru-rRU/contact_editor.xml |   2 +-
 .../main/res/values-ru-rRU/contact_list.xml   |  21 ++-
 .../main/res/values-ru-rRU/contact_viewer.xml |   4 +-
 .../src/main/res/values-ru-rRU/muc_editor.xml |   4 +-
 .../res/values-ru-rRU/notification_bar.xml    |   2 +-
 .../res/values-ru-rRU/preference_editor.xml   |  24 ++--
 xabber/src/main/res/values-ru-rRU/words.xml   |   6 +-
 .../main/res/values-ru-rRU/xabber_account.xml | 121 ++++++++++++++----
 xabber/src/main/res/values/account_editor.xml |   4 +-
 11 files changed, 169 insertions(+), 67 deletions(-)

diff --git a/xabber/src/main/res/values-ru-rRU/account_editor.xml b/xabber/src/main/res/values-ru-rRU/account_editor.xml
index e63a7a9b62..4becdf8676 100644
--- a/xabber/src/main/res/values-ru-rRU/account_editor.xml
+++ b/xabber/src/main/res/values-ru-rRU/account_editor.xml
@@ -2,25 +2,26 @@
 <!--Generated by crowdin.com-->
 <resources>
   <string name="account_compression">Использовать сжатие</string>
-    <string name="account_host">Хост</string>
+  <string name="account_host">Хост</string>
   <string name="account_password">Пароль</string>
   <string name="confirm_password">Подтверждение пароля</string>
   <string name="account_port">Порт</string>
   <string name="account_priority">Приоритет</string>
   <string name="account_resource">Ресурс</string>
   <string name="account_server_name">Сервер</string>
-    <string name="account_xmpp_register_warning">Вы должны <a href="http://www.google.com/#q=зарегистрировать учётную запись XMPP">зарегистрировать учётную запись XMPP</a> перед тем, как добавить её в Xabber!</string>
-    <string name="account_user_name">Имя пользователя</string>
+  <string name="account_xmpp_register_warning">Вы должны <a href="http://www.google.com/#q=зарегистрировать учётную запись XMPP">зарегистрировать учётную запись XMPP</a> перед тем, как добавить её в Xabber!</string>
+  <string name="account_user_name">Имя пользователя</string>
   <string name="EMPTY_SERVER_NAME">Не указано имя сервера</string>
   <string name="EMPTY_USER_NAME">Не указано имя пользователя</string>
   <string name="CONFIRM_PASSWORD">Пароли не совпадают</string>
-    <string name="account_compression_summary">Отметьте для включения сжатия данных</string>
+  <string name="ACCOUNT_EXIST">Аккаунт с таким именем пользователя уже существует</string>
+  <string name="account_compression_summary">Отметьте для включения сжатия данных</string>
   <string name="account_custom">Указать хост вручную</string>
   <string name="account_custom_summary">Указать хост для подключения вручную вместо использования SRV записи</string>
-    <string name="account_invalid_port">Порт должен быть числом (значение по умолчанию: 5222)</string>
+  <string name="account_invalid_port">Порт должен быть числом (значение по умолчанию: 5222)</string>
   <string name="account_invalid_port_range">Порт должен быть числом между 1 и 65535 (значение по умолчанию: 5222)</string>
   <string name="account_invalid_priority">Приоритет должен быть между -128 и 127 (значение по умолчанию: 0)</string>
-    <string name="account_proxy_host">Хост для прокси</string>
+  <string name="account_proxy_host">Хост для прокси</string>
   <string name="account_proxy_invalid_port_range">Порт для прокси должен быть числом между 1 и 65535 (по-умолчанию 8080)</string>
   <string name="account_proxy_invalid_port">Порт для прокси должен быть числом (по-умолчанию 8080)</string>
   <string name="account_proxy_password">Пароль для прокси</string>
@@ -32,14 +33,16 @@
   <string name="account_sasl_summary">Отключите эту опцию для подключения к очень старому серверу</string>
   <string name="account_store_password">Хранить пароль</string>
   <string name="account_store_password_summary">Отключение приведет к запросу пароля при каждом подключении</string>
-    <string name="account_tls_enable">Использовать TLS</string>
+  <string name="account_tls_enable">Использовать TLS</string>
   <string name="account_tls_enable_summary">Использовать TLS шифрование если поддерживается сервером</string>
   <string name="account_tls_legacy">Старый SSL</string>
   <string name="account_tls_legacy_summary">Использовать старый SSL метод шифрования соединения с сервером</string>
   <string name="account_tls_mode">Использование TLS/SSL</string>
   <string name="account_tls_require">Требовать TLS</string>
   <string name="account_tls_require_summary">Требовать TLS шифрование при подключении к серверу</string>
-    <string name="INCORRECT_USER_NAME">Неправильное имя пользователя. Просмотрите подсказку внизу экрана</string>
+  <string name="account_enable_tls">Включить протокол шифрования TLS</string>
+  <string name="account_use_tor">Подключаться через анонимную сеть TOR (необходим Orbot proxy)</string>
+  <string name="INCORRECT_USER_NAME">Неправильное имя пользователя. Просмотрите подсказку внизу экрана</string>
   <string name="orbot_required_message">Для использования TOR необходимо установить приложение Orbot и активировать в нём передачу данных. Вы хотите установить его из Google Play?</string>
   <string name="orbot_required_title">Установить Orbot?</string>
   <string name="install_orbot">Установить Orbot</string>
@@ -69,9 +72,10 @@
   <string name="blocked_contacts_not_supported">Блокировка контактов не поддерживается сервером.</string>
   <string name="blocked_contacts_empty">Нет заблокированных контактов.</string>
   <plurals name="blocked_contacts_number">
-    <item quantity="one">%d контакт заблокирован.</item>
-    <item quantity="few">%d контакта заблокировано.</item>
-    <item quantity="other">%d контактов заблокировано.</item>
+    <item quantity="one">%d контакт заблокирован</item>
+    <item quantity="few">%d контакта заблокировано</item>
+    <item quantity="many">%d контактов заблокировано</item>
+    <item quantity="other">%d контактов заблокировано</item>
   </plurals>
   <string name="account_chat_history">История сообщений</string>
   <string name="account_history_options_summary">Настройки хранения истории сообщений</string>
diff --git a/xabber/src/main/res/values-ru-rRU/chat_viewer.xml b/xabber/src/main/res/values-ru-rRU/chat_viewer.xml
index f357801c3e..6aa5e5af82 100644
--- a/xabber/src/main/res/values-ru-rRU/chat_viewer.xml
+++ b/xabber/src/main/res/values-ru-rRU/chat_viewer.xml
@@ -21,8 +21,8 @@
   <string name="message_remove">Удалить из истории</string>
   <string name="message_repeat">Повторить отправку</string>
   <string name="message_otr_show_original">Показать сообщение</string>
-    <string name="save_history">Сохранять локальную историю сообщений\nХранить историю переписки на устройстве</string>
-    <string name="action_attention_called">Сообщение для привлечения внимания было отправлено</string>
+  <string name="save_history">Сохранять локальную историю сообщений\nХранить историю переписки на устройстве</string>
+  <string name="action_attention_called">Сообщение для привлечения внимания было отправлено</string>
   <string name="action_attention_requested">Вас окликнули</string>
   <string name="action_ban">%1$s был забанен</string>
   <string name="action_ban_by">%2$s забанил %1$s</string>
@@ -71,7 +71,7 @@
   <string name="otr_refresh">Заново начать шифрование</string>
   <string name="otr_request">Собеседник запросил OTR шифрование беседы, но у вас не установлен плагин, который его поддерживает. Используйте Pidgin или Adium для PC/Mac и Xabber или GibberBot для Android. Посетите http://otr.cypherpunks.ca/ для получения более полной информации.</string>
   <string name="otr_start">Начать шифрование</string>
-    <string name="otr_unreadable_message">Зашифрованное сообщение, отправленное Вами, невозможно прочитать</string>
+  <string name="otr_unreadable_message">Зашифрованное сообщение, отправленное Вами, невозможно прочитать</string>
   <string name="otr_not_decrypted_message">Сообщение не может быть расшифровано</string>
   <string name="otr_verification">Проверка личности OTR</string>
   <string name="otr_verify_fingerprint">Проверка отпечатком пальца</string>
@@ -84,14 +84,15 @@
   <string name="otr_verification_progress_title">Идёт подтверждение подлинности сеанса OTR</string>
   <string name="otr_verification_notify_button">ОТКРЫТЬ</string>
   <string name="otr_verification_notify_button_cancel">ОТМЕНИТЬ</string>
-    <string name="chat_events_show_text_global">Использовать глобальные настройки</string>
+  <string name="chat_events_show_text_global">Использовать глобальные настройки</string>
   <string name="chat_events_show_text_always">Отображать текст сообщения</string>
   <string name="chat_events_show_text_never">Скрывать текст сообщения</string>
-    <string name="error_sending_file">Ошибка при отправке файла %s</string>
-    <string name="could_not_get_path_to_file">Не удалось найти путь к файлу</string>
+  <string name="error_sending_file">Ошибка при отправке файла %s</string>
+  <string name="could_not_get_path_to_file">Не удалось найти путь к файлу</string>
   <string name="message_open_private_chat">Начать личный чат</string>
-    <string name="no_permission_to_read_files">Нет разрешения на чтение файлов</string>
+  <string name="no_permission_to_read_files">Нет разрешения на чтение файлов</string>
   <string name="no_permission_to_write_files">Нет разрешения на сохранение файлов</string>
+  <string name="no_permission_to_camera">Нет доступа к камере</string>
   <string name="error_description_title">Сообщение об ошибке:</string>
   <string name="message_status_sent">Отправлено</string>
   <string name="message_status_delivered">Доставлено</string>
@@ -99,6 +100,7 @@
   <string name="message_status_error">Ошибка</string>
   <string name="message_status_forwarded">Отправлено с другого устройства</string>
   <string name="message_status_not_sent">Отправляется</string>
+  <string name="too_many_files_at_once">Нельзя отправить больше 10 файлов за раз</string>
   <string name="toast_no_history">В истории больше нет сообщений</string>
   <string name="muc_role_moderator">Модератор</string>
   <string name="muc_role_participant">Участник</string>
@@ -110,4 +112,10 @@
   <string name="button_join_conference">Присоединиться</string>
   <string name="showcase_chat_text_1">Смахните вправо чтобы открыть список недавних чатов</string>
   <string name="showcase_chat_text_2">Смахните влево чтобы увидеть данные собеседника</string>
+  <string name="action_copy_link">Скопировать ссылку</string>
+  <string name="action_download">Скачать</string>
+  <string name="action_image_saved">Изображение сохранено</string>
+  <string name="toast_link_copied">Ссылка скопирована в буфер обмена</string>
+  <string name="toast_could_not_open_file">Не удалось открыть файл</string>
+  <string name="uploaded_files_count">Загрузка.. %s</string>
 </resources>
diff --git a/xabber/src/main/res/values-ru-rRU/contact_editor.xml b/xabber/src/main/res/values-ru-rRU/contact_editor.xml
index e9159cbc70..6afb1e31bd 100644
--- a/xabber/src/main/res/values-ru-rRU/contact_editor.xml
+++ b/xabber/src/main/res/values-ru-rRU/contact_editor.xml
@@ -17,7 +17,7 @@
   <string name="processing_image">Обработка изображения...</string>
   <string name="error_during_crop">Ошибка во время кадрирования изображения</string>
   <string name="error_during_image_processing">Ошибка во время обработки изображения</string>
-    <string name="account_server_info">Информация о сервере</string>
+  <string name="account_server_info">Информация о сервере</string>
   <string name="account_server_info_description">Список возможностей сервера</string>
   <string name="conference_private_chat_invitation">%1$s из %2$s хочет начать личный чат с вами</string>
   <string name="accept_muc_private_chat">Принять</string>
diff --git a/xabber/src/main/res/values-ru-rRU/contact_list.xml b/xabber/src/main/res/values-ru-rRU/contact_list.xml
index e1f89f7592..394d37465f 100644
--- a/xabber/src/main/res/values-ru-rRU/contact_list.xml
+++ b/xabber/src/main/res/values-ru-rRU/contact_list.xml
@@ -19,13 +19,13 @@
   <string name="application_state_roster">Подключено...</string>
   <string name="application_state_starting">Идет запуск приложения ...</string>
   <string name="application_state_waiting">Ожидание подключения...</string>
-    <string name="chat_viewer">Чат</string>
-    <string name="CONNECTION_FAILED">Ошибка подключения</string>
+  <string name="chat_viewer">Чат</string>
+  <string name="CONNECTION_FAILED">Ошибка подключения</string>
   <string name="contact_add">Добавить контакт</string>
   <string name="contact_delete">Удалить</string>
   <string name="contact_block">Заблокировать контакт</string>
   <string name="contact_delete_confirm">Вы действительно хотите удалить контакт %1$s из учетной записи %2$s?</string>
-    <string name="discard_subscription">Запретить подписку</string>
+  <string name="discard_subscription">Запретить подписку</string>
   <string name="archive_chat">Архивировать</string>
   <string name="unarchive_chat">Разархивировать</string>
   <string name="mute_chat">Выключить уведомления</string>
@@ -43,7 +43,7 @@
   <string name="action_send_contact">Отправить контакт</string>
   <string name="XMPP_EXCEPTION">Ошибка соединения</string>
   <string name="application_state_closing">Сохранение изменений...\nПриложение скоро закроется.</string>
-    <string name="group_room">Конференции</string>
+  <string name="group_room">Конференции</string>
   <string name="OTR_ERROR">Ошибка OTR</string>
   <string name="select_contact">Выберите нужный контакт</string>
   <string name="show_offline_always">Всегда отображать</string>
@@ -58,7 +58,7 @@
   <string name="block_list">Черный список</string>
   <string name="contact_blocked_successfully">Контакт успешно заблокирован</string>
   <string name="error_blocking_contact">Не удалось заблокировать контакт</string>
-    <string name="contacts_unblocked_successfully">Контакты успешно разблокированы</string>
+  <string name="contacts_unblocked_successfully">Контакты успешно разблокированы</string>
   <string name="error_unblocking_contacts">Не удалось разблокировать контакты</string>
   <string name="block_contact_confirm">Вы действительно хотите удалить контакт %1$s из учетной записи %2$s?</string>
   <string name="unblock_all_contacts_confirm">Вы действительно хотите разблокировать все контакты из аккаунта %1$s?</string>
@@ -70,10 +70,10 @@
   <string name="dark_theme_suggest_dialog_stay_on_light_side">Светлая</string>
   <string name="battery_optimization_disable_dialog_title">Оптимизация расхода аккумулятора</string>
   <string name="battery_optimization_disable_dialog_message">Ваше устройство оптимизирует расход батареи, что может привести к задержкам в доставке сообщений или их потере.\n\nСейчас вам предложат отключить оптимизацию.</string>
-    <string name="clear_log">Удалить старые файлы журнала</string>
+  <string name="clear_log">Удалить старые файлы журнала</string>
   <string name="open_log_file">Открыть</string>
   <string name="send_log_file">Отправить</string>
-    <string name="synchronize_bookmarks">Синхронизировать закладки</string>
+  <string name="synchronize_bookmarks">Синхронизировать закладки</string>
   <string name="remove_all_bookmarks">Удалить все</string>
   <string name="remove_selected_bookmarks">Удалить выбранные</string>
   <string name="remove_all_bookmarks_confirm">Вы действительно хотите удалить все закладки учётной записи %1$s?</string>
@@ -89,5 +89,12 @@
   <string name="all_chats">Все чаты</string>
   <string name="no_messages">Нет сообщений</string>
   <string name="show_all_chats">Показать все чаты</string>
+  <string name="category_title_contacts">Контакты</string>
   <string name="showcase_contact_list_text_1">Смахните влево или вправо чтобы поместить чат в архив</string>
+  <string name="last_seen_now">был в сети только что</string>
+  <string name="last_seen_minutes">был в сети %1$s минут назад</string>
+  <string name="last_seen_hours">был в сети час назад</string>
+  <string name="last_seen_today">был в сети в %1$s</string>
+  <string name="last_seen_yesterday">был в сети вчера в %1$s</string>
+  <string name="last_seen_date">был в сети %1$s</string>
 </resources>
diff --git a/xabber/src/main/res/values-ru-rRU/contact_viewer.xml b/xabber/src/main/res/values-ru-rRU/contact_viewer.xml
index 379e000a5b..de0eac0324 100644
--- a/xabber/src/main/res/values-ru-rRU/contact_viewer.xml
+++ b/xabber/src/main/res/values-ru-rRU/contact_viewer.xml
@@ -17,9 +17,9 @@
   <string name="vcard_organization_unit">Отдел</string>
   <string name="vcard_title">Должность</string>
   <string name="vcard_role">Должностные функции</string>
-    <string name="vcard_decsription">Описание</string>
+  <string name="vcard_decsription">Описание</string>
   <string name="vcard_note">Заметки</string>
-    <string name="vcard_address_pobox">Почтовый ящик</string>
+  <string name="vcard_address_pobox">Почтовый ящик</string>
   <string name="vcard_address_extadr">Дополнительный адрес</string>
   <string name="vcard_address_street">Улица</string>
   <string name="vcard_address_locality">Город</string>
diff --git a/xabber/src/main/res/values-ru-rRU/muc_editor.xml b/xabber/src/main/res/values-ru-rRU/muc_editor.xml
index f012262e97..58a5a27f67 100644
--- a/xabber/src/main/res/values-ru-rRU/muc_editor.xml
+++ b/xabber/src/main/res/values-ru-rRU/muc_editor.xml
@@ -20,10 +20,10 @@
   <string name="muc_invite_confirm">%2$s приглашает вас подключиться к конференции %3$s. Подключиться с учетной записи %1$s?</string>
   <string name="muc_invite_confirm_reason">%2$s приглашает вас подключиться к конференции %3$s: %4$s. Подключить к учетной записи %1$s?</string>
   <string name="muc_leave">Покинуть конференцию</string>
-    <string name="muc_choose_conference">Выберите конференцию</string>
+  <string name="muc_choose_conference">Выберите конференцию</string>
   <string name="muc_next">Далее</string>
   <string name="muc_get_hosted_conferences">Получить список конференций</string>
   <string name="muc_error_getting_conferences">Ошибка при получении списка конференций</string>
   <string name="muc_type_conference_name">Введите имя конференции</string>
-    <string name="conference_invitation">Приглашение в конференцию</string>
+  <string name="conference_invitation">Приглашение в конференцию</string>
 </resources>
diff --git a/xabber/src/main/res/values-ru-rRU/notification_bar.xml b/xabber/src/main/res/values-ru-rRU/notification_bar.xml
index afd581152a..0ca33e4f0b 100644
--- a/xabber/src/main/res/values-ru-rRU/notification_bar.xml
+++ b/xabber/src/main/res/values-ru-rRU/notification_bar.xml
@@ -34,7 +34,7 @@
   <!-- Used for plural form in russian. -->
   <string name="connection_state_waiting_5">%1$d из %2$d %3$s ожидают переподключения </string>
   <string name="connection_state_offline">%1$d %2$s не в сети</string>
-    <string name="muc_invite_message">Вы хотите подключиться к конференции?</string>
+  <string name="muc_invite_message">Вы хотите подключиться к конференции?</string>
   <string name="otr_verification_in_progress">Нажмите, чтобы прервать.</string>
   <string name="PASSWORD_REQUIRED">Требуется ввести пароль</string>
   <string name="pay_attention">Вас окликнули</string>
diff --git a/xabber/src/main/res/values-ru-rRU/preference_editor.xml b/xabber/src/main/res/values-ru-rRU/preference_editor.xml
index 835b3ec4cd..8259e7674b 100644
--- a/xabber/src/main/res/values-ru-rRU/preference_editor.xml
+++ b/xabber/src/main/res/values-ru-rRU/preference_editor.xml
@@ -12,14 +12,15 @@
   <string name="contacts_order_alphabet">По алфавиту</string>
   <string name="contacts_order_status">По статусу</string>
   <string name="contacts_show_accounts">Группировать по учетным записям\nПозволяет группировать собеседников по учетным записям</string>
-    <string name="contacts_show_avatars">Отображать аватары\nПозволяет видеть аватары собеседников в списке контактов</string>
+  <string name="contacts_show_avatars">Отображать аватары\nПозволяет видеть аватары собеседников в списке контактов</string>
   <string name="contacts_show_messages">Отображать сообщения\nПозволяет видеть сообщения пользователей в списке контактов</string>
   <string name="contacts_show_empty_groups">Отображать пустые группы\nОтображать группы даже если в них нет контактов</string>
   <string name="contacts_show_groups">Отображать группы\nПозволяет группировать собеседников по группам</string>
   <string name="contacts_show_offline">Отображать оффлайн контакты\nОтображать собеседников не в сети</string>
-    <string name="debug_log">Журнал отладки\nВыводить отладочные сообщения в журнал отладки (перезапустите приложение для применения настройки)</string>
+  <string name="debug_log">Журнал отладки\nВыводить отладочные сообщения в журнал отладки (перезапустите приложение для применения настройки)</string>
   <string name="debug_file_log_title">Вести журнал\nЗаписывать отладочную информацию в файл на устройстве (вы можете им поделится).</string>
   <string name="debug_log_files_title">Файлы журнала\nСписок записанных файлов журнала.</string>
+  <string name="debug_download_all_messages_title">Загрузить все сообщения из архива\nФункция отладки. Может работать с ошибками</string>
   <string name="debug_log_files_activity_title">Файлы журнала</string>
   <string name="debug_connection_errors_title">Отображать ошибки соединения\nПоказывать ошибки соединения во всплывающих окнах.</string>
   <string name="debug_crash_reports_title">Сбор диагностической информации\nРазрешив сбор информации о сбоях вы поможете разработчикам улучшить Xabber (пожалуйста, перезапустите приложение, чтобы применить изменения).</string>
@@ -34,7 +35,7 @@
   <string name="interface_theme">Тема</string>
   <string name="interface_theme_dark">Темная</string>
   <string name="interface_theme_light">Светлая</string>
-    <string name="interface_smiles">Графические смайлы</string>
+  <string name="interface_smiles">Графические смайлы</string>
   <string name="interface_smiles_android">Стандартные смайлы</string>
   <string name="interface_smiles_none">Отключить графические смайлы</string>
   <string name="preference_connection">Настройки подключения\nНастройки вариантов подключения</string>
@@ -59,7 +60,8 @@
   <string name="chats_font_size_xlarge">Огромный</string>
   <string name="chats_hide_keyboard">Скрывать клавиатуру</string>
   <string name="chats_hide_keyboard_landscape">В ландшафтном режиме</string>
-    <string name="chats_show_avatars">Аватары в сообщениях\nОтображать пользовательские изображения в каждом сообщении</string>
+  <string name="chats_show_avatars">Аватарки в окне чата\nОтображать аватарки рядом с каждым сообщением</string>
+  <string name="chats_show_avatars_muc">Аватарки в конференциях\nОтображать аватарки рядом с каждым сообщением в конференции</string>
   <string name="chats_show_status_change">Отображать изменения статуса</string>
   <string name="chats_show_status_change_muc">В конференциях</string>
   <string name="chats_state_notification">Уведомлять о наборе текста\nУведомлять собеседника о наборе текста</string>
@@ -73,24 +75,24 @@
   <string name="contacts_reset_offline">Сброс настроек оффлайн\nОчистить индивидуальные настройки отображения контактов не в сети для групп и учетных записей</string>
   <string name="contacts_reset_offline_warning">Вы действительно хотите очистить индивидуальные настройки отображения контактов не в сети для групп и учетных записей?</string>
   <string name="events_first_only">Извещение только о первом сообщении в чате\nИзвещать только о первом входящем сообщении в чате</string>
-    <string name="events_show_text">Предпросмотр сообщений\nОтображать текст сообщений</string>
+  <string name="events_show_text">Предпросмотр сообщений\nОтображать текст сообщений</string>
   <string name="events_show_text_muc">Предпросмотр сообщений\nОтображать текст сообщений из групповых чатов</string>
-    <string name="events_suppress_100">Игнорировать некоторые сообщения\nНе получать служебные сообщения о неанонимности конференции</string>
+  <string name="events_suppress_100">Игнорировать некоторые сообщения\nНе получать служебные сообщения о неанонимности конференции</string>
   <string name="negative_priotiry_summary">%s (вы не будете получать сообщения)</string>
   <string name="preference_accounts">Учетные записи XMPP\nУправление учетными записями</string>
   <string name="preference_security">Безопасность\nНастройки безопасности</string>
   <string name="security_check_certificate">Проверка сертификата сервера\nОповещать о проблемах с сертификатами во время шифрованного подключения</string>
-    <string name="security_otr_mode">Режим OTR шифрования</string>
+  <string name="security_otr_mode">Режим OTR шифрования</string>
   <string name="chats_attention">Привлечение внимания\nОтзываться на запросы привлечения внимания</string>
   <string name="chats_attention_sound">Звук привлечения внимания\nВыберите мелодию звонка</string>
   <string name="connection_load_vcard">Загружать vCard\nЗагружать и обновлять персональную информацию и аватары контактов. Отключение поможет сэкономить трафик.</string>
   <string name="connection_load_images">Загружать изображения\nЗагружать изображения по ссылкам автоматически. Отключите для экономии трафика.</string>
   <string name="connection_use_carbons">Сообщения carbons\nПринимать сообщения других сессий Вашей учетной записи. Отключение поможет сэкономить трафик.</string>
-    <string name="connection_dns_resolver_type_dns_java_resolver">DNSJavaResolver</string>
+  <string name="connection_dns_resolver_type_dns_java_resolver">DNSJavaResolver</string>
   <string name="connection_dns_resolver_type_mini_dns_resolver">MiniDNSResolver (экспериментальный)</string>
-    <string name="events_phrases">Ключевые фразы\nНастройки уведомлений о сообщениях содержащих ключевые фразы</string>
-    <string name="account_error_settings">Настройки</string>
-    <string name="category_interface">Интерфейс</string>
+  <string name="events_phrases">Ключевые фразы\nНастройки уведомлений о сообщениях содержащих ключевые фразы</string>
+  <string name="account_error_settings">Настройки</string>
+  <string name="category_interface">Интерфейс</string>
   <string name="category_settings">Настройки</string>
   <string name="category_about">О программе</string>
   <string name="category_appearance">Внешний вид</string>
diff --git a/xabber/src/main/res/values-ru-rRU/words.xml b/xabber/src/main/res/values-ru-rRU/words.xml
index 05ea028e9d..8e34c5d300 100644
--- a/xabber/src/main/res/values-ru-rRU/words.xml
+++ b/xabber/src/main/res/values-ru-rRU/words.xml
@@ -17,10 +17,14 @@
   <string name="save">Сохранить</string>
   <string name="cancel">Отмена</string>
   <string name="skip">Пропустить</string>
+  <string name="skip_anyway">Все равно продолжить</string>
+  <string name="warning">Внимание!</string>
   <string name="settings">Настройки</string>
   <string name="ok">ОК</string>
   <string name="login">Вход</string>
-    <string name="share">Поделиться</string>
+  <string name="share">Поделиться</string>
   <string name="send_to">Отправить:</string>
   <string name="got_it">Понял</string>
+  <string name="search">Поиск</string>
+  <string name="free">бесплатно</string>
 </resources>
diff --git a/xabber/src/main/res/values-ru-rRU/xabber_account.xml b/xabber/src/main/res/values-ru-rRU/xabber_account.xml
index d3530aa0ed..f1c2231d36 100644
--- a/xabber/src/main/res/values-ru-rRU/xabber_account.xml
+++ b/xabber/src/main/res/values-ru-rRU/xabber_account.xml
@@ -4,39 +4,69 @@
   <string name="xabber_account_info">Аккаунт Xabber требуется для использования сервисов Xabber и синхронизации настроек устройств.</string>
   <string name="social_sign_in">Социальная Авторизация</string>
   <string name="email_hint">Email</string>
-    <string name="forgot_pass">ЗАБЫЛИ ПАРОЛЬ?</string>
-    <string name="sync_success">Синхронизация прошла успешно</string>
+  <string name="forgot_pass">ЗАБЫЛИ ПАРОЛЬ?</string>
+  <string name="sync_success">Синхронизация прошла успешно</string>
   <string name="sync_fail">Ошибка синхронизации</string>
   <string name="quit_success">Вы вышли из аккаунта</string>
-    <string name="confirm_success">Email был успешно подтвержден</string>
-    <string name="resend_success">Email с подтверждением отправлен</string>
-    <string name="social_auth_fail">Ошибка социальной авторизации</string>
+  <string name="confirm_success">Емайл подтвержден</string>
+  <string name="delete_success">Email удален</string>
+  <string name="resend_success">Email с подтверждением отправлен</string>
+  <string name="social_auth_fail">Ошибка социальной авторизации</string>
   <string name="settings_delete_success">Настройки удалены</string>
-    <string name="toast_no_internet">Нет подключения к Интернет</string>
+  <string name="social_bind_success">Социальный аккаунт привязан</string>
+  <string name="social_bind_fail">Эта учетная запись уже связана с другим аккаунтом Xabber</string>
+  <string name="social_unbind_success">Социальный аккаунт отвязан</string>
+  <string name="social_unbind_fail">Не удалось отвязать социальный аккаунт</string>
+  <string name="toast_no_internet">Нет подключения к Интернет</string>
   <string name="progress_message">Пожалуйста, подождите</string>
   <string name="progress_title_sync">Синхронизация</string>
   <string name="progress_title_quit">Выход</string>
   <string name="progress_title_login">Вход</string>
   <string name="progress_title_signup">Регистрация</string>
   <string name="progress_title_confirm">Подтверждение</string>
-    <string name="progress_title_resend">Повторная отправка email</string>
+  <string name="progress_title_resend">Повторная отправка email</string>
+  <string name="progress_title_delete">Удалить Email</string>
   <string name="progress_title_delete_settings">Удаление настроек</string>
-  <string name="hint_username">username</string>
-    <string name="title_xabber_account">Аккаунт Xabber</string>
-    <string name="title_email_confirm">Подтвердите адрес email</string>
-    <string name="title_complete_register">Завершение регистрации</string>
-    <string name="title_start_messaging">Начните общение!</string>
+  <string name="progress_title_bind_social">Аутентификация..</string>
+  <string name="progress_title_unbind_social">Отвязать социальную сеть</string>
+  <string name="progress_title_account_list">Загрузка списка учетных записей..</string>
+  <string name="progress_title_connect">Вход в аккаунт Xabber</string>
+  <string name="hint_username">Имя пользователя</string>
+  <string name="hint_old_pass">Старый пароль</string>
+  <string name="hint_pass">Новый пароль</string>
+  <string name="hint_confirm_pass">Подтвердите пароль</string>
+  <string name="label_xmpp_id">Действительный XMPP ID</string>
+  <string name="title_xabber_account">Аккаунт Xabber</string>
+  <string name="title_email_confirm">Подтвердите адрес Email</string>
+  <string name="title_complete_register">Завершение регистрации</string>
+  <string name="title_start_messaging">Начните общение!</string>
   <string name="title_reordering_account">Порядок аккаунтов</string>
   <string name="title_sync">Синхронизированные аккаунты</string>
-  <string name="title_login_xabber_account">Авторизация</string>
+  <string name="title_add_email">Привязать Email</string>
+  <string name="title_verified_email">Подтверждённый адрес Email</string>
+  <string name="title_unverified_email">Неподтверждённый адрес Email</string>
+  <string name="title_not_linked_account">Не связан</string>
+  <string name="title_linked_account">Связанный %1$s аккаунт</string>
+  <string name="title_no_linked_accounts">Нет связанных социальных или Email аккаунтов</string>
+  <string name="title_linked_accounts">Связанные социальные и Email аккаунты</string>
+  <string name="title_select_xmpp_account">Выберите XMPP аккаунт</string>
+  <string name="title_delete_email">Вы хотите отвязать этот Email от аккаунта Xabber?</string>
+  <string name="title_delete_social">Вы хотите отвязать учетную запись %1$s от аккаунта Xabber?</string>
+  <string name="title_login_xabber_account">Вход</string>
   <string name="title_register_xabber_account">Регистрация</string>
   <string name="summary_xabber_account_in_login">Аккаунт Xabber требуется для использования сервисов Xabber и синхронизации настроек устройств.</string>
-    <string name="button_quit">Выход</string>
+  <string name="button_connect">ПОДКЛЮЧИТЬ</string>
+  <string name="button_advanced_options">ДОПОЛНИТЕЛЬНЫЕ ПАРАМЕТРЫ</string>
+  <string name="button_hide_options">СКРЫТЬ ПАРАМЕТРЫ</string>
+  <string name="button_quit">Выход</string>
   <string name="button_login">ВХОД</string>
   <string name="button_registration">РЕГИСТРАЦИЯ</string>
   <string name="button_resend_link">ОТПРАВИТЬ КОД</string>
-    <string name="button_confirm">подтвердить</string>
-    <string name="button_sync">Синхронизировать</string>
+  <string name="button_confirm">подтвердить</string>
+  <string name="button_sync">Синхронизировать</string>
+  <string name="button_change_pass">Изменить пароль</string>
+  <string name="button_reset_pass">Сбросить пароль</string>
+  <string name="button_set_pass">Установить пароль</string>
   <string name="btn_done">закончить</string>
   <string name="not_login">Вход не выполнен</string>
   <string name="enter_password">Пожалуйста, введите пароль для этого аккаунта</string>
@@ -44,31 +74,78 @@
   <string name="last_sync_date">Последняя синхронизация: %1$s</string>
   <string name="last_sync_date_never">никогда</string>
   <string name="sync_all">Синхронизировать все</string>
-    <string name="no_username">нет имени пользователя</string>
+  <string name="sync_all_description">Настройки всех аккаунтов и их порядок будут автоматически синхронизированы с другими устройствами</string>
+  <string name="no_username">нет имени пользователя</string>
+  <string name="no_phone">нет телефона</string>
   <string name="empty_field">Поле не заполнено</string>
   <string name="pass_too_short">Пароль должен быть длиннее 4 символов</string>
   <string name="passwords_not_match">Пароли не совпадают</string>
   <string name="username_rules">Имя пользователя может содержать только строчные латинские буквы, цифры и точки</string>
   <string name="username_rules_first_symbol">Имя пользователя должно начинаться с буквы</string>
   <string name="username_rules_dots">Имя пользователя не может содержать две точки подряд</string>
+  <string name="sync_security_description">Пароли не синхронизируются и не могут быть скомпрометированы, но Вам придется самостоятельно вводить пароли на всех устройствах (кроме тех случаев, когда подключение происходит с помощью токенов)</string>
+  <string name="xmpp_auth_description">Выберите XMPP аккаунт который будет использован для входа в аккаунт Xabber. Осуществляя вход Вы соглашаетесь с нашей политикой по обработке персональных данных и с условиями оказания услуг.</string>
+  <string name="xmpp_auth_no_account">Все Ваши XMPP аккаунты отключены</string>
   <string name="sync_with_xabber_account">Синхронизация с аккаунтом Xabber</string>
   <string name="delete_synced_accounts">Удалить синхронизированные XMPP аккаунты с этого устройства?</string>
   <string name="delete_synced_account">Удалить аккаунт %1$s с этого устройства?</string>
   <string name="delete_settings">Удалить синхронизированные настройки этого XMPP аккаунта с сервера Xabber?</string>
   <string name="logout_summary">Вы выйдете из аккаунта Xabber. Вы не сможете использовать расширенные сервисы Xabber, но обычные XMPP аккаунты будут работать как обычно.</string>
   <string name="delete_settings_summary">Синхронизированные настройки этого XMPP аккаунта будут удалены с сервера Xabber</string>
-    <string name="reorder_summary">Для синхронизации порядка аккаунтов необходимо активировать опцию «Синхронизировать все» в настройках аккаунта Xabber</string>
-    <string name="delete_settings_button">Удалить настройки</string>
+  <string name="logout_error">Не удалось выйти</string>
+  <string name="signup_with_social">Ваш %1$s аккаунт будет связан с регистрируемой учётной записью</string>
+  <string name="auth_google_error">Авторизация с помощью Google не удалась</string>
+  <string name="auth_facebook_error">Авторизация с помощью Facebook не удалась</string>
+  <string name="auth_twitter_error">Авторизация с помощью Twitter не удалась</string>
+  <string name="auth_facebook_cancel">Авторизация с помощью Facebook отменена</string>
+  <string name="action_connect">СВЯЗАТЬ</string>
+  <string name="action_disconnect">ОТВЯЗАТЬ</string>
+  <string name="action_verify">ПОДТВЕРДИТЬ</string>
+  <string name="reorder_summary">Для синхронизации порядка аккаунтов необходимо активировать опцию «Синхронизировать все» в настройках аккаунта Xabber</string>
+  <string name="delete_settings_button">Удалить настройки</string>
   <string name="account_sync_enable_summary">Включить синхронизацию</string>
   <string name="sync_status_no">Не синхронизован</string>
   <string name="sync_status_local">Локальные настройки будут загружены на сервер</string>
   <string name="sync_status_remote">Настройки будут загружены с сервера</string>
   <string name="sync_status_ok">Синхронизирован</string>
-  <string name="sync_status_deleted">Настройки были удалены с сервера</string>
+  <string name="sync_status_deleted">Локальные настройки будут удалены</string>
   <string name="sync_status_not_allowed">Синхронизация недоступна</string>
   <string name="sync_status_enabled">Синхронизация включена</string>
   <string name="sync_status_disabled">Синхронизация выключена</string>
+  <string name="tutorial_title_1">Добро пожаловать в Xabber</string>
+  <string name="tutorial_title_2">Открытые Стандарты</string>
+  <string name="tutorial_title_3">Мультимедиа Возможности</string>
+  <string name="tutorial_title_4">Приватность и Безопасность</string>
+  <string name="tutorial_title_5">На Всех Платформах</string>
+  <string name="tutorial_title_6">Идеальная Синхронизация</string>
+  <string name="tutorial_title_7">Федерируемая Сеть</string>
+  <string name="tutorial_title_8">Социальная Авторизация</string>
+  <string name="tutorial_title_9">Открытый Исходный Код</string>
+  <string name="tutorial_description_1">Свободный XMPP клиент для Android с поддержкой нескольких аккаунтов</string>
+  <string name="tutorial_description_2">Вы не попадете в зависимость от единственного поставщика услуги. Xabber работает с любым стандартным XMPP сервером</string>
+  <string name="tutorial_description_3">Отправляйте изображения, видео и аудио файлы, голосовые сообщения, просматривая их прямо в окне чата</string>
+  <string name="tutorial_description_4">Для максимальной безопасности, используйте для общения оконечное шифрование и надежные сервера с хорошей репутацией</string>
+  <string name="tutorial_description_5">Версии Xabber одинаково хорошо работают в браузерах и на мобильных устройствах всех типов</string>
+  <string name="tutorial_description_6">С помощью аккаунта Xabber можно легко синхронизировать настройки приложения между своими устройствами</string>
+  <string name="tutorial_description_7">Вы можете использовать один сервер и общаться с пользователями, использующими другие сервера</string>
+  <string name="tutorial_description_8">Социальная аутентификация позволяет быстро войти в Xabber и сразу загрузить все свои аккаунты и настройки на новое устройство</string>
+  <string name="tutorial_description_9">Работа по разработке Xabber организована через GitHub. Мы рады всем участникам проекта: разработчикам, переводчикам, тестерам</string>
   <string name="account_deleted">Используемый аккаунт Xabber был удалён</string>
-    <string name="sync_not_allowed_summary">Аккаунты с нестандартными настройками (нестандартный порт, старый SSL, прокси) не могут быть синхронизированы.</string>
-    <string name="no_phone">телефон не указан</string>
+  <string name="sync_not_allowed_summary">Аккаунты с нестандартными настройками (нестандартный порт, старый SSL, прокси) не могут быть синхронизированы.</string>
+  <string name="xmpp_confirm_title">Введите код подтверждения, отправленный на %1$s</string>
+  <string name="xaccount_not_exist">Будет создан новый аккаунт</string>
+  <string name="xaccount_exist">Аккаунт Xabber уже создан</string>
+  <string name="title_signup_step_1">Шаг 1 из 4. Выберите имя пользователя и домен</string>
+  <string name="title_signup_step_2">Шаг 2 из 4. Установите пароль</string>
+  <string name="title_signup_step_3">Шаг 3 из 4. Политика конфиденциальности</string>
+  <string name="title_signup_step_4">Шаг 4 из 4. Обезопасьте свой аккаунт</string>
+  <string name="title_login_email">Войти с помощью Email</string>
+  <string name="accept_license">Согласиться с политикой конфиденциальности</string>
+  <string name="account_secure_description"><![CDATA[Обезопасьте свой аккаунт, связав его <i>по крайней мере с одним</i> социальным или Email аккаунтом. Если Вы не сделаете этого, то при утере пароля навсегда потеряете доступ к созданной учётной записи!]]></string>
+  <string name="account_secure_warning">Если Вы не привяжете емайл или социальный аккаунт, то можете навсегда утратить доступ к своему XMPP аккаунту</string>
+  <string name="password_changed_success">Пароль изменен</string>
+  <string name="password_changed_fail">Не удалось изменить пароль</string>
+  <string name="password_reset_success">Запрос на сброс пароля отправлен. Проверьте %1$s</string>
+  <string name="password_reset_fail">Не удалось отправить запрос на смену пароля</string>
+  <string name="password_reset_need_email">Для сброса пароля необходим подтвержденный адрес email</string>
 </resources>
diff --git a/xabber/src/main/res/values/account_editor.xml b/xabber/src/main/res/values/account_editor.xml
index 1fc2c44e25..e032942acf 100644
--- a/xabber/src/main/res/values/account_editor.xml
+++ b/xabber/src/main/res/values/account_editor.xml
@@ -75,8 +75,8 @@
     <string name="blocked_contacts_empty">No blocked contacts.</string>
 
     <plurals name="blocked_contacts_number">
-        <item quantity="one">%d contact blocked.</item>
-        <item quantity="other">%d contacts blocked.</item>
+        <item quantity="one">%d contact blocked</item>
+        <item quantity="other">%d contacts blocked</item>
     </plurals>
 
     <string name="account_chat_history">Chat history</string>

From efb4728bd0724223ab11fe3b4e83c0492b496873 Mon Sep 17 00:00:00 2001
From: Valery Miller <valera_miller94@mail.ru>
Date: Mon, 15 Oct 2018 17:06:53 +0500
Subject: [PATCH 242/251] Up version to 530

---
 xabber/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/xabber/build.gradle b/xabber/build.gradle
index fc70819f8e..4006849a43 100644
--- a/xabber/build.gradle
+++ b/xabber/build.gradle
@@ -10,8 +10,8 @@ android {
     defaultConfig {
         minSdkVersion 15
         targetSdkVersion 28
-        versionCode 529
-        versionName '2.4.2(529)'
+        versionCode 530
+        versionName '2.4.2(530)'
     }
 
     lintOptions {

From a60b8b906c22c73f04de4d09830d5fdf241eac26 Mon Sep 17 00:00:00 2001
From: Valery Miller <valera_miller94@mail.ru>
Date: Fri, 19 Oct 2018 10:55:48 +0500
Subject: [PATCH 243/251] Changed api url

---
 .../java/com/xabber/android/data/xaccount/HttpApiManager.java  | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/xabber/src/main/java/com/xabber/android/data/xaccount/HttpApiManager.java b/xabber/src/main/java/com/xabber/android/data/xaccount/HttpApiManager.java
index 720acb52e3..925c9c49cf 100644
--- a/xabber/src/main/java/com/xabber/android/data/xaccount/HttpApiManager.java
+++ b/xabber/src/main/java/com/xabber/android/data/xaccount/HttpApiManager.java
@@ -19,8 +19,7 @@ public class HttpApiManager {
 
     public static final String XABBER_FORGOT_PASS_URL = "https://www.xabber.com/account/auth/forgot-password/";
 
-    //public static final String XABBER_API_URL = "https://api.xabber.com/api/v1/";
-    public static final String XABBER_API_URL = "https://api.dev.xabber.com/api/v2/";
+    public static final String XABBER_API_URL = "https://api.xabber.com/api/v2/";
     private static final String XABBER_COM_URL = "https://www.xabber.com/";
     private static IXabberApi xabberApi;
     private static IXabberCom xabberCom;

From b13be31f98db409b5bc0d609924b8e4fbf630157 Mon Sep 17 00:00:00 2001
From: Valery Miller <valera_miller94@mail.ru>
Date: Fri, 19 Oct 2018 11:01:06 +0500
Subject: [PATCH 244/251] Changes in tutorial

---
 .../android/ui/adapter/TutorialAdapter.java   | 20 ++++++-------------
 1 file changed, 6 insertions(+), 14 deletions(-)

diff --git a/xabber/src/main/java/com/xabber/android/ui/adapter/TutorialAdapter.java b/xabber/src/main/java/com/xabber/android/ui/adapter/TutorialAdapter.java
index a4c6f1d960..afa8b69cbf 100644
--- a/xabber/src/main/java/com/xabber/android/ui/adapter/TutorialAdapter.java
+++ b/xabber/src/main/java/com/xabber/android/ui/adapter/TutorialAdapter.java
@@ -14,7 +14,7 @@
  */
 
 public class TutorialAdapter extends FragmentPagerAdapter {
-    private static int PAGE_NUMBERS = 9;
+    private static int PAGE_NUMBERS = 5;
 
     public TutorialAdapter(FragmentManager fm) {
         super(fm);
@@ -24,23 +24,15 @@ public TutorialAdapter(FragmentManager fm) {
     public Fragment getItem(int position) {
         switch (position) {
             case 0:
-                return TutorialFragment.newInstance(R.string.tutorial_title_1, R.string.tutorial_description_1, R.drawable.art_tutorial_1);
+                return TutorialFragment.newInstance(R.string.tutorial_title_1, R.string.tutorial_description_1, R.drawable.art_welcome);
             case 1:
-                return TutorialFragment.newInstance(R.string.tutorial_title_2, R.string.tutorial_description_2, R.drawable.art_tutorial_2);
+                return TutorialFragment.newInstance(R.string.tutorial_title_2, R.string.tutorial_description_2, R.drawable.art_tutorial_1);
             case 2:
-                return TutorialFragment.newInstance(R.string.tutorial_title_3, R.string.tutorial_description_3, R.drawable.art_tutorial_3);
+                return TutorialFragment.newInstance(R.string.tutorial_title_6, R.string.tutorial_description_6, R.drawable.art_tutorial_3);
             case 3:
-                return TutorialFragment.newInstance(R.string.tutorial_title_4, R.string.tutorial_description_4, R.drawable.art_tutorial_4);
-            case 4:
-                return TutorialFragment.newInstance(R.string.tutorial_title_5, R.string.tutorial_description_5, R.drawable.art_tutorial_1);
-            case 5:
-                return TutorialFragment.newInstance(R.string.tutorial_title_6, R.string.tutorial_description_6, R.drawable.art_tutorial_2);
-            case 6:
-                return TutorialFragment.newInstance(R.string.tutorial_title_7, R.string.tutorial_description_7, R.drawable.art_tutorial_3);
-            case 7:
                 return TutorialFragment.newInstance(R.string.tutorial_title_8, R.string.tutorial_description_8, R.drawable.art_tutorial_4);
-            case 8:
-                return TutorialFragment.newInstance(R.string.tutorial_title_9, R.string.tutorial_description_9, R.drawable.art_tutorial_1);
+            case 4:
+                return TutorialFragment.newInstance(R.string.tutorial_title_9, R.string.tutorial_description_9, R.drawable.art_tutorial_2);
             default:
                 return null;
         }

From 0f7ebf1c4d8b92712bcbf5244a047827fec56876 Mon Sep 17 00:00:00 2001
From: Valery Miller <valera_miller94@mail.ru>
Date: Fri, 19 Oct 2018 14:11:04 +0500
Subject: [PATCH 245/251] Fixed some screens Up version to 531

---
 xabber/build.gradle                                       | 4 ++--
 xabber/src/main/res/layout/fragment_xaccount_login.xml    | 4 ++++
 xabber/src/main/res/layout/fragment_xaccount_signup_3.xml | 4 ++++
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/xabber/build.gradle b/xabber/build.gradle
index 4006849a43..9c3cae0f46 100644
--- a/xabber/build.gradle
+++ b/xabber/build.gradle
@@ -10,8 +10,8 @@ android {
     defaultConfig {
         minSdkVersion 15
         targetSdkVersion 28
-        versionCode 530
-        versionName '2.4.2(530)'
+        versionCode 531
+        versionName '2.4.2(531)'
     }
 
     lintOptions {
diff --git a/xabber/src/main/res/layout/fragment_xaccount_login.xml b/xabber/src/main/res/layout/fragment_xaccount_login.xml
index 28230d72ec..917e60fd0a 100644
--- a/xabber/src/main/res/layout/fragment_xaccount_login.xml
+++ b/xabber/src/main/res/layout/fragment_xaccount_login.xml
@@ -134,6 +134,10 @@
                 android:textColor="@color/grey_500"
                 android:text="@string/button_advanced_options"
                 android:layout_centerVertical="true"
+                android:layout_toLeftOf="@id/btnLogin"
+                android:layout_toStartOf="@id/btnLogin"
+                android:layout_alignParentLeft="true"
+                android:layout_alignParentStart="true"
                 />
 
             <Button
diff --git a/xabber/src/main/res/layout/fragment_xaccount_signup_3.xml b/xabber/src/main/res/layout/fragment_xaccount_signup_3.xml
index a5bdc7afd4..87a02f9d08 100644
--- a/xabber/src/main/res/layout/fragment_xaccount_signup_3.xml
+++ b/xabber/src/main/res/layout/fragment_xaccount_signup_3.xml
@@ -51,6 +51,10 @@
                 android:layout_gravity="center"
                 android:layout_centerVertical="true"
                 android:text="@string/accept_license"
+                android:layout_toLeftOf="@id/btnSignUp"
+                android:layout_toStartOf="@id/btnSignUp"
+                android:layout_alignParentStart="true"
+                android:layout_alignParentLeft="true"
                 />
 
             <Button

From 6e392f457c386b8e8bd63c9ff4afcb377b60c8c7 Mon Sep 17 00:00:00 2001
From: Valery Miller <valera_miller94@mail.ru>
Date: Fri, 19 Oct 2018 18:10:31 +0500
Subject: [PATCH 246/251] Fixed deeplink for confirmation email

---
 xabber/src/main/AndroidManifest.xml           |  19 ++--
 .../android/data/xaccount/HttpApiManager.java |   1 +
 .../android/ui/activity/DeepLinkActivity.java | 103 ++++++++++++++++++
 .../ui/activity/XabberAccountActivity.java    |   2 +-
 .../src/main/res/layout/activity_deeplink.xml |  13 +++
 5 files changed, 129 insertions(+), 9 deletions(-)
 create mode 100644 xabber/src/main/java/com/xabber/android/ui/activity/DeepLinkActivity.java
 create mode 100644 xabber/src/main/res/layout/activity_deeplink.xml

diff --git a/xabber/src/main/AndroidManifest.xml b/xabber/src/main/AndroidManifest.xml
index d1c8496b36..f6331af37e 100644
--- a/xabber/src/main/AndroidManifest.xml
+++ b/xabber/src/main/AndroidManifest.xml
@@ -528,9 +528,19 @@
         <activity android:name=".ui.activity.XabberLoginActivity"
             android:screenOrientation="portrait"
             android:theme="@style/Theme.Design.Light"/>
+
         <activity android:name=".ui.activity.XabberAccountActivity"
+            android:theme="@style/ThemeDark"/>
+
+        <activity android:name=".ui.activity.XAChangePassActivity" />
+        <activity android:name=".ui.activity.PatreonAppealActivity"
             android:theme="@style/ThemeDark">
+            <meta-data
+                android:name="android.support.PARENT_ACTIVITY"
+                android:value="com.xabber.android.ui.activity.ContactListActivity" />
+        </activity>
 
+        <activity android:name=".ui.activity.DeepLinkActivity" >
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
                 <category android:name="android.intent.category.DEFAULT" />
@@ -539,15 +549,8 @@
                 <data android:host="www.xabber.com" />
                 <data android:pathPrefix="/account/emails/confirmation" />
             </intent-filter>
-
-        </activity>
-        <activity android:name=".ui.activity.XAChangePassActivity" />
-        <activity android:name=".ui.activity.PatreonAppealActivity"
-            android:theme="@style/ThemeDark">
-            <meta-data
-                android:name="android.support.PARENT_ACTIVITY"
-                android:value="com.xabber.android.ui.activity.ContactListActivity" />
         </activity>
+
         <meta-data android:name="com.facebook.sdk.ApplicationId"
             android:value="@string/SOCIAL_AUTH_FACEBOOK_KEY"/>
         <activity android:name="com.facebook.FacebookActivity"
diff --git a/xabber/src/main/java/com/xabber/android/data/xaccount/HttpApiManager.java b/xabber/src/main/java/com/xabber/android/data/xaccount/HttpApiManager.java
index 925c9c49cf..b52f991fe1 100644
--- a/xabber/src/main/java/com/xabber/android/data/xaccount/HttpApiManager.java
+++ b/xabber/src/main/java/com/xabber/android/data/xaccount/HttpApiManager.java
@@ -18,6 +18,7 @@
 public class HttpApiManager {
 
     public static final String XABBER_FORGOT_PASS_URL = "https://www.xabber.com/account/auth/forgot-password/";
+    public static final String XABBER_EMAIL_CONFIRM_URL = "https://www.xabber.com/account/emails/confirmation/";
 
     public static final String XABBER_API_URL = "https://api.xabber.com/api/v2/";
     private static final String XABBER_COM_URL = "https://www.xabber.com/";
diff --git a/xabber/src/main/java/com/xabber/android/ui/activity/DeepLinkActivity.java b/xabber/src/main/java/com/xabber/android/ui/activity/DeepLinkActivity.java
new file mode 100644
index 0000000000..c0cbcbc22f
--- /dev/null
+++ b/xabber/src/main/java/com/xabber/android/ui/activity/DeepLinkActivity.java
@@ -0,0 +1,103 @@
+package com.xabber.android.ui.activity;
+
+import android.content.Intent;
+import android.net.Uri;
+import android.os.Bundle;
+import android.widget.Toast;
+
+import com.xabber.android.R;
+import com.xabber.android.data.xaccount.AuthManager;
+import com.xabber.android.data.xaccount.HttpApiManager;
+import com.xabber.android.data.xaccount.XabberAccount;
+import com.xabber.android.data.xaccount.XabberAccountManager;
+
+import rx.Subscription;
+import rx.android.schedulers.AndroidSchedulers;
+import rx.functions.Action1;
+import rx.schedulers.Schedulers;
+import rx.subscriptions.CompositeSubscription;
+
+public class DeepLinkActivity extends BaseLoginActivity {
+
+    protected CompositeSubscription compositeSubscription = new CompositeSubscription();
+    private final static String LOG_TAG = DeepLinkActivity.class.getSimpleName();
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_deeplink);
+    }
+
+    @Override
+    protected void onResume() {
+        super.onResume();
+        handleIntent(getIntent());
+    }
+
+    @Override
+    protected void onPause() {
+        super.onPause();
+        compositeSubscription.clear();
+    }
+
+    @Override
+    protected void onSocialAuthSuccess(String provider, String credentials) { }
+
+    @Override
+    protected void showProgress(String title) { }
+
+    @Override
+    protected void hideProgress() { }
+
+    @Override
+    protected void onSynchronized() {
+
+    }
+
+    private void handleIntent(Intent intent) {
+        if (intent == null) return;
+
+        String appLinkAction = intent.getAction();
+        Uri appLinkData = intent.getData();
+        if (Intent.ACTION_VIEW.equals(appLinkAction) && appLinkData != null) {
+            String uri = appLinkData.toString();
+            String key = uri.replace(HttpApiManager.XABBER_EMAIL_CONFIRM_URL, "");
+            key = key.replace("/", "");
+
+            XabberAccount account = XabberAccountManager.getInstance().getAccount();
+            if (account != null) confirmEmailWithKey(key);
+        }
+    }
+
+    /** CONFIRM EMAIL */
+
+    protected void confirmEmailWithKey(String key) {
+        showProgress(getResources().getString(R.string.progress_title_confirm));
+        Subscription confirmSubscription = AuthManager.confirmEmailWithKey(key)
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(new Action1<XabberAccount>() {
+                    @Override
+                    public void call(XabberAccount s) {
+                        handleSuccessConfirm(s);
+                    }
+                }, new Action1<Throwable>() {
+                    @Override
+                    public void call(Throwable throwable) {
+                        handleErrorConfirm(throwable);
+                    }
+                });
+        compositeSubscription.add(confirmSubscription);
+    }
+
+    private void handleSuccessConfirm(XabberAccount response) {
+        Toast.makeText(this, R.string.confirm_success, Toast.LENGTH_SHORT).show();
+        synchronize(false);
+        finish();
+    }
+
+    private void handleErrorConfirm(Throwable throwable) {
+        handleError(throwable, "Error while confirming email: ", LOG_TAG);
+        finish();
+    }
+}
diff --git a/xabber/src/main/java/com/xabber/android/ui/activity/XabberAccountActivity.java b/xabber/src/main/java/com/xabber/android/ui/activity/XabberAccountActivity.java
index 4da17e5b68..40dfac04de 100644
--- a/xabber/src/main/java/com/xabber/android/ui/activity/XabberAccountActivity.java
+++ b/xabber/src/main/java/com/xabber/android/ui/activity/XabberAccountActivity.java
@@ -234,7 +234,7 @@ private void showInfoFragment() {
 
         fTrans = getFragmentManager().beginTransaction();
         fTrans.replace(R.id.container, fragmentInfo, FRAGMENT_INFO);
-        fTrans.commit();
+        fTrans.commitAllowingStateLoss();
 
         toolbar.setTitle(R.string.title_xabber_account);
         barPainter.setLiteGrey();
diff --git a/xabber/src/main/res/layout/activity_deeplink.xml b/xabber/src/main/res/layout/activity_deeplink.xml
new file mode 100644
index 0000000000..fb915e5bc8
--- /dev/null
+++ b/xabber/src/main/res/layout/activity_deeplink.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <ProgressBar
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_centerInParent="true"
+        />
+
+</RelativeLayout>
\ No newline at end of file

From 90ba9846008031309e0381e9791800ba584892af Mon Sep 17 00:00:00 2001
From: Valery Miller <valera_miller94@mail.ru>
Date: Fri, 19 Oct 2018 18:11:40 +0500
Subject: [PATCH 247/251] Up version to 532

---
 xabber/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/xabber/build.gradle b/xabber/build.gradle
index 9c3cae0f46..48135d78a2 100644
--- a/xabber/build.gradle
+++ b/xabber/build.gradle
@@ -10,8 +10,8 @@ android {
     defaultConfig {
         minSdkVersion 15
         targetSdkVersion 28
-        versionCode 531
-        versionName '2.4.2(531)'
+        versionCode 532
+        versionName '2.5(532)'
     }
 
     lintOptions {

From d5cff23da8e290a3c69ba79d85771f4b9e488a34 Mon Sep 17 00:00:00 2001
From: Valery Miller <valera_miller94@mail.ru>
Date: Mon, 22 Oct 2018 12:32:45 +0500
Subject: [PATCH 248/251] Enable landscape mode in login screen

---
 xabber/src/main/AndroidManifest.xml           |   1 -
 .../res/layout-land/activity_xabber_login.xml |  54 -----
 .../layout-land/fragment_xaccount_login.xml   | 191 ++++++++++++++++++
 .../res/layout-land/include_login_social.xml  | 128 ------------
 .../res/layout/fragment_xaccount_login.xml    |  25 ---
 .../main/res/layout/include_login_social.xml  | 105 ----------
 6 files changed, 191 insertions(+), 313 deletions(-)
 delete mode 100644 xabber/src/main/res/layout-land/activity_xabber_login.xml
 create mode 100644 xabber/src/main/res/layout-land/fragment_xaccount_login.xml
 delete mode 100644 xabber/src/main/res/layout-land/include_login_social.xml
 delete mode 100644 xabber/src/main/res/layout/include_login_social.xml

diff --git a/xabber/src/main/AndroidManifest.xml b/xabber/src/main/AndroidManifest.xml
index f6331af37e..d8fa86b6b8 100644
--- a/xabber/src/main/AndroidManifest.xml
+++ b/xabber/src/main/AndroidManifest.xml
@@ -526,7 +526,6 @@
         <activity android:name=".ui.activity.TutorialActivity"
             android:theme="@style/ThemeDark"/>
         <activity android:name=".ui.activity.XabberLoginActivity"
-            android:screenOrientation="portrait"
             android:theme="@style/Theme.Design.Light"/>
 
         <activity android:name=".ui.activity.XabberAccountActivity"
diff --git a/xabber/src/main/res/layout-land/activity_xabber_login.xml b/xabber/src/main/res/layout-land/activity_xabber_login.xml
deleted file mode 100644
index 8597735f84..0000000000
--- a/xabber/src/main/res/layout-land/activity_xabber_login.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@color/cardview_light_background">
-
-    <include layout="@layout/toolbar_default" />
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_below="@id/toolbar_default"
-
-        android:orientation="horizontal"
-        >
-
-        <RelativeLayout
-            android:layout_width="0dp"
-            android:layout_height="match_parent"
-            android:layout_weight="1"
-            android:layout_marginLeft="16dp"
-            android:layout_marginStart="16dp"
-            android:layout_marginRight="16dp"
-            android:layout_marginEnd="16dp"
-            android:fitsSystemWindows="true"
-            android:descendantFocusability="beforeDescendants"
-            android:focusableInTouchMode="true"
-            >
-
-            <FrameLayout
-                android:id="@+id/container"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"/>
-
-        </RelativeLayout>
-
-        <RelativeLayout
-            android:layout_width="0dp"
-            android:layout_height="match_parent"
-            android:layout_weight="1"
-            android:layout_marginLeft="16dp"
-            android:layout_marginStart="16dp"
-            android:layout_marginRight="16dp"
-            android:layout_marginEnd="16dp"
-            >
-
-            <include layout="@layout/include_login_social" />
-
-        </RelativeLayout>
-
-
-    </LinearLayout>
-
-</RelativeLayout>
\ No newline at end of file
diff --git a/xabber/src/main/res/layout-land/fragment_xaccount_login.xml b/xabber/src/main/res/layout-land/fragment_xaccount_login.xml
new file mode 100644
index 0000000000..f367b0ebb2
--- /dev/null
+++ b/xabber/src/main/res/layout-land/fragment_xaccount_login.xml
@@ -0,0 +1,191 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <ScrollView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:focusableInTouchMode="true"
+        >
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            android:paddingTop="16dp"
+            android:paddingBottom="8dp"
+            android:layout_marginLeft="@dimen/login_horizontal_margin"
+            android:layout_marginRight="@dimen/login_horizontal_margin"
+            android:focusableInTouchMode="true"
+            >
+
+            <android.support.design.widget.TextInputLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                >
+
+                <android.support.design.widget.TextInputEditText
+                    android:id="@+id/edtUsername"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:imeOptions="actionNext"
+                    android:inputType="textEmailAddress"
+                    android:nextFocusForward="@+id/edtPass"
+                    android:singleLine="true"
+                    android:hint="@string/label_xmpp_id"
+                    android:textSize="16sp"
+                    android:theme="@style/Theme"
+                    />
+
+            </android.support.design.widget.TextInputLayout>
+
+            <android.support.design.widget.TextInputLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                app:passwordToggleEnabled="true"
+                android:layout_marginTop="16dp"
+                android:layout_marginBottom="16dp"
+                >
+
+                <android.support.design.widget.TextInputEditText
+                    android:id="@+id/edtPass"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:imeOptions="actionDone"
+                    android:singleLine="true"
+                    android:textSize="16sp"
+                    android:theme="@style/Theme"
+                    android:hint="@string/hint_pass"
+                    android:inputType="textPassword"
+                    />
+
+            </android.support.design.widget.TextInputLayout>
+
+            <LinearLayout
+                android:id="@+id/optionsView"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                android:visibility="gone"
+                >
+
+                <CheckBox
+                    android:id="@+id/store_password"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:checked="true"
+                    android:text="@string/account_store_password" />
+
+                <CheckBox
+                    android:id="@+id/chkSync"
+                    android:layout_width="fill_parent"
+                    android:layout_height="wrap_content"
+                    android:checked="true"
+                    android:text="@string/sync_with_xabber_account" />
+
+                <CheckBox
+                    android:id="@+id/chkRequireTLS"
+                    android:layout_width="fill_parent"
+                    android:layout_height="wrap_content"
+                    android:checked="false"
+                    android:text="@string/account_enable_tls" />
+
+                <CheckBox
+                    android:id="@+id/chkUseTOR"
+                    android:layout_width="fill_parent"
+                    android:layout_height="wrap_content"
+                    android:checked="false"
+                    android:text="@string/account_use_tor" />
+
+            </LinearLayout>
+
+            <RelativeLayout
+                android:layout_marginTop="8dp"
+                android:layout_marginBottom="16dp"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_horizontal">
+
+                <Button
+                    android:id="@+id/btnOptions"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    style="@style/Widget.AppCompat.Button.Borderless"
+                    android:theme="@style/BlueButton"
+                    android:textColor="@color/grey_500"
+                    android:text="@string/button_advanced_options"
+                    android:layout_centerVertical="true"
+                    />
+
+                <Button
+                    android:id="@+id/btnLogin"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    style="@style/Widget.AppCompat.Button.Colored"
+                    android:theme="@style/BlueButton"
+                    android:paddingRight="18dp"
+                    android:paddingLeft="18dp"
+                    android:layout_centerVertical="true"
+                    android:layout_toRightOf="@id/btnOptions"
+                    android:layout_toEndOf="@id/btnOptions"
+                    android:layout_marginLeft="16dp"
+                    android:layout_marginStart="16dp"
+                    android:textColor="@color/white"
+                    android:text="@string/button_connect"
+                    />
+
+            </RelativeLayout>
+
+            <LinearLayout
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal"
+                android:layout_gravity="center_horizontal"
+                >
+
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/ic_error_grey_24dp"
+                    android:paddingTop="16dp"
+                    android:paddingBottom="16dp"
+                    android:paddingLeft="4dp"
+                    android:paddingRight="4dp"
+                    />
+
+                <TextView
+                    android:id="@+id/account_help"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:text="@string/account_xmpp_register_warning"
+                    android:layout_gravity="center_vertical"
+                    android:gravity="center_vertical"
+                    />
+
+            </LinearLayout>
+
+            <include layout="@layout/include_social"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginRight="64dp"
+                android:layout_marginLeft="64dp"/>
+
+            <Button
+                android:id="@+id/btnForgotPass"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                style="@style/Widget.AppCompat.Button.Borderless"
+                android:theme="@style/BlueButton"
+                android:textColor="@color/grey_500"
+                android:text="@string/forgot_pass"
+                android:layout_gravity="center_horizontal"
+                android:layout_centerVertical="true"
+                />
+
+        </LinearLayout>
+
+    </ScrollView>
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/xabber/src/main/res/layout-land/include_login_social.xml b/xabber/src/main/res/layout-land/include_login_social.xml
deleted file mode 100644
index 9de36f965f..0000000000
--- a/xabber/src/main/res/layout-land/include_login_social.xml
+++ /dev/null
@@ -1,128 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:layout_marginTop="16dp"
-    android:background="@color/cardview_light_background"
-    >
-
-    <RelativeLayout
-        android:id="@+id/socialTitle"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginBottom="30dp"
-        >
-
-        <TextView
-            android:id="@+id/tvLabel"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerInParent="true"
-            android:layout_marginLeft="7dp"
-            android:layout_marginRight="7dp"
-            android:text="@string/social_sign_in"
-            android:textColor="@color/black_text_secondary"
-            />
-
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="1dp"
-            android:layout_centerVertical="true"
-            android:layout_toLeftOf="@+id/tvLabel"
-            android:layout_toStartOf="@+id/tvLabel"
-            android:layout_marginLeft="5dp"
-            android:layout_marginStart="5dp"
-            android:background="@color/black_text_secondary"
-            />
-
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="1dp"
-            android:layout_centerVertical="true"
-            android:layout_toRightOf="@+id/tvLabel"
-            android:layout_toEndOf="@+id/tvLabel"
-            android:layout_marginRight="5dp"
-            android:layout_marginEnd="5dp"
-            android:background="@color/black_text_secondary"
-            />
-
-    </RelativeLayout>
-
-    <LinearLayout
-        android:id="@+id/llSocialLogos"
-        android:orientation="horizontal"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_centerHorizontal="true"
-        android:layout_marginBottom="30dp"
-        android:layout_below="@+id/socialTitle"
-        >
-
-        <ImageView
-            android:id="@+id/ivGoogle"
-            android:layout_width="48dp"
-            android:layout_height="48dp"
-            android:src="@drawable/ic_google_plus"
-            />
-
-        <ImageView
-            android:id="@+id/ivFacebook"
-            android:layout_width="48dp"
-            android:layout_height="48dp"
-            android:layout_marginLeft="30dp"
-            android:layout_marginStart="30dp"
-            android:layout_marginRight="30dp"
-            android:layout_marginEnd="30dp"
-            android:src="@drawable/ic_facebook"
-            />
-
-        <ImageView
-            android:id="@+id/ivTwitter"
-            android:layout_width="48dp"
-            android:layout_height="48dp"
-            android:src="@drawable/ic_twitter"
-            />
-
-    </LinearLayout>
-
-    <LinearLayout
-        android:id="@+id/llSocialLogosSecond"
-        android:orientation="horizontal"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_centerHorizontal="true"
-        android:layout_marginBottom="16dp"
-        android:layout_below="@+id/llSocialLogos"
-        >
-
-        <!--<ImageView-->
-            <!--android:id="@+id/ivTwitter"-->
-            <!--android:layout_width="48dp"-->
-            <!--android:layout_height="48dp"-->
-            <!--android:src="@drawable/ic_twitter"-->
-            <!--/>-->
-
-        <ImageView
-            android:id="@+id/ivGithub"
-            android:layout_width="48dp"
-            android:layout_height="48dp"
-            android:layout_marginLeft="30dp"
-            android:layout_marginStart="30dp"
-            android:src="@drawable/ic_github_logo_black"
-            android:visibility="gone"
-            />
-
-    </LinearLayout>
-
-    <TextView
-        android:id="@+id/tvInfo"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:paddingBottom="8dp"
-        android:layout_below="@+id/llSocialLogosSecond"
-        android:gravity="center"
-        android:textColor="@color/black_text_secondary"
-        android:text="@string/xabber_account_info"
-        />
-
-</RelativeLayout>
\ No newline at end of file
diff --git a/xabber/src/main/res/layout/fragment_xaccount_login.xml b/xabber/src/main/res/layout/fragment_xaccount_login.xml
index 917e60fd0a..5f0e3b9f6d 100644
--- a/xabber/src/main/res/layout/fragment_xaccount_login.xml
+++ b/xabber/src/main/res/layout/fragment_xaccount_login.xml
@@ -14,22 +14,6 @@
         android:focusableInTouchMode="true"
         >
 
-        <!--<ImageView-->
-            <!--android:layout_width="100dp"-->
-            <!--android:layout_height="100dp"-->
-            <!--android:src="@drawable/ic_logo_circle"-->
-            <!--android:layout_gravity="center_horizontal"-->
-            <!--/>-->
-
-        <!--<TextView-->
-            <!--android:layout_width="match_parent"-->
-            <!--android:layout_height="wrap_content"-->
-            <!--android:layout_marginTop="16dp"-->
-            <!--android:paddingLeft="4dp"-->
-            <!--android:textColor="@color/black_text_secondary"-->
-            <!--android:text="@string/label_xmpp_id"-->
-            <!--/>-->
-
         <android.support.design.widget.TextInputLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -50,15 +34,6 @@
 
         </android.support.design.widget.TextInputLayout>
 
-        <!--<TextView-->
-            <!--android:layout_width="match_parent"-->
-            <!--android:layout_height="wrap_content"-->
-            <!--android:paddingLeft="4dp"-->
-            <!--android:layout_marginTop="16dp"-->
-            <!--android:textColor="@color/black_text_secondary"-->
-            <!--android:text="@string/label_pass"-->
-            <!--/>-->
-
         <android.support.design.widget.TextInputLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
diff --git a/xabber/src/main/res/layout/include_login_social.xml b/xabber/src/main/res/layout/include_login_social.xml
deleted file mode 100644
index 96544ac9c2..0000000000
--- a/xabber/src/main/res/layout/include_login_social.xml
+++ /dev/null
@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical" android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:layout_marginLeft="16dp"
-    android:layout_marginRight="16dp"
-    android:layout_marginBottom="16dp">
-
-    <RelativeLayout
-        android:id="@+id/socialTitle"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_above="@+id/llSocialLogos"
-        android:layout_marginTop="12dp"
-        android:layout_marginBottom="12dp"
-        >
-
-        <TextView
-            android:id="@+id/tvLabel"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerInParent="true"
-            android:layout_marginLeft="7dp"
-            android:layout_marginRight="7dp"
-            android:textColor="@color/black_text_secondary"
-            android:text="Social Sign In"
-
-            />
-
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="1dp"
-            android:layout_centerVertical="true"
-            android:layout_toLeftOf="@+id/tvLabel"
-            android:layout_marginLeft="5dp"
-            android:background="@color/black_text_secondary"
-            />
-
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="1dp"
-            android:layout_centerVertical="true"
-            android:layout_toRightOf="@+id/tvLabel"
-            android:layout_marginRight="5dp"
-            android:background="@color/black_text_secondary"
-            />
-
-    </RelativeLayout>
-
-    <LinearLayout
-        android:id="@+id/llSocialLogos"
-        android:orientation="horizontal"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_above="@+id/tvInfo"
-        android:layout_centerHorizontal="true"
-        android:layout_marginBottom="16dp"
-        >
-
-        <ImageView
-            android:id="@+id/ivGoogle"
-            android:layout_width="48dp"
-            android:layout_height="48dp"
-            android:src="@drawable/ic_google_plus"
-            />
-
-        <ImageView
-            android:id="@+id/ivFacebook"
-            android:layout_width="48dp"
-            android:layout_height="48dp"
-            android:layout_marginLeft="30dp"
-            android:src="@drawable/ic_facebook"
-            />
-
-        <ImageView
-            android:id="@+id/ivTwitter"
-            android:layout_width="48dp"
-            android:layout_height="48dp"
-            android:layout_marginLeft="30dp"
-            android:src="@drawable/ic_twitter"
-            />
-
-        <ImageView
-            android:id="@+id/ivGithub"
-            android:layout_width="48dp"
-            android:layout_height="48dp"
-            android:layout_marginLeft="30dp"
-            android:src="@drawable/ic_github_logo_black"
-            android:visibility="gone"
-            />
-
-    </LinearLayout>
-
-    <TextView
-        android:id="@+id/tvInfo"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_alignParentBottom="true"
-        android:paddingBottom="8dp"
-        android:gravity="center"
-        android:textColor="@color/black_text_secondary"
-        android:text="@string/summary_xabber_account_in_login"
-        />
-
-</RelativeLayout>
\ No newline at end of file

From cd88db29fbc80b0dfe033fc2363d31aaa37a2a19 Mon Sep 17 00:00:00 2001
From: Valery Miller <valera_miller94@mail.ru>
Date: Mon, 22 Oct 2018 12:50:37 +0500
Subject: [PATCH 249/251] Fixed landscape mode in xabber account info screen

---
 xabber/src/main/res/layout/dialog_account_sync.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/xabber/src/main/res/layout/dialog_account_sync.xml b/xabber/src/main/res/layout/dialog_account_sync.xml
index 3ee748204c..8952de84f7 100644
--- a/xabber/src/main/res/layout/dialog_account_sync.xml
+++ b/xabber/src/main/res/layout/dialog_account_sync.xml
@@ -48,6 +48,8 @@
             android:layout_height="wrap_content"
             android:layout_centerVertical="true"
             android:layout_toLeftOf="@id/switchSyncAll"
+            android:layout_alignParentStart="true"
+            android:layout_alignParentLeft="true"
             android:layout_marginRight="8dp"
             >
 

From b20481f50e5a6cf7a84b62c6e44a583655373b58 Mon Sep 17 00:00:00 2001
From: Valery Miller <valera_miller94@mail.ru>
Date: Mon, 22 Oct 2018 18:11:07 +0500
Subject: [PATCH 250/251] Up version to 533

---
 xabber/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/xabber/build.gradle b/xabber/build.gradle
index 48135d78a2..2243a22f2b 100644
--- a/xabber/build.gradle
+++ b/xabber/build.gradle
@@ -10,8 +10,8 @@ android {
     defaultConfig {
         minSdkVersion 15
         targetSdkVersion 28
-        versionCode 532
-        versionName '2.5(532)'
+        versionCode 533
+        versionName '2.5(533)'
     }
 
     lintOptions {

From fb90e54474412ec844420878c6b938fda8f4078e Mon Sep 17 00:00:00 2001
From: Valery Miller <valera_miller94@mail.ru>
Date: Tue, 27 Nov 2018 12:48:49 +0500
Subject: [PATCH 251/251] Update build tools gradle for new Android Studio

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index a7c2ad0e3d..840551871e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -6,7 +6,7 @@ buildscript {
         maven { url 'https://maven.fabric.io/public' }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.0'
+        classpath 'com.android.tools.build:gradle:3.2.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'