TheArchive/Magisk
1
0
Fork 0
mirror of https://github.com/topjohnwu/Magisk.git synced 2025-02-26 02:47:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed clearing cache crashing due to operations on main thread

Browse Source
This commit is contained in:
Viktor De Pasquale 2019-05-24 12:28:16 +02:00
parent aaabd836e4
commit f0a734fdab
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/main/java/com/topjohnwu/magisk/data/repository/ModuleRepository.kt
View File

@ -12,6 +12,7 @@ import com.topjohnwu.magisk.utils.Utils
import com.topjohnwu.magisk.utils.toSingle import com.topjohnwu.magisk.utils.toSingle
import com.topjohnwu.magisk.utils.writeToFile import com.topjohnwu.magisk.utils.writeToFile
import com.topjohnwu.magisk.utils.writeToString import com.topjohnwu.magisk.utils.writeToString
import io.reactivex.Completable
import io.reactivex.Single import io.reactivex.Single
class ModuleRepository( class ModuleRepository(
@ -59,7 +60,7 @@ class ModuleRepository(
.fetchModuleInstaller() .fetchModuleInstaller()
.map { it.writeToFile(context, FILE_MODULE_INSTALLER_SH) } .map { it.writeToFile(context, FILE_MODULE_INSTALLER_SH) }
fun deleteAllCached() = repoDao.deleteAll() fun deleteAllCached() = Completable.fromCallable { repoDao.deleteAll() }
private fun fetchProperties(module: String, lastChanged: Long) = apiRaw private fun fetchProperties(module: String, lastChanged: Long) = apiRaw

4
app/src/main/java/com/topjohnwu/magisk/ui/settings/SettingsFragment.java
View File

@ -110,7 +110,9 @@ public final class SettingsFragment extends BasePreferenceFragment {
Preference clear = findPreference("clear"); Preference clear = findPreference("clear");
clear.setOnPreferenceClickListener(pref -> { clear.setOnPreferenceClickListener(pref -> {
getPrefs().edit().remove(Config.Key.ETAG_KEY).apply(); getPrefs().edit().remove(Config.Key.ETAG_KEY).apply();
getModuleRepo().deleteAllCached(); getModuleRepo().deleteAllCached().subscribeOn(Schedulers.io()).subscribe(() -> {
}, throwable -> {
});
Utils.toast(R.string.repo_cache_cleared, Toast.LENGTH_SHORT); Utils.toast(R.string.repo_cache_cleared, Toast.LENGTH_SHORT);
return true; return true;
}); });