update homepage links; version bump to 2.2.3 (fa585660) · Commits · e / os / AccountManager

app/build.gradle

+2 −2

Original line number	Diff line number	Diff line
		@@ -18,7 +18,7 @@ android {
		defaultConfig {
		applicationId "at.bitfire.davdroid"

		versionCode 265
		versionCode 266
		buildConfigField "long", "buildTime", System.currentTimeMillis() + "L"
		buildConfigField "boolean", "customCerts", "true"

		@@ -34,7 +34,7 @@ android {
		flavorDimensions "distribution"
		productFlavors {
		standard {
		versionName "2.2.3-beta2-ose"
		versionName "2.2.3-ose"
		}
		}

+1 −1

Original line number	Diff line number	Diff line
		@@ -393,7 +393,7 @@ class AccountSettingsActivity: AppCompatActivity() {
		.setPositiveButton(android.R.string.ok) { _, _ -> }
		.setNeutralButton(R.string.settings_more_info_faq) { _, _ ->
		val faqUrl = App.homepageUrl(requireActivity()).buildUpon()
		.appendEncodedPath("faq/wifi-ssid-restriction-location-permission")
		.appendPath("faq").appendPath("wifi-ssid-restriction-location-permission")
		.build()
		val intent = Intent(Intent.ACTION_VIEW, faqUrl)
		startActivity(Intent.createChooser(intent, null))

+6 −5

Original line number	Diff line number	Diff line
		@@ -44,16 +44,17 @@ class DefaultAccountsDrawerHandler: IAccountsDrawerHandler {
		UiUtils.launchUri(activity, App.homepageUrl(activity))
		R.id.nav_manual ->
		UiUtils.launchUri(activity, App.homepageUrl(activity)
		.buildUpon().appendEncodedPath("manual/").build())
		.buildUpon().appendPath("manual").build())
		R.id.nav_faq ->
		UiUtils.launchUri(activity, App.homepageUrl(activity)
		.buildUpon().appendEncodedPath("faq/").build())
		.buildUpon().appendPath("faq").build())
		R.id.nav_forums ->
		UiUtils.launchUri(activity, App.homepageUrl(activity)
		.buildUpon().appendEncodedPath("forums/").build())
		.buildUpon().appendPath("forums").build())
		R.id.nav_donate ->
		//if (BuildConfig.FLAVOR != App.FLAVOR_GOOGLE_PLAY)
		UiUtils.launchUri(activity, App.homepageUrl(activity)
		.buildUpon().appendEncodedPath("donate/").build())
		.buildUpon().appendPath("donate").build())
		else ->
		return false
		}

+2 −2

Original line number	Diff line number	Diff line
		@@ -100,7 +100,7 @@ class StartupDialogFragment: DialogFragment() {
		.setMessage(getString(R.string.startup_autostart_permission_message, Build.MANUFACTURER))
		.setPositiveButton(R.string.startup_more_info) { _, _ ->
		UiUtils.launchUri(requireActivity(), App.homepageUrl(requireActivity()).buildUpon()
		.appendPath("faq").appendEncodedPath("synchronization-is-not-run-as-expected/").build())
		.appendPath("faq").appendPath("synchronization-is-not-run-as-expected").build())
		}
		.setNeutralButton(R.string.startup_not_now) { _, _ -> }
		.setNegativeButton(R.string.startup_dont_show_again) { _, _ ->
		@@ -149,7 +149,7 @@ class StartupDialogFragment: DialogFragment() {
		.setMessage(R.string.startup_donate_message)
		.setPositiveButton(R.string.startup_donate_now) { _, _ ->
		UiUtils.launchUri(requireActivity(), App.homepageUrl(requireActivity()).buildUpon()
		.appendEncodedPath("donate/")
		.appendPath("donate")
		.build())
		settings.putLong(SETTING_NEXT_DONATION_POPUP, System.currentTimeMillis() + 30 * 86400000L) // 30 days
		}

+1 −1

Original line number	Diff line number	Diff line
		@@ -61,7 +61,7 @@ class LoginActivity: AppCompatActivity() {

		fun showHelp(item: MenuItem) {
		UiUtils.launchUri(this, App.homepageUrl(this).buildUpon()
		.appendEncodedPath("tested-with/")
		.appendPath("tested-with")
		.build())
		}