From f04b8d36f8b4dc1910fd7da0a7787716727136be Mon Sep 17 00:00:00 2001
From: Emux <devemux86@gmail.com>
Date: Wed, 20 Oct 2021 17:31:37 +0300
Subject: [PATCH] Update Android samples
---
vtm-android-example/AndroidManifest.xml | 1 +
.../src/org/oscim/android/test/LocationActivity.java | 4 ++--
.../src/org/oscim/android/test/LocationTextureActivity.java | 4 ++--
vtm-app/AndroidManifest.xml | 1 +
vtm-app/src/org/oscim/app/TileMap.java | 4 ++--
5 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/vtm-android-example/AndroidManifest.xml b/vtm-android-example/AndroidManifest.xml
index 45fd562d..d547b9f0 100644
--- a/vtm-android-example/AndroidManifest.xml
+++ b/vtm-android-example/AndroidManifest.xml
@@ -5,6 +5,7 @@
android:versionCode="1"
android:versionName="1.0">
+ <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission
diff --git a/vtm-android-example/src/org/oscim/android/test/LocationActivity.java b/vtm-android-example/src/org/oscim/android/test/LocationActivity.java
index f7a3edbd..1d5b3b4f 100644
--- a/vtm-android-example/src/org/oscim/android/test/LocationActivity.java
+++ b/vtm-android-example/src/org/oscim/android/test/LocationActivity.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2016-2019 devemux86
+ * Copyright 2016-2021 devemux86
*
* This program is free software: you can redistribute it and/or modify it under the
* terms of the GNU Lesser General Public License as published by the Free Software
@@ -104,7 +104,7 @@ public class LocationActivity extends BitmapTileActivity implements LocationList
private void enableAvailableProviders() {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
if (checkSelfPermission(Manifest.permission.ACCESS_FINE_LOCATION) != PackageManager.PERMISSION_GRANTED) {
- requestPermissions(new String[]{Manifest.permission.ACCESS_FINE_LOCATION}, 0);
+ requestPermissions(new String[]{Manifest.permission.ACCESS_COARSE_LOCATION, Manifest.permission.ACCESS_FINE_LOCATION}, 0);
return;
}
}
diff --git a/vtm-android-example/src/org/oscim/android/test/LocationTextureActivity.java b/vtm-android-example/src/org/oscim/android/test/LocationTextureActivity.java
index 32bcdfb0..6938d00b 100644
--- a/vtm-android-example/src/org/oscim/android/test/LocationTextureActivity.java
+++ b/vtm-android-example/src/org/oscim/android/test/LocationTextureActivity.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2016-2019 devemux86
+ * Copyright 2016-2021 devemux86
* Copyright 2018 Longri
*
* This program is free software: you can redistribute it and/or modify it under the
@@ -134,7 +134,7 @@ public class LocationTextureActivity extends BitmapTileActivity implements Locat
private void enableAvailableProviders() {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
if (checkSelfPermission(Manifest.permission.ACCESS_FINE_LOCATION) != PackageManager.PERMISSION_GRANTED) {
- requestPermissions(new String[]{Manifest.permission.ACCESS_FINE_LOCATION}, 0);
+ requestPermissions(new String[]{Manifest.permission.ACCESS_COARSE_LOCATION, Manifest.permission.ACCESS_FINE_LOCATION}, 0);
return;
}
}
diff --git a/vtm-app/AndroidManifest.xml b/vtm-app/AndroidManifest.xml
index c0f36874..b9665dda 100644
--- a/vtm-app/AndroidManifest.xml
+++ b/vtm-app/AndroidManifest.xml
@@ -5,6 +5,7 @@
android:versionCode="1"
android:versionName="1.0">
+ <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
<uses-permission android:name="android.permission.INTERNET" />
diff --git a/vtm-app/src/org/oscim/app/TileMap.java b/vtm-app/src/org/oscim/app/TileMap.java
index 42f81cb3..7b72475c 100755
--- a/vtm-app/src/org/oscim/app/TileMap.java
+++ b/vtm-app/src/org/oscim/app/TileMap.java
@@ -1,6 +1,6 @@
/* Copyright 2010, 2011, 2012 mapsforge.org
* Copyright 2012 Hannes Janetzek
- * Copyright 2016-2019 devemux86
+ * Copyright 2016-2021 devemux86
*
* This program is free software: you can redistribute it and/or modify it under the
* terms of the GNU Lesser General Public License as published by the Free Software
@@ -77,7 +77,7 @@ public class TileMap extends MapActivity implements MapEventsReceiver {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
if (checkSelfPermission(Manifest.permission.ACCESS_FINE_LOCATION) != PackageManager.PERMISSION_GRANTED)
- requestPermissions(new String[]{Manifest.permission.ACCESS_FINE_LOCATION}, 0);
+ requestPermissions(new String[]{Manifest.permission.ACCESS_COARSE_LOCATION, Manifest.permission.ACCESS_FINE_LOCATION}, 0);
}
setContentView(R.layout.activity_tilemap);