From a099eb86e690cc8b3b65a49ef6724ffd5c2d34e2 Mon Sep 17 00:00:00 2001 From: Alex Baker Date: Fri, 1 May 2020 12:58:41 -0500 Subject: [PATCH] Use https for tasks.org urls --- CHANGELOG.md | 8 ++++---- .../org/tasks/caldav/CaldavAccountSettingsActivity.java | 2 +- .../org/tasks/etesync/EncryptionSettingsActivity.java | 2 +- .../org/tasks/etesync/EteSyncAccountSettingsActivity.java | 2 +- .../locale/ui/activity/TaskerCreateTaskActivity.java | 2 +- .../main/java/org/tasks/ui/NavigationDrawerFragment.java | 2 +- app/src/main/res/xml/preferences_look_and_feel.xml | 2 +- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ec0ceb309..92b3d553f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -483,7 +483,7 @@ Change Log ### 6.8 (2019-07-30) * Name your own subscription price! Upgrade, downgrade, or cancel at any time -* Choose icons for lists (requires [subscription](http://tasks.org/subscribe)) +* Choose icons for lists (requires [subscription](https://tasks.org/subscribe)) * Choose color for custom filters * Performance improvements * Allow duplicate CalDAV list names @@ -855,9 +855,9 @@ Change Log ### 6.0 (2018-04-23) -* Change to [annual subscription](http://tasks.org/subscribe) pricing -* [CalDAV synchronization](http://tasks.org/caldav) -* Sync with [multiple Google Task accounts](http://tasks.org/docs/google_tasks_intro.html) +* Change to [annual subscription](https://tasks.org/subscribe) pricing +* [CalDAV synchronization](https://tasks.org/caldav) +* Sync with [multiple Google Task accounts](https://tasks.org/docs/google_tasks_intro.html) * Default theme changed to blue * Display Google Task and CalDAV chips on task list * Display sync error icon in navigation drawer diff --git a/app/src/main/java/org/tasks/caldav/CaldavAccountSettingsActivity.java b/app/src/main/java/org/tasks/caldav/CaldavAccountSettingsActivity.java index 85651b809..6e444cc2b 100644 --- a/app/src/main/java/org/tasks/caldav/CaldavAccountSettingsActivity.java +++ b/app/src/main/java/org/tasks/caldav/CaldavAccountSettingsActivity.java @@ -97,7 +97,7 @@ public class CaldavAccountSettingsActivity extends BaseCaldavAccountSettingsActi @Override protected String getHelpUrl() { - return "http://tasks.org/caldav"; + return "https://tasks.org/caldav"; } @Override diff --git a/app/src/main/java/org/tasks/etesync/EncryptionSettingsActivity.java b/app/src/main/java/org/tasks/etesync/EncryptionSettingsActivity.java index f106cd68e..aa95d4b50 100644 --- a/app/src/main/java/org/tasks/etesync/EncryptionSettingsActivity.java +++ b/app/src/main/java/org/tasks/etesync/EncryptionSettingsActivity.java @@ -213,7 +213,7 @@ public class EncryptionSettingsActivity extends ThemedInjectingAppCompatActivity @Override public boolean onMenuItemClick(MenuItem item) { if (item.getItemId() == R.id.menu_help) { - startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse("http://tasks.org/etesync"))); + startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse("https://tasks.org/etesync"))); return true; } else { return onOptionsItemSelected(item); diff --git a/app/src/main/java/org/tasks/etesync/EteSyncAccountSettingsActivity.java b/app/src/main/java/org/tasks/etesync/EteSyncAccountSettingsActivity.java index 2597ab425..15eda4a1d 100644 --- a/app/src/main/java/org/tasks/etesync/EteSyncAccountSettingsActivity.java +++ b/app/src/main/java/org/tasks/etesync/EteSyncAccountSettingsActivity.java @@ -173,7 +173,7 @@ public class EteSyncAccountSettingsActivity extends BaseCaldavAccountSettingsAct @Override protected String getHelpUrl() { - return "http://tasks.org/etesync"; + return "https://tasks.org/etesync"; } @Override diff --git a/app/src/main/java/org/tasks/locale/ui/activity/TaskerCreateTaskActivity.java b/app/src/main/java/org/tasks/locale/ui/activity/TaskerCreateTaskActivity.java index c07c30cc0..673ffcf36 100755 --- a/app/src/main/java/org/tasks/locale/ui/activity/TaskerCreateTaskActivity.java +++ b/app/src/main/java/org/tasks/locale/ui/activity/TaskerCreateTaskActivity.java @@ -133,7 +133,7 @@ public final class TaskerCreateTaskActivity extends AbstractFragmentPluginAppCom public boolean onMenuItemClick(MenuItem item) { if (item.getItemId() == R.id.menu_help) { startActivity( - new Intent(Intent.ACTION_VIEW).setData(Uri.parse("http://tasks.org/help/tasker"))); + new Intent(Intent.ACTION_VIEW).setData(Uri.parse("https://tasks.org/help/tasker"))); return true; } return onOptionsItemSelected(item); diff --git a/app/src/main/java/org/tasks/ui/NavigationDrawerFragment.java b/app/src/main/java/org/tasks/ui/NavigationDrawerFragment.java index 95e0b0621..48126146a 100644 --- a/app/src/main/java/org/tasks/ui/NavigationDrawerFragment.java +++ b/app/src/main/java/org/tasks/ui/NavigationDrawerFragment.java @@ -115,7 +115,7 @@ public class NavigationDrawerFragment extends InjectingFragment { if (action.requestCode == REQUEST_PURCHASE) { startActivity(new Intent(getContext(), PurchaseActivity.class)); } else if (action.requestCode == REQUEST_DONATE) { - startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse("http://tasks.org/donate"))); + startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse("https://tasks.org/donate"))); } else if (action.requestCode == REQUEST_NEW_FILTER) { NewFilterDialog.Companion.newFilterDialog() .show(getParentFragmentManager(), FRAG_TAG_NEW_FILTER); diff --git a/app/src/main/res/xml/preferences_look_and_feel.xml b/app/src/main/res/xml/preferences_look_and_feel.xml index 63570117f..0d05f9834 100644 --- a/app/src/main/res/xml/preferences_look_and_feel.xml +++ b/app/src/main/res/xml/preferences_look_and_feel.xml @@ -176,7 +176,7 @@ app:icon="@drawable/ic_open_in_new_24px"> + android:data="https://tasks.org/translations" />