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

[android] "geo" scheme support.

Browse source
This commit is contained in:
Dmitry Kunin 2013-04-16 23:43:55 +03:00 • committed by Alex Zolotarev
parent f6f237ed4e
commit 4591e0eca6
7 changed files with 81 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
android/MapsWithMeLite.Samsung/AndroidManifest.xml
View file

@ -37,6 +37,25 @@
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
<!-- standard "geo" scheme -->
<intent-filter><action android:name="android.intent.action.VIEW"></action>
<category android:name="android.intent.category.DEFAULT"></category>
<data android:scheme="geo"></data>
</intent-filter>
<!--
<intent-filter><action android:name="android.intent.action.VIEW"></action>
<category android:name="android.intent.category.DEFAULT"></category>
<data android:scheme="ge0"></data>
</intent-filter>
<intent-filter><action android:name="android.intent.action.VIEW"></action>
<category android:name="android.intent.category.DEFAULT"></category>
<data android:scheme="mapswithme"></data>
</intent-filter>
-->
</activity>
<activity android:name="com.mapswithme.maps.MWMActivity"
android:label="@string/app_name"

19
android/MapsWithMeLite/AndroidManifest.xml
View file

@ -33,6 +33,25 @@
android:screenOrientation="behind"
android:theme="@style/MWMNoTitle"
android:configChanges="orientation|screenLayout|screenSize">
<!-- standard "geo" scheme -->
<intent-filter><action android:name="android.intent.action.VIEW"></action>
<category android:name="android.intent.category.DEFAULT"></category>
<data android:scheme="geo"></data>
</intent-filter>
<!--
<intent-filter><action android:name="android.intent.action.VIEW"></action>
<category android:name="android.intent.category.DEFAULT"></category>
<data android:scheme="ge0"></data>
</intent-filter>
<intent-filter><action android:name="android.intent.action.VIEW"></action>
<category android:name="android.intent.category.DEFAULT"></category>
<data android:scheme="mapswithme"></data>
</intent-filter>
-->
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />

7
android/MapsWithMePro/AndroidManifest.xml
View file

@ -40,24 +40,23 @@
</intent-filter>
<!-- standart "geo" scheme -->
<!-- standard "geo" scheme -->
<intent-filter><action android:name="android.intent.action.VIEW"></action>
<category android:name="android.intent.category.DEFAULT"></category>
<data android:scheme="geo"></data>
</intent-filter>
<!-- internal "ge0" scheme for sms on so on -->
<!--
<intent-filter><action android:name="android.intent.action.VIEW"></action>
<category android:name="android.intent.category.DEFAULT"></category>
<data android:scheme="ge0"></data>
</intent-filter>
<!-- internal "mapswithme" scheme for human-readable links -->
<intent-filter><action android:name="android.intent.action.VIEW"></action>
<category android:name="android.intent.category.DEFAULT"></category>
<data android:scheme="mapswithme"></data>
</intent-filter>
-->
<intent-filter>
<action android:name="android.intent.action.VIEW" />

7
android/jni/com/mapswithme/maps/DownloadResourcesActivity.cpp
View file

@ -325,4 +325,11 @@ extern "C"
{
return g_framework->NativeFramework()->AddBookmarksFile(jni::ToNativeString(env, path));
}
JNIEXPORT jboolean JNICALL
Java_com_mapswithme_maps_DownloadResourcesActivity_setViewPortByUrl(
JNIEnv * env, jobject thiz, jstring url)
{
return g_framework->SetViewportByUrl(jni::ToNativeString(env, url));
}
}

8
android/jni/com/mapswithme/maps/Framework.cpp
View file

@ -722,4 +722,12 @@ namespace android
{
return m_work.Storage().IsDownloadInProgress();
}
bool Framework::SetViewportByUrl(string const & url)
{
//TODO this is weird hack, we should reconsider Android
// lifecycle handling design
m_doLoadState = false;
m_work.SetViewportByURL(url);
}
}

2
android/jni/com/mapswithme/maps/Framework.hpp
View file

@ -142,6 +142,8 @@ namespace android
::Framework * NativeFramework();
bool IsDownloadingActive();
bool SetViewportByUrl(string const & ulr);
};
}

60
android/src/com/mapswithme/maps/DownloadResourcesActivity.java
View file

@ -52,11 +52,13 @@ public class DownloadResourcesActivity extends Activity implements LocationServi
private LocationService mLocationService = null;
private Index mCountryIndex = null;
//TODO add geo processors
private IntentProcessor[] mIntentProcessors = {new KmzIntentProcessor(),
new Ge0IntentProcessor(),
new GeoIntentProcessor(),
new MapsWithMeIntentProcessor()};
private IntentProcessor[] mIntentProcessors = {new GeoIntentProcessor(),
/* uncomment code below when add
* appropriate schemes support
* */
//new Ge0IntentProcessor()
//new MapsWithMeIntentProcessor()
};
private void setDownloadMessage(int bytesToDownload)
{
@ -349,9 +351,10 @@ public class DownloadResourcesActivity extends Activity implements LocationServi
if (checkLiteProPackages(isPro))
return;
dispatchIntent();
final boolean dispatched = dispatchIntent();
if (!dispatched) {
parseIntentForKMZFile();
}
setContentView(R.layout.download_resources);
@ -370,18 +373,18 @@ public class DownloadResourcesActivity extends Activity implements LocationServi
}
}
private void dispatchIntent() {
private boolean dispatchIntent() {
if (getIntent() != null) {
final Intent intent = getIntent();
for (IntentProcessor ip : mIntentProcessors) {
if (ip.isIntentSupported(intent)) {
Utils.toastShortcut(this, "Intent: " + intent.getData());
ip.processIntent(intent);
return true;
}
}
}
return false;
}
private String getExtensionFromMime(String mime)
@ -470,7 +473,7 @@ public class DownloadResourcesActivity extends Activity implements LocationServi
if (tmpFile != null)
tmpFile.delete();
Toast.makeText(this, success ? R.string.load_kmz_successful : R.string.load_kmz_failed, Toast.LENGTH_LONG).show();
Utils.toastShortcut(this, success ? R.string.load_kmz_successful : R.string.load_kmz_failed);
}
}
}
@ -598,23 +601,6 @@ public class DownloadResourcesActivity extends Activity implements LocationServi
{
}
private class KmzIntentProcessor implements IntentProcessor {
@Override
public boolean isIntentSupported(Intent intent) {
final String scheme = intent.getScheme();
return "file".equals(scheme) || "http".equals(scheme);
}
@Override
public boolean processIntent(Intent intent) {
// TODO temp impl
parseIntentForKMZFile();
return true;
}
}
private class GeoIntentProcessor implements IntentProcessor {
@Override
@ -624,12 +610,12 @@ public class DownloadResourcesActivity extends Activity implements LocationServi
@Override
public boolean processIntent(Intent intent) {
// TODO Auto-generated method stub
Utils.toastShortcut(DownloadResourcesActivity.this, this.getClass().getSimpleName());
return false;
final Uri data = intent.getData();
return data != null ? setViewPortByUrl(data.toString()) : false;
}
}
@SuppressWarnings("unused")
private class Ge0IntentProcessor implements IntentProcessor {
@Override
@ -639,24 +625,22 @@ public class DownloadResourcesActivity extends Activity implements LocationServi
@Override
public boolean processIntent(Intent intent) {
// TODO Auto-generated method stub
Utils.toastShortcut(DownloadResourcesActivity.this, this.getClass().getSimpleName());
// TODO add ge0 parsing
return false;
}
}
@SuppressWarnings("unused")
private class MapsWithMeIntentProcessor implements IntentProcessor {
@Override
public boolean isIntentSupported(Intent intent) {
// TODO Auto-generated method stub
return "mapswithme".equals(intent.getScheme());
}
@Override
public boolean processIntent(Intent intent) {
// TODO Auto-generated method stub
Utils.toastShortcut(DownloadResourcesActivity.this, this.getClass().getSimpleName());
// TODO add mapswithme parsing
return false;
}
@ -669,4 +653,6 @@ public class DownloadResourcesActivity extends Activity implements LocationServi
private native Index findIndexByPos(double lat, double lon);
private native void cancelCurrentFile();
private native boolean loadKMZFile(String path);
//===============S=C=H=E=M=E======================//
private native boolean setViewPortByUrl(String url);
}