Merge dandelion news and FAQ content all into markdown files in the dandelion repository

.github/ISSUE_TEMPLATE.md

@@ -21,7 +21,4 @@
   Description:
   What this is about, what happens and what is expected to happen. What needs to be done for it to happen.
   If a crash is happening a log is needed. Screenshots or demonstration videos are always helpful too.
-
-  About logging:
-  https://gsantner.net/android-contribution-guide/?packageid=com.github.dfa.diaspora_android&name=dandelion&web=https://github.com/gsantner/dandelion#logcat
 -->

.github/workflows/build-android-project.yml

@@ -1,6 +1,19 @@
+##############################################################################################################################
+# # Cleanup:
+#const sleep = ms => () => new Promise((resolve, reject) => window.setTimeout(resolve, ms));
+#Promise.resolve()
+#.then(() => {  document.getElementsByClassName("details-overlay details-reset position-relative d-inline-block ")[3].children[0].click();  })
+#.then(sleep(500))
+#.then(() => {  document.getElementsByClassName("dropdown-item btn-link menu-item-danger")[0].click();  })
+#.then(sleep(1000))
+#.then(() => {  document.getElementsByClassName("btn btn-block btn-danger")[0].click();});
+#
+# while [ 1 ] ; do sleep 4; xdotool key Up; sleep 0.1; xdotool key Return; done
+##############################################################################################################################
+
 name: "CI"
 
-on: [push, pull_request_target]
+on: [push, pull_request]
 
 jobs:
   build:
@@ -53,17 +66,3 @@ jobs:
         name: "android-apk"
         path: |
           dist/*.apk
-
-    - name: "Test: JUnit report"
-      if: always()
-      uses: mikepenz/action-junit-report@v1
-      with:
-        github_token: ${{ secrets.GITHUB_TOKEN }}
-        report_paths: 'dist/tests/TEST-*.xml'
-        check_name: "JUnit"
-
-    - name: "Test: Android Lint"
-      if: always()
-      uses: yutailang0119/action-android-lint@v1.0.2
-      with:
-        xml_path: 'dist/lint/lint-results-flavorDefaultDebug.xml'

CHANGELOG.md

@@ -1,9 +1,11 @@
-![](https://r.gsantner.net/matomo/piwik.php?action_name=inapp_changelog&idsite=2&rec=1&urlref=https%3A%2F%2Fgithub.com%2Fgsantner%2Fdandelion%2FCHANGELOG.md&_cvar=%7B%221%22%3A%5B%22source%22%2C%22changelog%22%5D%2C%222%22%3A%5B%22project%22%2C%22dandelion%22%5D%2C%223%22%3A%5B%22packageid%22%2C%22com.github.dfa.diaspora_android%22%5D%2C%224%22%3A%5B%22referrer%22%2C%22https%3A%2F%2Fgithub.com%2Fgsantner%2Fdandelion%2FCHANGELOG.md%22%5D%7D)
+### Recent changes
+- See [Discussions](https://github.com/gsantner/dandelion/discussions), [Issues](https://github.com/gsantner/dandelion/issues) and [Project page](https://github.com/gsantner/dandelion#readme) to see what is going on.
 
-
+### v1.4.0
-### v1.3.x
+- Add seconds to 'save picture' date format
 - Updated translations
 - Added german F-Droid description translation
+- Update to Android SDK 29
 
 ### v1.3.0
 - Add option to open youtube links external/in YouTube app (optional)  
@@ -21,7 +23,6 @@
 
 **New features:**  
 - All new Aspects and Tags, using a searchable dialog
-- A new home - project blog/page: <https://gsantner.net/project/dandelion.html>
 
 **Fixed:**  
 - Sometimes the Stream went white, which is due an still (>3 years) unfixed Android Support library bug. It should not occur very often anymore due less use of fragments.

CONTRIBUTORS.md

@@ -1,6 +1,5 @@
 <!--
 This file contains references to people who contributed to the app.
-You can also send a mail to [gsantner AT mailbox DOT org](http://gsantner.net#contact) to get included.
 
 Schema:  **[Name](Reference)**<br/>~° Text
 
@@ -13,7 +12,7 @@ Where:
 
 ## LIST OF CONTRIBUTORS
 -->
-* **[Gregor Santner](http://gsantner.net)**<br/>~° Current developer of dandelion
+* **[Gregor Santner](http://github.com/gsantner)**<br/>~° Development of dandelion
 * **[Paul Schaub](https://github.com/vanitasvitae)**<br/>~° Development of dandelion
 * **[Martín Vukovic](martinvukovic AT protonmail DOT com)**<br/>~° Diaspora Native WebApp
 * **[Gaukler Faun](https://github.com/scoute-dich)**<br/>~° Diaspora Native WebApp additions

Makefile

@@ -10,36 +10,47 @@ env-%:
 DIST_DIR = dist
 MOVE = mv
 
-all: $(DIST_DIR) lint test build
+all: $(DIST_DIR) spellcheck lint deptree test build aapt_dump_badging
 
 ####################################################################################
 
 $(DIST_DIR):
 	mkdir -p ${DIST_DIR}
 
-.NOTPARALLEL: gradle gradle-check-error
+ANDROID_BUILD_TOOLS := $(shell test -n "$ANDROID_SDK_ROOT" && find "${ANDROID_SDK_ROOT}/build-tools" -iname "aapt" | sort -r | head -n1 | xargs dirname)
+TOOL_SPELLCHECKING_ISPELL := $(shell command -v ispell 2> /dev/null)
+
+FLAVOR := $(or ${FLAVOR},${FLAVOR},Atest)
+
+.NOTPARALLEL: gradle gradle-analyze-log
 gradle: env-ANDROID_SDK_ROOT
 	mkdir -p $(DIST_DIR)/log/
 	chmod +x gradlew
 	./gradlew --no-daemon --parallel --stacktrace $A  2>&1 | tee "$(DIST_DIR)/log/gradle.log"
 	@echo "-----------------------------------------------------------------------------------"
 
-gradle-check-error:
+gradle-analyze-log:
 	mv  "$(DIST_DIR)/log/gradle.log" "$(DIST_DIR)/log/gradle$A.log"
 	cat "$(DIST_DIR)/log/gradle$A.log" | grep "BUILD " | tail -n1 | grep -q "BUILD SUCCESSFUL in"
 
+adb: env-ANDROID_SDK_ROOT
+	"${ANDROID_SDK_ROOT}/platform-tools/adb" $A 2>&1 | tee "$(DIST_DIR)/log/adb-$L.log"
+
+aapt: env-ANDROID_SDK_ROOT
+	"${ANDROID_BUILD_TOOLS}/aapt" $A 2>&1 | grep -v 'application-label-' | tee "$(DIST_DIR)/log/aapt$L.log"
+
 build:
 	rm -f $(DIST_DIR)/*.apk
-	$(MAKE) A="clean assembleFlavorAtest -x lint" gradle
+	$(MAKE) A="clean assembleFlavor$(FLAVOR) -x lint" gradle
-	find app -type f -iname '*.apk' | grep -v 'unsigned.apk' | xargs cp -R -t $(DIST_DIR)/
+	find app -type f -newermt '-300 seconds' -iname '*.apk' -not -iname '*unsigned.apk' | xargs cp -R -t $(DIST_DIR)/
-	$(MAKE) A="-build" gradle-check-error
+	$(MAKE) A="-build" gradle-analyze-log
 
 lint:
 	rm -Rf $(DIST_DIR)/lint
 	mkdir -p $(DIST_DIR)/lint/
 	$(MAKE) A="lintFlavorDefaultDebug" gradle
-	find app -type f -iname 'lint-results-*' | xargs cp -R -t $(DIST_DIR)/lint
+	find app -type f -iname 'lint-results-*' | grep -v 'intermediates' | xargs cp -R -t $(DIST_DIR)/lint
-	$(MAKE) A="-lint" gradle-check-error
+	$(MAKE) A="-lint" gradle-analyze-log
 
 test:
 	rm -Rf $(DIST_DIR)/tests
@@ -47,9 +58,42 @@ test:
 	mkdir -p app/build/test-results/testFlavorDefaultDebugUnitTest && echo 'PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHRlc3RzdWl0ZSBuYW1lPSJkdW1teSIgdGVzdHM9IjEiIHNraXBwZWQ9IjAiIGZhaWx1cmVzPSIwIiBlcnJvcnM9IjAiIHRpbWVzdGFtcD0iMjAyMC0xMi0wOFQwMDowMDowMCIgaG9zdG5hbWU9ImxvY2FsaG9zdCIgdGltZT0iMC4wMSI+CiAgPHByb3BlcnRpZXMvPgogIDx0ZXN0Y2FzZSBuYW1lPSJkdW1teSIgY2xhc3NuYW1lPSJkdW1teSIgdGltZT0iMC4wMSIvPgogIDxzeXN0ZW0tb3V0PjwhW0NEQVRBW11dPjwvc3lzdGVtLW91dD4KICA8c3lzdGVtLWVycj48IVtDREFUQVtdXT48L3N5c3RlbS1lcnI+CjwvdGVzdHN1aXRlPgo=' | base64 -d > 'app/build/test-results/testFlavorDefaultDebugUnitTest/TEST-dummy.xml'
 	find app -type d -iname 'testFlavorDefaultDebugUnitTest' | xargs cp -R -t $(DIST_DIR)/
 	mv ${DIST_DIR}/testFlavorDefaultDebugUnitTest $(DIST_DIR)/tests
-	$(MAKE) A="-test" gradle-check-error
+	$(MAKE) A="-test" gradle-analyze-log
+
+deptree:
+	$(MAKE) A="app:dependencies --configuration flavor$(FLAVOR)DebugRuntimeClasspath" gradle
+	$(MAKE) A="-dependency-tree" gradle-analyze-log
 
 clean:
 	$(MAKE) A="clean" gradle
-	rm -Rf $(DIST_DIR) app/build app/flavor*
+	rm -Rf $(DIST_DIR) app/build app/flavor* .idea dist
+	find . -type f -iname "*.iml" -delete
 	$(MAKE) $(DIST_DIR)
+	@echo "-----------------------------------------------------------------------------------"
+
+install:
+	$(MAKE) A="install -r $(DIST_DIR)/*.apk" L="install" adb
+
+run:
+	$(MAKE) A="shell monkey -p $$(aapt dump badging $(DIST_DIR)/*.apk | grep package: | sed 's@.* name=@@' | sed 's@ .*@@' | xargs | head -n1) -c android.intent.category.LAUNCHER 1" L="run" adb
+
+aapt_dump_badging:
+	$(MAKE) A="dump badging $(DIST_DIR)/*.apk" aapt
+	@echo "-----------------------------------------------------------------------------------"
+
+spellcheck:
+	mkdir -p "$(DIST_DIR)/lint/"
+ifndef TOOL_SPELLCHECKING_ISPELL
+	@echo "Tool ispell (spellcheck) not found in PATH. Spellcheck skipped." > "$(DIST_DIR)/lint/stringsxml-spellcheck.txt"
+else
+	@echo "Use ispell for spellchecking the original values/strings.xml"
+	find . -iname "strings.xml" -path "*/main*/values/*" | head -n1 | xargs cat \
+	   | grep "<string name=" | sed 's@.*">@@' | sed 's@</string>@@' | sed 's@\\n@  @g' | sed 's@\\@@g'  \
+	   | ispell -W3 -a | grep ^\& | sed 's@[0-9]@@g' | sort | uniq | cut -d, -f1-4 \
+	   | sed 's@^..@- @' | column -t -s: \
+	   > "$(DIST_DIR)/lint/stringsxml-spellcheck.txt"
+	@echo "\nPotential words with bad spelling:"
+endif
+	@cat "$(DIST_DIR)/lint/stringsxml-spellcheck.txt"
+	@echo "-----------------------------------------------------------------------------------"
+

NEWS.md

@@ -0,0 +1,96 @@
+# dandelion - News
+
+## General
+
+### Installation
+You can install and update from [F-Droid](https://f-droid.org/repository/browse/?fdid=com.github.dfa.diaspora_android) or [GitHub](https://github.com/gsantner/dandelion/releases/latest).
+
+F-Droid is a store for free & open source apps.
+The *.apk's available for download are signed by the F-Droid team and guaranteed to correspond to the (open source) source code of dandelion.
+Generally this is the recommended way to install dandelion & keep it updated.
+
+
+### Get informed
+* Check the [project readme](https://github.com/gsantner/dandelion/tree/news#readme) for general project information.
+* Check the [project news](https://github.com/gsantner/dandelion/blob/master/NEWS.md#readme) for more details on what is going on.
+* Check the [project git history](https://github.com/gsantner/dandelion/commits/master) for most recent code changes.
+
+### The right place to ask
+If you have questions or found an issue please head to the [dandelion project](https://github.com/gsantner/dandelion/issues/new/choose) and ask there. 
+[Search](https://github.com/gsantner/dandelion/issues?q=#js-issues-search) for same/similar and related issues/questions before, it might be already answered or resolved.   
+
+
+### Navigation
+* [dandelion v1.2 - Add dandelior - Searchable Tags and Aspects](#dandelion-v12---add-dandelior---searchable-tags-and-aspects)
+* [dandelion v0.1.2 - Aspekte, Pod wechseln](#dandelion-v012---aspekte-pod-wechseln)
+
+
+
+
+
+
+
+
+
+------------------------------------------------------------------------------------------------------------------------------------
+
+------------------------------------------------------------------------------------------------------------------------------------
+
+------------------------------------------------------------------------------------------------------------------------------------
+
+
+# dandelion\* v1.2 - Add dandelior\* - Searchable Tags and Aspects
+_12. August 2018_
+
+## dandelior\* is a rebranded version of dandelion\*
+dandelior\* is based 100% on the same code and resources as dandelion\*. Its from the same code repository, just a different build flavor. 
+The main purpose of dandelior\* is the most requested feature till date - to support multiple accounts / another account at dandelion\*.
+
+- Added an (rebranded) flavor of dandelion: dandelior
+- Only differenties in use are other (black) icon and AMOLED colors by default enabled
+- Already available on F-Droid
+
+**New features:**  
+- All new Aspects and Tags, using a searchable dialog
+
+**Fixed:**  
+- Sometimes the Stream went white, which is due an still (3+ years) unfixed Android Support library bug. It should not occur very often anymore due less use of fragments.
+
+**Improved:**
+- Various small tweaks
+- Updated translation files
+
+
+
+
+
+
+
+
+
+------------------------------------------------------------------------------------------------------------------------------------
+
+------------------------------------------------------------------------------------------------------------------------------------
+
+------------------------------------------------------------------------------------------------------------------------------------
+
+
+# dandelion v0.1.2 - Aspekte, Pod wechseln
+_05. Juni 2016_
+
+In den letzten Tagen hat @gsantner viel Zeit in die inoffizielle diaspora\* Android App ([dandelion\*](https://github.com/gsantner/dandelion)) investiert.
+
+Dabei wurden unter anderem folgende Änderungen beigesteuert:
+
+- Allgemeines zur Usability
+- Animationen für den Activity-Wechsel und Startup, WebView-Scroll-Top
+- Podliste caching
+- Aspekt-Liste und Aspekte hinzugefügt
+- Verbessertes Sharing aus der App
+- Material Progressbar
+- Suche verbessert
+- Collapsing top menu
+- toolbar/actions/menu geändert, fab entfernt
+- Refactoring layout & menu files, dialogs
+- Überarbeitete Main,Splash,PodSelectionActivity
+- Pod wechseln

README.md

@@ -1,9 +1,9 @@
-[![GitHub release](https://img.shields.io/github/tag/gsantner/dandelion.svg)](https://github.com/gsantner/dandelion/releases)
+[![GitHub releases](https://img.shields.io/github/tag/gsantner/dandelion.svg)](https://github.com/gsantner/dandelion/releases)
-[![Build Status](https://travis-ci.org/gsantner/dandelion.svg?branch=master)](https://travis-ci.org/gsantner/dandelion)
+[![GitHub downloads](https://img.shields.io/github/downloads/gsantner/dandelion/total.svg?logo=github&logoColor=lime)](https://github.com/gsantner/dandelion/releases)
-[![Translate - with Stringlate](https://img.shields.io/badge/stringlate-translate-green.svg)](https://lonamiwebs.github.io/stringlate/translate?git=https%3A%2F%2Fgithub.com%2Fgsantner%2Fdandelion.git&mail=gro.xobliam@@rentnasg)
+[![Translate on Crowdin](https://img.shields.io/badge/translate-crowdin-green.svg)](https://crowdin.com/project/diaspora-for-android/invite)
-[![Chat - Matrix](https://img.shields.io/badge/chat-on%20matrix-blue.svg)](https://matrix.to/#/#dandelion:matrix.org) [![Chat - FreeNode IRC](https://img.shields.io/badge/chat-on%20irc-blue.svg)](https://kiwiirc.com/client/irc.freenode.net/?nick=dandelion-anon|?##dandelion)
+[![Chat on Matrix](https://img.shields.io/badge/chat-matrix-blue.svg)](https://matrix.to/#/#dandelion:matrix.org)
-[![Donate](https://img.shields.io/badge/donate-appreciation-orange.svg)](https://gsantner.net/page/supportme.html?project=dandelion&source=gh_readme)
+[![GitHub CI](https://github.com/gsantner/dandelion/workflows/CI/badge.svg)](https://github.com/gsantner/dandelion/actions)
-[![Donate LiberaPay](https://img.shields.io/badge/donate-liberapay-orange.svg)](https://liberapay.com/gsantner/donate) ![](https://r.gsantner.net/matomo/piwik.php?action_name=readme&idsite=2&rec=1&urlref=https%3A%2F%2Fgithub.com%2Fgsantner%2Fdandelion%2FREADME.md&_cvar=%7B%221%22%3A%5B%22source%22%2C%22readme%22%5D%2C%222%22%3A%5B%22project%22%2C%22dandelion%22%5D%2C%223%22%3A%5B%22packageid%22%2C%22com.github.dfa.diaspora_android%22%5D%2C%224%22%3A%5B%22referrer%22%2C%22https%3A%2F%2Fgithub.com%2Fgsantner%2Fdandelion%2FREADME.md%22%5D%7D)
+[![Codacy code quality](https://img.shields.io/codacy/grade/aff869c440bc48b7bd64680e97cbc453)](https://www.codacy.com/app/gsantner/dandelion)
 
 # dandelion\*
 <img src="/app/src/main/ic_launcher-web.png" align="left" width="100" hspace="10" vspace="10">
@@ -39,12 +39,11 @@ dandelion\* requires access to the Internet and to external storage to be able t
 
 ## Contributions
 The project is always open for contributions and accepts pull requests.
-The project uses [AOSP Java Code Style](https://source.android.com/source/code-style#follow-field-naming-conventions), with one exception: private members are `_camelCase` instead of `mBigCamel`. You may use Android Studios _auto reformat feature_ before sending a PR. See [gsantner's android contribution guide](https://gsantner.net/android-contribution-guide/?packageid=com.github.dfa.diaspora_android&name=dandelion&web=https://github.com/gsantner/dandelion&source=readme#logcat) for more information.
+The project uses [AOSP Java Code Style](https://source.android.com/source/code-style#follow-field-naming-conventions), with one exception: private members are `_camelCase` instead of `mBigCamel`. You may use Android Studios _auto reformat feature_ before sending a PR.
 
-Translations can be contributed on GitHub or via [E-Mail](https://gsantner.net/#contact). You can use Stringlate ([![Translate - with Stringlate](https://img.shields.io/badge/stringlate-translate-green.svg)](https://lonamiwebs.github.io/stringlate/translate?git=https%3A%2F%2Fgithub.com%2Fgsantner%2Fdandelion.git)) to translate the project directly on your Android phone. It allows you to export as E-Mail attachement and to post on GitHub.
+Translations can be contributed on GitHub. You can use Stringlate ([![Translate - with Stringlate](https://img.shields.io/badge/stringlate-translate-green.svg)](https://lonamiwebs.github.io/stringlate/translate?git=https%3A%2F%2Fgithub.com%2Fgsantner%2Fdandelion.git)) to translate the project directly on your Android phone. It allows you to export as E-Mail attachement and to post on GitHub.
-
-Join our IRC or Matrix channel (bridged) and say hello! Don't be afraid to start talking. [![Chat - Matrix](https://img.shields.io/badge/chat-on%20matrix-blue.svg)](https://matrix.to/#/#dandelion:matrix.org) [![Chat - FreeNode IRC](https://img.shields.io/badge/chat-on%20irc-blue.svg)](https://kiwiirc.com/client/irc.freenode.net/?nick=dandelion-anon|?##dandelion)
 
+Join our Matrix channel and say hello! Don't be afraid to start talking. [![Chat - Matrix](https://img.shields.io/badge/chat-on%20matrix-blue.svg)](https://matrix.to/#/#dandelion:matrix.org)  
 Note that the main project members are working on this project for free during leisure time, are mostly busy with their job/university/school, and may not react or start coding immediately.
 
 
@@ -62,23 +61,21 @@ For more licensing informations, see [`3rd party licenses`](/app/src/main/res/ra
 
 ## Screenshots
 <div style="display:flex;" >
-	<img src="https://raw.githubusercontent.com/diaspora-for-android/dandelion-metadata-latest/master/en-US/phoneScreenshots/01.png" width="19%" >
+	<img src="https://raw.githubusercontent.com/gsantner/dandelion/master/metadata/en-US/phoneScreenshots/01.png" width="19%" >
-	<img src="https://raw.githubusercontent.com/diaspora-for-android/dandelion-metadata-latest/master/en-US/phoneScreenshots/02.png" width="19%" style="margin-left:10px;" >
+	<img src="https://raw.githubusercontent.com/gsantner/dandelion/master/metadata/en-US/phoneScreenshots/02.png" width="19%" style="margin-left:10px;" >
-	<img src="https://raw.githubusercontent.com/diaspora-for-android/dandelion-metadata-latest/master/en-US/phoneScreenshots/03.png" width="19%" style="margin-left:10px;" >
+	<img src="https://raw.githubusercontent.com/gsantner/dandelion/master/metadata/en-US/phoneScreenshots/03.png" width="19%" style="margin-left:10px;" >
-	<img src="https://raw.githubusercontent.com/diaspora-for-android/dandelion-metadata-latest/master/en-US/phoneScreenshots/04.png" width="19%" style="margin-left:10px;" >
+	<img src="https://raw.githubusercontent.com/gsantner/dandelion/master/metadata/en-US/phoneScreenshots/04.png" width="19%" style="margin-left:10px;" >
-	<img src="https://raw.githubusercontent.com/diaspora-for-android/dandelion-metadata-latest/master/en-US/phoneScreenshots/05.png" width="19%" style="margin-left:10px;" >
+	<img src="https://raw.githubusercontent.com/gsantner/dandelion/master/metadata/en-US/phoneScreenshots/05.png" width="19%" style="margin-left:10px;" >
 </div>
 
 <div style="display:flex;" >
-	<img src="https://raw.githubusercontent.com/diaspora-for-android/dandelion-metadata-latest/master/en-US/phoneScreenshots/06.png" width="19%" >
+	<img src="https://raw.githubusercontent.com/gsantner/dandelion/master/metadata/en-US/phoneScreenshots/06.png" width="19%" >
-	<img src="https://raw.githubusercontent.com/diaspora-for-android/dandelion-metadata-latest/master/en-US/phoneScreenshots/07.png" width="19%" style="margin-left:10px;" >
+	<img src="https://raw.githubusercontent.com/gsantner/dandelion/master/metadata/en-US/phoneScreenshots/07.png" width="19%" style="margin-left:10px;" >
-	<img src="https://raw.githubusercontent.com/diaspora-for-android/dandelion-metadata-latest/master/en-US/phoneScreenshots/08.png" width="19%" style="margin-left:10px;" >
+	<img src="https://raw.githubusercontent.com/gsantner/dandelion/master/metadata/en-US/phoneScreenshots/08.png" width="19%" style="margin-left:10px;" >
-	<img src="https://raw.githubusercontent.com/diaspora-for-android/dandelion-metadata-latest/master/en-US/phoneScreenshots/09.png" width="19%" style="margin-left:10px;" >
+	<img src="https://raw.githubusercontent.com/gsantner/dandelion/master/metadata/en-US/phoneScreenshots/09.png" width="19%" style="margin-left:10px;" >
 </div>
 
 ### Notice
 #### Maintainers
-- gsantner ([GitHub](https://github.com/gsantner), [Web](https://gsantner.net/page/supportme.html?project=dandelion&source=gh_readme), [diaspora*](https://pod.geraspora.de/people/d1cbdd70095301341e834860008dbc6c))
+- gsantner ([GitHub](https://github.com/gsantner), [diaspora*](https://pod.geraspora.de/people/d1cbdd70095301341e834860008dbc6c))
-  - Bitcoin: [1B9ZyYdQoY9BxMe9dRUEKaZbJWsbQqfXU5](https://gsantner.net/page/supportme.html?project=dandelion&source=gh_readme)
 - vanitasvitae ([GitHub](https://github.com/vanitasvitae), [diaspora*](https://pod.geraspora.de/people/bbd7af90fbec013213e34860008dbc6c))
-  - Bitcoin: 1Ao3W6NaQv3xKppviB7RSFKjHo6PGd8RTy

SCREENSHOTS.md

@@ -1,16 +0,0 @@
-## Screenshots
-
-<div style="display:flex;" >
-	<img src="https://raw.githubusercontent.com/diaspora-for-android/dandelion-metadata-latest/master/en-US/phoneScreenshots/01.png" width="19%" >
-	<img src="https://raw.githubusercontent.com/diaspora-for-android/dandelion-metadata-latest/master/en-US/phoneScreenshots/02.png" width="19%" style="margin-left:10px;" >
-	<img src="https://raw.githubusercontent.com/diaspora-for-android/dandelion-metadata-latest/master/en-US/phoneScreenshots/03.png" width="19%" style="margin-left:10px;" >
-	<img src="https://raw.githubusercontent.com/diaspora-for-android/dandelion-metadata-latest/master/en-US/phoneScreenshots/04.png" width="19%" style="margin-left:10px;" >
-	<img src="https://raw.githubusercontent.com/diaspora-for-android/dandelion-metadata-latest/master/en-US/phoneScreenshots/05.png" width="19%" style="margin-left:10px;" >
-</div>
-
-<div style="display:flex;" >
-	<img src="https://raw.githubusercontent.com/diaspora-for-android/dandelion-metadata-latest/master/en-US/phoneScreenshots/06.png" width="19%" >
-	<img src="https://raw.githubusercontent.com/diaspora-for-android/dandelion-metadata-latest/master/en-US/phoneScreenshots/07.png" width="19%" style="margin-left:10px;" >
-	<img src="https://raw.githubusercontent.com/diaspora-for-android/dandelion-metadata-latest/master/en-US/phoneScreenshots/08.png" width="19%" style="margin-left:10px;" >
-	<img src="https://raw.githubusercontent.com/diaspora-for-android/dandelion-metadata-latest/master/en-US/phoneScreenshots/09.png" width="19%" style="margin-left:10px;" >
-</div>

app/src/main/AndroidManifest.xml

@@ -15,6 +15,7 @@
         android:allowBackup="false"
         android:icon="@drawable/ic_launcher"
         android:label="@string/app_name"
+        android:requestLegacyExternalStorage="true"
         android:theme="@style/DiasporaLight">
 
         <provider
@@ -59,7 +60,8 @@
             android:theme="@style/DiasporaLight.NoActionBar"
             android:windowSoftInputMode="adjustResize">
 
-            <meta-data android:name="android.app.shortcuts"
+            <meta-data
+                android:name="android.app.shortcuts"
                 android:resource="@xml/shortcuts" />
 
             <intent-filter>
@@ -68,6 +70,7 @@
                 <action android:name="sc_aspects" />
                 <action android:name="sc_activities" />
                 <action android:name="android.intent.action.MAIN" />
+
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
 

app/src/main/java/com/github/dfa/diaspora_android/App.java

@@ -36,6 +36,7 @@ import com.github.dfa.diaspora_android.util.DiasporaUrlHelper;
 
 import net.gsantner.opoc.util.AdBlock;
 import net.gsantner.opoc.util.ContextUtils;
+import net.gsantner.opoc.util.ShareUtil;
 
 public class App extends Application {
     private volatile static App app;
@@ -51,6 +52,7 @@ public class App extends Application {
     @Override
     public void onCreate() {
         super.onCreate();
+        ShareUtil.setFileProviderAuthority(BuildConfig.APPLICATION_ID);
         app = this;
         final Context c = getApplicationContext();
         appSettings = AppSettings.get();

app/src/main/java/com/github/dfa/diaspora_android/activity/DiasporaStreamFragment.java

@@ -128,7 +128,7 @@ public class DiasporaStreamFragment extends BrowserFragment {
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
         AppLog.d(this, "StreamFragment.onOptionsItemSelected()");
-        ShareUtil shu = new ShareUtil(getContext()).setFileProviderAuthority(BuildConfig.APPLICATION_ID);
+        ShareUtil shu = new ShareUtil(getContext());
         PermissionChecker permc = new PermissionChecker(getActivity());
         switch (item.getItemId()) {
             case R.id.action_reload: {
@@ -185,7 +185,7 @@ public class DiasporaStreamFragment extends BrowserFragment {
                     if (permc.mkdirIfStoragePermissionGranted(fileSaveDirectory)) {
                         Bitmap bmp = ShareUtil.getBitmapFromWebView(webView);
                         String filename = "dandelion-" + ShareUtil.SDF_SHORT.format(new Date()) + ".jpg";
-                        _cu.writeImageToFileJpeg(new File(fileSaveDirectory, filename), bmp);
+                        _cu.writeImageToFile(new File(fileSaveDirectory, filename), bmp);
                         Snackbar.make(webView, getString(R.string.saving_screenshot_as)
                                 + " " + filename, Snackbar.LENGTH_LONG).show();
                     }
@@ -195,7 +195,7 @@ public class DiasporaStreamFragment extends BrowserFragment {
 
             case R.id.action_share_screenshot: {
                 if (permc.doIfExtStoragePermissionGranted(getString(R.string.screenshot_permission__appspecific))) {
-                    shu.shareImage(ShareUtil.getBitmapFromWebView(webView), Bitmap.CompressFormat.JPEG);
+                    shu.shareImage(ShareUtil.getBitmapFromWebView(webView));
                 }
                 return true;
             }

app/src/main/java/com/github/dfa/diaspora_android/activity/MainActivity.java

@@ -90,7 +90,6 @@ import com.github.dfa.diaspora_android.web.WebHelper;
 import com.github.dfa.diaspora_android.web.custom_tab.CustomTabActivityHelper;
 
 import net.gsantner.opoc.format.markdown.SimpleMarkdownParser;
-import net.gsantner.opoc.util.AndroidSupportMeWrapper;
 
 import java.io.IOException;
 
@@ -664,7 +663,6 @@ public class MainActivity extends ThemedActivity
     protected void onResume() {
         AppLog.v(this, "onResume()");
         super.onResume();
-        //new AndroidSupportMeWrapper(this).mainOnResume();
         AppLog.v(this, "Register BroadcastReceivers");
         LocalBroadcastManager.getInstance(this).registerReceiver(brSetTitle, new IntentFilter(ACTION_UPDATE_TITLE_FROM_URL));
         LocalBroadcastManager.getInstance(this).registerReceiver(brOpenExternalLink, new IntentFilter(ACTION_OPEN_EXTERNAL_URL));

app/src/main/java/com/github/dfa/diaspora_android/data/DiasporaPodList.java

@@ -13,7 +13,7 @@ import java.util.List;
 
 
 /**
- * Created by gsantner (https://gsantner.net/ on 30.09.16.
+ * Created by gsantner (gsantner AT mailbox DOT org on 30.09.16.
  * DiasporaPodList  - List container for DiasporaPod's, with methods to merge with other DiasporaPodLists
  * DiasporaPod      - Data container for a Pod, can include N DiasporaPodUrl's
  * DiasporaPodUrl   - A Url of an DiasporaPod

app/src/main/java/com/github/dfa/diaspora_android/data/DiasporaUserProfile.java

@@ -32,7 +32,7 @@ import org.json.JSONObject;
 
 /**
  * User profile
- * Created by gsantner (https://gsantner.net/) on 24.03.16.  Part of dandelion*.
+ * Created by gsantner (gsantner AT mailbox DOT org) on 24.03.16.  Part of dandelion*.
  */
 public class DiasporaUserProfile {
     private static final int MINIMUM_USERPROFILE_LOAD_TIMEDIFF = 5000;

app/src/main/java/com/github/dfa/diaspora_android/listener/DiasporaUserProfileChangedListener.java

@@ -21,7 +21,7 @@ package com.github.dfa.diaspora_android.listener;
 import com.github.dfa.diaspora_android.data.DiasporaUserProfile;
 
 /**
- * Created by gsantner (https://gsantner.net/) on 26.03.16.
+ * Created by gsantner (gsantner AT mailbox DOT org) on 26.03.16.
  * Interface that needs to be implemented by classes that listen for Profile related changes
  */
 public interface DiasporaUserProfileChangedListener {

app/src/main/java/com/github/dfa/diaspora_android/ui/PodSelectionDialog.java

@@ -37,7 +37,7 @@ import butterknife.OnItemSelected;
 
 /**
  * Dialog that helps the user configure a pod
- * Created by gsantner (http://gsantner.net) on 06.10.16.
+ * Created by gsantner on 06.10.16.
  */
 public class PodSelectionDialog extends ThemedAppCompatDialogFragment {
     public static final String TAG = "com.github.dfa.diaspora_android.ui.PodSelectionDialog";

app/src/main/java/com/github/dfa/diaspora_android/util/AppSettings.java

@@ -37,7 +37,7 @@ import java.util.List;
 
 /**
  * Settings
- * Created by gsantner (https://gsantner.net/) on 20.03.16. Part of dandelion*.
+ * Created by gsantner (gsantner AT mailbox DOT org) on 20.03.16. Part of dandelion*.
  */
 @SuppressWarnings("ConstantConditions")
 public class AppSettings extends SharedPreferencesPropertyBackend {

app/src/main/java/com/github/dfa/diaspora_android/web/ContextMenuWebView.java

@@ -78,7 +78,7 @@ public class ContextMenuWebView extends NestedWebView {
             public boolean onMenuItemClick(MenuItem item) {
                 HitTestResult result = getHitTestResult();
                 String url = result.getExtra();
-                final ShareUtil shu = new ShareUtil(context).setFileProviderAuthority(BuildConfig.APPLICATION_ID);
+                final ShareUtil shu = new ShareUtil(context);
                 final PermissionChecker permc = new PermissionChecker(parentActivity);
                 final AppSettings appSettings = new AppSettings(context);
 

app/src/main/java/com/github/dfa/diaspora_android/web/WebHelper.java

@@ -32,7 +32,6 @@ import com.github.dfa.diaspora_android.activity.MainActivity;
 
 /**
  * Created by Gregor Santner on 07.08.16.
- * http://gsantner.net
  */
 public class WebHelper {
 

app/src/main/java/net/gsantner/opoc/activity/GsFragmentBase.java

@@ -1,9 +1,8 @@
 /*#######################################################
  *
- *   Maintained by Gregor Santner, 2017-
+ *   Maintained 2017-2023 by Gregor Santner <gsantner AT mailbox DOT org>
- *   https://gsantner.net/
  *
- *   License: Apache 2.0 / Commercial
+ *   License: Apache 2.0
  *  https://github.com/gsantner/opoc/#licensing
  *  https://www.apache.org/licenses/LICENSE-2.0
  *
@@ -24,6 +23,7 @@ import android.view.MenuInflater;
 import android.view.View;
 import android.view.ViewGroup;
 
+import net.gsantner.opoc.android.dummy.MenuItemDummy;
 import net.gsantner.opoc.util.ContextUtils;
 
 import butterknife.ButterKnife;
@@ -37,7 +37,7 @@ public abstract class GsFragmentBase extends Fragment {
 
     protected ContextUtils _cu;
     protected Bundle _savedInstanceState = null;
-    protected Menu _fragmentMenu;
+    protected Menu _fragmentMenu = new MenuItemDummy.Menu();
 
     @Override
     public void onCreate(Bundle savedInstanceState) {

app/src/main/java/net/gsantner/opoc/android/dummy/MenuItemDummy.java

@@ -0,0 +1,351 @@
+/*
+ * Maintained 2017-2023 by Gregor Santner <gsantner AT mailbox DOT org>
+ * License: Creative Commons Zero (CC0 1.0) / Public Domain
+ *  http://creativecommons.org/publicdomain/zero/1.0/
+ *
+ * You can do whatever you want with this. If we meet some day, and you think it is worth it,
+ * you can buy me a drink in return. Provided as is without any kind of warranty. Do not blame
+ * or ask for support if something goes wrong.  - Gregor Santner
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ */
+package net.gsantner.opoc.android.dummy;
+
+import android.content.ComponentName;
+import android.content.Intent;
+import android.graphics.drawable.Drawable;
+import android.view.ActionProvider;
+import android.view.ContextMenu;
+import android.view.KeyEvent;
+import android.view.MenuItem;
+import android.view.SubMenu;
+import android.view.View;
+
+public class MenuItemDummy implements MenuItem {
+    private final int _itemId;
+
+    public MenuItemDummy(final int itemId) {
+        _itemId = itemId;
+    }
+
+    @Override
+    public int getItemId() {
+        return _itemId;
+    }
+
+    @Override
+    public int getGroupId() {
+        return 0;
+    }
+
+    @Override
+    public int getOrder() {
+        return 0;
+    }
+
+    @Override
+    public MenuItem setTitle(CharSequence title) {
+        return null;
+    }
+
+    @Override
+    public MenuItem setTitle(int title) {
+        return null;
+    }
+
+    @Override
+    public CharSequence getTitle() {
+        return null;
+    }
+
+    @Override
+    public MenuItem setTitleCondensed(CharSequence title) {
+        return null;
+    }
+
+    @Override
+    public CharSequence getTitleCondensed() {
+        return null;
+    }
+
+    @Override
+    public MenuItem setIcon(Drawable icon) {
+        return null;
+    }
+
+    @Override
+    public MenuItem setIcon(int iconRes) {
+        return null;
+    }
+
+    @Override
+    public Drawable getIcon() {
+        return null;
+    }
+
+    @Override
+    public MenuItem setIntent(Intent intent) {
+        return null;
+    }
+
+    @Override
+    public Intent getIntent() {
+        return null;
+    }
+
+    @Override
+    public MenuItem setShortcut(char numericChar, char alphaChar) {
+        return null;
+    }
+
+    @Override
+    public MenuItem setNumericShortcut(char numericChar) {
+        return null;
+    }
+
+    @Override
+    public char getNumericShortcut() {
+        return 0;
+    }
+
+    @Override
+    public MenuItem setAlphabeticShortcut(char alphaChar) {
+        return null;
+    }
+
+    @Override
+    public char getAlphabeticShortcut() {
+        return 0;
+    }
+
+    @Override
+    public MenuItem setCheckable(boolean checkable) {
+        return null;
+    }
+
+    @Override
+    public boolean isCheckable() {
+        return false;
+    }
+
+    @Override
+    public MenuItem setChecked(boolean checked) {
+        return null;
+    }
+
+    @Override
+    public boolean isChecked() {
+        return false;
+    }
+
+    @Override
+    public MenuItem setVisible(boolean visible) {
+        return null;
+    }
+
+    @Override
+    public boolean isVisible() {
+        return false;
+    }
+
+    @Override
+    public MenuItem setEnabled(boolean enabled) {
+        return null;
+    }
+
+    @Override
+    public boolean isEnabled() {
+        return false;
+    }
+
+    @Override
+    public boolean hasSubMenu() {
+        return false;
+    }
+
+    @Override
+    public SubMenu getSubMenu() {
+        return null;
+    }
+
+    @Override
+    public MenuItem setOnMenuItemClickListener(OnMenuItemClickListener menuItemClickListener) {
+        return null;
+    }
+
+    @Override
+    public ContextMenu.ContextMenuInfo getMenuInfo() {
+        return null;
+    }
+
+    @Override
+    public void setShowAsAction(int actionEnum) {
+    }
+
+    @Override
+    public MenuItem setShowAsActionFlags(int actionEnum) {
+        return null;
+    }
+
+    @Override
+    public MenuItem setActionView(View view) {
+        return null;
+    }
+
+    @Override
+    public MenuItem setActionView(int resId) {
+        return null;
+    }
+
+    @Override
+    public View getActionView() {
+        return null;
+    }
+
+    @Override
+    public MenuItem setActionProvider(ActionProvider actionProvider) {
+        return null;
+    }
+
+    @Override
+    public ActionProvider getActionProvider() {
+        return null;
+    }
+
+    @Override
+    public boolean expandActionView() {
+        return false;
+    }
+
+    @Override
+    public boolean collapseActionView() {
+        return false;
+    }
+
+    @Override
+    public boolean isActionViewExpanded() {
+        return false;
+    }
+
+    @Override
+    public MenuItem setOnActionExpandListener(OnActionExpandListener listener) {
+        return null;
+    }
+
+
+    public static class Menu implements android.view.Menu {
+        @Override
+        public MenuItem add(CharSequence title) {
+            return add(0, 0, 0, "");
+        }
+
+        @Override
+        public MenuItem add(int titleRes) {
+            return add(0, 0, 0, "");
+        }
+
+        @Override
+        public MenuItem add(int groupId, int itemId, int order, CharSequence title) {
+            return new MenuItemDummy(itemId);
+        }
+
+        @Override
+        public MenuItem add(int groupId, int itemId, int order, int titleRes) {
+            return add(0, 0, 0, "");
+        }
+
+        @Override
+        public SubMenu addSubMenu(CharSequence title) {
+            return null;
+        }
+
+        @Override
+        public SubMenu addSubMenu(int titleRes) {
+            return null;
+        }
+
+        @Override
+        public SubMenu addSubMenu(int groupId, int itemId, int order, CharSequence title) {
+            return null;
+        }
+
+        @Override
+        public SubMenu addSubMenu(int groupId, int itemId, int order, int titleRes) {
+            return null;
+        }
+
+        @Override
+        public int addIntentOptions(int groupId, int itemId, int order, ComponentName caller, Intent[] specifics, Intent intent, int flags, MenuItem[] outSpecificItems) {
+            return 0;
+        }
+
+        @Override
+        public void removeItem(int id) {
+        }
+
+        @Override
+        public void removeGroup(int groupId) {
+        }
+
+        @Override
+        public void clear() {
+        }
+
+        @Override
+        public void setGroupCheckable(int group, boolean checkable, boolean exclusive) {
+        }
+
+        @Override
+        public void setGroupVisible(int group, boolean visible) {
+        }
+
+        @Override
+        public void setGroupEnabled(int group, boolean enabled) {
+        }
+
+        @Override
+        public boolean hasVisibleItems() {
+            return false;
+        }
+
+        @Override
+        public MenuItem findItem(int id) {
+            return null;
+        }
+
+        @Override
+        public int size() {
+            return 0;
+        }
+
+        @Override
+        public MenuItem getItem(int index) {
+            return null;
+        }
+
+        @Override
+        public void close() {
+        }
+
+        @Override
+        public boolean performShortcut(int keyCode, KeyEvent event, int flags) {
+            return false;
+        }
+
+        @Override
+        public boolean isShortcutKey(int keyCode, KeyEvent event) {
+            return false;
+        }
+
+        @Override
+        public boolean performIdentifierAction(int id, int flags) {
+            return false;
+        }
+
+        @Override
+        public void setQwertyMode(boolean isQwerty) {
+        }
+    }
+}

app/src/main/java/net/gsantner/opoc/android/dummy/TextWatcherDummy.java

@@ -0,0 +1,58 @@
+/*
+ * Maintained 2017-2023 by Gregor Santner <gsantner AT mailbox DOT org>
+ * License: Creative Commons Zero (CC0 1.0) / Public Domain
+ *  http://creativecommons.org/publicdomain/zero/1.0/
+ *
+ * You can do whatever you want with this. If we meet some day, and you think it is worth it,
+ * you can buy me a drink in return. Provided as is without any kind of warranty. Do not blame
+ * or ask for support if something goes wrong.  - Gregor Santner
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ */
+package net.gsantner.opoc.android.dummy;
+
+import android.text.Editable;
+import android.text.TextWatcher;
+
+import net.gsantner.opoc.util.Callback;
+
+@SuppressWarnings({"unused", "SpellCheckingInspection"})
+public class TextWatcherDummy implements TextWatcher {
+    @Override
+    public void beforeTextChanged(final CharSequence s, final int start, final int count, final int after) {
+    }
+
+    @Override
+    public void onTextChanged(final CharSequence s, final int start, final int before, final int count) {
+    }
+
+    @Override
+    public void afterTextChanged(final Editable s) {
+    }
+
+    public static TextWatcher before(final Callback.a4<CharSequence, Integer, Integer, Integer> impl) {
+        return new TextWatcherDummy() {
+            public void beforeTextChanged(CharSequence s, int start, int count, int after) {
+                impl.callback(s, start, count, after);
+            }
+        };
+    }
+
+    public static TextWatcher on(final Callback.a4<CharSequence, Integer, Integer, Integer> impl) {
+        return new TextWatcherDummy() {
+            public void onTextChanged(final CharSequence s, final int start, final int before, final int count) {
+                impl.callback(s, start, before, count);
+            }
+        };
+    }
+
+    public static TextWatcher after(final Callback.a1<Editable> impl) {
+        return new TextWatcherDummy() {
+            public void afterTextChanged(final Editable s) {
+                impl.callback(s);
+            }
+        };
+    }
+}

app/src/main/java/net/gsantner/opoc/format/markdown/SimpleMarkdownParser.java

@@ -1,9 +1,8 @@
 /*#######################################################
  *
- *   Maintained by Gregor Santner, 2018-
+ *   Maintained 2018-2023 by Gregor Santner <gsantner AT mailbox DOT org>
- *   https://gsantner.net/
  *
- *   License: Apache 2.0 / Commercial
+ *   License: Apache 2.0
  *  https://github.com/gsantner/opoc/#licensing
  *  https://www.apache.org/licenses/LICENSE-2.0
  *

app/src/main/java/net/gsantner/opoc/preference/PropertyBackend.java

@@ -1,9 +1,8 @@
 /*#######################################################
  *
- *   Maintained by Gregor Santner, 2018-
+ *   Maintained 2018-2023 by Gregor Santner <gsantner AT mailbox DOT org>
- *   https://gsantner.net/
  *
- *   License: Apache 2.0 / Commercial
+ *   License: Apache 2.0
  *  https://github.com/gsantner/opoc/#licensing
  *  https://www.apache.org/licenses/LICENSE-2.0
  *

app/src/main/java/net/gsantner/opoc/preference/SharedPreferencesPropertyBackend.java

@@ -1,9 +1,8 @@
 /*#######################################################
  *
- *   Maintained by Gregor Santner, 2016-
+ *   Maintained 2016-2023 by Gregor Santner <gsantner AT mailbox DOT org>
- *   https://gsantner.net/
  *
- *   License: Apache 2.0 / Commercial
+ *   License: Apache 2.0
  *  https://github.com/gsantner/opoc/#licensing
  *  https://www.apache.org/licenses/LICENSE-2.0
  *
@@ -42,6 +41,7 @@ import android.support.annotation.StringRes;
 import android.support.v4.content.ContextCompat;
 import android.text.TextUtils;
 
+import java.io.File;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Calendar;
@@ -201,11 +201,15 @@ public class SharedPreferencesPropertyBackend implements PropertyBackend<String,
     }
 
     public String getString(String key, String defaultValue, final SharedPreferences... pref) {
+        try {
             return gp(pref).getString(key, defaultValue);
+        } catch (ClassCastException e) {
+            return defaultValue;
+        }
     }
 
     public String getString(@StringRes int keyResourceId, String defaultValue, @StringRes int keyResourceIdDefaultValue, final SharedPreferences... pref) {
-        return gp(pref).getString(rstr(keyResourceId), rstr(keyResourceIdDefaultValue));
+        return getString(rstr(keyResourceId), rstr(keyResourceIdDefaultValue), pref);
     }
 
     private void setStringListOne(String key, List<String> values, final SharedPreferences pref) {
@@ -219,9 +223,7 @@ public class SharedPreferencesPropertyBackend implements PropertyBackend<String,
 
     private ArrayList<String> getStringListOne(String key, final SharedPreferences pref) {
         ArrayList<String> ret = new ArrayList<>();
-        String value = pref
+        String value = getString(key, ARRAY_SEPARATOR).replace(ARRAY_SEPARATOR_SUBSTITUTE, ARRAY_SEPARATOR);
-                .getString(key, ARRAY_SEPARATOR)
-                .replace(ARRAY_SEPARATOR_SUBSTITUTE, ARRAY_SEPARATOR);
         if (value.equals(ARRAY_SEPARATOR) || TextUtils.isEmpty(value)) {
             return ret;
         }
@@ -277,11 +279,15 @@ public class SharedPreferencesPropertyBackend implements PropertyBackend<String,
     }
 
     public int getInt(@StringRes int keyResourceId, int defaultValue, final SharedPreferences... pref) {
-        return gp(pref).getInt(rstr(keyResourceId), defaultValue);
+        return getInt(rstr(keyResourceId), defaultValue, pref);
     }
 
     public int getInt(String key, int defaultValue, final SharedPreferences... pref) {
+        try {
             return gp(pref).getInt(key, defaultValue);
+        } catch (ClassCastException e) {
+            return defaultValue;
+        }
     }
 
     public int getIntOfStringPref(@StringRes int keyResId, int defaultValue, final SharedPreferences... pref) {
@@ -304,7 +310,7 @@ public class SharedPreferencesPropertyBackend implements PropertyBackend<String,
 
     private ArrayList<Integer> getIntListOne(String key, final SharedPreferences pref) {
         ArrayList<Integer> ret = new ArrayList<>();
-        String value = pref.getString(key, ARRAY_SEPARATOR);
+        String value = getString(key, ARRAY_SEPARATOR);
         if (value.equals(ARRAY_SEPARATOR)) {
             return ret;
         }
@@ -361,11 +367,15 @@ public class SharedPreferencesPropertyBackend implements PropertyBackend<String,
     }
 
     public long getLong(@StringRes int keyResourceId, long defaultValue, final SharedPreferences... pref) {
-        return gp(pref).getLong(rstr(keyResourceId), defaultValue);
+        return getLong(rstr(keyResourceId), defaultValue, pref);
     }
 
     public long getLong(String key, long defaultValue, final SharedPreferences... pref) {
+        try {
             return gp(pref).getLong(key, defaultValue);
+        } catch (ClassCastException e) {
+            return defaultValue;
+        }
     }
 
     //
@@ -380,11 +390,15 @@ public class SharedPreferencesPropertyBackend implements PropertyBackend<String,
     }
 
     public float getFloat(@StringRes int keyResourceId, float defaultValue, final SharedPreferences... pref) {
-        return gp(pref).getFloat(rstr(keyResourceId), defaultValue);
+        return getFloat(rstr(keyResourceId), defaultValue);
     }
 
     public float getFloat(String key, float defaultValue, final SharedPreferences... pref) {
+        try {
             return gp(pref).getFloat(key, defaultValue);
+        } catch (ClassCastException e) {
+            return defaultValue;
+        }
     }
 
     //
@@ -418,22 +432,26 @@ public class SharedPreferencesPropertyBackend implements PropertyBackend<String,
     }
 
     public boolean getBool(@StringRes int keyResourceId, boolean defaultValue, final SharedPreferences... pref) {
-        return gp(pref).getBoolean(rstr(keyResourceId), defaultValue);
+        return getBool(rstr(keyResourceId), defaultValue);
     }
 
     public boolean getBool(String key, boolean defaultValue, final SharedPreferences... pref) {
+        try {
             return gp(pref).getBoolean(key, defaultValue);
+        } catch (ClassCastException e) {
+            return defaultValue;
+        }
     }
 
     //
     // Getter & Setter for Color
     //
     public int getColor(String key, @ColorRes int defaultColor, final SharedPreferences... pref) {
-        return gp(pref).getInt(key, rcolor(defaultColor));
+        return getInt(key, rcolor(defaultColor));
     }
 
     public int getColor(@StringRes int keyResourceId, @ColorRes int defaultColor, final SharedPreferences... pref) {
-        return gp(pref).getInt(rstr(keyResourceId), rcolor(defaultColor));
+        return getColor(rstr(keyResourceId), defaultColor);
     }
 
     //
@@ -588,4 +606,12 @@ public class SharedPreferencesPropertyBackend implements PropertyBackend<String,
     public static synchronized void appendDebugLog(String text) {
         _debugLog += "[" + new Date().toString() + "] " + text + "\n";
     }
+
+    public static boolean ne(final String str) {
+        return str != null && !str.trim().isEmpty();
+    }
+
+    public static boolean fexists(final String fp) {
+        return ne(fp) && (new File(fp)).exists();
+    }
 }

app/src/main/java/net/gsantner/opoc/preference/nonsupport/LanguagePreference.java

@@ -1,7 +1,6 @@
 /*#######################################################
  *
- *   Maintained by Gregor Santner, 2017-
+ *   Maintained 2017-2023 by Gregor Santner <gsantner AT mailbox DOT org>
- *   https://gsantner.net/
  *
  *   License: Apache 2.0
  *  https://github.com/gsantner/opoc/#licensing

app/src/main/java/net/gsantner/opoc/ui/SearchOrCustomTextDialog.java

@@ -1,7 +1,6 @@
 /*#######################################################
  *
- *   Maintained by Gregor Santner, 2017-
+ *   Maintained 2017-2023 by Gregor Santner <gsantner AT mailbox DOT org>
- *   https://gsantner.net/
  *
  *   License: Apache 2.0
  *  https://github.com/gsantner/opoc/#licensing
@@ -10,27 +9,27 @@
 #########################################################*/
 package net.gsantner.opoc.ui;
 
+import android.annotation.SuppressLint;
 import android.app.Activity;
+import android.app.Dialog;
 import android.content.Context;
 import android.content.res.ColorStateList;
 import android.graphics.Color;
 import android.graphics.Typeface;
-import android.os.AsyncTask;
 import android.os.Build;
 import android.support.annotation.ColorInt;
+import android.support.annotation.DrawableRes;
 import android.support.annotation.LayoutRes;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.annotation.StringRes;
-import android.support.design.widget.Snackbar;
 import android.support.v7.app.AlertDialog;
 import android.support.v7.widget.AppCompatEditText;
-import android.text.Editable;
+import android.support.v7.widget.TooltipCompat;
+import android.text.InputType;
 import android.text.Spannable;
 import android.text.SpannableString;
 import android.text.TextUtils;
-import android.text.TextWatcher;
-import android.util.Pair;
 import android.view.Gravity;
 import android.view.KeyEvent;
 import android.view.LayoutInflater;
@@ -39,34 +38,43 @@ import android.view.ViewGroup;
 import android.view.Window;
 import android.view.WindowManager;
 import android.widget.ArrayAdapter;
+import android.widget.Button;
+import android.widget.Checkable;
 import android.widget.Filter;
+import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.ListView;
 import android.widget.TextView;
 
-import net.gsantner.opoc.util.ActivityUtils;
+import net.gsantner.opoc.android.dummy.TextWatcherDummy;
 import net.gsantner.opoc.util.Callback;
 import net.gsantner.opoc.util.ContextUtils;
 
-import org.apache.commons.io.FileUtils;
-import org.apache.commons.io.filefilter.IOFileFilter;
-
-import java.io.File;
-import java.lang.ref.WeakReference;
 import java.util.ArrayList;
-import java.util.Iterator;
+import java.util.Collections;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Locale;
+import java.util.Set;
 import java.util.regex.Pattern;
 
-@SuppressWarnings("WeakerAccess")
+@SuppressLint("SetTextI18n")
 public class SearchOrCustomTextDialog {
 
     public static class DialogOptions {
-        public Callback.a1<String> callback;
+
-        public Callback.a2<String, Integer> withPositionCallback;
+        // Callback for search text or text of single item
-        public List<? extends CharSequence> data;
+        @Nullable
-        public List<? extends CharSequence> highlightData;
+        public Callback.a1<String> callback = null;
+
+        // Callback for indices of selected items.
+        // List will contain single item if isMultiSelectEnabled == false;
+        @Nullable
+        public Callback.a1<List<Integer>> positionCallback = null;
+
+        public boolean isMultiSelectEnabled = false;
+        public List<? extends CharSequence> data = null;
+        public List<? extends CharSequence> highlightData = null;
         public List<Integer> iconsForData;
         public String messageText = "";
         public String defaultText = "";
@@ -75,10 +83,11 @@ public class SearchOrCustomTextDialog {
         public int dialogWidthDp = WindowManager.LayoutParams.MATCH_PARENT;
         public int dialogHeightDp = WindowManager.LayoutParams.WRAP_CONTENT;
         public int gravity = Gravity.NO_GRAVITY;
-        public int searchInputType = 0;
+        public int searchInputType = InputType.TYPE_TEXT_FLAG_NO_SUGGESTIONS;
         public boolean searchIsRegex = false;
-        public Callback.a1<Spannable> highlighter;
+        public Callback.a1<Spannable> highlighter = null;
         public String extraFilter = null;
+        public List<Integer> preSelected = null;
 
         public Callback.a0 neutralButtonCallback = null;
 
@@ -96,59 +105,75 @@ public class SearchOrCustomTextDialog {
         public int titleText = 0;
         @StringRes
         public int searchHintText = android.R.string.search_go;
+        @DrawableRes
+        public int clearInputIcon = android.R.drawable.ic_input_delete;
     }
 
-    private static class WithPositionAdapter extends ArrayAdapter<Pair<String, Integer>> {
+    private static class Adapter extends ArrayAdapter<Integer> {
+        @LayoutRes
+        private final int _layout;
+        private final int _layoutHeight;
+        private final LayoutInflater _inflater;
+        private final DialogOptions _dopt;
+        private final List<Integer> _filteredItems;
+        private final Set<Integer> _selectedItems;
+        private final Pattern _extraPattern;
 
-        final LayoutInflater mInflater;
+        public static Adapter create(final Context context, final DialogOptions dopt) {
-        final @LayoutRes
+            return new Adapter(context, dopt, dopt.isMultiSelectEnabled ? android.R.layout.simple_list_item_multiple_choice : android.R.layout.simple_list_item_1, new ArrayList<>());
-        int mLayout;
+        }
-        final DialogOptions dopt;
-        final List<Pair<String, Integer>> filteredItems;
-        final Pattern extraPattern;
 
-        WithPositionAdapter(Context context, @LayoutRes int layout, List<Pair<String, Integer>> filteredItems, DialogOptions dopt) {
+        private Adapter(final Context context, final DialogOptions dopt, final int layout, final List<Integer> filteredItems) {
             super(context, layout, filteredItems);
-            mInflater = LayoutInflater.from(context);
+            _layout = layout;
-            mLayout = layout;
+            _filteredItems = filteredItems;
-            this.dopt = dopt;
+            _inflater = LayoutInflater.from(context);
-            this.filteredItems = filteredItems;
+            _dopt = dopt;
-            extraPattern = dopt.extraFilter == null ? null : Pattern.compile(dopt.extraFilter);
+            _extraPattern = (_dopt.extraFilter == null ? null : Pattern.compile(_dopt.extraFilter));
+            _selectedItems = new HashSet<>(_dopt.preSelected != null ? _dopt.preSelected : Collections.emptyList());
+            ContextUtils cu = new ContextUtils(context);
+            _layoutHeight = (int) cu.convertDpToPx(36);
+            cu.freeContextRef();
         }
 
         @NonNull
         @Override
         public View getView(int pos, @Nullable View convertView, @NonNull ViewGroup parent) {
-            final Pair<String, Integer> item = getItem(pos);
+            final int index = getItem(pos);
-            final String text = item.first;
-            final int posInOriginalList = item.second;
 
             final TextView textView;
             if (convertView == null) {
-                textView = (TextView) mInflater.inflate(mLayout, parent, false);
+                textView = (TextView) _inflater.inflate(_layout, parent, false);
+                textView.setLayoutParams(new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.WRAP_CONTENT));
+                textView.setMinHeight(_layoutHeight);
             } else {
                 textView = (TextView) convertView;
             }
 
-            if (posInOriginalList >= 0 && dopt.iconsForData != null && posInOriginalList < dopt.iconsForData.size() && dopt.iconsForData.get(posInOriginalList) != 0) {
+            if (textView instanceof Checkable) {
-                textView.setCompoundDrawablesWithIntrinsicBounds(dopt.iconsForData.get(posInOriginalList), 0, 0, 0);
+                ((Checkable) textView).setChecked(_selectedItems.contains(index));
+            }
+
+            if (index >= 0 && _dopt.iconsForData != null && index < _dopt.iconsForData.size() && _dopt.iconsForData.get(index) != 0) {
+                textView.setCompoundDrawablesWithIntrinsicBounds(_dopt.iconsForData.get(index), 0, 0, 0);
                 textView.setCompoundDrawablePadding(32);
                 if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-                    textView.setCompoundDrawableTintList(ColorStateList.valueOf(dopt.isDarkDialog ? Color.WHITE : Color.BLACK));
+                    textView.setCompoundDrawableTintList(ColorStateList.valueOf(_dopt.isDarkDialog ? Color.WHITE : Color.BLACK));
                 }
             } else {
                 textView.setCompoundDrawablesWithIntrinsicBounds(0, 0, 0, 0);
             }
 
-            if (dopt.highlightData != null) {
+            final CharSequence text = _dopt.data.get(index).toString();
-                final boolean hl = dopt.highlightData.contains(text);
+            if (_dopt.highlightData != null) {
-                textView.setTextColor(hl ? dopt.highlightColor : dopt.textColor);
+                final boolean hl = _dopt.highlightData.contains(text);
+                textView.setTextColor(hl ? _dopt.highlightColor : _dopt.textColor);
                 textView.setTypeface(null, hl ? Typeface.BOLD : Typeface.NORMAL);
             }
 
-            if (dopt.highlighter != null) {
+            if (_dopt.highlighter != null) {
                 Spannable s = new SpannableString(text);
-                dopt.highlighter.callback(s);
+                _dopt.highlighter.callback(s);
                 textView.setText(s);
             } else {
                 textView.setText(text);
@@ -157,31 +182,33 @@ public class SearchOrCustomTextDialog {
             return textView;
         }
 
+        @NonNull
         @Override
         public Filter getFilter() {
             return new Filter() {
                 @SuppressWarnings("unchecked")
                 @Override
                 protected void publishResults(final CharSequence constraint, final FilterResults results) {
-                    filteredItems.clear();
+                    _filteredItems.clear();
-                    filteredItems.addAll((List<Pair<String, Integer>>) results.values);
+                    _filteredItems.addAll((List<Integer>) results.values);
                     notifyDataSetChanged();
                 }
 
                 @Override
                 protected FilterResults performFiltering(final CharSequence constraint) {
-                    final ArrayList<Pair<CharSequence, Integer>> resList = new ArrayList<>();
+                    final List<Integer> resList = new ArrayList<>();
 
-                    if (dopt.data != null) {
+                    if (_dopt.data != null) {
                         final String fil = constraint.toString();
                         final boolean emptySearch = fil.isEmpty();
-                        for (int i = 0; i < dopt.data.size(); i++) {
+                        for (int i = 0; i < _dopt.data.size(); i++) {
-                            final CharSequence str = dopt.data.get(i);
+                            final String str = _dopt.data.get(i).toString();
-                            final boolean matchExtra = (extraPattern == null) || extraPattern.matcher(str).find();
+                            final boolean matchExtra = (_extraPattern == null) || _extraPattern.matcher(str).find();
-                            final boolean matchNormal = str.toString().toLowerCase(Locale.getDefault()).contains(fil.toLowerCase(Locale.getDefault()));
+                            final Locale locale = Locale.getDefault();
-                            final boolean matchRegex = dopt.searchIsRegex && (str.toString().matches(fil));
+                            final boolean matchNormal = str.toLowerCase(locale).contains(fil.toLowerCase(locale));
+                            final boolean matchRegex = _dopt.searchIsRegex && (str.matches(fil));
                             if (matchExtra && (matchNormal || matchRegex || emptySearch)) {
-                                resList.add(new Pair<>(str, i));
+                                resList.add(i);
                             }
                         }
                     }
@@ -196,12 +223,11 @@ public class SearchOrCustomTextDialog {
     }
 
     public static void showMultiChoiceDialogWithSearchFilterUI(final Activity activity, final DialogOptions dopt) {
-        final List<Pair<String, Integer>> filteredItems = new ArrayList<>();
         final AlertDialog.Builder dialogBuilder = new AlertDialog.Builder(activity, dopt.isDarkDialog
                 ? android.support.v7.appcompat.R.style.Theme_AppCompat_Dialog
                 : android.support.v7.appcompat.R.style.Theme_AppCompat_Light_Dialog
         );
-        final WithPositionAdapter listAdapter = new WithPositionAdapter(activity, android.R.layout.simple_list_item_1, filteredItems, dopt);
+        final Adapter listAdapter = Adapter.create(activity, dopt);
 
         final AppCompatEditText searchEditText = new AppCompatEditText(activity);
         searchEditText.setText(dopt.defaultText);
@@ -211,21 +237,30 @@ public class SearchOrCustomTextDialog {
         searchEditText.setHintTextColor((dopt.textColor & 0x00FFFFFF) | 0x99000000);
         searchEditText.setHint(dopt.searchHintText);
         searchEditText.setInputType(dopt.searchInputType == 0 ? searchEditText.getInputType() : dopt.searchInputType);
+        searchEditText.addTextChangedListener(TextWatcherDummy.after((cbEditable) -> listAdapter.getFilter().filter(cbEditable)));
 
-        searchEditText.addTextChangedListener(new TextWatcher() {
+        final ContextUtils cu = new ContextUtils(activity);
-            @Override
+        final int margin = (int) cu.convertDpToPx(8);
-            public void afterTextChanged(final Editable arg0) {
+        cu.freeContextRef();
-                listAdapter.getFilter().filter(searchEditText.getText());
-            }
 
-            @Override
+        final LinearLayout searchLayout = new LinearLayout(activity);
-            public void onTextChanged(final CharSequence arg0, final int arg1, final int arg2, final int arg3) {
+        searchLayout.setOrientation(LinearLayout.HORIZONTAL);
-            }
 
-            @Override
+        LinearLayout.LayoutParams lp;
-            public void beforeTextChanged(final CharSequence arg0, final int arg1, final int arg2, final int arg3) {
+        lp = new LinearLayout.LayoutParams(LinearLayout.LayoutParams.WRAP_CONTENT, LinearLayout.LayoutParams.MATCH_PARENT, 1);
-            }
+        lp.gravity = Gravity.START | Gravity.BOTTOM;
-        });
+        searchLayout.addView(searchEditText, lp);
+
+        // 'Button to clear the search box'
+        final ImageView clearButton = new ImageView(activity);
+        clearButton.setImageResource(dopt.clearInputIcon);
+        TooltipCompat.setTooltipText(clearButton, activity.getString(android.R.string.cancel));
+        clearButton.setColorFilter(dopt.isDarkDialog ? Color.WHITE : Color.parseColor("#ff505050"));
+        lp = new LinearLayout.LayoutParams(LinearLayout.LayoutParams.WRAP_CONTENT, LinearLayout.LayoutParams.MATCH_PARENT, 0);
+        lp.gravity = Gravity.END | Gravity.CENTER_VERTICAL;
+        lp.setMargins(margin, 0, (int) (margin * 1.5), 0);
+        searchLayout.addView(clearButton, lp);
+        clearButton.setOnClickListener((v) -> searchEditText.setText(""));
 
         final ListView listView = new ListView(activity);
         final LinearLayout linearLayout = new LinearLayout(activity);
@@ -234,10 +269,9 @@ public class SearchOrCustomTextDialog {
         linearLayout.setOrientation(LinearLayout.VERTICAL);
 
         if (dopt.isSearchEnabled) {
-            LinearLayout.LayoutParams lp = new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.WRAP_CONTENT);
+            lp = new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.WRAP_CONTENT);
-            int px = (int) (new ContextUtils(listView.getContext()).convertDpToPx(8));
+            lp.setMargins(margin, margin / 2, margin, margin / 2);
-            lp.setMargins(px, px / 2, px, px / 2);
+            linearLayout.addView(searchLayout, lp);
-            linearLayout.addView(searchEditText, lp);
         }
 
         final LinearLayout.LayoutParams layoutParams = new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT, 0);
@@ -251,36 +285,32 @@ public class SearchOrCustomTextDialog {
                 .setOnCancelListener(null)
                 .setNegativeButton(dopt.cancelButtonText, (dialogInterface, i) -> dialogInterface.dismiss());
 
+        if (dopt.titleText != 0) {
+            dialogBuilder.setTitle(dopt.titleText);
+        }
+
+        // Ok button action
+        if ((dopt.isSearchEnabled && dopt.callback != null) || (dopt.isMultiSelectEnabled)) {
+            dialogBuilder.setPositiveButton(dopt.okButtonText, (dialogInterface, i) -> {
+                final String searchText = dopt.isSearchEnabled ? searchEditText.getText().toString() : null;
+                if (dopt.positionCallback != null && !listAdapter._selectedItems.isEmpty()) {
+                    final List<Integer> sel = new ArrayList<>(listAdapter._selectedItems);
+                    Collections.sort(sel);
+                    dopt.positionCallback.callback(sel);
+                } else if (dopt.callback != null && !TextUtils.isEmpty(searchText)) {
+                    dopt.callback.callback(searchText);
+                }
+            });
+        }
+
+        // Setup neutralbutton
         if (dopt.neutralButtonCallback != null && dopt.neutralButtonText != 0) {
             dialogBuilder.setNeutralButton(dopt.neutralButtonText, (dialogInterface, i) -> {
                 dopt.neutralButtonCallback.callback();
             });
         }
 
-        if (dopt.titleText != 0) {
-            dialogBuilder.setTitle(dopt.titleText);
-        }
-
-        if (dopt.isSearchEnabled) {
-            dialogBuilder.setPositiveButton(dopt.okButtonText, (dialogInterface, i) -> {
-                dialogInterface.dismiss();
-                if (dopt.callback != null && !TextUtils.isEmpty(searchEditText.getText().toString())) {
-                    dopt.callback.callback(searchEditText.getText().toString());
-                }
-            });
-        }
-
         final AlertDialog dialog = dialogBuilder.create();
-        listView.setOnItemClickListener((parent, view, position, id) -> {
-            dialog.dismiss();
-            if (dopt.callback != null) {
-                dopt.callback.callback(filteredItems.get(position).first);
-            }
-            if (dopt.withPositionCallback != null) {
-                final Pair<String, Integer> item = filteredItems.get(position);
-                dopt.withPositionCallback.callback(item.first, item.second);
-            }
-        });
 
         searchEditText.setOnKeyListener((keyView, keyCode, keyEvent) -> {
             if ((keyEvent.getAction() == KeyEvent.ACTION_DOWN) && (keyCode == KeyEvent.KEYCODE_ENTER)) {
@@ -316,117 +346,49 @@ public class SearchOrCustomTextDialog {
         if (dopt.defaultText != null) {
             listAdapter.getFilter().filter(searchEditText.getText());
         }
+
+        // Helper function to trigger callback with single item
+        final Callback.b1<Integer> directActivate = (position) -> {
+            final int index = listAdapter._filteredItems.get(position);
+            dialog.dismiss();
+            if (dopt.callback != null) {
+                dopt.callback.callback(dopt.data.get(index).toString());
             }
-
+            if (dopt.positionCallback != null) {
-
+                dopt.positionCallback.callback(Collections.singletonList(index));
-    public static SearchFilesTask recursiveFileSearch(Activity activity, File searchDir, String query, Callback.a1<List<String>> callback) {
-        query = query.replaceAll("(?<![.])[*]", ".*");
-        SearchFilesTask task = new SearchFilesTask(activity, searchDir, query, callback, query.startsWith("^") || query.contains("*"));
-        task.execute();
-        return task;
             }
-
-    public static class SearchFilesTask extends AsyncTask<Void, File, List<String>> implements IOFileFilter {
-        private final Callback.a1<List<String>> _callback;
-        private final File _searchDir;
-        private final String _query;
-        private final boolean _isRegex;
-        private final WeakReference<Activity> _activityRef;
-
-        private final Pattern _regex;
-        private Snackbar _snackBar;
-
-        public SearchFilesTask(Activity activity, File searchDir, String query, Callback.a1<List<String>> callback, boolean isRegex) {
-            _searchDir = searchDir;
-            _query = isRegex ? query : query.toLowerCase();
-            _callback = callback;
-            _isRegex = isRegex;
-            _regex = isRegex ? Pattern.compile(_query) : null;
-            _activityRef = new WeakReference<>(activity);
-        }
-
-        // Called for both, file and folder filter
-        @Override
-        public boolean accept(File file) {
-            return isMatching(file, true);
-        }
-
-        // Not called
-        @Override
-        public boolean accept(File dir, String name) {
-            return isMatching(new File(dir, name), true);
-        }
-
-        // In iterateFilesAndDirs, subdirs are only scanned when returning true on it
-        // But those dirs will also occur in iterator
-        // Hence call this aagain with alwaysMatchDir=false
-        public boolean isMatching(File file, boolean alwaysMatchDir) {
-            if (file.isDirectory()) {
-                // Do never scan .git directories, lots of files, lots of time
-                if (file.getName().equals(".git")) {
-                    return false;
-                }
-                if (alwaysMatchDir) {
             return true;
-                }
+        };
-            }
-            String name = file.getName();
-            file = file.getParentFile();
-            return _isRegex ? _regex.matcher(name).matches() : name.toLowerCase().contains(_query);
-        }
 
-        @Override
+        // Helper function to append selection count to OK button
-        protected void onPreExecute() {
+        final Button okButton = dialog.getButton(Dialog.BUTTON_POSITIVE);
-            super.onPreExecute();
+        final String okText = activity.getString(dopt.okButtonText) + (dopt.isMultiSelectEnabled ? " (%d)" : "");
-            if (_activityRef.get() != null) {
+        final Callback.a0 setOkButtonState = () -> {
-                _snackBar = Snackbar.make(_activityRef.get().findViewById(android.R.id.content), _query + "...", Snackbar.LENGTH_INDEFINITE);
+            okButton.setText(okText.replace("%d", Integer.toString(listAdapter._selectedItems.size())));
-                _snackBar.setAction(android.R.string.cancel, (v) -> {
+        };
-                    _snackBar.dismiss();
-                    cancel(true);
-                }).show();
-            }
-        }
 
-        @Override
+        // Set ok button text initially
-        protected List<String> doInBackground(Void... voidp) {
+        setOkButtonState.callback();
-            List<String> ret = new ArrayList<>();
 
-            boolean first = true;
+        // Item click action
-            Iterator<File> iter = null;
+        listView.setOnItemClickListener((parent, textView, pos, id) -> {
-            try {
+            if (dopt.isMultiSelectEnabled) {
-                iter = FileUtils.iterateFilesAndDirs(_searchDir, this, this);
+                final int index = listAdapter._filteredItems.get(pos);
-            } catch (Exception ex) {
+                if (listAdapter._selectedItems.contains(index)) {
-                // Iterator may throw an error at creation
+                    listAdapter._selectedItems.remove(index);
-                return ret;
+                } else {
+                    listAdapter._selectedItems.add(index);
                 }
-            while (iter.hasNext() && !isCancelled()) {
+                if (textView instanceof Checkable) {
-                File f = iter.next();
+                    ((Checkable) textView).setChecked(listAdapter._selectedItems.contains(index));
-                if (first) {
-                    first = false;
-                    if (f.equals(_searchDir)) {
-                        continue;
                 }
+                setOkButtonState.callback();
+            } else {
+                directActivate.callback(pos);
             }
-                if (f.isFile() || (f.isDirectory() && isMatching(f, false))) {
+        });
-                    ret.add(f.getAbsolutePath().replace(_searchDir.getAbsolutePath() + "/", ""));
-                }
-            }
-            return ret;
-        }
 
-        @Override
+        // long click always activates
-        protected void onPostExecute(List<String> ret) {
+        listView.setOnItemLongClickListener((parent, view, pos, id) -> directActivate.callback(pos));
-            super.onPostExecute(ret);
-            if (_snackBar != null) {
-                _snackBar.dismiss();
-            }
-            if (_callback != null) {
-                try {
-                    _callback.callback(ret);
-                } catch (Exception ignored) {
-                }
-            }
-            new ActivityUtils(_activityRef.get()).hideSoftKeyboard().freeContextRef();
-        }
     }
 }

app/src/main/java/net/gsantner/opoc/util/ActivityUtils.java

@@ -1,9 +1,8 @@
 /*#######################################################
  *
- *   Maintained by Gregor Santner, 2016-
+ *   Maintained 2016-2023 by Gregor Santner <gsantner AT mailbox DOT org>
- *   https://gsantner.net/
  *
- *   License of this file: Apache 2.0 (Commercial upon request)
+ *   License of this file: Apache 2.0
  *     https://www.apache.org/licenses/LICENSE-2.0
  *     https://github.com/gsantner/opoc/#licensing
  *
@@ -11,6 +10,7 @@
 package net.gsantner.opoc.util;
 
 import android.app.Activity;
+import android.app.ActivityManager;
 import android.content.ActivityNotFoundException;
 import android.content.ComponentName;
 import android.content.Context;
@@ -38,8 +38,10 @@ import android.view.inputmethod.InputMethodManager;
 import android.webkit.WebView;
 import android.widget.ScrollView;
 
+import java.util.List;
 
-@SuppressWarnings({"WeakerAccess", "unused", "SameParameterValue", "SpellCheckingInspection"})
+
+@SuppressWarnings({"WeakerAccess", "unused", "SameParameterValue", "SpellCheckingInspection", "rawtypes", "UnusedReturnValue"})
 public class ActivityUtils extends net.gsantner.opoc.util.ContextUtils {
     //########################
     //## Members, Constructors
@@ -239,13 +241,22 @@ public class ActivityUtils extends net.gsantner.opoc.util.ContextUtils {
     }
 
     public ActivityUtils setLauncherActivityEnabled(Class activityClass, boolean enable) {
-        Context context = _context.getApplicationContext();
+        try {
-        PackageManager pkg = context.getPackageManager();
+            ComponentName component = new ComponentName(_context, activityClass);
-        ComponentName component = new ComponentName(context, activityClass);
+            _context.getPackageManager().setComponentEnabledSetting(component, enable ? PackageManager.COMPONENT_ENABLED_STATE_ENABLED : PackageManager.COMPONENT_ENABLED_STATE_DISABLED, PackageManager.DONT_KILL_APP);
-        pkg.setComponentEnabledSetting(component, enable ? PackageManager.COMPONENT_ENABLED_STATE_ENABLED : PackageManager.COMPONENT_ENABLED_STATE_DISABLED, PackageManager.DONT_KILL_APP);
+        } catch (Exception ignored) {
+        }
         return this;
     }
 
+    public boolean isLauncherEnabled(Class activityClass) {
+        try {
+            ComponentName component = new ComponentName(_context, activityClass);
+            return _context.getPackageManager().getComponentEnabledSetting(component) != PackageManager.COMPONENT_ENABLED_STATE_DISABLED;
+        } catch (Exception ignored) {
+        }
+        return false;
+    }
 
     @ColorInt
     public Integer getCurrentPrimaryColor() {
@@ -316,4 +327,20 @@ public class ActivityUtils extends net.gsantner.opoc.util.ContextUtils {
         } catch (Exception ignored) {
         }
     }
+
+    // Make activity/app not show up in the recents history - call before finish / System.exit
+    public ActivityUtils removeActivityFromHistory() {
+        try {
+            ActivityManager am = (ActivityManager) _activity.getSystemService(Context.ACTIVITY_SERVICE);
+            if (am != null && android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.LOLLIPOP) {
+                List<ActivityManager.AppTask> tasks = am.getAppTasks();
+                if (tasks != null && !tasks.isEmpty()) {
+                    tasks.get(0).setExcludeFromRecents(true);
+                }
+            }
+
+        } catch (Exception ignored) {
+        }
+        return this;
+    }
 }

app/src/main/java/net/gsantner/opoc/util/AdBlock.java

@@ -1,7 +1,6 @@
 /*#######################################################
  *
- *   Maintained by Gregor Santner, 2017-
+ *   Maintained 2017-2023 by Gregor Santner <gsantner AT mailbox DOT org>
- *   https://gsantner.net/
  *
  *   License: Apache 2.0
  *  https://github.com/gsantner/opoc/#licensing
@@ -46,8 +45,9 @@ import java.util.Set;
 /**
  * Simple Host-Based AdBlocker
  */
-@SuppressWarnings({"WeakerAccess", "SpellCheckingInspection", "unused"})
+@SuppressWarnings({"WeakerAccess", "SpellCheckingInspection", "unused", "TryFinallyCanBeTryWithResources"})
 public class AdBlock {
+    private static final Object synchronizeObj = new Object();
     private static final AdBlock instance = new AdBlock();
 
     public static AdBlock getInstance() {
@@ -61,7 +61,9 @@ public class AdBlock {
     //########################
     private final Set<String> _adblockHostsFromRaw = new HashSet<>();
     private final Set<String> _adblockHosts = new HashSet<>();
-    private boolean _isLoaded;
+    private final List<Callback.b3<URI, String, String>> _customBlockCallbacks = new ArrayList<>();
+    private boolean _isLoaded = false;
+    private boolean _isAdblockLogging = false;
 
     //########################
     //##
@@ -72,25 +74,47 @@ public class AdBlock {
     }
 
     public boolean isAdHost(String urlS) {
+        boolean block = false;
         if (urlS != null && !urlS.isEmpty() && urlS.startsWith("http")) {
             try {
-                URI url = new URI(urlS);
+                URI url;
+                try {
+                    url = new URI(urlS);
+                } catch (Exception e) {
+                    url = new URI(urlS.replaceFirst("[?].*", ""));
+                }
                 String host = url.getHost().trim();
                 if (host.startsWith("www.") && host.length() >= 4) {
                     host = host.substring(4);
                 }
-                return _adblockHosts.contains(host) || _adblockHosts.contains("www." + host);
+                block = _adblockHosts.contains(host) || _adblockHosts.contains("www." + host);
+                for (Callback.b3<URI, String, String> cb : _customBlockCallbacks) {
+                    if (block) {
+                        break;
+                    }
+                    try {
+                        block = cb.callback(url, urlS, host);
+                    } catch (Exception ignored) {
+                    }
+                }
             } catch (URISyntaxException e) {
                 e.printStackTrace();
             }
 
         }
-        return false;
+
+        if (_isAdblockLogging) {
+            Log.d(getClass().getSimpleName(), "UrlAllowed-" + (block ? "N" : "Y") + "  " + urlS);
+        }
+        return block;
     }
 
     public AdBlock reset() {
+        synchronized (synchronizeObj) {
             _adblockHosts.clear();
             _adblockHosts.addAll(_adblockHostsFromRaw);
+            _customBlockCallbacks.clear();
+        }
         return this;
     }
 
@@ -102,7 +126,7 @@ public class AdBlock {
         return new WebResourceResponse("text/plain", "utf-8", new ByteArrayInputStream("".getBytes()));
     }
 
-    public void addBlockedHosts(String... hosts) {
+    public AdBlock addBlockedHosts(String... hosts) {
         for (String host : hosts) {
             if (host != null) {
                 host = host.trim();
@@ -110,24 +134,30 @@ public class AdBlock {
                     host = host.substring(4);
                 }
                 if (!host.startsWith("#") && !host.startsWith("\"")) {
+                    synchronized (synchronizeObj) {
                         _adblockHosts.add(host);
                     }
                 }
             }
-
+        }
+        return this;
     }
 
-    public void loadHostsFromRawAssetsAsync(final Context context) {
+    public void loadHostsFromRawAssetsAsync(final Context context, final boolean... debugIgnoreAssets) {
-        new Thread(new Runnable() {
+        if (debugIgnoreAssets != null && debugIgnoreAssets.length > 0 && debugIgnoreAssets[0]) {
-            @Override
+            _isLoaded = true;
-            public void run() {
+            return;
+        }
+
+        new Thread(() -> {
             try {
+                synchronized (synchronizeObj) {
                     loadHostsFromRawAssets(context);
                     _isLoaded = true;
+                }
             } catch (IOException e) {
                 e.printStackTrace();
             }
-            }
         }).start();
     }
 
@@ -172,4 +202,17 @@ public class AdBlock {
         }
         return adblockResIds;
     }
+
+    // URI uri, String url, String host
+    public AdBlock addCustomBlockCallback(Callback.b3<URI, String, String> cb) {
+        synchronized (synchronizeObj) {
+            _customBlockCallbacks.add(cb);
+        }
+        return this;
+    }
+
+    public AdBlock setLogEnabled(boolean isAdblockLogging) {
+        _isAdblockLogging = isAdblockLogging;
+        return this;
+    }
 }

app/src/main/java/net/gsantner/opoc/util/AndroidSupportMeWrapper.java

@@ -1,72 +0,0 @@
-/*#######################################################
- *
- *   Maintained by Gregor Santner, 2018-
- *   https://gsantner.net/
- *
- *   License of this file: Apache 2.0 (Commercial upon request)
- *     https://www.apache.org/licenses/LICENSE-2.0
- *     https://github.com/gsantner/opoc/#licensing
- *
-#########################################################*/
-package net.gsantner.opoc.util;
-
-import android.app.Activity;
-import android.content.Context;
-import android.content.SharedPreferences;
-import android.support.v7.app.AlertDialog;
-
-import com.github.dfa.diaspora_android.R;
-
-import net.gsantner.opoc.preference.SharedPreferencesPropertyBackend;
-
-public class AndroidSupportMeWrapper extends ActivityUtils {
-    private LocalSettingsImpl _localSettingsImpl;
-
-    public AndroidSupportMeWrapper(Activity activity) {
-        super(activity);
-        _localSettingsImpl = new LocalSettingsImpl(_context.getApplicationContext());
-    }
-
-    public void openPayPalDonationPage() {
-        String id = getPackageIdManifest();
-        String url = "https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=TVV24QBGMN23C&source=self.gsantner.net%2F" + id;
-        openWebpageInExternalBrowser(url);
-    }
-
-
-    public void openGeneralDonatePage() {
-        openWebpageInExternalBrowser(_context.getString(R.string.app_donate_url));
-    }
-
-    public void mainOnResume() {
-        if (_localSettingsImpl.all14dRequest()) {
-            AlertDialog.Builder dialog = new AlertDialog.Builder(_context);
-            dialog.setTitle(R.string.donate_)
-                    .setCancelable(false)
-                    .setNegativeButton(R.string.close, (dialogInterface, i) -> dialogInterface.dismiss())
-                    .setPositiveButton("PayPal", (dialogInterface, i) -> {
-                        openPayPalDonationPage();
-                        dialogInterface.dismiss();
-                    })
-                    .setNeutralButton(R.string.donate_, (dialogInterface, i) -> {
-                        openGeneralDonatePage();
-                        dialogInterface.dismiss();
-                    })
-                    .setMessage(R.string.do_you_like_this_project_want_donate_to_keep_alive);
-            dialog.show();
-        }
-    }
-
-    private class LocalSettingsImpl extends SharedPreferencesPropertyBackend {
-        private final SharedPreferences _prefCache;
-
-        public LocalSettingsImpl(Context _context) {
-            super(_context, "AndroidSupportMeWrapper.LocalSettingsImpl");
-            _prefCache = _context.getSharedPreferences("cache", Context.MODE_PRIVATE);
-        }
-
-        public boolean all14dRequest() {
-            return afterDaysTrue("all14dRequest", 31, 3);
-        }
-    }
-}

app/src/main/java/net/gsantner/opoc/util/Callback.java

@@ -1,9 +1,8 @@
 /*#######################################################
  *
- *   Maintained by Gregor Santner, 2018-
+ *   Maintained 2018-2023 by Gregor Santner <gsantner AT mailbox DOT org>
- *   https://gsantner.net/
  *
- *   License of this file: Apache 2.0 (Commercial upon request)
+ *   License of this file: Apache 2.0
  *     https://www.apache.org/licenses/LICENSE-2.0
  *     https://github.com/gsantner/opoc/#licensing
  *

app/src/main/java/net/gsantner/opoc/util/ContextUtils.java

@@ -1,9 +1,8 @@
 /*#######################################################
  *
- *   Maintained by Gregor Santner, 2016-
+ *   Maintained 2016-2023 by Gregor Santner <gsantner AT mailbox DOT org>
- *   https://gsantner.net/
  *
- *   License of this file: Apache 2.0 (Commercial upon request)
+ *   License of this file: Apache 2.0
  *     https://www.apache.org/licenses/LICENSE-2.0
  *     https://github.com/gsantner/opoc/#licensing
  *
@@ -67,7 +66,9 @@ import android.util.Log;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.MotionEvent;
+import android.view.Surface;
 import android.view.View;
+import android.view.WindowManager;
 import android.webkit.MimeTypeMap;
 import android.widget.ImageView;
 import android.widget.TextView;
@@ -76,10 +77,10 @@ import net.gsantner.opoc.format.markdown.SimpleMarkdownParser;
 
 import java.io.BufferedReader;
 import java.io.File;
-import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStreamReader;
+import java.lang.reflect.Field;
 import java.lang.reflect.Method;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
@@ -90,7 +91,7 @@ import static android.content.Context.VIBRATOR_SERVICE;
 import static android.content.Intent.FLAG_ACTIVITY_NEW_TASK;
 import static android.graphics.Bitmap.CompressFormat;
 
-@SuppressWarnings({"WeakerAccess", "unused", "SameParameterValue", "ObsoleteSdkInt", "deprecation", "SpellCheckingInspection", "TryFinallyCanBeTryWithResources", "UnusedAssignment"})
+@SuppressWarnings({"WeakerAccess", "unused", "SameParameterValue", "ObsoleteSdkInt", "deprecation", "SpellCheckingInspection", "TryFinallyCanBeTryWithResources", "UnusedAssignment", "UnusedReturnValue"})
 public class ContextUtils {
     //
     // Members, Constructors
@@ -144,11 +145,11 @@ public class ContextUtils {
     /**
      * Get String by given string ressource identifier (textual)
      */
-    public String rstr(final String strResKey) {
+    public String rstr(final String strResKey, Object... a0getResKeyAsFallback) {
         try {
             return rstr(getResId(ResType.STRING, strResKey));
         } catch (Resources.NotFoundException e) {
-            return null;
+            return a0getResKeyAsFallback != null && a0getResKeyAsFallback.length > 0 ? strResKey : null;
         }
     }
 
@@ -257,7 +258,7 @@ public class ContextUtils {
      * Send a {@link Intent#ACTION_VIEW} Intent with given paramter
      * If the parameter is an string a browser will get triggered
      */
-    public void openWebpageInExternalBrowser(final String url) {
+    public ContextUtils openWebpageInExternalBrowser(final String url) {
         try {
             Uri uri = Uri.parse(url);
             Intent intent = new Intent(Intent.ACTION_VIEW, uri);
@@ -266,6 +267,7 @@ public class ContextUtils {
         } catch (Exception e) {
             e.printStackTrace();
         }
+        return this;
     }
 
     /**
@@ -292,14 +294,27 @@ public class ContextUtils {
      * Falls back to applicationId of the app which may differ from manifest.
      */
     public Object getBuildConfigValue(final String fieldName) {
-        String pkg = getPackageIdManifest() + ".BuildConfig";
+        final String pkg = getPackageIdManifest() + ".BuildConfig";
         try {
             Class<?> c = Class.forName(pkg);
             return c.getField(fieldName).get(null);
         } catch (Exception e) {
             e.printStackTrace();
+        }
         return null;
     }
+
+    public List<String> getBuildConfigFields() {
+        final String pkg = getPackageIdManifest() + ".BuildConfig";
+        final List<String> fields = new ArrayList<>();
+        try {
+            for (Field f : Class.forName(pkg).getFields()) {
+                fields.add(f.getName());
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return fields;
     }
 
     /**
@@ -349,26 +364,6 @@ public class ContextUtils {
         return bcbool("IS_FOSS_BUILD", false);
     }
 
-    /**
-     * Request a bitcoin donation with given details.
-     * All parameters are awaited as string resource ids
-     */
-    public void showDonateBitcoinRequest(@StringRes final int srBitcoinId, @StringRes final int srBitcoinAmount, @StringRes final int srBitcoinMessage, @StringRes final int srAlternativeDonateUrl) {
-        if (!isGooglePlayBuild()) {
-            String btcUri = String.format("bitcoin:%s?amount=%s&label=%s&message=%s",
-                    rstr(srBitcoinId), rstr(srBitcoinAmount),
-                    rstr(srBitcoinMessage), rstr(srBitcoinMessage));
-            Intent intent = new Intent(Intent.ACTION_VIEW);
-            intent.setData(Uri.parse(btcUri));
-            intent.addFlags(FLAG_ACTIVITY_NEW_TASK);
-            try {
-                _context.startActivity(intent);
-            } catch (ActivityNotFoundException e) {
-                openWebpageInExternalBrowser(rstr(srAlternativeDonateUrl));
-            }
-        }
-    }
-
     public String readTextfileFromRawRes(@RawRes int rawResId, String linePrefix, String linePostfix) {
         StringBuilder sb = new StringBuilder();
         BufferedReader br = null;
@@ -742,44 +737,27 @@ public class ContextUtils {
         return Bitmap.createBitmap(bitmap, 0, 0, bitmap.getWidth(), bitmap.getHeight(), matrix, true);
     }
 
-    /**
-     * Write the given {@link Bitmap} to {@code imageFile}, in {@link CompressFormat#JPEG} format
-     */
-    public boolean writeImageToFileJpeg(final File imageFile, final Bitmap image) {
-        return writeImageToFile(imageFile, image, Bitmap.CompressFormat.JPEG, 95);
-    }
-
     /**
      * Write the given {@link Bitmap} to filesystem
      *
      * @param targetFile The file to be written in
-     * @param image      The image as android {@link Bitmap}
+     * @param image      Android {@link Bitmap}
-     * @param format     One format of {@link CompressFormat}, null will determine based on filename
-     * @param quality    Quality level, defaults to 95
      * @return True if writing was successful
      */
-    public boolean writeImageToFile(final File targetFile, final Bitmap image, CompressFormat format, Integer quality) {
+    public boolean writeImageToFile(final File targetFile, final Bitmap image, Integer... a0quality) {
+        final int quality = (a0quality != null && a0quality.length > 0 && a0quality[0] >= 0 && a0quality[0] <= 100) ? a0quality[0] : 70;
+        final String lc = targetFile.getAbsolutePath().toLowerCase(Locale.ROOT);
+        final CompressFormat format = lc.endsWith(".webp") ? CompressFormat.WEBP : (lc.endsWith(".png") ? CompressFormat.PNG : CompressFormat.JPEG);
+
+        boolean ok = false;
         File folder = new File(targetFile.getParent());
-        if (quality == null || quality < 0 || quality > 100) {
-            quality = 95;
-        }
-        if (format == null) {
-            format = CompressFormat.JPEG;
-            String lc = targetFile.getAbsolutePath().toLowerCase(Locale.ROOT);
-            if (lc.endsWith(".png")) {
-                format = CompressFormat.PNG;
-            }
-            if (lc.endsWith(".webp")) {
-                format = CompressFormat.WEBP;
-            }
-        }
         if (folder.exists() || folder.mkdirs()) {
             FileOutputStream stream = null;
             try {
-                stream = new FileOutputStream(targetFile); // overwrites this image every time
+                stream = new FileOutputStream(targetFile);
                 image.compress(format, quality, stream);
-                return true;
+                ok = true;
-            } catch (FileNotFoundException ignored) {
+            } catch (Exception ignored) {
             } finally {
                 try {
                     if (stream != null) {
@@ -789,7 +767,11 @@ public class ContextUtils {
                 }
             }
         }
-        return false;
+        try {
+            image.recycle();
+        } catch (Exception ignored) {
+        }
+        return ok;
     }
 
     /**
@@ -1011,6 +993,25 @@ public class ContextUtils {
             vibrator.vibrate(ms_v);
         }
     }
+
+    /*
+    Check if Wifi is connected. Requires these permissions in AndroidManifest:
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
+     */
+    @SuppressLint("MissingPermission")
+    public boolean isWifiConnected(boolean... enabledOnly) {
+        final boolean doEnabledCheckOnly = enabledOnly != null && enabledOnly.length > 0 && enabledOnly[0];
+        final ConnectivityManager connectivityManager = (ConnectivityManager) _context.getApplicationContext().getSystemService(Context.CONNECTIVITY_SERVICE);
+        final NetworkInfo wifiInfo = connectivityManager.getNetworkInfo(ConnectivityManager.TYPE_WIFI);
+        return wifiInfo != null && (doEnabledCheckOnly ? wifiInfo.isAvailable() : wifiInfo.isConnected());
+    }
+
+    // Returns if the device is currently in portrait orientation (landscape=false)
+    public boolean isDeviceOrientationPortrait() {
+        final int rotation = ((WindowManager) _context.getSystemService(Context.WINDOW_SERVICE)).getDefaultDisplay().getOrientation();
+        return (rotation == Surface.ROTATION_0) || (rotation == Surface.ROTATION_180);
+    }
 }
 
 

app/src/main/java/net/gsantner/opoc/util/FileUtils.java

@@ -1,9 +1,8 @@
 /*#######################################################
  *
- *   Maintained by Gregor Santner, 2017-
+ *   Maintained 2017-2023 by Gregor Santner <gsantner AT mailbox DOT org>
- *   https://gsantner.net/
  *
- *   License of this file: Apache 2.0 (Commercial upon request)
+ *   License of this file: Apache 2.0
  *     https://www.apache.org/licenses/LICENSE-2.0
  *     https://github.com/gsantner/opoc/#licensing
  *
@@ -11,6 +10,8 @@
 package net.gsantner.opoc.util;
 
 
+import android.text.TextUtils;
+
 import java.io.BufferedInputStream;
 import java.io.BufferedOutputStream;
 import java.io.BufferedReader;
@@ -37,7 +38,7 @@ import java.util.UUID;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.regex.Pattern;
 
-@SuppressWarnings({"WeakerAccess", "unused", "SameParameterValue", "SpellCheckingInspection", "deprecation"})
+@SuppressWarnings({"WeakerAccess", "unused", "SameParameterValue", "SpellCheckingInspection", "deprecation", "TryFinallyCanBeTryWithResources"})
 public class FileUtils {
     // Used on methods like copyFile(src, dst)
     private static final int BUFFER_SIZE = 4096;
@@ -391,24 +392,23 @@ public class FileUtils {
      */
     public static String getMimeType(File file) {
         String guess = null;
-        if (file != null && file.exists() && file.isFile()) {
+        if (file != null) {
+            if (file.exists() && file.isFile()) {
                 InputStream is = null;
                 try {
                     is = new BufferedInputStream(new FileInputStream(file));
                     guess = URLConnection.guessContentTypeFromStream(is);
-            } catch (IOException e) {
+                } catch (Exception ignored) {
-                e.printStackTrace();
                 } finally {
                     if (is != null) {
                         try {
                             is.close();
-                    } catch (IOException ignored) {
+                        } catch (Exception ignored) {
+                        }
                     }
                 }
             }
 
-            if (guess == null || guess.isEmpty()) {
-                guess = "*/*";
             String filename = file.getName().replace(".jenc", "");
             int dot = filename.lastIndexOf(".") + 1;
             if (dot > 0 && dot < filename.length()) {
@@ -425,11 +425,25 @@ public class FileUtils {
                     case "txt":
                         guess = "text/plain";
                         break;
+                    case "webp":
+                        guess = "image/webp";
+                        break;
+                    case "jpg":
+                    case "jpeg":
+                        guess = "image/jpeg";
+                        break;
+                    case "png":
+                        guess = "image/png";
+                        break;
                 }
             }
+
+            if (TextUtils.isEmpty(guess)) {
+                guess = URLConnection.guessContentTypeFromName(filename);
             }
         }
-        return guess;
+
+        return TextUtils.isEmpty(guess) ? "*/*" : guess;
     }
 
     public static boolean isTextFile(File file) {
@@ -496,9 +510,18 @@ public class FileUtils {
         } else if (bytes < 1000000) {
             return String.format(Locale.getDefault(), "%.2f%s", (bytes / 1000f), "KB");
         } else if (bytes < 1000000000) {
-            return String.format(Locale.getDefault(), "%.2f%s", (bytes / 1000000f), "GB");
+            return String.format(Locale.getDefault(), "%.2f%s", (bytes / 1000000f), "MB");
+        } else if (bytes < 1000000000000L) {
+            return String.format(Locale.getDefault(), "%.2f%s", (bytes / 1000000000f), "GB");
         } else {
-            return String.format(Locale.getDefault(), "%.2f%s", (bytes / 1000000000f), "TB");
+            return String.format(Locale.getDefault(), "%.2f%s", (bytes / 1000000000000f), "TB");
         }
     }
+
+    public static File join(File file, String... childSegments) {
+        for (final String s : childSegments != null ? childSegments : new String[0]) {
+            file = new File(file, s);
+        }
+        return file;
+    }
 }

app/src/main/java/net/gsantner/opoc/util/NetworkUtils.java

@@ -1,9 +1,8 @@
 /*#######################################################
  *
- *   Maintained by Gregor Santner, 2017-
+ *   Maintained 2017-2023 by Gregor Santner <gsantner AT mailbox DOT org>
- *   https://gsantner.net/
  *
- *   License of this file: Apache 2.0 (Commercial upon request)
+ *   License of this file: Apache 2.0
  *     https://www.apache.org/licenses/LICENSE-2.0
  *     https://github.com/gsantner/opoc/#licensing
  *
@@ -24,7 +23,6 @@ import java.net.URL;
 import java.net.URLDecoder;
 import java.net.URLEncoder;
 import java.nio.charset.Charset;
-import java.nio.charset.StandardCharsets;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -222,4 +220,14 @@ public class NetworkUtils {
 
         return result;
     }
+
+    public static void httpGetAsync(final String url, final Callback.a1<String> callback) {
+        new Thread(() -> {
+            try {
+                String c = NetworkUtils.performCall(url, GET);
+                callback.callback(c);
+            } catch (Exception ignored) {
+            }
+        }).start();
+    }
 }

app/src/main/java/net/gsantner/opoc/util/PermissionChecker.java

@@ -1,9 +1,8 @@
 /*#######################################################
  *
- *   Maintained by Gregor Santner, 2017-
+ *   Maintained 2017-2023 by Gregor Santner <gsantner AT mailbox DOT org>
- *   https://gsantner.net/
  *
- *   License of this file: Apache 2.0 (Commercial upon request)
+ *   License of this file: Apache 2.0
  *     https://www.apache.org/licenses/LICENSE-2.0
  *     https://github.com/gsantner/opoc/#licensing
  *

app/src/main/java/net/gsantner/opoc/util/ShareUtil.java

@@ -1,9 +1,8 @@
 /*#######################################################
  *
- *   Maintained by Gregor Santner, 2017-
+ *   Maintained 2017-2023 by Gregor Santner <gsantner AT mailbox DOT org>
- *   https://gsantner.net/
  *
- *   License of this file: Apache 2.0 (Commercial upon request)
+ *   License of this file: Apache 2.0
  *     https://www.apache.org/licenses/LICENSE-2.0
  *     https://github.com/gsantner/opoc/#licensing
  *
@@ -83,6 +82,7 @@ public class ShareUtil {
     public final static String EXTRA_FILEPATH = "real_file_path_2";
     public final static SimpleDateFormat SDF_RFC3339_ISH = new SimpleDateFormat("yyyy-MM-dd'T'HH-mm-ss", Locale.getDefault());
     public final static SimpleDateFormat SDF_SHORT = new SimpleDateFormat("yyMMdd-HHmmss", Locale.getDefault());
+    public final static SimpleDateFormat SDF_IMAGES = new SimpleDateFormat("yyyyMMdd-HHmmss", Locale.getDefault()); //20190511-230845
     public final static String MIME_TEXT_PLAIN = "text/plain";
     public final static String PREF_KEY__SAF_TREE_URI = "pref_key__saf_tree_uri";
 
@@ -93,9 +93,9 @@ public class ShareUtil {
     public final static int MIN_OVERWRITE_LENGTH = 5;
 
     protected static String _lastCameraPictureFilepath;
+    protected static String _fileProviderAuthority;
 
     protected Context _context;
-    protected String _fileProviderAuthority;
     protected String _chooserTitle;
 
     public ShareUtil(final Context context) {
@@ -118,9 +118,8 @@ public class ShareUtil {
         return _fileProviderAuthority;
     }
 
-    public ShareUtil setFileProviderAuthority(final String fileProviderAuthority) {
+    public static void setFileProviderAuthority(final String fileProviderAuthority) {
         _fileProviderAuthority = fileProviderAuthority;
-        return this;
     }
 
 
@@ -230,9 +229,9 @@ public class ShareUtil {
             intent.putExtra(Intent.EXTRA_STREAM, fileUri);
             showChooser(intent, null);
             return true;
-        } catch (Exception e) { // FileUriExposed(API24) / IllegalArgument
+        } catch (Exception ignored) { // FileUriExposed(API24) / IllegalArgument
-            return false;
         }
+        return false;
     }
 
     /**
@@ -320,17 +319,6 @@ public class ShareUtil {
         return false;
     }
 
-    /**
-     * Share the given bitmap with given format
-     *
-     * @param bitmap Image
-     * @param format A {@link Bitmap.CompressFormat}, supporting JPEG,PNG,WEBP
-     * @return if success, true
-     */
-    public boolean shareImage(final Bitmap bitmap, final Bitmap.CompressFormat format) {
-        return shareImage(bitmap, format, 95, "SharedImage");
-    }
-
     /**
      * Share the given bitmap with given format
      *
@@ -340,20 +328,36 @@ public class ShareUtil {
      * @param quality   Quality of the exported image [0-100]
      * @return if success, true
      */
-    public boolean shareImage(final Bitmap bitmap, final Bitmap.CompressFormat format, final int quality, final String imageName) {
+    public boolean shareImage(final Bitmap bitmap, final Integer... quality) {
         try {
-            String ext = format.name().toLowerCase();
+            File file = new File(_context.getCacheDir(), getFilenameWithTimestamp());
-            File file = File.createTempFile(imageName, "." + ext.replace("jpeg", "jpg"), _context.getExternalCacheDir());
+            if (bitmap != null && new ContextUtils(_context).writeImageToFile(file, bitmap, quality)) {
-            if (bitmap != null && new ContextUtils(_context).writeImageToFile(file, bitmap, format, quality)) {
+                String x = FileUtils.getMimeType(file);
-                shareStream(file, "image/" + ext);
+                shareStream(file, FileUtils.getMimeType(file));
                 return true;
             }
-        } catch (IOException e) {
+        } catch (Exception ignored) {
-            e.printStackTrace();
         }
         return false;
     }
 
+    /**
+     * Generate a filename based off current datetime in filename (year, month, day, hour, minute, second)
+     * Examples: Screenshot_20210208-184301_Trebuchet.png IMG_20190511-230845.jpg
+     *
+     * @param A0prefixA1postfixA2ext All arguments are optional and default values are taken for null
+     *                               [0] = Prefix [Screenshot/IMG]
+     *                               [1] = Postfix [Trebuchet]
+     *                               [2] = File extensions [jpg/png/txt]
+     * @return Filename
+     */
+    public static String getFilenameWithTimestamp(String... A0prefixA1postfixA2ext) {
+        final String prefix = (((A0prefixA1postfixA2ext != null && A0prefixA1postfixA2ext.length > 0 && !TextUtils.isEmpty(A0prefixA1postfixA2ext[0])) ? A0prefixA1postfixA2ext[0] : "Screenshot") + "_").trim().replaceFirst("^_$", "");
+        final String postfix = ("_" + ((A0prefixA1postfixA2ext != null && A0prefixA1postfixA2ext.length > 1 && !TextUtils.isEmpty(A0prefixA1postfixA2ext[1])) ? A0prefixA1postfixA2ext[1] : "")).trim().replaceFirst("^_$", "");
+        final String ext = (A0prefixA1postfixA2ext != null && A0prefixA1postfixA2ext.length > 2 && !TextUtils.isEmpty(A0prefixA1postfixA2ext[2])) ? A0prefixA1postfixA2ext[2] : "jpg";
+        return String.format("%s%s%s.%s", prefix.trim(), SDF_IMAGES.format(new Date()), postfix.trim(), ext.toLowerCase().replace(".", "").replace("jpeg", "jpg"));
+    }
+
     /**
      * Print a {@link WebView}'s contents, also allows to create a PDF
      *
@@ -405,21 +409,21 @@ public class ShareUtil {
      * @return A {@link Bitmap} or null
      */
     @Nullable
-    public static Bitmap getBitmapFromWebView(final WebView webView) {
+    public static Bitmap getBitmapFromWebView(final WebView webView, final boolean... a0fullpage) {
         try {
             //Measure WebView's content
+            if (a0fullpage != null && a0fullpage.length > 0 && a0fullpage[0]) {
                 int widthMeasureSpec = View.MeasureSpec.makeMeasureSpec(View.MeasureSpec.UNSPECIFIED, View.MeasureSpec.UNSPECIFIED);
                 int heightMeasureSpec = View.MeasureSpec.makeMeasureSpec(0, View.MeasureSpec.UNSPECIFIED);
                 webView.measure(widthMeasureSpec, heightMeasureSpec);
                 webView.layout(0, 0, webView.getMeasuredWidth(), webView.getMeasuredHeight());
+            }
 
             //Build drawing cache and store its size
             webView.buildDrawingCache();
-            int measuredWidth = webView.getMeasuredWidth();
-            int measuredHeight = webView.getMeasuredHeight();
 
             //Creates the bitmap and draw WebView's content on in
-            Bitmap bitmap = Bitmap.createBitmap(measuredWidth, measuredHeight, Bitmap.Config.ARGB_8888);
+            Bitmap bitmap = Bitmap.createBitmap(webView.getMeasuredWidth(), webView.getMeasuredHeight(), Bitmap.Config.ARGB_8888);
             Canvas canvas = new Canvas(bitmap);
             canvas.drawBitmap(bitmap, 0, bitmap.getHeight(), new Paint());
 
@@ -1148,7 +1152,7 @@ public class ShareUtil {
                     if (isDirectory) {
                         // Nothing to do
                     } else {
-                        pfd = _context.getContentResolver().openFileDescriptor(dof.getUri(), "rw");
+                        pfd = _context.getContentResolver().openFileDescriptor(dof.getUri(), "rwt");
                         fileOutputStream = new FileOutputStream(pfd.getFileDescriptor());
                     }
                 }

app/src/main/res/raw/maintainers.md

@@ -1,5 +1,5 @@
 * Gregor Santner (gsantner)
-~° http://gsantner.net
+~° https://github.com/gsantner
 
 * Paul Schaub (vanitasvitae)
 ~° https://github.com/vanitasvitae

app/src/main/res/values-af/strings.xml

@@ -154,5 +154,4 @@
     <string name="youtube_links">Youtube links</string>
     <string name="change_the_theme_of_your_account">Verander die tema van jou rekening</string>
     <string name="pull_to_refresh">Trek om te verfris</string>
-    <string name="donate">Skenk</string>
 </resources>

app/src/main/res/values-ar/strings.xml

@@ -38,5 +38,4 @@
     <string name="license">ترخيص</string>
     <!-- License & help (large amount of text) -->
     <string name="contributors">المساهمون</string>
-    <string name="donate">تبرع</string>
 </resources>

app/src/main/res/values-az/strings.xml

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Application -->
+    <!-- Common Words -->
+    <!-- Notifications dropdown menu -->
+    <!-- Pod Activity -->
+    <!-- Drawer, Menu, Toolbar, ContextMenu -->
+    <!-- More from MainActivity -->
+    <!-- Permissions -->
+    <!-- Operability -->
+    <!-- Category Titles -->
+    <!-- Visuals -->
+    <!-- Navigiation Slider -->
+    <!-- Themes -->
+    <!-- Notifications dropdown -->
+    <!-- Font size -->
+    <!-- Load images -->
+    <!-- Screen rotation -->
+    <!-- Proxy -->
+    <!-- Chrome custom tabs -->
+    <!-- Diaspora Settings -->
+    <!-- More -->
+    <!-- License & help (large amount of text) -->
+</resources>

app/src/main/res/values-bg/strings.xml

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Application -->
+    <!-- Common Words -->
+    <!-- Notifications dropdown menu -->
+    <!-- Pod Activity -->
+    <!-- Drawer, Menu, Toolbar, ContextMenu -->
+    <!-- More from MainActivity -->
+    <!-- Permissions -->
+    <!-- Operability -->
+    <!-- Category Titles -->
+    <!-- Visuals -->
+    <!-- Navigiation Slider -->
+    <!-- Themes -->
+    <!-- Notifications dropdown -->
+    <!-- Font size -->
+    <!-- Load images -->
+    <!-- Screen rotation -->
+    <!-- Proxy -->
+    <!-- Chrome custom tabs -->
+    <!-- Diaspora Settings -->
+    <!-- More -->
+    <!-- License & help (large amount of text) -->
+</resources>

app/src/main/res/values-bs/strings.xml

@@ -38,6 +38,4 @@
     <string name="about">O programu</string>
     <!-- License & help (large amount of text) -->
     <string name="contributors">Saradnici</string>
-    <string name="donate">Doniraj</string>
-    <string name="do_you_like_this_project_want_donate_to_keep_alive">Sviđa li Vam se ovaj projekat? Želite li da napreduje a problemi budu otklonjeni?\n\nRazvijanje aplikacija i pisanje članaka o njima uzima puno vremena! Ako biste voljeli pomoći da projekat opstane, molimo Vas da razmislite o skromnoj donaciji!\n\nRad na ovom projektu odvija se u slobodno vrijeme, a program je besplatan i ne sadrži nikakav vid reklama!</string>
 </resources>

app/src/main/res/values-ca/strings.xml

@@ -206,6 +206,4 @@ diaspora*. Si voleu contribuir, endavant! Actualment som un equip molt petit, de
     <string name="change_the_theme_of_your_account">Canvia el tema del vostre compte</string>
     <string name="pull_to_refresh">Feu lliscar per actualitzar</string>
     <string name="pulling_down_on_top_of_page_to_refresh">S\'està lliscant cap avall a la part superior de la pàgina per actualitzar.\nCal que reinicieu l\'aplicació perquè els canvis tinguin efecte.</string>
-    <string name="donate">Fes un donatiu</string>
-    <string name="do_you_like_this_project_want_donate_to_keep_alive">Us agrada aquest projecte? Voleu que encara sigui millor i es solucionin els problemes?\n\nDesenvolupar aplicacions i escriure publicacions relacionades als blogs costa molt de temps! Si voleu ajudar perquè el projecte pugui continuar, considereu aportar una petita donació!\n\nAquest projecte es desenvolupa durant el temps lliure, completament gratis i sense publicitat!</string>
 </resources>

app/src/main/res/values-ckb/strings.xml

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Application -->
+    <!-- Common Words -->
+    <!-- Notifications dropdown menu -->
+    <!-- Pod Activity -->
+    <!-- Drawer, Menu, Toolbar, ContextMenu -->
+    <!-- More from MainActivity -->
+    <!-- Permissions -->
+    <!-- Operability -->
+    <!-- Category Titles -->
+    <!-- Visuals -->
+    <!-- Navigiation Slider -->
+    <!-- Themes -->
+    <!-- Notifications dropdown -->
+    <!-- Font size -->
+    <!-- Load images -->
+    <!-- Screen rotation -->
+    <!-- Proxy -->
+    <!-- Chrome custom tabs -->
+    <!-- Diaspora Settings -->
+    <!-- More -->
+    <!-- License & help (large amount of text) -->
+</resources>

app/src/main/res/values-cs/strings.xml

@@ -200,5 +200,4 @@
     <string name="youtube_links">Youtube odkazy</string>
     <string name="change_the_theme_of_your_account">Změňte téma vašeho účtu</string>
     <string name="pull_to_refresh">Pull osvěžit</string>
-    <string name="donate">Krátce</string>
 </resources>

app/src/main/res/values-da/strings.xml

@@ -90,5 +90,4 @@
     <!-- License & help (large amount of text) -->
     <string name="maintainers">Udviklere</string>
     <string name="contributors">Bidragsydere</string>
-    <string name="donate">Donér</string>
 </resources>

app/src/main/res/values-de/strings.xml

@@ -209,6 +209,4 @@ nachträglich erteilen. Öffne dafür: Systemeinstellungen - Apps - dandelion*.
     <string name="change_the_theme_of_your_account">Thema des Accounts ändern</string>
     <string name="pull_to_refresh">Pull-To-Refresh</string>
     <string name="pulling_down_on_top_of_page_to_refresh">In der Website von ganz oben nach unten ziehen um zu aktualisieren.\nDu musst die App neu starten damit die Änderungen wirksam werden.</string>
-    <string name="donate">Spenden</string>
-    <string name="do_you_like_this_project_want_donate_to_keep_alive">Gefällt dir dieses Projekt? Möchtest du, dass es verbessert wird und Probleme behoben werden?\n\nDie Entwicklung von Apps und das schreiben von relevanten Blog-Einträgen kostet viel Zeit! Wenn du helfen möchtest, so dass das Projekt weitergehen kann, ziehe bitte eine kleine Spende in Betracht!\n\nDieses Projekt wird in der Freizeit, völlig kostenlos und ohne jegliche Werbeeinblendungen entwickelt &amp; angeboten!</string>
 </resources>

app/src/main/res/values-eo/strings.xml

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Application -->
+    <!-- Common Words -->
+    <!-- Notifications dropdown menu -->
+    <!-- Pod Activity -->
+    <!-- Drawer, Menu, Toolbar, ContextMenu -->
+    <!-- More from MainActivity -->
+    <!-- Permissions -->
+    <!-- Operability -->
+    <!-- Category Titles -->
+    <!-- Visuals -->
+    <!-- Navigiation Slider -->
+    <!-- Themes -->
+    <!-- Notifications dropdown -->
+    <!-- Font size -->
+    <!-- Load images -->
+    <!-- Screen rotation -->
+    <!-- Proxy -->
+    <!-- Chrome custom tabs -->
+    <!-- Diaspora Settings -->
+    <!-- More -->
+    <!-- License & help (large amount of text) -->
+</resources>

app/src/main/res/values-es/strings.xml

@@ -204,6 +204,4 @@
     <string name="change_the_theme_of_your_account">Cambiar el tema de tu cuenta</string>
     <string name="pull_to_refresh">Tirar para refrescar</string>
     <string name="pulling_down_on_top_of_page_to_refresh">Deslizar hacia abajo la parte superior de la página para refrescar.\n Necesita reiniciar la aplicación para que los cambios surtan efecto.</string>
-    <string name="donate">Donar</string>
-    <string name="do_you_like_this_project_want_donate_to_keep_alive">¿Te gusta este proyecto? ¿Quieres que se mejore y se corrijan problemas?\n\nEl desarrollo de aplicaciones y la escritura de entradas relacionadas del blog cuesta mucho tiempo. Si quieres ayudar a que el proyecto pueda continuar, por favor considera una pequeña donación!\n\nEste proyecto se desarrolla en tiempo de ocio, completamente gratis y sin publicidad!</string>
 </resources>

app/src/main/res/values-et/strings.xml

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Application -->
+    <!-- Common Words -->
+    <!-- Notifications dropdown menu -->
+    <!-- Pod Activity -->
+    <!-- Drawer, Menu, Toolbar, ContextMenu -->
+    <!-- More from MainActivity -->
+    <!-- Permissions -->
+    <!-- Operability -->
+    <!-- Category Titles -->
+    <!-- Visuals -->
+    <!-- Navigiation Slider -->
+    <!-- Themes -->
+    <!-- Notifications dropdown -->
+    <!-- Font size -->
+    <!-- Load images -->
+    <!-- Screen rotation -->
+    <!-- Proxy -->
+    <!-- Chrome custom tabs -->
+    <!-- Diaspora Settings -->
+    <!-- More -->
+    <!-- License & help (large amount of text) -->
+</resources>

app/src/main/res/values-fa/strings.xml

@@ -32,5 +32,4 @@
     <string name="about">درباره مارکور</string>
     <!-- License & help (large amount of text) -->
     <string name="contributors">همکاران</string>
-    <string name="donate">کمک مالی</string>
 </resources>

app/src/main/res/values-fr/strings.xml

@@ -204,6 +204,4 @@
     <string name="change_the_theme_of_your_account">Changer le thème de votre compte</string>
     <string name="pull_to_refresh">Tirer vers le bas pour mettre à jour</string>
     <string name="pulling_down_on_top_of_page_to_refresh">Tirez depuis le haut de la page vers le bas pour l\'actualiser.\nVous devez redémarrer l\'application pour que ces changements prennent effet.</string>
-    <string name="donate">Donner</string>
-    <string name="do_you_like_this_project_want_donate_to_keep_alive">Vous aimez ce projet ? Vous voulez participer à son amélioration et corriger ses problèmes ?\n\nDévelopper des applications et écrire les posts de blog correspondants demande beaucoup de temps ! Si vous voulez aider à la poursuite du projet, merci de considérer une petite donation.\n\nCe projet est développé sur du temps libre, complètement gratuitement et sans publicité !</string>
 </resources>

app/src/main/res/values-gl/strings.xml

@@ -207,6 +207,4 @@
     <string name="change_the_theme_of_your_account">Cambiar o decorado da túa conta</string>
     <string name="pull_to_refresh">Tira para actualizar</string>
     <string name="pulling_down_on_top_of_page_to_refresh">Tirar hacia abaixo na parte superior da páxina.\nDebes reiniciar a app para que os cambios se apliquen.</string>
-    <string name="donate">Doar</string>
-    <string name="do_you_like_this_project_want_donate_to_keep_alive">Gústache este proxecto? Queres que siga mellorando e resolvendo os problemas?\n\nDesenvolver aplicacións e escribir a documentación leva moito tempo! Se queres apoiar ao proxecto para que continúe, por favor, considera facer unha pequena doazón!\n\nEste proxecto desenvólvese no tempo libre, ofrécese libre e gratuitamente e sen publicidade!</string>
 </resources>

app/src/main/res/values-hi/strings.xml

@@ -38,5 +38,4 @@
     <string name="license">लाइसेंस</string>
     <!-- License & help (large amount of text) -->
     <string name="contributors">योगदान कर्ता</string>
-    <string name="donate">दान करें</string>
 </resources>

app/src/main/res/values-hr/strings.xml

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Application -->
+    <!-- Common Words -->
+    <!-- Notifications dropdown menu -->
+    <!-- Pod Activity -->
+    <!-- Drawer, Menu, Toolbar, ContextMenu -->
+    <!-- More from MainActivity -->
+    <!-- Permissions -->
+    <!-- Operability -->
+    <!-- Category Titles -->
+    <!-- Visuals -->
+    <!-- Navigiation Slider -->
+    <!-- Themes -->
+    <!-- Notifications dropdown -->
+    <!-- Font size -->
+    <!-- Load images -->
+    <!-- Screen rotation -->
+    <!-- Proxy -->
+    <!-- Chrome custom tabs -->
+    <!-- Diaspora Settings -->
+    <!-- More -->
+    <!-- License & help (large amount of text) -->
+</resources>

app/src/main/res/values-hu/strings.xml

@@ -190,5 +190,4 @@
     <string name="the_following_libraries_are_used">A következő könyvtárak vannak használatban:</string>
     <string name="inspiration_from_leafpic__appspecific">A LeafPicből merítettünk némi inspirációt és programkódot. Próbáld ki, ez is szabad szoftver!</string>
     <string name="tell_me_more">Tudj meg többet</string>
-    <string name="donate">Adományozás</string>
 </resources>

app/src/main/res/values-it/strings.xml

@@ -210,6 +210,4 @@
     <string name="change_the_theme_of_your_account">Cambia il tema del tuo account</string>
     <string name="pull_to_refresh">Trascina per aggiornare</string>
     <string name="pulling_down_on_top_of_page_to_refresh">Trascina dall\'alto al basso per aggiornare la pagina.\nDevi riavviare l\'app affinchè le modifiche abbiano effetto.</string>
-    <string name="donate">Dona</string>
-    <string name="do_you_like_this_project_want_donate_to_keep_alive">Ti piace questo progetto? Vuoi vederlo ancora migliore e con i problemi risolti?\n\nSviluppare applicazioni e documentarle sul blog costa un sacco di tempo! Se vuoi aiutare lo sviluppo del progetto, puoi fare una piccola donazione!\n\nQuesto progetto è sviluppato nel tempo libero, completamente gratis e senza alcuna pubblicità!</string>
 </resources>

app/src/main/res/values-iw/strings.xml

@@ -34,5 +34,4 @@
     <string name="about">אודות</string>
     <!-- License & help (large amount of text) -->
     <string name="contributors">תורמים</string>
-    <string name="donate">תרום</string>
 </resources>

app/src/main/res/values-ja/strings.xml

@@ -204,6 +204,4 @@
     <string name="change_the_theme_of_your_account">アカウントのテーマを変更</string>
     <string name="pull_to_refresh">引き下げて更新</string>
     <string name="pulling_down_on_top_of_page_to_refresh">ページの上から下に引き下げて更新します。\n変更を反映するため、アプリを再起動する必要があります。</string>
-    <string name="donate">寄付</string>
-    <string name="do_you_like_this_project_want_donate_to_keep_alive">このプロジェクトを気に入っていただけましたか? 改善したい、あるいは問題を修正したいですか?\n\nアプリの開発や、関連するブログの記事を書くに多くの時間がかかります! プロジェクトを進めるために、支援をしていただける場合は、少しの寄付をご検討ください!\n\nこのプロジェクトは余暇に開発していて、完全に無料で、広告はありません!</string>
 </resources>

app/src/main/res/values-kab/strings.xml

@@ -200,5 +200,4 @@
     <string name="the_following_libraries_are_used">Tinedlisin-agi ttwaseqdacent:</string>
     <string name="inspiration_from_leafpic__appspecific">Newwi kra n tiktiwin akked tengat si LeafPic. Duu ad ten-twaliḍ. D aseɣẓan ilellil!</string>
     <string name="tell_me_more">Ini-yid ugar</string>
-    <string name="donate">Mudd</string>
 </resources>

app/src/main/res/values-kmr/strings.xml

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Application -->
+    <!-- Common Words -->
+    <!-- Notifications dropdown menu -->
+    <!-- Pod Activity -->
+    <!-- Drawer, Menu, Toolbar, ContextMenu -->
+    <!-- More from MainActivity -->
+    <!-- Permissions -->
+    <!-- Operability -->
+    <!-- Category Titles -->
+    <!-- Visuals -->
+    <!-- Navigiation Slider -->
+    <!-- Themes -->
+    <!-- Notifications dropdown -->
+    <!-- Font size -->
+    <!-- Load images -->
+    <!-- Screen rotation -->
+    <!-- Proxy -->
+    <!-- Chrome custom tabs -->
+    <!-- Diaspora Settings -->
+    <!-- More -->
+    <!-- License & help (large amount of text) -->
+</resources>

app/src/main/res/values-ko/strings.xml

@@ -193,5 +193,4 @@
     <string name="inspiration_from_leafpic__appspecific">LeafPic에서 약간의 영감을 받았으며, 코드들도 일부 차용했습니다.
 한번 사용해보세요! 무료 소프트웨어 입니다!</string>
     <string name="tell_me_more">더 자세히 보기</string>
-    <string name="donate">후원하기</string>
 </resources>

app/src/main/res/values-nb-rNO/strings.xml

@@ -37,5 +37,4 @@
     <string name="about">Om</string>
     <!-- License & help (large amount of text) -->
     <string name="contributors">Bidragsytere</string>
-    <string name="donate">Doner</string>
 </resources>

app/src/main/res/values-nl/strings.xml

@@ -204,5 +204,4 @@
     <string name="change_the_theme_of_your_account">Wijzig het thema van uw account</string>
     <string name="pull_to_refresh">Trek om te vernieuwen</string>
     <string name="pulling_down_on_top_of_page_to_refresh">Trek omlaag op de bovenkant van de pagina om te vernieuwen.\nU moet de app opnieuw opstarten om wijzigingen door te voeren.</string>
-    <string name="donate">Doneer</string>
 </resources>

app/src/main/res/values-or/strings.xml

@@ -0,0 +1,118 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Application -->
+    <string name="open_navdrawer">ନେଭିଗେସନ୍ ଡ୍ରୟର୍ ଖୋଲନ୍ତୁ</string>
+    <string name="close_navdrawer">ନେଭିଗେସନ୍ ଡ୍ରୟର୍ ବନ୍ଦ କରନ୍ତୁ</string>
+    <string name="reload">ପୁନଃଲୋଡ୍ କରନ୍ତୁ</string>
+    <string name="close">ବନ୍ଦ କରନ୍ତୁ</string>
+    <string name="cancel">ବାତିଲ୍ କର</string>
+    <!-- Common Words -->
+    <string name="settings">ସେଟିଂସମୂହ</string>
+    <string name="notifications">ବିଜ୍ଞପ୍ତି</string>
+    <string name="conversations">ବାର୍ତ୍ତାଳାପ</string>
+    <string name="profile">ପ୍ରୋଫାଇଲ୍</string>
+    <string name="search">ସନ୍ଧାନ କରନ୍ତୁ</string>
+    <string name="changelog">ପରିବର୍ତ୍ତନ ଲଗ୍</string>
+    <string name="statistics">ପରିସଂଖ୍ୟାନ</string>
+    <!-- Notifications dropdown menu -->
+    <string name="all_notifications">ସବୁ ବିଜ୍ଞପ୍ତି</string>
+    <!-- Pod Activity -->
+    <string name="confirmation">ନିଶ୍ଚିତକରଣ</string>
+    <!-- Drawer, Menu, Toolbar, ContextMenu -->
+    <string name="more">ଅଧିକ</string>
+    <string name="help_license">ବିଷୟରେ | ସହାୟତା</string>
+    <string name="share_link_as_text">ପାଠ୍ୟ ଭାବରେ ଲିଙ୍କ୍ ଅଂଶୀଦାର କରନ୍ତୁ</string>
+    <string name="share_screenshot_of_webpage">ୱେବପୃଷ୍ଠାର ସ୍କ୍ରିନସଟ୍ ଅଂଶୀଦାର କରନ୍ତୁ</string>
+    <string name="take_screenshot_of_webpage">ୱେବପୃଷ୍ଠାର ସ୍କ୍ରିନସଟ୍ ନିଅନ୍ତୁ</string>
+    <string name="saving_image_to">ଏଥିରେ ପ୍ରତିଛବି ସଞ୍ଚୟ କରୁଛି</string>
+    <string name="link_adress_copied">ଲିଙ୍କ୍ ଠିକଣା କପି ହୋଇଛି …</string>
+    <string name="go_to_top">ଶୀର୍ଷକୁ ଯାଆନ୍ତୁ</string>
+    <string name="exit_app">ଆପ୍ ବାହାରକୁ ଯାଆନ୍ତୁ</string>
+    <string name="toggle_mobile_desktop_view">ମୋବାଇଲ୍/ଡେସ୍କଟପ୍ ଦର୍ଶନ ଟୋଗଲ୍ କରନ୍ତୁ</string>
+    <string name="share_dotdotdot">ଅଂଶୀଦାର…</string>
+    <string name="please_add_a_name">ଦୟାକରି ଏକ ନାମ ଯୋଡ଼ନ୍ତୁ</string>
+    <string name="share_link_address">ଲିଙ୍କ୍ ଠିକଣା ଅଂଶୀଦାର କରନ୍ତୁ</string>
+    <string name="save_image">ପ୍ରତିଛବି ସଞ୍ଚୟ କରନ୍ତୁ</string>
+    <string name="share_image">ପ୍ରତିଛବି ଅଂଶୀଦାର କରନ୍ତୁ</string>
+    <!-- More from MainActivity -->
+    <string name="unable_to_load_image">ପ୍ରତିଛବି ଲୋଡ୍ କରିବାରେ ଅସମର୍ଥ</string>
+    <!-- Permissions -->
+    <string name="protocol">ପ୍ରୋଟୋକଲ୍</string>
+    <string name="hide_statusbar_in_mainview">ମୁଖ୍ୟ ଦର୍ଶନରେ ସ୍ଥିତି ଦଣ୍ଡିକା ଲୁଚାନ୍ତୁ</string>
+    <string name="hide_statusbar">ସ୍ଥିତି ଦଣ୍ଡିକା ଲୁଚାଅ</string>
+    <string name="show_title_in_main_view">ମୁଖ୍ୟ ଦର୍ଶନରେ ଆଖ୍ୟା ଦେଖାନ୍ତୁ</string>
+    <string name="show_title">ଆଖ୍ୟା ଦେଖାନ୍ତୁ</string>
+    <string name="launcher_shortcut">ଉନ୍ମୋଚକ ସର୍ଟକଟ୍</string>
+    <!-- Operability -->
+    <!-- Category Titles -->
+    <string name="appearance">ରୂପ</string>
+    <string name="network">ନେଟୱର୍କ</string>
+    <!-- Visuals -->
+    <!-- Navigiation Slider -->
+    <string name="user">ଉପଭୋକ୍ତା</string>
+    <string name="general">ସାଧାରଣ</string>
+    <string name="admin">ବ୍ୟବସ୍ଥାପକ</string>
+    <!-- Themes -->
+    <string name="theme_and_colors">ଥିମ୍ ଏବଂ ରଙ୍ଗ</string>
+    <!-- Notifications dropdown -->
+    <string name="language_change_restart_description">ଏହି ଆପ୍ ର ଭାଷା ବଦଳାନ୍ତୁ। ପରିବର୍ତ୍ତନଗୁଡ଼ିକ କାର୍ଯ୍ୟକାରୀ ହେବା ପାଇଁ ଆପ୍ ପୁନଃଆରମ୍ଭ କରନ୍ତୁ</string>
+    <string name="language">ଭାଷା</string>
+    <string name="system_language">ସିଷ୍ଟମ୍ ଭାଷା</string>
+    <!-- Font size -->
+    <string name="font_size">ଫଣ୍ଟ ଆକାର</string>
+    <string name="normal">ସାଧାରଣ</string>
+    <string name="large">ବଡ଼</string>
+    <string name="huge">ବିରାଟ</string>
+    <!-- Load images -->
+    <string name="load_images">ପ୍ରତିଛବିଗୁଡ଼ିକୁ ଧାରଣ କରନ୍ତୁ</string>
+    <!-- Screen rotation -->
+    <string name="screen_rotation">ସ୍କ୍ରିନ୍ ଘୂର୍ଣ୍ଣନ</string>
+    <string name="default_">ଡିଫଲ୍ଟ</string>
+    <string name="portrait">ପୋର୍ଟ୍ରେଟ୍</string>
+    <string name="landscape">ଲ୍ୟାଣ୍ଡସ୍କେପ୍</string>
+    <!-- Proxy -->
+    <string name="proxy">ପ୍ରକ୍ସି</string>
+    <string name="enable_proxy">ପ୍ରକ୍ସି ସକ୍ଷମ କରନ୍ତୁ</string>
+    <!-- Chrome custom tabs -->
+    <!-- Diaspora Settings -->
+    <string name="change_account">ଆକାଉଣ୍ଟ୍ ବଦଳାନ୍ତୁ</string>
+    <string name="logout_warning_description">ଏହା ସମସ୍ତ କୁକୀ ଏବଂ ଅଧିବେଶନ ଡାଟା ଲିଭାଇଦେବ। ଆପଣ ପ୍ରକୃତରେ ଆପଣଙ୍କ ଆକାଉଣ୍ଟ୍ ପରିବର୍ତ୍ତନ କରିବାକୁ ଚାହାଁନ୍ତି କି?</string>
+    <!-- More -->
+    <string name="miscellaneous">ଵିଵିଧ</string>
+    <string name="full_reset">ପୂର୍ଣ୍ଣ ପୁନଃସେଟ୍</string>
+    <string name="enable_basic_adblocker_description">ମୌଳିକ AdBlocker ସକ୍ଷମ କରନ୍ତୁ। ବିଜ୍ଞାପନଗୁଡ଼ିକ ଗ୍ରଥିତ ଦର୍ଶନରେ ଅନ୍ତର୍ଭୁକ୍ତ ହୋଇପାରେ</string>
+    <string name="block_advertisments">ବିଜ୍ଞାପନଗୁଡ଼ିକୁ ଅବରୋଧ କରନ୍ତୁ</string>
+    <string name="about">ବିଷୟରେ</string>
+    <string name="license">ଲାଇସେନ୍ସ</string>
+    <string name="application">ଆପ୍ଲିକେସନ୍</string>
+    <string name="device">ଡିଭାଇସ୍</string>
+    <string name="app_version_with_arg">ଆପ୍ ସଂସ୍କରଣ: %1$s</string>
+    <string name="android_version_witharg">ଆଣ୍ଡ୍ରଏଡ୍ ସଂସ୍କରଣ: %1$s</string>
+    <string name="device_name_witharg">ଡିଭାଇସ୍ ନାମ: %1$s</string>
+    <string name="code_name_witharg">କୋଡ୍ ନାମ: %1$s</string>
+    <string name="get_the_source">ଉତ୍ସ ପ୍ରାପ୍ତ କରନ୍ତୁ</string>
+    <string name="translate_the_app">ଆପ୍ ଅନୁବାଦ କରନ୍ତୁ!</string>
+    <string name="app_not_available_in_your_lang_translate_with_stringlate">ଆପ୍ ଆପଣଙ୍କ ଭାଷାରେ ଉପଲବ୍ଧ ନାହିଁ କି? ଆପଣ ଏହା ବଦଳାଇପାରିବେ! ଆପଣ ଏହାକୁ ଅନୁବାଦ କରି ଆମକୁ କାହିଁକି ସାହାଯ୍ୟ କରୁନାହାଁନ୍ତି? ଆପ୍ ଅନୁବାଦ କରିବାରେ ଯେକୌଣସି ବ୍ୟକ୍ତିଙ୍କୁ ସକ୍ଷମ କରିବା ପାଇଁ ଆମେ Crowdin ବ୍ୟବହାର କରୁ।</string>
+    <string name="let_me_translate">ମୋତେ ଅନୁବାଦ କରିବାକୁ ଦିଅ</string>
+    <string name="give_feedback">ମତାମତ ଦିଅନ୍ତୁ!</string>
+    <string name="dandelion_still_in_development__appspecific">dandelion* ଏପର୍ଯ୍ୟନ୍ତ ବିକାଶରେ ଅଛି, ତେଣୁ ଯଦି ଆପଣଙ୍କର ପରାମର୍ଶ କିମ୍ୱା କୌଣସି ପ୍ରକାରର ମତାମତ ରହିଛି, ତେବେ ଦୟାକରି ଆମକୁ ଜଣାଇବା ପାଇଁ ଆମର ବଗ୍ ଟ୍ରାକର୍ ବ୍ୟବହାର କରନ୍ତୁ!</string>
+    <string name="report_bugs">ବଗ୍‌ ରିପୋର୍ଟ୍‌ କରନ୍ତୁ</string>
+    <string name="spread_the_word">ଶବ୍ଦ ବିସ୍ତାର କରନ୍ତୁ!</string>
+    <string name="tell_your_friends_about_diaspora__appspecific">diaspora* ଏବଂ #dandelion ବିଷୟରେ ଆପଣଙ୍କ ବନ୍ଧୁ ଏବଂ ପରିବାରକୁ କୁହନ୍ତୁ! ଆପଣ ଆପଣଙ୍କର ଅନୁଭୂତି ବିଷୟରେ କାହିଁକି ବ୍ଲଗ୍ କରୁନାହଁ? ଆମେ ଆପଣଙ୍କଠାରୁ ଶୁଣିବାକୁ ପସନ୍ଦ କରିବୁ!</string>
+    <string name="share_the_app">ଆପ୍ ଅଂଶୀଦାର କରନ୍ତୁ</string>
+    <string name="hey_checkout_dandelion_tag__appspecific">ଆଜ୍ଞା! #dandelion କୁ ଥରେ ଦେଖିଯାଆନ୍ତୁ! %1$s</string>
+    <!-- License & help (large amount of text) -->
+    <string name="maintainers">ରକ୍ଷଣାବେକ୍ଷଣକାରୀ</string>
+    <string name="this_app_is_currently_developed_and_maintained_by_witharg">ଏହି ଆପ୍ ବର୍ତ୍ତମାନ &lt;br&gt;&lt;br&gt;%1$sଙ୍କ ଦ୍ୱାରା ବିକାଶ ଓ ରକ୍ଷଣାବେକ୍ଷଣ କରାଯାଉଛି</string>
+    <string name="contributors">ଯୋଗଦାନକାରୀ</string>
+    <string name="thank_you_witharg">%1$s&lt;br&gt;&lt;br&gt;ଧନ୍ୟବାଦ!</string>
+    <string name="gnu_gplv3_license">GNU GPLv3+ ଲାଇସେନ୍ସ</string>
+    <string name="show_third_party_licenses">ତୃତୀୟ-ପକ୍ଷ ଲାଇବ୍ରେରୀ</string>
+    <string name="the_following_libraries_are_used">ନିମ୍ନଲିଖିତ ଲାଇବ୍ରେରୀଗୁଡ଼ିକ ବ୍ୟବହାର ହୋଇଛି:</string>
+    <string name="inspiration_from_leafpic__appspecific">ଆମେ LeafPic ରୁ କିଛି ପ୍ରେରଣା ଏବଂ କୋଡ୍ ନେଇଛୁ। ଯାଆନ୍ତୁ ଏହାକୁ ଥରେ ଦେଖି ଆସନ୍ତୁ, ଏହା ବି ଏକ ମାଗଣା ସଫ୍ଟୱେର୍!</string>
+    <string name="tell_me_more">ମୋତେ ଆହୁରି କୁହନ୍ତୁ</string>
+    <string name="enable_to_open_youtube_links_on_external_app">ବାହ୍ୟ ଆପରେ YouTube ଲିଙ୍କ୍ ଖୋଲିବା ପାଇଁ ସକ୍ଷମ କରନ୍ତୁ</string>
+    <string name="youtube_links">YouTube ଲିଙ୍କଗୁଡ଼ିକ</string>
+    <string name="change_the_theme_of_your_account">ଆପଣଙ୍କ ଆକାଉଣ୍ଟର ଥିମ୍ ପରିବର୍ତ୍ତନ କରନ୍ତୁ</string>
+    <string name="pull_to_refresh">ସତେଜ କରିବାକୁ ଟାଣନ୍ତୁ</string>
+</resources>

app/src/main/res/values-pl/strings.xml

@@ -203,5 +203,4 @@
     <string name="youtube_links">Linki YouTube</string>
     <string name="change_the_theme_of_your_account">Zmień motyw konta</string>
     <string name="pull_to_refresh">Pociągnij aby odświeżyć</string>
-    <string name="donate">Wspomóż</string>
 </resources>

app/src/main/res/values-pt-rBR/strings.xml

@@ -174,6 +174,4 @@
     <string name="show_third_party_licenses">Bibliotecas de Terceiros</string>
     <string name="the_following_libraries_are_used">São usadas as seguintes bibliotecas:</string>
     <string name="tell_me_more">Conte-me mais</string>
-    <string name="donate">Doar</string>
-    <string name="do_you_like_this_project_want_donate_to_keep_alive">Você gosta deste projeto? Você quer que ele fica melhor e com problemas corrigidos?\n\nDesenvolver aplicativos e escrever postagens relacionado em blog custa muito tempo! Se você quiser ajudar na continuação do projeto, por favor considere uma pequena doação!\n\nEsse projeto é desenvolvido durante o tempo de lazer, totalmente gratuito e sem propagandas!</string>
 </resources>

app/src/main/res/values-pt/strings.xml

@@ -202,6 +202,4 @@
     <string name="change_the_theme_of_your_account">Altera o tema da sua conta</string>
     <string name="pull_to_refresh">Puxar para atualizar</string>
     <string name="pulling_down_on_top_of_page_to_refresh">Deslize de cima para baixo para recarregar.\nTem que reiniciar a aplicação para aplicar as alterações.</string>
-    <string name="donate">Donativos</string>
-    <string name="do_you_like_this_project_want_donate_to_keep_alive">Gosta deste projeto? Deseja ajudar a melhorar a aplicação e a corrigir erros?\n\nO desenvolvimento de aplicações custa-me imenso tempo! Se quiser ajudar a manter o projeto, por favor considere a hipótese de um donativo!\n\nEsta aplicação é desenvolvida durante o meu tempo livre, é completamente livre e não tem anúncios!</string>
 </resources>

app/src/main/res/values-ru/strings.xml

@@ -204,6 +204,4 @@
     <string name="change_the_theme_of_your_account">Изменить тему вашей учётной записи</string>
     <string name="pull_to_refresh">Потяните для обновления</string>
     <string name="pulling_down_on_top_of_page_to_refresh">Потяните вниз, чтобы обновить страницу.\nВам нужно перезапустить приложение, чтобы изменения вступили в силу.</string>
-    <string name="donate">Поддержать проект</string>
-    <string name="do_you_like_this_project_want_donate_to_keep_alive">Вам нравится этот проект? Вы хотите поддержать дальнейшие улучшения и исправления ошибок?\n\nРазработка приложений и написание связанных блогов занимает много времени! Если вы хотите помочь проекту продолжить, пожалуйста, рассмотрите возможность небольшого пожертвования!\n\nЭтот проект развивается в свободное время, полностью бесплатно и без рекламы!</string>
 </resources>

app/src/main/res/values-sc/strings.xml

@@ -207,6 +207,4 @@
     <string name="change_the_theme_of_your_account">Muda su tema de su contu tuo</string>
     <string name="pull_to_refresh">Tira cara a bassu pro annoare</string>
     <string name="pulling_down_on_top_of_page_to_refresh">Tira cara a bassu pro annoare sa pàgina.\nDepes torrare a allùghere s\'aplicatzione pro fàghere in modu chi sas modìficas tèngiant efetu.</string>
-    <string name="donate">Dona</string>
-    <string name="do_you_like_this_project_want_donate_to_keep_alive">T\'agradat custu progetu? Cheres chi bèngiat megioradu e chi sos problemas bèngiant isortos?\n\nS\'isvilupu de aplicatziones e s\'iscritura de publicatziones curreladas in sos blogs pigat unu muntone de tempus! Si cheres agiudare, pro fàghere in modu chi su progetu potzat sighire, pro praghere piga in cunsìderu s\'idea de fàghere una donatzione, fintzas si minore!\n\nCustu progetu est isvilupadu in su tempus lìberu, totu de badas e chene annùntzios publitzitàrios!</string>
 </resources>

app/src/main/res/values-si/strings.xml

@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Application -->
+    <string name="reload">නැවත පූරණය</string>
+    <string name="close">වසන්න</string>
+    <string name="cancel">අවලංගු</string>
+    <!-- Common Words -->
+    <string name="settings">සැකසුම්</string>
+    <string name="notifications">දැනුම්දීම්</string>
+    <string name="conversations">සංවාද</string>
+    <string name="profile">පැතිකඩ</string>
+    <string name="activities">ක්‍රියාකාරකම්</string>
+    <string name="commented">අදහස් දැක්විණි</string>
+    <string name="mentions">සැඳහුම්</string>
+    <string name="public_">ප්‍රසිද්ධ</string>
+    <string name="search">සොයන්න</string>
+    <string name="contacts">සබඳතා</string>
+    <string name="statistics">සංඛ්‍යාලේඛන</string>
+    <!-- Notifications dropdown menu -->
+    <string name="all_notifications">සියළුම දැනුම්දීම්</string>
+    <string name="also_commented">එවගේම අදහස් දැක්විණි</string>
+    <!-- Pod Activity -->
+    <string name="do_you_want_to_exit">ඔබට පිටවීමට ඇවැසිද?</string>
+    <!-- Drawer, Menu, Toolbar, ContextMenu -->
+    <string name="more">තව</string>
+    <string name="help_license">පිළිබඳව | උපකාර</string>
+    <string name="public_activities">ප්‍රසිද්ධ ක්‍රියාකාරකම්</string>
+    <string name="reports">වාර්තා</string>
+    <string name="share_screenshot_of_webpage">වියමන පිටුවෙහි තිරසේයාවක් බෙදාගන්න</string>
+    <string name="take_screenshot_of_webpage">වියමන පිටුවෙහි තිර සේයාවක් අරගන්න</string>
+    <string name="saving_screenshot_as">ලෙස තිරසේයාව සුරකින්න:</string>
+    <string name="link_adress_copied">සබැඳියේ ලිපිනය පිටපත් විය…</string>
+    <string name="exit_app">යෙදුමෙන් පිටවන්න</string>
+    <string name="share_dotdotdot">බෙදාගන්න…</string>
+    <string name="please_add_a_name">නමක් එකතු කරන්න</string>
+    <string name="share_link_address">සබැඳියේ ලිපිනය බෙදාගන්න</string>
+    <string name="open_in_external_browser">බාහිර අතිරික්සුවකින් විවෘත කරන්න…</string>
+    <string name="copy_link_adress_to_clipboard">සබැඳිය පසුරුපුවරුවට පිටපත් කරන්න</string>
+    <!-- More from MainActivity -->
+    <!-- Permissions -->
+    <string name="protocol">කෙටුම්පත</string>
+    <string name="show_title">සිරැසිය පෙන්වන්න</string>
+    <!-- Operability -->
+    <!-- Category Titles -->
+    <string name="network">ජාලය</string>
+    <!-- Visuals -->
+    <!-- Navigiation Slider -->
+    <string name="user">පරිශීලක</string>
+    <string name="admin">පරිපාලක</string>
+    <!-- Themes -->
+    <string name="theme_and_colors">තේමාව සහ වර්ණ</string>
+    <!-- Notifications dropdown -->
+    <string name="language">භාෂාව</string>
+    <string name="system_language">පද්ධතියේ භාෂාව</string>
+    <!-- Font size -->
+    <string name="font_size">මුද්‍රණඅකුරේ ප්‍රමාණය</string>
+    <string name="normal">සාමාන්‍ය</string>
+    <!-- Load images -->
+    <!-- Screen rotation -->
+    <string name="default_">පෙරනිමි</string>
+    <!-- Proxy -->
+    <string name="proxy">පෙරකලාසිය</string>
+    <string name="enable_proxy">පෙරකලාසිය සබල කරන්න</string>
+    <!-- Chrome custom tabs -->
+    <!-- Diaspora Settings -->
+    <string name="change_account">ගිණුම වෙනස් කරන්න</string>
+    <!-- More -->
+    <string name="about">පිලිබඳව</string>
+    <string name="license">බලපත්‍රය</string>
+    <string name="application">යෙදුම</string>
+    <string name="device">උපාංගය</string>
+    <string name="android_version_witharg">ඇන්ඩ්‍රොයිඩ් අනුවාදය: %1$s</string>
+    <string name="device_name_witharg">උපාංගයේ නම: %1$s</string>
+    <string name="code_name_witharg">කේතනාමය: %1$s</string>
+    <string name="get_the_source">මූලාශ්‍රය ගන්න</string>
+    <string name="translate_the_app">යෙදුම පරිවර්තනය කරන්න!</string>
+    <string name="share_the_app">යෙදුම බෙදාගන්න</string>
+    <!-- License & help (large amount of text) -->
+    <string name="gnu_gplv3_license">ජීඑන්යූ ජීපීඑල්v3+ බලපත්‍රය</string>
+    <string name="youtube_links">යූටියුබ් සබැඳිය</string>
+</resources>

app/src/main/res/values-sr-rRS/strings.xml

@@ -35,5 +35,4 @@
     <string name="contributors">Pomo\'nici</string>
     <string name="gnu_gplv3_license">Prikazi GNU GPLv3 licence</string>
     <string name="show_third_party_licenses">Prikaz licence trecih lica</string>
-    <string name="donate">Doniraj</string>
 </resources>

app/src/main/res/values-sr/strings.xml

@@ -37,5 +37,4 @@
     <!-- License & help (large amount of text) -->
     <string name="maintainers">Програмери</string>
     <string name="contributors">Сарадници</string>
-    <string name="donate">Doniraj</string>
 </resources>

app/src/main/res/values-sv/strings.xml

@@ -46,7 +46,7 @@
     <string name="take_screenshot_of_webpage">Ta skärmdump av en webbsida</string>
     <string name="saving_image_to">Sparar bild som</string>
     <string name="saving_screenshot_as">Sparar skärmdump som:</string>
-    <string name="link_adress_copied">Länkadress kopierad&#8230;</string>
+    <string name="link_adress_copied">Länkadressen kopierades ...</string>
     <string name="new_post">Nytt inlägg</string>
     <string name="go_to_top">Till toppen</string>
     <string name="search_by_tags_or_persons__appspecific">Sök på taggar eller personer</string>
@@ -59,7 +59,7 @@
     <string name="share_link_address">Dela länkadress</string>
     <string name="save_image">Spara bild</string>
     <string name="share_image">Dela bild</string>
-    <string name="open_in_external_browser">Öppna i en extern webbläsare&#8230;</string>
+    <string name="open_in_external_browser">Öppna i en extern webbläsare...</string>
     <string name="copy_link_adress_to_clipboard">Kopiera länkadress</string>
     <string name="copy_image_address_to_clipboard">Kopiera bildadressen</string>
     <!-- More from MainActivity -->
@@ -210,6 +210,4 @@
     <string name="change_the_theme_of_your_account">Ändra temat för ditt konto</string>
     <string name="pull_to_refresh">Dra för att uppdatera</string>
     <string name="pulling_down_on_top_of_page_to_refresh">Dra ner på toppen av sidan för att uppdatera.\nDu måste starta om appen för att ändringarna ska träda i kraft.</string>
-    <string name="donate">Donera</string>
-    <string name="do_you_like_this_project_want_donate_to_keep_alive">Gillar du detta projektet? Vill du att det förbättras och att buggar åtgärdas snabbt?\n\nAtt utveckla appar och skriva relaterade blogginlägg tar mycket tid! Om du vill hjälpa till så att projektet kan fortgå så kan du överväga att ge en liten donation!\n\nDetta projektet utvecklas av volontärer på fritiden och är helt utan reklam!</string>
 </resources>

app/src/main/res/values-th/strings.xml

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Application -->
+    <!-- Common Words -->
+    <!-- Notifications dropdown menu -->
+    <!-- Pod Activity -->
+    <!-- Drawer, Menu, Toolbar, ContextMenu -->
+    <!-- More from MainActivity -->
+    <!-- Permissions -->
+    <!-- Operability -->
+    <!-- Category Titles -->
+    <!-- Visuals -->
+    <!-- Navigiation Slider -->
+    <!-- Themes -->
+    <!-- Notifications dropdown -->
+    <!-- Font size -->
+    <!-- Load images -->
+    <!-- Screen rotation -->
+    <!-- Proxy -->
+    <!-- Chrome custom tabs -->
+    <!-- Diaspora Settings -->
+    <!-- More -->
+    <!-- License & help (large amount of text) -->
+</resources>

app/src/main/res/values-tr/strings.xml

@@ -207,6 +207,4 @@
     <string name="change_the_theme_of_your_account">Hesabınızın temasını değiştirin</string>
     <string name="pull_to_refresh">Yenilemek için çek</string>
     <string name="pulling_down_on_top_of_page_to_refresh">Yenilemek için sayfanın üst kısmından çekin\nDeğişikliklerin geçerli olması için uygulamayı yeniden başlat.</string>
-    <string name="donate">Bağış yap</string>
-    <string name="do_you_like_this_project_want_donate_to_keep_alive">Bu projeyi beğendiniz mi? Projenin iyileştirilmesini ve sorunların çözülmesini istiyor musunuz?\n\nUygulama geliştirmek ve onunla ilgili blog gönderileri yazmak çok zaman alıyor! Projenin devam edebilmesi için yardım etmek istiyorsanız, lütfen küçük bir bağış yapmayı düşünün!\n\nBu proje boş zamanlarımda, tamamen ücretsiz ve reklamsız olarak geliştirilmiştir!</string>
 </resources>

app/src/main/res/values-uk/strings.xml

@@ -210,6 +210,4 @@
     <string name="change_the_theme_of_your_account">Змінити тему вашого облікового запису</string>
     <string name="pull_to_refresh">Потягніть, щоб оновити</string>
     <string name="pulling_down_on_top_of_page_to_refresh">Потягніть сторінку згори вниз, щоб оновити.\nВам потрібно перезавантажити застосунок, щоб зміни набрали сили.</string>
-    <string name="donate">Пожертвувати</string>
-    <string name="do_you_like_this_project_want_donate_to_keep_alive">Вам подобається цей проект? Бажаєте, щоб його покращували й виправляли помилки? \n\nРозробка застосунків та написання пов\'язаних статей у блозі займає багато часу! Якщо ви хочете допомогти цьому проекту розвиватися далі — зробіть маленьке пожертвування!\n\nЦей проект розроблений у вільний час, не містить реклами та є абсолютно безкоштовним!</string>
 </resources>

app/src/main/res/values-zh-rCN/strings.xml

@@ -210,6 +210,4 @@
     <string name="change_the_theme_of_your_account">更改您的帐户的主题</string>
     <string name="pull_to_refresh">下拉刷新</string>
     <string name="pulling_down_on_top_of_page_to_refresh">在页面顶部下拉刷新。\n您需要重新启动应用程序以使更改生效。</string>
-    <string name="donate">捐赠</string>
-    <string name="do_you_like_this_project_want_donate_to_keep_alive">你喜欢这个项目吗？你想要它得到改善并解决问题吗？\n\n开发应用并撰写相关博客文章需要花费大量时间！如果你想要帮助项目继续进行，请考虑小额捐赠！\n\n这个项目是在闲暇时间开发的，完全免费且没有任何广告！</string>
 </resources>

app/src/main/res/values-zh-rTW/strings.xml

@@ -202,6 +202,7 @@
     <string name="tell_me_more">再多說一些</string>
     <string name="enable_to_open_youtube_links_on_external_app">使用其他應用程式來開啟 Youtube 連結</string>
     <string name="youtube_links">Youtube 連結</string>
-    <string name="donate">贊助</string>
+    <string name="change_the_theme_of_your_account">修改帳號的佈景主題</string>
-    <string name="do_you_like_this_project_want_donate_to_keep_alive">喜歡這個專案嗎？希望它繼續改善而且問題得到解決嗎？\n\n開發應用程式以及撰寫相關部落格文章都需要很多時間！如果你想要幫忙讓專案可以繼續，請考慮小額捐款！\n\n這個專案是在閒暇時間開發的，完全免費，並且沒有任何廣告！</string>
+    <string name="pull_to_refresh">下拉可更新</string>
+    <string name="pulling_down_on_top_of_page_to_refresh">從頁面的上方下拉一下可以更新內容。\n這個設定修改後需要重啟應用程式才會生效。</string>
 </resources>

app/src/main/res/values/strings-not_translatable.xml

@@ -13,9 +13,6 @@
     <string name="tor" translatable="false">Tor</string>
     <string name="HTTP" translatable="false">HTTP</string>
 
-    <string name="donate_" translatable="false">@string/donate</string>
-    <string name="app_donate_url" translatable="false"><![CDATA[https://gsantner.net/supportme/?project=markor&source=inapp_supdon]]></string>
-
     <string name="action_compose_new_post" translatable="false">@string/new_post</string>
     <string name="search_alert_title" translatable="false">@string/search</string>
     <string name="http" translatable="false">http</string>
@@ -40,10 +37,6 @@
 
 
     <string name="not_implemented" translatable="false">not_implemented</string>
-    <string name="donate__bitcoin_id" translatable="false">@string/not_implemented</string>
-    <string name="donate__bitcoin_message" translatable="false">@string/not_implemented</string>
-    <string name="donate__bitcoin_amount" translatable="false">@string/not_implemented</string>
-    <string name="donate__bitcoin_url" translatable="false">@string/not_implemented</string>
 
     <!-- Rotation values -->
     <string name="rotation_val_system" translatable="false">auto</string>

app/src/main/res/values/strings.xml

@@ -261,7 +261,4 @@
     <string name="pull_to_refresh">Pull to refresh</string>
     <string name="pulling_down_on_top_of_page_to_refresh">Pulling down on top of page to refresh.\nYou need to restart the app for changes to take effect.</string>
 
-    <string name="donate">Donate</string>
-    <string name="do_you_like_this_project_want_donate_to_keep_alive">Do you like this project? Do you want that it gets improved and problems fixed?\n\nDeveloping apps and writing related blog posts costs a lot of time! If you want to help so that the project can go on, please consider a small donation!\n\nThis project is developed in leisure time, completely for free and without any advertisements!</string>
-
 </resources>

build.gradle

@@ -1,10 +1,7 @@
 /*#######################################################
  *
- *   Maintained by Gregor Santner, 2017-
+ * SPDX-FileCopyrightText: 2017-2023 Gregor Santner <gsantner AT mailbox DOT org>
- *   https://gsantner.net/
+ * SPDX-License-Identifier: Unlicense OR CC0-1.0
- *
- *   License of this file: Apache 2.0 (Commercial upon request)
- *     https://www.apache.org/licenses/LICENSE-2.0
  *
 #########################################################*/
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
@@ -17,8 +14,8 @@ buildscript {
         version_plugin_kotlin = "1.3.72"
         enable_plugin_kotlin = false
 
-        version_compileSdk = 28
+        version_compileSdk = 29
-        version_buildTools = "28.0.3"
+        version_buildTools = "29.0.3"
         version_minSdk = 17
 
         // https://developer.android.com/topic/libraries/support-library/

crowdin.yml

@@ -1,11 +1,14 @@
 # vim: sw=2 ts=2 noexpandtab:
-commit_message: "[ci skip] Crowdin translation bot: New translations for %language%"
+commit_message: "[ci skip] Update translations (%language%)"
 append_commit_message: false
 files:
   - source: /app/src/main/res/values/strings.xml
     translation: /app/src/main/res/values-%android_code%/%original_file_name%
     languages_mapping:
       android_code:
+        az: az    # Azerbaijani
+        ckb: ckb  # Sorani (Kurdish)
+        kmr: kmr  # Kurmanji (Kurdish)
         gl: gl  	# Galician
         sc: sc  	# Sardinian
         kab: kab        # Kabyle
@@ -57,4 +60,11 @@ files:
         ta: ta # Tamil (Asian)
         sq: sq # Albanian
         mk: mk # Macedonian
+        si-LK: si # Sinhala (Sri Lanka)
+        eo: eo # Esperanto
+        or: or # Odia/Oriya (India)
+        hr: hr # Croatia
+        bg: bg # Bulgarian
+        et: et # Estonian
+        th: th # Thai
     translate_attributes: 0

metadata/de/full_description.txt

@@ -12,17 +12,12 @@ Verbessere dein Netzwerk-Erlebnis durch nützliche Features:
 
 🈯 Getrennte App- und Systemsprache. Nutze die App in beliebiger Sprache (zB. Englisch) und behalte deine Systemsprache (zB. Deutsch) bei.
 
-🔐 Du bist noch auf der Suche nach einem Pod um dich zu registrieren? Die App bringt eine große Liste mit und weitere Pods findest du auf <a href="https://podupti.me/">podupti.me</a>.
+🔐 Du bist noch auf der Suche nach einem Pod um dich zu registrieren? Die App bringt eine große Liste mit und weitere Pods findest du auf <a href="https://diaspora.fediverse.observer/">diaspora.fediverse.observer</a>.
 
 🍻 Mehrere Accounts: Nutze dandelion* und <a href="https://f-droid.org/de/packages/net.gsantner.dandelior/">dandelior*</a> um zwei Accounts auf dem gleichen Gerät zu nutzen. Die Apps besitzen eigene Icons und unterschiedliche Vorgabefarben.
 
 🌍 Hinweis: Die App nutzt Androids WebView Komponente um Inhalte von diaspora* Pods in der mobilen Ansicht anzuzeigen. Für fehlende Features frage bitte auf dem diaspora* Bug Tracker.
 
 <b>Weitere Informationen:</b>
-<a href="https://gsantner.net/index.html?project=dandelion&source=fdroid">Projekt Blog</a> | <a href="https://wiki.diasporafoundation.org/FAQ_for_users">diaspora* FAQ</a>
+<a href="https://github.com/gsantner/dandelion">Project site</a> | <a href="https://wiki.diasporafoundation.org/FAQ_for_users">diaspora* FAQ</a>
 
-<b>Unterstütze das Projekt:</b>
-<a href="https://lonamiwebs.github.io/stringlate/translate?git=https%3A%2F%2Fgithub.com%2Fgsantner%2Fdandelion.git&mail=gro.xobliam@@rentnasg">Übersetze mit Stringlate</a> | <a 
-href="https://matrix.to/#/#dandelion:matrix.org">Nimm per Matrix and der Diskussion teil</a> | <a href="https://github.com/gsantner/dandelion#contributions">Mitwirkende</a> | <a 
-href="https://gsantner.net/android-contribution-guide/?packageid=com.github.dfa.diaspora_android&name=dandelion&web=https://github.com/gsantner/dandelion&source=fdroid">Leitfaden zur Mitwirkung</a> 
-| <a href="https://gsantner.net/supportme?project=dandelion&source=fdroid">Unterstütze den Hauptentwickler</a>

metadata/en-US/full_description.txt

@@ -12,14 +12,11 @@ It adds useful features to your networking experience:
 
 🈯 Use in any language that the app is translated in - for example in German but have English as system language.
 
-🔐 Looking for a pod to register? The app lists many pods with more being listed at <a href="https://podupti.me/">podupti.me</a>.
+🔐 Looking for a pod to register? The app lists many pods with more being listed at <a href="https://diaspora.fediverse.observer/">diaspora.fediverse.observer</a>.
 
 🍻 Multiple accounts: You can use dandelion* and dandelior* to use two accounts at the same time on one device. They use a different icon and other default colors.
 
 🌍 Notice: The app uses the Android WebView component to display contents of diaspora* pods in the mobile view. For missing features and bugs in mobile view, ask at diaspora* bugtracker.
 
 <b> More information:</b>
-<a href="https://gsantner.net/index.html?project=dandelion&source=fdroid">Project Blog</a> | <a href="https://wiki.diasporafoundation.org/FAQ_for_users">diaspora* FAQ</a>
+<a href="https://github.com/gsantner/dandelion">Project site</a> | <a href="https://wiki.diasporafoundation.org/FAQ_for_users">diaspora* FAQ</a>
-
-<b>Support the project:</b>
-<a href="https://lonamiwebs.github.io/stringlate/translate?git=https%3A%2F%2Fgithub.com%2Fgsantner%2Fdandelion.git&mail=gro.xobliam@@rentnasg">Translate using Stringlate</a> | <a href="https://matrix.to/#/#dandelion:matrix.org">Join discussion on Matrix</a> | <a href="https://github.com/gsantner/dandelion#contributions">Contribution information</a> | <a href="https://gsantner.net/android-contribution-guide/?packageid=com.github.dfa.diaspora_android&name=dandelion&web=https://github.com/gsantner/dandelion&source=fdroid">Android Contribution Guide</a> | <a href="https://gsantner.net/supportme?project=dandelion&source=fdroid">Support main developer</a>