Commit 9643cb76 authored by Ricki Hirner's avatar Ricki Hirner 🐑

StartupDialogFragment: Use activity instead of context

parent 46669dd0
Pipeline #12784728 failed with stage
in 60 minutes and 4 seconds
...@@ -110,7 +110,6 @@ class StartupDialogFragment: DialogFragment(), LoaderManager.LoaderCallbacks<ISe ...@@ -110,7 +110,6 @@ class StartupDialogFragment: DialogFragment(), LoaderManager.LoaderCallbacks<ISe
@SuppressLint("BatteryLife") @SuppressLint("BatteryLife")
@TargetApi(Build.VERSION_CODES.M)
override fun onCreateDialog(savedInstanceState: Bundle?): Dialog { override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
isCancelable = false isCancelable = false
...@@ -122,11 +121,11 @@ class StartupDialogFragment: DialogFragment(), LoaderManager.LoaderCallbacks<ISe ...@@ -122,11 +121,11 @@ class StartupDialogFragment: DialogFragment(), LoaderManager.LoaderCallbacks<ISe
.setTitle(R.string.startup_battery_optimization) .setTitle(R.string.startup_battery_optimization)
.setMessage(R.string.startup_battery_optimization_message) .setMessage(R.string.startup_battery_optimization_message)
.setPositiveButton(android.R.string.ok, { _, _ -> }) .setPositiveButton(android.R.string.ok, { _, _ -> })
.setNeutralButton(R.string.startup_battery_optimization_disable, { _, _ -> .setNeutralButton(R.string.startup_battery_optimization_disable, @TargetApi(Build.VERSION_CODES.M) { _, _ ->
val intent = Intent(android.provider.Settings.ACTION_REQUEST_IGNORE_BATTERY_OPTIMIZATIONS, val intent = Intent(android.provider.Settings.ACTION_REQUEST_IGNORE_BATTERY_OPTIMIZATIONS,
Uri.parse("package:" + BuildConfig.APPLICATION_ID)) Uri.parse("package:" + BuildConfig.APPLICATION_ID))
if (intent.resolveActivity(context.packageManager) != null) if (intent.resolveActivity(activity.packageManager) != null)
context.startActivity(intent) activity.startActivity(intent)
}) })
.setNegativeButton(R.string.startup_dont_show_again, { _: DialogInterface, _: Int -> .setNegativeButton(R.string.startup_dont_show_again, { _: DialogInterface, _: Int ->
settings?.putBoolean(HINT_BATTERY_OPTIMIZATIONS, false) settings?.putBoolean(HINT_BATTERY_OPTIMIZATIONS, false)
...@@ -147,7 +146,7 @@ class StartupDialogFragment: DialogFragment(), LoaderManager.LoaderCallbacks<ISe ...@@ -147,7 +146,7 @@ class StartupDialogFragment: DialogFragment(), LoaderManager.LoaderCallbacks<ISe
.setPositiveButton(android.R.string.ok, { _, _ -> }) .setPositiveButton(android.R.string.ok, { _, _ -> })
.setNeutralButton(R.string.startup_google_play_accounts_removed_more_info, { _, _ -> .setNeutralButton(R.string.startup_google_play_accounts_removed_more_info, { _, _ ->
val intent = Intent(Intent.ACTION_VIEW, Uri.parse(getString(R.string.navigation_drawer_faq_url))) val intent = Intent(Intent.ACTION_VIEW, Uri.parse(getString(R.string.navigation_drawer_faq_url)))
context.startActivity(intent) activity.startActivity(intent)
}) })
.setNegativeButton(R.string.startup_dont_show_again, { _, _ -> .setNegativeButton(R.string.startup_dont_show_again, { _, _ ->
settings?.putBoolean(HINT_GOOGLE_PLAY_ACCOUNTS_REMOVED, false) settings?.putBoolean(HINT_GOOGLE_PLAY_ACCOUNTS_REMOVED, false)
...@@ -166,8 +165,8 @@ class StartupDialogFragment: DialogFragment(), LoaderManager.LoaderCallbacks<ISe ...@@ -166,8 +165,8 @@ class StartupDialogFragment: DialogFragment(), LoaderManager.LoaderCallbacks<ISe
.setPositiveButton(android.R.string.ok, { _, _ -> }) .setPositiveButton(android.R.string.ok, { _, _ -> })
.setNeutralButton(R.string.startup_opentasks_not_installed_install, { _, _ -> .setNeutralButton(R.string.startup_opentasks_not_installed_install, { _, _ ->
val intent = Intent(Intent.ACTION_VIEW, Uri.parse("market://details?id=org.dmfs.tasks")) val intent = Intent(Intent.ACTION_VIEW, Uri.parse("market://details?id=org.dmfs.tasks"))
if (intent.resolveActivity(context.packageManager) != null) if (intent.resolveActivity(activity.packageManager) != null)
context.startActivity(intent) activity.startActivity(intent)
else else
Logger.log.warning("No market app available, can't install OpenTasks") Logger.log.warning("No market app available, can't install OpenTasks")
}) })
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment