Release 1.9.2

https://github.com/coil-kt/coil/issues/159

.github/FUNDING.yml

@@ -1,2 +1,2 @@
 github: johan12345
-custom: 'https://paypal.me/johan98'
+custom: ['https://paypal.me/johan98', 'https://ev-map.app/donate/']

.github/workflows/apikeys-ci.xml

@@ -1,8 +1,11 @@
 <resources>
    <string name="google_maps_key" templateMergeStrategy="preserve" translatable="false">ci</string>
    <string name="mapbox_key" translatable="false">ci</string>
+   <string name="jawg_key" translatable="false">ci</string>
+   <string name="arcgis_key" translatable="false">ci</string>
    <string name="goingelectric_key" translatable="false">ci</string>
    <string name="chargeprice_key" translatable="false">ci</string>
    <string name="openchargemap_key" translatable="false">ci</string>
    <string name="fronyx_key" translatable="false">ci</string>
+   <string name="acra_credentials" translatable="false">ci:ci</string>
 </resources>

.github/workflows/release.yml

@@ -11,18 +11,18 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       - name: Set up Java environment
-        uses: actions/setup-java@v2
+        uses: actions/setup-java@v4
         with:
-          java-version: 11
+          java-version: 17
           distribution: 'zulu'
           cache: 'gradle'
       - name: Decrypt keystore
         run: openssl aes-256-cbc -K  ${{ secrets.encrypted_53968681344a_key }} -iv  ${{ secrets.encrypted_53968681344a_iv }} -in _ci/keystore.jks.enc -out _ci/keystore.jks -d
       - name: Extract version code
-        run: echo "VERSION_CODE=$(grep -o "^\s*versionCode\s\+[0-9]*" app/build.gradle | awk '{ print $2 }' | tr -d \''"\\')" >> $GITHUB_ENV
+        run: echo "VERSION_CODE=$(grep -o "^\s*versionCode\s*=\s*[0-9]\+" app/build.gradle.kts | awk '{ print $3 }' | tr -d \''"\\')" >> $GITHUB_ENV
 
       - name: Build app release
         env:
@@ -30,8 +30,11 @@ jobs:
           OPENCHARGEMAP_API_KEY: ${{ secrets.OPENCHARGEMAP_API_KEY }}
           CHARGEPRICE_API_KEY: ${{ secrets.CHARGEPRICE_API_KEY }}
           MAPBOX_API_KEY: ${{ secrets.MAPBOX_API_KEY }}
+          JAWG_API_KEY: ${{ secrets.JAWG_API_KEY }}
+          ARCGIS_API_KEY: ${{ secrets.ARCGIS_API_KEY }}
           GOOGLE_MAPS_API_KEY: ${{ secrets.GOOGLE_MAPS_API_KEY }}
           FRONYX_API_KEY: ${{ secrets.FRONYX_API_KEY }}
+          ACRA_CRASHREPORT_CREDENTIALS: ${{ secrets.ACRA_CRASHREPORT_CREDENTIALS }}
           KEYSTORE_PASSWORD: ${{ secrets.KEYSTORE_PASSWORD }}
           KEYSTORE_ALIAS: ${{ secrets.KEYSTORE_ALIAS }}
           KEYSTORE_ALIAS_PASSWORD: ${{ secrets.KEYSTORE_ALIAS_PASSWORD }}
@@ -76,3 +79,12 @@ jobs:
           asset_path: app/build/outputs/apk/googleAutomotive/release/app-google-automotive-release.apk
           asset_name: app-google-automotive-release.apk
           asset_content_type: application/vnd.android.package-archive
+      - name: upload Foss Automotive artifact
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ github.token }}
+        with:
+          upload_url: ${{ steps.create_release.outputs.upload_url }}
+          asset_path: app/build/outputs/apk/fossAutomotive/release/app-foss-automotive-release.apk
+          asset_name: app-foss-automotive-release.apk
+          asset_content_type: application/vnd.android.package-archive

.github/workflows/tests.yml

@@ -13,15 +13,15 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        buildvariant: [ FossNormal, GoogleNormal, GoogleAutomotive ]
+        buildvariant: [ FossNormal, FossAutomotive, GoogleNormal, GoogleAutomotive ]
     steps:
       - name: Check out code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       - name: Set up Java environment
-        uses: actions/setup-java@v2
+        uses: actions/setup-java@v4
         with:
-          java-version: 11
+          java-version: 17
           distribution: 'zulu'
           cache: 'gradle'
 
@@ -34,3 +34,5 @@ jobs:
         run: ./gradlew test${{ matrix.buildvariant }}DebugUnitTest --no-daemon
       - name: Run Android Lint
         run: ./gradlew lint${{ matrix.buildvariant }}Debug --no-daemon
+      - name: Check licenses
+        run: ./gradlew exportLibraryDefinitions --no-daemon

.gitignore

@@ -12,4 +12,5 @@ apikeys.xml
 /app/**/*.apk
 /_img/connectors/*.ai
 api-7125266970515251116-798419-8e2dda660c80.json
-output-metadata.json
+output-metadata.json
+licenses_*.csv

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2020-2022 Johan von Forstner
+Copyright (c) 2020-2024 Johan von Forstner and contributors
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -1,7 +1,8 @@
-EVMap [![Build Status](https://github.com/johan12345/EVMap/actions/workflows/tests.yml/badge.svg)](https://github.com/johan12345/EVMap/actions)
+EVMap [![Build Status](https://github.com/ev-map/EVMap/actions/workflows/tests.yml/badge.svg)](https://github.com/ev-map/EVMap/actions)
 =====
 
-<img src="https://raw.githubusercontent.com/johan12345/EVMap/master/_img/feature_graphic.svg" width=700 alt="Logo"/>
+<a href="https://ev-map.app" target="_blank">
+<img src="https://raw.githubusercontent.com/ev-map/EVMap/master/_img/feature_graphic.svg" width=700 alt="Logo"/></a>
 
 Android app to find electric vehicle charging stations.
 
@@ -23,12 +24,13 @@ Features
 - Android Auto & Android Automotive OS integration
 - No ads, fully open source
 - Compatible with Android 5.0 and above
-- Can use Google Maps or Mapbox (OpenStreetMap) as map backends - the version available on F-Droid only uses Mapbox.
+- Can use Google Maps or OpenStreetMap as map backends - the version available on F-Droid only uses
+  OSM.
 
 Screenshots
 -----------
 
-<img src="https://raw.githubusercontent.com/johan12345/EVMap/master/_img/screenshots/phone/en/mapbox/01_map.png" width=250 alt="Screenshot 1"/><img src="https://raw.githubusercontent.com/johan12345/EVMap/master/_img/screenshots/phone/en/mapbox/02_detail.png" width=250 alt="Screenshot 2"/>
+<img src="https://raw.githubusercontent.com/ev-map/EVMap/master/_img/screenshots/phone/en/mapbox/01_map.png" width=250 alt="Screenshot 1"/><img src="https://raw.githubusercontent.com/ev-map/EVMap/master/_img/screenshots/phone/en/mapbox/02_detail.png" width=250 alt="Screenshot 2"/>
 
 Development setup
 -----------------
@@ -36,19 +38,35 @@ Development setup
 The App is developed using Android Studio and should pretty much work out-of-the-box when you clone
 the Git repository and open the project with Android Studio.
 
-The only exception is that you need to obtain some free API keys for the different data sources that
+The only exception is that you need to obtain some API keys for the different data sources that
 EVMap uses and put them into the app in the form of a resource file called `apikeys.xml` under
 `app/src/main/res/values`. You can find more information on which API keys are necessary for which
 features and how they can be obtained in our [documentation page](doc/api_keys.md).
 
-There are three different build flavors, `googleNormal`, `fossNormal` and `googleAutomotive`.
-- The `foss` variant only uses Mapbox data and should run on most Android devices, even without
+There are four different build flavors, `googleNormal`, `fossNormal`, `googleAutomotive`, and
+`fossAutomotive`.
+
+- The `foss` variants only use OSM data and should run on most Android devices, even without
   Google Play Services.
+    - `fossNormal` is intended to run on smartphones and tablets, and also includes the Android
+      Auto app for use on the car display (however Android Auto may not work if the app is not
+      installed from Google Play, see https://github.com/ev-map/EVMap/issues/319).
+    - `fossAutomotive` can be installed directly on
+      [Android Automotive OS (AAOS)](https://source.android.com/docs/automotive/start/what_automotive)
+      headunits without Google services.
+      It does not provide the usual smartphone UI, and requires an implementation of the
+      [AOSP template app host](https://source.android.com/docs/automotive/hmi/aosp_host)
+      to be installed. If you are an OEM and would like to distribute EVMap to your AAOS vehicles,
+      please [get in touch](mailto:evmap@vonforst.net).
 - The `google` variants also include access to Google Maps data.
     - `googleNormal` is intended to run on smartphones and tablets, and also includes the Android
       Auto app for use on the car display.
-    - `googleAutomotive` variant is intended to be installed directly on car infotainment systems
-      using the Google-flavored Android Automotive OS. It does not provide the usual smartphone UI.
+    - `googleAutomotive` can be installed directly on car infotainment systems running the
+      Google-flavored Android Automotive OS (Google Automotive Services /
+      ["Google built-in"](https://built-in.google/cars/)).
+      It does not provide the usual smartphone UI, and requires the
+      [Google Automotive App Host](https://play.google.com/store/apps/details?id=com.google.android.apps.automotive.templates.host)
+      to run, which should be preinstalled on those cars and can be updated through the Play Store.
 
 We also have a special [documentation page](doc/android_auto.md) on how to test the Android Auto
 app.
@@ -60,5 +78,23 @@ You can use our [Weblate page](https://hosted.weblate.org/projects/evmap/) to he
 into new languages.
 
 <a href="https://hosted.weblate.org/engage/evmap/">
-<img src="https://hosted.weblate.org/widgets/evmap/-/open-graph.png" width="500" alt="Translation status" />
+<img src="https://hosted.weblate.org/widgets/evmap/-/open-graph.png" width="400" alt="Translation status" />
 </a>
+
+Sponsors
+--------
+
+Many users currently support the development EVMap with their donations. You can find more
+information on the [Donate page](https://ev-map.app/donate/) on the EVMap website.
+
+<a href="https://www.jawg.io"><img src="https://www.jawg.io/static/Blue@10x-9cdc4596e4e59acbd9ead55e9c28613e.png" alt="JawgMaps" height="58"/></a><br>
+Since May 2024, **JawgMaps** provides their OpenStreetMap vector map tiles service to EVMap for
+free, i.e. the background map displayed in the app if OpenStreetMap is selected as the data source.
+
+<a href="https://chargeprice.app"><img src="https://raw.githubusercontent.com/ev-map/EVMap/master/_img/powered_by_chargeprice.svg" alt="Powered by Chargeprice" height="58"/></a><br>
+Since April 2021, **Chargeprice.app** provide their price comparison API at a greatly reduced
+price for EVMap. This data is used in EVMap's price comparison feature.
+
+<a href="https://fronyx.io/"><img src="https://github.com/ev-map/EVMap/blob/master/_img/powered_by_fronyx.svg" alt="Powered by Fronyx" height="68"/></a><br>
+Since September 2022, for certain charging stations, **Fronyx** provide us free access to their API
+for availability predictions.

_img/connectors/connector_supercharger.svg

@@ -1,23 +1,25 @@
-<svg id="Ebene_5" data-name="Ebene 5" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
-    <defs>
-        <style>.cls-1,.cls-2{fill:none;}.cls-2{stroke:#000;stroke-miterlimit:10;stroke-width:2px;}
-        </style>
-    </defs>
-    <title>connector_supercharger</title>
-    <path class="cls-1" d="M12,12H36V36H12Z" />
-    <path class="cls-2"
-        d="M13.45,17.08a8.24,8.24,0,0,1-3.11.6,8.34,8.34,0,0,1-6-14.18H16.3a8.35,8.35,0,0,1,1.07,10.33" />
-    <circle cx="10.34" cy="9.34" r="1.67" />
-    <circle cx="15.35" cy="9.34" r="1.67" />
-    <circle cx="12.84" cy="13.51" r="1.67" />
-    <circle cx="7.84" cy="13.51" r="1.67" />
-    <circle cx="5.34" cy="9.34" r="1.67" />
-    <circle cx="7.84" cy="5.59" r="1" />
-    <circle cx="12.84" cy="5.59" r="1.04" />
+<?xml version="1.0" encoding="utf-8"?><!-- Generator: Adobe Illustrator 24.3.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Ebene_5" xmlns="http://www.w3.org/2000/svg"
+    xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 24 24"
+    style="enable-background:new 0 0 24 24;" xml:space="preserve">
+<style type="text/css">
+	.st0{display:none;fill:none;}
+	.st1{fill:none;stroke:#000000;stroke-width:2;stroke-miterlimit:10;}
+</style>
+    <path class="st0" d="M12,12h24v24H12V12z" />
+    <path class="st1"
+        d="M6.2,13.8C4.1,10.6,4.6,6.3,7.3,3.5h12c1.5,1.6,2.4,3.7,2.4,5.9c0,4.6-3.8,8.3-8.4,8.3c-1.1,0-2.1-0.2-3.1-0.6" />
+    <circle cx="13.3" cy="9.3" r="1.7" />
+    <circle cx="8.3" cy="9.3" r="1.7" />
+    <circle cx="10.8" cy="13.5" r="1.7" />
+    <circle cx="15.8" cy="13.5" r="1.7" />
+    <circle cx="18.3" cy="9.3" r="1.7" />
+    <circle cx="15.8" cy="5.6" r="1" />
+    <circle cx="10.8" cy="5.6" r="1" />
     <g id="T">
-        <path id="path35"
-            d="M18.18,22.23l1-5.48c.93,0,1.22.1,1.27.52a2.15,2.15,0,0,0,.93-.7,6.91,6.91,0,0,0-2.46-.6l-.71.88h0L17.46,16a7,7,0,0,0-2.46.6,2.22,2.22,0,0,0,.94.7c0-.42.33-.52,1.26-.52l1,5.48" />
-        <path id="path37"
-            d="M18.18,15.72a7.9,7.9,0,0,1,3.28.66,2.65,2.65,0,0,0,.2-.4,9.24,9.24,0,0,0-7,0,2.61,2.61,0,0,0,.19.4,7.94,7.94,0,0,1,3.29-.66h0" />
-    </g>
-</svg>
+	<path id="path35" d="M5.4,22.3l1-5.5c0.9,0,1.3,0.1,1.3,0.5c0.4-0.1,0.7-0.4,0.9-0.7C7.8,16.3,7,16,6.1,16l-0.8,0.8l0,0L4.7,16
+		c-0.8,0-1.7,0.3-2.5,0.6c0.2,0.3,0.6,0.6,0.9,0.7c0.1-0.4,0.3-0.5,1.3-0.5L5.4,22.3" />
+        <path id="path37" d="M5.5,15.7L5.5,15.7c1.1,0,2.3,0.2,3.3,0.7c0.1-0.1,0.1-0.3,0.2-0.4c-2.2-0.9-4.8-0.9-7,0
+		c0.1,0.1,0.1,0.3,0.2,0.4C3.2,15.9,4.3,15.7,5.5,15.7" />
+</g>
+</svg>

_img/ic_launcher-playstore.svg

@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg id="Ebene_2" data-name="Ebene 2" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512">
+    <defs>
+        <style>
+            .cls-1 {
+            fill: #00e676;
+            }
+
+            .cls-1, .cls-2, .cls-3, .cls-4, .cls-5, .cls-6, .cls-7, .cls-8 {
+            stroke-width: 0px;
+            }
+
+            .cls-2 {
+            fill: rgba(255, 255, 255, .2);
+            }
+
+            .cls-3 {
+            fill: #ffb300;
+            }
+
+            .cls-4 {
+            fill: #000;
+            isolation: isolate;
+            opacity: .45;
+            }
+
+            .cls-5 {
+            fill: #fff;
+            }
+
+            .cls-6 {
+            fill: #90a4ae;
+            }
+
+            .cls-7 {
+            fill: #546e7a;
+            }
+
+            .cls-8 {
+            fill: rgba(62, 39, 35, .2);
+            }
+        </style>
+    </defs>
+    <g id="Layer_1" data-name="Layer 1">
+        <g>
+            <rect class="cls-5" width="512" height="512" />
+            <g>
+                <g>
+                    <path class="cls-3"
+                        d="M159.42,338.98l-6.43-56.15-9.81,1.01,6.43,56.15,9.81-1.01ZM194.26,334.92l-6.43-56.15-9.81,1.01,6.43,56.15,9.81-1.01Z" />
+                    <path class="cls-6"
+                        d="M212.53,411.37c-3.04,3.72-5.41,6.09-5.75,6.43-8.79,7.1-15.9,9.13-21.65,6.43-10.15-5.07-9.47-24.02-9.13-26.05l7.1.34c-.34,5.41.68,16.91,5.41,19.28,2.71,1.35,7.44-.34,13.53-5.41h0s19.62-19.62,15.56-35.18c-4.74-18.6,16.91-45.33,24.02-54.46l1.01-1.01,5.75,4.4-1.01,1.35c-21.99,27.06-24.35,40.93-22.66,48.03,3.38,13.53-5.75,28.08-12.18,35.85Z" />
+                    <path class="cls-6"
+                        d="M137.78,338.3l2.71,23,21.31,14.21,28.75-3.04,17.59-18.6-2.71-23-67.65,7.44Z" />
+                    <path class="cls-7"
+                        d="M190.21,372.47l-28.75,3.04,6.09,25.37,22.66-2.71v-25.71h0ZM210.84,311.58l2.37,20.97-82.53,9.47-2.37-20.97,82.53-9.47Z" />
+                </g>
+                <g>
+                    <g>
+                        <path class="cls-1"
+                            d="M275.45,80.22c-59.19,0-107.23,48.03-107.23,107.23,0,80.84,90.31,123.12,101.14,238.47.34,3.38,3.04,5.75,6.43,5.75s6.09-2.37,6.43-5.75c10.82-115.34,101.14-157.63,101.14-238.47-.68-59.53-48.71-107.23-107.9-107.23Z" />
+                        <path class="cls-2"
+                            d="M275.45,82.58c58.86,0,106.55,47.36,107.23,105.87v-1.01c0-59.19-48.03-107.23-107.23-107.23s-107.23,47.69-107.23,107.23v1.01c.68-58.52,48.37-105.87,107.23-105.87h0Z" />
+                        <path class="cls-8"
+                            d="M281.87,423.21c-.34,3.38-3.04,5.75-6.43,5.75s-6.09-2.37-6.43-5.75c-10.49-115.01-100.12-157.29-100.8-237.12v1.69c0,80.84,90.31,123.12,101.14,238.47.34,3.38,3.04,5.75,6.43,5.75s6.09-2.37,6.43-5.75c10.82-115.34,101.14-157.63,101.14-238.47v-1.69c-1.35,79.83-90.99,122.11-101.48,237.12h0Z" />
+                    </g>
+                    <path class="cls-4"
+                        d="M250.75,135.01v64.94h17.59v53.11l41.27-71.03h-23.68l23.68-47.36c.34.34-58.86.34-58.86.34Z" />
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>

_tools/export_licenses_faurecia.py

@@ -0,0 +1,23 @@
+import subprocess
+import json
+
+build_types = ["fossNormalRelease", "fossAutomotiveRelease"]
+
+for build_type in build_types:
+    result = subprocess.run(["gradlew.bat", f"generateLibraryDefinitions{build_type.capitalize()}"],
+                            capture_output=True)
+
+    data = json.load(
+        open(f"app/build/generated/aboutLibraries/{build_type}/res/raw/aboutlibraries.json"))
+
+    with open(f"licenses_{build_type}.csv", "w") as f:
+        f.write("component_name;license_title;license_url;public_repository;copyrights\n")
+        for lib in data["libraries"]:
+            license = data["licenses"][lib["licenses"][0]] if len(lib["licenses"]) > 0 else None
+            license_name = license["name"] if license is not None else " "
+            license_url = license["url"] if license is not None else " "
+            copyrights = ", ".join([dev["name"] for dev in lib["developers"] if "name" in dev])
+            if copyrights == "":
+                copyrights = " "
+            repo_url = lib['scm']['url'] if 'scm' in lib else ''
+            f.write(f"{lib['name']};{license_name};{license_url};\"{copyrights}\";{repo_url}\n")

app/build.gradle

@@ -1,278 +0,0 @@
-plugins {
-    id 'com.adarshr.test-logger' version '3.1.0'
-}
-
-apply plugin: 'com.android.application'
-apply plugin: 'kotlin-android'
-apply plugin: 'kotlin-parcelize'
-apply plugin: 'kotlin-kapt'
-apply plugin: 'androidx.navigation.safeargs.kotlin'
-apply plugin: 'com.mikepenz.aboutlibraries.plugin'
-apply plugin: 'de.timfreiheit.resourceplaceholders'
-
-def supportedLocales = "en,de,fr,nb-rNO"
-
-android {
-    compileSdkVersion 33
-    buildToolsVersion "30.0.3"
-
-    defaultConfig {
-        applicationId "net.vonforst.evmap"
-        minSdkVersion 21
-        targetSdkVersion 33
-        // NOTE: always increase versionCode by 2 since automotive flavor uses versionCode + 1
-        versionCode 156
-        versionName "1.4.4"
-
-        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
-        resConfigs supportedLocales.split(",")
-        buildConfigField("String", "supportedLocales", '"' + supportedLocales + '"')
-    }
-
-    signingConfigs {
-        release {
-            def isRunningOnCI = System.getenv("CI") == "true"
-            if (isRunningOnCI) {
-                // configure keystore
-                storeFile = file("../_ci/keystore.jks")
-                storePassword = System.getenv("KEYSTORE_PASSWORD")
-                keyAlias = System.getenv("KEYSTORE_ALIAS")
-                keyPassword = System.getenv("KEYSTORE_ALIAS_PASSWORD")
-            }
-        }
-    }
-
-    buildTypes {
-        release {
-            minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
-            signingConfig signingConfigs.release
-        }
-        debug {
-            applicationIdSuffix ".debug"
-            debuggable true
-        }
-    }
-
-    flavorDimensions "dependencies", "automotive"
-    productFlavors {
-        foss {
-            dimension "dependencies"
-        }
-        google {
-            dimension "dependencies"
-            versionNameSuffix "-google"
-        }
-        normal {
-            dimension "automotive"
-        }
-        automotive {
-            dimension "automotive"
-            versionNameSuffix "-automotive"
-            versionCode defaultConfig.versionCode + 1
-            minSdkVersion 29
-        }
-    }
-    variantFilter { variant ->
-        def names = variant.flavors*.name
-        // Android Automotive OS app is always based on Google variant
-        if (names.contains("automotive") && !names.contains("google")) {
-            setIgnore(true)
-        }
-    }
-
-    compileOptions {
-        coreLibraryDesugaringEnabled true
-        targetCompatibility = JavaVersion.VERSION_1_8
-        sourceCompatibility = JavaVersion.VERSION_1_8
-    }
-
-    kotlinOptions {
-        jvmTarget = JavaVersion.VERSION_1_8.toString()
-    }
-
-    buildFeatures {
-        dataBinding = true
-        viewBinding true
-    }
-    lint {
-        disable 'NullSafeMutableLiveData'
-        warning 'MissingTranslation'
-    }
-
-    testOptions {
-        unitTests.includeAndroidResources true
-    }
-
-    resourcePlaceholders {
-        files = ['xml/shortcuts.xml']
-    }
-    namespace 'net.vonforst.evmap'
-
-    // add API keys from environment variable if not set in apikeys.xml
-    applicationVariants.all { variant ->
-        ext.env = System.getenv()
-        def goingelectricKey = env.GOINGELECTRIC_API_KEY ?: project.findProperty("GOINGELECTRIC_API_KEY")
-        if (goingelectricKey != null) {
-            variant.resValue "string", "goingelectric_key", goingelectricKey
-        }
-        def openchargemapKey = env.OPENCHARGEMAP_API_KEY ?: project.findProperty("OPENCHARGEMAP_API_KEY")
-        if (openchargemapKey == null && project.hasProperty("OPENCHARGEMAP_API_KEY_ENCRYPTED")) {
-            openchargemapKey = decode(project.findProperty("OPENCHARGEMAP_API_KEY_ENCRYPTED"), "FmK.d,-f*p+rD+WK!eds")
-        }
-        if (openchargemapKey != null) {
-            variant.resValue "string", "openchargemap_key", openchargemapKey
-        }
-        def googleMapsKey = env.GOOGLE_MAPS_API_KEY ?: project.findProperty("GOOGLE_MAPS_API_KEY")
-        if (googleMapsKey != null && variant.flavorName.startsWith('google')) {
-            variant.resValue "string", "google_maps_key", googleMapsKey
-        }
-        def mapboxKey = env.MAPBOX_API_KEY ?: project.findProperty("MAPBOX_API_KEY")
-        if (mapboxKey == null && project.hasProperty("MAPBOX_API_KEY_ENCRYPTED")) {
-            mapboxKey = decode(project.findProperty("MAPBOX_API_KEY_ENCRYPTED"), "FmK.d,-f*p+rD+WK!eds")
-        }
-        if (mapboxKey != null) {
-            variant.resValue "string", "mapbox_key", mapboxKey
-        }
-        def chargepriceKey = env.CHARGEPRICE_API_KEY ?: project.findProperty("CHARGEPRICE_API_KEY")
-        if (chargepriceKey == null && project.hasProperty("CHARGEPRICE_API_KEY_ENCRYPTED")) {
-            chargepriceKey = decode(project.findProperty("CHARGEPRICE_API_KEY_ENCRYPTED"), "FmK.d,-f*p+rD+WK!eds")
-        }
-        if (chargepriceKey != null) {
-            variant.resValue "string", "chargeprice_key", chargepriceKey
-        }
-        def fronyxKey = env.FRONYX_API_KEY ?: project.findProperty("FRONYX_API_KEY")
-        if (fronyxKey == null && project.hasProperty("FRONYX_API_KEY_ENCRYPTED")) {
-            fronyxKey = decode(project.findProperty("FRONYX_API_KEY_ENCRYPTED"), "FmK.d,-f*p+rD+WK!eds")
-        }
-        if (fronyxKey != null) {
-            variant.resValue "string", "fronyx_key", fronyxKey
-        }
-    }
-
-}
-
-configurations {
-    googleNormalImplementation {}
-    googleAutomotiveImplementation {}
-}
-
-dependencies {
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-    implementation 'androidx.appcompat:appcompat:1.6.0-rc01'
-    implementation 'androidx.core:core-ktx:1.9.0'
-    implementation 'androidx.core:core-splashscreen:1.0.0'
-    implementation "androidx.activity:activity-ktx:1.6.1"
-    implementation "androidx.fragment:fragment-ktx:1.5.5"
-    implementation 'androidx.cardview:cardview:1.0.0'
-    implementation 'androidx.preference:preference-ktx:1.2.0'
-    implementation 'com.google.android.material:material:1.7.0'
-    implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
-    implementation 'androidx.recyclerview:recyclerview:1.2.1'
-    implementation 'androidx.browser:browser:1.4.0'
-    implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'
-    implementation 'com.github.johan12345:CustomBottomSheetBehavior:f4f641aab5'
-    implementation 'com.squareup.retrofit2:retrofit:2.9.0'
-    implementation 'com.squareup.retrofit2:converter-moshi:2.9.0'
-    implementation 'com.squareup.okhttp3:okhttp:4.9.0'
-    implementation 'com.squareup.okhttp3:okhttp-urlconnection:4.9.0'
-    implementation 'com.squareup.moshi:moshi-kotlin:1.13.0'
-    implementation 'com.squareup.moshi:moshi-adapters:1.13.0'
-    implementation 'com.markomilos.jsonapi:jsonapi-retrofit:1.1.0'
-    implementation 'io.coil-kt:coil:1.1.0'
-    implementation 'com.github.johan12345:StfalconImageViewer:5082ebd392'
-    implementation "com.mikepenz:aboutlibraries-core:$about_libs_version"
-    implementation "com.mikepenz:aboutlibraries:$about_libs_version"
-    implementation 'com.airbnb.android:lottie:4.1.0'
-    implementation 'io.michaelrocks.bimap:bimap:1.1.0'
-    implementation 'com.google.guava:guava:29.0-android'
-    implementation 'com.github.pengrad:mapscaleview:1.6.0'
-    implementation 'com.github.romandanylyk:PageIndicatorView:b1bad589b5'
-
-    // Android Auto
-    def carAppVersion = '1.3.0-rc01'
-    googleImplementation "androidx.car.app:app:$carAppVersion"
-    googleNormalImplementation "androidx.car.app:app-projected:$carAppVersion"
-    googleAutomotiveImplementation "androidx.car.app:app-automotive:$carAppVersion"
-
-    // AnyMaps
-    def anyMapsVersion = 'a9b3dd7d99'
-    implementation "com.github.johan12345.AnyMaps:anymaps-base:$anyMapsVersion"
-    googleImplementation "com.github.johan12345.AnyMaps:anymaps-google:$anyMapsVersion"
-    googleImplementation 'com.google.android.gms:play-services-maps:18.1.0'
-    implementation("com.github.johan12345.AnyMaps:anymaps-mapbox:$anyMapsVersion") {
-        exclude group: 'com.mapbox.mapboxsdk', module: 'mapbox-android-accounts'
-        exclude group: 'com.mapbox.mapboxsdk', module: 'mapbox-android-telemetry'
-        exclude group: 'com.google.android.gms', module: 'play-services-location'
-        exclude group: 'com.mapbox.mapboxsdk', module: 'mapbox-android-core'
-    }
-    // patched version of mapbox-android-core that removes build-time dependency on GMS
-    implementation 'com.github.johan12345:mapbox-events-android:a21c324501'
-
-    // Google Places
-    googleImplementation 'com.google.android.libraries.places:places:2.7.0'
-    googleImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-play-services:1.6.1'
-
-    // Mapbox Geocoding
-    implementation 'com.mapbox.mapboxsdk:mapbox-sdk-services:5.5.0'
-
-    // navigation library
-    implementation "androidx.navigation:navigation-fragment-ktx:$nav_version"
-    implementation "androidx.navigation:navigation-ui-ktx:$nav_version"
-
-    // viewmodel library
-    def lifecycle_version = "2.5.1"
-    implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version"
-    implementation "androidx.lifecycle:lifecycle-livedata-ktx:$lifecycle_version"
-
-    // room library
-    def room_version = "2.4.3"
-    implementation "androidx.room:room-runtime:$room_version"
-    kapt "androidx.room:room-compiler:$room_version"
-    implementation "androidx.room:room-ktx:$room_version"
-
-    // billing library
-    def billing_version = "5.1.0"
-    googleImplementation "com.android.billingclient:billing:$billing_version"
-    googleImplementation "com.android.billingclient:billing-ktx:$billing_version"
-
-    // ACRA (crash reporting)
-    def acraVersion = "5.8.4"
-    implementation("ch.acra:acra-mail:$acraVersion")
-    implementation("ch.acra:acra-dialog:$acraVersion")
-    implementation("ch.acra:acra-limiter:$acraVersion")
-
-    // debug tools
-    implementation 'com.facebook.stetho:stetho:1.6.0'
-    implementation 'com.facebook.stetho:stetho-okhttp3:1.6.0'
-
-    // testing
-    testImplementation 'junit:junit:4.13.2'
-    testImplementation "com.squareup.okhttp3:mockwebserver:4.9.0"
-    //noinspection GradleDependency
-    testImplementation 'org.json:json:20080701'
-
-    // testing for car app
-    testGoogleImplementation "androidx.car.app:app-testing:$carAppVersion"
-    testGoogleImplementation 'org.robolectric:robolectric:4.9'
-    testGoogleImplementation 'androidx.test:core:1.5.0'
-
-    androidTestImplementation 'androidx.test.ext:junit:1.1.4'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.0'
-
-    kapt "com.squareup.moshi:moshi-kotlin-codegen:1.13.0"
-
-    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.2.2'
-}
-
-private static String decode(String s, String key) {
-    return new String(xorWithKey(s.decodeBase64(), key.getBytes()), "UTF-8");
-}
-
-private static byte[] xorWithKey(byte[] a, byte[] key) {
-    byte[] out = new byte[a.length];
-    for (int i = 0; i < a.length; i++) {
-        out[i] = (byte) (a[i] ^ key[i%key.length]);
-    }
-    return out;
-}

app/build.gradle.kts

@@ -0,0 +1,398 @@
+import java.util.Base64
+
+plugins {
+    id("com.adarshr.test-logger") version "3.1.0"
+    id("com.android.application")
+    id("kotlin-android")
+    id("kotlin-parcelize")
+    id("kotlin-kapt")
+    id("androidx.navigation.safeargs.kotlin")
+    id("com.mikepenz.aboutlibraries.plugin")
+}
+
+
+android {
+    useLibrary("android.car")
+
+    defaultConfig {
+        applicationId = "net.vonforst.evmap"
+        compileSdk = 34
+        minSdk = 21
+        targetSdk = 34
+        // NOTE: always increase versionCode by 2 since automotive flavor uses versionCode + 1
+        versionCode = 222
+        versionName = "1.9.2"
+
+        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
+    }
+
+    signingConfigs {
+        create("release") {
+            val isRunningOnCI = System.getenv("CI") == "true"
+            if (isRunningOnCI) {
+                // configure keystore
+                storeFile = file("../_ci/keystore.jks")
+                storePassword = System.getenv("KEYSTORE_PASSWORD")
+                keyAlias = System.getenv("KEYSTORE_ALIAS")
+                keyPassword = System.getenv("KEYSTORE_ALIAS_PASSWORD")
+            }
+        }
+    }
+
+    buildTypes {
+        release {
+            isMinifyEnabled = false
+            proguardFiles(
+                getDefaultProguardFile("proguard-android-optimize.txt"),
+                "proguard-rules.pro"
+            )
+            signingConfig = signingConfigs.getByName("release")
+        }
+        create("releaseAutomotivePackageName") {
+            // Faurecia Aptoide requires the automotive variant to use a separate package name
+            initWith(getByName("release"))
+            applicationIdSuffix = ".automotive"
+        }
+        debug {
+            applicationIdSuffix = ".debug"
+            isDebuggable = true
+        }
+    }
+
+    sourceSets {
+        getByName("releaseAutomotivePackageName").setRoot("src/release")
+    }
+
+    flavorDimensions += listOf("dependencies", "automotive")
+    productFlavors {
+        create("foss") {
+            dimension = "dependencies"
+        }
+        create("google") {
+            dimension = "dependencies"
+            versionNameSuffix = "-google"
+        }
+        create("normal") {
+            dimension = "automotive"
+        }
+        create("automotive") {
+            dimension = "automotive"
+            versionNameSuffix = "-automotive"
+            versionCode = defaultConfig.versionCode!! + 1
+            minSdk = 29
+        }
+    }
+
+    compileOptions {
+        isCoreLibraryDesugaringEnabled = true
+        targetCompatibility = JavaVersion.VERSION_1_8
+        sourceCompatibility = JavaVersion.VERSION_1_8
+    }
+
+    kotlinOptions {
+        jvmTarget = JavaVersion.VERSION_1_8.toString()
+    }
+
+    tasks.withType<org.jetbrains.kotlin.gradle.tasks.KaptGenerateStubs>().configureEach {
+        kotlinOptions {
+            jvmTarget = "1.8"
+        }
+    }
+
+    buildFeatures {
+        dataBinding = true
+        viewBinding = true
+        buildConfig = true
+    }
+    lint {
+        disable += listOf("NullSafeMutableLiveData")
+        warning += listOf("MissingTranslation")
+    }
+    androidResources {
+        generateLocaleConfig = true
+    }
+
+    testOptions {
+        unitTests {
+            isIncludeAndroidResources = true
+        }
+    }
+
+    namespace = "net.vonforst.evmap"
+
+    // add API keys from environment variable if not set in apikeys.xml
+    applicationVariants.all {
+        val goingelectricKey =
+            System.getenv("GOINGELECTRIC_API_KEY") ?: project.findProperty("GOINGELECTRIC_API_KEY")
+                ?.toString()
+        if (goingelectricKey != null) {
+            resValue("string", "goingelectric_key", goingelectricKey)
+        }
+        var openchargemapKey =
+            System.getenv("OPENCHARGEMAP_API_KEY") ?: project.findProperty("OPENCHARGEMAP_API_KEY")
+                ?.toString()
+        if (openchargemapKey == null && project.hasProperty("OPENCHARGEMAP_API_KEY_ENCRYPTED")) {
+            openchargemapKey = decode(
+                project.findProperty("OPENCHARGEMAP_API_KEY_ENCRYPTED").toString(),
+                "FmK.d,-f*p+rD+WK!eds"
+            )
+        }
+        if (openchargemapKey != null) {
+            resValue("string", "openchargemap_key", openchargemapKey)
+        }
+        val googleMapsKey =
+            System.getenv("GOOGLE_MAPS_API_KEY") ?: project.findProperty("GOOGLE_MAPS_API_KEY")
+                ?.toString()
+        if (googleMapsKey != null && flavorName.startsWith("google")) {
+            resValue("string", "google_maps_key", googleMapsKey)
+        }
+        var mapboxKey =
+            System.getenv("MAPBOX_API_KEY") ?: project.findProperty("MAPBOX_API_KEY")?.toString()
+        if (mapboxKey == null && project.hasProperty("MAPBOX_API_KEY_ENCRYPTED")) {
+            mapboxKey = decode(
+                project.findProperty("MAPBOX_API_KEY_ENCRYPTED").toString(),
+                "FmK.d,-f*p+rD+WK!eds"
+            )
+        }
+        if (mapboxKey != null) {
+            resValue("string", "mapbox_key", mapboxKey)
+        }
+        var jawgKey =
+            System.getenv("JAWG_API_KEY") ?: project.findProperty("JAWG_API_KEY")?.toString()
+        if (jawgKey == null && project.hasProperty("JAWG_API_KEY_ENCRYPTED")) {
+            jawgKey = decode(
+                project.findProperty("JAWG_API_KEY_ENCRYPTED").toString(),
+                "FmK.d,-f*p+rD+WK!eds"
+            )
+        }
+        if (jawgKey != null) {
+            resValue("string", "jawg_key", jawgKey)
+        }
+        var arcgisKey =
+            System.getenv("ARCGIS_API_KEY") ?: project.findProperty("ARCGIS_API_KEY")?.toString()
+        if (arcgisKey == null && project.hasProperty("ARCGIS_API_KEY_ENCRYPTED")) {
+            arcgisKey = decode(
+                project.findProperty("ARCGIS_API_KEY_ENCRYPTED").toString(),
+                "FmK.d,-f*p+rD+WK!eds"
+            )
+        }
+        if (arcgisKey != null) {
+            resValue("string", "arcgis_key", jawgKey)
+        }
+        var chargepriceKey =
+            System.getenv("CHARGEPRICE_API_KEY") ?: project.findProperty("CHARGEPRICE_API_KEY")
+                ?.toString()
+        if (chargepriceKey == null && project.hasProperty("CHARGEPRICE_API_KEY_ENCRYPTED")) {
+            chargepriceKey = decode(
+                project.findProperty("CHARGEPRICE_API_KEY_ENCRYPTED").toString(),
+                "FmK.d,-f*p+rD+WK!eds"
+            )
+        }
+        if (chargepriceKey != null) {
+            resValue("string", "chargeprice_key", chargepriceKey)
+        }
+        var fronyxKey =
+            System.getenv("FRONYX_API_KEY") ?: project.findProperty("FRONYX_API_KEY")?.toString()
+        if (fronyxKey == null && project.hasProperty("FRONYX_API_KEY_ENCRYPTED")) {
+            fronyxKey = decode(
+                project.findProperty("FRONYX_API_KEY_ENCRYPTED").toString(),
+                "FmK.d,-f*p+rD+WK!eds"
+            )
+        }
+        if (fronyxKey != null) {
+            resValue("string", "fronyx_key", fronyxKey)
+        }
+        var acraKey = System.getenv("ACRA_CRASHREPORT_CREDENTIALS")
+            ?: project.findProperty("ACRA_CRASHREPORT_CREDENTIALS")?.toString()
+        if (acraKey == null && project.hasProperty("ACRA_CRASHREPORT_CREDENTIALS_ENCRYPTED")) {
+            acraKey = decode(
+                project.findProperty("ACRA_CRASHREPORT_CREDENTIALS_ENCRYPTED").toString(),
+                "FmK.d,-f*p+rD+WK!eds"
+            )
+        }
+        if (acraKey != null) {
+            resValue("string", "acra_credentials", acraKey)
+        }
+    }
+
+    packaging {
+        jniLibs {
+            pickFirsts.addAll(
+                listOf(
+                    "lib/x86/libc++_shared.so",
+                    "lib/arm64-v8a/libc++_shared.so",
+                    "lib/x86_64/libc++_shared.so",
+                    "lib/armeabi-v7a/libc++_shared.so"
+                )
+            )
+        }
+    }
+}
+
+androidComponents {
+    beforeVariants { variantBuilder ->
+        if (variantBuilder.buildType == "releaseAutomotivePackageName"
+            && !variantBuilder.productFlavors.containsAll(
+                listOf(
+                    "automotive" to "automotive",
+                    "dependencies" to "foss"
+                )
+            )
+        ) {
+            // releaseAutomotivePackageName type is only needed for fossAutomotive
+            variantBuilder.enable = false
+        }
+    }
+}
+
+configurations {
+    create("googleNormalImplementation") {}
+    create("googleAutomotiveImplementation") {}
+}
+
+aboutLibraries {
+    allowedLicenses = arrayOf(
+        "Apache-2.0", "mit", "BSD-2-Clause", "BSD-3-Clause", "EPL-1.0",
+        "asdkl",  // Android SDK
+        "Dual OpenSSL and SSLeay License",  // Android NDK OpenSSL
+        "Google Maps Platform Terms of Service",  // Google Maps SDK
+        "provided without support or warranty",  // org.json
+        "Unicode/ICU License",  // icu4j
+        "Bouncy Castle Licence",  // bcprov
+        "CDDL + GPLv2 with classpath exception",  // javax.annotation-api
+    )
+    strictMode = com.mikepenz.aboutlibraries.plugin.StrictMode.FAIL
+}
+
+dependencies {
+    val kotlinVersion: String by rootProject.extra
+    val aboutLibsVersion: String by rootProject.extra
+    val navVersion: String by rootProject.extra
+    val normalImplementation by configurations
+    val googleImplementation by configurations
+    val automotiveImplementation by configurations
+    val fossImplementation by configurations
+    val testGoogleImplementation by configurations
+
+    implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlinVersion")
+    implementation("androidx.appcompat:appcompat:1.7.0")
+    implementation("androidx.core:core-ktx:1.13.1")
+    implementation("androidx.core:core-splashscreen:1.0.1")
+    implementation("androidx.activity:activity-ktx:1.9.0")
+    implementation("androidx.fragment:fragment-ktx:1.7.1")
+    implementation("androidx.cardview:cardview:1.0.0")
+    implementation("androidx.preference:preference-ktx:1.2.1")
+    implementation("com.google.android.material:material:1.12.0")
+    implementation("androidx.constraintlayout:constraintlayout:2.1.4")
+    implementation("androidx.recyclerview:recyclerview:1.3.2")
+    implementation("androidx.browser:browser:1.8.0")
+    implementation("androidx.swiperefreshlayout:swiperefreshlayout:1.1.0")
+    implementation("androidx.security:security-crypto:1.1.0-alpha06")
+    implementation("androidx.work:work-runtime-ktx:2.9.0")
+    implementation("com.github.ev-map:CustomBottomSheetBehavior:e48f73ea7b")
+    implementation("com.squareup.retrofit2:retrofit:2.9.0")
+    implementation("com.squareup.retrofit2:converter-moshi:2.9.0")
+    implementation("com.squareup.okhttp3:okhttp:4.12.0")
+    implementation("com.squareup.okhttp3:okhttp-urlconnection:4.12.0")
+    implementation("com.squareup.moshi:moshi-kotlin:1.15.0")
+    implementation("com.squareup.moshi:moshi-adapters:1.15.0")
+    implementation("com.markomilos.jsonapi:jsonapi-retrofit:1.1.0")
+    implementation("io.coil-kt:coil:2.6.0")
+    implementation("com.github.ev-map:StfalconImageViewer:5082ebd392")
+    implementation("com.mikepenz:aboutlibraries-core:$aboutLibsVersion")
+    implementation("com.mikepenz:aboutlibraries:$aboutLibsVersion")
+    implementation("com.airbnb.android:lottie:4.1.0")
+    implementation("io.michaelrocks.bimap:bimap:1.1.0")
+    implementation("com.google.guava:guava:29.0-android")
+    implementation("com.github.pengrad:mapscaleview:1.6.0")
+    implementation("com.github.romandanylyk:PageIndicatorView:b1bad589b5")
+
+    // Android Auto
+    val carAppVersion = "1.4.0"
+    implementation("androidx.car.app:app:$carAppVersion")
+    normalImplementation("androidx.car.app:app-projected:$carAppVersion")
+    automotiveImplementation("androidx.car.app:app-automotive:$carAppVersion")
+
+    // AnyMaps
+    val anyMapsVersion = "a5b9abca40"
+    implementation("com.github.ev-map.AnyMaps:anymaps-base:$anyMapsVersion")
+    googleImplementation("com.github.ev-map.AnyMaps:anymaps-google:$anyMapsVersion")
+    googleImplementation("com.google.android.gms:play-services-maps:18.2.0")
+    implementation("com.github.ev-map.AnyMaps:anymaps-maplibre:$anyMapsVersion") {
+        // duplicates classes from mapbox-sdk-services
+        exclude("org.maplibre.gl", "android-sdk-geojson")
+    }
+
+    // Google Places
+    googleImplementation("com.google.android.libraries.places:places:3.5.0")
+    googleImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-play-services:1.7.3")
+
+    // Mapbox Geocoding
+    implementation("com.mapbox.mapboxsdk:mapbox-sdk-services:5.5.0")
+
+    // navigation library
+    implementation("androidx.navigation:navigation-fragment-ktx:$navVersion")
+    implementation("androidx.navigation:navigation-ui-ktx:$navVersion")
+
+    // viewmodel library
+    val lifecycle_version = "2.8.1"
+    implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version")
+    implementation("androidx.lifecycle:lifecycle-livedata-ktx:$lifecycle_version")
+
+    // room library
+    val room_version = "2.6.1"
+    implementation("androidx.room:room-runtime:$room_version")
+    kapt("androidx.room:room-compiler:$room_version")
+    implementation("androidx.room:room-ktx:$room_version")
+    implementation("com.github.anboralabs:spatia-room:0.2.9") {
+        exclude(group = "com.github.dalgarins", module = "android-spatialite")
+    }
+    implementation("com.github.EV-map:android-spatialite:e5495c83ad")  // version with minSdk increased to 21 & FORTIFY_SOURCE enabled
+
+    // billing library
+    val billing_version = "7.0.0"
+    googleImplementation("com.android.billingclient:billing:$billing_version")
+    googleImplementation("com.android.billingclient:billing-ktx:$billing_version")
+
+    // ACRA (crash reporting)
+    val acraVersion = "5.11.1"
+    implementation("ch.acra:acra-http:$acraVersion")
+    implementation("ch.acra:acra-dialog:$acraVersion")
+    implementation("ch.acra:acra-limiter:$acraVersion")
+
+    // debug tools
+    debugImplementation("com.facebook.flipper:flipper:0.238.0")
+    debugImplementation("com.facebook.soloader:soloader:0.10.5")
+    debugImplementation("com.facebook.flipper:flipper-network-plugin:0.238.0")
+
+    // testing
+    testImplementation("junit:junit:4.13.2")
+    testImplementation("com.squareup.okhttp3:mockwebserver:4.12.0")
+    //noinspection GradleDependency
+    testImplementation("org.json:json:20080701")
+    testImplementation("org.robolectric:robolectric:4.11.1")
+    testImplementation("androidx.test:core:1.5.0")
+    testImplementation("androidx.arch.core:core-testing:2.2.0")
+    testImplementation("androidx.car.app:app-testing:$carAppVersion")
+    testImplementation("androidx.test:core:1.5.0")
+
+    androidTestImplementation("androidx.test.ext:junit:1.1.5")
+    androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1")
+    androidTestImplementation("androidx.arch.core:core-testing:2.2.0")
+
+    kapt("com.squareup.moshi:moshi-kotlin-codegen:1.15.0")
+
+    coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:2.0.4")
+}
+
+fun decode(s: String, key: String): String {
+    return String(xorWithKey(Base64.getDecoder().decode(s), key.toByteArray()), Charsets.UTF_8)
+}
+
+fun xorWithKey(a: ByteArray, key: ByteArray): ByteArray {
+    val out = ByteArray(a.size)
+    for (i in a.indices) {
+        out[i] = (a[i].toInt() xor key[i % key.size].toInt()).toByte()
+    }
+    return out
+}

app/lint.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<lint>
+    <issue id="MissingQuantity">
+        <ignore regexp=".*?Czech.*?many" />
+    </issue>
+</lint>

app/proguard-rules.pro

@@ -1,6 +1,6 @@
 # Add project specific ProGuard rules here.
 # You can control the set of applied configuration files using the
-# proguardFiles setting in build.gradle.
+# proguardFiles setting in build.gradle.kts.
 #
 # For more details, see
 #   http://developer.android.com/guide/developing/tools/proguard.html

app/src/androidTest/java/com/johan/evmap/ExampleInstrumentedTest.kt

@@ -1,24 +0,0 @@
-package com.johan.evmap
-
-import androidx.test.platform.app.InstrumentationRegistry
-import androidx.test.ext.junit.runners.AndroidJUnit4
-
-import org.junit.Test
-import org.junit.runner.RunWith
-
-import org.junit.Assert.*
-
-/**
- * Instrumented test, which will execute on an Android device.
- *
- * See [testing documentation](http://d.android.com/tools/testing).
- */
-@RunWith(AndroidJUnit4::class)
-class ExampleInstrumentedTest {
-    @Test
-    fun useAppContext() {
-        // Context of the app under test.
-        val appContext = InstrumentationRegistry.getInstrumentation().targetContext
-        assertEquals("com.johan.evmap", appContext.packageName)
-    }
-}

app/src/androidTest/java/com/johan/evmap/storage/SavedRegionDaoTest.kt

@@ -0,0 +1,95 @@
+package com.johan.evmap.storage
+
+import android.content.Context
+import androidx.arch.core.executor.testing.InstantTaskExecutorRule
+import androidx.test.core.app.ApplicationProvider
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import co.anbora.labs.spatia.geometry.Mbr
+import co.anbora.labs.spatia.geometry.MultiPolygon
+import kotlinx.coroutines.runBlocking
+import net.vonforst.evmap.storage.AppDatabase
+import net.vonforst.evmap.storage.SavedRegion
+import net.vonforst.evmap.storage.SavedRegionDao
+import net.vonforst.evmap.utils.distanceBetween
+import net.vonforst.evmap.viewmodel.await
+import org.junit.After
+import org.junit.Assert.*
+import org.junit.Before
+import org.junit.Rule
+import org.junit.Test
+import org.junit.runner.RunWith
+import java.time.ZoneOffset
+import java.time.ZonedDateTime
+
+@RunWith(AndroidJUnit4::class)
+class SavedRegionDaoTest {
+    private lateinit var database: AppDatabase
+    private lateinit var dao: SavedRegionDao
+
+    @get:Rule
+    var instantExecutorRule = InstantTaskExecutorRule()
+
+    @Before
+    fun setUp() {
+        val context = ApplicationProvider.getApplicationContext<Context>()
+        database = AppDatabase.createInMemory(context)
+        dao = database.savedRegionDao()
+    }
+
+    @After
+    fun tearDown() {
+        database.close()
+    }
+
+    @Test
+    fun testGetSavedRegion() {
+        val ds = "test"
+
+        val ts1 = ZonedDateTime.of(2023, 1, 1, 0, 0, 0, 0, ZoneOffset.UTC).toInstant()
+        val region1 = Mbr(9.0, 53.0, 10.0, 54.0, 4326).asPolygon()
+        runBlocking {
+            dao.insert(
+                SavedRegion(
+                    region1,
+                    ds, ts1, null, false
+                )
+            )
+        }
+        assertEquals(region1, dao.getSavedRegion(ds, 0))
+        runBlocking {
+            assertTrue(dao.savedRegionCovers(53.1, 53.2, 9.1, 9.2, ds, 0).await())
+            assertTrue(dao.savedRegionCoversRadius(53.05, 9.15, 10.0, ds, 0).await())
+            assertFalse(dao.savedRegionCovers(52.1, 52.2, 9.1, 9.2, ds, 0).await())
+        }
+
+        val ts2 = ZonedDateTime.of(2023, 1, 1, 1, 0, 0, 0, ZoneOffset.UTC).toInstant()
+        val region2 = Mbr(9.0, 55.0, 10.0, 56.0, 4326).asPolygon()
+        runBlocking {
+            dao.insert(
+                SavedRegion(
+                    region2,
+                    ds, ts2, null, false
+                )
+            )
+        }
+        assertEquals(MultiPolygon(listOf(region1, region2)), dao.getSavedRegion(ds, 0))
+        assertEquals(region2, dao.getSavedRegion(ds, ts1.toEpochMilli()))
+
+        runBlocking {
+            assertTrue(dao.savedRegionCovers(53.1, 53.2, 9.1, 9.2, ds, 0).await())
+            assertTrue(dao.savedRegionCoversRadius(53.05, 9.15, 10.0, ds, 0).await())
+            assertFalse(dao.savedRegionCovers(53.1, 55.2, 9.1, 9.2, ds, 0).await())
+        }
+    }
+
+    @Test
+    fun testMakeCircle() {
+        val lat = 53.0
+        val lng = 10.0
+        val radius = 10000.0
+        val circle = runBlocking { dao.makeCircle(lat, lng, radius) }
+        for (point in circle.points) {
+            assertEquals(radius, distanceBetween(lat, lng, point.y, point.x), 10.0)
+        }
+    }
+}

app/src/automotive/AndroidManifest.xml

@@ -54,6 +54,13 @@
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+                <data android:scheme="net.vonforst.evmap" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+            </intent-filter>
 
             <meta-data
                 android:name="distractionOptimized"

app/src/automotive/java/net/vonforst/evmap/auto/CarInfo.kt

@@ -0,0 +1,171 @@
+import android.car.Car
+import android.car.VehiclePropertyIds
+import android.car.VehicleUnit
+import android.car.hardware.CarPropertyValue
+import android.car.hardware.property.CarPropertyManager
+import android.car.hardware.property.CarPropertyManager.CarPropertyEventCallback
+import androidx.annotation.OptIn
+import androidx.car.app.CarContext
+import androidx.car.app.annotations.ExperimentalCarApi
+import androidx.car.app.hardware.CarHardwareManager
+import androidx.car.app.hardware.common.CarUnit
+import androidx.car.app.hardware.common.CarValue
+import androidx.car.app.hardware.common.OnCarDataAvailableListener
+import androidx.car.app.hardware.info.CarInfo
+import androidx.car.app.hardware.info.EnergyLevel
+import androidx.car.app.hardware.info.EnergyProfile
+import androidx.car.app.hardware.info.EvStatus
+import androidx.car.app.hardware.info.Mileage
+import androidx.car.app.hardware.info.Model
+import androidx.car.app.hardware.info.Speed
+import androidx.car.app.hardware.info.TollCard
+import java.util.concurrent.Executor
+
+
+val CarContext.patchedCarInfo: CarInfo
+    get() = CarInfoWrapper(this)
+
+class CarInfoWrapper(ctx: CarContext) : CarInfo {
+    private val wrapped =
+        (ctx.getCarService(CarContext.HARDWARE_SERVICE) as CarHardwareManager).carInfo
+    private val carPropertyManager = try {
+        val car = Car.createCar(ctx)
+        car.getCarManager(Car.PROPERTY_SERVICE) as CarPropertyManager
+    } catch (e: NoClassDefFoundError) {
+        null
+    }
+    private val callbacks = mutableMapOf<OnCarDataAvailableListener<*>, CarPropertyEventCallback>()
+
+    override fun fetchModel(executor: Executor, listener: OnCarDataAvailableListener<Model>) =
+        wrapped.fetchModel(executor, listener)
+
+    override fun fetchEnergyProfile(
+        executor: Executor,
+        listener: OnCarDataAvailableListener<EnergyProfile>
+    ) = wrapped.fetchEnergyProfile(executor, listener)
+
+    override fun addTollListener(
+        executor: Executor,
+        listener: OnCarDataAvailableListener<TollCard>
+    ) = wrapped.addTollListener(executor, listener)
+
+    override fun removeTollListener(listener: OnCarDataAvailableListener<TollCard>) =
+        wrapped.removeTollListener(listener)
+
+    override fun addEnergyLevelListener(
+        executor: Executor,
+        listener: OnCarDataAvailableListener<EnergyLevel>
+    ) = wrapped.addEnergyLevelListener(executor, listener)
+
+    override fun removeEnergyLevelListener(listener: OnCarDataAvailableListener<EnergyLevel>) =
+        wrapped.removeEnergyLevelListener(listener)
+
+    override fun addSpeedListener(executor: Executor, listener: OnCarDataAvailableListener<Speed>) {
+        // TODO: This is a emporary workaround until Car App Library 1.7.0 is released - previous versions would crash if the car reported an invalid speed display unit
+        carPropertyManager ?: return
+        val callback = object : CarPropertyEventCallback {
+            private var speedRaw: CarPropertyValue<Float>? = null
+            private var speedDisplay: CarPropertyValue<Float>? = null
+            private var speedUnit: CarPropertyValue<Int>? = null
+
+            override fun onChangeEvent(value: CarPropertyValue<*>?) {
+                when (value?.propertyId) {
+                    VehiclePropertyIds.PERF_VEHICLE_SPEED -> speedRaw =
+                        value as CarPropertyValue<Float>?
+
+                    VehiclePropertyIds.PERF_VEHICLE_SPEED_DISPLAY -> speedDisplay =
+                        value as CarPropertyValue<Float>?
+
+                    VehiclePropertyIds.VEHICLE_SPEED_DISPLAY_UNITS -> speedUnit =
+                        value as CarPropertyValue<Int>?
+                }
+
+                executor.execute {
+                    listener.onCarDataAvailable(Speed.Builder().apply {
+                        speedRaw?.let {
+                            setRawSpeedMetersPerSecond(
+                                CarValue(
+                                    it.value,
+                                    it.timestamp,
+                                    if (it.value != null) CarValue.STATUS_SUCCESS else CarValue.STATUS_UNKNOWN
+                                )
+                            )
+                        }
+                        speedDisplay?.let {
+                            setDisplaySpeedMetersPerSecond(
+                                CarValue(
+                                    it.value,
+                                    it.timestamp,
+                                    if (it.value != null) CarValue.STATUS_SUCCESS else CarValue.STATUS_UNKNOWN
+                                )
+                            )
+                        }
+                        speedUnit?.let {
+                            val unit = when (it.value) {
+                                VehicleUnit.METER_PER_SEC -> CarUnit.METERS_PER_SEC
+                                VehicleUnit.MILES_PER_HOUR -> CarUnit.MILES_PER_HOUR
+                                VehicleUnit.KILOMETERS_PER_HOUR -> CarUnit.KILOMETERS_PER_HOUR
+                                else -> null
+                            }
+                            setSpeedDisplayUnit(
+                                CarValue(
+                                    unit,
+                                    it.timestamp,
+                                    if (unit != null) CarValue.STATUS_SUCCESS else CarValue.STATUS_UNKNOWN
+                                )
+                            )
+                        }
+                    }.build())
+                }
+            }
+
+            override fun onErrorEvent(propertyId: Int, areaId: Int) {
+                listener.onCarDataAvailable(
+                    Speed.Builder()
+                        .setRawSpeedMetersPerSecond(CarValue(null, 0, CarValue.STATUS_UNKNOWN))
+                        .setDisplaySpeedMetersPerSecond(CarValue(null, 0, CarValue.STATUS_UNKNOWN))
+                        .setSpeedDisplayUnit(CarValue(null, 0, CarValue.STATUS_UNKNOWN))
+                        .build()
+                )
+            }
+        }
+        carPropertyManager.registerCallback(
+            callback,
+            VehiclePropertyIds.PERF_VEHICLE_SPEED,
+            CarPropertyManager.SENSOR_RATE_NORMAL
+        )
+        carPropertyManager.registerCallback(
+            callback,
+            VehiclePropertyIds.PERF_VEHICLE_SPEED_DISPLAY,
+            CarPropertyManager.SENSOR_RATE_NORMAL
+        )
+        carPropertyManager.registerCallback(
+            callback,
+            VehiclePropertyIds.VEHICLE_SPEED_DISPLAY_UNITS,
+            CarPropertyManager.SENSOR_RATE_NORMAL
+        )
+    }
+
+    override fun removeSpeedListener(listener: OnCarDataAvailableListener<Speed>) {
+        val callback = callbacks[listener] ?: return
+        carPropertyManager?.unregisterCallback(callback)
+    }
+
+    override fun addMileageListener(
+        executor: Executor,
+        listener: OnCarDataAvailableListener<Mileage>
+    ) = wrapped.addMileageListener(executor, listener)
+
+    override fun removeMileageListener(listener: OnCarDataAvailableListener<Mileage>) =
+        wrapped.removeMileageListener(listener)
+
+    @OptIn(ExperimentalCarApi::class)
+    override fun addEvStatusListener(
+        executor: Executor,
+        listener: OnCarDataAvailableListener<EvStatus>
+    ) = wrapped.addEvStatusListener(executor, listener)
+
+    @OptIn(ExperimentalCarApi::class)
+    override fun removeEvStatusListener(listener: OnCarDataAvailableListener<EvStatus>) =
+        wrapped.removeEvStatusListener(listener)
+}

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

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="grant_on_phone">Povolit</string>
+    <string name="auto_location_permission_needed">Pro spuštění aplikace EVMap ve vašem autě musíte povolit přístup k vaší poloze.</string>
+</resources>

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

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="grant_on_phone">Toestaan</string>
+    <string name="auto_location_permission_needed">Om EVmap te gebruiken in je wagen, moet je toegang geven tot je locatie.</string>
+</resources>

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

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="grant_on_phone">Permitir</string>
+    <string name="auto_location_permission_needed">Para usar o EVMap no seu carro, permita o acesso à sua localização.</string>
+</resources>

app/src/automotive/res/values-ro/strings.xml

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources></resources>

app/src/debug/AndroidManifest.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <application>
+        <activity
+            android:name="com.facebook.flipper.android.diagnostics.FlipperDiagnosticActivity"
+            android:exported="true" />
+    </application>
+</manifest>

app/src/debug/java/net/vonforst/evmap/DebugInits.kt

@@ -0,0 +1,42 @@
+package net.vonforst.evmap
+
+import android.content.Context
+import android.os.Build
+import com.facebook.flipper.android.AndroidFlipperClient
+import com.facebook.flipper.plugins.databases.DatabasesFlipperPlugin
+import com.facebook.flipper.plugins.inspector.DescriptorMapping
+import com.facebook.flipper.plugins.inspector.InspectorFlipperPlugin
+import com.facebook.flipper.plugins.network.FlipperOkhttpInterceptor
+import com.facebook.flipper.plugins.network.NetworkFlipperPlugin
+import com.facebook.flipper.plugins.sharedpreferences.SharedPreferencesFlipperPlugin
+import com.facebook.soloader.SoLoader
+import okhttp3.OkHttpClient
+
+private val networkFlipperPlugin = NetworkFlipperPlugin()
+
+fun addDebugInterceptors(context: Context) {
+    if (Build.FINGERPRINT == "robolectric") return
+
+    SoLoader.init(context, false)
+    val client = AndroidFlipperClient.getInstance(context)
+    client.addPlugin(InspectorFlipperPlugin(context, DescriptorMapping.withDefaults()))
+    client.addPlugin(networkFlipperPlugin)
+    client.addPlugin(DatabasesFlipperPlugin(context))
+    client.addPlugin(SharedPreferencesFlipperPlugin(context))
+    client.start()
+}
+
+fun OkHttpClient.Builder.addDebugInterceptors(): OkHttpClient.Builder {
+    // Flipper does not work during unit tests - so check whether we are running tests first
+    var isRunningTest = true
+    try {
+        Class.forName("org.junit.Test")
+    } catch (e: ClassNotFoundException) {
+        isRunningTest = false
+    }
+    
+    if (!isRunningTest) {
+        this.addNetworkInterceptor(FlipperOkhttpInterceptor(networkFlipperPlugin))
+    }
+    return this
+}

app/src/foss/java/net/vonforst/evmap/Inits.kt

@@ -3,10 +3,12 @@ package net.vonforst.evmap
 import android.app.Activity
 import android.content.Context
 
+@Suppress("UNUSED_PARAMETER")
 fun init(context: Context) {
 
 }
 
+@Suppress("UNUSED_PARAMETER")
 fun checkPlayServices(activity: Activity): Boolean {
     return true
 }

app/src/foss/java/net/vonforst/evmap/fragment/DonateFragment.kt

@@ -12,9 +12,11 @@ import com.google.android.material.transition.MaterialSharedAxis
 import net.vonforst.evmap.MapsActivity
 import net.vonforst.evmap.R
 import net.vonforst.evmap.databinding.FragmentDonateBinding
+import net.vonforst.evmap.databinding.FragmentDonateReferralBinding
 
-class DonateFragment : Fragment() {
+class DonateFragment : DonateFragmentBase() {
     private lateinit var binding: FragmentDonateBinding
+    private lateinit var referrals: FragmentDonateReferralBinding
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -28,6 +30,7 @@ class DonateFragment : Fragment() {
         savedInstanceState: Bundle?
     ): View {
         binding = FragmentDonateBinding.inflate(inflater, container, false)
+        referrals = binding.referrals
         return binding.root
     }
 
@@ -42,5 +45,7 @@ class DonateFragment : Fragment() {
         binding.btnDonate.setOnClickListener {
             (activity as? MapsActivity)?.openUrl(getString(R.string.paypal_link))
         }
+
+        setupReferrals(referrals)
     }
 }

app/src/foss/java/net/vonforst/evmap/fragment/OnboardingFragment.kt

@@ -1,16 +0,0 @@
-package net.vonforst.evmap.fragment
-
-import androidx.fragment.app.Fragment
-import androidx.viewpager2.adapter.FragmentStateAdapter
-
-class OnboardingViewPagerAdapter(fragment: Fragment) :
-    FragmentStateAdapter(fragment) {
-    override fun getItemCount(): Int = 3
-
-    override fun createFragment(position: Int): Fragment = when (position) {
-        0 -> WelcomeFragment()
-        1 -> IconsFragment()
-        2 -> DataSourceSelectFragment()
-        else -> throw IllegalArgumentException()
-    }
-}

app/src/foss/res/layout/fragment_donate.xml

@@ -1,18 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/linearLayout2"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    android:orientation="vertical">
 
     <com.google.android.material.appbar.AppBarLayout
         android:id="@+id/toolbar_container"
-        android:layout_width="0dp"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:fitsSystemWindows="true"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent">
+        android:fitsSystemWindows="true">
 
         <androidx.appcompat.widget.Toolbar
             android:id="@+id/toolbar"
@@ -21,31 +19,55 @@
 
     </com.google.android.material.appbar.AppBarLayout>
 
-    <Button
-        android:id="@+id/btnDonate"
-        style="@style/Widget.Material3.Button.Icon"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="24dp"
-        android:text="@string/donate_paypal"
-        app:icon="@drawable/ic_paypal"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/textView20" />
+    <ScrollView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
 
-    <TextView
-        android:id="@+id/textView20"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="16dp"
-        android:layout_marginTop="16dp"
-        android:layout_marginEnd="16dp"
-        android:text="@string/donations_info"
-        app:layout_constraintBottom_toTopOf="@+id/btnDonate"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.5"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/toolbar_container"
-        app:layout_constraintVertical_chainStyle="packed" />
-</androidx.constraintlayout.widget.ConstraintLayout>
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:layout_height="wrap_content"
+            android:layout_width="match_parent">
+
+            <Button
+                android:id="@+id/btnDonate"
+                style="@style/Widget.Material3.Button.Icon"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="8dp"
+                android:layout_marginStart="16dp"
+                android:text="@string/donate_paypal"
+                app:icon="@drawable/ic_paypal"
+                app:layout_constraintBottom_toTopOf="@id/referrals"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/textView20" />
+
+            <TextView
+                android:id="@+id/textView20"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="16dp"
+                android:layout_marginTop="16dp"
+                android:layout_marginEnd="16dp"
+                android:text="@string/donations_info"
+                app:layout_constraintBottom_toTopOf="@+id/btnDonate"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintHorizontal_bias="0.5"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent"
+                app:layout_constraintVertical_chainStyle="packed" />
+
+            <include
+                android:id="@+id/referrals"
+                layout="@layout/fragment_donate_referral"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="16dp"
+                android:layout_marginTop="36dp"
+                android:layout_marginEnd="16dp"
+                android:layout_marginBottom="16dp"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/btnDonate" />
+        </androidx.constraintlayout.widget.ConstraintLayout>
+    </ScrollView>
+</LinearLayout>

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

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="donations_info" formatted="false">Pomohla vám EVMap? Podpořte její vývoj zasláním finančního daru vývojáři.</string>
+    <string name="donate_paypal">Přispět pomocí PayPalu</string>
+    <string name="data_sources_hint">Mapová data v aplikaci poskytuje služba OpenStreetMap.</string>
+</resources>

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

@@ -2,5 +2,5 @@
 <resources>
     <string name="donations_info" formatted="false">Findest du EVMap nützlich? Unterstütze die Weiterentwicklung der App mit einer Spende an den Entwickler.</string>
     <string name="donate_paypal">Mit PayPal spenden</string>
-    <string name="data_sources_hint">Die Kartendaten für die App stammen von OpenStreetMap (Mapbox).</string>
+    <string name="data_sources_hint">Die Kartendaten für die App stammen von OpenStreetMap.</string>
 </resources>

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

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="donations_info" formatted="false">Trouvez-vous EVMap utile \? Soutenez son développement en envoyant un don au développeur.</string>
-    <string name="data_sources_hint">Les données cartographiques de l\'application sont fournies par OpenStreetMap (Mapbox).</string>
+    <string name="data_sources_hint">Les données cartographiques de l\'application sont fournies par OpenStreetMap.</string>
     <string name="donate_paypal">Faire un don avec PayPal</string>
 </resources>

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

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="donate_paypal">Doner med PayPal</string>
-    <string name="data_sources_hint">Kartdata i programmet tilbys av OpenStreetMap (Mapbox).</string>
+    <string name="data_sources_hint">Kartdata i programmet tilbys av OpenStreetMap.</string>
     <string name="donations_info" formatted="false">Synes du EVMap er nyttig\? Støtt utviklingen ved å sende en slant til utvikleren.</string>
 </resources>

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

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="donations_info" formatted="false">Vond je EVMap nuttig\? Je kan de ontwikkeling ondersteunen door een donatie te sturen naar de ontwikkelaar.</string>
+    <string name="donate_paypal">Doneer via PayPal</string>
+    <string name="data_sources_hint">De kaartgegevens zijn afkomstig van OpenStreetMap.</string>
+</resources>

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

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="data_sources_hint">Os dados do mapa são fornecidos pelo OpenStreetMap.</string>
+    <string name="donate_paypal">Doar com o PayPal</string>
+    <string name="donations_info" formatted="false">Acha que o EVMap é útil\? Apoie a manutenção e desenvolvimento com uma doação para o desenvolvedor da app.</string>
+</resources>

app/src/foss/res/values-ro/strings.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="donations_info" formatted="false">Crezi ca EVMap este util? Sprijina dezvoltarea printr-o donatie pentru dezvoltator.</string>
+    <string name="donate_paypal">Doneaza cu PayPal</string>
+    <string name="data_sources_hint">Hartile din aplicatie sunt furnizate de OpenStreetMap.</string>
+</resources>

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

@@ -2,5 +2,5 @@
 <resources>
     <string name="donations_info" formatted="false">Do you find EVMap useful? Support its development by sending a donation to the developer.</string>
     <string name="donate_paypal">Donate with PayPal</string>
-    <string name="data_sources_hint">Map data in the app is provided by OpenStreetMap (Mapbox).</string>
+    <string name="data_sources_hint">Map data in the app is provided by OpenStreetMap.</string>
 </resources>

app/src/google/AndroidManifest.xml

@@ -1,46 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools">
-
-    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
-    <uses-permission android:name="androidx.car.app.MAP_TEMPLATES" />
-    <uses-permission android:name="com.google.android.gms.permission.CAR_FUEL" />
-    <uses-permission android:name="com.google.android.gms.permission.CAR_SPEED" />
-
-    <uses-sdk tools:overrideLibrary="androidx.car.app,androidx.car.app.projected" />
-
-    <queries>
-        <package android:name="com.google.android.projection.gearhead" />
-        <package android:name="com.google.android.apps.automotive.templates.host" />
-    </queries>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <application>
         <meta-data
             android:name="com.google.android.geo.API_KEY"
             android:value="@string/google_maps_key" />
-
-        <meta-data
-            android:name="com.google.android.gms.car.application"
-            android:resource="@xml/automotive_app_desc" />
-
-        <meta-data
-            android:name="androidx.car.app.theme"
-            android:resource="@style/CarAppTheme" />
-
-        <meta-data
-            android:name="androidx.car.app.minCarApiLevel"
-            android:value="1" />
-
-        <service
-            android:name=".auto.CarAppService"
-            android:label="@string/app_name"
-            android:icon="@mipmap/ic_launcher"
-            android:exported="true">
-            <intent-filter>
-                <action
-                    android:name="androidx.car.app.CarAppService"
-                    android:category="androidx.car.app.category.POI" />
-            </intent-filter>
-        </service>
     </application>
 </manifest>

app/src/google/java/net/vonforst/evmap/autocomplete/GooglePlacesAutocompleteProvider.kt

@@ -7,6 +7,7 @@ import android.text.style.StyleSpan
 import com.car2go.maps.google.adapter.AnyMapAdapter
 import com.car2go.maps.util.SphericalUtil
 import com.google.android.gms.common.api.ApiException
+import com.google.android.gms.common.api.CommonStatusCodes
 import com.google.android.gms.maps.model.LatLng
 import com.google.android.gms.maps.model.LatLngBounds
 import com.google.android.gms.tasks.Tasks.await
@@ -19,6 +20,7 @@ import com.google.android.libraries.places.api.net.FindAutocompletePredictionsRe
 import com.google.android.libraries.places.api.net.PlacesStatusCodes
 import kotlinx.coroutines.tasks.await
 import net.vonforst.evmap.R
+import java.io.IOException
 import java.util.concurrent.ExecutionException
 import kotlin.math.sqrt
 
@@ -36,10 +38,10 @@ class GooglePlacesAutocompleteProvider(val context: Context) : AutocompleteProvi
     ): List<AutocompletePlace> {
         val request = FindAutocompletePredictionsRequest.builder().apply {
             if (location != null) {
-                setLocationBias(calcLocationBias(location))
-                setOrigin(LatLng(location.latitude, location.longitude))
+                locationBias = calcLocationBias(location)
+                origin = LatLng(location.latitude, location.longitude)
             }
-            setSessionToken(token)
+            sessionToken = token
             setQuery(query)
         }.build()
         try {
@@ -58,6 +60,13 @@ class GooglePlacesAutocompleteProvider(val context: Context) : AutocompleteProvi
             if (cause is ApiException) {
                 if (cause.statusCode == PlacesStatusCodes.OVER_QUERY_LIMIT) {
                     throw ApiUnavailableException()
+                } else if (cause.statusCode in listOf(
+                        CommonStatusCodes.NETWORK_ERROR,
+                        CommonStatusCodes.TIMEOUT, CommonStatusCodes.RECONNECTION_TIMED_OUT,
+                        CommonStatusCodes.RECONNECTION_TIMED_OUT_DURING_UPDATE
+                    )
+                ) {
+                    throw IOException(cause)
                 }
             }
             throw e
@@ -83,10 +92,11 @@ class GooglePlacesAutocompleteProvider(val context: Context) : AutocompleteProvi
         }
     }
 
-    override fun getAttributionString(): Int = R.string.places_powered_by_google
+    override fun getAttributionString(): Int =
+        com.google.android.libraries.places.R.string.places_powered_by_google
 
     override fun getAttributionImage(dark: Boolean): Int =
-        if (dark) R.drawable.places_powered_by_google_dark else R.drawable.places_powered_by_google_light
+        if (dark) com.google.android.libraries.places.R.drawable.places_powered_by_google_dark else com.google.android.libraries.places.R.drawable.places_powered_by_google_light
 
     private fun calcLocationBias(location: com.car2go.maps.model.LatLng): RectangularBounds {
         val radius = 100e3 // meters

app/src/google/java/net/vonforst/evmap/fragment/DonateFragment.kt

@@ -6,11 +6,10 @@ import android.view.View
 import android.view.ViewGroup
 import androidx.appcompat.app.AppCompatActivity
 import androidx.databinding.DataBindingUtil
-import androidx.fragment.app.Fragment
 import androidx.fragment.app.viewModels
-import androidx.lifecycle.Observer
 import androidx.navigation.fragment.findNavController
 import androidx.navigation.ui.setupWithNavController
+import androidx.recyclerview.widget.ConcatAdapter
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.google.android.material.color.MaterialColors
 import com.google.android.material.snackbar.Snackbar
@@ -18,12 +17,17 @@ import com.google.android.material.transition.MaterialSharedAxis
 import net.vonforst.evmap.MapsActivity
 import net.vonforst.evmap.R
 import net.vonforst.evmap.adapter.DonationAdapter
+import net.vonforst.evmap.adapter.SingleViewAdapter
 import net.vonforst.evmap.databinding.FragmentDonateBinding
+import net.vonforst.evmap.databinding.FragmentDonateHeaderBinding
+import net.vonforst.evmap.databinding.FragmentDonateReferralBinding
 import net.vonforst.evmap.viewmodel.DonateViewModel
 
-class DonateFragment : Fragment() {
+class DonateFragment : DonateFragmentBase() {
     private lateinit var binding: FragmentDonateBinding
     private val vm: DonateViewModel by viewModels()
+    private lateinit var header: FragmentDonateHeaderBinding
+    private lateinit var referrals: FragmentDonateReferralBinding
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -40,6 +44,9 @@ class DonateFragment : Fragment() {
         binding.lifecycleOwner = this
         binding.vm = vm
 
+        header = FragmentDonateHeaderBinding.inflate(inflater, container, false)
+        referrals = FragmentDonateReferralBinding.inflate(inflater, container, false)
+
         return binding.root
     }
 
@@ -51,25 +58,33 @@ class DonateFragment : Fragment() {
             (requireActivity() as MapsActivity).appBarConfiguration
         )
 
-        binding.productsList.apply {
-            adapter = DonationAdapter().apply {
-                onClickListener = {
-                    vm.startPurchase(it, requireActivity())
-                }
+        val donationAdapter = DonationAdapter().apply {
+            onClickListener = {
+                vm.startPurchase(it, requireActivity())
             }
+        }
+        binding.productsList.apply {
+            val joinedAdapter = ConcatAdapter(
+                SingleViewAdapter(header.root),
+                donationAdapter,
+                SingleViewAdapter(referrals.root)
+            )
+            adapter = joinedAdapter
             layoutManager = LinearLayoutManager(context)
         }
 
         vm.products.observe(viewLifecycleOwner) {
-            print(it)
+            donationAdapter.submitList(it.data)
         }
 
-        vm.purchaseSuccessful.observe(viewLifecycleOwner, Observer {
+        vm.purchaseSuccessful.observe(viewLifecycleOwner) {
             Snackbar.make(view, R.string.donation_successful, Snackbar.LENGTH_LONG).show()
-        })
-        vm.purchaseFailed.observe(viewLifecycleOwner, Observer {
+        }
+        vm.purchaseFailed.observe(viewLifecycleOwner) {
             Snackbar.make(view, R.string.donation_failed, Snackbar.LENGTH_LONG).show()
-        })
+        }
+
+        setupReferrals(referrals)
 
         // Workaround for AndroidX bug: https://github.com/material-components/material-components-android/issues/1984
         view.setBackgroundColor(MaterialColors.getColor(view, android.R.attr.windowBackground))

app/src/google/java/net/vonforst/evmap/fragment/OnboardingFragment.kt

@@ -1,69 +0,0 @@
-package net.vonforst.evmap.fragment
-
-import android.animation.AnimatorSet
-import android.animation.ObjectAnimator
-import android.annotation.SuppressLint
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import android.view.animation.DecelerateInterpolator
-import androidx.fragment.app.Fragment
-import androidx.viewpager2.adapter.FragmentStateAdapter
-import net.vonforst.evmap.databinding.FragmentOnboardingAndroidAutoBinding
-
-class OnboardingViewPagerAdapter(fragment: Fragment) :
-    FragmentStateAdapter(fragment) {
-    override fun getItemCount(): Int = 4
-
-    override fun createFragment(position: Int): Fragment = when (position) {
-        0 -> WelcomeFragment()
-        1 -> IconsFragment()
-        2 -> AndroidAutoFragment()
-        3 -> DataSourceSelectFragment()
-        else -> throw IllegalArgumentException()
-    }
-}
-
-class AndroidAutoFragment : OnboardingPageFragment() {
-    private lateinit var binding: FragmentOnboardingAndroidAutoBinding
-
-    override fun onCreateView(
-        inflater: LayoutInflater,
-        container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ): View {
-        binding = FragmentOnboardingAndroidAutoBinding.inflate(inflater, container, false)
-
-        binding.btnGetStarted.setOnClickListener {
-            parent.goToNext()
-        }
-        binding.imgAndroidAuto.alpha = 0f
-
-        return binding.root
-    }
-
-    @SuppressLint("Recycle")
-    override fun onResume() {
-        super.onResume()
-
-        val animators =
-            listOf(
-                ObjectAnimator.ofFloat(binding.imgAndroidAuto, "translationY", -20f, 0f).apply {
-                    interpolator = DecelerateInterpolator()
-                },
-                ObjectAnimator.ofFloat(binding.imgAndroidAuto, "alpha", 0f, 1f).apply {
-                    interpolator = DecelerateInterpolator()
-                }
-            )
-        AnimatorSet().apply {
-            playTogether(animators)
-            start()
-        }
-    }
-
-    override fun onPause() {
-        super.onPause()
-        binding.imgAndroidAuto.alpha = 0f
-    }
-}

app/src/google/java/net/vonforst/evmap/viewmodel/DonateViewModel.kt

@@ -15,6 +15,12 @@ class DonateViewModel(application: Application) : AndroidViewModel(application),
         .setListener(this)
         .enablePendingPurchases()
         .build()
+    
+    val products: MutableLiveData<Resource<List<DonationItem>>> by lazy {
+        MutableLiveData<Resource<List<DonationItem>>>().apply {
+            value = Resource.loading(null)
+        }
+    }
 
     init {
         billingClient.startConnection(object : BillingClientStateListener {
@@ -70,12 +76,6 @@ class DonateViewModel(application: Application) : AndroidViewModel(application),
         }
     }
 
-    val products: MutableLiveData<Resource<List<DonationItem>>> by lazy {
-        MutableLiveData<Resource<List<DonationItem>>>().apply {
-            value = Resource.loading(null)
-        }
-    }
-
     val purchaseSuccessful = SingleLiveEvent<Nothing>()
     val purchaseFailed = SingleLiveEvent<Nothing>()
 

app/src/google/res/layout/fragment_donate.xml

@@ -35,29 +35,16 @@
 
         </com.google.android.material.appbar.AppBarLayout>
 
-        <TextView
-            android:id="@+id/textView20"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="16dp"
-            android:layout_marginTop="16dp"
-            android:layout_marginEnd="16dp"
-            android:text="@string/donations_info"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/toolbar_container" />
-
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/products_list"
             android:layout_width="0dp"
             android:layout_height="0dp"
-            android:layout_marginTop="16dp"
-            app:data="@{vm.products.data}"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/textView20"
-            tools:listitem="@layout/item_donation" />
+            app:layout_constraintTop_toBottomOf="@id/toolbar_container"
+            tools:itemCount="1"
+            tools:listitem="@layout/fragment_donate_preview" />
 
         <ProgressBar
             android:id="@+id/progressBar3"

app/src/google/res/layout/fragment_donate_header.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<TextView android:id="@+id/textView20"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_marginStart="16dp"
+    android:layout_marginTop="16dp"
+    android:layout_marginEnd="16dp"
+    android:layout_marginBottom="16dp"
+    android:text="@string/donations_info"
+    xmlns:android="http://schemas.android.com/apk/res/android" />

app/src/google/res/layout/fragment_donate_preview.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <include layout="@layout/fragment_donate_header" />
+
+    <include layout="@layout/item_donation" />
+
+    <include layout="@layout/item_donation" />
+
+    <include layout="@layout/item_donation" />
+
+    <include layout="@layout/fragment_donate_referral" />
+</LinearLayout>

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

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="donations_info" formatted="false">Pomohla vám EVMap? Podpořte její vývoj posláním finančního daru vývojáři.
+\n
+\nGoogle si z každého daru strhne 15 %.</string>
+    <string name="data_sources_hint">V nastavení můžete také pro mapová data přepínat mezi službami Mapy Google a OpenStreetMap.</string>
+</resources>

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

@@ -1,39 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="donations_info" formatted="false">Findest du EVMap nützlich? Unterstütze die Weiterentwicklung der App mit einer Spende an den Entwickler.\n\nGoogle zieht von der Spende 15% Gebühren ab.</string>
-    <string name="auto_location_service">EVMap läuft unter Android Auto und nutzt dafür deinen Standort.</string>
-    <string name="auto_no_chargers_found">Keine Ladestationen in der Nähe gefunden</string>
-    <string name="auto_no_favorites_found">Keine Favoriten gefunden</string>
-    <string name="open_in_app">In App öffnen</string>
-    <string name="opened_on_phone">Auf dem Telefon geöffnet</string>
-    <string name="auto_location_permission_needed">Um EVMap auf Android Auto zu nutzen, braucht die App Zugriff auf deinen Standort.</string>
-    <string name="auto_vehicle_data_permission_needed">Für diese Funktion benötigt EVMap Zugriff auf Daten deines Fahrzeugs.</string>
-    <string name="grant_on_phone">Auf Telefon zulassen</string>
-    <string name="auto_chargers_closeby">In der Nähe</string>
-    <string name="auto_favorites">Favoriten</string>
-    <string name="auto_chargers_near_location">Nahe %s</string>
-    <string name="auto_fault_report_date">⚠️ Störungsmeldung (%s)</string>
-    <string name="auto_no_refresh_possible">Weitere Aktualisierung nicht möglich. Bitte zurück gehen und neu starten.</string>
-    <string name="auto_prices">Preise</string>
-    <string name="auto_vehicle_data">Fahrzeugdaten</string>
-    <string name="auto_charging_level">Ladezustand</string>
-    <string name="auto_no_data">Nicht verfügbar</string>
-    <string name="auto_range">Reichweite</string>
-    <string name="auto_speed">Geschwindigkeit</string>
-    <string name="auto_heading">Fahrtrichtung</string>
-    <string name="auto_settings">Einstellungen</string>
-    <string name="welcome_android_auto">Android Auto-Unterstützung</string>
-    <string name="welcome_android_auto_detail">Auf unterstützen Autos kannst du EVMap auch mit Android Auto nutzen. Öffne dazu einfach die EVMap-App aus dem Menü von Android Auto.</string>
-    <string name="sounds_cool">klingt cool</string>
-    <string name="auto_chargeprice_vehicle_unavailable">EVMap konnte das Fahrzeugmodell nicht erkennen.</string>
-    <string name="auto_chargeprice_vehicle_unknown">Keins der in der App ausgewählten Fahrzeuge passt zu diesem Fahrzeug (%1$s %2$s).</string>
-    <string name="auto_chargeprice_vehicle_ambiguous">Mehrere der in der App ausgewählten Fahrzeuge passen zu diesem Fahrzeug (%1$s %2$s).</string>
-    <string name="auto_chargers_ahead">Nur Ladestationen in Fahrtrichtung</string>
-    <string name="settings_android_auto_chargeprice_range">Ladebereich für Preisvergleich</string>
-    <string name="data_sources_hint">In den Einstellungen kannst du auch zwischen Google Maps und OpenStreetMap (Mapbox) für die Kartendaten wechseln.</string>
-    <string name="selecting_all">alle Einträge ausgewählt</string>
-    <string name="selecting_none">alle Einträge abgewählt</string>
-    <string name="loading">Lade…</string>
-    <string name="auto_multipage_goto">Seite %d</string>
-    <string name="auto_multipage">(%d/%d)</string>
+    <string name="data_sources_hint">In den Einstellungen kannst du auch zwischen Google Maps und OpenStreetMap für die Kartendaten wechseln.</string>
 </resources>

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

@@ -3,36 +3,5 @@
     <string name="donations_info" formatted="false">Trouvez-vous EVMap utile \? Soutenez son développement en envoyant un don au développeur.
 \n
 \nGoogle prend 15% sur chaque don.</string>
-    <string name="auto_location_service">EVMap fonctionne sur Android Auto et utilise votre position.</string>
-    <string name="open_in_app">Ouvrir dans l\'application</string>
-    <string name="opened_on_phone">Ouvert sur le téléphone</string>
-    <string name="auto_location_permission_needed">Pour exécuter EVMap sur Android Auto, vous devez autoriser l\'accès à votre emplacement.</string>
-    <string name="grant_on_phone">Grant au téléphone</string>
-    <string name="auto_prices">Prix</string>
-    <string name="auto_vehicle_data">Données sur le véhicule</string>
-    <string name="auto_range">Autonomie</string>
-    <string name="auto_speed">Vitesse</string>
-    <string name="welcome_android_auto">Prise en charge d’Android Auto</string>
-    <string name="sounds_cool">ça a l\'air cool</string>
-    <string name="auto_chargeprice_vehicle_unknown">Aucun des véhicules sélectionnés dans l\'application ne correspond à ce véhicule (%1$s %2$s).</string>
-    <string name="auto_chargeprice_vehicle_ambiguous">Plusieurs véhicules sélectionnés dans l\'application correspondent à ce véhicule (%1$s %2$s).</string>
-    <string name="selecting_all">tous les éléments sélectionnés</string>
-    <string name="data_sources_hint">Dans les paramètres, vous pouvez également choisir entre Google Maps et OpenStreetMap (Mapbox) pour les données cartographiques.</string>
-    <string name="auto_chargeprice_vehicle_unavailable">EVMap n\'a pas pu déterminer le modèle de votre véhicule.</string>
-    <string name="auto_no_chargers_found">Aucun chargeur à proximité n\'a été trouvé</string>
-    <string name="auto_no_favorites_found">Pas de favoris trouvés</string>
-    <string name="auto_charging_level">Niveau de charge</string>
-    <string name="auto_chargers_closeby">Chargeurs à proximité</string>
-    <string name="auto_chargers_near_location">Près de %s</string>
-    <string name="auto_fault_report_date">⚠️ Rapport d\'anomalie (%s)</string>
-    <string name="auto_no_data">Indisponible</string>
-    <string name="auto_settings">Paramètres</string>
-    <string name="selecting_none">désélectionner tous les éléments</string>
-    <string name="auto_vehicle_data_permission_needed">Pour cette fonction, EVMap doit avoir accès aux données de votre véhicule.</string>
-    <string name="auto_heading">Direction</string>
-    <string name="auto_favorites">Favoris</string>
-    <string name="auto_no_refresh_possible">D\'autres mises à jour ne sont pas possibles. Veuillez revenir en arrière et redémarrer.</string>
-    <string name="settings_android_auto_chargeprice_range">Plage de charge pour la comparaison des prix</string>
-    <string name="welcome_android_auto_detail">Vous pouvez également utiliser EVMap à partir d\'Android Auto sur les voitures prises en charge. Il suffit de sélectionner l\'application EVMap dans le menu Android Auto.</string>
-    <string name="loading">Chargement…</string>
+    <string name="data_sources_hint">Dans les paramètres, vous pouvez également choisir entre Google Maps et OpenStreetMap pour les données cartographiques.</string>
 </resources>

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

@@ -3,37 +3,5 @@
     <string name="donations_info" formatted="false">Synes du EVMap er nyttig\? Støtt utviklingen ved å sende penger til utvikleren.
 \n
 \nGoogle tar 15% av alle donasjoner.</string>
-    <string name="auto_favorites">Favoritter</string>
-    <string name="auto_charging_level">Ladingsnivå</string>
-    <string name="auto_chargeprice_vehicle_unavailable">EVMap kunne ikke fastsette kjøretøymodellen.</string>
-    <string name="selecting_none">fravalgte alle elementer</string>
-    <string name="grant_on_phone">Innvilg på mobilenheten</string>
-    <string name="auto_chargers_closeby">Ladere i nærheten</string>
-    <string name="auto_prices">Pris</string>
-    <string name="auto_no_chargers_found">Ingen ladere i nærheten</string>
-    <string name="auto_no_favorites_found">Fant ikke noen favoritter</string>
-    <string name="open_in_app">Åpne i programmet</string>
-    <string name="auto_location_service">EVMap kjører på Android Auto og bruker posisjonen din.</string>
-    <string name="auto_heading">Fartsretning</string>
-    <string name="opened_on_phone">Åpnet på mobilenheten</string>
-    <string name="auto_location_permission_needed">Innvilg posisjonstilgang for å bruke EVMap på Android Auto.</string>
-    <string name="auto_chargers_near_location">Nær %s</string>
-    <string name="auto_fault_report_date">⚠️ Feilrapport (%s)</string>
-    <string name="auto_vehicle_data">Kjøretøydata</string>
-    <string name="auto_no_data">Utilgjengelig</string>
-    <string name="auto_speed">Hastighet</string>
-    <string name="auto_settings">Innstillinger</string>
-    <string name="auto_chargeprice_vehicle_unknown">Ingen av kjøretøyene valgt i programmet samsvarer med dette kjøretøyet (%1$s %2$s).</string>
-    <string name="welcome_android_auto">Android Auto-støtte</string>
-    <string name="auto_chargeprice_vehicle_ambiguous">Flere kjøretøy valgt i programmet samsvarer med dette kjøretøyet (%1$s %2$s).</string>
-    <string name="auto_vehicle_data_permission_needed">EvMap trenger tilgang til kjøretøydata for å bruke denne funksjonen.</string>
-    <string name="auto_no_refresh_possible">Videre oppdateringer er ikke mulig. Gå tilbake og start på ny.</string>
-    <string name="auto_range">Rekkevidde</string>
-    <string name="welcome_android_auto_detail">Du kan også bruke EVMap inne i Android Auto på bilder som støtter dette ved å velge det i Android Auto-menyen.</string>
-    <string name="settings_android_auto_chargeprice_range">Prissammenligning for laderekkevidde fordelt på pris</string>
-    <string name="data_sources_hint">I innstillingene kan du også bytte mellom Google Maps og OpenStreetMap (Mapbox) for kartdata.</string>
-    <string name="selecting_all">valgte alle elementene</string>
-    <string name="sounds_cool">den er grei</string>
-    <string name="auto_chargers_ahead">Kun ladere i kjøreretningen</string>
-    <string name="loading">Laster inn …</string>
+    <string name="data_sources_hint">I innstillingene kan du også bytte mellom Google Maps og OpenStreetMap for kartdata.</string>
 </resources>

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

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="donations_info" formatted="false">Vind je EVMap nuttig\? Je kan de ontwikkeling steunen via een donatie aan de ontwikkelaar.
+\n
+\nGoogle houdt 15% in van elke donatie.</string>
+    <string name="data_sources_hint">In de instellingen kan je ook wisselen tussen Google Maps en OpenStreetMap voor de kaartgegevens.</string>
+</resources>

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

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="donations_info" formatted="false">Acha que o EVMap é útil\? Apoie a manutenção e desenvolvimento com uma doação para o desenvolvedor da app.
+\n
+\nA Google cobra 15% de cada doação.</string>
+    <string name="data_sources_hint">Também pode mudar entre o Google Maps e OpenStreetMap nas definições da app.</string>
+</resources>

app/src/google/res/values-ro/strings.xml

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources></resources>

app/src/google/res/values/arrays.xml

@@ -2,7 +2,7 @@
 <resources>
     <string-array name="pref_map_provider_names">
         <item>@string/pref_provider_google_maps</item>
-        <item>@string/pref_provider_osm_mapbox</item>
+        <item>@string/pref_provider_osm</item>
     </string-array>
     <string-array name="pref_map_provider_values" translatable="false">
         <item>google</item>

app/src/google/res/values/colors.xml

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <color name="gauge_active">#00e676</color>
-    <color name="gauge_middle">#087f23</color>
-    <color name="gauge_inactive">#9e9e9e</color>
-    <color name="charger_100kw_dark">#FBC02D</color>
-</resources>

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

@@ -1,39 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="donations_info" formatted="false">Do you find EVMap useful? Support its development by sending a donation to the developer.\n\nGoogle takes 15% off every donation.</string>
-    <string name="auto_location_service">EVMap is running on Android Auto and using your location.</string>
-    <string name="auto_no_chargers_found">No nearby chargers found</string>
-    <string name="auto_no_favorites_found">No favorites found</string>
-    <string name="open_in_app">Open in app</string>
-    <string name="opened_on_phone">Opened on phone</string>
-    <string name="auto_location_permission_needed">To run EVMap on Android Auto, you need to grant access to your location.</string>
-    <string name="auto_vehicle_data_permission_needed">For this feature, EVMap needs access to your vehicle data.</string>
-    <string name="grant_on_phone">Grant on phone</string>
-    <string name="auto_chargers_closeby">Nearby chargers</string>
-    <string name="auto_favorites">Favorites</string>
-    <string name="auto_chargers_near_location">Near %s</string>
-    <string name="auto_fault_report_date">⚠️ Fault report (%s)</string>
-    <string name="auto_no_refresh_possible">Further updates not possible. Please go back and restart.</string>
-    <string name="auto_prices">Pricing</string>
-    <string name="auto_vehicle_data">Vehicle data</string>
-    <string name="auto_charging_level">Charging level</string>
-    <string name="auto_no_data">Unavailable</string>
-    <string name="auto_range">Range</string>
-    <string name="auto_speed">Speed</string>
-    <string name="auto_heading">Heading</string>
-    <string name="auto_settings">Settings</string>
-    <string name="welcome_android_auto">Android Auto support</string>
-    <string name="welcome_android_auto_detail">You can also use EVMap from within Android Auto on supported cars. Simply select the EVMap app in the Android Auto menu.</string>
-    <string name="sounds_cool">sounds cool</string>
-    <string name="auto_chargeprice_vehicle_unavailable">EVMap could not determine your vehicle model.</string>
-    <string name="auto_chargeprice_vehicle_unknown">None of the vehicles selected in the app matches this vehicle (%1$s %2$s).</string>
-    <string name="auto_chargeprice_vehicle_ambiguous">Multiple vehicles selected in the app match this vehicle (%1$s %2$s).</string>
-    <string name="auto_chargers_ahead">Only chargers along driving direction</string>
-    <string name="settings_android_auto_chargeprice_range">Charging range for price comparison</string>
-    <string name="data_sources_hint">In the settings you can also switch between Google Maps and OpenStreetMap (Mapbox) for the map data.</string>
-    <string name="selecting_all">selected all items</string>
-    <string name="selecting_none">deselected all items</string>
-    <string name="loading">Loading…</string>
-    <string name="auto_multipage_goto">Page %d</string>
-    <string name="auto_multipage">(%d/%d)</string>
+    <string name="data_sources_hint">In the settings you can also switch between Google Maps and OpenStreetMap for the map data.</string>
 </resources>

app/src/google/res/values/styles.xml

@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
-    <style name="CarAppTheme">
-        <item name="carColorPrimary">@color/colorPrimary</item>
-        <item name="carColorPrimaryDark">@color/colorPrimaryDark</item>
-        <item name="carColorSecondary">@color/colorSecondary</item>
-        <item name="carColorSecondaryDark">@color/colorSecondaryDark</item>
-    </style>
-</resources>

app/src/google/res/xml/settings_variantspecific.xml

@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
-    <Preference
-        android:fragment="net.vonforst.evmap.fragment.preference.AndroidAutoSettingsFragment"
-        android:title="@string/settings_android_auto"
-        android:icon="@drawable/ic_android_auto" />
+<PreferenceScreen>
+
 </PreferenceScreen>

app/src/main/AndroidManifest.xml

@@ -1,10 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools">
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
     <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_LOCATION" />
+    <uses-permission android:name="androidx.car.app.MAP_TEMPLATES" />
+    <uses-permission android:name="com.google.android.gms.permission.CAR_FUEL" />
+    <uses-permission android:name="com.google.android.gms.permission.CAR_SPEED" />
 
     <queries>
         <intent>
@@ -18,22 +24,37 @@
         <intent>
             <action android:name="android.support.customtabs.action.CustomTabsService" />
         </intent>
+
+        <package android:name="com.google.android.projection.gearhead" />
+        <package android:name="com.google.android.apps.automotive.templates.host" />
+        <package android:name="com.google.android.apps.maps" />
     </queries>
 
     <application
         android:name=".EvMapApplication"
         android:allowBackup="true"
+        android:fullBackupContent="@xml/backup_rules"
+        android:dataExtractionRules="@xml/backup_rules_api31"
+        android:fullBackupOnly="true"
+        android:backupAgent=".storage.BackupAgent"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
-        android:theme="@style/AppTheme"
-        android:localeConfig="@xml/locales_config">
+        android:theme="@style/AppTheme">
 
         <meta-data
             android:name="com.mapbox.ACCESS_TOKEN"
             android:value="@string/mapbox_key" />
 
+        <meta-data
+            android:name="io.jawg.ACCESS_TOKEN"
+            android:value="@string/jawg_key" />
+
+        <meta-data
+            android:name="com.arcgis.ACCESS_TOKEN"
+            android:value="@string/arcgis_key" />
+
         <activity
             android:name=".MapsActivity"
             android:label="@string/app_name"
@@ -260,6 +281,17 @@
                     android:host="openchargemap.org"
                     android:pathPattern="/site/poi/details/..*"
                     android:scheme="https" />
+                <data
+                    android:host="map.openchargemap.io"
+                    android:path="/"
+                    android:scheme="https" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+                <data android:scheme="net.vonforst.evmap" />
 
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.BROWSABLE" />
@@ -270,6 +302,10 @@
                 android:resource="@xml/shortcuts" />
         </activity>
 
+        <activity android:name=".auto.OAuthLoginActivity">
+
+        </activity>
+
         <service
             android:name="androidx.appcompat.app.AppLocalesMetadataHolderService"
             android:enabled="false"
@@ -278,6 +314,50 @@
                 android:name="autoStoreLocales"
                 android:value="true" />
         </service>
+
+        <provider
+            android:name="androidx.startup.InitializationProvider"
+            android:authorities="${applicationId}.androidx-startup"
+            android:exported="false"
+            tools:node="merge">
+            <!-- Remove WorkManagerInitializer as we implement getWorkManagerConfiguration in application class -->
+            <meta-data
+                android:name="androidx.work.WorkManagerInitializer"
+                android:value="androidx.startup"
+                tools:node="remove" />
+        </provider>
+
+        <!-- Configuration for Android Auto app -->
+        <meta-data
+            android:name="com.google.android.gms.car.application"
+            android:resource="@xml/automotive_app_desc" />
+
+        <meta-data
+            android:name="androidx.car.app.theme"
+            android:resource="@style/CarAppTheme" />
+
+        <meta-data
+            android:name="androidx.car.app.minCarApiLevel"
+            android:value="1" />
+
+        <service
+            android:name=".auto.CarAppService"
+            android:label="@string/app_name"
+            android:icon="@mipmap/ic_launcher"
+            android:exported="true"
+            android:foregroundServiceType="location">
+            <intent-filter>
+                <action android:name="androidx.car.app.CarAppService" />
+                <category android:name="androidx.car.app.category.POI" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+                <data android:scheme="net.vonforst.evmap" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+            </intent-filter>
+        </service>
     </application>
 
 </manifest>

app/src/main/java/net/vonforst/evmap/EvMapApplication.kt

@@ -1,17 +1,22 @@
 package net.vonforst.evmap
 
+import android.app.Activity
 import android.app.Application
-import com.facebook.stetho.Stetho
+import android.os.Build
+import androidx.work.*
+import net.vonforst.evmap.storage.CleanupCacheWorker
 import net.vonforst.evmap.storage.PreferenceDataSource
 import net.vonforst.evmap.ui.updateAppLocale
 import net.vonforst.evmap.ui.updateNightMode
 import org.acra.config.dialog
+import org.acra.config.httpSender
 import org.acra.config.limiter
-import org.acra.config.mailSender
 import org.acra.data.StringFormat
 import org.acra.ktx.initAcra
+import org.acra.sender.HttpSender
+import java.time.Duration
 
-class EvMapApplication : Application() {
+class EvMapApplication : Application(), Configuration.Provider {
     override fun onCreate() {
         super.onCreate()
         val prefs = PreferenceDataSource(this)
@@ -24,16 +29,21 @@ class EvMapApplication : Application() {
             prefs.language = null
         }
 
-        Stetho.initializeWithDefaults(this);
         init(applicationContext)
+        addDebugInterceptors(applicationContext)
 
         if (!BuildConfig.DEBUG) {
             initAcra {
                 buildConfigClass = BuildConfig::class.java
-                reportFormat = StringFormat.KEY_VALUE_LIST
 
-                mailSender {
-                    mailTo = "evmap+crashreport@vonforst.net"
+                // Vehicles often don't have an email app, so use HTTP to send instead
+                reportFormat = StringFormat.JSON
+                httpSender {
+                    uri = getString(R.string.acra_backend_url)
+                    val creds = getString(R.string.acra_credentials).split(":")
+                    basicAuthLogin = creds[0]
+                    basicAuthPassword = creds[1]
+                    httpMethod = HttpSender.Method.POST
                 }
 
                 dialog {
@@ -42,6 +52,10 @@ class EvMapApplication : Application() {
                     commentPrompt = getString(R.string.crash_report_comment_prompt)
                     resIcon = R.drawable.ic_launcher_foreground
                     resTheme = R.style.AppTheme
+                    if (BuildConfig.FLAVOR_automotive == "automotive") {
+                        reportDialogClass =
+                            Class.forName("androidx.car.app.activity.CarAppActivity") as Class<out Activity>?
+                    }
                 }
 
                 limiter {
@@ -49,5 +63,18 @@ class EvMapApplication : Application() {
                 }
             }
         }
+
+        val cleanupCacheRequest = PeriodicWorkRequestBuilder<CleanupCacheWorker>(Duration.ofDays(1))
+            .setConstraints(Constraints.Builder().apply {
+                setRequiresBatteryNotLow(true)
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+                    setRequiresDeviceIdle(true)
+                }
+            }.build()).build()
+        WorkManager.getInstance(this).enqueueUniquePeriodicWork(
+            "CleanupCacheWorker", ExistingPeriodicWorkPolicy.UPDATE, cleanupCacheRequest
+        )
     }
+
+    override val workManagerConfiguration = Configuration.Builder().build()
 }

app/src/main/java/net/vonforst/evmap/MapsActivity.kt

@@ -55,8 +55,8 @@ class MapsActivity : AppCompatActivity(),
     private lateinit var prefs: PreferenceDataSource
 
     override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
         val splashScreen = installSplashScreen()
+        super.onCreate(savedInstanceState)
 
         setContentView(R.layout.activity_maps)
 
@@ -76,7 +76,7 @@ class MapsActivity : AppCompatActivity(),
         val navView = findViewById<NavigationView>(R.id.nav_view)
         navView.setupWithNavController(navController)
 
-        ViewCompat.setOnApplyWindowInsetsListener(navView) { v, insets ->
+        ViewCompat.setOnApplyWindowInsetsListener(navView) { _, insets ->
             val header = navView.getHeaderView(0)
             header.setPadding(0, insets.getInsets(WindowInsetsCompat.Type.statusBars()).top, 0, 0)
             insets
@@ -107,6 +107,10 @@ class MapsActivity : AppCompatActivity(),
             navGraph.setStartDestination(R.id.onboarding)
             navController.graph = navGraph
             return
+        } else if (!prefs.privacyAccepted) {
+            navGraph.setStartDestination(R.id.onboarding)
+            navController.graph = navGraph
+            return
         } else {
             navGraph.setStartDestination(R.id.map)
             navController.setGraph(navGraph, MapFragmentArgs(appStart = true).toBundle())
@@ -124,7 +128,7 @@ class MapsActivity : AppCompatActivity(),
                         .setDestination(R.id.map)
                         .setArguments(MapFragmentArgs(latLng = LatLng(lat, lon)).toBundle())
                         .createPendingIntent()
-                } else if (query != null && query.isNotEmpty()) {
+                } else if (!query.isNullOrEmpty()) {
                     deepLink = navController.createDeepLink()
                         .setGraph(R.navigation.nav_graph)
                         .setDestination(R.id.map)
@@ -151,8 +155,12 @@ class MapsActivity : AppCompatActivity(),
                         .setArguments(MapFragmentArgs(chargerId = id).toBundle())
                         .createPendingIntent()
                 }
-            } else if (intent?.scheme == "https" && intent?.data?.host == "openchargemap.org") {
-                val id = intent.data?.pathSegments?.last()?.toLongOrNull()
+            } else if (intent?.scheme == "https" && intent?.data?.host in listOf("openchargemap.org", "map.openchargemap.io")) {
+                val id = when (intent.data?.host) {
+                    "openchargemap.org" -> intent.data?.pathSegments?.last()?.toLongOrNull()
+                    "map.openchargemap.io" -> intent.data?.getQueryParameter("id")?.toLongOrNull()
+                    else -> null
+                }
                 if (id != null) {
                     if (prefs.dataSource != "openchargemap") {
                         prefs.dataSource = "openchargemap"
@@ -171,6 +179,32 @@ class MapsActivity : AppCompatActivity(),
                         .setArguments(MapFragmentArgs(chargerId = id).toBundle())
                         .createPendingIntent()
                 }
+            } else if (intent.scheme == "net.vonforst.evmap") {
+                intent.data?.let {
+                    if (it.host == "find_charger") {
+                        val lat = it.getQueryParameter("latitude")?.toDouble()
+                        val lon = it.getQueryParameter("longitude")?.toDouble()
+                        val name = it.getQueryParameter("name")
+                        if (lat != null && lon != null) {
+                            deepLink = navController.createDeepLink()
+                                .setGraph(R.navigation.nav_graph)
+                                .setDestination(R.id.map)
+                                .setArguments(
+                                    MapFragmentArgs(
+                                        latLng = LatLng(lat, lon),
+                                        locationName = name
+                                    ).toBundle()
+                                )
+                                .createPendingIntent()
+                        } else if (name != null) {
+                            deepLink = navController.createDeepLink()
+                                .setGraph(R.navigation.nav_graph)
+                                .setDestination(R.id.map)
+                                .setArguments(MapFragmentArgs(locationName = name).toBundle())
+                                .createPendingIntent()
+                        }
+                    }
+                }
             } else if (intent.hasExtra(EXTRA_CHARGER_ID)) {
                 deepLink = navController.createDeepLink()
                     .setDestination(R.id.map)
@@ -207,7 +241,7 @@ class MapsActivity : AppCompatActivity(),
         intent.data = Uri.parse("google.navigation:q=${coord.lat},${coord.lng}")
         intent.`package` = "com.google.android.apps.maps"
         if (prefs.navigateUseMaps && intent.resolveActivity(packageManager) != null) {
-            startActivity(intent);
+            startActivity(intent)
         } else {
             // fallback: generic geo intent
             showLocation(charger)
@@ -223,7 +257,7 @@ class MapsActivity : AppCompatActivity(),
             })"
         )
         if (intent.resolveActivity(packageManager) != null) {
-            startActivity(intent);
+            startActivity(intent)
         } else {
             val cb = fragmentCallback ?: return
             Snackbar.make(
@@ -234,7 +268,7 @@ class MapsActivity : AppCompatActivity(),
         }
     }
 
-    fun openUrl(url: String) {
+    fun openUrl(url: String, preferBrowser: Boolean = true) {
         val pkg = CustomTabsClient.getPackageName(this, null)
         val intent = CustomTabsIntent.Builder()
             .setDefaultColorSchemeParams(
@@ -246,7 +280,7 @@ class MapsActivity : AppCompatActivity(),
         pkg?.let {
             // prefer to open URL in custom tab, even if native app
             // available (such as EVMap itself)
-            intent.intent.setPackage(pkg)
+            if (preferBrowser) intent.intent.setPackage(pkg)
         }
         try {
             intent.launchUrl(this, Uri.parse(url))
@@ -262,7 +296,7 @@ class MapsActivity : AppCompatActivity(),
 
     fun shareUrl(url: String) {
         val intent = Intent(Intent.ACTION_SEND).apply {
-            setType("text/plain")
+            type = "text/plain"
             putExtra(Intent.EXTRA_TEXT, url)
         }
         startActivity(intent)

app/src/main/java/net/vonforst/evmap/Utils.kt

@@ -1,12 +1,23 @@
 package net.vonforst.evmap
 
 import android.content.Context
+import android.content.pm.ApplicationInfo
+import android.content.pm.PackageInfo
+import android.content.pm.PackageManager
 import android.content.res.Configuration
 import android.graphics.Typeface
+import android.icu.util.LocaleData
+import android.icu.util.ULocale
+import android.os.Build
 import android.os.Bundle
-import android.text.*
+import android.text.Spannable
+import android.text.SpannableString
+import android.text.SpannableStringBuilder
+import android.text.SpannedString
+import android.text.TextUtils
 import android.text.style.StyleSpan
-import java.util.*
+import net.vonforst.evmap.storage.PreferenceDataSource
+import java.util.Locale
 
 fun Bundle.optDouble(name: String): Double? {
     if (!this.containsKey(name)) return null
@@ -72,7 +83,7 @@ fun max(a: Int?, b: Int?): Int? {
      * otherwise the non-null value or null
      */
     return if (a != null && b != null) {
-        max(a, b)
+        kotlin.math.max(a, b)
     } else {
         a ?: b
     }
@@ -85,7 +96,47 @@ fun Context.isDarkMode() =
 
 const val kmPerMile = 1.609344
 const val meterPerFt = 0.3048
+const val ftPerMile = 5280
+const val ydPerMile = 1760
 
-fun shouldUseImperialUnits(): Boolean {
-    return Locale.getDefault().country in listOf("US", "GB", "MM", "LR")
+fun shouldUseImperialUnits(ctx: Context): Boolean {
+    val prefs = PreferenceDataSource(ctx)
+    return when (prefs.units) {
+        "metric" -> false
+        "imperial" -> true
+        else -> if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
+            when (LocaleData.getMeasurementSystem(ULocale.getDefault())) {
+                LocaleData.MeasurementSystem.US, LocaleData.MeasurementSystem.UK -> true
+                LocaleData.MeasurementSystem.SI -> false
+                else -> false
+            }
+        } else {
+            return Locale.getDefault().country in listOf("US", "GB", "MM", "LR")
+        }
+    }
+
+}
+
+fun PackageManager.getPackageInfoCompat(packageName: String, flags: Int = 0): PackageInfo =
+    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+        getPackageInfo(packageName, PackageManager.PackageInfoFlags.of(flags.toLong()))
+    } else {
+        @Suppress("DEPRECATION") getPackageInfo(packageName, flags)
+    }
+
+
+fun PackageManager.getApplicationInfoCompat(packageName: String, flags: Int = 0): ApplicationInfo =
+    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+        getApplicationInfo(packageName, PackageManager.ApplicationInfoFlags.of(flags.toLong()))
+    } else {
+        @Suppress("DEPRECATION") getApplicationInfo(packageName, flags)
+    }
+
+
+fun PackageManager.isAppInstalled(packageName: String): Boolean {
+    return try {
+        getApplicationInfoCompat(packageName, 0).enabled
+    } catch (e: PackageManager.NameNotFoundException) {
+        false
+    }
 }

app/src/main/java/net/vonforst/evmap/adapter/DataBindingAdapters.kt

@@ -22,6 +22,7 @@ import net.vonforst.evmap.databinding.ItemChargepriceVehicleChipBinding
 import net.vonforst.evmap.databinding.ItemConnectorButtonBinding
 import net.vonforst.evmap.model.Chargepoint
 import net.vonforst.evmap.ui.CheckableConstraintLayout
+import java.time.Instant
 
 interface Equatable {
     override fun equals(other: Any?): Boolean
@@ -31,6 +32,7 @@ abstract class DataBindingAdapter<T : Equatable>(getKey: ((T) -> Any)? = null) :
     ListAdapter<T, DataBindingAdapter.ViewHolder<T>>(DiffCallback(getKey)) {
 
     var onClickListener: ((T) -> Unit)? = null
+    var onLongClickListener: ((T) -> Boolean)? = null
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder<T> {
         val layoutInflater = LayoutInflater.from(parent.context)
@@ -55,6 +57,12 @@ abstract class DataBindingAdapter<T : Equatable>(getKey: ((T) -> Any)? = null) :
                 listener(item)
             }
         }
+        if (onLongClickListener != null) {
+            holder.binding.root.setOnLongClickListener {
+                val listener = onLongClickListener ?: return@setOnLongClickListener false
+                return@setOnLongClickListener listener(item)
+            }
+        }
     }
 
     class DiffCallback<T : Equatable>(val getKey: ((T) -> Any)?) : DiffUtil.ItemCallback<T>() {
@@ -88,10 +96,22 @@ class ConnectorAdapter : DataBindingAdapter<ConnectorAdapter.ChargepointWithAvai
     override fun getItemViewType(position: Int): Int = R.layout.item_connector
 }
 
-class ChargepriceAdapter() :
+class ConnectorDetailsAdapter : DataBindingAdapter<ConnectorDetailsAdapter.ConnectorDetails>() {
+    data class ConnectorDetails(
+        val status: ChargepointStatus?,
+        val evseId: String?,
+        val label: String?,
+        val lastChange: Instant?
+    ) :
+        Equatable
+
+    override fun getItemViewType(position: Int): Int = R.layout.dialog_connector_details_item
+}
+
+class ChargepriceAdapter :
     DataBindingAdapter<ChargePrice>() {
 
-    val viewPool = RecyclerView.RecycledViewPool();
+    val viewPool = RecyclerView.RecycledViewPool()
     var meta: ChargepriceChargepointMeta? = null
         set(value) {
             field = value
@@ -166,7 +186,7 @@ class CheckableConnectorAdapter : DataBindingAdapter<Chargepoint>() {
         root.setOnClickListener {
             root.isChecked = true
         }
-        root.setOnCheckedChangeListener { v: View, checked: Boolean ->
+        root.setOnCheckedChangeListener { _, checked: Boolean ->
             if (checked) {
                 checkedItem = holder.bindingAdapterPosition.takeIf { it != -1 }
                 root.post {
@@ -205,13 +225,13 @@ class CheckableChargepriceCarAdapter : DataBindingAdapter<ChargepriceCar>() {
         root.setOnClickListener {
             root.isChecked = true
         }
-        root.setOnCheckedChangeListener { v: View, checked: Boolean ->
+        root.setOnCheckedChangeListener { _, checked: Boolean ->
             if (checked && item != checkedItem) {
                 checkedItem = item
                 root.post {
                     notifyDataSetChanged()
+                    onCheckedItemChangedListener?.invoke(getCheckedItem()!!)
                 }
-                onCheckedItemChangedListener?.invoke(getCheckedItem()!!)
             }
         }
     }

app/src/main/java/net/vonforst/evmap/adapter/DetailsAdapter.kt

@@ -1,8 +1,15 @@
 package net.vonforst.evmap.adapter
 
 import android.content.Context
+import android.graphics.Typeface
+import android.text.Spannable
+import android.text.style.StyleSpan
 import androidx.core.text.HtmlCompat
+import androidx.core.text.buildSpannedString
 import net.vonforst.evmap.R
+import net.vonforst.evmap.api.availability.tesla.Pricing
+import net.vonforst.evmap.api.availability.tesla.Rates
+import net.vonforst.evmap.api.availability.tesla.TeslaChargingOwnershipGraphQlApi
 import net.vonforst.evmap.bold
 import net.vonforst.evmap.joinToSpannedString
 import net.vonforst.evmap.model.ChargeCard
@@ -10,6 +17,7 @@ import net.vonforst.evmap.model.ChargeCardId
 import net.vonforst.evmap.model.ChargeLocation
 import net.vonforst.evmap.model.OpeningHoursDays
 import net.vonforst.evmap.plus
+import net.vonforst.evmap.ui.currency
 import net.vonforst.evmap.utils.formatDMS
 import net.vonforst.evmap.utils.formatDecimal
 import java.time.ZoneId
@@ -41,11 +49,18 @@ fun buildDetails(
     loc: ChargeLocation?,
     chargeCards: Map<Long, ChargeCard>?,
     filteredChargeCards: Set<Long>?,
+    teslaPricing: Pricing?,
     ctx: Context
 ): List<DetailsAdapter.Detail> {
     if (loc == null) return emptyList()
 
     return listOfNotNull(
+        if (teslaPricing != null) DetailsAdapter.Detail(
+            R.drawable.ic_tesla,
+            R.string.cost,
+            formatTeslaPricing(teslaPricing, ctx),
+            formatTeslaParkingFee(teslaPricing, ctx)
+        ) else null,
         if (loc.address != null) DetailsAdapter.Detail(
             R.drawable.ic_address,
             R.string.address,
@@ -61,7 +76,8 @@ fun buildDetails(
         if (loc.network != null) DetailsAdapter.Detail(
             R.drawable.ic_network,
             R.string.network,
-            loc.network
+            loc.network,
+            clickable = loc.networkUrl != null
         ) else null,
         if (loc.faultReport != null) DetailsAdapter.Detail(
             R.drawable.ic_fault_report,
@@ -125,6 +141,128 @@ fun buildDetails(
     )
 }
 
+fun formatTeslaParkingFee(teslaPricing: Pricing, ctx: Context) =
+    teslaPricing.memberRates?.activePricebook?.parking?.let { parkingFee ->
+        ctx.getString(
+            R.string.tesla_pricing_blocking_fee,
+            formatTeslaPricingRate(parkingFee.rates, parkingFee.currencyCode, parkingFee.uom, ctx)
+        )
+    }
+
+fun formatTeslaPricing(teslaPricing: Pricing, ctx: Context) =
+    buildSpannedString {
+        teslaPricing.memberRates?.let { memberRates ->
+            append(
+                ctx.getString(if (teslaPricing.userRates != null) R.string.tesla_pricing_members else R.string.tesla_pricing_owners),
+                StyleSpan(Typeface.BOLD),
+                Spannable.SPAN_EXCLUSIVE_EXCLUSIVE
+            )
+            append(formatTeslaPricingRates(memberRates, ctx))
+        }
+        teslaPricing.userRates?.let { userRates ->
+            append("\n\n")
+            append(
+                ctx.getString(R.string.tesla_pricing_others),
+                StyleSpan(Typeface.BOLD),
+                Spannable.SPAN_EXCLUSIVE_EXCLUSIVE
+            )
+            append(formatTeslaPricingRates(userRates, ctx))
+        }
+    }
+
+private fun formatTeslaPricingRates(rates: Rates, ctx: Context) =
+    buildSpannedString {
+        val timeFmt = DateTimeFormatter.ofLocalizedTime(FormatStyle.SHORT)
+        if (rates.activePricebook.charging.touRates.enabled) {
+            // time-of-day-based rates
+            val ratesByTime = rates.activePricebook.charging.touRates.activeRatesByTime
+            val distinctRates =
+                ratesByTime.map { it.rates }.distinct().sortedByDescending { it.max() }
+            if (distinctRates.size == 2) {
+                // special case: only list periods with higher price
+                val highPriceTimes = ratesByTime.filter { it.rates == distinctRates[0] }
+                append("\n")
+                append(highPriceTimes.joinToString(", ") {
+                    timeFmt.format(it.startTime) + " - " + timeFmt.format(it.endTime)
+                } + ": ", StyleSpan(Typeface.ITALIC), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE)
+                append(
+                    formatTeslaPricingRate(
+                        distinctRates[0],
+                        rates.activePricebook.charging.currencyCode,
+                        rates.activePricebook.charging.uom,
+                        ctx
+                    )
+                )
+                append("\n")
+                append(
+                    ctx.getString(R.string.tesla_pricing_other_times),
+                    StyleSpan(Typeface.ITALIC),
+                    Spannable.SPAN_EXCLUSIVE_EXCLUSIVE
+                )
+                append(" ")
+                append(
+                    formatTeslaPricingRate(
+                        distinctRates[1],
+                        rates.activePricebook.charging.currencyCode,
+                        rates.activePricebook.charging.uom,
+                        ctx
+                    )
+                )
+            } else {
+                // general case
+                ratesByTime.forEach { rate ->
+                    append("\n")
+                    append(
+                        timeFmt.format(rate.startTime) + " - " + timeFmt.format(rate.endTime) + ": ",
+                        StyleSpan(Typeface.ITALIC),
+                        Spannable.SPAN_EXCLUSIVE_EXCLUSIVE
+                    )
+                    append(
+                        formatTeslaPricingRate(
+                            rate.rates,
+                            rates.activePricebook.charging.currencyCode,
+                            rates.activePricebook.charging.uom,
+                            ctx
+                        )
+                    )
+                }
+            }
+        } else {
+            // fixed rates
+            append(" ")
+            append(
+                formatTeslaPricingRate(
+                    rates.activePricebook.charging.rates,
+                    rates.activePricebook.charging.currencyCode,
+                    rates.activePricebook.charging.uom,
+                    ctx
+                )
+            )
+        }
+    }
+
+private fun formatTeslaPricingRate(
+    rates: List<Double>,
+    currencyCode: String,
+    uom: String,
+    ctx: Context
+): String {
+    if (rates.isEmpty()) return ""
+    val rate = rates.max()
+    val value = ctx.getString(
+        when (uom) {
+            "kwh" -> R.string.charge_price_kwh_format
+            "min" -> R.string.charge_price_minute_format
+            else -> return ""
+        }, rate, currency(currencyCode)
+    )
+    return if (rates.size > 1) {
+        ctx.getString(R.string.pricing_up_to, value)
+    } else {
+        value
+    }
+}
+
 fun formatChargeCards(
     chargecards: List<ChargeCardId>,
     chargecardData: Map<Long, ChargeCard>?,

app/src/main/java/net/vonforst/evmap/adapter/FilterProfilesAdapter.kt

@@ -25,7 +25,7 @@ class FilterProfilesAdapter(
         super.bind(holder, item)
 
         val binding = holder.binding as ItemFilterProfileBinding
-        binding.handle.setOnTouchListener { v, event ->
+        binding.handle.setOnTouchListener { _, event ->
             if (event?.action == MotionEvent.ACTION_DOWN) {
                 dragHelper.startDrag(holder)
             }

app/src/main/java/net/vonforst/evmap/adapter/GalleryAdapter.kt

@@ -5,14 +5,13 @@ import android.content.Context
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.view.ViewTreeObserver.OnGlobalLayoutListener
 import android.widget.ImageView
 import androidx.recyclerview.widget.DiffUtil
 import androidx.recyclerview.widget.ListAdapter
 import androidx.recyclerview.widget.RecyclerView
 import coil.load
 import coil.memory.MemoryCache
-import coil.size.OriginalSize
-import coil.size.SizeResolver
 import net.vonforst.evmap.R
 import net.vonforst.evmap.model.ChargerPhoto
 
@@ -37,27 +36,43 @@ class GalleryAdapter(context: Context, val itemClickListener: ItemClickListener?
     }
 
     override fun onBindViewHolder(holder: ViewHolder, position: Int) {
-        val id = getItem(position).id
-        val url = getItem(position).getUrl(height = holder.view.height)
+        val item = getItem(position)
 
-        holder.view.load(
-            url
-        ) {
-            size(SizeResolver(OriginalSize))
-            allowHardware(false)
-            listener(
-                onSuccess = { _, metadata ->
-                    memoryKeys[id] = metadata.memoryCacheKey
+        if (holder.view.height == 0) {
+            holder.view.viewTreeObserver.addOnGlobalLayoutListener(object : OnGlobalLayoutListener {
+                override fun onGlobalLayout() {
+                    holder.view.viewTreeObserver.removeOnGlobalLayoutListener(this)
+                    loadImage(item, holder)
                 }
-            )
+            })
+        } else {
+            loadImage(item, holder)
         }
 
         if (itemClickListener != null) {
             holder.view.setOnClickListener {
-                itemClickListener.onItemClick(holder.view, position, memoryKeys[id])
+                itemClickListener.onItemClick(holder.view, position, memoryKeys[item.id])
             }
         }
     }
+
+    private fun loadImage(
+        item: ChargerPhoto,
+        holder: ViewHolder
+    ) {
+        val url = item.getUrl(height = holder.view.height)
+
+        holder.view.load(
+            url
+        ) {
+            listener(
+                onSuccess = { _, metadata ->
+                    memoryKeys[item.id] = metadata.memoryCacheKey
+                }
+            )
+            allowHardware(false)
+        }
+    }
 }
 
 class ChargerPhotoDiffCallback : DiffUtil.ItemCallback<ChargerPhoto>() {

app/src/main/java/net/vonforst/evmap/api/ChargepointApi.kt

@@ -8,23 +8,36 @@ import net.vonforst.evmap.api.goingelectric.GoingElectricApiWrapper
 import net.vonforst.evmap.api.openchargemap.OpenChargeMapApiWrapper
 import net.vonforst.evmap.model.*
 import net.vonforst.evmap.viewmodel.Resource
+import java.time.Duration
+import java.time.Instant
 
 interface ChargepointApi<out T : ReferenceData> {
+    /**
+     * Query for chargepoints within certain geographic bounds
+     */
     suspend fun getChargepoints(
         referenceData: ReferenceData,
         bounds: LatLngBounds,
         zoom: Float,
+        useClustering: Boolean,
         filters: FilterValues?
-    ): Resource<List<ChargepointListItem>>
+    ): Resource<ChargepointList>
 
+    /**
+     * Query for chargepoints within a given radius in kilometers
+     */
     suspend fun getChargepointsRadius(
         referenceData: ReferenceData,
         location: LatLng,
         radius: Int,
         zoom: Float,
+        useClustering: Boolean,
         filters: FilterValues?
-    ): Resource<List<ChargepointListItem>>
+    ): Resource<ChargepointList>
 
+    /**
+     * Fetches detailed data for a specific charging site
+     */
     suspend fun getChargepointDetail(
         referenceData: ReferenceData,
         id: Long
@@ -34,8 +47,17 @@ interface ChargepointApi<out T : ReferenceData> {
 
     fun getFilters(referenceData: ReferenceData, sp: StringProvider): List<Filter<FilterValue>>
 
+    fun convertFiltersToSQL(filters: FilterValues, referenceData: ReferenceData): FiltersSQLQuery
+
+    fun filteringInSQLRequiresDetails(filters: FilterValues): Boolean
+
     val name: String
     val id: String
+
+    /**
+     * Duration we are limited to if there is a required API local cache time limit.
+     */
+    val cacheLimit: Duration
 }
 
 interface StringProvider {
@@ -66,4 +88,16 @@ fun createApi(type: String, ctx: Context): ChargepointApi<ReferenceData> {
         }
         else -> throw IllegalArgumentException()
     }
+}
+
+data class FiltersSQLQuery(
+    val query: String,
+    val requiresChargepointQuery: Boolean,
+    val requiresChargeCardQuery: Boolean
+)
+
+data class ChargepointList(val items: List<ChargepointListItem>, val isComplete: Boolean) {
+    companion object {
+        fun empty() = ChargepointList(emptyList(), true)
+    }
 }

app/src/main/java/net/vonforst/evmap/api/RateLimitInterceptor.kt

@@ -10,7 +10,7 @@ class RateLimitInterceptor : Interceptor {
 
     override fun intercept(chain: Interceptor.Chain): Response {
         val request = chain.request()
-        if (request.url.host == "my.newmotion.com") {
+        if (request.url.host == "ui-map.shellrecharge.com") {
             // limit requests sent to NewMotion to 3 per second
             rateLimiter.acquire(1)
 

app/src/main/java/net/vonforst/evmap/api/availability/AvailabilityDetector.kt

@@ -1,15 +1,21 @@
 package net.vonforst.evmap.api.availability
 
-import com.facebook.stetho.okhttp3.StethoInterceptor
+import android.content.Context
+import android.os.Parcelable
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
+import kotlinx.parcelize.Parcelize
+import net.vonforst.evmap.addDebugInterceptors
 import net.vonforst.evmap.api.RateLimitInterceptor
 import net.vonforst.evmap.api.await
+import net.vonforst.evmap.api.chargeprice.ChargepriceApi
 import net.vonforst.evmap.api.equivalentPlugTypes
 import net.vonforst.evmap.cartesianProduct
 import net.vonforst.evmap.model.ChargeLocation
 import net.vonforst.evmap.model.Chargepoint
+import net.vonforst.evmap.storage.EncryptedPreferenceDataStore
 import net.vonforst.evmap.viewmodel.Resource
+import okhttp3.Cache
 import okhttp3.JavaNetCookieJar
 import okhttp3.OkHttpClient
 import okhttp3.Request
@@ -17,6 +23,7 @@ import retrofit2.HttpException
 import java.io.IOException
 import java.net.CookieManager
 import java.net.CookiePolicy
+import java.time.Instant
 import java.util.concurrent.TimeUnit
 
 interface AvailabilityDetector {
@@ -71,19 +78,19 @@ abstract class BaseAvailabilityDetector(private val client: OkHttpClient) : Avai
             connectors: Map<Long, Pair<Double, String>>,
             chargepoints: List<Chargepoint>
         ): Map<Chargepoint, Set<Long>> {
-            var chargepoints = chargepoints
+            var cpts = chargepoints
 
             // iterate over each connector type
             val types = connectors.map { it.value.second }.distinct().toSet()
             val equivalentTypes = types.map { equivalentPlugTypes(it).plus(it) }.cartesianProduct()
-            var geTypes = chargepoints.map { it.type }.distinct().toSet()
+            var geTypes = cpts.map { it.type }.distinct().toSet()
             if (!equivalentTypes.any { it == geTypes } && geTypes.size > 1 && geTypes.contains(
                     Chargepoint.SCHUKO
                 )) {
                 // If charger has household plugs and other plugs, try removing the household plugs
                 // (common e.g. in Hamburg -> 2x Type 2 + 2x Schuko, but NM only lists Type 2)
                 geTypes = geTypes.filter { it != Chargepoint.SCHUKO }.toSet()
-                chargepoints = chargepoints.filter { it.type != Chargepoint.SCHUKO }
+                cpts = cpts.filter { it.type != Chargepoint.SCHUKO }
             }
             if (!equivalentTypes.any { it == geTypes }) throw AvailabilityDetectorException("chargepoints do not match")
             return types.flatMap { type ->
@@ -93,14 +100,14 @@ abstract class BaseAvailabilityDetector(private val client: OkHttpClient) : Avai
                 val powers = connsOfType.map { it.value.first }.distinct().sorted()
                 // find corresponding powers in GE data
                 val gePowers =
-                    chargepoints.filter { equivalentPlugTypes(it.type).any { it == type } }
+                    cpts.filter { equivalentPlugTypes(it.type).any { it == type } }
                         .mapNotNull { it.power }.distinct().sorted()
 
                 // if the distinct number of powers is the same, try to match.
                 if (powers.size == gePowers.size) {
                     gePowers.zip(powers).map { (gePower, power) ->
                         val chargepoint =
-                            chargepoints.find { equivalentPlugTypes(it.type).any { it == type } && it.power == gePower }!!
+                            cpts.find { equivalentPlugTypes(it.type).any { it == type } && it.power == gePower }!!
                         val ids = connsOfType.filter { it.value.first == power }.keys
                         if (chargepoint.count != ids.size) {
                             throw AvailabilityDetectorException("chargepoints do not match")
@@ -108,7 +115,7 @@ abstract class BaseAvailabilityDetector(private val client: OkHttpClient) : Avai
                         chargepoint to ids
                     }
                 } else if (powers.size == 1 && gePowers.size == 2
-                    && chargepoints.sumOf { it.count } == connsOfType.size
+                    && cpts.sumOf { it.count } == connsOfType.size
                 ) {
                     // special case: dual charger(s) with load balancing
                     // GoingElectric shows 2 different powers, NewMotion just one
@@ -116,7 +123,7 @@ abstract class BaseAvailabilityDetector(private val client: OkHttpClient) : Avai
                     var i = 0
                     gePowers.map { gePower ->
                         val chargepoint =
-                            chargepoints.find { it.type in equivalentPlugTypes(type) && it.power == gePower }!!
+                            cpts.find { it.type in equivalentPlugTypes(type) && it.power == gePower }!!
                         val ids = allIds.subList(i, i + chargepoint.count).toSet()
                         i += chargepoint.count
                         chargepoint to ids
@@ -133,7 +140,11 @@ abstract class BaseAvailabilityDetector(private val client: OkHttpClient) : Avai
 data class ChargeLocationStatus(
     val status: Map<Chargepoint, List<ChargepointStatus>>,
     val source: String,
-    val evseIds: Map<Chargepoint, List<String>>? = null
+    val evseIds: Map<Chargepoint, List<String>>? = null,
+    val labels: Map<Chargepoint, List<String?>>? = null,
+    val congestionHistogram: List<Double>? = null,
+    val lastChange: Map<Chargepoint, List<Instant?>>? = null,
+    val extraData: Any? = null  // API-specific data
 ) {
     fun applyFilters(connectors: Set<String>?, minPower: Int?): ChargeLocationStatus {
         val statusFiltered = status.filterKeys {
@@ -148,48 +159,73 @@ data class ChargeLocationStatus(
     val totalChargepoints = status.map { it.key.count }.sum()
 }
 
-enum class ChargepointStatus {
+@Parcelize
+enum class ChargepointStatus : Parcelable {
     AVAILABLE, UNKNOWN, CHARGING, OCCUPIED, FAULTED
 }
 
 class AvailabilityDetectorException(message: String) : Exception(message)
 
+class NotSignedInException : IOException("not signed in")
+
 private val cookieManager = CookieManager().apply {
     setCookiePolicy(CookiePolicy.ACCEPT_ALL)
 }
 
-private val okhttp = OkHttpClient.Builder()
-    .addInterceptor(RateLimitInterceptor())
-    .addNetworkInterceptor(StethoInterceptor())
-    .readTimeout(10, TimeUnit.SECONDS)
-    .connectTimeout(10, TimeUnit.SECONDS)
-    .cookieJar(JavaNetCookieJar(cookieManager))
-    .build()
-val availabilityDetectors = listOf(
-    RheinenergieAvailabilityDetector(okhttp),
-    EnBwAvailabilityDetector(okhttp),
-    NewMotionAvailabilityDetector(okhttp)
-)
+class AvailabilityRepository(context: Context) {
+    private val cacheSize = 5L * 1024 * 1024 // 5MB
+    private val okhttp = OkHttpClient.Builder()
+        .addInterceptor(RateLimitInterceptor())
+        .addDebugInterceptors()
+        .readTimeout(10, TimeUnit.SECONDS)
+        .connectTimeout(10, TimeUnit.SECONDS)
+        .cookieJar(JavaNetCookieJar(cookieManager))
+        .cache(Cache(context.cacheDir, cacheSize))
+        .build()
+    private val teslaOwnerAvailabilityDetector =
+        TeslaOwnerAvailabilityDetector(okhttp, EncryptedPreferenceDataStore(context))
+    private val availabilityDetectors = listOf(
+        RheinenergieAvailabilityDetector(okhttp),
+        teslaOwnerAvailabilityDetector,
+        TeslaGuestAvailabilityDetector(okhttp),
+        EnBwAvailabilityDetector(okhttp),
+        NewMotionAvailabilityDetector(okhttp)
+    )
 
-suspend fun getAvailability(charger: ChargeLocation): Resource<ChargeLocationStatus> {
-    var value: Resource<ChargeLocationStatus>? = null
-    withContext(Dispatchers.IO) {
-        for (ad in availabilityDetectors) {
-            if (!ad.isChargerSupported(charger)) continue
-            try {
-                value = Resource.success(ad.getAvailability(charger))
-                break
-            } catch (e: IOException) {
-                value = Resource.error(e.message, null)
-                e.printStackTrace()
-            } catch (e: HttpException) {
-                value = Resource.error(e.message, null)
-                e.printStackTrace()
-            } catch (e: AvailabilityDetectorException) {
-                value = Resource.error(e.message, null)
-                e.printStackTrace()
+    suspend fun getAvailability(charger: ChargeLocation): Resource<ChargeLocationStatus> {
+        var result: ChargeLocationStatus? = null
+        var exception: Throwable? = null
+
+        withContext(Dispatchers.IO) {
+            for (ad in availabilityDetectors) {
+                if (!ad.isChargerSupported(charger)) continue
+                try {
+                    result = ad.getAvailability(charger)
+                    break
+                } catch (e: IOException) {
+                    exception = exception.takeIf { it is NotSignedInException } ?: e
+                    e.printStackTrace()
+                } catch (e: HttpException) {
+                    exception = exception.takeIf { it is NotSignedInException } ?: e
+                    e.printStackTrace()
+                } catch (e: AvailabilityDetectorException) {
+                    exception = exception.takeIf { it is NotSignedInException } ?: e
+                    e.printStackTrace()
+                } catch (e: NotSignedInException) {
+                    exception = e
+                    e.printStackTrace()
+                }
             }
         }
+        result?.let {
+            return Resource.success(it)
+        }
+        return Resource.error(exception?.message, null)
     }
-    return value ?: Resource.error(null, null)
+
+    fun isSupercharger(charger: ChargeLocation) =
+        teslaOwnerAvailabilityDetector.isChargerSupported(charger)
+
+    fun isTeslaSupported(charger: ChargeLocation) =
+        teslaOwnerAvailabilityDetector.isChargerSupported(charger) && teslaOwnerAvailabilityDetector.isSignedIn()
 }

app/src/main/java/net/vonforst/evmap/api/availability/ChargecloudAvailabilityDetector.kt

@@ -51,7 +51,7 @@ interface ChargecloudApi {
     )
 
     companion object {
-        fun create(client: OkHttpClient, baseUrl: String? = null): ChargecloudApi {
+        fun create(client: OkHttpClient, baseUrl: String): ChargecloudApi {
             val retrofit = Retrofit.Builder()
                 .baseUrl(baseUrl)
                 .addConverterFactory(MoshiConverterFactory.create())

app/src/main/java/net/vonforst/evmap/api/availability/EnBwAvailabilityDetector.kt

@@ -1,6 +1,10 @@
 package net.vonforst.evmap.api.availability
 
+import com.squareup.moshi.FromJson
 import com.squareup.moshi.JsonClass
+import com.squareup.moshi.Moshi
+import com.squareup.moshi.ToJson
+import net.vonforst.evmap.api.availability.tesla.LocalTimeAdapter
 import net.vonforst.evmap.model.ChargeLocation
 import net.vonforst.evmap.model.Chargepoint
 import net.vonforst.evmap.utils.distanceBetween
@@ -10,9 +14,11 @@ import retrofit2.converter.moshi.MoshiConverterFactory
 import retrofit2.http.GET
 import retrofit2.http.Path
 import retrofit2.http.Query
+import java.time.Instant
+import java.time.LocalTime
 
 private const val coordRange = 0.005  // range of latitude and longitude for loading the map
-private const val maxDistance = 40  // max distance between reported positions in meters
+private const val maxDistance = 60  // max distance between reported positions in meters
 
 interface EnBwApi {
     @GET("chargestations?grouping=false")
@@ -53,7 +59,8 @@ interface EnBwApi {
     data class EnBwChargePoint(
         val evseId: String?,
         val status: String,
-        val connectors: List<EnBwConnector>
+        val connectors: List<EnBwConnector>,
+        val state: EnBwState?
     )
 
     @JsonClass(generateAdapter = true)
@@ -70,6 +77,11 @@ interface EnBwApi {
         val upperRightLon: Double
     )
 
+    @JsonClass(generateAdapter = true)
+    data class EnBwState(
+        val updatedAt: Instant?
+    )
+
     companion object {
         fun create(client: OkHttpClient, baseUrl: String? = null): EnBwApi {
             val clientWithInterceptor = client.newBuilder()
@@ -85,7 +97,11 @@ interface EnBwApi {
                 }.build()
             val retrofit = Retrofit.Builder()
                 .baseUrl(baseUrl ?: "https://enbw-emp.azure-api.net/emobility-public-api/api/v1/")
-                .addConverterFactory(MoshiConverterFactory.create())
+                .addConverterFactory(
+                    MoshiConverterFactory.create(
+                        Moshi.Builder().add(InstantAdapter()).build()
+                    )
+                )
                 .client(clientWithInterceptor)
                 .build()
             return retrofit.create(EnBwApi::class.java)
@@ -93,6 +109,23 @@ interface EnBwApi {
     }
 }
 
+internal class InstantAdapter {
+    @FromJson
+    fun fromJson(value: Long?): Instant? = value?.let {
+        Instant.ofEpochMilli(it)
+    }
+
+    @ToJson
+    fun toJson(value: Instant?): Long? = value?.toEpochMilli()
+}
+
+data class EnBwStatus(
+    val conn: EnBwApi.EnBwConnector,
+    val status: String,
+    val evseId: String?,
+    val lastChange: Instant?
+)
+
 class EnBwAvailabilityDetector(client: OkHttpClient, baseUrl: String? = null) :
     BaseAvailabilityDetector(client) {
     val api = EnBwApi.create(client, baseUrl)
@@ -117,6 +150,7 @@ class EnBwAvailabilityDetector(client: OkHttpClient, baseUrl: String? = null) :
                 listOf(it)
             }
         }
+        if (markers.any { it.grouped }) throw AvailabilityDetectorException("markers still grouped")
 
         val nearest = markers.minByOrNull { marker ->
             distanceBetween(marker.lat, marker.lon, lat, lng)
@@ -132,34 +166,39 @@ class EnBwAvailabilityDetector(client: OkHttpClient, baseUrl: String? = null) :
             throw AvailabilityDetectorException("no candidates found")
         }
 
-        // combine related stations
-        markers = markers.filter { marker ->
-            distanceBetween(
-                marker.lat,
-                marker.lon,
-                nearest.lat,
-                nearest.lon
-            ) < maxDistance
+        if (nearest.numberOfChargePoints < location.totalChargepoints) {
+            // combine related stations
+            markers = markers.filter { marker ->
+                distanceBetween(
+                    marker.lat,
+                    marker.lon,
+                    nearest.lat,
+                    nearest.lon
+                ) < maxDistance
+            }.filter {
+                // only include stations from same operator
+                it.operator == nearest.operator && it.stationId != null
+            }
+        } else {
+            markers = listOf(nearest)
         }
 
-        var details = markers.filter {
-            // only include stations from same operator
-            it.operator == nearest.operator && it.stationId != null
-        }.map {
+        val details = markers.mapNotNull { it.stationId }.map {
             // load details
-            api.getLocation(it.stationId!!)
+            api.getLocation(it)
         }
 
         val connectorStatus = details.flatMap { it.chargePoints }.flatMap { cp ->
             cp.connectors.map { connector ->
-                Triple(connector, cp.status, cp.evseId)
+                EnBwStatus(connector, cp.status, cp.evseId, cp.state?.updatedAt)
             }
         }
 
         val enbwConnectors = mutableMapOf<Long, Pair<Double, String>>()
         val enbwStatus = mutableMapOf<Long, ChargepointStatus>()
         val enbwEvseId = mutableMapOf<Long, String>()
-        connectorStatus.forEachIndexed { index, (connector, statusStr, evseId) ->
+        val enbwLastChange = mutableMapOf<Long, Instant?>()
+        connectorStatus.forEachIndexed { index, (connector, statusStr, evseId, updatedAt) ->
             val id = index.toLong()
             val power = connector.maxPowerInKw ?: 0.0
             val type = when (connector.plugTypeName) {
@@ -182,6 +221,7 @@ class EnBwAvailabilityDetector(client: OkHttpClient, baseUrl: String? = null) :
             }
             enbwConnectors[id] = power to type
             enbwStatus[id] = status
+            enbwLastChange[id] = updatedAt
             evseId?.let { enbwEvseId[id] = it }
         }
 
@@ -192,10 +232,13 @@ class EnBwAvailabilityDetector(client: OkHttpClient, baseUrl: String? = null) :
         val evseIds = if (enbwEvseId.size == enbwStatus.size) match.mapValues { entry ->
             entry.value.map { enbwEvseId[it]!! }
         } else null
+        val lastChange =
+            if (enbwLastChange.size == enbwStatus.size) match.mapValues { entry -> entry.value.map { enbwLastChange[it] } } else null
         return ChargeLocationStatus(
             chargepointStatus,
             "EnBW",
-            evseIds
+            evseIds,
+            lastChange = lastChange
         )
     }
 
@@ -203,30 +246,46 @@ class EnBwAvailabilityDetector(client: OkHttpClient, baseUrl: String? = null) :
         val country = charger.chargepriceData?.country
             ?: charger.address?.country ?: return false
         return when (charger.dataSource) {
-            // list of countries as of 2021/06/30, according to
-            // https://www.electrive.net/2021/06/30/enbw-expandiert-mit-ladenetz-in-drei-weitere-laender/
+            // list of countries as of 2023/04/14, according to
+            // https://www.enbw.com/elektromobilitaet/produkte/ladetarife
             "goingelectric" -> country in listOf(
                 "Deutschland",
                 "Österreich",
                 "Schweiz",
-                "Frankreich",
                 "Belgien",
-                "Niederlande",
-                "Luxemburg",
-                "Liechtenstein",
+                "Dänemark",
+                "Frankreich",
                 "Italien",
-            )
+                "Kroatien",
+                "Liechtenstein",
+                "Luxemburg",
+                "Niederlande",
+                "Polen",
+                "Schweden",
+                "Slowakei",
+                "Slowenien",
+                "Spanien",
+                "Tschechien"
+            ) && charger.network != "Tesla Supercharger"
             "openchargemap" -> country in listOf(
                 "DE",
                 "AT",
                 "CH",
-                "FR",
                 "BE",
-                "NE",
-                "LU",
+                "DK",
+                "FR",
+                "IT",
+                "HR",
                 "LI",
-                "IT"
-            )
+                "LU",
+                "NE",
+                "PL",
+                "SE",
+                "SK",
+                "SI",
+                "ES",
+                "CZ"
+            ) && charger.chargepriceData?.network !in listOf("23", "3534")
             else -> false
         }
     }

app/src/main/java/net/vonforst/evmap/api/availability/NewMotionAvailabilityDetector.kt

@@ -1,6 +1,10 @@
 package net.vonforst.evmap.api.availability
 
+import androidx.car.app.model.DateTimeWithZone
+import com.squareup.moshi.FromJson
 import com.squareup.moshi.JsonClass
+import com.squareup.moshi.Moshi
+import com.squareup.moshi.ToJson
 import net.vonforst.evmap.model.ChargeLocation
 import net.vonforst.evmap.model.Chargepoint
 import net.vonforst.evmap.utils.distanceBetween
@@ -9,25 +13,31 @@ import retrofit2.Retrofit
 import retrofit2.converter.moshi.MoshiConverterFactory
 import retrofit2.http.GET
 import retrofit2.http.Path
+import java.time.Instant
+import java.time.LocalDateTime
+import java.time.ZoneOffset
+import java.time.ZonedDateTime
+import java.time.format.DateTimeParseException
 import java.util.*
 
 private const val coordRange = 0.005  // range of latitude and longitude for loading the map
-private const val maxDistance = 40  // max distance between reported positions in meters
+private const val maxDistance = 60  // max distance between reported positions in meters
 
 interface NewMotionApi {
-    @GET("markers/{lngMin}/{lngMax}/{latMin}/{latMax}")
+    @GET("markers/{lngMin}/{lngMax}/{latMin}/{latMax}/{zoom}")
     suspend fun getMarkers(
         @Path("lngMin") lngMin: Double,
         @Path("lngMax") lngMax: Double,
         @Path("latMin") latMin: Double,
-        @Path("latMax") latMax: Double
+        @Path("latMax") latMax: Double,
+        @Path("zoom") zoom: Int = 22
     ): List<NMMarker>
 
     @GET("locations/{id}")
     suspend fun getLocation(@Path("id") id: Long): NMLocation
 
     @JsonClass(generateAdapter = true)
-    data class NMMarker(val coordinates: NMCoordinates, val locationUid: Long)
+    data class NMMarker(val coordinates: NMCoordinates, val locationUid: Long, val evseCount: Int)
 
     @JsonClass(generateAdapter = true)
     data class NMCoordinates(val latitude: Double, val longitude: Double)
@@ -41,7 +51,12 @@ interface NewMotionApi {
     )
 
     @JsonClass(generateAdapter = true)
-    data class NMEvse(val evseId: String?, val status: String, val connectors: List<NMConnector>)
+    data class NMEvse(
+        val evseId: String?,
+        val status: String,
+        val connectors: List<NMConnector>,
+        val updated: ZonedDateTime?
+    )
 
     @JsonClass(generateAdapter = true)
     data class NMConnector(
@@ -76,8 +91,12 @@ interface NewMotionApi {
     companion object {
         fun create(client: OkHttpClient, baseUrl: String? = null): NewMotionApi {
             val retrofit = Retrofit.Builder()
-                .baseUrl(baseUrl ?: "https://my.newmotion.com/api/map/v2/")
-                .addConverterFactory(MoshiConverterFactory.create())
+                .baseUrl(baseUrl ?: "https://ui-map.shellrecharge.com/api/map/v2/")
+                .addConverterFactory(
+                    MoshiConverterFactory.create(
+                        Moshi.Builder().add(ZonedDateTimeAdapter()).build()
+                    )
+                )
                 .client(client)
                 .build()
             return retrofit.create(NewMotionApi::class.java)
@@ -85,6 +104,21 @@ interface NewMotionApi {
     }
 }
 
+internal class ZonedDateTimeAdapter {
+    @FromJson
+    fun fromJson(value: String): ZonedDateTime? = ZonedDateTime.parse(value)
+
+    @ToJson
+    fun toJson(value: ZonedDateTime): String = value.toString()
+}
+
+data class NmStatus(
+    val conn: NewMotionApi.NMConnector,
+    val status: String,
+    val evseId: String?,
+    val updated: ZonedDateTime?
+)
+
 class NewMotionAvailabilityDetector(client: OkHttpClient, baseUrl: String? = null) :
     BaseAvailabilityDetector(client) {
     val api = NewMotionApi.create(client, baseUrl)
@@ -110,14 +144,18 @@ class NewMotionAvailabilityDetector(client: OkHttpClient, baseUrl: String? = nul
             throw AvailabilityDetectorException("no candidates found")
         }
 
-        // combine related stations
-        markers = markers.filter { marker ->
-            distanceBetween(
-                marker.coordinates.latitude,
-                marker.coordinates.longitude,
-                nearest.coordinates.latitude,
-                nearest.coordinates.longitude
-            ) < maxDistance
+        markers = if (nearest.evseCount < location.totalChargepoints) {
+            // combine related stations
+            markers.filter { marker ->
+                distanceBetween(
+                    marker.coordinates.latitude,
+                    marker.coordinates.longitude,
+                    nearest.coordinates.latitude,
+                    nearest.coordinates.longitude
+                ) < maxDistance
+            }
+        } else {
+            listOf(nearest)
         }
 
         // load details
@@ -130,17 +168,18 @@ class NewMotionAvailabilityDetector(client: OkHttpClient, baseUrl: String? = nul
         }
         val connectorStatus = details.flatMap { it.evses }.flatMap { evse ->
             evse.connectors.map { connector ->
-                Triple(connector, evse.status, evse.evseId)
+                NmStatus(connector, evse.status, evse.evseId, evse.updated)
             }
         }
 
         val nmConnectors = mutableMapOf<Long, Pair<Double, String>>()
         val nmStatus = mutableMapOf<Long, ChargepointStatus>()
         val nmEvseId = mutableMapOf<Long, String>()
-        connectorStatus.forEach { (connector, statusStr, evseId) ->
+        val nmUpdated = mutableMapOf<Long, ZonedDateTime>()
+        connectorStatus.forEach { (connector, statusStr, evseId, updated) ->
             val id = connector.uid
             val power = connector.electricalProperties.getPower()
-            val type = when (connector.connectorType.toLowerCase(Locale.ROOT)) {
+            val type = when (connector.connectorType.lowercase(Locale.ROOT)) {
                 "type3" -> Chargepoint.TYPE_3
                 "type2" -> Chargepoint.TYPE_2_UNKNOWN
                 "type1" -> Chargepoint.TYPE_1
@@ -163,6 +202,7 @@ class NewMotionAvailabilityDetector(client: OkHttpClient, baseUrl: String? = nul
             nmConnectors.put(id, power to type)
             nmStatus.put(id, status)
             evseId?.let { nmEvseId[id] = it }
+            updated?.let { nmUpdated[id] = it }
         }
 
         val match = matchChargepoints(nmConnectors, location.chargepointsMerged)
@@ -172,16 +212,22 @@ class NewMotionAvailabilityDetector(client: OkHttpClient, baseUrl: String? = nul
         val evseIds = if (nmEvseId.size == nmStatus.size) match.mapValues { entry ->
             entry.value.map { nmEvseId[it]!! }
         } else null
+        val updated = match.mapValues { entry -> entry.value.map { nmUpdated[it]?.toInstant() } }
         return ChargeLocationStatus(
             chargepointStatus,
             "NewMotion",
-            evseIds
+            evseIds,
+            lastChange = updated
         )
     }
 
     override fun isChargerSupported(charger: ChargeLocation): Boolean {
         // NewMotion is our fallback
-        return true
+        return when (charger.dataSource) {
+            "goingelectric" -> charger.network != "Tesla Supercharger"
+            "openchargemap" -> charger.chargepriceData?.network !in listOf("23", "3534")
+            else -> false
+        }
     }
 
 }

app/src/main/java/net/vonforst/evmap/api/availability/TeslaGuestAvailabilityDetector.kt

@@ -0,0 +1,173 @@
+package net.vonforst.evmap.api.availability
+
+import com.squareup.moshi.JsonDataException
+import kotlinx.coroutines.async
+import kotlinx.coroutines.coroutineScope
+import net.vonforst.evmap.api.availability.tesla.ChargerAvailability
+import net.vonforst.evmap.api.availability.tesla.TeslaChargingGuestGraphQlApi
+import net.vonforst.evmap.api.availability.tesla.TeslaCuaApi
+import net.vonforst.evmap.model.ChargeLocation
+import net.vonforst.evmap.model.Chargepoint
+import net.vonforst.evmap.utils.distanceBetween
+import okhttp3.OkHttpClient
+
+private const val coordRange = 0.005  // range of latitude and longitude for loading the map
+
+class TeslaGuestAvailabilityDetector(
+    client: OkHttpClient,
+    baseUrl: String? = null
+) :
+    BaseAvailabilityDetector(client) {
+
+    private var cuaApi = TeslaCuaApi.create(client, baseUrl)
+    private var api = TeslaChargingGuestGraphQlApi.create(client, baseUrl)
+
+    override suspend fun getAvailability(location: ChargeLocation): ChargeLocationStatus {
+        val results = cuaApi.getTeslaLocations()
+
+        val result =
+            results.minByOrNull {
+                if (it.latitude != null && it.longitude != null) {
+                    distanceBetween(
+                        it.latitude,
+                        it.longitude,
+                        location.coordinates.lat,
+                        location.coordinates.lng
+                    )
+                } else Double.POSITIVE_INFINITY
+            } ?: throw AvailabilityDetectorException("no candidates found.")
+
+        val resultDetails = try {
+            cuaApi.getTeslaLocation(result.locationId)
+        } catch (e: JsonDataException) {
+            // instead of a single location, this may also return an empty JSON list []. This is hard to fix with Moshi
+            if (e.message == "Expected BEGIN_OBJECT but was BEGIN_ARRAY at path \$") {
+                throw AvailabilityDetectorException("no candidates found.")
+            } else {
+                throw e
+            }
+        }
+        val trtId = resultDetails.trtId?.toLongOrNull()
+            ?: throw AvailabilityDetectorException("charger data not available through guest API")
+
+        val (detailsA, guestPricing) = coroutineScope {
+            val details = async {
+                api.getChargingSiteDetails(
+                    TeslaChargingGuestGraphQlApi.GetChargingSiteDetailsRequest(
+                        TeslaChargingGuestGraphQlApi.GetChargingSiteInformationVariables(
+                            TeslaChargingGuestGraphQlApi.Identifier(
+                                TeslaChargingGuestGraphQlApi.ChargingSiteIdentifier(
+                                    trtId
+                                )
+                            ),
+                            TeslaChargingGuestGraphQlApi.Experience.ADHOC
+                        )
+                    )
+                ).data.site ?: throw AvailabilityDetectorException("no candidates found.")
+            }
+            val guestPricing = async {
+                api.getChargingSiteDetails(
+                    TeslaChargingGuestGraphQlApi.GetChargingSiteDetailsRequest(
+                        TeslaChargingGuestGraphQlApi.GetChargingSiteInformationVariables(
+                            TeslaChargingGuestGraphQlApi.Identifier(
+                                TeslaChargingGuestGraphQlApi.ChargingSiteIdentifier(
+                                    trtId
+                                )
+                            ),
+                            TeslaChargingGuestGraphQlApi.Experience.GUEST
+                        )
+                    )
+                ).data.site?.pricing
+            }
+            details to guestPricing
+        }
+        val details = detailsA.await()
+
+        val scV2Connectors = location.chargepoints.filter { it.type == Chargepoint.SUPERCHARGER }
+        val scV2CCSConnectors = location.chargepoints.filter {
+            it.type in listOf(
+                Chargepoint.CCS_TYPE_2,
+                Chargepoint.CCS_UNKNOWN
+            ) && it.power != null && it.power <= 150
+        }
+        if (scV2CCSConnectors.sumOf { it.count } != 0 && scV2CCSConnectors.sumOf { it.count } != scV2Connectors.sumOf { it.count }) {
+            throw AvailabilityDetectorException("number of V2 connectors does not match number of V2 CCS connectors")
+        }
+        val scV3Connectors = location.chargepoints.filter {
+            it.type in listOf(
+                Chargepoint.CCS_TYPE_2,
+                Chargepoint.CCS_UNKNOWN
+            ) && it.power != null && it.power > 150
+        }
+        if (location.totalChargepoints != scV2Connectors.sumOf { it.count } + scV3Connectors.sumOf { it.count } + scV2CCSConnectors.sumOf { it.count }) throw AvailabilityDetectorException(
+            "charger has unknown connectors"
+        )
+
+        val chargerDetails = details.chargersAvailable.chargerDetails
+        val chargers = details.chargers.associateBy { it.id }
+        var detailsSorted = chargerDetails
+            .sortedBy { chargers[it.id]?.labelLetter }
+            .sortedBy { chargers[it.id]?.labelNumber }
+
+
+        if (detailsSorted.size != scV2Connectors.sumOf { it.count } + scV3Connectors.sumOf { it.count }) {
+            // apparently some connectors are missing in Tesla data
+            // If we have just one type of charger, we can still match
+            val numMissing =
+                scV2Connectors.sumOf { it.count } + scV3Connectors.sumOf { it.count } - detailsSorted.size
+            if ((scV2Connectors.isEmpty() || scV3Connectors.isEmpty()) && numMissing > 0) {
+                detailsSorted =
+                    detailsSorted + List(numMissing) {
+                        TeslaChargingGuestGraphQlApi.ChargerDetail(
+                            ChargerAvailability.UNKNOWN,
+                            ""
+                        )
+                    }
+            } else {
+                throw AvailabilityDetectorException("Tesla API chargepoints do not match data source")
+            }
+        }
+
+        val detailsMap =
+            mutableMapOf<Chargepoint, List<TeslaChargingGuestGraphQlApi.ChargerDetail>>()
+        var i = 0
+        for (connector in scV2Connectors) {
+            detailsMap[connector] =
+                detailsSorted.subList(i, i + connector.count)
+            i += connector.count
+        }
+        if (scV2CCSConnectors.isNotEmpty()) {
+            i = 0
+            for (connector in scV2CCSConnectors) {
+                detailsMap[connector] =
+                    detailsSorted.subList(i, i + connector.count)
+                i += connector.count
+            }
+        }
+        for (connector in scV3Connectors) {
+            detailsMap[connector] =
+                detailsSorted.subList(i, i + connector.count)
+            i += connector.count
+        }
+
+        val statusMap = detailsMap.mapValues { it.value.map { it.availability.toStatus() } }
+        val labelsMap = detailsMap.mapValues { it.value.map { chargers[it.id]?.label } }
+
+        val pricing = details.pricing.copy(memberRates = guestPricing.await()?.userRates)
+
+        return ChargeLocationStatus(
+            statusMap,
+            "Tesla",
+            labels = labelsMap,
+            extraData = pricing
+        )
+    }
+
+    override fun isChargerSupported(charger: ChargeLocation): Boolean {
+        return when (charger.dataSource) {
+            "goingelectric" -> charger.network == "Tesla Supercharger"
+            "openchargemap" -> charger.chargepriceData?.network in listOf("23", "3534")
+            else -> false
+        }
+    }
+}

app/src/main/java/net/vonforst/evmap/api/availability/TeslaOwnerAvailabilityDetector.kt

@@ -0,0 +1,200 @@
+package net.vonforst.evmap.api.availability
+
+import net.vonforst.evmap.api.availability.tesla.ChargerAvailability
+import net.vonforst.evmap.api.availability.tesla.TeslaAuthenticationApi
+import net.vonforst.evmap.api.availability.tesla.TeslaChargingGuestGraphQlApi
+import net.vonforst.evmap.api.availability.tesla.TeslaChargingOwnershipGraphQlApi
+import net.vonforst.evmap.api.availability.tesla.asTeslaCoord
+import net.vonforst.evmap.model.ChargeLocation
+import net.vonforst.evmap.model.Chargepoint
+import okhttp3.OkHttpClient
+import java.time.Instant
+import java.util.Collections
+
+private const val coordRange = 0.005  // range of latitude and longitude for loading the map
+
+class TeslaOwnerAvailabilityDetector(
+    private val client: OkHttpClient,
+    private val tokenStore: TokenStore,
+    private val baseUrl: String? = null
+) :
+    BaseAvailabilityDetector(client) {
+
+    private val authApi = TeslaAuthenticationApi.create(client, null)
+    private var api: TeslaChargingOwnershipGraphQlApi? = null
+
+    interface TokenStore {
+        var teslaRefreshToken: String?
+        var teslaAccessToken: String?
+        var teslaAccessTokenExpiry: Long
+    }
+
+    override suspend fun getAvailability(location: ChargeLocation): ChargeLocationStatus {
+        val api = initApi()
+        val req = TeslaChargingOwnershipGraphQlApi.GetNearbyChargingSitesRequest(
+            TeslaChargingOwnershipGraphQlApi.GetNearbyChargingSitesVariables(
+                TeslaChargingOwnershipGraphQlApi.GetNearbyChargingSitesArgs(
+                    location.coordinates.asTeslaCoord(),
+                    TeslaChargingOwnershipGraphQlApi.Coordinate(
+                        location.coordinates.lat + coordRange,
+                        location.coordinates.lng - coordRange
+                    ),
+                    TeslaChargingOwnershipGraphQlApi.Coordinate(
+                        location.coordinates.lat - coordRange,
+                        location.coordinates.lng + coordRange
+                    ),
+                    TeslaChargingOwnershipGraphQlApi.OpenToNonTeslasFilterValue(false)
+                )
+            )
+        )
+        val results = api.getNearbyChargingSites(
+            req,
+            req.operationName
+        ).data.charging?.nearbySites?.sitesAndDistances
+            ?: throw AvailabilityDetectorException("no candidates found.")
+        val result =
+            results.minByOrNull { it.haversineDistanceMiles.value }
+                ?: throw AvailabilityDetectorException("no candidates found.")
+
+        val details = api.getChargingSiteInformation(
+            TeslaChargingOwnershipGraphQlApi.GetChargingSiteInformationRequest(
+                TeslaChargingOwnershipGraphQlApi.GetChargingSiteInformationVariables(
+                    TeslaChargingOwnershipGraphQlApi.ChargingSiteIdentifier(result.id.text),
+                    TeslaChargingOwnershipGraphQlApi.VehicleMakeType.NON_TESLA
+                )
+            )
+        ).data.charging.site ?: throw AvailabilityDetectorException("no candidates found.")
+
+
+        val scV2Connectors = location.chargepoints.filter { it.type == Chargepoint.SUPERCHARGER }
+        val scV2CCSConnectors = location.chargepoints.filter {
+            it.type in listOf(
+                Chargepoint.CCS_TYPE_2,
+                Chargepoint.CCS_UNKNOWN
+            ) && it.power != null && it.power <= 150
+        }
+        if (scV2CCSConnectors.sumOf { it.count } != 0 && scV2CCSConnectors.sumOf { it.count } != scV2Connectors.sumOf { it.count }) {
+            throw AvailabilityDetectorException("number of V2 connectors does not match number of V2 CCS connectors")
+        }
+        val scV3Connectors = location.chargepoints.filter {
+            it.type in listOf(
+                Chargepoint.CCS_TYPE_2,
+                Chargepoint.CCS_UNKNOWN
+            ) && it.power != null && it.power > 150
+        }
+        if (location.totalChargepoints != scV2Connectors.sumOf { it.count } + scV3Connectors.sumOf { it.count } + scV2CCSConnectors.sumOf { it.count }) throw AvailabilityDetectorException(
+            "charger has unknown connectors"
+        )
+
+        val chargerDetails = details.siteDynamic.chargerDetails
+        val chargers = details.siteStatic.chargers.associateBy { it.id }
+        var detailsSorted = chargerDetails
+            .sortedBy { c -> c.charger.labelLetter ?: chargers[c.charger.id]?.labelLetter }
+            .sortedBy { c -> c.charger.labelNumber ?: chargers[c.charger.id]?.labelNumber }
+        if (detailsSorted.size != scV2Connectors.sumOf { it.count } + scV3Connectors.sumOf { it.count }) {
+            // apparently some connectors are missing in Tesla data
+            // If we have just one type of charger, we can still match
+            val numMissing =
+                scV2Connectors.sumOf { it.count } + scV3Connectors.sumOf { it.count } - detailsSorted.size
+            if ((scV2Connectors.isEmpty() || scV3Connectors.isEmpty()) && numMissing > 0) {
+                detailsSorted =
+                    detailsSorted + List(numMissing) {
+                        TeslaChargingOwnershipGraphQlApi.ChargerDetail(
+                            ChargerAvailability.UNKNOWN,
+                            TeslaChargingOwnershipGraphQlApi.ChargerId(
+                                TeslaChargingOwnershipGraphQlApi.Text(""),
+                                null,
+                                null
+                            )
+                        )
+                    }
+            } else {
+                throw AvailabilityDetectorException("Tesla API chargepoints do not match data source")
+            }
+        }
+
+        val detailsMap =
+            emptyMap<Chargepoint, List<TeslaChargingOwnershipGraphQlApi.ChargerDetail>>().toMutableMap()
+        var i = 0
+        for (connector in scV2Connectors) {
+            detailsMap[connector] =
+                detailsSorted.subList(i, i + connector.count)
+            i += connector.count
+        }
+        if (scV2CCSConnectors.isNotEmpty()) {
+            i = 0
+            for (connector in scV2CCSConnectors) {
+                detailsMap[connector] =
+                    detailsSorted.subList(i, i + connector.count)
+                i += connector.count
+            }
+        }
+        for (connector in scV3Connectors) {
+            detailsMap[connector] =
+                detailsSorted.subList(i, i + connector.count)
+            i += connector.count
+        }
+
+        val congestionHistogram = details.congestionPriceHistogram?.let { cph ->
+            val indexOfMidnight = cph.dataAttributes.indexOfFirst { it.label == "12AM" }
+            indexOfMidnight.takeIf { it >= 0 }?.let { index ->
+                val data = cph.data.toMutableList()
+                Collections.rotate(data, -index)
+                data
+            }
+        }
+
+        val statusMap = detailsMap.mapValues { it.value.map { it.availability.toStatus() } }
+        val labelsMap = detailsMap.mapValues {
+            it.value.map {
+                it.charger.label?.value ?: chargers[it.charger.id]?.label?.value
+            }
+        }
+
+        return ChargeLocationStatus(
+            statusMap,
+            "Tesla",
+            labels = labelsMap,
+            congestionHistogram = congestionHistogram,
+            extraData = details.pricing
+        )
+    }
+
+    override fun isChargerSupported(charger: ChargeLocation): Boolean {
+        return when (charger.dataSource) {
+            "goingelectric" -> charger.network == "Tesla Supercharger"
+            "openchargemap" -> charger.chargepriceData?.network in listOf("23", "3534")
+            else -> false
+        }
+    }
+
+    private suspend fun initApi(): TeslaChargingOwnershipGraphQlApi {
+
+        return api ?: run {
+            val newApi = TeslaChargingOwnershipGraphQlApi.create(client, baseUrl) {
+                val now = Instant.now().epochSecond
+                val token =
+                    tokenStore.teslaAccessToken.takeIf { tokenStore.teslaAccessTokenExpiry > now }
+                        ?: run {
+                            val refreshToken = tokenStore.teslaRefreshToken
+                                ?: throw NotSignedInException()
+                            val response =
+                                authApi.getToken(
+                                    TeslaAuthenticationApi.RefreshTokenRequest(
+                                        refreshToken
+                                    )
+                                )
+                            tokenStore.teslaAccessToken = response.accessToken
+                            tokenStore.teslaAccessTokenExpiry = now + response.expiresIn
+                            response.accessToken
+                        }
+                token
+            }
+            api = newApi
+            newApi
+        }
+    }
+
+    fun isSignedIn() = tokenStore.teslaRefreshToken != null
+
+}

app/src/main/java/net/vonforst/evmap/api/availability/tesla/TeslaApiCommon.kt

@@ -0,0 +1,104 @@
+package net.vonforst.evmap.api.availability.tesla
+
+import com.squareup.moshi.FromJson
+import com.squareup.moshi.Json
+import com.squareup.moshi.JsonClass
+import com.squareup.moshi.ToJson
+import net.vonforst.evmap.api.availability.ChargepointStatus
+import net.vonforst.evmap.model.Coordinate
+import java.time.LocalTime
+
+sealed class GraphQlRequest {
+    abstract val operationName: String
+    abstract val query: String
+    abstract val variables: Any?
+}
+
+fun Coordinate.asTeslaCoord() =
+    TeslaChargingOwnershipGraphQlApi.Coordinate(this.lat, this.lng)
+
+@JsonClass(generateAdapter = true)
+data class Outage(val message: String /* TODO: */)
+
+enum class ChargerAvailability {
+    @Json(name = "CHARGER_AVAILABILITY_AVAILABLE")
+    AVAILABLE,
+
+    @Json(name = "CHARGER_AVAILABILITY_OCCUPIED")
+    OCCUPIED,
+
+    @Json(name = "CHARGER_AVAILABILITY_DOWN")
+    DOWN,
+
+    @Json(name = "CHARGER_AVAILABILITY_UNKNOWN")
+    UNKNOWN;
+
+    fun toStatus() = when (this) {
+        AVAILABLE -> ChargepointStatus.AVAILABLE
+        OCCUPIED -> ChargepointStatus.OCCUPIED
+        DOWN -> ChargepointStatus.FAULTED
+        UNKNOWN -> ChargepointStatus.UNKNOWN
+    }
+}
+
+@JsonClass(generateAdapter = true)
+data class Pricing(
+    val canDisplayCombinedComparison: Boolean?,
+    val hasMSPPricing: Boolean?,
+    val hasMembershipPricing: Boolean?,
+    val memberRates: Rates?, // rates for Tesla drivers & non-Tesla drivers with subscription
+    val userRates: Rates?    // rates without subscription
+)
+
+@JsonClass(generateAdapter = true)
+data class Rates(
+    val activePricebook: Pricebook
+)
+
+@JsonClass(generateAdapter = true)
+data class Pricebook(
+    val charging: PricebookDetails,
+    val parking: PricebookDetails,
+    val priceBookID: Long?
+)
+
+@JsonClass(generateAdapter = true)
+data class PricebookDetails(
+    val bucketUom: String,  // unit of measurement for buckets (typically "kw")
+    val buckets: List<Bucket>,  // buckets of charging power (used for minute-based pricing)
+    val currencyCode: String,
+    val programType: String,
+    val rates: List<Double>,
+    val touRates: TouRates,
+    val uom: String,  // unit of measurement ("kwh" or "min")
+    val vehicleMakeType: String
+)
+
+@JsonClass(generateAdapter = true)
+data class Bucket(
+    val start: Int,
+    val end: Int
+)
+
+@JsonClass(generateAdapter = true)
+data class TouRates(
+    val activeRatesByTime: List<ActiveRatesByTime>,
+    val enabled: Boolean
+)
+
+@JsonClass(generateAdapter = true)
+data class ActiveRatesByTime(
+    val startTime: LocalTime,
+    val endTime: LocalTime,
+    val rates: List<Double>
+)
+
+internal class LocalTimeAdapter {
+    @FromJson
+    fun fromJson(value: String?): LocalTime? = value?.let {
+        if (it == "24:00") LocalTime.MAX else LocalTime.parse(it)
+    }
+
+    @ToJson
+    fun toJson(value: LocalTime?): String? = value?.toString()
+}

app/src/main/java/net/vonforst/evmap/api/availability/tesla/TeslaGuestApi.kt

@@ -0,0 +1,169 @@
+package net.vonforst.evmap.api.availability.tesla
+
+import com.squareup.moshi.Json
+import com.squareup.moshi.JsonAdapter
+import com.squareup.moshi.JsonClass
+import com.squareup.moshi.JsonReader
+import com.squareup.moshi.JsonWriter
+import com.squareup.moshi.Moshi
+import com.squareup.moshi.Types
+import okhttp3.CacheControl
+import okhttp3.OkHttpClient
+import retrofit2.Retrofit
+import retrofit2.converter.moshi.MoshiConverterFactory
+import retrofit2.http.Body
+import retrofit2.http.GET
+import retrofit2.http.POST
+import retrofit2.http.Query
+import java.lang.reflect.Type
+import java.util.concurrent.TimeUnit
+
+interface TeslaCuaApi {
+    @GET("tesla-locations")
+    suspend fun getTeslaLocations(
+        @Query("translate") translate: String = "en_US",
+        @Query("usetrt") usetrt: Boolean = true,
+    ): List<TeslaLocation>
+
+    @GET("tesla-location")
+    suspend fun getTeslaLocation(
+        @Query("id") id: String,
+        @Query("translate") translate: String = "en_US",
+        @Query("usetrt") usetrt: Boolean = true
+    ): TeslaLocation
+
+    @JsonClass(generateAdapter = true)
+    data class TeslaLocation(
+        val latitude: Double?,
+        val longitude: Double?,
+        @Json(name = "location_id") val locationId: String,
+        val title: String?,
+        @Json(name = "location_type") val locationType: List<String>,
+        val trtId: String?
+    )
+
+    companion object {
+        fun create(
+            client: OkHttpClient,
+            baseUrl: String? = null
+        ): TeslaCuaApi {
+            val clientWithInterceptor = client.newBuilder()
+                .addInterceptor { chain ->
+                    // increase cache duration to 24h (useful for the large getTeslaLocations request)
+                    val request = chain.request().newBuilder()
+                        .cacheControl(CacheControl.Builder().maxStale(24, TimeUnit.HOURS).build())
+                        .build()
+                    chain.proceed(request)
+                }.build()
+            val retrofit = Retrofit.Builder()
+                .baseUrl(baseUrl ?: "https://www.tesla.com/cua-api/")
+                .addConverterFactory(
+                    MoshiConverterFactory.create(
+                        Moshi.Builder().add(LocalTimeAdapter()).build()
+                    )
+                )
+                .client(clientWithInterceptor)
+                .build()
+            return retrofit.create(TeslaCuaApi::class.java)
+        }
+    }
+}
+
+interface TeslaChargingGuestGraphQlApi {
+    @POST("graphql")
+    suspend fun getChargingSiteDetails(
+        @Body request: GetChargingSiteDetailsRequest,
+        @Query("operationName") operationName: String = "getGuestChargingSiteDetails"
+    ): GetChargingSiteDetailsResponse
+
+    @JsonClass(generateAdapter = true)
+    data class GetChargingSiteDetailsRequest(
+        override val variables: GetChargingSiteInformationVariables,
+        override val operationName: String = "getGuestChargingSiteDetails",
+        override val query: String =
+            "\n    query getGuestChargingSiteDetails(\$identifier: ChargingSiteIdentifierInput!, \$deviceLocale: String!, \$experience: ChargingExperienceEnum!) {\n  site(\n    identifier: \$identifier\n    deviceLocale: \$deviceLocale\n    experience: \$experience\n  ) {\n    activeOutages\n    address {\n      countryCode\n    }\n    chargers {\n      id\n      label\n    }\n    chargersAvailable {\n      chargerDetails {\n        id\n        availability\n      }\n    }\n    holdAmount {\n      holdAmount\n      currencyCode\n    }\n    maxPowerKw\n    name\n    programType\n    publicStallCount\n    id\n    pricing(experience: \$experience) {\n      userRates {\n        activePricebook {\n          charging {\n            uom\n            rates\n            buckets {\n              start\n              end\n            }\n            bucketUom\n            currencyCode\n            programType\n            vehicleMakeType\n            touRates {\n              enabled\n              activeRatesByTime {\n                startTime\n                endTime\n                rates\n              }\n            }\n          }\n          parking {\n            uom\n            rates\n            buckets {\n              start\n              end\n            }\n            bucketUom\n            currencyCode\n            programType\n            vehicleMakeType\n            touRates {\n              enabled\n              activeRatesByTime {\n                startTime\n                endTime\n                rates\n              }\n            }\n          }\n          congestion {\n            uom\n            rates\n            buckets {\n              start\n              end\n            }\n            bucketUom\n            currencyCode\n            programType\n            vehicleMakeType\n            touRates {\n              enabled\n              activeRatesByTime {\n                startTime\n                endTime\n                rates\n              }\n            }\n          }\n        }\n      }\n    }\n  }\n}\n    "
+    ) : GraphQlRequest()
+
+    @JsonClass(generateAdapter = true)
+    data class GetChargingSiteInformationVariables(
+        val identifier: Identifier,
+        val experience: Experience,
+        val deviceLocale: String = "de-DE",
+    )
+
+    enum class Experience {
+        ADHOC, GUEST
+    }
+
+    @JsonClass(generateAdapter = true)
+    data class Identifier(
+        val siteId: ChargingSiteIdentifier
+    )
+
+    @JsonClass(generateAdapter = true)
+    data class ChargingSiteIdentifier(
+        val id: Long,
+        val siteType: SiteType = SiteType.SUPERCHARGER
+    )
+
+    enum class SiteType {
+        @Json(name = "SITE_TYPE_SUPERCHARGER")
+        SUPERCHARGER
+    }
+
+    @JsonClass(generateAdapter = true)
+    data class GetChargingSiteDetailsResponse(val data: GetChargingSiteDetailsResponseData)
+
+    @JsonClass(generateAdapter = true)
+    data class GetChargingSiteDetailsResponseData(val site: ChargingSiteInformation?)
+
+    @JsonClass(generateAdapter = true)
+    data class ChargingSiteInformation(
+        val activeOutages: List<Outage>?,
+        val chargers: List<ChargerId>,
+        val chargersAvailable: ChargersAvailable,
+        val id: Long,
+        val maxPowerKw: Int,
+        val name: String,
+        val pricing: Pricing,
+        val publicStallCount: Int
+    )
+
+    @JsonClass(generateAdapter = true)
+    data class ChargerId(
+        val id: String,
+        val label: String?,
+    ) {
+        val labelNumber
+            get() = label?.replace(Regex("""\D"""), "")?.toInt()
+        val labelLetter
+            get() = label?.replace(Regex("""\d"""), "")
+    }
+
+    @JsonClass(generateAdapter = true)
+    data class ChargersAvailable(val chargerDetails: List<ChargerDetail>)
+
+    @JsonClass(generateAdapter = true)
+    data class ChargerDetail(
+        val availability: ChargerAvailability,
+        val id: String
+    )
+
+    companion object {
+        fun create(
+            client: OkHttpClient,
+            baseUrl: String? = null
+        ): TeslaChargingGuestGraphQlApi {
+            val retrofit = Retrofit.Builder()
+                .baseUrl(baseUrl ?: "https://www.tesla.com/de_DE/charging/guest/api/")
+                .addConverterFactory(
+                    MoshiConverterFactory.create(
+                        Moshi.Builder().add(LocalTimeAdapter()).build()
+                    )
+                )
+                .client(client)
+                .build()
+            return retrofit.create(TeslaChargingGuestGraphQlApi::class.java)
+        }
+    }
+}

app/src/main/java/net/vonforst/evmap/api/availability/tesla/TeslaOwnerApi.kt

@@ -0,0 +1,394 @@
+package net.vonforst.evmap.api.availability.tesla
+
+import android.net.Uri
+import android.util.Base64
+import com.squareup.moshi.Json
+import com.squareup.moshi.JsonClass
+import com.squareup.moshi.Moshi
+import com.squareup.moshi.adapters.PolymorphicJsonAdapterFactory
+import kotlinx.coroutines.runBlocking
+import okhttp3.OkHttpClient
+import retrofit2.Retrofit
+import retrofit2.converter.moshi.MoshiConverterFactory
+import retrofit2.http.Body
+import retrofit2.http.GET
+import retrofit2.http.POST
+import retrofit2.http.Query
+import java.security.MessageDigest
+import java.security.SecureRandom
+import java.time.LocalTime
+
+interface TeslaAuthenticationApi {
+    @POST("oauth2/v3/token")
+    suspend fun getToken(@Body request: OAuth2Request): OAuth2Response
+
+    @JsonClass(generateAdapter = true)
+    class AuthCodeRequest(
+        val code: String,
+        @Json(name = "code_verifier") val codeVerifier: String,
+        @Json(name = "redirect_uri") val redirectUri: String = "https://auth.tesla.com/void/callback",
+        scope: String = "openid email offline_access",
+        @Json(name = "client_id") clientId: String = "ownerapi"
+    ) : OAuth2Request(scope, clientId)
+
+    @JsonClass(generateAdapter = true)
+    class RefreshTokenRequest(
+        @Json(name = "refresh_token") val refreshToken: String,
+        scope: String = "openid email offline_access",
+        @Json(name = "client_id") clientId: String = "ownerapi"
+    ) : OAuth2Request(scope, clientId)
+
+    sealed class OAuth2Request(
+        val scope: String,
+        val clientId: String
+    )
+
+    @JsonClass(generateAdapter = true)
+    data class OAuth2Response(
+        @Json(name = "access_token") val accessToken: String,
+        @Json(name = "token_type") val tokenType: String,
+        @Json(name = "expires_in") val expiresIn: Long,
+        @Json(name = "refresh_token") val refreshToken: String,
+    )
+
+    companion object {
+        fun create(client: OkHttpClient, baseUrl: String? = null): TeslaAuthenticationApi {
+            val retrofit = Retrofit.Builder()
+                .baseUrl(baseUrl ?: "https://auth.tesla.com")
+                .addConverterFactory(
+                    MoshiConverterFactory.create(
+                        Moshi.Builder()
+                            .add(
+                                PolymorphicJsonAdapterFactory.of(
+                                    OAuth2Request::class.java,
+                                    "grant_type"
+                                )
+                                    .withSubtype(AuthCodeRequest::class.java, "authorization_code")
+                                    .withSubtype(RefreshTokenRequest::class.java, "refresh_token")
+                                    .withDefaultValue(null)
+                            )
+                            .build()
+                    )
+                )
+                .client(client)
+                .build()
+            return retrofit.create(TeslaAuthenticationApi::class.java)
+        }
+
+        fun generateCodeVerifier(): String {
+            val code = ByteArray(64)
+            SecureRandom().nextBytes(code)
+            return Base64.encodeToString(
+                code,
+                Base64.URL_SAFE or Base64.NO_WRAP or Base64.NO_PADDING
+            )
+        }
+
+        fun generateCodeChallenge(codeVerifier: String): String {
+            val bytes = codeVerifier.toByteArray()
+            val messageDigest = MessageDigest.getInstance("SHA-256")
+            messageDigest.update(bytes, 0, bytes.size)
+            return Base64.encodeToString(
+                messageDigest.digest(),
+                Base64.URL_SAFE or Base64.NO_WRAP or Base64.NO_PADDING
+            )
+        }
+
+        fun buildSignInUri(codeChallenge: String): Uri =
+            Uri.parse("https://auth.tesla.com/oauth2/v3/authorize").buildUpon()
+                .appendQueryParameter("client_id", "ownerapi")
+                .appendQueryParameter("code_challenge", codeChallenge)
+                .appendQueryParameter("code_challenge_method", "S256")
+                .appendQueryParameter("redirect_uri", "https://auth.tesla.com/void/callback")
+                .appendQueryParameter("response_type", "code")
+                .appendQueryParameter("scope", "openid email offline_access")
+                .appendQueryParameter("state", "123").build()
+
+        val resultUrlPrefix = "https://auth.tesla.com/void/callback"
+    }
+}
+
+interface TeslaOwnerApi {
+    @GET("/api/1/users/me")
+    suspend fun getUserInfo(): UserInfoResponse
+
+    @JsonClass(generateAdapter = true)
+    data class UserInfoResponse(
+        val response: UserInfo
+    )
+
+    @JsonClass(generateAdapter = true)
+    data class UserInfo(
+        val email: String,
+        @Json(name = "full_name") val fullName: String,
+        @Json(name = "profile_image_url") val profileImageUrl: String?
+    )
+
+    companion object {
+        fun create(client: OkHttpClient, token: String, baseUrl: String? = null): TeslaOwnerApi {
+            val clientWithInterceptor = client.newBuilder()
+                .addInterceptor { chain ->
+                    // add API key to every request
+                    val request = chain.request().newBuilder()
+                        .header("Authorization", "Bearer $token")
+                        .header("User-Agent", "okhttp/4.9.2")
+                        .header("x-tesla-user-agent", "TeslaApp/4.19.5-1667/3a5d531cc3/android/27")
+                        .header("Accept", "*/*")
+                        .build()
+                    chain.proceed(request)
+                }.build()
+            val retrofit = Retrofit.Builder()
+                .baseUrl(baseUrl ?: "https://owner-api.teslamotors.com")
+                .addConverterFactory(MoshiConverterFactory.create())
+                .client(clientWithInterceptor)
+                .build()
+            return retrofit.create(TeslaOwnerApi::class.java)
+        }
+    }
+}
+
+interface TeslaChargingOwnershipGraphQlApi {
+    @POST("/graphql")
+    suspend fun getNearbyChargingSites(
+        @Body request: GetNearbyChargingSitesRequest,
+        @Query("operationName") operationName: String = "GetNearbyChargingSites",
+        @Query("deviceLanguage") deviceLanguage: String = "en",
+        @Query("deviceCountry") deviceCountry: String = "US",
+        @Query("ttpLocale") ttpLocale: String = "en_US",
+        @Query("vin") vin: String = "",
+    ): GetNearbyChargingSitesResponse
+
+    @POST("/graphql")
+    suspend fun getChargingSiteInformation(
+        @Body request: GetChargingSiteInformationRequest,
+        @Query("operationName") operationName: String = "getChargingSiteInformation",
+        @Query("deviceLanguage") deviceLanguage: String = "en",
+        @Query("deviceCountry") deviceCountry: String = "US",
+        @Query("ttpLocale") ttpLocale: String = "en_US",
+        @Query("vin") vin: String = "",
+    ): GetChargingSiteInformationResponse
+
+    @JsonClass(generateAdapter = true)
+    data class GetNearbyChargingSitesRequest(
+        override val variables: GetNearbyChargingSitesVariables,
+        override val operationName: String = "GetNearbyChargingSites",
+        override val query: String =
+            "\n    query GetNearbyChargingSites(\$args: GetNearbyChargingSitesRequestType!) {\n  charging {\n    nearbySites(args: \$args) {\n      sitesAndDistances {\n        ...ChargingNearbySitesFragment\n      }\n    }\n  }\n}\n    \n    fragment ChargingNearbySitesFragment on ChargerSiteAndDistanceType {\n  activeOutages {\n    message\n    nonTeslasAffectedOnly {\n      value\n    }\n  }\n  availableStalls {\n    value\n  }\n  centroid {\n    ...EnergySvcCoordinateTypeFields\n  }\n  drivingDistanceMiles {\n    value\n  }\n  entryPoint {\n    ...EnergySvcCoordinateTypeFields\n  }\n  haversineDistanceMiles {\n    value\n  }\n  id {\n    text\n  }\n  localizedSiteName {\n    value\n  }\n  maxPowerKw {\n    value\n  }\n  trtId {\n    value\n  }\n  totalStalls {\n    value\n  }\n  siteType\n  accessType\n  waitEstimateBucket\n  hasHighCongestion\n}\n    \n    fragment EnergySvcCoordinateTypeFields on EnergySvcCoordinateType {\n  latitude\n  longitude\n}\n    "
+    ) : GraphQlRequest()
+
+    @JsonClass(generateAdapter = true)
+    data class GetNearbyChargingSitesVariables(val args: GetNearbyChargingSitesArgs)
+
+    @JsonClass(generateAdapter = true)
+    data class GetNearbyChargingSitesArgs(
+        val userLocation: Coordinate,
+        val northwestCorner: Coordinate,
+        val southeastCorner: Coordinate,
+        val openToNonTeslasFilter: OpenToNonTeslasFilterValue,
+        val languageCode: String = "en",
+        val countryCode: String = "US",
+        //val vin: String = "",
+        //val maxCount: Int = 100
+    )
+
+    @JsonClass(generateAdapter = true)
+    data class OpenToNonTeslasFilterValue(val value: Boolean)
+
+    @JsonClass(generateAdapter = true)
+    data class Coordinate(val latitude: Double, val longitude: Double)
+
+    @JsonClass(generateAdapter = true)
+    data class GetChargingSiteInformationRequest(
+        override val variables: GetChargingSiteInformationVariables,
+        override val operationName: String = "getChargingSiteInformation",
+        override val query: String =
+            "\n    query getChargingSiteInformation(\$id: ChargingSiteIdentifierInputType!, \$vehicleMakeType: ChargingVehicleMakeTypeEnum, \$deviceCountry: String!, \$deviceLanguage: String!) {\n  charging {\n    site(\n      id: \$id\n      deviceCountry: \$deviceCountry\n      deviceLanguage: \$deviceLanguage\n      vehicleMakeType: \$vehicleMakeType\n    ) {\n      siteStatic {\n        ...SiteStaticFragmentNoHoldAmt\n      }\n      siteDynamic {\n        ...SiteDynamicFragment\n      }\n      pricing(vehicleMakeType: \$vehicleMakeType) {\n        userRates {\n          ...ChargingActiveRateFragment\n        }\n        memberRates {\n          ...ChargingActiveRateFragment\n        }\n        hasMembershipPricing\n        hasMSPPricing\n        canDisplayCombinedComparison\n      }\n      holdAmount(vehicleMakeType: \$vehicleMakeType) {\n        currencyCode\n        holdAmount\n      }\n      congestionPriceHistogram(vehicleMakeType: \$vehicleMakeType) {\n        ...CongestionPriceHistogramFragment\n      }\n    }\n  }\n}\n    \n    fragment SiteStaticFragmentNoHoldAmt on ChargingSiteStaticType {\n  address {\n    ...AddressFragment\n  }\n  amenities\n  centroid {\n    ...EnergySvcCoordinateTypeFields\n  }\n  entryPoint {\n    ...EnergySvcCoordinateTypeFields\n  }\n  id {\n    text\n  }\n  accessCode {\n    value\n  }\n  localizedSiteName {\n    value\n  }\n  maxPowerKw {\n    value\n  }\n  name\n  openToPublic\n  chargers {\n    id {\n      text\n    }\n    label {\n      value\n    }\n  }\n  publicStallCount\n  timeZone {\n    id\n    version\n  }\n  fastchargeSiteId {\n    value\n  }\n  siteType\n  accessType\n  isMagicDockSupportedSite\n  trtId {\n    value\n  }\n}\n    \n    fragment AddressFragment on EnergySvcAddressType {\n  streetNumber {\n    value\n  }\n  street {\n    value\n  }\n  district {\n    value\n  }\n  city {\n    value\n  }\n  state {\n    value\n  }\n  postalCode {\n    value\n  }\n  country\n}\n    \n\n    fragment EnergySvcCoordinateTypeFields on EnergySvcCoordinateType {\n  latitude\n  longitude\n}\n    \n\n    fragment SiteDynamicFragment on ChargingSiteDynamicType {\n  id {\n    text\n  }\n  activeOutages {\n    message\n    nonTeslasAffectedOnly {\n      value\n    }\n  }\n  chargersAvailable {\n    value\n  }\n  chargerDetails {\n    charger {\n      id {\n        text\n      }\n      label {\n        value\n      }\n      name\n    }\n    availability\n  }\n  waitEstimateBucket\n  currentCongestion\n}\n    \n\n    fragment ChargingActiveRateFragment on ChargingActiveRateType {\n  activePricebook {\n    charging {\n      ...ChargingUserRateFragment\n    }\n    parking {\n      ...ChargingUserRateFragment\n    }\n    priceBookID\n  }\n}\n    \n    fragment ChargingUserRateFragment on ChargingUserRateType {\n  currencyCode\n  programType\n  rates\n  buckets {\n    start\n    end\n  }\n  bucketUom\n  touRates {\n    enabled\n    activeRatesByTime {\n      startTime\n      endTime\n      rates\n    }\n  }\n  uom\n  vehicleMakeType\n}\n    \n\n    fragment CongestionPriceHistogramFragment on HistogramData {\n  axisLabels {\n    index\n    value\n  }\n  regionLabels {\n    index\n    value {\n      ...ChargingPriceFragment\n      ... on HistogramRegionLabelValueString {\n        value\n      }\n    }\n  }\n  chargingUom\n  parkingUom\n  parkingRate {\n    ...ChargingPriceFragment\n  }\n  data\n  activeBar\n  maxRateIndex\n  whenRateChanges\n  dataAttributes {\n    congestionThreshold\n    label\n  }\n}\n    \n    fragment ChargingPriceFragment on ChargingPrice {\n  currencyCode\n  price\n}\n"
+    ) : GraphQlRequest()
+
+    @JsonClass(generateAdapter = true)
+    data class GetChargingSiteInformationVariables(
+        val id: ChargingSiteIdentifier,
+        val vehicleMakeType: VehicleMakeType,
+        val deviceLanguage: String = "en",
+        val deviceCountry: String = "US",
+        val ttpLocale: String = "en_US"
+    )
+
+    @JsonClass(generateAdapter = true)
+    data class ChargingSiteIdentifier(
+        val id: String,
+        val type: ChargingSiteIdentifierType = ChargingSiteIdentifierType.SITE_ID
+    )
+
+    enum class ChargingSiteIdentifierType {
+        SITE_ID
+    }
+
+    enum class VehicleMakeType {
+        TESLA, NON_TESLA
+    }
+
+    @JsonClass(generateAdapter = true)
+    data class GetNearbyChargingSitesResponse(val data: GetNearbyChargingSitesResponseData)
+
+    @JsonClass(generateAdapter = true)
+    data class GetNearbyChargingSitesResponseData(val charging: GetNearbyChargingSitesResponseDataCharging?)
+
+    @JsonClass(generateAdapter = true)
+    data class GetNearbyChargingSitesResponseDataCharging(val nearbySites: GetNearbyChargingSitesResponseDataChargingNearbySites)
+
+    @JsonClass(generateAdapter = true)
+    data class GetNearbyChargingSitesResponseDataChargingNearbySites(val sitesAndDistances: List<ChargingSite>)
+
+    @JsonClass(generateAdapter = true)
+    data class ChargingSite(
+        val activeOutages: List<Outage>,
+        val availableStalls: Value<Int>?,
+        val centroid: Coordinate,
+        val drivingDistanceMiles: Value<Double>?,
+        val entryPoint: Coordinate,
+        val haversineDistanceMiles: Value<Double>,
+        val id: Text,
+        val localizedSiteName: Value<String>,
+        val maxPowerKw: Value<Int>,
+        val totalStalls: Value<Int>
+        // TODO: siteType, accessType
+    )
+
+    @JsonClass(generateAdapter = true)
+    data class GetChargingSiteInformationResponse(val data: GetChargingSiteInformationResponseData)
+
+    @JsonClass(generateAdapter = true)
+    data class GetChargingSiteInformationResponseData(val charging: GetChargingSiteInformationResponseDataCharging)
+
+    @JsonClass(generateAdapter = true)
+    data class GetChargingSiteInformationResponseDataCharging(val site: ChargingSiteInformation?)
+
+    @JsonClass(generateAdapter = true)
+    data class ChargingSiteInformation(
+        val siteDynamic: SiteDynamic,
+        val siteStatic: SiteStatic,
+        val pricing: Pricing,
+        val congestionPriceHistogram: CongestionPriceHistogram?,
+    )
+
+    @JsonClass(generateAdapter = true)
+    data class SiteDynamic(
+        val activeOutages: List<Outage>,
+        val chargerDetails: List<ChargerDetail>,
+        val chargersAvailable: Value<Int>?,
+        val currentCongestion: Double,
+        val id: Text,
+        val waitEstimateBucket: WaitEstimateBucket
+    )
+
+    @JsonClass(generateAdapter = true)
+    data class ChargerId(
+        val id: Text,
+        val label: Value<String>?,
+        val name: String?
+    ) {
+        val labelNumber
+            get() = label?.value?.replace(Regex("""\D"""), "")?.toInt()
+        val labelLetter
+            get() = label?.value?.replace(Regex("""\d"""), "")
+    }
+
+    @JsonClass(generateAdapter = true)
+    data class ChargerDetail(
+        val availability: ChargerAvailability,
+        val charger: ChargerId
+    )
+
+    @JsonClass(generateAdapter = true)
+    data class SiteStatic(
+        val accessCode: Value<String>?,
+        val centroid: Coordinate,
+        val chargers: List<ChargerId>,
+        val entryPoint: Coordinate,
+        val fastchargeSiteId: Value<Long>,
+        val id: Text,
+        val isMagicDockSupportedSite: Boolean,
+        val localizedSiteName: Value<String>,
+        val maxPowerKw: Value<Int>,
+        val name: String,
+        val openToPublic: Boolean,
+        val publicStallCount: Int
+        // TODO: siteType, accessType, address, amenities, timeZone
+    )
+
+    @JsonClass(generateAdapter = true)
+    data class CongestionPriceHistogram(
+        val data: List<Double>,
+        val dataAttributes: List<CongestionHistogramDataAttributes>
+    )
+
+    @JsonClass(generateAdapter = true)
+    data class CongestionHistogramDataAttributes(
+        val congestionThreshold: String,  // "LEVEL_1"
+        val label: String  // "1AM", "2AM", etc.
+    )
+
+    @JsonClass(generateAdapter = true)
+    data class Value<T : Any>(val value: T)
+
+    @JsonClass(generateAdapter = true)
+    data class Text(val text: String)
+
+    enum class WaitEstimateBucket {
+        @Json(name = "WAIT_ESTIMATE_BUCKET_NO_WAIT")
+        NO_WAIT,
+
+        @Json(name = "WAIT_ESTIMATE_BUCKET_LESS_THAN_5_MINUTES")
+        LESS_THAN_5_MINUTES,
+
+        @Json(name = "WAIT_ESTIMATE_BUCKET_APPROXIMATELY_5_MINUTES")
+        APPROXIMATELY_5_MINUTES,
+
+        @Json(name = "WAIT_ESTIMATE_BUCKET_APPROXIMATELY_10_MINUTES")
+        APPROXIMATELY_10_MINUTES,
+
+        @Json(name = "WAIT_ESTIMATE_BUCKET_APPROXIMATELY_15_MINUTES")
+        APPROXIMATELY_15_MINUTES,
+
+        @Json(name = "WAIT_ESTIMATE_BUCKET_APPROXIMATELY_20_MINUTES")
+        APPROXIMATELY_20_MINUTES,
+
+        @Json(name = "WAIT_ESTIMATE_BUCKET_GREATER_THAN_25_MINUTES")
+        GREATER_THAN_25_MINUTES,
+
+        @Json(name = "WAIT_ESTIMATE_BUCKET_UNKNOWN")
+        UNKNOWN
+    }
+
+    companion object {
+        fun create(
+            client: OkHttpClient,
+            baseUrl: String? = null,
+            token: suspend () -> String
+        ): TeslaChargingOwnershipGraphQlApi {
+            val clientWithInterceptor = client.newBuilder()
+                .addInterceptor { chain ->
+                    val t = runBlocking { token() }
+                    // add API key to every request
+                    val request = chain.request().newBuilder()
+                        .header("Authorization", "Bearer $t")
+                        .header("User-Agent", "okhttp/4.9.2")
+                        .header("x-tesla-user-agent", "TeslaApp/4.19.5-1667/3a5d531cc3/android/27")
+                        .header("Accept", "*/*")
+                        .build()
+                    chain.proceed(request)
+                }.build()
+            val retrofit = Retrofit.Builder()
+                .baseUrl(baseUrl ?: "https://akamai-apigateway-charging-ownership.tesla.com")
+                .addConverterFactory(
+                    MoshiConverterFactory.create(
+                        Moshi.Builder().add(LocalTimeAdapter()).build()
+                    )
+                )
+                .client(clientWithInterceptor)
+                .build()
+            return retrofit.create(TeslaChargingOwnershipGraphQlApi::class.java)
+        }
+    }
+}