improved the sm-g900f guide

devices/sm-g900f.md

@@ -14,34 +14,27 @@
 
 download latest TWRP image from https://eu.dl.twrp.me/klte/
 
-download latest lineageOS from https://download.lineage.microg.org/klte/
+download latest lineageOS from https://cloud.0x90.space/s/5gIjkxmfvoHAAJL
 
 download latest Magisk.zip from https://github.com/topjohnwu/Magisk/releases
 
 ## Unlock the Bootloader / OEM
 
-Attach phone to PC. Use a good micro USB cable; make sure that you can use it
+Attach phone to PC. Use a good micro USB cable; make sure that it can be used
 to copy data.
 
+In the "About Device" settings,
 enable developer options
+by tapping on the "Build Number" 7 times.
 
-enable USB debugging in developer options
+Under "Developer options",
+enable USB debugging.
 
-allow USB debugging access for your PC
+Then when it asks you,
+allow USB debugging access for your PC.
 
 ## Flash Recovery
 
-<!-- *Right now, flashing recovery only works with Odin; Odin only runs on Windows.
-Guide how to flash TWRP with Odin:
-https://www.cyanogenmods.org/forums/topic/install-twrp-recovery-samsung-android-using-odin/
-
-Otherwise, there is also this guide to build a patched version of heimdall,
-which works with the S5:
-https://github.com/Benjamin-Dobell/Heimdall/pull/225#issuecomment-180961953
-Actually, Heimdall might work with some S5s, just not with mine.
-
-If Heimdall works:* -->
-
 Power off the your device and connect the USB adapter to the computer (but not to the device, yet).
 
 Boot into download mode:
@@ -50,7 +43,12 @@ Boot into download mode:
 
 Accept the disclaimer, then insert the USB cable into the device.
 
-`heimdall flash --RECOVERY twrp-3.3.1-0-klte.img --no-reboot`
+Open a command line,
+and use the `cd` command to navigate to the download folder,
+or whereever you saved the TWRP and lineageOS files,
+e.g. with `cd Downloads`.
+Run `heimdall flash --RECOVERY twrp-3.7.0_9-0-klte.img --no-reboot` on the command line,
+or replace the twrp-xxxxx.img part with the file name of the downloaded TWRP image.
 
 Now we don't want to boot into the system, we want into the new recovery
 directly - so turn off the phone with the power button, and then boot into
@@ -62,14 +60,20 @@ left of the screen.
 
 When asked, swipe right to allow modifications.
 
-Then go to Wipe + Advanced Wipe to wipe the following partitions:
+Then go to "Wipe > Advanced Wipe" to wipe the following partitions:
 
 * System
 * Data
 * Cache
 * Dalvik
 
-Then go to Advanced/ADB Sideload, swipe to the right, and execute `adb sideload lineage-xxx.zip` on your computer.
+Now go back to the "Wipe" menu,
+click on "Format Data",
+and enter "yes" when asked for confirmation.
+
+Then go back to the TWRP main menu
+and to "Advanced > ADB Sideload",
+swipe to the right, and execute `adb sideload lineage-18.1-20230615-microG-klte.zip` on your computer.
 * When it shows something like `Total xfer: 1.00x` or `adb: failed to read command: Success` on the PC, and `Exit code: 1.000000` in TWRP, it has suceeded.
 
 <!--
@@ -80,6 +84,7 @@ Go to Advanced/ADB Sideload, swipe to the right, and execute `adb sideload addon
 * When it shows something like `Total xfer: 1.00x` or `adb: failed to read command: Success` on the PC, and `Exit code: 1.000000` in TWRP, it has suceeded.
 -->
 
+<!--
 Don't reboot yet, we still want to flash Magisk to root the phone.
 
 First go to Backup and select only the Boot partition. Under "Select Storage",
@@ -91,7 +96,7 @@ to the right, and execute `adb sideload Magisk-*.zip` on your computer.
 * When it shows something like `Total xfer: 1.60x` or `adb: failed to read
   command: Success` on the PC, and `- Flashing new boot image` in combination
   with `- Done` in TWRP, it has suceeded.
-
+--> 
 Reboot to start LineageOS!
 
 ### Finish Installation
@@ -111,11 +116,25 @@ days. This is a very weird default setting.
 
 ## Device Encryption
 
-Charge the phone to 100%.
+Charge the phone to 80%.
+If that takes too long for you,
+you can use the command line
+to tell the phone that the battery is on 80%.
+For this you need to
+enable USB debugging again,
+with the same "tap build number 7 times" trick as before.
+After that, you can find the LineageOS developer options
+under "System > Advanced > Developer Options".
+Now you can run `adb shell dumpsys battery set level 80` on your PC.
 
 Go to the Security Settings and encrypt the phone. During the process, it
-reboots once and asks you for the device PIN. It can take a while, but not soo
+reboots once and asks you for the device PIN. It can take a while, but not
-long actually.
+longer than 10 minutes typically.
+
+If it fails for some reason,
+you can boot into TWRP,
+"Wipe > Format Data" to reset the broken encryption,
+and setup lineageOS again.
 
 ### Secure the device encryption
 
@@ -124,6 +143,7 @@ only have to enter when the phone boots, and a shorter PIN for your lockscreen.
 By design, Android doesn't allow this; this is a workaround to make it possible
 still.
 
+<!--
 We will also install an app which shuts down the phone when you get the unlock
 code wrong 5 times in a row.
 
@@ -139,7 +159,7 @@ Open "Wrong PIN Shutdown", grant Admin rights until forever, activate the
 function, and set it to shut down the phone after 5 wrong tries to enter the
 PIN. You can try it out directly - if you enter your PIN wrong 5 times, does it
 shut down? 
-
+-->
 #### Change the encryption password to a long password
 
 First you need to enable USB debugging again. You can enable the developer