aboutsummaryrefslogtreecommitdiffstats
path: root/main/src/cgeo/geocaching/activity/AbstractActivity.java
diff options
context:
space:
mode:
Diffstat (limited to 'main/src/cgeo/geocaching/activity/AbstractActivity.java')
-rw-r--r--main/src/cgeo/geocaching/activity/AbstractActivity.java6
1 files changed, 3 insertions, 3 deletions
diff --git a/main/src/cgeo/geocaching/activity/AbstractActivity.java b/main/src/cgeo/geocaching/activity/AbstractActivity.java
index 4fe750a..603211e 100644
--- a/main/src/cgeo/geocaching/activity/AbstractActivity.java
+++ b/main/src/cgeo/geocaching/activity/AbstractActivity.java
@@ -96,9 +96,9 @@ public abstract class AbstractActivity extends ActionBarActivity implements IAbs
return super.onOptionsItemSelected(item);
}
- public void onResume(final Subscription resumeSubscription) {
+ public void onResume(final Subscription... resumeSubscriptions) {
super.onResume();
- this.resumeSubscription = resumeSubscription;
+ this.resumeSubscription = Subscriptions.from(resumeSubscriptions);
}
@Override
@@ -216,7 +216,7 @@ public abstract class AbstractActivity extends ActionBarActivity implements IAbs
}
protected void initializeAndroidBeam(final ActivitySharingInterface sharingInterface) {
- if (Build.VERSION.SDK_INT > Build.VERSION_CODES.ICE_CREAM_SANDWICH) {
+ if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.ICE_CREAM_SANDWICH) {
initializeICSAndroidBeam(sharingInterface);
}
}