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

Move "from" into AppDetails.EXTRA_FROM

Browse Source
This commit is contained in:
Daniel Martí 2014-04-10 15:52:11 +02:00
parent 7fd3ea236e
commit f6707490f8
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -76,6 +76,7 @@ public class AppDetails extends ListActivity {
private static final int REQUEST_UNINSTALL = 1; private static final int REQUEST_UNINSTALL = 1;
public static final String EXTRA_APPID = "appid"; public static final String EXTRA_APPID = "appid";
public static final String EXTRA_FROM = "from";
private ApkListAdapter adapter; private ApkListAdapter adapter;
@ -288,16 +289,15 @@ public class AppDetails extends ListActivity {
// fdroid.app:app.id // fdroid.app:app.id
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(EXTRA_APPID)) { } else if (!i.hasExtra(EXTRA_APPID)) {
Log.d("FDroid", "No application ID in AppDetails!?"); Log.d("FDroid", "No application ID in AppDetails!?");
} else { } else {
appid = i.getStringExtra(EXTRA_APPID); appid = i.getStringExtra(EXTRA_APPID);
} }
if (i.hasExtra("from")) { if (i.hasExtra(EXTRA_FROM)) {
setTitle(i.getStringExtra("from")); setTitle(i.getStringExtra(EXTRA_FROM));
} }
mPm = getPackageManager(); mPm = getPackageManager();

2
src/org/fdroid/fdroid/views/fragments/AppListFragment.java
View File

@ -119,7 +119,7 @@ abstract public class AppListFragment extends ListFragment implements
final App app = new App((Cursor)getListView().getItemAtPosition(position)); final App app = new App((Cursor)getListView().getItemAtPosition(position));
Intent intent = new Intent(getActivity(), AppDetails.class); Intent intent = new Intent(getActivity(), AppDetails.class);
intent.putExtra(AppDetails.EXTRA_APPID, app.id); intent.putExtra(AppDetails.EXTRA_APPID, app.id);
intent.putExtra("from", getFromTitle()); intent.putExtra(AppDetails.EXTRA_FROM, getFromTitle());
startActivityForResult(intent, FDroid.REQUEST_APPDETAILS); startActivityForResult(intent, FDroid.REQUEST_APPDETAILS);
} }