Karl/BobStore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use the new /app/app.id uri scheme

Browse Source 
Also, differentiate between market://details and http://f-droid.org/app
better.
This commit is contained in:
Daniel Martí 2013-07-22 11:33:21 +02:00
parent f3ee1201e4
commit 6bfcb338d4
2 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
AndroidManifest.xml
View File

@ -73,7 +73,8 @@
<category android:name="android.intent.category.DEFAULT" /> <category android:name="android.intent.category.DEFAULT" />
<category android:name="android.intent.category.BROWSABLE" /> <category android:name="android.intent.category.BROWSABLE" />
<data android:scheme="http" android:host="f-droid.org" android:path="/app" /> <data android:scheme="http" android:host="f-droid.org"
android:pathPrefix="/app" />
</intent-filter> </intent-filter>
<meta-data <meta-data
android:name="android.support.PARENT_ACTIVITY" android:name="android.support.PARENT_ACTIVITY"

13
src/org/fdroid/fdroid/AppDetails.java
View File

@ -193,13 +193,18 @@ public class AppDetails extends ListActivity {
appid = ""; appid = "";
Uri data = getIntent().getData(); Uri data = getIntent().getData();
if (data != null) { if (data != null) {
if (data.isHierarchical()) if (data.isHierarchical()) {
// fdroid://details?id=app.id if (data.getHost().equals("details")) {
// market://details?id=app.id // market://details?id=app.id
appid = data.getQueryParameter("id"); appid = data.getQueryParameter("id");
else } else {
// http://f-droid.org/app/app.id
appid = data.getLastPathSegment();
}
} else {
// fdroid.app:app.id (old scheme) // fdroid.app:app.id (old scheme)
appid = data.getEncodedSchemeSpecificPart(); appid = data.getEncodedSchemeSpecificPart();
}
Log.d("FDroid", "AppDetails launched from link, for '" + appid Log.d("FDroid", "AppDetails launched from link, for '" + appid
+ "'"); + "'");
} else if (!i.hasExtra("appid")) { } else if (!i.hasExtra("appid")) {
@ -771,7 +776,7 @@ public class AppDetails extends ListActivity {
shareIntent.setType("text/plain"); shareIntent.setType("text/plain");
shareIntent.putExtra(android.content.Intent.EXTRA_SUBJECT, app.name); shareIntent.putExtra(android.content.Intent.EXTRA_SUBJECT, app.name);
shareIntent.putExtra(android.content.Intent.EXTRA_TEXT, "http://f-droid.org/app?id="+app.id); shareIntent.putExtra(android.content.Intent.EXTRA_TEXT, "http://f-droid.org/app/"+app.id);
startActivity(Intent.createChooser(shareIntent, getString(R.string.menu_share))); startActivity(Intent.createChooser(shareIntent, getString(R.string.menu_share)));
} }