.idea/deploymentTargetDropDown.xml

@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="deploymentTargetDropDown">
-    <targetSelectedWithDropDown>
-      <Target>
-        <type value="QUICK_BOOT_TARGET" />
-        <deviceKey>
-          <Key>
-            <type value="VIRTUAL_DEVICE_PATH" />
-            <value value="$USER_HOME$/.android/avd/Pixel_5_API_29.avd" />
-          </Key>
-        </deviceKey>
-      </Target>
-    </targetSelectedWithDropDown>
-    <timeTargetWasSelectedWithDropDown value="2023-02-15T07:23:10.782369Z" />
-  </component>
-</project>

README.md

@@ -1,6 +1,6 @@
-![Nextcloud Maps Geofavorites Logo](/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png)
+![Nextcloud Maps Geobookmarks Logo](/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png)
 
-# Nextcloud Maps Geofavorites Android app
+# Nextcloud Maps Geobookmarks Android app
 
 [<img src="https://fdroid.gitlab.io/artwork/badge/get-it-on.png" alt="Get it on F-Droid" height="80">](https://f-droid.org/it/packages/it.danieleverducci.nextcloudmaps)
 [<img src="https://cdn.rawgit.com/steverichey/google-play-badge-svg/master/img/en_get.svg" height="80">](https://play.google.com/store/apps/details?id=it.danieleverducci.nextcloudmaps)
@@ -8,8 +8,8 @@
 
 (Always prefer [F-Droid](https://f-droid.org) build, when possible).
 
-UNOFFICIAL and FOSS Nextcloud Maps client at its earliest stages of developement. Shows your Nextcloud Maps geofavorites list.
+UNOFFICIAL and FOSS Nextcloud Maps client at its earliest stages of developement. Shows your Nextcloud Maps geobookmarks list.
-Geofavorites can be opened in all apps supporting geo links (i.e. Google Maps, Organic Maps etc...).
+Geobookmarks can be opened in all apps supporting geo links (i.e. Google Maps, Organic Maps etc...).
 A new geofavorite can be created on current location, by sharing a "geo:" uri from another app or manually picking from the map.
 
 **Requires Maps app to be installed on the Nextcloud instance.**

app/build.gradle

@@ -18,14 +18,14 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 31
+    compileSdkVersion 30
 
     defaultConfig {
         applicationId "it.danieleverducci.nextcloudmaps"
         minSdkVersion 23
-        targetSdkVersion 31
+        targetSdkVersion 30
-        versionCode 8
+        versionCode 6
-        versionName "0.3.6"
+        versionName "0.3.4"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
@@ -54,7 +54,7 @@ repositories {
 dependencies {
     implementation fileTree(dir: "libs", include: ["*.jar"])
 
-    implementation 'com.android.support:design:31.0.0'
+    implementation 'com.android.support:design:30.0.1'
     implementation 'androidx.appcompat:appcompat:1.3.1'
     implementation 'androidx.recyclerview:recyclerview:1.2.1'
     implementation "androidx.cardview:cardview:1.0.0"
@@ -70,7 +70,7 @@ dependencies {
     implementation 'com.squareup.retrofit2:converter-gson:2.6.1'
 
     // Nextcloud SSO
-    implementation "com.github.nextcloud:Android-SingleSignOn:0.6.1"
+    implementation "com.github.nextcloud:Android-SingleSignOn:0.5.6"
 
     // OSMDroid
     implementation 'org.osmdroid:osmdroid-android:6.1.10'

app/release/output-metadata.json

@@ -0,0 +1,18 @@
+{
+  "version": 2,
+  "artifactType": {
+    "type": "APK",
+    "kind": "Directory"
+  },
+  "applicationId": "it.danieleverducci.nextcloudmaps",
+  "variantName": "release",
+  "elements": [
+    {
+      "type": "SINGLE",
+      "filters": [],
+      "versionCode": 6,
+      "versionName": "0.3.4",
+      "outputFile": "app-release.apk"
+    }
+  ]
+}

app/src/main/AndroidManifest.xml

@@ -21,13 +21,10 @@
     package="it.danieleverducci.nextcloudmaps">
 
     <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" />
 
     <queries>
         <package android:name="com.nextcloud.client" />
-        <!-- To see if google maps is installed, as it needs a specific intent Uri) -->
-        <package android:name="com.google.android.apps.maps" />
     </queries>
 
     <application
@@ -38,24 +35,21 @@
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
 
-        <activity android:name=".activity.login.LoginActivity"
+        <activity android:name=".activity.login.LoginActivity">
-            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
 
-        <activity android:name=".activity.main.MainActivity"
+        <activity android:name=".activity.main.MainActivity">
-            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
             </intent-filter>
         </activity>
 
         <activity
-            android:name=".activity.detail.GeofavoriteDetailActivity"
+            android:name=".activity.detail.GeofavoriteDetailActivity">
-            android:exported="true">
             <!-- standard "geo" scheme -->
             <intent-filter>
                 <action android:name="android.intent.action.VIEW"/>
@@ -88,24 +82,13 @@
                 <category android:name="android.intent.category.DEFAULT"/>
                 <category android:name="android.intent.category.BROWSABLE"/>
                 <data
-                    android:host="www.google.com"
+                    android:host="maps.google.com"
-                    android:pathPrefix="/maps"
+                    android:scheme="http"/>
-                    android:scheme="https"/>
-            </intent-filter>
-
-            <intent-filter>
-                <action android:name="android.intent.action.VIEW"/>
-                <category android:name="android.intent.category.DEFAULT"/>
-                <category android:name="android.intent.category.BROWSABLE"/>
-                <data
-                    android:host="www.openstreetmap.org"
-                    android:scheme="https"/>
             </intent-filter>
 
         </activity>
 
         <activity android:name=".activity.mappicker.MapPickerActivity"
-            android:exported="true"
             android:theme="@style/AppTheme">
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />

app/src/main/java/it/danieleverducci/nextcloudmaps/activity/detail/GeofavoriteDetailActivity.java

@@ -27,7 +27,6 @@ import android.location.LocationListener;
 import android.location.LocationManager;
 import android.os.Build;
 import android.os.Bundle;
-import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.Toast;
@@ -65,6 +64,7 @@ import it.danieleverducci.nextcloudmaps.utils.MapUtils;
 public class GeofavoriteDetailActivity extends NextcloudMapsStyledActivity implements LocationListener, ActivityCompat.OnRequestPermissionsResultCallback {
 
     public static final String TAG = "GeofavDetail";
+    public static final int MINIMUM_ACCEPTABLE_ACCURACY = 50;  // In meters
     public static final String ARG_GEOFAVORITE = "geofav";
     private static final int PERMISSION_REQUEST_CODE = 9999;
 
@@ -119,7 +119,7 @@ public class GeofavoriteDetailActivity extends NextcloudMapsStyledActivity imple
         });
 
         mViewModel = new ViewModelProvider(this).get(GeofavoriteDetailActivityViewModel.class);
-        mViewModel.init(getApplicationContext());
+        mViewModel.init();
         mViewModel.getCategories().observe(this, new Observer<HashSet<String>>() {
             @Override
             public void onChanged(HashSet<String> categories) {
@@ -161,12 +161,11 @@ public class GeofavoriteDetailActivity extends NextcloudMapsStyledActivity imple
             if (getIntent().getData() != null) {
                 // Opened by external generic intent: parse URI
                 try {
-                    double[] coords = GeoUriParser.parseUri(getIntent().getData(), false);
+                    double[] coords = GeoUriParser.parseUri(getIntent().getData());
                     mGeofavorite.setLat(coords[0]);
                     mGeofavorite.setLng(coords[1]);
                     mViewHolder.hideAccuracy();
                 } catch (IllegalArgumentException e) {
-                    Log.e(TAG, e.getMessage());
                     Toast.makeText(this, R.string.error_unsupported_uri, Toast.LENGTH_SHORT).show();
                     finish();
                 }
@@ -336,11 +335,11 @@ public class GeofavoriteDetailActivity extends NextcloudMapsStyledActivity imple
 
         public void updateView(Geofavorite item) {
             binding.collapsingToolbar.setTitle(item.getName() != null ? item.getName() : getString(R.string.new_geobookmark));
-            binding.nameEt.setText(item.getName() != null ? item.getName() : "");
+            binding.nameEt.setText(item.getName());
-            binding.descriptionEt.setText(item.getComment() != null ? item.getComment() : "");
+            binding.descriptionEt.setText(item.getComment());
             binding.createdTv.setText(item.getLocalDateCreated().format(dateFormatter));
             binding.modifiedTv.setText(item.getLocalDateCreated().format(dateFormatter));
-            binding.categoryAt.setText(item.getCategory() != null ? item.getCategory() : Geofavorite.DEFAULT_CATEGORY);
+            binding.categoryAt.setText(item.getCategory());
             updateViewCoords(item);
         }
 

app/src/main/java/it/danieleverducci/nextcloudmaps/activity/detail/GeofavoriteDetailActivityViewModel.java

@@ -1,7 +1,5 @@
 package it.danieleverducci.nextcloudmaps.activity.detail;
 
-import android.content.Context;
-
 import androidx.lifecycle.LiveData;
 import androidx.lifecycle.MutableLiveData;
 import androidx.lifecycle.ViewModel;
@@ -16,8 +14,8 @@ import it.danieleverducci.nextcloudmaps.repository.GeofavoriteRepository;
 public class GeofavoriteDetailActivityViewModel extends ViewModel {
     private GeofavoriteRepository mRepo;
 
-    public void init(Context applicationContext) {
+    public void init() {
-        mRepo = GeofavoriteRepository.getInstance(applicationContext);
+        mRepo = GeofavoriteRepository.getInstance();
     }
 
     public Geofavorite getGeofavorite(int id) {

app/src/main/java/it/danieleverducci/nextcloudmaps/activity/login/LoginActivity.java

@@ -41,11 +41,11 @@ import com.nextcloud.android.sso.ui.UiExceptionManager;
 import it.danieleverducci.nextcloudmaps.R;
 import it.danieleverducci.nextcloudmaps.activity.NextcloudMapsStyledActivity;
 import it.danieleverducci.nextcloudmaps.activity.main.MainActivity;
-import it.danieleverducci.nextcloudmaps.api.API;
 import it.danieleverducci.nextcloudmaps.api.ApiProvider;
 
 public class LoginActivity extends NextcloudMapsStyledActivity {
 
+    protected ApiProvider mApi;
     protected ProgressBar progress;
     protected Button button;
 
@@ -115,6 +115,9 @@ public class LoginActivity extends NextcloudMapsStyledActivity {
     }
 
     private void accountAccessDone() {
+        Context l_context = getApplicationContext();
+        mApi = new ApiProvider(l_context);
+
         Intent intent = new Intent(LoginActivity.this, MainActivity.class);
         startActivity(intent);
 

app/src/main/java/it/danieleverducci/nextcloudmaps/activity/main/GeofavoriteAdapter.java

@@ -111,8 +111,8 @@ public class GeofavoriteAdapter extends RecyclerView.Adapter<GeofavoriteAdapter.
         holder.tv_category.setText(geofavorite.categoryLetter());
         holder.setCategoryColor(
                 geofavorite.categoryColor() == 0 ? context.getColor(R.color.defaultBrand) : geofavorite.categoryColor());
-        holder.tv_title.setText(Html.fromHtml(geofavorite.getName() == null ? "" : geofavorite.getName()));
+        holder.tv_title.setText(Html.fromHtml(geofavorite.getName()));
-        holder.tv_content.setText(geofavorite.getComment() == null ? "" : geofavorite.getComment());
+        holder.tv_content.setText(geofavorite.getComment());
         holder.tv_date.setText(geofavorite.getLocalDateCreated().format(dateFormatter));
     }
 

app/src/main/java/it/danieleverducci/nextcloudmaps/activity/main/MainActivity.java

@@ -58,7 +58,6 @@ import it.danieleverducci.nextcloudmaps.activity.login.LoginActivity;
 import it.danieleverducci.nextcloudmaps.activity.main.NavigationAdapter.NavigationItem;
 import it.danieleverducci.nextcloudmaps.activity.main.SortingOrderDialogFragment.OnSortingOrderListener;
 import it.danieleverducci.nextcloudmaps.activity.mappicker.MapPickerActivity;
-import it.danieleverducci.nextcloudmaps.api.ApiProvider;
 import it.danieleverducci.nextcloudmaps.model.Geofavorite;
 import it.danieleverducci.nextcloudmaps.utils.GeoUriParser;
 import it.danieleverducci.nextcloudmaps.utils.IntentGenerator;
@@ -141,7 +140,7 @@ public class MainActivity extends NextcloudMapsStyledActivity implements OnSorti
 
 
         mMainActivityViewModel = new ViewModelProvider(this).get(MainActivityViewModel.class);
-        mMainActivityViewModel.init(getApplicationContext());
+        mMainActivityViewModel.init();
         mMainActivityViewModel.getIsUpdating().observe(this, new Observer<Boolean>() {
             @Override
             public void onChanged(@Nullable Boolean aBoolean) {
@@ -156,7 +155,7 @@ public class MainActivity extends NextcloudMapsStyledActivity implements OnSorti
         mMainActivityViewModel.getOnFinished().observe(this, new Observer<Boolean>() {
             @Override
             public void onChanged(@Nullable Boolean success) {
-                if(success == null || !success){
+                if(!success){
                     Toast.makeText(MainActivity.this, R.string.list_geofavorite_connection_error, Toast.LENGTH_LONG).show();
                 }
             }
@@ -298,11 +297,9 @@ public class MainActivity extends NextcloudMapsStyledActivity implements OnSorti
     }
 
     private void switch_account() {
-        ApiProvider.logout();
         SingleAccountHelper.setCurrentAccount(this, null);
         Intent intent = new Intent(MainActivity.this, LoginActivity.class);
         startActivity(intent);
-        finish();
     }
 
     @Override
@@ -345,7 +342,7 @@ public class MainActivity extends NextcloudMapsStyledActivity implements OnSorti
 
     private void showGeofavoriteDeteleDialog(Geofavorite item) {
         AlertDialog.Builder builder = new AlertDialog.Builder(MainActivity.this);
-        builder.setMessage(getString(R.string.dialog_delete_message).replace("{name}", item.getName() != null ? item.getName() : ""))
+        builder.setMessage(getString(R.string.dialog_delete_message).replace("{name}", item.getName()))
                 .setTitle(R.string.dialog_delete_title)
                 .setPositiveButton(R.string.dialog_delete_delete, new DialogInterface.OnClickListener() {
                     public void onClick(DialogInterface dialog, int id) {

app/src/main/java/it/danieleverducci/nextcloudmaps/activity/main/MainActivityViewModel.java

@@ -1,7 +1,5 @@
 package it.danieleverducci.nextcloudmaps.activity.main;
 
-import android.content.Context;
-
 import androidx.lifecycle.LiveData;
 import androidx.lifecycle.MutableLiveData;
 import androidx.lifecycle.ViewModel;
@@ -14,8 +12,8 @@ import it.danieleverducci.nextcloudmaps.repository.GeofavoriteRepository;
 public class MainActivityViewModel extends ViewModel {
     private GeofavoriteRepository mRepo;
 
-    public void init(Context applicationContext) {
+    public void init() {
-        mRepo = GeofavoriteRepository.getInstance(applicationContext);
+        mRepo = GeofavoriteRepository.getInstance();
     }
 
     public LiveData<List<Geofavorite>> getGeofavorites(){

app/src/main/java/it/danieleverducci/nextcloudmaps/activity/mappicker/MapPickerActivity.java

@@ -15,19 +15,25 @@ import android.view.inputmethod.InputMethodManager;
 import android.widget.Toast;
 
 import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatActivity;
 import androidx.core.app.ActivityCompat;
+import androidx.preference.PreferenceManager;
 
 import org.osmdroid.api.IGeoPoint;
 import org.osmdroid.api.IMapController;
+import org.osmdroid.config.Configuration;
+import org.osmdroid.config.IConfigurationProvider;
 import org.osmdroid.events.MapListener;
 import org.osmdroid.events.ScrollEvent;
 import org.osmdroid.events.ZoomEvent;
 import org.osmdroid.util.GeoPoint;
 import org.osmdroid.views.CustomZoomButtonsController;
 import org.osmdroid.views.MapView;
+import org.osmdroid.views.Projection;
 
 import java.util.Locale;
 
+import it.danieleverducci.nextcloudmaps.BuildConfig;
 import it.danieleverducci.nextcloudmaps.R;
 import it.danieleverducci.nextcloudmaps.activity.NextcloudMapsStyledActivity;
 import it.danieleverducci.nextcloudmaps.activity.detail.GeofavoriteDetailActivity;
@@ -58,7 +64,7 @@ public class MapPickerActivity extends NextcloudMapsStyledActivity {
             @Override
             public void onConfirmButtonPressed() {
                 double[] coords = mViewHolder.getCurrentCoordinates();
-                Uri geoUri = GeoUriParser.createGeoUri(coords[0], coords[1], null);
+                Uri geoUri = GeoUriParser.createUri(coords[0], coords[1], null);
                 Intent i = new Intent(MapPickerActivity.this, GeofavoriteDetailActivity.class);
                 i.setData(geoUri);
                 startActivity(i);

app/src/main/java/it/danieleverducci/nextcloudmaps/api/ApiProvider.java

@@ -24,7 +24,6 @@ import android.content.Context;
 import android.util.Log;
 
 import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
 
 import com.google.gson.GsonBuilder;
 import com.nextcloud.android.sso.api.NextcloudAPI;
@@ -36,27 +35,47 @@ import com.nextcloud.android.sso.model.SingleSignOnAccount;
 import retrofit2.NextcloudRetrofitApiBuilder;
 
 public class ApiProvider {
-    private static final String TAG = ApiProvider.class.getCanonicalName();
+    private final String TAG = ApiProvider.class.getCanonicalName();
 
+    @NonNull
+    protected Context context;
     protected static API mApi;
 
-    @Nullable
+    protected static String ssoAccountName;
-    public static API getAPI(Context context) {
-        if (mApi == null) {
-            try {
-                SingleSignOnAccount ssoAccount = SingleAccountHelper.getCurrentSingleSignOnAccount(context);
-                NextcloudAPI nextcloudAPI = new NextcloudAPI(context, ssoAccount, new GsonBuilder().create());
 
-                mApi = new NextcloudRetrofitApiBuilder(nextcloudAPI, API.mApiEndpoint).create(API.class);
+    public ApiProvider(Context context) {
-            } catch (NextcloudFilesAppAccountNotFoundException | NoCurrentAccountSelectedException e) {
+        this.context = context;
-                Log.d(TAG, "setAccout() called with: ex = [" + e + "]");
+        initSsoApi(new NextcloudAPI.ApiConnectedListener() {
+            @Override
+            public void onConnected() {
+                Log.d(TAG, "Connected to Nextcloud instance");
             }
-        }
 
+            @Override
+            public void onError(Exception ex) {
+                Log.d(TAG, "Unable to connect to Nextcloud instance: " + ex.toString());
+            }
+        });
+    }
+
+    public void initSsoApi(final NextcloudAPI.ApiConnectedListener callback) {
+        try {
+            SingleSignOnAccount ssoAccount = SingleAccountHelper.getCurrentSingleSignOnAccount(context);
+            NextcloudAPI nextcloudAPI = new NextcloudAPI(context, ssoAccount, new GsonBuilder().create(), callback);
+
+            ssoAccountName = ssoAccount.name;
+            mApi = new NextcloudRetrofitApiBuilder(nextcloudAPI, API.mApiEndpoint).create(API.class);
+        } catch (NextcloudFilesAppAccountNotFoundException | NoCurrentAccountSelectedException e) {
+            Log.d(TAG, "setAccout() called with: ex = [" + e + "]");
+        }
+    }
+
+    public static API getAPI() {
         return mApi;
     }
 
-    public static void logout() {
+    public static String getAccountName() {
-        mApi = null;
+        return ssoAccountName;
     }
+
 }

app/src/main/java/it/danieleverducci/nextcloudmaps/model/Geofavorite.java

@@ -164,10 +164,7 @@ public class Geofavorite implements Serializable {
     }
 
     public Uri getGeoUri() {
-        return GeoUriParser.createGeoUri(this.lat, this.lng, this.name);
+        return GeoUriParser.createUri(this.lat, this.lng, this.name);
-    }
-    public Uri getGmapsUri() {
-        return GeoUriParser.createGmapsUri(this.lat, this.lng);
     }
 
     public boolean valid() {
@@ -202,7 +199,7 @@ public class Geofavorite implements Serializable {
      */
     public int  categoryColor() {
         // If category is default, return null: will be used Nextcloud's accent
-        if (this.category == null || this.category.equals(DEFAULT_CATEGORY) || this.category.length() == 0)
+        if (this.category.equals(DEFAULT_CATEGORY))
             return 0;
 
         float letter1Index = this.category.toLowerCase().charAt(0);
@@ -215,7 +212,9 @@ public class Geofavorite implements Serializable {
     }
 
     public String categoryLetter() {
-        if (category == null || category.length() == 0 || category.equals(DEFAULT_CATEGORY))
+        if (category == null || category.length() == 0)
+            return "";
+        if (category.equals(DEFAULT_CATEGORY))
             return "\u2022";
         return category.substring(0,1);
     }

app/src/main/java/it/danieleverducci/nextcloudmaps/repository/GeofavoriteRepository.java

@@ -1,9 +1,9 @@
 package it.danieleverducci.nextcloudmaps.repository;
 
-import android.content.Context;
 import android.util.Log;
 
 import androidx.annotation.NonNull;
+import androidx.appcompat.app.AppCompatActivity;
 import androidx.lifecycle.MutableLiveData;
 
 import java.util.ArrayList;
@@ -29,15 +29,9 @@ public class GeofavoriteRepository {
     private MutableLiveData<Boolean> mIsUpdating = new MutableLiveData<>(false);
     private SingleLiveEvent<Boolean> mOnFinished = new SingleLiveEvent<>();
 
-    private Context applicationContext;
+    public static GeofavoriteRepository getInstance() {
-
-    public GeofavoriteRepository(Context applicationContext) {
-        this.applicationContext = applicationContext;
-    }
-
-    public static GeofavoriteRepository getInstance(Context applicationContext) {
         if(instance == null){
-            instance = new GeofavoriteRepository(applicationContext);
+            instance = new GeofavoriteRepository();
         }
         return instance;
     }
@@ -65,7 +59,7 @@ public class GeofavoriteRepository {
     public void updateGeofavorites() {
         mIsUpdating.postValue(true);
         // Obtain geofavorites
-        Call<List<Geofavorite>> call = ApiProvider.getAPI(this.applicationContext).getGeofavorites();
+        Call<List<Geofavorite>> call = ApiProvider.getAPI().getGeofavorites();
         call.enqueue(new Callback<List<Geofavorite>>() {
             @Override
             public void onResponse(@NonNull Call<List<Geofavorite>> call, @NonNull Response<List<Geofavorite>> response) {
@@ -100,10 +94,10 @@ public class GeofavoriteRepository {
         Call<Geofavorite> call;
         if (geofav.getId() == 0) {
             // New geofavorite
-            call = ApiProvider.getAPI(this.applicationContext).createGeofavorite(geofav);
+            call = ApiProvider.getAPI().createGeofavorite(geofav);
         } else {
             // Update existing geofavorite
-            call = ApiProvider.getAPI(this.applicationContext).updateGeofavorite(geofav.getId(), geofav);
+            call = ApiProvider.getAPI().updateGeofavorite(geofav.getId(), geofav);
         }
         call.enqueue(new Callback<Geofavorite>() {
             @Override
@@ -135,7 +129,7 @@ public class GeofavoriteRepository {
     public void deleteGeofavorite(Geofavorite geofav) {
         mIsUpdating.postValue(true);
         // Delete Geofavorite
-        Call<Geofavorite> call = ApiProvider.getAPI(this.applicationContext).deleteGeofavorite(geofav.getId());
+        Call<Geofavorite> call = ApiProvider.getAPI().deleteGeofavorite(geofav.getId());
         call.enqueue(new Callback<Geofavorite>() {
             @Override
             public void onResponse(Call<Geofavorite> call, Response<Geofavorite> response) {
@@ -162,9 +156,7 @@ public class GeofavoriteRepository {
     private void updateCategories(List<Geofavorite> geofavs) {
         HashSet<String> categories = new HashSet<>();
         for (Geofavorite g : geofavs) {
-            String cat = g.getCategory();
+            categories.add(g.getCategory());
-            if (cat != null)
-                categories.add(cat);
         }
         mCategories.postValue(categories);
     }

app/src/main/java/it/danieleverducci/nextcloudmaps/utils/GeoUriParser.java

@@ -10,79 +10,35 @@ import it.danieleverducci.nextcloudmaps.model.Geofavorite;
 
 public class GeoUriParser {
     private static final Pattern PATTERN_GEO = Pattern.compile("geo:(-?[\\d.]+),(-?[\\d.]+)");
-    // Try to match not only geoUri but also Google Maps Uri
-    private static final Pattern PATTERN_BROAD = Pattern.compile(
-        "(?:@|&query=|&ce\nter=|geo:|#map=\\d{1,2}\\/)(-?\\d{1,2}\\.\\d+)(?:,|%2C|\\/)(-?\\d{1,3}\\.\\d{1,10})"
-    );
 
-    /**
+    public static double[] parseUri(Uri uri) throws IllegalArgumentException {
-     * Parses an URI into latitude and longitude
-     * @param uri to parse
-     * @param strict if true, the uri must be a valid geo: uri, otherwise a broader check is applied to include other uris, like Google Maps ones
-     * @return the parsed coordinates in an array [lat,lon]
-     * @throws IllegalArgumentException if the url could not be parsed
-     */
-    public static double[] parseUri(Uri uri, boolean strict) throws IllegalArgumentException {
         if (uri == null)
             throw new IllegalArgumentException("no uri");
 
-        // Try to extract coordinates in uri string with regexp
+        Matcher m = PATTERN_GEO.matcher(uri.toString());
-        Pattern pattern = strict ? PATTERN_GEO : PATTERN_BROAD;
+        if (m.find() && m.groupCount() == 2) {
-        Matcher m = pattern.matcher(uri.toString());
+            String sLat = m.group(1);
-        if (!m.find() || m.groupCount() != 2)
+            String sLon = m.group(2);
-            throw new IllegalArgumentException("unable to parse uri: unable to find coordinates in uri");
+            try {
-
+                return new double[]{Double.parseDouble(sLat), Double.parseDouble(sLon)};
-        // Obtain coordinates from regexp result
+            } catch (NumberFormatException e) {
-        String sLat = m.group(1);
+                throw new IllegalArgumentException("unable to parse uri");
-        String sLon = m.group(2);
+            }
-        double[] coords = null;
+        } else {
-        try {
+            throw new IllegalArgumentException("unable to parse uri");
-            // Check coordinates are numeric
-            coords = new double[]{Double.parseDouble(sLat), Double.parseDouble(sLon)};
-        } catch (NumberFormatException e) {
-            throw new IllegalArgumentException("unable to parse uri: coordinates are not double");
         }
-
-        // Check coordinates validity
-        String error = checkCoordsValidity(coords[0], coords[1]);
-        if (error != null)
-            throw new IllegalArgumentException(error);
-
-        return coords;
     }
 
-    public static Uri createGeoUri(double lat, double lon, String name) {
+    public static Uri createUri(double lat, double lon, String name) {
-        String error = checkCoordsValidity(lat, lon);
+        // Check coords validity
-        if (error != null)
+        if (lon <= -180 || lon >= 180 )
-            throw new IllegalArgumentException(error);
+            throw new IllegalArgumentException("Invalid longitude: " + lon);
+        if (lat <= -90 || lat >= 90)
+            throw new IllegalArgumentException("Invalid latitude: " + lat);
 
         String uriStr = "geo:" + lat + "," + lon;
         if (name != null)
             uriStr += "(" + name + ")";
         return Uri.parse(uriStr);
     }
-
-    public static Uri createGmapsUri(double lat, double lon) {
-        String error = checkCoordsValidity(lat, lon);
-        if (error != null)
-            throw new IllegalArgumentException(error);
-
-        String uriStr = "https://www.google.com/maps/search/?api=1&query=" + lat + "," + lon;
-        return Uri.parse(uriStr);
-    }
-
-    /**
-     * Checks a latitude/longitude is valid
-     * @param lat latitude
-     * @param lon longitude
-     * @return null if valid, a string containing an error otherwise
-     */
-    private static String checkCoordsValidity(double lat, double lon) {
-        // Check coords validity
-        if (lon <= -180 || lon >= 180 )
-            return "Invalid longitude: " + lon;
-        if (lat <= -90 || lat >= 90)
-            return "Invalid latitude: " + lat;
-        return null;
-    }
 }

app/src/main/java/it/danieleverducci/nextcloudmaps/utils/IntentGenerator.java

@@ -2,7 +2,6 @@ package it.danieleverducci.nextcloudmaps.utils;
 
 import android.content.Context;
 import android.content.Intent;
-import android.content.pm.PackageManager;
 import android.util.Log;
 
 import it.danieleverducci.nextcloudmaps.R;
@@ -23,16 +22,7 @@ public class IntentGenerator {
     public static Intent newGeoUriIntent(Context context, Geofavorite item) {
         Intent i = new Intent();
         i.setAction(Intent.ACTION_VIEW);
-        i.setData(isGoogleMapsInstalled(context) ? item.getGmapsUri() : item.getGeoUri());
+        i.setData(item.getGeoUri());
         return i;
     }
-    
-    public static boolean isGoogleMapsInstalled(Context context) {
-        try {
-            context.getPackageManager().getApplicationInfo("com.google.android.apps.maps", 0);
-            return true;
-        } catch (PackageManager.NameNotFoundException e) {
-            return false;
-        }
-    }
 }

app/src/main/res/layout/mipmap-anydpi-v26/ic_launcher.xml

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Nextcloud Maps Geofavorites for Android
+  ~
+  ~ This program is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ This program is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with this program.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@drawable/ic_launcher_background"/>
+    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
+</adaptive-icon>

app/src/main/res/layout/mipmap-anydpi-v26/ic_launcher_round.xml

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Nextcloud Maps Geofavorites for Android
+  ~
+  ~ This program is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ This program is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with this program.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@drawable/ic_launcher_background"/>
+    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
+</adaptive-icon>

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

@@ -18,13 +18,13 @@
 
 <resources>
     <!-- App strings -->
-    <string name="app_name">Maps Geofavorites</string>
+    <string name="app_name">Maps Geobookmarks</string>
-    <string name="welcome">Benvenuto su Nextcloud Maps Geofavorites</string>
+    <string name="welcome">Benvenuto su Nextcloud Maps Geobookmarks</string>
 
     <!-- Login Activity -->
     <string name="choose_account">Scegli account</string>
 
-    <!-- Geofavorites list -->
+    <!-- Geobookmarks list -->
     <string name="new_geobookmark">Nuovo geosegnalibro</string>
     <string name="about">Informazioni</string>
     <string name="switch_account">Cambia account</string>
@@ -48,7 +48,7 @@
     <string name="menu_item_sort_by_category_a_z">Categoria</string>
     <string name="menu_item_sort_by_distance_nearest_first">Distanza</string>
 
-    <!-- Geofavorites detail -->
+    <!-- Geobookmarks detail -->
     <string name="name">Nome</string>
     <string name="description">Descrizione</string>
     <string name="created">Creato</string>

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

@@ -17,13 +17,13 @@
 
 <resources>
     <!-- App strings -->
-    <string name="app_name">Maps Geofavorites</string>
+    <string name="app_name">Maps Geobookmarks</string>
-    <string name="welcome">Welcome to Nextcloud Maps Geofavorites</string>
+    <string name="welcome">Welcome to Nextcloud Maps Geobookmarks</string>
 
     <!-- Login Activity -->
     <string name="choose_account">Choose account</string>
 
-    <!-- Geofavorites list -->
+    <!-- Geobookmarks list -->
     <string name="new_geobookmark">New geofavorite</string>
     <string name="about">About</string>
     <string name="switch_account">Switch account</string>
@@ -47,7 +47,7 @@
     <string name="menu_item_sort_by_category_a_z">Category</string>
     <string name="menu_item_sort_by_distance_nearest_first">Distance</string>
 
-    <!-- Geofavorites detail -->
+    <!-- Geobookmarks detail -->
     <string name="name">Name</string>
     <string name="description">Description</string>
     <string name="created">Created</string>

build.gradle

@@ -25,7 +25,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.1.1'
+        classpath 'com.android.tools.build:gradle:4.2.2'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

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

@@ -1,4 +0,0 @@
-Fix crash when using corrupted dataset with null category (It may happen on imports from Google Maps)
-Reimplemented API Provider to try to fix NullPointerException on mApi reported in Play Store
-Open Google Maps on Google devices
-Support share from: google maps urls, OpenStreetMap urls (only if containing coordinates)

fastlane/metadata/android/en-US/full_description.txt

@@ -1,5 +1,5 @@
-UNOFFICIAL and FOSS Nextcloud Maps client at its earliest stages of developement. Shows your Nextcloud Maps geofavorites list.
+UNOFFICIAL and FOSS Nextcloud Maps client at its earliest stages of developement. Shows your Nextcloud Maps geobookmarks list.
-Geofavorites can be opened in all apps supporting geo links (i.e. Google Maps, Organic Maps etc...).
+Geobookmarks can be opened in all apps supporting geo links (i.e. Google Maps, Organic Maps etc...).
 A new geofavorite can be created on current location, by sharing a "geo:" uri from another app or manually picking from the map.
 
 Requires Maps app to be installed on the Nextcloud instance.

fastlane/metadata/android/en-US/short_description.txt

@@ -1 +1 @@
-Manage Nextcloud Maps Geofavorites on your phone
+Manage Nextcloud Maps Geobookmarks on your phone

fastlane/metadata/android/en-US/title.txt

@@ -1 +1 @@
-Nextcloud Maps Geofavorites
+Nextcloud Maps Geobookmarks

fastlane/metadata/android/it-IT/full_description.txt

@@ -1,3 +0,0 @@
-Client per Nextcloud Maps non ufficiale e FOSS al suo stato iniziale di sviluppo.
-Mostra la lista dei geosegnalibri di Nextcloud Maps e permette di aprirli in qualunque app supporti i "geo:" urls (i.e. Google Maps, Organic Maps etc...).
-È possibile creare nuovi geosegnalibri nella posizione GPS attuale, scegliendo la posizione dalla mappa o condividendola da altre app sotto forma di "geo:" uri.

fastlane/metadata/android/it-IT/short_description.txt

@@ -1 +0,0 @@
-Un semplice client per Nextcloud Maps

fastlane/metadata/android/it-IT/title.txt

@@ -1 +0,0 @@
-Nextcloud Maps Geofavorites

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,23 @@
-#Sun Feb 20 08:50:37 CET 2022
+#
+# Nextcloud Geofavorites for Android
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+#Mon Oct 05 23:27:18 ART 2020
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
 distributionPath=wrapper/dists
-zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip