organicmaps/api-android
13
Fork 0
Code Issues 5 Pull requests Projects Releases Wiki Activity Actions

Switch installation check to intent resolution

Browse source
This commit is contained in:
moving-bits 2023-08-12 23:36:46 +02:00 • committed by Alexander Borsuk
parent f3a87782f0
commit 1619b32afb
2 changed files with 4 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
lib/src/main/AndroidManifest.xml
View file

@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<queries>
<!-- packages we want to see using the package manager need to be declared starting with targetSDK 30, and we need to use specific strings / cannot use @string/xxx notation -->
<package android:name="app.organicmaps"/>
<package android:name="com.mapswithme.maps"/>
</queries>

11
lib/src/main/java/app/organicmaps/api/OrganicMapsApi.java
View file

@ -1,16 +1,14 @@
package app.organicmaps.api;
import android.app.Activity;
import android.content.ComponentName;
import android.content.Context;
import android.content.Intent;
import android.content.pm.ActivityInfo;
import java.util.ArrayList;
public class OrganicMapsApi {
static final String PACKAGE_NAME = "app.organicmaps";
private OrganicMapsApi() {
// utility class
}
@ -31,9 +29,6 @@ public class OrganicMapsApi {
public static void sendRequest(final Activity caller, final Intent intent) {
if (isOrganicMapsInstalled(caller)) {
// Match activity for intent
final ActivityInfo aInfo = caller.getPackageManager().resolveActivity(intent, 0).activityInfo;
intent.setClassName(aInfo.packageName, aInfo.name);
caller.startActivity(intent);
} else {
new DownloadDialog(caller).show();
@ -44,8 +39,8 @@ public class OrganicMapsApi {
* Detects if any version of OrganicMaps is installed on the device
*/
public static boolean isOrganicMapsInstalled(final Context context) {
final Intent i = context.getPackageManager().getLaunchIntentForPackage(PACKAGE_NAME);
return i != null;
final ComponentName c = new MapRequest().toIntent().resolveActivity(context.getPackageManager());
return c != null;
}
}