diff options
| author | Samuel Tardieu <sam@rfc1149.net> | 2015-01-15 18:16:18 +0100 |
|---|---|---|
| committer | Samuel Tardieu <sam@rfc1149.net> | 2015-01-15 18:16:18 +0100 |
| commit | 5e287395352aa31bf4ec14b82eb3267ca5aeaff9 (patch) | |
| tree | b75c7822c2816068640d2271b368906620e206d4 /main | |
| parent | 1d216b5056c43d8189c752c8c51bba158ccec149 (diff) | |
| parent | 2a59940ea1e9ac5dc1b7c8d3753bcbfe0e0b797e (diff) | |
| download | cgeo-5e287395352aa31bf4ec14b82eb3267ca5aeaff9.zip cgeo-5e287395352aa31bf4ec14b82eb3267ca5aeaff9.tar.gz cgeo-5e287395352aa31bf4ec14b82eb3267ca5aeaff9.tar.bz2 | |
Merge branch 'release' into upstream
Diffstat (limited to 'main')
| -rw-r--r-- | main/src/cgeo/geocaching/TrackableActivity.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/main/src/cgeo/geocaching/TrackableActivity.java b/main/src/cgeo/geocaching/TrackableActivity.java index c6d5bed..139b136 100644 --- a/main/src/cgeo/geocaching/TrackableActivity.java +++ b/main/src/cgeo/geocaching/TrackableActivity.java @@ -99,6 +99,7 @@ public class TrackableActivity extends AbstractViewPagerActivity<TrackableActivi @Override public void onCreate(final Bundle savedInstanceState) { super.onCreate(savedInstanceState, R.layout.viewpager_activity); + createSubscriptions = new CompositeSubscription(); // set title in code, as the activity needs a hard coded title due to the intent filters setTitle(res.getString(R.string.trackable)); @@ -191,7 +192,6 @@ public class TrackableActivity extends AbstractViewPagerActivity<TrackableActivi } }); waitDialog = ProgressDialog.show(this, message, res.getString(R.string.trackable_details_loading), true, true); - createSubscriptions = new CompositeSubscription(); createSubscriptions.add(AppObservable.bindActivity(this, loadTrackable(geocode, guid, id)).singleOrDefault(null).subscribe(new Action1<Trackable>() { @Override public void call(final Trackable trackable) { |
