Move URLs to keys.xml

app/src/main/java/org/tasks/billing/PurchaseDialog.kt

@@ -86,7 +86,7 @@ class PurchaseDialog : DialogFragment(), OnPurchasesUpdated {
         } else {
             benefits += """
 ---                
-#### [${getString(R.string.upgrade_sync_with_tasks)} (BETA)](https://tasks.org/sync)
+#### [${getString(R.string.upgrade_sync_with_tasks)} (BETA)](${getString(R.string.help_url_sync)})
 * **${getString(R.string.upgrade_no_platform_lock_in)}** — ${getString(R.string.upgrade_open_internet_standards)}
 * **${getString(R.string.upgrade_customer)}** — ${getString(R.string.upgrade_privacy)}
 * ${getString(R.string.upgrade_coming_soon)}
@@ -95,15 +95,15 @@ class PurchaseDialog : DialogFragment(), OnPurchasesUpdated {
         benefits += """
 ---
 #### ${getString(R.string.upgrade_synchronization)}
-* [${getString(R.string.davx5)}](https://tasks.org/docs/davx5.html)
-* [${getString(R.string.caldav)}](https://tasks.org/docs/caldav_intro.html)
-* [${getString(R.string.upgrade_etesync)}](https://tasks.org/docs/etesync_intro.html)
+* [${getString(R.string.davx5)}](${getString(R.string.url_davx5)})
+* [${getString(R.string.caldav)}](${getString(R.string.url_caldav)})
+* [${getString(R.string.upgrade_etesync)}](${getString(R.string.url_etesync)})
 * ${getString(R.string.upgrade_google_tasks)}
 ---
 #### ${getString(R.string.upgrade_additional_features)}
 * ${getString(R.string.upgrade_themes)}
 * ${getString(R.string.upgrade_google_places)}
-* [${getString(R.string.upgrade_tasker)}](https://tasks.org/docs/tasker.html)
+* [${getString(R.string.upgrade_tasker)}](${getString(R.string.url_tasker)})
 ---
 * ${getString(R.string.upgrade_free_trial)}
 * **${getString(R.string.upgrade_downgrade)}** — ${getString(R.string.upgrade_balance)}

app/src/main/java/org/tasks/caldav/CaldavAccountSettingsActivity.kt

@@ -74,5 +74,5 @@ class CaldavAccountSettingsActivity : BaseCaldavAccountSettingsActivity(), Toolb
         }
 
     override val helpUrl: String
-        get() = "https://tasks.org/caldav"
+        get() = getString(R.string.url_caldav)
 }

app/src/main/java/org/tasks/dialogs/WhatsNewDialog.kt

@@ -101,7 +101,7 @@ class WhatsNewDialog : DialogFragment() {
 
     private fun onDonateClick() {
         dismiss()
-        startActivity(Intent(Intent.ACTION_VIEW, Uri.parse("https://tasks.org/donate")))
+        startActivity(Intent(Intent.ACTION_VIEW, Uri.parse(getString(R.string.url_donate))))
     }
 
     override fun onCancel(dialog: DialogInterface) {

app/src/main/java/org/tasks/etesync/EncryptionSettingsActivity.kt

@@ -173,7 +173,7 @@ class EncryptionSettingsActivity : ThemedInjectingAppCompatActivity(), Toolbar.O
 
     override fun onMenuItemClick(item: MenuItem): Boolean {
         return if (item.itemId == R.id.menu_help) {
-            startActivity(Intent(Intent.ACTION_VIEW, Uri.parse("https://tasks.org/etesync")))
+            startActivity(Intent(Intent.ACTION_VIEW, Uri.parse(getString(R.string.url_etesync))))
             true
         } else {
             onOptionsItemSelected(item)

app/src/main/java/org/tasks/etesync/EteSyncAccountSettingsActivity.kt

@@ -142,7 +142,7 @@ class EteSyncAccountSettingsActivity : BaseCaldavAccountSettingsActivity(), Tool
         get() = binding.password.text.toString().trim { it <= ' ' }
 
     override val helpUrl: String
-        get() = "https://tasks.org/etesync"
+        get() = getString(R.string.url_etesync)
 
     override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
         if (requestCode == REQUEST_ENCRYPTION_PASSWORD) {

app/src/main/java/org/tasks/locale/ui/activity/TaskerCreateTaskActivity.java

@@ -132,7 +132,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("https://tasks.org/help/tasker")));
+          new Intent(Intent.ACTION_VIEW).setData(Uri.parse(getString(R.string.url_tasker))));
       return true;
     }
     return onOptionsItemSelected(item);

app/src/main/java/org/tasks/opentasks/OpenTaskAccountSettingsActivity.kt

@@ -65,5 +65,5 @@ class OpenTaskAccountSettingsActivity : BaseCaldavAccountSettingsActivity(), Too
     override suspend fun updateAccount() = updateAccount(caldavAccount!!.url)
 
     override val helpUrl: String
-        get() = "https://tasks.org/sync"
+        get() = getString(R.string.help_url_sync)
 }

app/src/main/java/org/tasks/sync/AddAccountDialog.kt

@@ -79,7 +79,7 @@ class AddAccountDialog : DialogFragment() {
                                 Intent(activity, EteSyncAccountSettingsActivity::class.java),
                                 REQUEST_CALDAV_SETTINGS)
                         4 -> activity?.startActivity(
-                                Intent(ACTION_VIEW, Uri.parse("https://tasks.org/davx5")))
+                                Intent(ACTION_VIEW, Uri.parse(getString(R.string.url_davx5))))
                     }
                     dialog.dismiss()
                 }

app/src/main/java/org/tasks/ui/NavigationDrawerFragment.kt

@@ -86,7 +86,7 @@ class NavigationDrawerFragment : Fragment() {
                             when (item.requestCode) {
                                 REQUEST_PURCHASE ->
                                     newPurchaseDialog().show(parentFragmentManager, FRAG_TAG_PURCHASE_DIALOG)
-                                REQUEST_DONATE -> startActivity(Intent(Intent.ACTION_VIEW, Uri.parse("https://tasks.org/donate")))
+                                REQUEST_DONATE -> startActivity(Intent(Intent.ACTION_VIEW, Uri.parse(getString(R.string.url_donate))))
                                 REQUEST_NEW_FILTER -> newFilterDialog().show(parentFragmentManager, FRAG_TAG_NEW_FILTER)
                                 else -> activity?.startActivityForResult(item.intent, item.requestCode)
                             }

app/src/main/res/values/keys.xml

@@ -18,6 +18,12 @@
   <string name="etesync_url">https://api.etesync.com</string>
   <string name="help_url_sync">https://tasks.org/sync</string>
 
+  <string name="url_davx5">https://tasks.org/davx5</string>
+  <string name="url_caldav">https://tasks.org/caldav</string>
+  <string name="url_etesync">https://tasks.org/etesync</string>
+  <string name="url_tasker">https://tasks.org/help/tasker</string>
+  <string name="url_donate">https://tasks.org/donate</string>
+
   <!-- Eventually these should be moved to strings.xml for translation -->
   <string name="upgrade_header">Subscribe to unlock additional features and support open source software!</string>
   <string name="upgrade_sync_with_tasks">Sync with Tasks.org</string>