gpesquero/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[android] Replace com.mapswithme.maps.api with https://omaps.app/

Browse source 
Instead of action="com.mapswithme.maps.api.request" use
           action="android.intent.action.VIEW" with https://omaps.app url.

Closes #2674

Signed-off-by: Roman Tsisyk <roman@tsisyk.com>
This commit is contained in:
Roman Tsisyk 2022-07-03 13:25:09 +03:00 • committed by Alexander Borsuk
parent b7f48d354d
commit faa4162b9a
6 changed files with 26 additions and 66 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
android/AndroidManifest.xml
View file

@ -588,12 +588,6 @@
android:scheme="mapsme"/>
</intent-filter>
<!-- API CALL -->
<intent-filter>
<action android:name="com.mapswithme.maps.api.request"/>
<category android:name="android.intent.category.DEFAULT"/>
</intent-filter>
<intent-filter>
<action android:name="android.intent.action.VIEW"/>
<category android:name="android.intent.category.DEFAULT"/>

8
android/src/com/mapswithme/maps/DownloadResourcesLegacyActivity.java
View file

@ -92,7 +92,6 @@ public class DownloadResourcesLegacyActivity extends BaseMwmFragmentActivity imp
private final IntentProcessor[] mIntentProcessors = {
new Factory.GeoIntentProcessor(),
new Factory.HttpGeoIntentProcessor(),
new Factory.ApiIntentProcessor(),
new Factory.HttpMapsIntentProcessor(),
new Factory.OpenCountryTaskProcessor(),
new Factory.KmzKmlProcessor(this),
@ -408,14 +407,11 @@ public class DownloadResourcesLegacyActivity extends BaseMwmFragmentActivity imp
protected void onActivityResult(int requestCode, int resultCode, Intent data)
{
switch (requestCode)
super.onActivityResult(requestCode, resultCode, data);
if (requestCode == REQ_CODE_API_RESULT)
{
case REQ_CODE_API_RESULT:
setResult(resultCode, data);
finish();
break;
default:
super.onActivityResult(requestCode, resultCode, data);
}
}

11
android/src/com/mapswithme/maps/SplashActivity.java
View file

@ -13,6 +13,7 @@ import androidx.appcompat.app.AlertDialog;
import androidx.appcompat.app.AppCompatActivity;
import com.mapswithme.maps.api.Const;
import com.mapswithme.maps.api.ParsedMwmRequest;
import com.mapswithme.maps.base.BaseActivity;
import com.mapswithme.maps.base.BaseActivityDelegate;
import com.mapswithme.maps.location.LocationHelper;
@ -193,7 +194,7 @@ public class SplashActivity extends AppCompatActivity implements BaseActivity
input.getParcelableExtra(EXTRA_INITIAL_INTENT) :
input;
result.putExtra(EXTRA_INITIAL_INTENT, initialIntent);
if (Const.ACTION_MWM_REQUEST.equals(initialIntent.getAction()))
if (!initialIntent.hasCategory(Intent.CATEGORY_LAUNCHER))
{
// Wait for the result from MwmActivity for API callers.
startActivityForResult(result, REQ_CODE_API_RESULT);
@ -207,15 +208,11 @@ public class SplashActivity extends AppCompatActivity implements BaseActivity
protected void onActivityResult(int requestCode, int resultCode, Intent data)
{
switch (requestCode)
super.onActivityResult(requestCode, resultCode, data);
if (requestCode == REQ_CODE_API_RESULT)
{
case REQ_CODE_API_RESULT:
// Propagate the result to API callers
setResult(resultCode, data);
finish();
break;
default:
super.onActivityResult(requestCode, resultCode, data);
}
}

24
android/src/com/mapswithme/maps/api/Const.java
View file

@ -2,24 +2,22 @@ package com.mapswithme.maps.api;
public class Const
{
/* Common */
static final String API_SCHEME = "om://";
static final String AUTHORITY = "app.organicmaps.api";
static final String EXTRA_PREFIX = AUTHORITY + ".extra";
/* Request extras */
static final String AUTHORITY = "com.mapswithme.maps.api";
public static final String EXTRA_URL = AUTHORITY + ".url";
public static final String EXTRA_TITLE = AUTHORITY + ".title";
public static final String EXTRA_PICK_POINT = AUTHORITY + ".pick_point";
public static final String EXTRA_TITLE = EXTRA_PREFIX + ".TITLE";
public static final String EXTRA_PICK_POINT = EXTRA_PREFIX + ".PICK_POINT";
/* Response extras */
/* Point part-by-part*/
public static final String EXTRA_MWM_RESPONSE_POINT_NAME = AUTHORITY + ".point_name";
public static final String EXTRA_MWM_RESPONSE_POINT_LAT = AUTHORITY + ".point_lat";
public static final String EXTRA_MWM_RESPONSE_POINT_LON = AUTHORITY + ".point_lon";
public static final String EXTRA_MWM_RESPONSE_POINT_ID = AUTHORITY + ".point_id";
public static final String EXTRA_MWM_RESPONSE_ZOOM = AUTHORITY + ".zoom_level";
public static final String ACTION_MWM_REQUEST = AUTHORITY + ".request";
public static final String EXTRA_POINT_NAME = EXTRA_PREFIX + ".POINT_NAME";
public static final String EXTRA_POINT_LAT = EXTRA_PREFIX + ".POINT_LAT";
public static final String EXTRA_POINT_LON = EXTRA_PREFIX + ".POINT_LON";
public static final String EXTRA_POINT_ID = EXTRA_PREFIX + ".POINT_ID";
public static final String EXTRA_ZOOM_LEVEL = EXTRA_PREFIX + ".ZOOM_LEVEL";
private Const() {}
}

33
android/src/com/mapswithme/maps/intent/Factory.java
View file

@ -14,7 +14,6 @@ import com.mapswithme.maps.Framework;
import com.mapswithme.maps.MapFragment;
import com.mapswithme.maps.MwmActivity;
import com.mapswithme.maps.MwmApplication;
import com.mapswithme.maps.api.Const;
import com.mapswithme.maps.api.ParsedMwmRequest;
import com.mapswithme.maps.api.ParsedRoutingData;
import com.mapswithme.maps.api.ParsedSearchRequest;
@ -73,38 +72,14 @@ public class Factory
if (uri.getPath() == null)
return null;
final String ge0Url = "om:/" + uri.getPath();
SearchEngine.INSTANCE.cancelInteractiveSearch();
final ParsedMwmRequest request = ParsedMwmRequest.extractFromIntent(intent);
ParsedMwmRequest.setCurrentRequest(request);
return new OpenUrlTask(ge0Url);
}
}
/**
* Use this to invoke API task.
*/
public static class ApiIntentProcessor implements IntentProcessor
{
@Nullable
@Override
public MapTask process(@NonNull Intent intent)
{
if (!Const.ACTION_MWM_REQUEST.equals(intent.getAction()))
return null;
final String apiUrl = intent.getStringExtra(Const.EXTRA_URL);
if (apiUrl != null)
{
SearchEngine.INSTANCE.cancelInteractiveSearch();
final ParsedMwmRequest request = ParsedMwmRequest.extractFromIntent(intent);
ParsedMwmRequest.setCurrentRequest(request);
if (request.isPickPointMode())
return new OpenUrlTask(apiUrl);
}
throw new AssertionError("Url must be provided!");
}
}
public static class HttpMapsIntentProcessor implements IntentProcessor
{
@Nullable

10
android/src/com/mapswithme/maps/widget/placepage/PlacePageView.java
View file

@ -536,11 +536,11 @@ public class PlacePageView extends NestedScrollViewClickFixed
if (request != null && request.isPickPointMode())
{
final Intent result = new Intent();
result.putExtra(Const.EXTRA_MWM_RESPONSE_POINT_LAT, mMapObject.getLat())
.putExtra(Const.EXTRA_MWM_RESPONSE_POINT_LON, mMapObject.getLon())
.putExtra(Const.EXTRA_MWM_RESPONSE_POINT_NAME, mMapObject.getTitle())
.putExtra(Const.EXTRA_MWM_RESPONSE_POINT_ID, mMapObject.getApiId())
.putExtra(Const.EXTRA_MWM_RESPONSE_ZOOM, Framework.nativeGetDrawScale());
result.putExtra(Const.EXTRA_POINT_LAT, mMapObject.getLat())
.putExtra(Const.EXTRA_POINT_LON, mMapObject.getLon())
.putExtra(Const.EXTRA_POINT_NAME, mMapObject.getTitle())
.putExtra(Const.EXTRA_POINT_ID, mMapObject.getApiId())
.putExtra(Const.EXTRA_ZOOM_LEVEL, Framework.nativeGetDrawScale());
getActivity().setResult(Activity.RESULT_OK, result);
ParsedMwmRequest.setCurrentRequest(null);
}