qwe/keepass2android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'bug-2366-ssh-debug-logging_master' into custom-sftp-private-key_patches

Browse Source
This commit is contained in:
Rick Brown
2023-07-19 17:12:53 -04:00
parent da5533ef3b da3665c25b
commit 006f5497e5
80 changed files with 6431 additions and 1508 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/java/android-filechooser-AS/app/src/main/java/keepass2android/kp2afilechooser/Kp2aFileProvider.java
View File

@@ -529,7 +529,7 @@ public abstract class Kp2aFileProvider extends BaseFileProvider {
* parameters.
*/
private MatrixCursor doRetrieveFileInfo(Uri uri) {
Log.d(CLASSNAME, "retrieve file info "+uri.toString());
MatrixCursor matrixCursor = BaseFileProviderUtils.newBaseFileCursor();
String filename = extractFile(uri);

8
src/java/android-filechooser-AS/app/src/main/res/values-de/strings.xml
View File

@@ -56,15 +56,15 @@
<string name="afc_title_sort_by">Sortieren nach…</string>
<string name="afc_yesterday">Gestern</string>
<plurals name="afc_title_choose_directories">
<item quantity="one">Verzeichnis wählen&#8230;</item>
<item quantity="one">Ordner wählen …</item>
<item quantity="other">Verzeichnisse wählen&#8230;</item>
</plurals>
<plurals name="afc_title_choose_files">
<item quantity="one">Datei wählen&#8230;</item>
<item quantity="other">Dateien wählen&#8230;</item>
<item quantity="other">Dateien wählen …</item>
</plurals>
<plurals name="afc_title_choose_files_directories">
<item quantity="one">Datei/Ordner wählen&#8230;</item>
<item quantity="other">Dateien/Ordner wählen&#8230;</item>
<item quantity="one">Datei/Ordner wählen …</item>
<item quantity="other">Dateien/Ordner wählen …</item>
</plurals>
</resources>

2
src/java/android-filechooser-AS/gradle.properties
View File

@@ -1,2 +1,2 @@
org.gradle.jvmargs=-Xmx1024m
org.gradle.jvmargs=-Xmx1536m
android.useAndroidX=true