diff options
| author | Mathieu Alorent <github@kumy.net> | 2015-08-30 22:50:38 +0200 |
|---|---|---|
| committer | Mathieu Alorent <github@kumy.net> | 2015-08-30 22:50:38 +0200 |
| commit | 34354c9191e5efb7443ae232d8dfeb0df2e9b239 (patch) | |
| tree | f10c13504729a2142ec2b5bb04feda97da6249bc | |
| parent | c08608e598bda9ab7187d165b6dc824c563d565d (diff) | |
| download | cgeo-34354c9191e5efb7443ae232d8dfeb0df2e9b239.zip cgeo-34354c9191e5efb7443ae232d8dfeb0df2e9b239.tar.gz cgeo-34354c9191e5efb7443ae232d8dfeb0df2e9b239.tar.bz2 | |
Pre-fill Tracking Code in LogTrackableActivity coming from LogCacheActivity
LogTrackableActivity was already capable of receiving a Tracking Code as an
Intent. Just propagate the TCode from the inventory list in LogCacheActivity.
| -rw-r--r-- | main/src/cgeo/geocaching/LogCacheActivity.java | 3 | ||||
| -rw-r--r-- | main/src/cgeo/geocaching/TrackableActivity.java | 6 |
2 files changed, 8 insertions, 1 deletions
diff --git a/main/src/cgeo/geocaching/LogCacheActivity.java b/main/src/cgeo/geocaching/LogCacheActivity.java index f0da41d..99e472f 100644 --- a/main/src/cgeo/geocaching/LogCacheActivity.java +++ b/main/src/cgeo/geocaching/LogCacheActivity.java @@ -174,15 +174,16 @@ public class LogCacheActivity extends AbstractLoggingActivity implements DateDia } }); - final String tbCode = (StringUtils.isNotEmpty(tb.geocode) ? tb.geocode : tb.trackCode); inventoryItem.setClickable(true); ButterKnife.findById(inventoryItem, R.id.info).setOnClickListener(new View.OnClickListener() { @Override public void onClick(final View view) { final Intent trackablesIntent = new Intent(LogCacheActivity.this, TrackableActivity.class); + final String tbCode = (StringUtils.isNotEmpty(tb.geocode) ? tb.geocode : tb.trackCode); trackablesIntent.putExtra(Intents.EXTRA_GEOCODE, tbCode); trackablesIntent.putExtra(Intents.EXTRA_BRAND, tb.brand.getId()); + trackablesIntent.putExtra(Intents.EXTRA_TRACKING_CODE, tb.trackCode); startActivity(trackablesIntent); } }); diff --git a/main/src/cgeo/geocaching/TrackableActivity.java b/main/src/cgeo/geocaching/TrackableActivity.java index e4ebad2..f02e30b 100644 --- a/main/src/cgeo/geocaching/TrackableActivity.java +++ b/main/src/cgeo/geocaching/TrackableActivity.java @@ -95,6 +95,7 @@ public class TrackableActivity extends AbstractViewPagerActivity<TrackableActivi private String guid = null; private String id = null; private String geocache = null; + private String trackingCode = null; private TrackableBrand brand = null; private LayoutInflater inflater = null; private ProgressDialog waitDialog = null; @@ -133,6 +134,8 @@ public class TrackableActivity extends AbstractViewPagerActivity<TrackableActivi id = extras.getString(Intents.EXTRA_ID); geocache = extras.getString(Intents.EXTRA_GEOCACHE); brand = TrackableBrand.getById(extras.getInt(Intents.EXTRA_BRAND)); + trackingCode = extras.getString(Intents.EXTRA_TRACKING_CODE); + } // try to get data from URI @@ -212,6 +215,9 @@ public class TrackableActivity extends AbstractViewPagerActivity<TrackableActivi createSubscriptions.add(AppObservable.bindActivity(this, loadTrackable(geocode, guid, id, brand)).singleOrDefault(null).subscribe(new Action1<Trackable>() { @Override public void call(final Trackable trackable) { + if (trackable != null && trackingCode != null) { + trackable.setTrackingcode(trackingCode); + } TrackableActivity.this.trackable = trackable; displayTrackable(); // reset imagelist |