Merge branch 'refs/heads/native_map_download_ui'

Author: pstorch

build.gradle

@@ -155,6 +155,7 @@ dependencies {
     }
     implementation libs.vtm.android
     implementation libs.androidsvg
+    implementation libs.jsoup.jsoup
 
     testImplementation libs.junit.jupiter
     testImplementation libs.assertj.core

fastlane/metadata/android/de-DE/changelogs/44.txt

@@ -1,4 +1,5 @@
 - Beschreibung für die Offline-Version geändert
 - Neu: Map und Theme Downloads über Android DownloadManager
+- Neu: Map Download über nativen Dialog (ersetzt WebView)
 - Übersetzungen aktualisiert
 - Abhängigkeiten aktualisiert

fastlane/metadata/android/en-US/changelogs/44.txt

@@ -1,4 +1,5 @@
 - Change description for offline version
-- New: map and theme donwloads use now the Android DownloadManager
+- New: map and theme downloads use now the Android DownloadManager
+- New: map download via native dialog (replaces WebView)
 - Updated translations
 - Updated dependencies

gradle/libs.versions.toml

@@ -16,6 +16,7 @@ material = "1.12.0"
 preferenceKtx = "1.2.1"
 runner = "1.6.2"
 slf4jApi = "2.0.16"
+jsoup = "1.18.1"
 
 [libraries]
 android-test-runner = { module = "de.mannodermaus.junit5:android-test-runner", version.ref = "androidTest" }
@@ -27,6 +28,7 @@ constraintlayout = { module = "androidx.constraintlayout:constraintlayout", vers
 desugar_jdk_libs = { module = "com.android.tools:desugar_jdk_libs", version.ref = "desugar_jdk_libs" }
 documentfile = { module = "androidx.documentfile:documentfile", version.ref = "documentfile" }
 gradle = { module = "com.android.tools.build:gradle", version.ref = "androidGradlePlugin" }
+jsoup-jsoup = { module = "org.jsoup:jsoup", version.ref = "jsoup" }
 junit-jupiter = { module = "org.junit.jupiter:junit-jupiter", version.ref = "junitJupiter" }
 junit-jupiter-api = { module = "org.junit.jupiter:junit-jupiter-api", version.ref = "junitJupiter" }
 junit-jupiter-engine = { module = "org.junit.jupiter:junit-jupiter-engine", version.ref = "junitJupiter" }

src/main/AndroidManifest.xml

@@ -27,8 +27,8 @@
         <activity
             android:name=".settings.SettingsActivity"
             android:label="@string/title_activity_settings" />
-        <activity android:name=".DirectoryChooserActivity$MapDirectoryChooserActivity"/>
-        <activity android:name=".DirectoryChooserActivity$ThemeDirectoryChooserActivity"/>
+        <activity android:name=".settings.DirectoryChooserActivity$MapDirectoryChooserActivity" />
+        <activity android:name=".settings.DirectoryChooserActivity$ThemeDirectoryChooserActivity" />
         <activity
             android:name=".MapsActivity"
             android:launchMode="singleTask"
@@ -48,63 +48,73 @@
             </intent-filter>
         </activity>
         <activity
-            android:name=".DownloadActivity" android:exported="true">
+            android:name=".download.DownloadActivity"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
+
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.BROWSABLE" />
+
                 <data android:scheme="mf-v4-map" />
             </intent-filter>
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
+
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.BROWSABLE" />
+
                 <data android:scheme="mf-theme" />
             </intent-filter>
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
                 <action android:name="android.intent.action.SEND" />
+
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.BROWSABLE" />
+
                 <data android:scheme="http" />
                 <data android:host="download.mapsforge.org" />
-                <data android:pathPattern=".*\\.map"/>
+                <data android:pathPattern=".*\\.map" />
             </intent-filter>
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
                 <action android:name="android.intent.action.SEND" />
+
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.BROWSABLE" />
+
                 <data android:scheme="https" />
                 <data android:host="download.freizeitkarte-osm.de" />
-                <data android:pathPattern="/android/latest/.*\\.map\\.zip"/>
-                <data android:pathPattern="/android/latest/.*\\.zip"/>
+                <data android:pathPattern="/android/latest/.*\\.map\\.zip" />
+                <data android:pathPattern="/android/latest/.*\\.zip" />
             </intent-filter>
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
                 <action android:name="android.intent.action.SEND" />
+
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.BROWSABLE" />
+
                 <data android:scheme="https" />
                 <data android:host="ftp.gwdg.de" />
-                <data android:pathPattern="/pub/misc/openstreetmap/openandromaps/mapsV4/.*\\.zip"/>
+                <data android:pathPattern="/pub/misc/openstreetmap/openandromaps/mapsV4/.*\\.zip" />
             </intent-filter>
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
                 <action android:name="android.intent.action.SEND" />
+
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.BROWSABLE" />
+
                 <data android:scheme="https" />
                 <data android:host="www.openandromaps.org" />
-                <data android:pathPattern="/wp-content/users/tobias/.*\\.zip"/>
+                <data android:pathPattern="/wp-content/users/tobias/.*\\.zip" />
             </intent-filter>
         </activity>
-        <activity
-            android:name=".DownloadMapSelectionActivity" />
-        <activity
-            android:name=".MapSelectionActivity"/>
-        <activity
-            android:name=".ThemeSelectionActivity" />
+        <activity android:name=".download.DownloadMapSelectionActivity" />
+        <activity android:name=".settings.MapSelectionActivity" />
+        <activity android:name=".settings.ThemeSelectionActivity" />
         <activity
             android:name=".ShowErrorActivity"
             android:excludeFromRecents="true"

src/main/java/de/storchp/opentracks/osmplugin/BaseActivity.java

@@ -13,7 +13,7 @@
 
 import de.storchp.opentracks.osmplugin.settings.SettingsActivity;
 
-abstract class BaseActivity extends AppCompatActivity {
+public abstract class BaseActivity extends AppCompatActivity {
 
     public void onCreateOptionsMenu(Menu menu, boolean showInfo) {
         super.onCreateOptionsMenu(menu);

src/main/java/de/storchp/opentracks/osmplugin/DownloadMapSelectionActivity.java

@@ -1,4 +1,4 @@
-package de.storchp.opentracks.osmplugin;
+package de.storchp.opentracks.osmplugin.download;
 
 import android.annotation.SuppressLint;
 import android.app.Activity;
@@ -36,7 +36,10 @@
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipInputStream;
 
+import de.storchp.opentracks.osmplugin.BaseActivity;
+import de.storchp.opentracks.osmplugin.R;
 import de.storchp.opentracks.osmplugin.databinding.ActivityDownloadBinding;
+import de.storchp.opentracks.osmplugin.settings.DirectoryChooserActivity;
 import de.storchp.opentracks.osmplugin.utils.FileUtil;
 import de.storchp.opentracks.osmplugin.utils.PreferencesUtils;
 

src/main/java/de/storchp/opentracks/osmplugin/DownloadActivity.java renamed to src/main/java/de/storchp/opentracks/osmplugin/download/DownloadActivity.java

@@ -0,0 +1,26 @@
+package de.storchp.opentracks.osmplugin.download;
+
+import java.util.Arrays;
+import java.util.Optional;
+
+import de.storchp.opentracks.osmplugin.R;
+
+public enum DownloadItemType {
+    SUBDIR(R.drawable.baseline_folder_24, "[DIR]"), MAP(R.drawable.baseline_map_24, "[   ]");
+
+    private final int iconResId;
+    private final String alt;
+
+    DownloadItemType(int iconResId, String alt) {
+        this.iconResId = iconResId;
+        this.alt = alt;
+    }
+
+    public static Optional<DownloadItemType> ofAlt(String alt) {
+        return Arrays.stream(DownloadItemType.values()).filter(downloadItemType -> downloadItemType.alt.equals(alt)).findFirst();
+    }
+
+    public int getIconResId() {
+        return iconResId;
+    }
+}

src/main/java/de/storchp/opentracks/osmplugin/download/DownloadItemType.java

@@ -0,0 +1,23 @@
+package de.storchp.opentracks.osmplugin.download;
+
+import android.net.Uri;
+
+import androidx.annotation.NonNull;
+
+public record DownloadMapItem(DownloadItemType downloadItemType, String name, String date,
+                              String size, Uri uri) implements Comparable<DownloadMapItem> {
+
+    @NonNull
+    @Override
+    public String toString() {
+        return name();
+    }
+
+    @Override
+    public int compareTo(DownloadMapItem o) {
+        if (downloadItemType != o.downloadItemType) {
+            return downloadItemType.compareTo(o.downloadItemType);
+        }
+        return name.compareTo(o.name);
+    }
+}