DataHearth/tachiyomi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix an error when restoring backup

Browse Source
This commit is contained in:
len 2016-03-31 12:17:40 +02:00
parent 0c0372dc51
commit ac15c0c57e
3 changed files with 10 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/main/java/eu/kanade/tachiyomi/ui/backup/BackupFragment.kt
View File

@ -97,9 +97,8 @@ class BackupFragment : BaseRxFragment<BackupPresenter>() {
.progress(true, 0) .progress(true, 0)
.show() .show()
context.contentResolver.openInputStream(data.data).use { val stream = context.contentResolver.openInputStream(data.data)
presenter.restoreBackup(it) presenter.restoreBackup(stream)
}
} }
} }

30
app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt
View File

@ -61,30 +61,12 @@ class MainActivity : BaseActivity() {
text_label.text = "" text_label.text = ""
when (item.itemId) { when (item.itemId) {
R.id.nav_drawer_library -> { R.id.nav_drawer_library -> setFragment(LibraryFragment.newInstance())
setFragment(LibraryFragment.newInstance()) R.id.nav_drawer_recent_updates -> setFragment(RecentChaptersFragment.newInstance())
item.isChecked = true R.id.nav_drawer_catalogues -> setFragment(CatalogueFragment.newInstance())
} R.id.nav_drawer_downloads -> setFragment(DownloadFragment.newInstance())
R.id.nav_drawer_recent_updates -> { R.id.nav_drawer_settings -> startActivity(Intent(this, SettingsActivity::class.java))
setFragment(RecentChaptersFragment.newInstance()) R.id.nav_drawer_backup -> setFragment(BackupFragment.newInstance())
item.isChecked = true
}
R.id.nav_drawer_catalogues -> {
setFragment(CatalogueFragment.newInstance())
item.isChecked = true
}
R.id.nav_drawer_downloads -> {
setFragment(DownloadFragment.newInstance())
item.isChecked = true
}
R.id.nav_drawer_settings -> {
item.isChecked = false
startActivity(Intent(this, SettingsActivity::class.java))
}
R.id.nav_drawer_backup -> {
setFragment(BackupFragment.newInstance())
item.isChecked = true
}
} }
drawer.closeDrawer(GravityCompat.START) drawer.closeDrawer(GravityCompat.START)
true true

3
app/src/main/res/menu/menu_navigation.xml
View File

@ -25,7 +25,8 @@
<item <item
android:id="@+id/nav_drawer_settings" android:id="@+id/nav_drawer_settings"
android:icon="@drawable/ic_settings_black_24dp" android:icon="@drawable/ic_settings_black_24dp"
android:title="@string/label_settings" /> android:title="@string/label_settings"
android:checkable="false" />
<item <item
android:id="@+id/nav_drawer_backup" android:id="@+id/nav_drawer_backup"
android:icon="@drawable/ic_backup_black_24dp" android:icon="@drawable/ic_backup_black_24dp"