Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix #7658

Browse source
This commit is contained in:
max-klaus 2019-10-28 15:44:37 +03:00
parent 8fc456f3ec
commit 83149359e9
3 changed files with 57 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
OsmAnd-java/src/main/java/net/osmand/map/TileSourceManager.java
View file

@ -486,7 +486,7 @@ public class TileSourceManager {
return templates;
}
private static TileSourceTemplate createTileSourceTemplate(Map<String, String> attrs) {
public static TileSourceTemplate createTileSourceTemplate(Map<String, String> attrs) {
TileSourceTemplate template = null;
String rule = attrs.get("rule");
if(rule == null){

13
OsmAnd/AndroidManifest.xml
View file

@ -116,6 +116,19 @@
<category android:name="android.intent.category.DESK_DOCK" />
</intent-filter>
<intent-filter>
<data android:scheme="http" />
<data android:scheme="https" />
<data android:host="osmand.net" />
<data android:pathPrefix="/add-tile-source" />
<action android:name="android.intent.action.VIEW" />
<category android:name="android.intent.category.DEFAULT" />
<category android:name="android.intent.category.BROWSABLE" />
<category android:name="android.intent.category.APP_MAPS" />
<category android:name="android.intent.category.CAR_MODE" />
<category android:name="android.intent.category.CAR_DOCK" />
<category android:name="android.intent.category.DESK_DOCK" />
</intent-filter>
<!-- android matches non-greedy : http://stackoverflow.com/questions/3400072/pathpattern-to-match-file-extension-does-not-work-if-a-period-exists-elsewhere-i-->
<!-- mimeType&host are both needed or you will either have unwanted matching or no match when needed -->

46
OsmAnd/src/net/osmand/plus/activities/MapActivity.java
View file

@ -60,6 +60,8 @@ import net.osmand.data.QuadRect;
import net.osmand.data.RotatedTileBox;
import net.osmand.map.MapTileDownloader.DownloadRequest;
import net.osmand.map.MapTileDownloader.IMapDownloaderCallback;
import net.osmand.map.TileSourceManager;
import net.osmand.map.TileSourceManager.TileSourceTemplate;
import net.osmand.plus.AppInitializer;
import net.osmand.plus.AppInitializer.AppInitializeListener;
import net.osmand.plus.AppInitializer.InitEvents;
@ -151,6 +153,7 @@ import org.apache.commons.logging.Log;
import java.io.File;
import java.lang.ref.WeakReference;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
@ -290,7 +293,7 @@ public class MapActivity extends OsmandActionBarActivity implements DownloadEven
}
dashboardOnMap.createDashboardView();
checkAppInitialization();
parseLaunchIntentLocation();
parseLaunchIntents();
mapView.setTrackBallDelegate(new OsmandMapTileView.OnTrackBallListener() {
@Override
public boolean onTrackBallEvent(MotionEvent e) {
@ -696,7 +699,7 @@ public class MapActivity extends OsmandActionBarActivity implements DownloadEven
@Override
protected void onRestart() {
super.onRestart();
parseLaunchIntentLocation();
parseLaunchIntents();
}
@Override
@ -1634,8 +1637,15 @@ public class MapActivity extends OsmandActionBarActivity implements DownloadEven
return mapViewTrackingUtilities;
}
private boolean parseLaunchIntents() {
boolean applied = parseLocationIntent();
if (!applied) {
applied = parseTileSourceIntent();
}
return applied;
}
protected void parseLaunchIntentLocation() {
private boolean parseLocationIntent() {
Intent intent = getIntent();
if (intent != null && intent.getData() != null) {
Uri data = intent.getData();
@ -1658,8 +1668,38 @@ public class MapActivity extends OsmandActionBarActivity implements DownloadEven
}
}
setIntent(null);
return true;
}
}
return false;
}
private boolean parseTileSourceIntent() {
Intent intent = getIntent();
if (intent != null && intent.getData() != null) {
Uri data = intent.getData();
if (("http".equalsIgnoreCase(data.getScheme()) || "https".equalsIgnoreCase(data.getScheme())) && data.getHost() != null && data.getHost().contains("osmand.net") &&
data.getPath() != null && data.getPath().startsWith("/add-tile-source")) {
Map<String, String> attrs = new HashMap<>();
for (String name : data.getQueryParameterNames()) {
attrs.put(name, data.getQueryParameter(name));
}
if (!attrs.isEmpty()) {
try {
TileSourceTemplate r = TileSourceManager.createTileSourceTemplate(attrs);
if (r != null && settings.installTileSource(r)) {
Toast.makeText(this, getString(R.string.edit_tilesource_successfully, r.getName()),
Toast.LENGTH_SHORT).show();
}
} catch (Exception e) {
LOG.error("parseAddTileSourceIntent error", e);
}
}
setIntent(null);
return true;
}
}
return false;
}
public MapActivityActions getMapActions() {