From e7ea3063ca4e9c6c16368a75ae2ac443150f9706 Mon Sep 17 00:00:00 2001
From: Artem Umerov <artem1999.umerov@gmail.com>
Date: Sat, 25 Mar 2023 01:41:50 +0300
Subject: [PATCH] 18

18
---
 .../ragnarok/fenrir/activity/MainActivity.kt  | 268 ++++++++++--------
 .../fragment/SecurityPreferencesFragment.kt   |  11 +
 .../fragment/accounts/AccountsFragment.kt     |   8 +
 .../fragment/accounts/AccountsPresenter.kt    |  10 +-
 .../fenrir/fragment/accounts/IAccountsView.kt |   2 +
 .../fenrir/settings/AccountsSettings.kt       | 123 +++++---
 .../dev/ragnarok/fenrir/settings/ISettings.kt |   8 +-
 .../dev/ragnarok/fenrir/util/ShortcutUtils.kt |   2 +-
 app_fenrir/src/main/res/values-be/strings.xml |   2 +
 app_fenrir/src/main/res/values-ru/strings.xml |   2 +
 app_fenrir/src/main/res/values/strings.xml    |   2 +
 11 files changed, 280 insertions(+), 158 deletions(-)

diff --git a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/activity/MainActivity.kt b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/activity/MainActivity.kt
index 53d403873..048ac0482 100644
--- a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/activity/MainActivity.kt
+++ b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/activity/MainActivity.kt
@@ -791,133 +791,161 @@ open class MainActivity : AppCompatActivity(), NavigationDrawerCallbacks, OnSect
         if (intent == null) {
             return false
         }
-        if (ACTION_OPEN_WALL == intent.action) {
-            val owner_id = intent.extras!!.getLong(Extra.OWNER_ID)
-            PlaceFactory.getOwnerWallPlace(mAccountId, owner_id, null).tryOpenWith(this)
-            return true
-        }
-        if (ACTION_SWITH_ACCOUNT == intent.action) {
-            val newAccountId = intent.extras!!.getLong(Extra.ACCOUNT_ID)
-            if (Settings.get().accounts().current != newAccountId) {
-                Settings.get()
-                    .accounts().current = newAccountId
-                mAccountId = newAccountId
+        Logger.d(TAG, "handleIntent, extras: ${intent.extras}, action: ${intent.action}")
+        when {
+            ACTION_OPEN_WALL == intent.action -> {
+                val owner_id = intent.extras!!.getLong(Extra.OWNER_ID)
+                PlaceFactory.getOwnerWallPlace(mAccountId, owner_id, null).tryOpenWith(this)
+                return true
             }
-            intent.action = ACTION_MAIN
-        }
-        if (ACTION_SHORTCUT_WALL == intent.action) {
-            val newAccountId = intent.extras!!.getLong(Extra.ACCOUNT_ID)
-            val ownerId = intent.extras!!.getLong(Extra.OWNER_ID)
-            if (Settings.get().accounts().current != newAccountId) {
-                Settings.get()
-                    .accounts().current = newAccountId
-                mAccountId = newAccountId
+
+            ACTION_SWITCH_ACCOUNT == intent.action -> {
+                val newAccountId = intent.extras!!.getLong(Extra.ACCOUNT_ID)
+                if (Settings.get().accounts().current != newAccountId) {
+                    if (!Settings.get().accounts().registered.contains(newAccountId)) {
+                        createCustomToast(this).showToastError(R.string.account_not_registered)
+                    } else {
+                        Settings.get()
+                            .accounts().current = newAccountId
+                        mAccountId = newAccountId
+                    }
+                }
+                intent.action = ACTION_MAIN
             }
-            clearBackStack()
-            openPlace(PlaceFactory.getOwnerWallPlace(newAccountId, ownerId, null))
-            return true
-        }
-        val extras = intent.extras
-        val action = intent.action
-        Logger.d(TAG, "handleIntent, extras: $extras, action: $action")
-        if (Intent.ACTION_SEND_MULTIPLE == action) {
-            val mime = intent.type
-            if (getMainActivityTransform() == MainActivityTransforms.MAIN && extras != null && mime.nonNullNoEmpty() && isMimeAudio(
-                    mime
-                ) && extras.containsKey(Intent.EXTRA_STREAM)
-            ) {
-                val uris = intent.getParcelableArrayListExtraCompat<Uri>(Intent.EXTRA_STREAM)
-                if (uris.nonNullNoEmpty()) {
-                    val playlist = ArrayList<Audio>(
-                        uris.size
-                    )
-                    for (i in uris) {
-                        val track = UploadUtils.findFileName(this, i) ?: return false
-                        var TrackName = track.replace(".mp3", "")
-                        var Artist = ""
-                        val arr = TrackName.split(Regex(" - ")).toTypedArray()
-                        if (arr.size > 1) {
-                            Artist = arr[0]
-                            TrackName = TrackName.replace("$Artist - ", "")
-                        }
-                        val tmp = Audio().setIsLocal().setThumb_image_big(
-                            "share_$i"
-                        ).setThumb_image_little("share_$i").setUrl(i.toString())
-                            .setOwnerId(mAccountId).setArtist(Artist).setTitle(TrackName)
-                            .setId(i.toString().hashCode())
-                        playlist.add(tmp)
+
+            ACTION_SHORTCUT_WALL == intent.action -> {
+                var newAccountId = intent.extras!!.getLong(Extra.ACCOUNT_ID)
+                val prefsAid = Settings.get()
+                    .accounts()
+                    .current
+                val ownerId = intent.extras!!.getLong(Extra.OWNER_ID)
+                if (prefsAid != newAccountId) {
+                    if (!Settings.get().accounts().registered.contains(newAccountId)) {
+                        newAccountId = prefsAid
+                        createCustomToast(this).showToastError(R.string.account_not_registered)
+                    } else {
+                        Settings.get()
+                            .accounts().current = newAccountId
+                        mAccountId = newAccountId
                     }
-                    intent.removeExtra(Intent.EXTRA_STREAM)
-                    startForPlayList(this, playlist, 0, false)
-                    PlaceFactory.getPlayerPlace(mAccountId).tryOpenWith(this)
                 }
+                clearBackStack()
+                openPlace(PlaceFactory.getOwnerWallPlace(newAccountId, ownerId, null))
+                return true
             }
-        }
-        if (extras != null && checkInputExist(this)) {
-            mCurrentFrontSection = AbsNavigationView.SECTION_ITEM_DIALOGS
-            openNavigationPage(AbsNavigationView.SECTION_ITEM_DIALOGS, false)
-            return true
-        }
-        if (ACTION_SEND_ATTACHMENTS == action) {
-            mCurrentFrontSection = AbsNavigationView.SECTION_ITEM_DIALOGS
-            openNavigationPage(AbsNavigationView.SECTION_ITEM_DIALOGS, false)
-            return true
-        }
-        if (ACTION_OPEN_PLACE == action) {
-            val place: Place = intent.getParcelableExtraCompat(Extra.PLACE) ?: return false
-            openPlace(place)
-            return if (place.type == Place.CHAT) {
-                Settings.get().ui().swipes_chat_mode != SwipesChatMode.SLIDR || Settings.get()
+
+            ACTION_CHAT_FROM_SHORTCUT == intent.action -> {
+                var aid = intent.extras!!.getLong(Extra.ACCOUNT_ID)
+                val prefsAid = Settings.get()
+                    .accounts()
+                    .current
+                if (prefsAid != aid) {
+                    if (!Settings.get().accounts().registered.contains(aid)) {
+                        aid = prefsAid
+                        createCustomToast(this).showToastError(R.string.account_not_registered)
+                    } else {
+                        Settings.get()
+                            .accounts().current = aid
+                    }
+                }
+                val peerId = intent.extras!!.getLong(Extra.PEER_ID)
+                val title = intent.getStringExtra(Extra.TITLE)
+                val imgUrl = intent.getStringExtra(Extra.IMAGE)
+                val peer = Peer(peerId).setTitle(title).setAvaUrl(imgUrl)
+                PlaceFactory.getChatPlace(aid, aid, peer).tryOpenWith(this)
+                return Settings.get()
+                    .ui().swipes_chat_mode != SwipesChatMode.SLIDR || Settings.get()
                     .ui().swipes_chat_mode == SwipesChatMode.DISABLED
-            } else true
-        }
-        if (ACTION_OPEN_AUDIO_PLAYER == action) {
-            openPlace(PlaceFactory.getPlayerPlace(mAccountId))
-            return false
-        }
-        if (ACTION_CHAT_FROM_SHORTCUT == action) {
-            val aid = intent.extras!!.getLong(Extra.ACCOUNT_ID)
-            val prefsAid = Settings.get()
-                .accounts()
-                .current
-            if (prefsAid != aid) {
-                Settings.get()
-                    .accounts().current = aid
             }
-            val peerId = intent.extras!!.getLong(Extra.PEER_ID)
-            val title = intent.getStringExtra(Extra.TITLE)
-            val imgUrl = intent.getStringExtra(Extra.IMAGE)
-            val peer = Peer(peerId).setTitle(title).setAvaUrl(imgUrl)
-            PlaceFactory.getChatPlace(aid, aid, peer).tryOpenWith(this)
-            return Settings.get().ui().swipes_chat_mode != SwipesChatMode.SLIDR || Settings.get()
-                .ui().swipes_chat_mode == SwipesChatMode.DISABLED
-        }
-        if (Intent.ACTION_VIEW == action) {
-            val data = intent.data
-            val mime = intent.type ?: ""
-            if (getMainActivityTransform() == MainActivityTransforms.MAIN && mime.nonNullNoEmpty() && isMimeAudio(
-                    mime
-                )
-            ) {
-                val track = UploadUtils.findFileName(this, data) ?: return false
-                var TrackName = track.replace(".mp3", "")
-                var Artist = ""
-                val arr = TrackName.split(Regex(" - ")).toTypedArray()
-                if (arr.size > 1) {
-                    Artist = arr[0]
-                    TrackName = TrackName.replace("$Artist - ", "")
+
+            Intent.ACTION_SEND_MULTIPLE == intent.action -> {
+                val mime = intent.type
+                if (getMainActivityTransform() == MainActivityTransforms.MAIN && intent.extras != null && mime.nonNullNoEmpty() && isMimeAudio(
+                        mime
+                    ) && intent.extras?.containsKey(Intent.EXTRA_STREAM) == true
+                ) {
+                    val uris = intent.getParcelableArrayListExtraCompat<Uri>(Intent.EXTRA_STREAM)
+                    if (uris.nonNullNoEmpty()) {
+                        val playlist = ArrayList<Audio>(
+                            uris.size
+                        )
+                        for (i in uris) {
+                            val track = UploadUtils.findFileName(this, i) ?: return false
+                            var TrackName = track.replace(".mp3", "")
+                            var Artist = ""
+                            val arr = TrackName.split(Regex(" - ")).toTypedArray()
+                            if (arr.size > 1) {
+                                Artist = arr[0]
+                                TrackName = TrackName.replace("$Artist - ", "")
+                            }
+                            val tmp = Audio().setIsLocal().setThumb_image_big(
+                                "share_$i"
+                            ).setThumb_image_little("share_$i").setUrl(i.toString())
+                                .setOwnerId(mAccountId).setArtist(Artist).setTitle(TrackName)
+                                .setId(i.toString().hashCode())
+                            playlist.add(tmp)
+                        }
+                        intent.removeExtra(Intent.EXTRA_STREAM)
+                        startForPlayList(this, playlist, 0, false)
+                        PlaceFactory.getPlayerPlace(mAccountId).tryOpenWith(this)
+                    }
                 }
-                val tmp =
-                    Audio().setIsLocal().setThumb_image_big("share_$data").setThumb_image_little(
-                        "share_$data"
-                    ).setUrl(data.toString()).setOwnerId(mAccountId).setArtist(Artist)
-                        .setTitle(TrackName).setId(data.toString().hashCode())
-                startForPlayList(this, ArrayList(listOf(tmp)), 0, false)
-                PlaceFactory.getPlayerPlace(mAccountId).tryOpenWith(this)
+            }
+
+            ACTION_SEND_ATTACHMENTS == intent.action -> {
+                mCurrentFrontSection = AbsNavigationView.SECTION_ITEM_DIALOGS
+                openNavigationPage(AbsNavigationView.SECTION_ITEM_DIALOGS, false)
+                return true
+            }
+
+            ACTION_OPEN_PLACE == intent.action -> {
+                val place: Place = intent.getParcelableExtraCompat(Extra.PLACE) ?: return false
+                openPlace(place)
+                return if (place.type == Place.CHAT) {
+                    Settings.get().ui().swipes_chat_mode != SwipesChatMode.SLIDR || Settings.get()
+                        .ui().swipes_chat_mode == SwipesChatMode.DISABLED
+                } else true
+            }
+
+            ACTION_OPEN_AUDIO_PLAYER == intent.action -> {
+                openPlace(PlaceFactory.getPlayerPlace(mAccountId))
                 return false
             }
-            LinkHelper.openUrl(this, mAccountId, data.toString(), isMain)
-            return true
+
+            Intent.ACTION_VIEW == intent.action -> {
+                val data = intent.data
+                val mime = intent.type ?: ""
+                if (getMainActivityTransform() == MainActivityTransforms.MAIN && mime.nonNullNoEmpty() && isMimeAudio(
+                        mime
+                    )
+                ) {
+                    val track = UploadUtils.findFileName(this, data) ?: return false
+                    var TrackName = track.replace(".mp3", "")
+                    var Artist = ""
+                    val arr = TrackName.split(Regex(" - ")).toTypedArray()
+                    if (arr.size > 1) {
+                        Artist = arr[0]
+                        TrackName = TrackName.replace("$Artist - ", "")
+                    }
+                    val tmp =
+                        Audio().setIsLocal().setThumb_image_big("share_$data")
+                            .setThumb_image_little(
+                                "share_$data"
+                            ).setUrl(data.toString()).setOwnerId(mAccountId).setArtist(Artist)
+                            .setTitle(TrackName).setId(data.toString().hashCode())
+                    startForPlayList(this, ArrayList(listOf(tmp)), 0, false)
+                    PlaceFactory.getPlayerPlace(mAccountId).tryOpenWith(this)
+                    return false
+                }
+                LinkHelper.openUrl(this, mAccountId, data.toString(), isMain)
+                return true
+            }
+
+            intent.extras != null && checkInputExist(this) -> {
+                mCurrentFrontSection = AbsNavigationView.SECTION_ITEM_DIALOGS
+                openNavigationPage(AbsNavigationView.SECTION_ITEM_DIALOGS, false)
+                return true
+            }
         }
         return false
     }
@@ -1861,14 +1889,16 @@ open class MainActivity : AppCompatActivity(), NavigationDrawerCallbacks, OnSect
 
     companion object {
         const val ACTION_MAIN = "android.intent.action.MAIN"
-        const val ACTION_CHAT_FROM_SHORTCUT = "dev.ragnarok.fenrir.ACTION_CHAT_FROM_SHORTCUT"
         const val ACTION_OPEN_PLACE = "dev.ragnarok.fenrir.activity.MainActivity.openPlace"
         const val ACTION_OPEN_AUDIO_PLAYER =
             "dev.ragnarok.fenrir.activity.MainActivity.openAudioPlayer"
         const val ACTION_SEND_ATTACHMENTS = "dev.ragnarok.fenrir.ACTION_SEND_ATTACHMENTS"
-        const val ACTION_SWITH_ACCOUNT = "dev.ragnarok.fenrir.ACTION_SWITH_ACCOUNT"
+
+        const val ACTION_SWITCH_ACCOUNT = "dev.ragnarok.fenrir.ACTION_SWITCH_ACCOUNT"
         const val ACTION_SHORTCUT_WALL = "dev.ragnarok.fenrir.ACTION_SHORTCUT_WALL"
         const val ACTION_OPEN_WALL = "dev.ragnarok.fenrir.ACTION_OPEN_WALL"
+        const val ACTION_CHAT_FROM_SHORTCUT = "dev.ragnarok.fenrir.ACTION_CHAT_FROM_SHORTCUT"
+
         const val EXTRA_NO_REQUIRE_PIN = "no_require_pin"
 
         /**
diff --git a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/SecurityPreferencesFragment.kt b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/SecurityPreferencesFragment.kt
index 12bf9c5b2..89b5963a3 100644
--- a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/SecurityPreferencesFragment.kt
+++ b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/SecurityPreferencesFragment.kt
@@ -302,6 +302,17 @@ class SecurityPreferencesFragment : AbsPreferencesFragment(),
                 defaultValue = true
                 titleRes = R.string.show_hidden_accounts
             }
+
+            switch("disable_hidden_accounts") {
+                defaultValue = false
+                titleRes = R.string.disable_hidden_accounts
+                onCheckedBeforeChange {
+                    !Settings.get().accounts().currentHidden
+                }
+                onCheckedChange {
+                    Settings.get().accounts().loadAccounts(true)
+                }
+            }
         }
     }
 
diff --git a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/accounts/AccountsFragment.kt b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/accounts/AccountsFragment.kt
index 7e4d70b98..da7c8c680 100644
--- a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/accounts/AccountsFragment.kt
+++ b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/accounts/AccountsFragment.kt
@@ -355,6 +355,14 @@ class AccountsFragment : BaseMvpFragment<AccountsPresenter, IAccountsView>(), IA
         mAdapter?.notifyItemRemoved(position)
     }
 
+    override fun notifyItemChanged(position: Int) {
+        mAdapter?.notifyItemChanged(position)
+    }
+
+    override fun notifyItemRangeChanged(positionStart: Int, count: Int) {
+        mAdapter?.notifyItemRangeChanged(positionStart, count)
+    }
+
     override fun notifyItemRangeRemoved(positionStart: Int, count: Int) {
         mAdapter?.notifyItemRangeRemoved(positionStart, count)
     }
diff --git a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/accounts/AccountsPresenter.kt b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/accounts/AccountsPresenter.kt
index ba31340bd..8fac20382 100644
--- a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/accounts/AccountsPresenter.kt
+++ b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/accounts/AccountsPresenter.kt
@@ -162,7 +162,7 @@ class AccountsPresenter(savedInstanceState: Bundle?) :
         Settings.get()
             .accounts()
             .removeDevice(account.getOwnerObjectId())
-        Settings.get()
+        val s = Settings.get()
             .accounts()
             .remove(account.getOwnerObjectId())
         DBHelper.removeDatabaseFor(context, account.getOwnerObjectId())
@@ -170,6 +170,14 @@ class AccountsPresenter(savedInstanceState: Bundle?) :
         val indx = indexOf(account.getOwnerObjectId())
         mData.removeAt(indx)
         view?.notifyItemRemoved(indx)
+        s?.let {
+            for (o in mData.indices) {
+                if (mData[o].getOwnerObjectId() == s) {
+                    view?.notifyItemChanged(o)
+                    break
+                }
+            }
+        }
         view?.resolveEmptyText(mData.isEmpty())
         appendDisposable(
             Includes.stores.stickers().clearAccount(account.getOwnerObjectId()).fromIOToMain()
diff --git a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/accounts/IAccountsView.kt b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/accounts/IAccountsView.kt
index 65b650f37..c01b2a13a 100644
--- a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/accounts/IAccountsView.kt
+++ b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/accounts/IAccountsView.kt
@@ -16,6 +16,8 @@ interface IAccountsView : IMvpView, IErrorView, IToastView {
 
     fun notifyDataSetChanged()
     fun notifyItemRemoved(position: Int)
+    fun notifyItemChanged(position: Int)
+    fun notifyItemRangeChanged(positionStart: Int, count: Int)
     fun notifyItemRangeRemoved(positionStart: Int, count: Int)
     fun notifyItemRangeInserted(positionStart: Int, count: Int)
     fun showColoredSnack(text: String?, @ColorInt color: Int)
diff --git a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/settings/AccountsSettings.kt b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/settings/AccountsSettings.kt
index d2aee6963..dae9c76f5 100644
--- a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/settings/AccountsSettings.kt
+++ b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/settings/AccountsSettings.kt
@@ -24,12 +24,7 @@ internal class AccountsSettings @SuppressLint("UseSparseArrays") constructor(con
     private val tokens: MutableMap<Long, String> = Collections.synchronizedMap(HashMap(1))
     private val types: MutableMap<Long, Int> = Collections.synchronizedMap(HashMap(1))
     private val devices: MutableMap<Long, String> = Collections.synchronizedMap(HashMap(1))
-    private val accounts: MutableSet<String> = Collections.synchronizedSet(
-        preferences.getStringSet(
-            KEY_ACCOUNT_UIDS,
-            HashSet(1)
-        )!!
-    )
+    private val accounts: MutableSet<Long> = Collections.synchronizedSet(HashSet(1))
     private val currentPublisher = PublishProcessor.create<Long>()
     private fun notifyAboutRegisteredChanges() {
         changesPublisher.onNext(this)
@@ -44,14 +39,7 @@ internal class AccountsSettings @SuppressLint("UseSparseArrays") constructor(con
     }
 
     override val registered: List<Long>
-        get() {
-            val ids: MutableList<Long> = ArrayList(accounts.size)
-            for (stringuid in accounts) {
-                val uid = stringuid.toLong()
-                ids.add(uid)
-            }
-            return ids
-        }
+        get() = ArrayList(accounts)
 
     @SuppressLint("CheckResult")
     private fun fireAccountChange() {
@@ -73,27 +61,32 @@ internal class AccountsSettings @SuppressLint("UseSparseArrays") constructor(con
             fireAccountChange()
         }
 
-    override fun remove(accountId: Long) {
+    override fun remove(accountId: Long): Long? {
         val currentAccountId = current
         val preferences = getPreferences(app)
-        accounts.remove(accountId.toString())
+        accounts.remove(accountId)
+        val tmpStore = fetchAccountsFromPrefs()
+        tmpStore.remove(accountId)
         preferences.edit()
-            .putStringSet(KEY_ACCOUNT_UIDS, accounts)
+            .putStringSet(KEY_ACCOUNT_UIDS, makeAccountsToPrefs(tmpStore))
             .apply()
+        var firstUserAccountId: Long? = null
         if (accountId == currentAccountId) {
             val accountIds = registered
-            var fisrtUserAccountId: Long? = null
 
             // делаем активным первый аккаунт ПОЛЬЗОВАТЕЛЯ
             for (existsId in accountIds) {
-                if (existsId > 0) {
-                    fisrtUserAccountId = existsId
+                if (existsId > 0 && !isHiddenType(
+                        types[existsId] ?: Constants.DEFAULT_ACCOUNT_TYPE
+                    )
+                ) {
+                    firstUserAccountId = existsId
                     break
                 }
             }
-            if (fisrtUserAccountId != null) {
+            if (firstUserAccountId != null) {
                 preferences.edit()
-                    .putLong(KEY_CURRENT, fisrtUserAccountId)
+                    .putLong(KEY_CURRENT, firstUserAccountId)
                     .apply()
             } else {
                 preferences.edit()
@@ -103,13 +96,16 @@ internal class AccountsSettings @SuppressLint("UseSparseArrays") constructor(con
         }
         notifyAboutRegisteredChanges()
         fireAccountChange()
+        return firstUserAccountId
     }
 
     override fun registerAccountId(accountId: Long, setCurrent: Boolean) {
         val preferences = getPreferences(app)
-        accounts.add(accountId.toString())
+        accounts.add(accountId)
         val editor = preferences.edit()
-        editor.putStringSet(KEY_ACCOUNT_UIDS, accounts)
+        val tmpStore = fetchAccountsFromPrefs()
+        tmpStore.add(accountId)
+        editor.putStringSet(KEY_ACCOUNT_UIDS, makeAccountsToPrefs(tmpStore))
         if (setCurrent) {
             editor.putLong(KEY_CURRENT, accountId)
         }
@@ -163,6 +159,17 @@ internal class AccountsSettings @SuppressLint("UseSparseArrays") constructor(con
     override val currentAccessToken: String?
         get() = tokens[current]
 
+    @AccountType
+    override val currentType: Int
+        get() = types[current] ?: Constants.DEFAULT_ACCOUNT_TYPE
+
+    private fun isHiddenType(@AccountType type: Int): Boolean {
+        return type == AccountType.KATE_HIDDEN || type == AccountType.VK_ANDROID_HIDDEN
+    }
+
+    override val currentHidden: Boolean
+        get() = isHiddenType(types[current] ?: Constants.DEFAULT_ACCOUNT_TYPE)
+
     @AccountType
     override fun getType(accountId: Long): Int {
         if (types.containsKey(accountId)) {
@@ -207,6 +214,58 @@ internal class AccountsSettings @SuppressLint("UseSparseArrays") constructor(con
             .apply()
     }
 
+    private fun makeAccountsToPrefs(data: HashSet<Long>): HashSet<String> {
+        val ret = HashSet<String>()
+        for (i in data) {
+            ret.add(i.toString())
+        }
+        return ret
+    }
+
+    private fun fetchAccountsFromPrefs(): HashSet<Long> {
+        val ret = HashSet<Long>()
+        for (i in preferences.getStringSet(
+            KEY_ACCOUNT_UIDS,
+            HashSet(1)
+        ).orEmpty()) {
+            ret.add(i.toLong())
+        }
+        return ret
+    }
+
+    override fun loadAccounts(refresh: Boolean) {
+        if (refresh) {
+            types.clear()
+            tokens.clear()
+            devices.clear()
+            accounts.clear()
+            accounts.addAll(
+                fetchAccountsFromPrefs()
+            )
+        }
+        val disableHidden = preferences.getBoolean("disable_hidden_accounts", false)
+        val aids: Collection<Long> = registered
+
+        for (aid in aids) {
+            types[aid] = preferences.getInt(typeAccKeyFor(aid), Constants.DEFAULT_ACCOUNT_TYPE)
+        }
+        for (aid in aids) {
+            if (disableHidden && isHiddenType(types[aid] ?: Constants.DEFAULT_ACCOUNT_TYPE)) {
+                accounts.remove(aid)
+                types.remove(aid)
+                continue
+            }
+            val token = preferences.getString(tokenKeyFor(aid), null)
+            if (token.nonNullNoEmpty()) {
+                tokens[aid] = token
+            }
+            val device = preferences.getString(deviceKeyFor(aid), null)
+            if (device.nonNullNoEmpty()) {
+                devices[aid] = device
+            }
+        }
+    }
+
     companion object {
         private const val KEY_ACCOUNT_UIDS = "account_uids"
         private const val KEY_CURRENT = "current_account_id_long"
@@ -228,17 +287,9 @@ internal class AccountsSettings @SuppressLint("UseSparseArrays") constructor(con
     }
 
     init {
-        val aids: Collection<Long> = registered
-        for (aid in aids) {
-            val token = preferences.getString(tokenKeyFor(aid), null)
-            if (token.nonNullNoEmpty()) {
-                tokens[aid] = token
-            }
-            val device = preferences.getString(deviceKeyFor(aid), null)
-            if (device.nonNullNoEmpty()) {
-                devices[aid] = device
-            }
-            types[aid] = preferences.getInt(typeAccKeyFor(aid), Constants.DEFAULT_ACCOUNT_TYPE)
-        }
+        accounts.addAll(
+            fetchAccountsFromPrefs()
+        )
+        loadAccounts(false)
     }
 }
\ No newline at end of file
diff --git a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/settings/ISettings.kt b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/settings/ISettings.kt
index 6cd6570c4..0fa425b15 100644
--- a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/settings/ISettings.kt
+++ b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/settings/ISettings.kt
@@ -165,7 +165,11 @@ interface ISettings {
         val registered: List<Long>
         var current: Long
         val currentAccessToken: String?
-        fun remove(accountId: Long)
+
+        @AccountType
+        val currentType: Int
+        val currentHidden: Boolean
+        fun remove(accountId: Long): Long?
         fun registerAccountId(accountId: Long, setCurrent: Boolean)
         fun storeAccessToken(accountId: Long, accessToken: String?)
         fun storeLogin(accountId: Long, loginCombo: String?)
@@ -182,6 +186,8 @@ interface ISettings {
         fun removeType(accountId: Long)
         fun removeLogin(accountId: Long)
 
+        fun loadAccounts(refresh: Boolean)
+
         companion object {
             const val INVALID_ID = -1L
         }
diff --git a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/util/ShortcutUtils.kt b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/util/ShortcutUtils.kt
index e7ec4dc1b..38633a3b7 100644
--- a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/util/ShortcutUtils.kt
+++ b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/util/ShortcutUtils.kt
@@ -47,7 +47,7 @@ object ShortcutUtils {
                 .get()
         }
         val intent = Intent(context.applicationContext, MainActivity::class.java)
-        intent.action = MainActivity.ACTION_SWITH_ACCOUNT
+        intent.action = MainActivity.ACTION_SWITCH_ACCOUNT
         intent.putExtra(Extra.ACCOUNT_ID, accountId)
         val id = "fenrir_account_$accountId"
         sendShortcutBroadcast(context, id, intent, title, avatar)
diff --git a/app_fenrir/src/main/res/values-be/strings.xml b/app_fenrir/src/main/res/values-be/strings.xml
index 97d26e61f..789cc30a9 100644
--- a/app_fenrir/src/main/res/values-be/strings.xml
+++ b/app_fenrir/src/main/res/values-be/strings.xml
@@ -1552,6 +1552,7 @@
     <string name="on_server">На серверы</string>
     <string name="no_system_equalizer">Няма сістэмнага эквалайзера</string>
     <string name="show_hidden_accounts">Паказваць схаваныя акаўнты</string>
+    <string name="disable_hidden_accounts">Блакаваць схаваныя акаўнты</string>
     <string name="set_device">Задаць прыладу</string>
     <string name="not_read">Непрачытаныя</string>
     <string name="not_read_show">Хуткія непрачытаныя</string>
@@ -1715,4 +1716,5 @@
     <string name="answer">Адказаць</string>
     <string name="clips">Кліпы</string>
     <string name="stories">Гісторыі</string>
+    <string name="account_not_registered">Акаўнт не зарэгістраваны!</string>
 </resources>
\ No newline at end of file
diff --git a/app_fenrir/src/main/res/values-ru/strings.xml b/app_fenrir/src/main/res/values-ru/strings.xml
index 753364f21..c68e13bee 100644
--- a/app_fenrir/src/main/res/values-ru/strings.xml
+++ b/app_fenrir/src/main/res/values-ru/strings.xml
@@ -1554,6 +1554,7 @@
     <string name="on_server">На сервере</string>
     <string name="no_system_equalizer">Нет системного эквалайзера</string>
     <string name="show_hidden_accounts">Показывать скрытые аккаунты</string>
+    <string name="disable_hidden_accounts">Блокировать скрытые аккаунты</string>
     <string name="set_device">Задать устройство</string>
     <string name="not_read">Непрочитанные</string>
     <string name="not_read_show">Быстрые непрочитанные</string>
@@ -1717,4 +1718,5 @@
     <string name="answer">Ответить</string>
     <string name="clips">Клипы</string>
     <string name="stories">Истории</string>
+    <string name="account_not_registered">Аккаунт не зарегистрирован!</string>
 </resources>
\ No newline at end of file
diff --git a/app_fenrir/src/main/res/values/strings.xml b/app_fenrir/src/main/res/values/strings.xml
index 0be71b06c..39a38604a 100644
--- a/app_fenrir/src/main/res/values/strings.xml
+++ b/app_fenrir/src/main/res/values/strings.xml
@@ -1791,6 +1791,7 @@
     <string name="on_server">On Server</string>
     <string name="no_system_equalizer">No system equalizer found</string>
     <string name="show_hidden_accounts">Show hidden accounts</string>
+    <string name="disable_hidden_accounts">Block hidden accounts</string>
     <string name="set_device">Set Device</string>
     <string name="not_read">Not read</string>
     <string name="not_read_show">Fast Unread</string>
@@ -1954,4 +1955,5 @@
     <string name="answer">Answer</string>
     <string name="clips">Clips</string>
     <string name="stories">Stories</string>
+    <string name="account_not_registered">Account not registered!</string>
 </resources>