{n,txt}/obtainium{,2}.{md,txt}: split API key requiring apps from obtainium.txt to obtainium2.txt, app stores into n/obtainium.md directly.

n/obtainium.md

@@ -25,7 +25,8 @@ automatic updates on Android 12+.
 
 - [Importable app list](#importable-app-list)
 - [Third party F-Droid repositories](#third-party-f-droid-repositories)
-- [Individually added apps](#individually-added-apps)
+  - [Apps within them](#apps-within-them)
+- [App Stores](#app-stores)
 - [Other noteworthy apps:](#other-noteworthy-apps)
 
 <!-- END doctoc generated TOC please keep comment here to allow auto update -->
@@ -35,18 +36,8 @@ automatic updates on Android 12+.
 
 ## Importable app list
 
-_Moved to [txt/obtainium.txt](/txt/obtainium.txt)!_
+- For apps that don't require API keys to be entered into Obtainium, see [txt/obtainium.txt](/txt/obtainium.txt).
-
+- For apps that require GitHub or GitLab API key to be entered into Obtainium, see [txt/obtainium2.txt](/txt/obtainium2.txt)
-<!--
-
-Note to self: to turn Obtainium export like this or close enough to manually
-cut it:
-
-```bash
-cat obtainium-export-1693463035816.json | jq -s | \grep 'url'
-```
-
--->
 
 ## Third party F-Droid repositories
 
@@ -58,12 +49,10 @@ Aren't mass-importable sadly, but using Briar as an example:
 
 Upon adding it will become something like the link below.
 
-## Individually added apps
+### Apps within them
 
-These apps must be added individually for whatever reason rather than mass imported:
+_However I would use [the F-Droid repositories directly](/n/f-droid.html)._
 
-- `https://appgallery.huawei.com/app/C27162`
-  - Huawei App Gallery. Huawei App Gallery seems require adding separately.
 - `https://briarproject.org/fdroid/repo?appId=org.briarproject.briar.android`
   - Briar. Third party F-Droid repo.
 - `https://fdroid.frostnerd.com?appId=com.frostnerd.smokescreen`
@@ -73,11 +62,34 @@ These apps must be added individually for whatever reason rather than mass impor
 - `https://divestos.org/apks/official/fdroid/repo?appId=us.spotco.fennec_dos`
   - Mull Browser (not to be confused with Mullvad). Often suggested as the closest to [LibreWolf](https://librewolf.net)
     on Android. Third party F-Droid repo.
+
+## App Stores
+
+_Always exercise caution when installing apps, even from Google Play Store!_
+
+- `https://github.com/accrescent/accrescent`
+  - Accrescent is a recent App Store which I have seen recommended especially in privacy circles, while it's a bit plain and doesn't have much selection yet.
+- `https://apkpure.net/apkpure/com.apkpure.aegon`
+  - APK Pure. Full of intrusive advertising, I wouldn't use it without adblocker and even then would keep my family away from it.
+- `https://gitlab.com/AuroraOSS/AuroraStore`
+  - Open source and anonymous interface for Google Play Store. Google doesn't like it, so the accounts often don't work, which is the reason this section has so many apps regardless of the common advice to install nothing outside of Play Store (that I obviously disagree with as there are dangerous and unwanted apps there too).
 - `https://aptoide.en.aptoide.com/app`
-  - Aptoide's official app. I didn't even try adding this in mass though,
+  - Aptoide App Store. Divided into multiple "substores", I would only use `apps`
-    be very careful with third party app stores there.
+    which is the official and `jolla` which comes with SailfishOS. I wouldn't
+    install it for a family member.
+- `https://f-droid.org/packages/org.fdroid.fdroid`
+  - FOSS-only app store with support for additional [repositories](/n/f-droid.html). I prefer the Basic version though, see below.
+- `https://f-droid.org/packages/org.fdroid.basic`
+  - F-Droid without local application sharing. Used to target higher API level than the main app allowing automatic updates for apps targeting recent enough app version. This is what I recommend and have installed for family for years.
+- `https://github.com/Tobi823/ffupdater`
+  - Installer and updater for privacy friendly browsers (and itself), including, but not limited to Firefox, Chromium and other browsers based on them (except obviously not Google Chrome). Would install for family, if they didn't have Google Play Store.
+- `https://appgallery.huawei.com/app/C27162`
+  - Huawei App Gallery. I don't think I recommend it, unless it comes with your phone, but it's nice to know it exists and can be installed?
+- `https://github.com/ImranR98/Obtainium`
+  - An app downloader that can install apps directly from the publishers, a few other app stores and F-Droid repositories (see an earlier section on this page). But you should know that already considering this page is of no interest to anyone else than Obtainium users (and mainly only me).
 - `https://uptodown-android.en.uptodown.com/android`
-  - See Aptoide.
+  - Uptodown app store, pleasant interface and not so intrusive advertising
+    as opposed to APK Pure. I would consider installing it for a family member, should they reach ??? apps outside of Play Store that it offers (such as AdGuard (which Google again dislikes), Telegram.org/Android...)
 
 ## Other noteworthy apps:
 

txt/obtainium.txt

@@ -1,5 +1,4 @@
 https://apkpure.net/android-system-webview/com.google.android.webview
-https://apkpure.net/apkpure/com.apkpure.aegon
 https://apkpure.net/beeper-unified-messenger/com.beeper.chat
 https://apkpure.net/bluesky/xyz.blueskyweb.app
 https://apkpure.net/google-gemini/com.google.android.apps.bard
@@ -24,69 +23,7 @@ https://f-droid.org/packages/com.termux
 https://f-droid.org/packages/eu.siacs.conversations
 https://f-droid.org/packages/net.eneiluj.moneybuster
 https://f-droid.org/packages/net.osmand.plus
-https://f-droid.org/packages/org.fdroid.basic
-https://f-droid.org/packages/org.fdroid.fdroid
 https://f-droid.org/packages/org.witness.sscphase1
-https://github.com/accrescent/accrescent
-https://github.com/AnySoftKeyboard/AnySoftKeyboard
-https://github.com/billthefarmer/editor
-https://github.com/binwiederhier/ntfy-android
-https://github.com/bitwarden/mobile
-https://github.com/Catfriend1/syncthing-android
-https://github.com/Catfriend1/syncthing-android-fdroid
-https://github.com/celzero/rethink-app
-https://github.com/cliambrown/EasyNoise
-https://github.com/c-lis/morelocale
-https://github.com/element-hq/element-android
-https://github.com/element-hq/element-x-android
-https://github.com/F0x1d/LogFox
-https://github.com/flxapps/DetoxDroid
-https://github.com/forkgram/TelegramAndroid
-https://github.com/forrestguice/IntervalMidpoints
-https://github.com/forrestguice/NaturalHour
-https://github.com/forrestguice/SolunarPeriods
-https://github.com/forrestguice/SuntimesCalendars
-https://github.com/forrestguice/SuntimesNFC
-https://github.com/forrestguice/SuntimesWidget
-https://github.com/GrapheneOS/PdfViewer
-https://github.com/guardianproject/ObscuraCam
-https://github.com/guardianproject/orbot
-https://github.com/HabitRPG/habitica-android
-https://github.com/ImranR98/Obtainium
-https://github.com/kawaiiDango/pano-scrobbler
-https://github.com/krille-chan/fluffychat
-https://github.com/laurent22/joplin-android
-https://github.com/markusfisch/BinaryEye
-https://github.com/mastodon/mastodon-android
-https://github.com/michaeltroger/greenpass-android
-https://github.com/mollyim/mollyim-android
-https://github.com/mollyim/mollyim-android-unifiedpush
-https://github.com/mollyim/mollyim-insider-android
-https://github.com/Neamar/KISS
-https://github.com/nextcloud/android
-https://github.com/ooni/probe-android
-https://github.com/organicmaps/organicmaps
-https://github.com/OsmTravel/OsmGo
-https://github.com/pilot51/voicenotify
-https://github.com/polymorphicshade/Tubular
-https://github.com/RikkaApps/Shizuku
-https://github.com/seemoo-lab/AirGuard
-https://github.com/segler-alex/RadioDroid
-https://github.com/simplex-chat/simplex-chat
-https://github.com/streetcomplete/StreetComplete
-https://github.com/svenjacobs/leon
-https://github.com/Swordfish90/Lemuroid
-https://github.com/syncthing/syncthing-android
-https://github.com/TeamNewPipe/NewPipe
-https://github.com/Telegram-FOSS-Team/Telegram-FOSS
-https://github.com/thundernest/k-9
-https://github.com/Tobi823/ffupdater
-https://github.com/tosdr/tosdr-android
-https://github.com/UnifiedPush/fcm-distributor
-https://github.com/UP-NextPush/android
-https://github.com/Zverik/every_door
-https://gitlab.com/AuroraOSS/AuroraStore
-https://gitlab.com/guardianproject/proofmode/proofmode-android
 https://signal.org
 https://store.steampowered.com
 https://telegram.org

txt/obtainium2.txt

@@ -0,0 +1,56 @@
+https://github.com/AnySoftKeyboard/AnySoftKeyboard
+https://github.com/billthefarmer/editor
+https://github.com/binwiederhier/ntfy-android
+https://github.com/bitwarden/mobile
+https://github.com/Catfriend1/syncthing-android
+https://github.com/Catfriend1/syncthing-android-fdroid
+https://github.com/celzero/rethink-app
+https://github.com/cliambrown/EasyNoise
+https://github.com/c-lis/morelocale
+https://github.com/element-hq/element-android
+https://github.com/element-hq/element-x-android
+https://github.com/F0x1d/LogFox
+https://github.com/flxapps/DetoxDroid
+https://github.com/forkgram/TelegramAndroid
+https://github.com/forrestguice/IntervalMidpoints
+https://github.com/forrestguice/NaturalHour
+https://github.com/forrestguice/SolunarPeriods
+https://github.com/forrestguice/SuntimesCalendars
+https://github.com/forrestguice/SuntimesNFC
+https://github.com/forrestguice/SuntimesWidget
+https://github.com/GrapheneOS/PdfViewer
+https://github.com/guardianproject/ObscuraCam
+https://github.com/guardianproject/orbot
+https://github.com/HabitRPG/habitica-android
+https://github.com/kawaiiDango/pano-scrobbler
+https://github.com/krille-chan/fluffychat
+https://github.com/laurent22/joplin-android
+https://github.com/markusfisch/BinaryEye
+https://github.com/mastodon/mastodon-android
+https://github.com/michaeltroger/greenpass-android
+https://github.com/mollyim/mollyim-android
+https://github.com/mollyim/mollyim-android-unifiedpush
+https://github.com/mollyim/mollyim-insider-android
+https://github.com/Neamar/KISS
+https://github.com/nextcloud/android
+https://github.com/ooni/probe-android
+https://github.com/organicmaps/organicmaps
+https://github.com/OsmTravel/OsmGo
+https://github.com/pilot51/voicenotify
+https://github.com/polymorphicshade/Tubular
+https://github.com/RikkaApps/Shizuku
+https://github.com/seemoo-lab/AirGuard
+https://github.com/segler-alex/RadioDroid
+https://github.com/simplex-chat/simplex-chat
+https://github.com/streetcomplete/StreetComplete
+https://github.com/svenjacobs/leon
+https://github.com/Swordfish90/Lemuroid
+https://github.com/syncthing/syncthing-android
+https://github.com/TeamNewPipe/NewPipe
+https://github.com/Telegram-FOSS-Team/Telegram-FOSS
+https://github.com/thundernest/k-9
+https://github.com/tosdr/tosdr-android
+https://github.com/UnifiedPush/fcm-distributor
+https://github.com/UP-NextPush/android
+https://github.com/Zverik/every_door
+https://gitlab.com/guardianproject/proofmode/proofmode-android