Merge remote-tracking branch 'origin/music'

# Conflicts:
#	app/src/main/java/ru/vtosters/lite/ui/fragments/MediaFragment.java
#	app/src/main/java/ru/vtosters/lite/utils/ContactsUtils.java
#	app/src/main/java/ru/vtosters/lite/utils/ThemesUtils.java
#	smali/res/values-ru/strings.xml
#	smali/res/values/strings.xml

smali/lib/armeabi-v7a/libvoip_armv7-a-neon.so.REMOVED.git-id

@@ -1 +0,0 @@
-6278c6512808b17c9470c0b231c40ab1d01ef877

smali/res/values-ru/strings.xml

@@ -5953,8 +5953,12 @@
 
     <string name="download_mp3">Скачать как mp3</string>
     <string name="remove_from_cache">Удалить из кеша</string>
-    <string name="play_in_vkx">Воспроизвести в VK X</string>
+    <string name="add_to_cache">Добавить в кеш</string>
 
+    <string name="remove_from_cache_vkx">Удалить из VK X кеша</string>
+    <string name="add_to_cache_vkx">Добавить в кеш VK X</string>
+
+    <string name="play_in_vkx">Воспроизвести в VK X</string>
 
     <string name="thanksfordonate">Спасибо тебе за поддержку проекта!</string>
     <string name="getdonate">Поддержи проект донатом и получи бонусы</string>
@@ -6252,4 +6256,116 @@
 
     <string name="force_disable_psm_title">Не отправлять информацию о батарее</string>
     <string name="force_disable_psm_summ">Включение этой функции скроет информацию о состоянии вашего устройства в режиме экономии батареи и ВКонтакте будет отправлять вам медиаконтент без сильного сжатия и блюра</string>
+
+    <string name="track_bd_insert_err">Ошибка при записи трека в БД!</string>
+    <string name="cached_tracks_deleted">Кешированные песни удалены</string>
+    <string name="cached_track">Закешированный трек</string>
+    <string name="cached_tracks_title">Кешированные песни</string>
+    <string name="saved_tracks_title">Сохраненные треки</string>
+    <string name="cached_tracks_desc">Это - список всех кешированных треков. Данный плейлист НЕ СУЩЕСТВУЕТ в вашем профиле.\n\nПри отсутствии соединения с Интернетом данный плейлист превратится в обычный список треков.</string>
+    <string name="cached_album_warning">Это кешированный альбом!</string>
+    <string name="cached_playlist_loading">Загрузка плейлиста</string>
+
+    <string name="cached_content_title">Кешированный контент</string>
+    <string name="cached_content_empty">Похоже, тут пусто</string>
+    <string name="cached_content_empty_desc">У вас отсутствует кешированный контент</string>
+    <string name="cached_tracks_remove_confirm">Вы действительно хотите удалить все кешированные песни?</string>
+
+    <string name="vkx_integration_title">Включите интеграцию VK X!</string>
+    <string name="vkx_integration_desc">Получите доступ к хранилищу треков и возможности включать/кешировать треки из VTLite в VK X.\n\nПодробнее - в Настройки > Медиа контент > VK X</string>
+
+    <string name="music_downloading">Загрузка музыки</string>
+    <string name="music_downloading_progress">Прогресс загрузки музыки</string>
+
+    <string name="playlist_downloading">Загрузка плейлиста</string>
+    <string name="playlist_downloading_progress">Прогресс загрузки плейлиста</string>
+
+    <string name="caching_track_or_pic">Кеширование трека / обложки</string>
+
+    <string name="cached_tracks_counter">Всего закешировано %1$d песен</string>
+
+    <string name="autocache_title">Автокеширование песен</string>
+    <string name="autocache_summ">Автоматически кешировать все воспроизведенные вами песни</string>
+
+    <string name="playlist_download_notf">Загружено песен: %1$d из %2$d</string>
+
+    <string name="all_audio">Все аудио</string>
+    <string name="notf_audio_dl_user">Скачивание всех аудио пользователя</string>
+    <string name="no_cache_error">У вас отсутствуют кешированные песни</string>
+
+    <string name="download_method">Способ скачивания</string>
+    <string name="download_method_desc">Выберите способ скачивания всех своих аудио (без плейлистов)</string>
+    <string name="download_method_cache">В кеш</string>
+    <string name="download_method_mp3">Как .mp3</string>
+
+    <string name="audio_download_title">Скачивание всех своих аудио</string>
+
+    <string name="app_activities_error">Ошибка в работе приложения. Перезапустите приложение</string>
+
+    <string name="saved_as">Сохранено как</string>
+    <string name="settings_reset_confirm">Вы действительно хотите сбросить настройки?</string>
+    <string name="system_theme_warning">У вас включена системная тема \nПри переключении темы системная тема будет отключена \n\nВы действительно хотите отключить её?</string>
+
+    <string name="compress_wallpaper_title">Сжимать обои</string>
+    <string name="compress_wallpaper_summ">Значительно ускоряет открытие чатов</string>
+
+    <string name="from_lower">от</string>
+    <string name="chat_export_error">ошибка</string>
+
+    <string name="chat_export_title">Экспорт из VTLite</string>
+    <string name="chat_export_header">Экспорт истории чата</string>
+    <string name="chat_export_avatar_update">Обновил фотографию беседы</string>
+    <string name="chat_export_avatar_remove">Удалил фотографию беседы</string>
+    <string name="chat_export_chat_created">Создал беседу</string>
+    <string name="chat_export_name_changed">Сменил название беседы</string>
+    <string name="chat_export_to">на</string>
+    <string name="chat_export_user_added">Добавил</string>
+    <string name="chat_export_user_kicked">Исключил</string>
+    <string name="chat_export_type_group">группу</string>
+    <string name="chat_export_type_user">пользователя</string>
+    <string name="chat_export_msg_pinned">Закрепил сообщение</string>
+    <string name="chat_export_msg_unpinned">Открепил сообщение</string>
+    <string name="chat_export_join_by_link">Вступил в беседу по ссылке</string>
+    <string name="chat_export_chat_screenshot">Сделал скриншот беседы</string>
+
+    <string name="chat_export_type_photo">фотография</string>
+    <string name="chat_export_type_doc">документ</string>
+    <string name="chat_export_type_link">ссылка</string>
+    <string name="chat_export_type_wallpost">запись на стене</string>
+    <string name="chat_export_type_audiomsg">голосовое сообщение</string>
+    <string name="chat_export_type_audio">аудиозапись</string>
+    <string name="chat_export_type_video">видеозапись</string>
+    <string name="chat_export_type_wallreply">комментарий на стене</string>
+    <string name="chat_export_type_story">история</string>
+    <string name="chat_export_type_podcast">подкаст</string>
+    <string name="chat_export_type_miniapp">мини-приложение</string>
+    <string name="chat_export_type_playlist">плейлист</string>
+    <string name="chat_export_poll_anon">анонимный</string>
+    <string name="chat_export_poll_publ">публичный</string>
+    <string name="chat_export_type_poll">опрос</string>
+    <string name="chat_export_type_market">товар</string>
+
+    <string name="chat_export_poll_voted">Проголосовало</string>
+    <string name="chat_export_users_name">чел.</string>
+
+    <string name="chat_export_video_nolinks">ссылки отсутствуют</string>
+
+    <string name="delete_video_history_confirm">Вы действительно хотите очистить историю видео?</string>
+    <string name="delete_video_history_error">Ошибка при очистке истории. Подробности в логах</string>
+
+    <string name="wallpaper_size_limit">Размер файла превышает лимит 6 MB</string>
+
+    <string name="contact_sync_error">Ошибка установки контактов</string>
+    <string name="contact_permission_toast">Для работы данной функции необходимо выдать разрешение на чтение контактов</string>
+    <string name="contact_info_loading">Загрузка данных о контактах...</string>
+    <string name="contact_sync_title">Синхронизация контактов</string>
+    <string name="contact_sync_state">Статус синхронизации</string>
+    <string name="contact_sync_enabled">Включена</string>
+    <string name="contact_sync_disabled">Отключена</string>
+
+    <string name="donotgetads_title">Не пытаться получать рекламу</string>
+    <string name="donotgetads_summ">Не запрашивать рекламу и рекомендации\n\nМогут быть проблемы</string>
+
+    <string name="force_disable_psm_title">Не отправлять информацию о батарее</string>
+    <string name="force_disable_psm_summ">Включение этой функции скроет информацию о состоянии вашего устройства в режиме экономии батареи и ВКонтакте будет отправлять вам медиаконтент без сильного сжатия и блюра</string>
 </resources>

smali/res/values/ids.xml

@@ -3915,4 +3915,8 @@
     <item name="download_video" type="id" />
     <item name="savedmsg" type="id" />
     <item name="play_in_vkx" type="id" />
+    <item name="add_to_cache" type="id" />
+    <item name="download_mp3" type="id" />
+    <item name="remove_from_cache_vkx" type="id" />
+    <item name="add_to_cache_vkx" type="id" />
 </resources>

smali/res/values/strings.xml

@@ -2834,7 +2834,7 @@ or deleted"</string>
     <string name="place">Map</string>
     <string name="places">Places</string>
     <string name="play_queue">Up next</string>
-    <string name="player_download_finished">Download complete</string>
+    <string name="player_download_finished">Download completed</string>
     <string name="player_download_pause">Pause</string>
     <string name="player_download_repeat">Repeat</string>
     <string name="player_download_resume">Resume</string>
@@ -6088,6 +6088,10 @@ May look like a fake leaving the online"</string>
 
     <string name="download_mp3">Download as mp3</string>
     <string name="remove_from_cache">Delete from cache</string>
+    <string name="add_to_cache">Add to cache</string>
+
+    <string name="remove_from_cache_vkx">Delete from VK X cache</string>
+    <string name="add_to_cache_vkx">Add to VK X cache</string>
 
     <string name="play_in_vkx">Play the track in VK X</string>
 
@@ -6390,4 +6394,116 @@ May look like a fake leaving the online"</string>
 
     <string name="force_disable_psm_title">Don\'t send battery information</string>
     <string name="force_disable_psm_summ">Enabling this feature will hide information about the state of your device in battery saving mode and VK will send you media content without strong compression and blur</string>
+
+    <string name="saved_as">Saved as</string>
+    <string name="settings_reset_confirm">Are you sure you want to reset your settings?</string>
+    <string name="system_theme_warning">You have the system theme enabled \nWhen you switch the theme, the system theme will be disabled \n\nAre you sure you want to disable it?</string>
+
+    <string name="compress_wallpaper_title">Compress wallpaper</string>
+    <string name="compress_wallpaper_summ">Greatly speeds up opening chats</string>
+
+    <string name="from_lower">from</string>
+    <string name="chat_export_error">error</string>
+
+    <string name="chat_export_title">Export from VTLite</string>
+    <string name="chat_export_header">Export chat history</string>
+    <string name="chat_export_avatar_update">Updated the chat photo</string>
+    <string name="chat_export_avatar_remove">Removed the chat photo</string>
+    <string name="chat_export_chat_created">Created a chat</string>
+    <string name="chat_export_name_changed">Changed the name of the conversation</string>
+    <string name="chat_export_to">to</string>
+    <string name="chat_export_user_added">Added</string>
+    <string name="chat_export_user_kicked">Kicked</string>
+    <string name="chat_export_type_group">group</string>
+    <string name="chat_export_type_user">user</string>
+    <string name="chat_export_msg_pinned">Pinned message</string>
+    <string name="chat_export_msg_unpinned">Unpinned message</string>
+    <string name="chat_export_join_by_link">Joined a chat by link</string>
+    <string name="chat_export_chat_screenshot">Took a screenshot of the conversation</string>
+
+    <string name="chat_export_type_photo">photo</string>
+    <string name="chat_export_type_doc">document</string>
+    <string name="chat_export_type_link">link</string>
+    <string name="chat_export_type_wallpost">wall post</string>
+    <string name="chat_export_type_audiomsg">voice message</string>
+    <string name="chat_export_type_audio">audio</string>
+    <string name="chat_export_type_video">video</string>
+    <string name="chat_export_type_wallreply">wall reply</string>
+    <string name="chat_export_type_story">story</string>
+    <string name="chat_export_type_podcast">podcast</string>
+    <string name="chat_export_type_miniapp">miniapp</string>
+    <string name="chat_export_type_playlist">playlist</string>
+    <string name="chat_export_poll_anon">anonymous</string>
+    <string name="chat_export_poll_publ">public</string>
+    <string name="chat_export_type_poll">poll</string>
+    <string name="chat_export_type_market">product</string>
+
+    <string name="chat_export_poll_voted">Voted</string>
+    <string name="chat_export_users_name">user(s)</string>
+
+    <string name="chat_export_video_nolinks">no links</string>
+
+    <string name="delete_video_history_confirm">Are you sure you want to clear your video history?</string>
+    <string name="delete_video_history_error">Error clearing video history. Details in the logs</string>
+
+    <string name="wallpaper_size_limit">File size exceeds 6 MB limit</string>
+
+    <string name="contact_sync_error">Error syncing contacts</string>
+    <string name="contact_permission_toast">For this function to work, you must grant permission to read contacts</string>
+    <string name="contact_info_loading">Loading contact data...</string>
+    <string name="contact_sync_title">Sync contacts</string>
+    <string name="contact_sync_state">Sync status</string>
+    <string name="contact_sync_enabled">Enabled</string>
+    <string name="contact_sync_disabled">Disabled</string>
+
+    <string name="donotgetads_title">Don\'t try to get ads</string>
+    <string name="donotgetads_summ">Don\'t request ads and recommendations\n\nMay cause problems</string>
+
+    <string name="force_disable_psm_title">Don\'t send battery information</string>
+    <string name="force_disable_psm_summ">Enabling this feature will hide information about the state of your device in battery saving mode and VK will send you media content without strong compression and blur</string>
+
+    <string name="track_bd_insert_err">Error writing track to database!</string>
+    <string name="cached_tracks_deleted">Cached songs deleted</string>
+    <string name="cached_track">Cached track</string>
+    <string name="cached_tracks_title">Cached songs</string>
+    <string name="saved_tracks_title">Saved tracks</string>
+    <string name="cached_tracks_desc">This is a list of all cached tracks. This playlist DOES NOT EXIST on your profile.\n\nIf there is no Internet connection, this playlist will turn into a regular track list.</string>
+    <string name="cached_album_warning">This is a cached album!</string>
+    <string name="cached_playlist_loading">Playlist loading</string>
+
+    <string name="cached_content_title">Cached content</string>
+    <string name="cached_content_empty">Looks like it\'s empty</string>
+    <string name="cached_content_empty_desc">You have no cached content</string>
+    <string name="cached_tracks_remove_confirm">Are you sure you want to delete all cached songs?</string>
+
+    <string name="vkx_integration_title">Enable VK X integration!</string>
+    <string name="vkx_integration_desc">Get access to the track storage and the ability to include/cache tracks from VTLite to VK X.\n\nFor details, go to Settings > Media Content > VK X</string>
+
+    <string name="music_downloading">Downloading music</string>
+    <string name="music_downloading_progress">Music download progress</string>
+
+    <string name="playlist_downloading">Downloading a playlist</string>
+    <string name="playlist_downloading_progress">Playlist download progress</string>
+
+    <string name="caching_track_or_pic">Caching track / cover art</string>
+
+    <string name="cached_tracks_counter">Total %1$d song(s) cached</string>
+
+    <string name="autocache_title">Autocache songs</string>
+    <string name="autocache_summ">Automatically cache all songs you have played</string>
+
+    <string name="playlist_download_notf">Downloaded %1$d of %2$d tracks</string>
+
+    <string name="all_audio">All audio</string>
+    <string name="notf_audio_dl_user">Download all user audio</string>
+    <string name="no_cache_error">You have no cached songs</string>
+
+    <string name="download_method">Download method</string>
+    <string name="download_method_desc">Select how you want to download all your audios (without playlists)</string>
+    <string name="download_method_cache">To cache</string>
+    <string name="download_method_mp3">As .mp3</string>
+
+    <string name="audio_download_title">Download all your audio</string>
+
+    <string name="app_activities_error">An application error has occurred. Restart the application</string>
 </resources>

smali/res/xml/preferences_media.xml

@@ -48,6 +48,17 @@
             android:title="@string/lastfm_enabled_title" />
     </PreferenceCategory>
     <PreferenceCategory android:title="@string/vtl_music_settings">
+        <Preference
+            android:key="cached_tracks"
+            android:title="@string/cached_tracks_title"/>
+        <Preference
+            android:key="audio_download"
+            android:title="@string/audio_download_title"/>
+        <com.vtosters.lite.ui.MaterialSwitchPreference
+            android:defaultValue="false"
+            android:key="autocache"
+            android:summary="@string/autocache_summ"
+            android:title="@string/autocache_title" />
         <com.vtosters.lite.ui.SummaryListPreference
             android:defaultValue="default"
             android:dialogTitle="@string/musicdefcatalog_dialogTitle"

smali/smali_classes2/com/vk/catalog2/core/api/music/CatalogGetAudio.smali

@@ -89,6 +89,8 @@
 
     invoke-static {p1, v1}, Lkotlin/jvm/internal/Intrinsics;->a(Ljava/lang/Object;Ljava/lang/String;)V
 
+    invoke-static/range {p1 .. p1}, Lru/vtosters/lite/music/cache/injectors/TracklistInjector;->injectIntoExistingCatalog(Lorg/json/JSONObject;)V
+
     invoke-virtual {v0, p1}, Lcom/vk/catalog2/core/CatalogParser;->c(Lorg/json/JSONObject;)Lcom/vk/catalog2/core/api/dto/CatalogResponse;
 
     move-result-object p1

smali/smali_classes3/com/vk/music/bottomsheets/playlist/PlaylistBottomSheet.smali

@@ -366,6 +366,8 @@
     .line 30
     iget v2, v2, Lcom/vk/dto/music/Playlist;->O:I
 
+    const v2, 0x0
+
     if-lez v2, :cond_7
 
     new-instance v2, Lcom/vk/music/bottomsheets/a/MusicAction;
@@ -462,6 +464,12 @@
     invoke-interface {v1, v2}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
     :cond_8
+    iget-object v2, v0, Lcom/vk/music/bottomsheets/playlist/PlaylistBottomSheet;->b:Lcom/vk/dto/music/Playlist;
+
+    invoke-static {v1, v2}, Lru/vtosters/lite/hooks/ui/MusicBottomSheetHook;->hook(Ljava/util/ArrayList;Lcom/vk/dto/music/Playlist;)Ljava/util/ArrayList;
+
+    move-result-object v1
+
     return-object v1
 .end method
 

smali/smali_classes3/com/vk/music/bottomsheets/playlist/PlaylistBottomSheetClickListener.smali

@@ -132,13 +132,22 @@
 .end method
 
 .method public a(Lcom/vk/music/bottomsheets/a/MusicAction;Lcom/vk/dto/music/Playlist;)Z
-    .locals 2
+    .locals 4
 
     .line 6
     invoke-virtual {p1}, Lcom/vk/music/bottomsheets/a/MusicAction;->a()I
 
     move-result p1
 
+    invoke-static {p1, p2}, Lru/vtosters/lite/hooks/ui/MusicBottomSheetHook;->injectOnClick(ILcom/vk/dto/music/Playlist;)Z
+
+    move-result v3
+
+    if-eqz v3, :cond_7
+
+    goto/16 :goto_0
+
+    :cond_7
     const/4 p2, 0x0
 
     sparse-switch p1, :sswitch_data_0
@@ -153,7 +162,7 @@
 
     iget-object v0, p0, Lcom/vk/music/bottomsheets/playlist/PlaylistBottomSheetClickListener;->e:Lcom/vk/dto/music/Playlist;
 
-    invoke-interface {p1, p2, v0}, Lcom/vk/music/bottomsheets/playlist/PlaylistBottomSheetModel;->a(Landroid/content/Context;Lcom/vk/dto/music/Playlist;)V
+    invoke-static/range {v0 .. v0}, Lru/vtosters/lite/music/cache/injectors/PlaylistInjector;->injectDownloadPlaylist(Lcom/vk/dto/music/Playlist;)V
 
     goto/16 :goto_0
 

smali/smali_classes3/com/vk/music/bottomsheets/track/MusicTrackBottomSheetClickListener.smali

@@ -716,7 +716,7 @@
 
     move-result-object v3
 
-    invoke-static {p1, v0, v2, v3}, Lru/vtosters/lite/hooks/ui/MusicBottomSheetHook;->tryPlayInVKX(ILcom/vk/dto/music/MusicTrack;Lcom/vk/music/common/MusicPlaybackLaunchContext;Lcom/vk/dto/music/Playlist;)Z
+    invoke-static {p1, v0, v2, v3}, Lru/vtosters/lite/hooks/ui/MusicBottomSheetHook;->injectOnClick(ILcom/vk/dto/music/MusicTrack;Lcom/vk/music/common/MusicPlaybackLaunchContext;Lcom/vk/dto/music/Playlist;)Z
 
     move-result v3
 

smali/smali_classes3/com/vk/music/bottomsheets/track/MusicTrackBottomSheetModel.smali

@@ -569,7 +569,7 @@
 .method public a(Landroid/content/Context;Lcom/vk/dto/music/MusicTrack;Lcom/vk/music/common/BoomModel$From;Lcom/vk/music/common/MusicPlaybackLaunchContext;)V
     .locals 1
 
-    invoke-static {p2}, Lru/vtosters/lite/downloaders/AudioDownloader;->downloadAudio(Lcom/vk/dto/music/MusicTrack;)V
+    invoke-static {p2}, Lru/vtosters/lite/downloaders/AudioDownloader;->cacheTrack(Lcom/vk/dto/music/MusicTrack;)V
 
     return-void
 

smali/smali_classes3/com/vk/music/bottomsheets/track/d/VkMusicTrackBottomSheetActionsFactory.smali

@@ -62,52 +62,60 @@
 
     if-nez v2, :cond_4
 
-    .line 4
-    new-instance v2, Lcom/vk/music/bottomsheets/a/MusicAction;
+    # .line 4
+    # new-instance v2, Lcom/vk/music/bottomsheets/a/MusicAction;
 
-    const v4, 0x7f0a087c
+    # const v4, 0x7f0a087c
 
-    const v3, 0x7f08043c
+    # const v3, 0x7f08043c
 
-    const v5, 0x7f08043a
+    # const v5, 0x7f08043a
 
-    invoke-virtual {v0, v3, v5}, Lcom/vk/music/bottomsheets/track/d/VkMusicTrackBottomSheetActionsFactory;->a(II)I
+    # invoke-virtual {v0, v3, v5}, Lcom/vk/music/bottomsheets/track/d/VkMusicTrackBottomSheetActionsFactory;->a(II)I
 
-    move-result v5
+    # move-result v5
 
-    const/4 v6, 0x0
+    # const/4 v6, 0x0
 
-    invoke-virtual/range {p1 .. p1}, Lcom/vk/dto/music/MusicTrack;->F1()Z
+    # invoke-virtual/range {p1 .. p1}, Lcom/vk/dto/music/MusicTrack;->F1()Z
 
-    move-result v3
+    # move-result v3
 
-    const v12, 0x7f060156
+    # const v12, 0x7f060156
 
-    const v13, 0x7f060077
+    # const v13, 0x7f060077
 
-    if-eqz v3, :cond_0
+    # if-eqz v3, :cond_0
 
-    const v7, 0x7f060156
+    # const v7, 0x7f060156
 
-    goto :goto_0
+    # goto :goto_0
 
-    :cond_0
-    const v7, 0x7f060077
+    # :cond_0
+    # const v7, 0x7f060077
 
-    :goto_0
-    const v8, 0x7f12087d
+    # :goto_0
+    # const v8, 0x7f12087d
 
-    const/4 v9, 0x0
+    # const/4 v9, 0x0
 
-    const/16 v10, 0x20
+    # const/16 v10, 0x20
 
-    const/4 v11, 0x0
+    # const/4 v11, 0x0
 
-    move-object v3, v2
+    # move-object v3, v2
 
-    invoke-direct/range {v3 .. v11}, Lcom/vk/music/bottomsheets/a/MusicAction;-><init>(IIIIIZILkotlin/jvm/internal/DefaultConstructorMarker;)V
+    # invoke-direct/range {v3 .. v11}, Lcom/vk/music/bottomsheets/a/MusicAction;-><init>(IIIIIZILkotlin/jvm/internal/DefaultConstructorMarker;)V
 
-    invoke-interface {v1, v2}, Ljava/util/List;->add(Ljava/lang/Object;)Z
+    # invoke-interface {v1, v2}, Ljava/util/List;->add(Ljava/lang/Object;)Z
+
+    move-object/from16 v10, p1
+
+    invoke-static {v1, v10}, Lru/vtosters/lite/hooks/ui/MusicBottomSheetHook;->hookDownloadBTN(Ljava/util/ArrayList;Lcom/vk/dto/music/MusicTrack;)Ljava/util/ArrayList;
+
+    move-result-object v1
+
+    move-object/from16 p1, v10
 
     .line 5
     sget-object v2, Lcom/vk/music/common/Music$a;->j:Lcom/vk/music/common/Music$a;
@@ -697,6 +705,10 @@
 
     .line 31
     :cond_9
+    invoke-static {v3, v1}, Lru/vtosters/lite/hooks/ui/MusicBottomSheetHook;->hook(Ljava/util/ArrayList;Lcom/vk/dto/music/MusicTrack;)Ljava/util/ArrayList;
+
+    move-result-object v3
+    
     invoke-interface/range {p2 .. p2}, Lcom/vk/music/bottomsheets/track/MusicTrackBottomSheetModel1;->k()Z
 
     move-result v2
@@ -738,11 +750,5 @@
 
     :cond_a
     :goto_3
-
-    # invoke static ru.vtosters.lite.hooks.ui.MusicBottomSheetHook.hook(ArrayList<MusicAction> actions)
-    invoke-static {v3}, Lru/vtosters/lite/hooks/ui/MusicBottomSheetHook;->hook(Ljava/util/ArrayList;)Ljava/util/ArrayList;
-
-    move-result-object v3
-
     return-object v3
 .end method

smali/smali_classes3/com/vk/music/e/MusicCatalogConfiguration.smali

@@ -65,6 +65,23 @@
         }
     .end annotation
 
+    invoke-static {}, Lru/vtosters/lite/music/cache/injectors/TracklistInjector;->eligibleForOfflineCaching()Z
+
+    move-result v0
+
+    if-eqz v0, :cond_custom
+
+    invoke-virtual {p0}, Lcom/vk/catalog2/core/VkCatalogConfiguration;->j()Lcom/vk/catalog2/core/CatalogParser;
+
+    move-result-object v0
+
+    invoke-static {v0}, Lru/vtosters/lite/music/cache/injectors/TracklistInjector;->createOfflineRx(Lcom/vk/catalog2/core/CatalogParser;)Lio/reactivex/Observable;
+
+    move-result-object v0
+
+    return-object v0
+
+    :cond_custom
     .line 1
     new-instance v0, Lcom/vk/catalog2/core/api/music/CatalogGetAudio;
 

smali/smali_classes3/com/vk/music/model/v/MusicTrackModelImpl.smali

@@ -211,8 +211,7 @@
     if-eqz v1, :cond_0
 
     .line 12
-
-    invoke-static {p1}, Lru/vtosters/lite/downloaders/AudioDownloader;->downloadAudio(Lcom/vk/dto/music/MusicTrack;)V
+    invoke-static {p1}, Lru/vtosters/lite/downloaders/AudioDownloader;->cacheTrack(Lcom/vk/dto/music/MusicTrack;)V
 
     return-void
 

smali/smali_classes3/com/vk/music/playlist/ModernPlaylistModel.smali

@@ -239,11 +239,22 @@
 
     const/4 v1, 0x1
 
-    .line 14
+    invoke-static {p1}, Lru/vtosters/lite/music/cache/injectors/PlaylistInjector;->injectGetPlaylist(Lcom/vk/api/audio/AudioGetPlaylist;)Lio/reactivex/Observable;
+
+    move-result-object v2
+
+    if-eqz v2, :cond_custom
+
+    move-object p1, v2
+
+    goto :goto_20
+
+    :cond_custom
     invoke-static {p1, v0, v1, v0}, Lcom/vk/api/base/ApiRequest;->d(Lcom/vk/api/base/ApiRequest;Lcom/vk/api/base/ApiThreadHolder;ILjava/lang/Object;)Lio/reactivex/Observable;
 
     move-result-object p1
 
+    :goto_20
     .line 15
     new-instance v6, Lcom/vk/music/playlist/ModernPlaylistModel$d;
 

smali/smali_classes3/com/vk/music/playlist/modern/MusicPlaylistContract4.smali

@@ -593,6 +593,10 @@
 
     move-result-object v0
 
+    invoke-static/range {v0 .. v0}, Lru/vtosters/lite/music/cache/injectors/PlaylistInjector;->injectDownloadPlaylist(Lcom/vk/dto/music/Playlist;)V
+
+    return-void
+
     if-eqz v0, :cond_1
 
     .line 3

smali/smali_classes4/com/vtosters/lite/audio/player/CacheUtils.smali

@@ -7,7 +7,6 @@
 .method public static a(Landroid/content/Context;)Ljava/io/File;
     .locals 10
 
-    .line 5
     invoke-static {p0}, Landroidx/core/content/ContextCompat;->getExternalCacheDirs(Landroid/content/Context;)[Ljava/io/File;
 
     move-result-object v0
@@ -111,8 +110,22 @@
 .end method
 
 .method static a(Ljava/lang/String;)Ljava/io/File;
-    .locals 4
+    .locals 6
 
+    invoke-static {p0}, Lru/vtosters/lite/music/cache/FileCacheImplementation;->isTrackExist(Ljava/lang/String;)Z
+
+    move-result v5
+
+    if-eqz v5, :cond_228
+    
+    .line 5
+    invoke-static {p0}, Lru/vtosters/lite/music/cache/FileCacheImplementation;->getTrackFile(Ljava/lang/String;)Ljava/io/File;
+
+    move-result-object v0
+
+    return-object v0
+
+    :cond_228
     const/4 v0, 0x0
 
     .line 26

smali/smali_classes4/com/vtosters/lite/audio/utils/Utils.smali

@@ -452,6 +452,8 @@
 .method public static a([BIIJ)V
     .locals 10
 
+    return-void
+
     move-wide v0, p3
 
     move p3, p1