Application package and application id renamed to "com.xabber.android.classic"

app/build.gradle

@@ -5,7 +5,7 @@ android {
     buildToolsVersion "21.1.2"
 
     defaultConfig {
-        applicationId "com.xabber.androiddev"
+        applicationId "com.xabber.android.classic"
         minSdkVersion 3
         targetSdkVersion 9
     }

app/src/main/AndroidManifest.xml

@@ -13,7 +13,7 @@
      along with this program. If not, see http://www.gnu.org/licenses/.
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.xabber.androiddev"
+    package="com.xabber.android.classic"
     android:versionCode="102"
     android:versionName="@string/application_version"
     android:installLocation="auto"

app/src/main/java/com/xabber/android/data/ActivityManager.java

@@ -30,7 +30,7 @@ import com.xabber.android.data.SettingsManager.InterfaceTheme;
 import com.xabber.android.ui.ContactList;
 import com.xabber.android.ui.LoadActivity;
 import com.xabber.android.ui.PreferenceEditor;
-import com.xabber.androiddev.R;
+import com.xabber.android.classic.R;
 
 /**
  * Activity stack manager.

app/src/main/java/com/xabber/android/data/Application.java

@@ -33,7 +33,7 @@ import android.os.Build;
 import android.os.Handler;
 
 import com.xabber.android.service.XabberService;
-import com.xabber.androiddev.R;
+import com.xabber.android.classic.R;
 
 /**
  * Base entry point.

app/src/main/java/com/xabber/android/data/SettingsManager.java

@@ -40,7 +40,7 @@ import com.xabber.android.service.XabberService;
 import com.xabber.android.ui.adapter.ComparatorByName;
 import com.xabber.android.ui.adapter.ComparatorByStatus;
 import com.xabber.android.utils.Emoticons;
-import com.xabber.androiddev.R;
+import com.xabber.android.classic.R;
 
 /**
  * Manage operations with common settings.

app/src/main/java/com/xabber/android/data/account/AccountAuthorizationError.java

@@ -20,7 +20,7 @@ import com.xabber.android.data.Application;
 import com.xabber.android.data.entity.AccountRelated;
 import com.xabber.android.data.notification.AccountNotificationItem;
 import com.xabber.android.ui.AccountEditor;
-import com.xabber.androiddev.R;
+import com.xabber.android.classic.R;
 
 public class AccountAuthorizationError extends AccountRelated implements
 		AccountNotificationItem {

app/src/main/java/com/xabber/android/data/account/AccountItem.java

@@ -27,7 +27,7 @@ import com.xabber.android.data.connection.ConnectionState;
 import com.xabber.android.data.connection.ConnectionThread;
 import com.xabber.android.data.connection.ProxyType;
 import com.xabber.android.data.connection.TLSMode;
-import com.xabber.androiddev.R;
+import com.xabber.android.classic.R;
 
 /**
  * Represent account settings and status.

app/src/main/java/com/xabber/android/data/account/AccountManager.java

@@ -42,7 +42,7 @@ 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.androiddev.R;
+import com.xabber.android.classic.R;
 import com.xabber.xmpp.address.Jid;
 
 /**

app/src/main/java/com/xabber/android/data/account/AccountProtocol.java

@@ -14,7 +14,7 @@
  */
 package com.xabber.android.data.account;
 
-import com.xabber.androiddev.R;
+import com.xabber.android.classic.R;
 
 /**
  * Supported account protocols.

app/src/main/java/com/xabber/android/data/account/AccountTable.java

@@ -36,7 +36,7 @@ import com.xabber.android.data.Application;
 import com.xabber.android.data.DatabaseManager;
 import com.xabber.android.data.connection.ProxyType;
 import com.xabber.android.data.connection.TLSMode;
-import com.xabber.androiddev.R;
+import com.xabber.android.classic.R;
 
 /**
  * Storage with account settings.

app/src/main/java/com/xabber/android/data/account/PasswordRequest.java

@@ -19,7 +19,7 @@ import android.content.Intent;
 import com.xabber.android.data.Application;
 import com.xabber.android.data.entity.AccountRelated;
 import com.xabber.android.data.notification.AccountNotificationItem;
-import com.xabber.androiddev.R;
+import com.xabber.android.classic.R;
 
 public class PasswordRequest extends AccountRelated implements
 		AccountNotificationItem {

app/src/main/java/com/xabber/android/data/account/StatusMode.java

@@ -17,7 +17,7 @@ package com.xabber.android.data.account;
 import org.jivesoftware.smack.packet.Presence;
 import org.jivesoftware.smack.packet.Presence.Mode;
 
-import com.xabber.androiddev.R;
+import com.xabber.android.classic.R;
 
 /**
  * Status mode.

app/src/main/java/com/xabber/android/data/account/WLMManager.java

@@ -40,7 +40,7 @@ import android.net.Uri;
 import com.xabber.android.data.Application;
 import com.xabber.android.data.LogManager;
 import com.xabber.android.data.NetworkException;
-import com.xabber.androiddev.R;
+import com.xabber.android.classic.R;
 
 class WLMManager implements OAuthProvider {
 

app/src/main/java/com/xabber/android/data/connection/CertificateInvalidReason.java

@@ -14,7 +14,7 @@
  */
 package com.xabber.android.data.connection;
 
-import com.xabber.androiddev.R;
+import com.xabber.android.classic.R;
 
 /**
  * Possible reasons for certificate invalidation.

app/src/main/java/com/xabber/android/data/connection/CertificateManager.java

@@ -45,7 +45,7 @@ import com.xabber.android.data.OnClearListener;
 import com.xabber.android.data.OnLoadListener;
 import com.xabber.android.data.notification.BaseNotificationProvider;
 import com.xabber.android.data.notification.NotificationManager;
-import com.xabber.androiddev.R;
+import com.xabber.android.classic.R;
 
 /**
  * Manage certificate exceptions.

app/src/main/java/com/xabber/android/data/connection/ConnectionItem.java

@@ -19,7 +19,7 @@ import org.jivesoftware.smack.XMPPConnection;
 import com.xabber.android.data.Application;
 import com.xabber.android.data.LogManager;
 import com.xabber.android.data.account.AccountProtocol;
-import com.xabber.androiddev.R;
+import com.xabber.android.classic.R;
 
 /**
  * Abstract connection.

app/src/main/java/com/xabber/android/data/connection/ConnectionManager.java

@@ -40,7 +40,7 @@ import com.xabber.android.data.OnTimerListener;
 import com.xabber.android.data.account.AccountItem;
 import com.xabber.android.data.account.AccountManager;
 import com.xabber.android.data.entity.NestedMap;
-import com.xabber.androiddev.R;
+import com.xabber.android.classic.R;
 import com.xabber.xmpp.address.Jid;
 import com.xabber.xmpp.wlm.XMessengerOAuth2;
 

app/src/main/java/com/xabber/android/data/connection/ConnectionState.java

@@ -14,7 +14,7 @@
  */
 package com.xabber.android.data.connection;
 
-import com.xabber.androiddev.R;
+import com.xabber.android.classic.R;
 
 /**
  * State of connection.

app/src/main/java/com/xabber/android/data/connection/PendingCertificate.java

@@ -25,7 +25,7 @@ import com.xabber.android.data.Application;
 import com.xabber.android.data.notification.NotificationItem;
 import com.xabber.android.ui.CertificateConfirmation;
 import com.xabber.android.utils.StringUtils;
-import com.xabber.androiddev.R;
+import com.xabber.android.classic.R;
 
 public class PendingCertificate implements NotificationItem {
 

app/src/main/java/com/xabber/android/data/extension/archive/AvailableArchiveRequest.java

@@ -21,7 +21,7 @@ import com.xabber.android.data.account.AccountManager;
 import com.xabber.android.data.entity.AccountRelated;
 import com.xabber.android.data.notification.AccountNotificationItem;
 import com.xabber.android.ui.ArchiveRequest;
-import com.xabber.androiddev.R;
+import com.xabber.android.classic.R;
 
 public class AvailableArchiveRequest extends AccountRelated implements
 		AccountNotificationItem {

app/src/main/java/com/xabber/android/data/extension/archive/MessageArchiveManager.java

@@ -49,7 +49,7 @@ import com.xabber.android.data.message.MessageItem;
 import com.xabber.android.data.message.MessageManager;
 import com.xabber.android.data.notification.BaseAccountNotificationProvider;
 import com.xabber.android.data.notification.NotificationManager;
-import com.xabber.androiddev.R;
+import com.xabber.android.classic.R;
 import com.xabber.xmpp.address.Jid;
 import com.xabber.xmpp.archive.AbstractMessage;
 import com.xabber.xmpp.archive.Auto;

app/src/main/java/com/xabber/android/data/extension/attention/AttentionManager.java

@@ -47,7 +47,7 @@ import com.xabber.android.data.notification.EntityNotificationProvider;
 import com.xabber.android.data.notification.NotificationManager;
 import com.xabber.android.data.roster.PresenceManager;
 import com.xabber.android.data.roster.ResourceItem;
-import com.xabber.androiddev.R;
+import com.xabber.android.classic.R;
 import com.xabber.xmpp.address.Jid;
 import com.xabber.xmpp.attention.Attention;
 

app/src/main/java/com/xabber/android/data/extension/attention/AttentionRequest.java

@@ -21,7 +21,7 @@ import com.xabber.android.data.entity.BaseEntity;
 import com.xabber.android.data.notification.EntityNotificationItem;
 import com.xabber.android.data.roster.RosterManager;
 import com.xabber.android.ui.ChatViewer;
-import com.xabber.androiddev.R;
+import com.xabber.android.classic.R;
 
 public class AttentionRequest extends BaseEntity implements
 		EntityNotificationItem {

app/src/main/java/com/xabber/android/data/extension/avatar/AvatarManager.java

@@ -37,7 +37,7 @@ import com.xabber.android.data.account.OAuthManager;
 import com.xabber.android.data.connection.ConnectionItem;
 import com.xabber.android.data.connection.OnPacketListener;
 import com.xabber.android.data.extension.vcard.VCardManager;
-import com.xabber.androiddev.R;
+import com.xabber.android.classic.R;
 import com.xabber.xmpp.address.Jid;
 import com.xabber.xmpp.avatar.VCardUpdate;
 

app/src/main/java/com/xabber/android/data/extension/muc/MUCManager.java

@@ -43,7 +43,7 @@ import com.xabber.android.data.message.MessageManager;
 import com.xabber.android.data.notification.EntityNotificationProvider;
 import com.xabber.android.data.notification.NotificationManager;
 import com.xabber.android.data.roster.RosterManager;
-import com.xabber.androiddev.R;
+import com.xabber.android.classic.R;
 import com.xabber.xmpp.muc.MUC;
 
 /**

app/src/main/java/com/xabber/android/data/extension/muc/RoomAuthorizationError.java

@@ -20,7 +20,7 @@ import com.xabber.android.data.Application;
 import com.xabber.android.data.entity.BaseEntity;
 import com.xabber.android.data.notification.EntityNotificationItem;
 import com.xabber.android.ui.MUCEditor;
-import com.xabber.androiddev.R;
+import com.xabber.android.classic.R;
 
 public class RoomAuthorizationError extends BaseEntity implements
 		EntityNotificationItem {

app/src/main/java/com/xabber/android/data/extension/muc/RoomChat.java

@@ -37,7 +37,7 @@ import com.xabber.android.data.message.AbstractChat;
 import com.xabber.android.data.message.ChatAction;
 import com.xabber.android.data.message.MessageItem;
 import com.xabber.android.data.roster.RosterManager;
-import com.xabber.androiddev.R;
+import com.xabber.android.classic.R;
 import com.xabber.xmpp.address.Jid;
 import com.xabber.xmpp.delay.Delay;
 import com.xabber.xmpp.muc.Affiliation;

app/src/main/java/com/xabber/android/data/extension/muc/RoomInvite.java

@@ -22,7 +22,7 @@ import com.xabber.android.data.entity.BaseEntity;
 import com.xabber.android.data.notification.EntityNotificationItem;
 import com.xabber.android.data.roster.RosterManager;
 import com.xabber.android.ui.MUCEditor;
-import com.xabber.androiddev.R;
+import com.xabber.android.classic.R;
 
 /**
  * Invite to join the room.

app/src/main/java/com/xabber/android/data/extension/otr/OTRManager.java

@@ -61,7 +61,7 @@ import com.xabber.android.data.message.MessageManager;
 import com.xabber.android.data.notification.EntityNotificationProvider;
 import com.xabber.android.data.notification.NotificationManager;
 import com.xabber.android.data.roster.RosterManager;
-import com.xabber.androiddev.R;
+import com.xabber.android.classic.R;
 import com.xabber.xmpp.archive.OtrMode;
 import com.xabber.xmpp.archive.SaveMode;
 

app/src/main/java/com/xabber/android/data/extension/otr/SMProgress.java

@@ -21,7 +21,7 @@ import com.xabber.android.data.entity.BaseEntity;
 import com.xabber.android.data.notification.EntityNotificationItem;
 import com.xabber.android.data.roster.RosterManager;
 import com.xabber.android.ui.QuestionViewer;
-import com.xabber.androiddev.R;
+import com.xabber.android.classic.R;
 
 public class SMProgress extends BaseEntity implements EntityNotificationItem {
 

app/src/main/java/com/xabber/android/data/extension/otr/SMRequest.java

@@ -21,7 +21,7 @@ import com.xabber.android.data.entity.BaseEntity;
 import com.xabber.android.data.notification.EntityNotificationItem;
 import com.xabber.android.data.roster.RosterManager;
 import com.xabber.android.ui.QuestionViewer;
-import com.xabber.androiddev.R;
+import com.xabber.android.classic.R;
 
 public class SMRequest extends BaseEntity implements EntityNotificationItem {
 

app/src/main/java/com/xabber/android/data/message/ChatAction.java

@@ -17,7 +17,7 @@ package com.xabber.android.data.message;
 import android.content.Context;
 
 import com.xabber.android.data.account.StatusMode;
-import com.xabber.androiddev.R;
+import com.xabber.android.classic.R;
 
 /**
  * Action in chat.

app/src/main/java/com/xabber/android/data/message/MessageManager.java

@@ -55,7 +55,7 @@ import com.xabber.android.data.roster.OnStatusChangeListener;
 import com.xabber.android.data.roster.OnRosterReceivedListener;
 import com.xabber.android.data.roster.RosterManager;
 import com.xabber.android.utils.StringUtils;
-import com.xabber.androiddev.R;
+import com.xabber.android.classic.R;
 import com.xabber.xmpp.address.Jid;
 import com.xabber.xmpp.delay.Delay;
 

app/src/main/java/com/xabber/android/data/notification/NotificationManager.java

@@ -57,7 +57,7 @@ import com.xabber.android.ui.ContactList;
 import com.xabber.android.ui.ReconnectionActivity;
 import com.xabber.android.utils.Emoticons;
 import com.xabber.android.utils.StringUtils;
-import com.xabber.androiddev.R;
+import com.xabber.android.classic.R;
 
 /**
  * Manage notifications about message, subscription and authentication.

app/src/main/java/com/xabber/android/data/roster/GroupManager.java

@@ -23,7 +23,7 @@ import com.xabber.android.data.account.AccountManager;
 import com.xabber.android.data.account.OnAccountRemovedListener;
 import com.xabber.android.data.entity.NestedMap;
 import com.xabber.android.data.entity.NestedMap.Entry;
-import com.xabber.androiddev.R;
+import com.xabber.android.classic.R;
 
 public class GroupManager implements OnLoadListener, OnAccountRemovedListener,
 		GroupStateProvider {

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

@@ -43,7 +43,7 @@ import com.xabber.android.data.entity.NestedMap;
 import com.xabber.android.data.extension.archive.OnArchiveModificationsReceivedListener;
 import com.xabber.android.data.notification.EntityNotificationProvider;
 import com.xabber.android.data.notification.NotificationManager;
-import com.xabber.androiddev.R;
+import com.xabber.android.classic.R;
 import com.xabber.xmpp.address.Jid;
 
 /**

app/src/main/java/com/xabber/android/data/roster/RosterManager.java

@@ -47,7 +47,7 @@ import com.xabber.android.data.extension.muc.RoomContact;
 import com.xabber.android.data.message.AbstractChat;
 import com.xabber.android.data.message.ChatContact;
 import com.xabber.android.data.message.MessageManager;
-import com.xabber.androiddev.R;
+import com.xabber.android.classic.R;
 import com.xabber.xmpp.address.Jid;
 
 /**

app/src/main/java/com/xabber/android/data/roster/SubscriptionRequest.java

@@ -21,7 +21,7 @@ import com.xabber.android.data.account.AccountManager;
 import com.xabber.android.data.entity.BaseEntity;
 import com.xabber.android.data.notification.EntityNotificationItem;
 import com.xabber.android.ui.ContactAdd;
-import com.xabber.androiddev.R;
+import com.xabber.android.classic.R;
 
 public class SubscriptionRequest extends BaseEntity implements
 		EntityNotificationItem {

app/src/main/java/com/xabber/android/data/roster/SyncManager.java

@@ -62,7 +62,7 @@ import com.xabber.android.data.entity.AccountRelated;
 import com.xabber.android.data.entity.BaseEntity;
 import com.xabber.android.data.extension.vcard.VCardManager;
 import com.xabber.android.utils.DummyCursor;
-import com.xabber.androiddev.R;
+import com.xabber.android.classic.R;
 
 /**
  * Manage integration with system accounts and contacts.

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

@@ -21,7 +21,7 @@ import android.text.method.LinkMovementMethod;
 import android.widget.TextView;
 
 import com.xabber.android.ui.helper.ManagedActivity;
-import com.xabber.androiddev.R;
+import com.xabber.android.classic.R;
 
 public class AboutViewer extends ManagedActivity {
 

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

@@ -37,7 +37,7 @@ import com.xabber.android.ui.adapter.AccountTypeAdapter;
 import com.xabber.android.ui.dialog.OrbotInstallerDialogBuilder;
 import com.xabber.android.ui.helper.ManagedActivity;
 import com.xabber.android.ui.helper.OrbotHelper;
-import com.xabber.androiddev.R;
+import com.xabber.android.classic.R;
 
 public class AccountAdd extends ManagedActivity implements
 		View.OnClickListener, OnItemSelectedListener {

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

@@ -36,7 +36,7 @@ import com.xabber.android.data.intent.AccountIntentBuilder;
 import com.xabber.android.ui.dialog.OrbotInstallerDialogBuilder;
 import com.xabber.android.ui.helper.BaseSettingsActivity;
 import com.xabber.android.ui.helper.OrbotHelper;
-import com.xabber.androiddev.R;
+import com.xabber.android.classic.R;
 
 public class AccountEditor extends BaseSettingsActivity implements
 		OnPreferenceClickListener {

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

@@ -30,7 +30,7 @@ import com.xabber.android.ui.adapter.AccountListAdapter;
 import com.xabber.android.ui.adapter.BaseListEditorAdapter;
 import com.xabber.android.ui.adapter.UpdatableAdapter;
 import com.xabber.android.ui.helper.BaseListEditor;
-import com.xabber.androiddev.R;
+import com.xabber.android.classic.R;
 
 public class AccountList extends BaseListEditor<String> implements
 		OnAccountChangedListener {

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

@@ -24,7 +24,7 @@ import com.xabber.android.data.account.AccountManager;
 import com.xabber.android.data.account.ArchiveMode;
 import com.xabber.android.data.intent.AccountIntentBuilder;
 import com.xabber.android.ui.helper.ManagedDialog;
-import com.xabber.androiddev.R;
+import com.xabber.android.classic.R;
 
 /**
  * Dialog with request to enable message archive.

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

@@ -29,7 +29,7 @@ import com.xabber.android.data.connection.ConnectionManager;
 import com.xabber.android.data.connection.PendingCertificate;
 import com.xabber.android.data.intent.SegmentIntentBuilder;
 import com.xabber.android.ui.helper.ManagedDialog;
-import com.xabber.androiddev.R;
+import com.xabber.android.classic.R;
 
 /**
  * Dialog to confirm invalid certificate.

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

@@ -28,7 +28,7 @@ import com.xabber.android.data.account.ArchiveMode;
 import com.xabber.android.data.intent.EntityIntentBuilder;
 import com.xabber.android.data.message.chat.ChatManager;
 import com.xabber.android.ui.helper.BaseSettingsActivity;
-import com.xabber.androiddev.R;
+import com.xabber.android.classic.R;
 
 public class ChatEditor extends BaseSettingsActivity {
 

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

@@ -31,7 +31,7 @@ import com.xabber.android.data.message.OnChatChangedListener;
 import com.xabber.android.data.roster.OnContactChangedListener;
 import com.xabber.android.ui.adapter.ChatListAdapter;
 import com.xabber.android.ui.helper.ManagedListActivity;
-import com.xabber.androiddev.R;
+import com.xabber.android.classic.R;
 
 public class ChatList extends ManagedListActivity implements
 		OnAccountChangedListener, OnContactChangedListener,

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

@@ -73,7 +73,7 @@ import com.xabber.android.ui.dialog.ExportChatDialogBuilder;
 import com.xabber.android.ui.helper.ManagedActivity;
 import com.xabber.android.ui.widget.PageSwitcher;
 import com.xabber.android.ui.widget.PageSwitcher.OnSelectListener;
-import com.xabber.androiddev.R;
+import com.xabber.android.classic.R;
 
 /**
  * Chat activity.

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

@@ -44,7 +44,7 @@ import com.xabber.android.ui.adapter.AccountChooseAdapter;
 import com.xabber.android.ui.dialog.ConfirmDialogBuilder;
 import com.xabber.android.ui.dialog.ConfirmDialogListener;
 import com.xabber.android.ui.dialog.DialogBuilder;
-import com.xabber.androiddev.R;
+import com.xabber.android.classic.R;
 
 public class ContactAdd extends GroupListActivity implements
 		View.OnClickListener, ConfirmDialogListener, OnItemSelectedListener {

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

@@ -33,7 +33,7 @@ import com.xabber.android.data.roster.AbstractContact;
 import com.xabber.android.data.roster.OnContactChangedListener;
 import com.xabber.android.data.roster.RosterManager;
 import com.xabber.android.ui.helper.ContactTitleInflater;
-import com.xabber.androiddev.R;
+import com.xabber.android.classic.R;
 import com.xabber.xmpp.address.Jid;
 
 public class ContactEditor extends GroupListActivity implements

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

@@ -85,7 +85,7 @@ import com.xabber.android.ui.dialog.ConfirmDialogListener;
 import com.xabber.android.ui.dialog.DialogBuilder;
 import com.xabber.android.ui.dialog.GroupRenameDialogBuilder;
 import com.xabber.android.ui.helper.ManagedListActivity;
-import com.xabber.androiddev.R;
+import com.xabber.android.classic.R;
 import com.xabber.xmpp.address.Jid;
 import com.xabber.xmpp.uri.XMPPUri;
 

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

@@ -49,7 +49,7 @@ import com.xabber.android.data.roster.RosterContact;
 import com.xabber.android.data.roster.RosterManager;
 import com.xabber.android.ui.helper.ManagedPreferenceActivity;
 import com.xabber.android.ui.widget.StatusPreference;
-import com.xabber.androiddev.R;
+import com.xabber.android.classic.R;
 import com.xabber.xmpp.address.Jid;
 import com.xabber.xmpp.vcard.Address;
 import com.xabber.xmpp.vcard.AddressProperty;

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

@@ -51,7 +51,7 @@ import com.xabber.android.ui.dialog.NotificationDialogBuilder;
 import com.xabber.android.ui.dialog.NotificationDialogListener;
 import com.xabber.android.ui.helper.ContactTitleInflater;
 import com.xabber.android.ui.helper.ManagedActivity;
-import com.xabber.androiddev.R;
+import com.xabber.android.classic.R;
 import com.xabber.xmpp.address.Jid;
 
 public class FingerprintViewer extends ManagedActivity implements

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

@@ -34,7 +34,7 @@ import com.xabber.android.ui.dialog.ConfirmDialogListener;
 import com.xabber.android.ui.dialog.DialogBuilder;
 import com.xabber.android.ui.dialog.GroupAddDialogBuilder;
 import com.xabber.android.ui.helper.ManagedListActivity;
-import com.xabber.androiddev.R;
+import com.xabber.android.classic.R;
 
 /**
  * Manage list of selected groups.

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

@@ -31,7 +31,7 @@ import com.xabber.android.data.LogManager;
 import com.xabber.android.data.account.OnAccountChangedListener;
 import com.xabber.android.service.XabberService;
 import com.xabber.android.ui.helper.SingleActivity;
-import com.xabber.androiddev.R;
+import com.xabber.android.classic.R;
 
 public class LoadActivity extends SingleActivity implements
 		OnAccountChangedListener {

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

@@ -44,7 +44,7 @@ import com.xabber.android.ui.dialog.ConfirmDialogBuilder;
 import com.xabber.android.ui.dialog.ConfirmDialogListener;
 import com.xabber.android.ui.dialog.DialogBuilder;
 import com.xabber.android.ui.helper.ManagedActivity;
-import com.xabber.androiddev.R;
+import com.xabber.android.classic.R;
 
 public class MUCEditor extends ManagedActivity implements View.OnClickListener,
 		OnItemSelectedListener, ConfirmDialogListener {

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

@@ -29,7 +29,7 @@ import com.xabber.android.data.NetworkException;
 import com.xabber.android.data.account.AccountProtocol;
 import com.xabber.android.data.account.OAuthManager;
 import com.xabber.android.ui.helper.ManagedActivity;
-import com.xabber.androiddev.R;
+import com.xabber.android.classic.R;
 
 /**
  * Activity with WebView for OAuth authorization.

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

@@ -29,7 +29,7 @@ import com.xabber.android.data.intent.EntityIntentBuilder;
 import com.xabber.android.data.roster.OnContactChangedListener;
 import com.xabber.android.ui.adapter.OccupantListAdapter;
 import com.xabber.android.ui.helper.ManagedListActivity;
-import com.xabber.androiddev.R;
+import com.xabber.android.classic.R;
 import com.xabber.xmpp.address.Jid;
 
 /**

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

@@ -25,7 +25,7 @@ import com.xabber.android.data.Application;
 import com.xabber.android.data.account.AccountManager;
 import com.xabber.android.data.intent.AccountIntentBuilder;
 import com.xabber.android.ui.helper.ManagedDialog;
-import com.xabber.androiddev.R;
+import com.xabber.android.classic.R;
 
 /**
  * Dialog with password request for authentication.

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

@@ -30,7 +30,7 @@ import com.xabber.android.data.intent.SegmentIntentBuilder;
 import com.xabber.android.data.message.phrase.Phrase;
 import com.xabber.android.data.message.phrase.PhraseManager;
 import com.xabber.android.ui.helper.BaseSettingsActivity;
-import com.xabber.androiddev.R;
+import com.xabber.android.classic.R;
 
 public class PhraseEditor extends BaseSettingsActivity {
 

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

@@ -23,7 +23,7 @@ import com.xabber.android.data.message.phrase.PhraseManager;
 import com.xabber.android.ui.adapter.BaseListEditorAdapter;
 import com.xabber.android.ui.adapter.PhraseListAdapter;
 import com.xabber.android.ui.helper.BaseListEditor;
-import com.xabber.androiddev.R;
+import com.xabber.android.classic.R;
 
 public class PhraseList extends BaseListEditor<Integer> {
 

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

@@ -41,7 +41,7 @@ import com.xabber.android.ui.dialog.ConfirmDialogListener;
 import com.xabber.android.ui.dialog.DialogBuilder;
 import com.xabber.android.ui.helper.ManagedPreferenceActivity;
 import com.xabber.android.ui.helper.PreferenceSummaryHelper;
-import com.xabber.androiddev.R;
+import com.xabber.android.classic.R;
 
 public class PreferenceEditor extends ManagedPreferenceActivity implements
 		OnPreferenceClickListener, OnSharedPreferenceChangeListener,

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

@@ -37,7 +37,7 @@ import com.xabber.android.data.roster.OnContactChangedListener;
 import com.xabber.android.data.roster.RosterManager;
 import com.xabber.android.ui.helper.ContactTitleInflater;
 import com.xabber.android.ui.helper.ManagedActivity;
-import com.xabber.androiddev.R;
+import com.xabber.android.classic.R;
 import com.xabber.xmpp.address.Jid;
 
 /**

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

@@ -42,7 +42,7 @@ import com.xabber.android.ui.adapter.StatusEditorAdapter;
 import com.xabber.android.ui.adapter.StatusModeAdapter;
 import com.xabber.android.ui.adapter.UpdatableAdapter;
 import com.xabber.android.ui.helper.ManagedListActivity;
-import com.xabber.androiddev.R;
+import com.xabber.android.classic.R;
 
 public class StatusEditor extends ManagedListActivity implements
 		View.OnClickListener, OnItemClickListener {

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

@@ -26,7 +26,7 @@ import android.widget.TextView;
 
 import com.xabber.android.data.account.AccountManager;
 import com.xabber.android.data.extension.avatar.AvatarManager;
-import com.xabber.androiddev.R;
+import com.xabber.android.classic.R;
 
 /**
  * Adapter for drop down list of accounts.

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

@@ -30,7 +30,7 @@ import com.xabber.android.data.account.AccountManager;
 import com.xabber.android.data.connection.ConnectionState;
 import com.xabber.android.data.extension.avatar.AvatarManager;
 import com.xabber.android.ui.AccountList;
-import com.xabber.androiddev.R;
+import com.xabber.android.classic.R;
 
 /**
  * Adapter for the list of accounts for {@link AccountList}.

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

@@ -28,7 +28,7 @@ import com.xabber.android.data.SettingsManager;
 import com.xabber.android.data.account.AccountManager;
 import com.xabber.android.data.account.StatusMode;
 import com.xabber.android.data.extension.avatar.AvatarManager;
-import com.xabber.androiddev.R;
+import com.xabber.android.classic.R;
 
 /**
  * Adapter for the list of accounts in the title of contact list.

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

@@ -25,7 +25,7 @@ import android.widget.TextView;
 
 import com.xabber.android.data.account.AccountManager;
 import com.xabber.android.data.account.AccountType;
-import com.xabber.androiddev.R;
+import com.xabber.android.classic.R;
 
 /**
  * Adapter for drop down list of account's types.

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

@@ -32,7 +32,7 @@ import android.widget.TextView;
 import com.xabber.android.data.SettingsManager;
 import com.xabber.android.data.roster.AbstractContact;
 import com.xabber.android.ui.helper.AbstractAvatarInflaterHelper;
-import com.xabber.androiddev.R;
+import com.xabber.android.classic.R;
 
 /**
  * Provides views and fills them with data for {@link BaseContactAdapter}.

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

@@ -20,7 +20,7 @@ import android.view.View;
 
 import com.xabber.android.data.message.MessageManager;
 import com.xabber.android.data.roster.AbstractContact;
-import com.xabber.androiddev.R;
+import com.xabber.android.classic.R;
 
 /**
  * Inflate view with contact's last message or status text as well as active

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

@@ -32,7 +32,7 @@ import com.xabber.android.data.roster.AbstractContact;
 import com.xabber.android.data.roster.RosterManager;
 import com.xabber.android.ui.ChatList;
 import com.xabber.android.ui.helper.AbstractAvatarInflaterHelper;
-import com.xabber.androiddev.R;
+import com.xabber.android.classic.R;
 
 /**
  * Adapter for {@link ChatList}.

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

@@ -47,7 +47,7 @@ import com.xabber.android.data.roster.AbstractContact;
 import com.xabber.android.data.roster.RosterManager;
 import com.xabber.android.utils.Emoticons;
 import com.xabber.android.utils.StringUtils;
-import com.xabber.androiddev.R;
+import com.xabber.android.classic.R;
 
 /**
  * Adapter for the list of messages in the chat.

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

@@ -48,7 +48,7 @@ import com.xabber.android.data.roster.RosterManager;
 import com.xabber.android.ui.helper.AbstractAvatarInflaterHelper;
 import com.xabber.android.ui.helper.ContactTitleInflater;
 import com.xabber.android.ui.widget.PageSwitcher;
-import com.xabber.androiddev.R;
+import com.xabber.android.classic.R;
 import com.xabber.xmpp.address.Jid;
 
 /**

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

@@ -20,7 +20,7 @@ import android.widget.ImageView;
 
 import com.xabber.android.data.extension.capability.ClientSoftware;
 import com.xabber.android.data.roster.AbstractContact;
-import com.xabber.androiddev.R;
+import com.xabber.android.classic.R;
 
 /**
  * Inflate view with contact's client software.

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

@@ -42,7 +42,7 @@ import com.xabber.android.data.roster.AbstractContact;
 import com.xabber.android.data.roster.GroupManager;
 import com.xabber.android.data.roster.RosterContact;
 import com.xabber.android.data.roster.RosterManager;
-import com.xabber.androiddev.R;
+import com.xabber.android.classic.R;
 
 /**
  * Adapter for contact list in the main activity.

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

@@ -36,7 +36,7 @@ import com.xabber.android.data.roster.Group;
 import com.xabber.android.data.roster.GroupManager;
 import com.xabber.android.data.roster.GroupStateProvider;
 import com.xabber.android.data.roster.ShowOfflineMode;
-import com.xabber.androiddev.R;
+import com.xabber.android.classic.R;
 
 /**
  * Provide grouping implementation for the list of contacts.

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

@@ -28,7 +28,7 @@ import com.xabber.android.data.extension.avatar.AvatarManager;
 import com.xabber.android.data.extension.muc.MUCManager;
 import com.xabber.android.data.extension.muc.Occupant;
 import com.xabber.android.ui.OccupantList;
-import com.xabber.androiddev.R;
+import com.xabber.android.classic.R;
 import com.xabber.xmpp.muc.Role;
 
 /**

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

@@ -23,7 +23,7 @@ import android.widget.TextView;
 
 import com.xabber.android.data.message.phrase.Phrase;
 import com.xabber.android.data.message.phrase.PhraseManager;
-import com.xabber.androiddev.R;
+import com.xabber.android.classic.R;
 
 /**
  * This class manage list of phrases.

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

@@ -20,7 +20,7 @@ import android.view.ViewGroup;
 import android.widget.ImageView;
 
 import com.xabber.android.data.roster.AbstractContact;
-import com.xabber.androiddev.R;
+import com.xabber.android.classic.R;
 
 /**
  * Inflate view with contact's status mode.

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

@@ -26,7 +26,7 @@ import android.widget.TextView;
 
 import com.xabber.android.data.account.AccountManager;
 import com.xabber.android.data.account.SavedStatus;
-import com.xabber.androiddev.R;
+import com.xabber.android.classic.R;
 
 /**
  * Adapter for saved statuses.

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

@@ -24,7 +24,7 @@ import android.widget.ImageView;
 import android.widget.TextView;
 
 import com.xabber.android.data.account.StatusMode;
-import com.xabber.androiddev.R;
+import com.xabber.android.classic.R;
 
 /**
  * Adapter for available status modes.

app/src/main/java/com/xabber/android/ui/dialog/ExportChatDialogBuilder.java

@@ -23,7 +23,7 @@ import android.widget.Toast;
 
 import com.xabber.android.data.account.AccountManager;
 import com.xabber.android.data.roster.RosterManager;
-import com.xabber.androiddev.R;
+import com.xabber.android.classic.R;
 
 public class ExportChatDialogBuilder extends ConfirmDialogBuilder {
 

app/src/main/java/com/xabber/android/ui/dialog/GroupAddDialogBuilder.java

@@ -22,7 +22,7 @@ import android.view.View;
 import android.widget.EditText;
 import android.widget.Toast;
 
-import com.xabber.androiddev.R;
+import com.xabber.android.classic.R;
 
 public class GroupAddDialogBuilder extends ConfirmDialogBuilder {
 

app/src/main/java/com/xabber/android/ui/dialog/GroupRenameDialogBuilder.java

@@ -20,7 +20,7 @@ import android.view.View;
 import android.widget.EditText;
 import android.widget.Toast;
 
-import com.xabber.androiddev.R;
+import com.xabber.android.classic.R;
 
 public class GroupRenameDialogBuilder extends ConfirmDialogBuilder {
 

app/src/main/java/com/xabber/android/ui/dialog/OrbotInstallerDialogBuilder.java

@@ -20,7 +20,7 @@ import android.content.Intent;
 import android.net.Uri;
 
 import com.xabber.android.ui.helper.OrbotHelper;
-import com.xabber.androiddev.R;
+import com.xabber.android.classic.R;
 
 /**
  * Orbot installer dialog builder.

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

@@ -32,7 +32,7 @@ import com.xabber.android.ui.adapter.BaseListEditorAdapter;
 import com.xabber.android.ui.dialog.ConfirmDialogBuilder;
 import com.xabber.android.ui.dialog.ConfirmDialogListener;
 import com.xabber.android.ui.dialog.DialogBuilder;
-import com.xabber.androiddev.R;
+import com.xabber.android.classic.R;
 
 /**
  * Provide possibility to add, edit and delete list items.

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

@@ -33,7 +33,7 @@ import android.view.Menu;
 import android.view.MenuItem;
 
 import com.xabber.android.ui.widget.RingtonePreference;
-import com.xabber.androiddev.R;
+import com.xabber.android.classic.R;
 
 /**
  * Provide possibility to edit, apply and discard settings.

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

@@ -32,7 +32,7 @@ import com.xabber.android.data.account.AccountManager;
 import com.xabber.android.data.extension.cs.ChatStateManager;
 import com.xabber.android.data.roster.AbstractContact;
 import com.xabber.android.utils.Emoticons;
-import com.xabber.androiddev.R;
+import com.xabber.android.classic.R;
 
 /**
  * Helper class to update <code>contact_title.xml</code>.

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

@@ -21,7 +21,7 @@ import android.view.ViewGroup;
 import android.view.Window;
 import android.widget.TextView;
 
-import com.xabber.androiddev.R;
+import com.xabber.android.classic.R;
 
 /**
  * Helper for dialog activities.

app/src/main/java/com/xabber/android/ui/widget/PageSwitcher.java

@@ -31,7 +31,7 @@ import android.widget.Scroller;
 
 import com.xabber.android.data.LogManager;
 import com.xabber.android.ui.adapter.SaveStateAdapter;
-import com.xabber.androiddev.R;
+import com.xabber.android.classic.R;
 
 /**
  * Widget to switch between chat pages.

app/src/main/java/com/xabber/android/ui/widget/PriorityPreference.java

@@ -19,7 +19,7 @@ import android.preference.EditTextPreference;
 import android.util.AttributeSet;
 import android.widget.Toast;
 
-import com.xabber.androiddev.R;
+import com.xabber.android.classic.R;
 
 /**
  * Preference to validate xmpp priority input and to show related hint.

app/src/main/java/com/xabber/android/ui/widget/StatusPreference.java

@@ -21,7 +21,7 @@ import android.view.View;
 import android.widget.ImageView;
 
 import com.xabber.android.data.account.StatusMode;
-import com.xabber.androiddev.R;
+import com.xabber.android.classic.R;
 
 /**
  * Preference to show status mode icon.

app/src/main/java/com/xabber/android/utils/Emoticons.java

@@ -26,7 +26,7 @@ import android.text.Spannable.Factory;
 import android.text.style.ImageSpan;
 
 import com.xabber.android.data.SettingsManager;
-import com.xabber.androiddev.R;
+import com.xabber.android.classic.R;
 
 /**
  * Emoticons.

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

@@ -15,7 +15,7 @@
 <resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">
   <string name="application_name">Xabber Classic</string>
   <string name="application_version">@string/development_versions_102</string>
-  <string name="application_package">com.xabber.androiddev</string>
+  <string name="application_package">com.xabber.android.classic</string>
   <string name="client_name">Xabber</string>
 
   <string name="development_versions_1">@string/production_versions_1</string>