Update docs

docs/README.md

@@ -4,7 +4,6 @@
 - [Frequently Asked Questions](faq.md)
 - [Release Notes](releases/index.md)
 - [Magisk Changelog](changes.md)
-- [Magisk Manager Changelog](app_changes.md)
 
 The following sections are for developers
 

docs/changes.md

@@ -1,5 +1,17 @@
 # Magisk Changelog
 
+### v22.0
+
+- [General] Magisk and Magisk Manager is now merged into the same package!
+- [App] The term "Magisk Manager" is no longer used elsewhere. We refer it as the Magisk app.
+- [App] Support hiding the Magisk app with advanced technique (stub APK loading) on Android 5.0+ (it used to be 9.0+)
+- [App] Disallow re-packaging the Magisk app on devices lower than Android 5.0
+- [App] Detect and warn about multiple invalid states and provide instructions on how to resolve it
+- [MagiskHide] Fix a bug when stopping MagiskHide does not take effect
+- [MagiskBoot] Fix bug when unpacking `lz4_lg` compressed boot images
+- [MagiskInit] Support Galaxy S21 series
+- [MagiskSU] Fix incorrect APEX paths that caused `libsqlite.so` fail to load
+
 ### v21.4
 
 - [MagiskSU] Fix `su -c` behavior that broke many root apps

docs/install.md

@@ -1,6 +1,6 @@
 # Installation
 
-If you already have Magisk installed, it is **strongly recommended** to upgrade directly via Magisk Manager using the "Direct Install" method. The following tutorial is only for initial installation.
+If you already have Magisk installed, it is **strongly recommended** to upgrade directly via the Magisk app using its "Direct Install" method. The following tutorial is only for the initial installation.
 
 ## Getting Started
 
@@ -13,7 +13,7 @@ Before you start:
 
 ---
 
-Download and install the latest Magisk Manager. We use the app to gather some information about your device. In the home screen, you should see this:
+Download and install the latest Magisk app. We use the app to gather some information about your device. In the home screen, you should see this:
 
 <p align="center"><img src="images/device_info.png" width="500"/></p>
 
@@ -41,9 +41,9 @@ You should be able to extract the file you need from official firmware packages
 - Press the **Install** button in the Magisk card
 - If you are patching a recovery image, make sure **"Recovery Mode"** is checked in options.<br>In most cases it should already be automatically checked.
 - Choose **"Select and Patch a File"** in method, and select the stock boot/recovery image
-- Magisk Manager will patch the image to `[Internal Storage]/Download/magisk_patched.img`.
+- The Magisk app will patch the image to `[Internal Storage]/Download/magisk_patched_[random_strings].img`.
 - Copy the patched image to your PC with ADB:<br>
-`adb pull /sdcard/Download/magisk_patched.img`
+`adb pull /sdcard/Download/magisk_patched_[random_strings].img`
 - Flash the patched boot/recovery image to your device.<br>
 For most devices, reboot into fastboot mode and flash with command:<br>
 `fastboot flash boot /path/to/magisk_patched.img` or <br>
@@ -52,12 +52,17 @@ For most devices, reboot into fastboot mode and flash with command:<br>
 
 ## Custom Recovery
 
-In some custom recoveries the installation may fail (this may look like success but actually bootloops). This is because the installer scripts cannot properly detect the correct device info or the recovery environment does not meet its expectation. If you face any issues, use the [Patch Image](#patching-images) method as it is guaranteed to work 100% of the time. Due to this reason, we no longer recommend installing Magisk through custom recoveries on modern devices. The custom recovery installation method exists mostly for legacy support.
+In some custom recoveries, the installation may fail silently (it might look like success but in reality it bootloops). This is because the installer scripts cannot properly detect the correct device info or the recovery environment does not meet its expectation. If you face any issues, use the [Patch Image](#patching-images) method as it is guaranteed to work 100% of the time. Due to this reason, installing Magisk through custom recoveries on modern devices is no longer recommended. The custom recovery installation method exists purely for legacy support.
 
-- Download the Magisk installer zip
-- Reboot to custom recovery
-- Flash the zip and reboot
-- Check whether Magisk Manager is installed. If it isn't installed automatically, manually install the APK.
+- Download the Magisk APK
+- Rename the `.apk` file extension to `.zip`, for example: `Magisk-v22.0.apk` → `Magisk-v22.0.zip`. If you have trouble renaming the file extension (like on Windows), use a file manager on Android or the one included in TWRP to rename the file.
+- Flash the zip just like any other ordinary flashable zip.
+- Check whether the Magisk app is installed. If it isn't installed automatically, manually install the APK.
+
+## Uninstallation
+
+The easiest way to uninstall Magisk is directly through the Magisk app.<br>
+If you insist on using custom recoveries, rename the Magisk APK to `uninstall.zip` and flash it like any other ordinary flashable zip.
 
 ## Magisk in Recovery
 
@@ -86,46 +91,46 @@ Each device has its own key combo to boot into recovery, as an example for Galax
 
 ### Unlocking Bootloader
 
-Unlocking BL on modern Samsung devices have some caveats, so I figure this would be helpful.
+Unlocking bootloader on modern Samsung devices have some caveats:
 
 - Allow bootloader unlocking in **Developer options → OEM unlocking**
-- Reboot to download mode: power off your device and press the download mode key combo for your device (usually Power + Vol Down + Bixby).
+- Reboot to download mode: power off your device and press the download mode key combo for your device
 - Long press volume up to unlock the bootloader. **This will wipe your data and automatically reboot.**
 
 If you think the bootloader is fully unlocked, it is actually not! Samsung introduced `VaultKeeper`, meaning the bootloader will still reject any unofficial partitions before `VaultKeeper` explicitly allows it.
 
 - Go through the initial setup. Skip through all the steps since data will be wiped again later when we are installing Magisk. **Connect the device to Internet during the setup.**
 - Enable developer options, and **confirm that the OEM unlocking option exists and is grayed out.** This means the `VaultKeeper` service has unleashed the bootloader.
-- Your bootloader now accepts unofficial images in download mode.
+- Your bootloader now accepts unofficial images in download mode
 
 ### Instructions
 
-- Use either [Frija](https://forum.xda-developers.com/s10-plus/how-to/tool-frija-samsung-firmware-downloader-t3910594) or [Samloader](https://forum.xda-developers.com/s10-plus/how-to/tool-samloader-samfirm-frija-replacement-t4105929) to download the latest firmware zip of your device directly from Samsung servers.
+- Use either [samfirm.js](https://github.com/jesec/samfirm.js), [Frija](https://forum.xda-developers.com/s10-plus/how-to/tool-frija-samsung-firmware-downloader-t3910594), or [Samloader](https://forum.xda-developers.com/s10-plus/how-to/tool-samloader-samfirm-frija-replacement-t4105929) to download the latest firmware zip of your device directly from Samsung servers.
 -  Unzip the firmware and copy the `AP` tar file to your device. It is normally named as `AP_[device_model_sw_ver].tar.md5`
 - Press the **Install** button in the Magisk card
 - If your device does **NOT** have boot ramdisk, make sure **"Recovery Mode"** is checked in options.<br>In most cases it should already be automatically checked.
 - Choose **"Select and Patch a File"** in method, and select the `AP` tar file
-- Magisk Manager will patch the whole firmware file to `[Internal Storage]/Download/magisk_patched.tar`
+- Magisk Manager will patch the whole firmware file to `[Internal Storage]/Download/magisk_patched_[random_strings].tar`
 - Copy the patched tar file to your PC with ADB:<br>
-`adb pull /sdcard/Download/magisk_patched.tar`<br>
-Do **NOT** use MTP as it is reported to corrupt files.
-- Reboot to download mode. Open Odin on your PC, and flash `magisk_patched.tar` as `AP`, together with `BL`, `CP`, and `CSC` (**NOT** `HOME_CSC` because we want to **wipe data**) from the original firmware. This may take some time (>10 mins).
+`adb pull /sdcard/Download/magisk_patched_[random_strings].tar`<br>
+**DO NOT USE MTP** as it is known to corrupt large files.
+- Reboot to download mode. Open Odin on your PC, and flash `magisk_patched.tar` as `AP`, together with `BL`, `CP`, and `CSC` (**NOT** `HOME_CSC` because we want to **wipe data**) from the original firmware. This could take a while (>10 mins).
 - After Odin is done, your device should reboot. You may continue with standard initial setup.<br>
 If you are stuck in a bootloop, agree to do a factory reset if promted.
 - If your device does **NOT** have boot ramdisk, reboot to recovery now to boot Android with Magisk (reason stated in [Magisk in Recovery](#magisk-in-recovery)).
 - Although Magisk is installed, it still need some additional setup. Please connect to the Internet.
-- Install the latest Magisk Manager and open the app. It should show a dialog asking for additional setups. Let it do its job and the app will automatically reboot your device.
+- Install the latest Magisk app and launch the app. It should show a dialog asking for additional setups. Let it do its job and the app will automatically reboot your device.
 - Voila! Enjoy Magisk 😃
 
 ### Additional Notes
 
 - **Never, ever** try to restore either `boot` or `recovery` partitions back to stock! You can easily brick your device by doing so, and the only way out is to do a full Odin restore with data wipe.
 - To upgrade your device with a new firmware, **NEVER** directly use the stock `AP` tar file with reasons mentioned above. **Always** pre-patch `AP` in Magisk Manager before flashing in Odin.
-- Use `HOME_CSC` to preserve your data when doing a firmware upgrade. Using `CSC` is only necessary for the initial installation.
+- Use `HOME_CSC` to preserve your data when doing a firmware upgrade in the future. Using `CSC` is only necessary for the initial Magisk installation.
 - Never just flash only `AP`, or else Odin can shrink your `/data` filesystem. Flash full `AP` + `BL` + `CP` + `HOME_CSC` when upgrading.
 
 ## Huawei
-Magisk no longer officially support modern Huawei devices as the bootloader on their devices are not unlockable, and more importantly they do not follow standard Android partitioning schemes. The following are some general guidance for the few who managed to unlock their bootloader and really want to root it.
+Magisk no longer officially support modern Huawei devices as the bootloader on their devices are not unlockable, and more importantly they do not follow standard Android partitioning schemes. The following are just some general guidance.
 
 Huawei devices using Kirin processors have a different partitioning method from most common devices. Magisk is usually installed to the `boot` partition of the device, however Huawei devices do not have this partition.
 

docs/releases/22000.md

@@ -0,0 +1,24 @@
+## 2020.2.23 Magisk v22.0
+
+### RESTORE THE EXISTING MAGISK MANAGER BACK TO NORMAL BEFORE UPGRADING IF HIDDEN!
+
+Another major Magisk release! This time our focus is not the core Magisk implementation, but rather on improving the whole Magisk user experience.
+
+### Magisk Manager is dead.<br>Long live the Magisk app!
+
+Ever since the first Magisk release, Magisk (the core components) and Magisk Manager (the companion app) are released separately and isn't necessarily always in sync. This leads to some confusion and a lot of complexity when downloading/installing Magisk through the app. Starting from v22.0, the Magisk app (renamed from Magisk Manager) includes everything it needs within the APK itself, making installation a 100% offline process.
+
+Custom recovery lovers, no worries! The Magisk app APK *itself* is a custom recovery flashable zip, just like MAGIC™🌈. Check out the updated [installation guide](https://topjohnwu.github.io/Magisk/install.html) for more info.
+
+### App Hiding
+
+Another major breakthrough in this release is that devices lower than Android 9.0 can now also use the advanced app hiding technique to hide the Magisk app. Due to this incompatible change, **RESTORE THE EXISTING MAGISK MANAGER BACK TO NORMAL BEFORE UPGRADING IF HIDDEN!**
+
+### Bug Fixes
+
+- [MagiskHide] Fix a bug when stopping MagiskHide does not take effect
+- [MagiskBoot] Fix bug when unpacking `lz4_lg` compressed boot images
+- [MagiskInit] Support Galaxy S21 series
+- [MagiskSU] Fix incorrect APEX paths that caused `libsqlite.so` fail to load
+
+### Full Changelog: [here](https://topjohnwu.github.io/Magisk/changes.html)

docs/releases/index.md

@@ -1,5 +1,6 @@
 # Release Notes
 
+- [v22.0](22000.md)
 - [v21.4](21400.md)
 - [v21.2](21200.md)
 - [v21.1](21100.md)