{@code bundle} will have been validated by {@link #isBundleValid(Bundle)} prior to this - * method being called. If {@link #isBundleValid(Bundle)} returned false, then this method will - * not be called. This helps ensure that plug-in Activity subclasses only have to worry about - * bundle validation once, in the {@link #isBundleValid(Bundle)} method. - * - *
Note this callback only occurs the first time the Activity is created, so it will not be
- * called when the Activity is recreated (e.g. {@code savedInstanceState != null}) such as after a
- * configuration change like a screen rotation.
- *
- * @param previousBundle Previous bundle that the Activity saved.
- * @param previousBlurb Previous blurb that the Activity saved
- */
- protected abstract void onPostCreateWithPreviousResult(
- final Bundle previousBundle, final String previousBlurb);
-
- /** @return Bundle for the plug-in or {@code null} if a valid Bundle cannot be generated. */
- protected abstract Bundle getResultBundle();
-
- /**
- * @param bundle Valid bundle for the component.
- * @return Blurb for {@code bundle}.
- */
- protected abstract String getResultBlurb(final Bundle bundle);
-}
diff --git a/app/src/main/java/org/tasks/locale/ui/activity/TaskerSettingsActivity.java b/app/src/main/java/org/tasks/locale/ui/activity/TaskerSettingsActivity.java
deleted file mode 100755
index d60b6281b..000000000
--- a/app/src/main/java/org/tasks/locale/ui/activity/TaskerSettingsActivity.java
+++ /dev/null
@@ -1,141 +0,0 @@
-package org.tasks.locale.ui.activity;
-
-import android.content.Intent;
-import android.os.Bundle;
-import android.view.MenuItem;
-import androidx.appcompat.widget.Toolbar;
-import com.todoroo.astrid.api.Filter;
-import javax.inject.Inject;
-import org.tasks.R;
-import org.tasks.activities.FilterSelectionActivity;
-import org.tasks.billing.BillingClient;
-import org.tasks.billing.Inventory;
-import org.tasks.billing.PurchaseActivity;
-import org.tasks.injection.ActivityComponent;
-import org.tasks.locale.bundle.ListNotificationBundle;
-import org.tasks.preferences.DefaultFilterProvider;
-
-public final class TaskerSettingsActivity extends AbstractFragmentPluginPreferenceActivity
- implements Toolbar.OnMenuItemClickListener {
-
- private static final int REQUEST_SELECT_FILTER = 10124;
- private static final int REQUEST_SUBSCRIPTION = 10125;
- private static final String EXTRA_FILTER = "extra_filter";
-
- @Inject DefaultFilterProvider defaultFilterProvider;
- @Inject BillingClient billingClient;
- @Inject Inventory inventory;
-
- private Bundle previousBundle;
- private Filter filter;
-
- @Override
- public void onCreate(final Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
-
- addPreferencesFromResource(R.xml.preferences_tasker);
-
- if (savedInstanceState != null) {
- previousBundle =
- savedInstanceState.getParcelable(ListNotificationBundle.BUNDLE_EXTRA_PREVIOUS_BUNDLE);
- filter = savedInstanceState.getParcelable(EXTRA_FILTER);
- } else {
- filter = defaultFilterProvider.getDefaultFilter();
- }
-
- findPreference(R.string.filter)
- .setOnPreferenceClickListener(
- preference -> {
- Intent intent =
- new Intent(TaskerSettingsActivity.this, FilterSelectionActivity.class);
- intent.putExtra(FilterSelectionActivity.EXTRA_FILTER, filter);
- intent.putExtra(FilterSelectionActivity.EXTRA_RETURN_FILTER, true);
- startActivityForResult(intent, REQUEST_SELECT_FILTER);
- return false;
- });
-
- refreshPreferences();
-
- if (!inventory.purchasedTasker()) {
- startActivityForResult(new Intent(this, PurchaseActivity.class), REQUEST_SUBSCRIPTION);
- }
- }
-
- @Override
- public void onPostCreateWithPreviousResult(
- final Bundle previousBundle, final String previousBlurb) {
- this.previousBundle = previousBundle;
- this.filter =
- defaultFilterProvider.getFilterFromPreference(
- ListNotificationBundle.getFilter(previousBundle));
- refreshPreferences();
- }
-
- @Override
- public boolean isBundleValid(final Bundle bundle) {
- return ListNotificationBundle.isBundleValid(bundle);
- }
-
- @Override
- protected Bundle getResultBundle() {
- return ListNotificationBundle.generateBundle(
- defaultFilterProvider.getFilterPreferenceValue(filter));
- }
-
- @Override
- public String getResultBlurb(final Bundle bundle) {
- return filter.listingTitle;
- }
-
- private void cancel() {
- mIsCancelled = true;
- finish();
- }
-
- @Override
- protected void onActivityResult(int requestCode, int resultCode, Intent data) {
- if (requestCode == REQUEST_SELECT_FILTER) {
- if (resultCode == RESULT_OK) {
- filter = data.getParcelableExtra(FilterSelectionActivity.EXTRA_FILTER);
- refreshPreferences();
- }
- } else if (requestCode == REQUEST_SUBSCRIPTION) {
- if (!inventory.purchasedTasker()) {
- cancel();
- }
- } else {
- super.onActivityResult(requestCode, resultCode, data);
- }
- }
-
- @Override
- protected void onSaveInstanceState(Bundle outState) {
- super.onSaveInstanceState(outState);
- outState.putParcelable(ListNotificationBundle.BUNDLE_EXTRA_PREVIOUS_BUNDLE, previousBundle);
- outState.putParcelable(EXTRA_FILTER, filter);
- }
-
- private void refreshPreferences() {
- findPreference(getString(R.string.filter)).setSummary(filter.listingTitle);
- }
-
- @Override
- public void inject(ActivityComponent component) {
- component.inject(this);
- }
-
- @Override
- protected String getHelpUrl() {
- return "http://tasks.org/help/tasker";
- }
-
- @Override
- public boolean onMenuItemClick(MenuItem item) {
- switch (item.getItemId()) {
- case R.id.menu_save:
- finish();
- return true;
- }
- return super.onMenuItemClick(item);
- }
-}
diff --git a/app/src/main/java/org/tasks/locale/ui/activity/TaskerSettingsActivity.kt b/app/src/main/java/org/tasks/locale/ui/activity/TaskerSettingsActivity.kt
new file mode 100644
index 000000000..8b8a1644f
--- /dev/null
+++ b/app/src/main/java/org/tasks/locale/ui/activity/TaskerSettingsActivity.kt
@@ -0,0 +1,40 @@
+package org.tasks.locale.ui.activity
+
+import android.os.Bundle
+import org.tasks.R
+import org.tasks.injection.ActivityComponent
+import org.tasks.locale.bundle.ListNotificationBundle
+import org.tasks.preferences.fragments.TaskerListNotification
+import org.tasks.preferences.fragments.TaskerListNotification.Companion.newTaskerListNotification
+
+class TaskerSettingsActivity : AbstractFragmentPluginPreference() {
+
+ var filter: String? = null
+
+ override fun onCreate(savedInstanceState: Bundle?) {
+ if (isLocalePluginIntent(intent)) {
+ val previousBundle = getPreviousBundle()
+ if (isBundleValid(previousBundle)) {
+ filter = ListNotificationBundle.getFilter(previousBundle)
+ }
+ }
+
+ super.onCreate(savedInstanceState)
+ }
+
+ override fun isBundleValid(bundle: Bundle?) = ListNotificationBundle.isBundleValid(bundle)
+
+ override fun getResultBundle() = getFragment().getBundle()
+
+ override fun getResultBlurb(bundle: Bundle?) = getFragment().getResultBlurb()
+
+ override fun isCancelled() = getFragment().cancelled
+
+ override fun getRootTitle() = R.string.tasker_list_notification
+
+ override fun getRootPreference() = newTaskerListNotification(filter)
+
+ override fun inject(component: ActivityComponent) = component.inject(this)
+
+ private fun getFragment() = supportFragmentManager.findFragmentById(R.id.settings) as TaskerListNotification
+}
\ No newline at end of file
diff --git a/app/src/main/java/org/tasks/preferences/fragments/TaskerListNotification.kt b/app/src/main/java/org/tasks/preferences/fragments/TaskerListNotification.kt
new file mode 100644
index 000000000..e4e7cad10
--- /dev/null
+++ b/app/src/main/java/org/tasks/preferences/fragments/TaskerListNotification.kt
@@ -0,0 +1,99 @@
+package org.tasks.preferences.fragments
+
+import android.app.Activity.RESULT_OK
+import android.content.Intent
+import android.os.Bundle
+import com.todoroo.astrid.api.Filter
+import org.tasks.R
+import org.tasks.activities.FilterSelectionActivity
+import org.tasks.billing.Inventory
+import org.tasks.billing.PurchaseActivity
+import org.tasks.injection.FragmentComponent
+import org.tasks.injection.InjectingPreferenceFragment
+import org.tasks.locale.bundle.ListNotificationBundle
+import org.tasks.preferences.DefaultFilterProvider
+import javax.inject.Inject
+
+const val EXTRA_FILTER = "extra_filter"
+private const val REQUEST_SELECT_FILTER = 10124
+private const val REQUEST_SUBSCRIPTION = 10125
+
+class TaskerListNotification : InjectingPreferenceFragment() {
+
+ companion object {
+ fun newTaskerListNotification(filter: String?): TaskerListNotification {
+ val fragment = TaskerListNotification()
+ val args = Bundle()
+ args.putString(EXTRA_FILTER, filter)
+ fragment.arguments = args
+ return fragment
+ }
+ }
+
+ @Inject lateinit var defaultFilterProvider: DefaultFilterProvider
+ @Inject lateinit var inventory: Inventory
+
+ var filter: Filter? = null
+ var cancelled: Boolean = false
+
+ override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
+ setPreferencesFromResource(R.xml.preferences_tasker, rootKey)
+
+ filter = if (savedInstanceState == null) {
+ defaultFilterProvider.getFilterFromPreference(arguments?.getString(EXTRA_FILTER))
+ } else {
+ savedInstanceState.getParcelable(EXTRA_FILTER)
+ }
+
+ refreshPreferences()
+
+ findPreference(R.string.filter).setOnPreferenceClickListener {
+ val intent = Intent(context, FilterSelectionActivity::class.java)
+ intent.putExtra(FilterSelectionActivity.EXTRA_FILTER, filter)
+ intent.putExtra(FilterSelectionActivity.EXTRA_RETURN_FILTER, true)
+ startActivityForResult(intent, REQUEST_SELECT_FILTER)
+ false
+ }
+
+ if (!inventory.purchasedTasker()) {
+ startActivityForResult(Intent(context, PurchaseActivity::class.java), REQUEST_SUBSCRIPTION)
+ }
+ }
+
+ override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
+ if (requestCode == REQUEST_SELECT_FILTER) {
+ if (resultCode == RESULT_OK) {
+ filter = data!!.getParcelableExtra(FilterSelectionActivity.EXTRA_FILTER)
+ refreshPreferences()
+ }
+ } else if (requestCode == REQUEST_SUBSCRIPTION) {
+ if (!inventory.purchasedTasker()) {
+ cancelled = true
+ activity!!.finish()
+ }
+ } else {
+ super.onActivityResult(requestCode, resultCode, data)
+ }
+ }
+
+ override fun onSaveInstanceState(outState: Bundle) {
+ super.onSaveInstanceState(outState)
+
+ outState.putParcelable(EXTRA_FILTER, filter)
+ }
+
+ private fun refreshPreferences() {
+ findPreference(R.string.filter).summary = filter?.listingTitle
+ }
+
+ fun getResultBlurb(): String? {
+ return filter?.listingTitle
+ }
+
+ fun getBundle(): Bundle {
+ return ListNotificationBundle.generateBundle(
+ defaultFilterProvider.getFilterPreferenceValue(filter))
+ }
+
+ override fun inject(component: FragmentComponent) = component.inject(this)
+}
\ No newline at end of file
diff --git a/app/src/main/res/xml/preferences_tasker.xml b/app/src/main/res/xml/preferences_tasker.xml
index 23be7b62b..0d66511b5 100644
--- a/app/src/main/res/xml/preferences_tasker.xml
+++ b/app/src/main/res/xml/preferences_tasker.xml
@@ -1,6 +1,6 @@