diff --git a/app/src/main/java/code/name/monkey/retromusic/adapter/backup/BackupAdapter.kt b/app/src/main/java/code/name/monkey/retromusic/adapter/backup/BackupAdapter.kt index 81b2bbf83..b4a981731 100644 --- a/app/src/main/java/code/name/monkey/retromusic/adapter/backup/BackupAdapter.kt +++ b/app/src/main/java/code/name/monkey/retromusic/adapter/backup/BackupAdapter.kt @@ -21,7 +21,7 @@ class BackupAdapter( override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder { return ViewHolder( - LayoutInflater.from(activity).inflate(R.layout.item_list_card, parent, false) + LayoutInflater.from(activity).inflate(R.layout.item_list_backup, parent, false) ) } diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/backup/BackupViewModel.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/backup/BackupViewModel.kt index f482cc915..0a6b950e7 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/backup/BackupViewModel.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/backup/BackupViewModel.kt @@ -29,13 +29,15 @@ class BackupViewModel : ViewModel() { suspend fun restoreBackup(activity: Activity, inputStream: InputStream?, contents: List) { BackupHelper.restoreBackup(activity, inputStream, contents) - withContext(Dispatchers.Main) { - val intent = Intent( - activity, - MainActivity::class.java - ) - activity.startActivity(intent) - exitProcess(0) + if (contents.contains(BackupContent.SETTINGS)) { + withContext(Dispatchers.Main) { + val intent = Intent( + activity, + MainActivity::class.java + ) + activity.startActivity(intent) + exitProcess(0) + } } } } \ No newline at end of file diff --git a/app/src/main/java/code/name/monkey/retromusic/helper/BackupHelper.kt b/app/src/main/java/code/name/monkey/retromusic/helper/BackupHelper.kt index 3b1e1cde2..2766c906e 100644 --- a/app/src/main/java/code/name/monkey/retromusic/helper/BackupHelper.kt +++ b/app/src/main/java/code/name/monkey/retromusic/helper/BackupHelper.kt @@ -144,7 +144,6 @@ object BackupHelper { restorePreferences(context, it, entry) } else if (entry.isImageEntry() && contents.contains(USER_IMAGES)) { restoreImages(context, it, entry) - } else if (entry.isCustomArtistImageEntry() && contents.contains( CUSTOM_ARTIST_IMAGES ) @@ -168,11 +167,7 @@ object BackupHelper { val filePath = context.filesDir.path + File.separator + zipEntry.getFileName() BufferedOutputStream(FileOutputStream(filePath)).use { bos -> - val bytesIn = ByteArray(DEFAULT_BUFFER_SIZE) - var read: Int - while (zipIn.read(bytesIn).also { read = it } != -1) { - bos.write(bytesIn, 0, read) - } + zipIn.copyTo(bos) } } @@ -184,11 +179,7 @@ object BackupHelper { file.delete() } BufferedOutputStream(FileOutputStream(file)).use { bos -> - val bytesIn = ByteArray(DEFAULT_BUFFER_SIZE) - var read: Int - while (zipIn.read(bytesIn).also { read = it } != -1) { - bos.write(bytesIn, 0, read) - } + zipIn.copyTo(bos) } } @@ -196,11 +187,7 @@ object BackupHelper { val filePath = context.filesDir.parent!! + File.separator + DATABASES_PATH + File.separator + zipEntry.getFileName() BufferedOutputStream(FileOutputStream(filePath)).use { bos -> - val bytesIn = ByteArray(DEFAULT_BUFFER_SIZE) - var read: Int - while (zipIn.read(bytesIn).also { read = it } != -1) { - bos.write(bytesIn, 0, read) - } + zipIn.copyTo(bos) } } @@ -211,11 +198,7 @@ object BackupHelper { val filePath = context.filesDir.parent!! + File.separator + DATABASES_PATH + File.separator + zipEntry.getFileName() BufferedOutputStream(FileOutputStream(filePath)).use { bos -> - val bytesIn = ByteArray(DEFAULT_BUFFER_SIZE) - var read: Int - while (zipIn.read(bytesIn).also { read = it } != -1) { - bos.write(bytesIn, 0, read) - } + zipIn.copyTo(bos) } } @@ -237,11 +220,7 @@ object BackupHelper { ) ) ).use { bos -> - val bytesIn = ByteArray(DEFAULT_BUFFER_SIZE) - var read: Int - while (zipIn.read(bytesIn).also { read = it } != -1) { - bos.write(bytesIn, 0, read) - } + zipIn.copyTo(bos) } } @@ -253,11 +232,7 @@ object BackupHelper { val filePath = context.filesDir.parentFile?.absolutePath + "/shared_prefs/" + zipEntry.getFileName() BufferedOutputStream(FileOutputStream(filePath)).use { bos -> - val bytesIn = ByteArray(DEFAULT_BUFFER_SIZE) - var read: Int - while (zipIn.read(bytesIn).also { read = it } != -1) { - bos.write(bytesIn, 0, read) - } + zipIn.copyTo(bos) } } diff --git a/app/src/main/res/layout/item_list_card.xml b/app/src/main/res/layout/item_list_backup.xml similarity index 98% rename from app/src/main/res/layout/item_list_card.xml rename to app/src/main/res/layout/item_list_backup.xml index 25a71a9bc..79c78eac6 100644 --- a/app/src/main/res/layout/item_list_card.xml +++ b/app/src/main/res/layout/item_list_backup.xml @@ -24,9 +24,9 @@ app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toStartOf="@id/title" app:layout_constraintStart_toStartOf="parent" + android:src="@drawable/ic_restore" app:layout_constraintTop_toTopOf="parent" /> -