Viktor De Pasquale
4f0e1c6c61
Merge remote-tracking branch 'john/master' into feature/redesign
# Conflicts:
# app/build.gradle
# app/src/main/java/com/topjohnwu/magisk/Hacks.kt
# app/src/main/java/com/topjohnwu/magisk/data/database/RepoDatabase.kt
# app/src/main/java/com/topjohnwu/magisk/data/repository/LogRepository.kt
# app/src/main/java/com/topjohnwu/magisk/di/DatabaseModule.kt
# app/src/main/java/com/topjohnwu/magisk/extensions/RxJava.kt
# app/src/main/java/com/topjohnwu/magisk/extensions/XAndroid.kt
# app/src/main/java/com/topjohnwu/magisk/extensions/XJava.kt
# app/src/main/java/com/topjohnwu/magisk/model/download/RemoteFileService.kt
# app/src/main/java/com/topjohnwu/magisk/model/entity/recycler/LogRvItem.kt
# app/src/main/java/com/topjohnwu/magisk/model/events/ViewEvents.kt
# app/src/main/java/com/topjohnwu/magisk/ui/SplashActivity.kt
# app/src/main/res/xml/app_settings.xml