From 1a97bbdec74968cebd208c91e39d8e9c3dbd58ec Mon Sep 17 00:00:00 2001 From: Alex Baker Date: Thu, 7 Sep 2017 11:15:27 -0500 Subject: [PATCH] Fix amazon and generic compile --- app/src/amazon/java/org/tasks/billing/PurchaseHelper.java | 4 +--- app/src/generic/java/org/tasks/billing/PurchaseHelper.java | 3 +-- app/src/main/java/org/tasks/analytics/Tracking.java | 1 - app/src/main/res/values/keys.xml | 1 - 4 files changed, 2 insertions(+), 7 deletions(-) diff --git a/app/src/amazon/java/org/tasks/billing/PurchaseHelper.java b/app/src/amazon/java/org/tasks/billing/PurchaseHelper.java index ccaccea60..0d79045c1 100644 --- a/app/src/amazon/java/org/tasks/billing/PurchaseHelper.java +++ b/app/src/amazon/java/org/tasks/billing/PurchaseHelper.java @@ -3,8 +3,6 @@ package org.tasks.billing; import android.app.Activity; import android.content.Intent; -import org.tasks.dialogs.DialogBuilder; - import javax.inject.Inject; public class PurchaseHelper { @@ -13,7 +11,7 @@ public class PurchaseHelper { public PurchaseHelper() { } - public boolean purchase(DialogBuilder dialogBuilder, final Activity activity, + public boolean purchase(final Activity activity, final String sku, final String pref, final int requestCode, final PurchaseHelperCallback callback) { callback.purchaseCompleted(false, sku); diff --git a/app/src/generic/java/org/tasks/billing/PurchaseHelper.java b/app/src/generic/java/org/tasks/billing/PurchaseHelper.java index 93cb8e128..b8c562c1d 100644 --- a/app/src/generic/java/org/tasks/billing/PurchaseHelper.java +++ b/app/src/generic/java/org/tasks/billing/PurchaseHelper.java @@ -3,7 +3,6 @@ package org.tasks.billing; import android.app.Activity; import android.content.Intent; -import org.tasks.dialogs.DialogBuilder; import org.tasks.preferences.Preferences; import javax.inject.Inject; @@ -16,7 +15,7 @@ public class PurchaseHelper { this.preferences = preferences; } - public boolean purchase(DialogBuilder dialogBuilder, final Activity activity, + public boolean purchase(final Activity activity, final String sku, final String pref, final int requestCode, final PurchaseHelperCallback callback) { preferences.setBoolean(pref, true); diff --git a/app/src/main/java/org/tasks/analytics/Tracking.java b/app/src/main/java/org/tasks/analytics/Tracking.java index 81334f70c..bb5b3dc4e 100644 --- a/app/src/main/java/org/tasks/analytics/Tracking.java +++ b/app/src/main/java/org/tasks/analytics/Tracking.java @@ -26,7 +26,6 @@ public class Tracking { MULTISELECT_CLONE(R.string.tracking_category_event, R.string.tracking_event_multiselect_clone), CLEAR_COMPLETED(R.string.tracking_category_event, R.string.tracking_action_clear_completed), UPGRADE(R.string.tracking_category_event, R.string.tracking_event_upgrade), - LEGACY_TASKER_TRIGGER(R.string.tracking_category_event, R.string.tracking_event_legacy_tasker_trigger), NIGHT_MODE_MISMATCH(R.string.tracking_category_event, R.string.tracking_event_night_mode_mismatch), SET_PREFERENCE(R.string.tracking_category_preferences, 0), PLAY_SERVICES_WARNING(R.string.tracking_category_event, R.string.tracking_event_play_services_error); diff --git a/app/src/main/res/values/keys.xml b/app/src/main/res/values/keys.xml index becf3564c..5d89abea8 100644 --- a/app/src/main/res/values/keys.xml +++ b/app/src/main/res/values/keys.xml @@ -242,7 +242,6 @@ Night Mismatch Play Services Error Upgrade - Legacy Tasker Multiselect delete Multiselect clone tesla_unread_enabled