diff --git a/src/amazon/java/org/tasks/activities/ClearGtaskDataActivity.java b/src/amazon/java/org/tasks/activities/ClearGtaskDataActivity.java deleted file mode 100644 index 0c676ccec..000000000 --- a/src/amazon/java/org/tasks/activities/ClearGtaskDataActivity.java +++ /dev/null @@ -1,10 +0,0 @@ -package org.tasks.activities; - -import javax.inject.Inject; - -public class ClearGtaskDataActivity { - @Inject - public ClearGtaskDataActivity() { - - } -} diff --git a/src/generic/java/org/tasks/activities/ClearGtaskDataActivity.java b/src/generic/java/org/tasks/activities/ClearGtaskDataActivity.java deleted file mode 100644 index 0c676ccec..000000000 --- a/src/generic/java/org/tasks/activities/ClearGtaskDataActivity.java +++ /dev/null @@ -1,10 +0,0 @@ -package org.tasks.activities; - -import javax.inject.Inject; - -public class ClearGtaskDataActivity { - @Inject - public ClearGtaskDataActivity() { - - } -} diff --git a/src/googleplay/AndroidManifest.xml b/src/googleplay/AndroidManifest.xml index 78fe8fb3f..151553f91 100644 --- a/src/googleplay/AndroidManifest.xml +++ b/src/googleplay/AndroidManifest.xml @@ -55,10 +55,6 @@ android:label="@string/synchronization" android:theme="@style/BlueGrey" /> - - diff --git a/src/googleplay/java/com/todoroo/astrid/gtasks/GtasksPreferences.java b/src/googleplay/java/com/todoroo/astrid/gtasks/GtasksPreferences.java index 4428470db..7de496820 100644 --- a/src/googleplay/java/com/todoroo/astrid/gtasks/GtasksPreferences.java +++ b/src/googleplay/java/com/todoroo/astrid/gtasks/GtasksPreferences.java @@ -6,21 +6,23 @@ package com.todoroo.astrid.gtasks; import android.app.Activity; +import android.content.DialogInterface; import android.content.Intent; import android.content.pm.PackageManager; import android.os.Bundle; import android.preference.CheckBoxPreference; import android.preference.Preference; -import android.widget.Toast; import com.todoroo.andlib.utility.DateUtilities; +import com.todoroo.astrid.dao.MetadataDao; +import com.todoroo.astrid.data.Metadata; import com.todoroo.astrid.gtasks.auth.GtasksLoginActivity; import org.tasks.R; -import org.tasks.activities.ClearGtaskDataActivity; import org.tasks.activities.NativeGoogleTaskListPicker; import org.tasks.analytics.Tracker; import org.tasks.analytics.Tracking; +import org.tasks.dialogs.DialogBuilder; import org.tasks.gtasks.GoogleTaskListSelectionHandler; import org.tasks.gtasks.PlayServicesAvailability; import org.tasks.gtasks.SyncAdapterHelper; @@ -36,7 +38,6 @@ public class GtasksPreferences extends InjectingPreferenceActivity implements Go private static final String FRAG_TAG_GOOGLE_TASK_LIST_SELECTION = "frag_tag_google_task_list_selection"; private static final int REQUEST_LOGIN = 0; - private static final int REQUEST_LOGOUT = 1; @Inject GtasksPreferenceService gtasksPreferenceService; @Inject ActivityPermissionRequestor permissionRequestor; @@ -45,6 +46,8 @@ public class GtasksPreferences extends InjectingPreferenceActivity implements Go @Inject SyncAdapterHelper syncAdapterHelper; @Inject Activity activity; @Inject PlayServicesAvailability playServicesAvailability; + @Inject DialogBuilder dialogBuilder; + @Inject MetadataDao metadataDao; @Override public void onCreate(Bundle savedInstanceState) { @@ -52,8 +55,8 @@ public class GtasksPreferences extends InjectingPreferenceActivity implements Go addPreferencesFromResource(R.xml.preferences_gtasks); - Preference gtaskPreference = findPreference(getString(R.string.sync_gtasks)); - ((CheckBoxPreference) gtaskPreference).setChecked(syncAdapterHelper.isEnabled()); + final CheckBoxPreference gtaskPreference = (CheckBoxPreference) findPreference(getString(R.string.sync_gtasks)); + gtaskPreference.setChecked(syncAdapterHelper.isEnabled()); gtaskPreference.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() { @Override public boolean onPreferenceChange(Preference preference, Object newValue) { @@ -87,7 +90,20 @@ public class GtasksPreferences extends InjectingPreferenceActivity implements Go findPreference(getString(R.string.sync_SPr_forget_key)).setOnPreferenceClickListener(new Preference.OnPreferenceClickListener() { @Override public boolean onPreferenceClick(Preference preference) { - startActivityForResult(new Intent(GtasksPreferences.this, ClearGtaskDataActivity.class), REQUEST_LOGOUT); + dialogBuilder.newMessageDialog(R.string.sync_forget_confirm) + .setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() { + @Override + public void onClick(DialogInterface dialog, int which) { + gtasksPreferenceService.clearLastSyncDate(); + gtasksPreferenceService.setUserName(null); + metadataDao.deleteWhere(Metadata.KEY.eq(GtasksMetadata.METADATA_KEY)); + syncAdapterHelper.enableSynchronization(false); + tracker.reportEvent(Tracking.Events.GTASK_LOGOUT); + gtaskPreference.setChecked(false); + } + }) + .setNegativeButton(android.R.string.cancel, null) + .show(); return true; } }); @@ -115,12 +131,6 @@ public class GtasksPreferences extends InjectingPreferenceActivity implements Go tracker.reportEvent(Tracking.Events.GTASK_ENABLED); } ((CheckBoxPreference) findPreference(getString(R.string.sync_gtasks))).setChecked(enabled); - } else if(requestCode == REQUEST_LOGOUT) { - if (resultCode == RESULT_OK) { - syncAdapterHelper.enableSynchronization(false); - tracker.reportEvent(Tracking.Events.GTASK_LOGOUT); - finish(); - } } else { super.onActivityResult(requestCode, resultCode, data); } diff --git a/src/googleplay/java/org/tasks/activities/ClearGtaskDataActivity.java b/src/googleplay/java/org/tasks/activities/ClearGtaskDataActivity.java deleted file mode 100644 index 2d042a49a..000000000 --- a/src/googleplay/java/org/tasks/activities/ClearGtaskDataActivity.java +++ /dev/null @@ -1,52 +0,0 @@ -package org.tasks.activities; - -import android.content.DialogInterface; -import android.os.Bundle; - -import com.todoroo.astrid.dao.MetadataDao; -import com.todoroo.astrid.data.Metadata; -import com.todoroo.astrid.gtasks.GtasksMetadata; -import com.todoroo.astrid.gtasks.GtasksPreferenceService; - -import org.tasks.R; -import org.tasks.dialogs.DialogBuilder; -import org.tasks.injection.ActivityComponent; -import org.tasks.injection.InjectingAppCompatActivity; - -import javax.inject.Inject; - -public class ClearGtaskDataActivity extends InjectingAppCompatActivity { - - @Inject DialogBuilder dialogBuilder; - @Inject GtasksPreferenceService gtasksPreferenceService; - @Inject MetadataDao metadataDao; - - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - - dialogBuilder.newMessageDialog(R.string.sync_forget_confirm) - .setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() { - @Override - public void onClick(DialogInterface dialog, int which) { - gtasksPreferenceService.clearLastSyncDate(); - gtasksPreferenceService.setUserName(null); - metadataDao.deleteWhere(Metadata.KEY.eq(GtasksMetadata.METADATA_KEY)); - setResult(RESULT_OK); - } - }) - .setNegativeButton(android.R.string.cancel, null) - .setOnDismissListener(new DialogInterface.OnDismissListener() { - @Override - public void onDismiss(DialogInterface dialog) { - finish(); - } - }) - .show(); - } - - @Override - public void inject(ActivityComponent component) { - component.inject(this); - } -} diff --git a/src/main/java/org/tasks/injection/BaseActivityComponent.java b/src/main/java/org/tasks/injection/BaseActivityComponent.java index 4cb91501d..e9c37e32a 100644 --- a/src/main/java/org/tasks/injection/BaseActivityComponent.java +++ b/src/main/java/org/tasks/injection/BaseActivityComponent.java @@ -15,7 +15,6 @@ import com.todoroo.astrid.reminders.ReminderPreferences; import org.tasks.activities.AddAttachmentActivity; import org.tasks.activities.CalendarSelectionActivity; import org.tasks.activities.CameraActivity; -import org.tasks.activities.ClearGtaskDataActivity; import org.tasks.activities.ColorPickerActivity; import org.tasks.activities.DateAndTimePickerActivity; import org.tasks.activities.DatePickerActivity; @@ -93,8 +92,6 @@ public interface BaseActivityComponent { void inject(VoiceCommandActivity voiceCommandActivity); - void inject(ClearGtaskDataActivity clearGtaskDataActivity); - void inject(ReminderPreferences reminderPreferences); void inject(WidgetConfigActivity widgetConfigActivity); diff --git a/src/release/res/xml/google_analytics.xml b/src/release/res/xml/google_analytics.xml index 44b5e5c7b..a45b23822 100644 --- a/src/release/res/xml/google_analytics.xml +++ b/src/release/res/xml/google_analytics.xml @@ -19,7 +19,6 @@ TagSettingsActivity SnoozeActivity CustomFilterActivity - ClearGtaskDataActivity CameraActivity CalendarSelectionActivity CalendarReminderActivity