diff options
author | pacien | 2018-08-05 21:04:19 +0200 |
---|---|---|
committer | pacien | 2018-08-05 21:04:19 +0200 |
commit | 0961e674fd7738d7a7ff6d76179677bc3779d535 (patch) | |
tree | 0e1ea7d674626a99466296c9cd92a5c11780c3b0 /app/src/main/java/org/pacien/tincapp/activities | |
parent | 464adf4257097bac9975485969d19162ee25a33e (diff) | |
download | tincapp-0961e674fd7738d7a7ff6d76179677bc3779d535.tar.gz |
Replace deprecated progress dialog
Diffstat (limited to 'app/src/main/java/org/pacien/tincapp/activities')
3 files changed, 4 insertions, 6 deletions
diff --git a/app/src/main/java/org/pacien/tincapp/activities/BaseActivity.kt b/app/src/main/java/org/pacien/tincapp/activities/BaseActivity.kt index 7b9c202..fde99d0 100644 --- a/app/src/main/java/org/pacien/tincapp/activities/BaseActivity.kt +++ b/app/src/main/java/org/pacien/tincapp/activities/BaseActivity.kt | |||
@@ -18,7 +18,6 @@ | |||
18 | 18 | ||
19 | package org.pacien.tincapp.activities | 19 | package org.pacien.tincapp.activities |
20 | 20 | ||
21 | import android.app.ProgressDialog | ||
22 | import android.os.Bundle | 21 | import android.os.Bundle |
23 | import android.support.annotation.StringRes | 22 | import android.support.annotation.StringRes |
24 | import android.support.design.widget.Snackbar | 23 | import android.support.design.widget.Snackbar |
@@ -33,6 +32,7 @@ import org.pacien.tincapp.context.App | |||
33 | import org.pacien.tincapp.context.AppInfo | 32 | import org.pacien.tincapp.context.AppInfo |
34 | import org.pacien.tincapp.context.AppPaths | 33 | import org.pacien.tincapp.context.AppPaths |
35 | import org.pacien.tincapp.context.CrashRecorder | 34 | import org.pacien.tincapp.context.CrashRecorder |
35 | import org.pacien.tincapp.utils.ProgressModal | ||
36 | 36 | ||
37 | /** | 37 | /** |
38 | * @author pacien | 38 | * @author pacien |
@@ -109,7 +109,7 @@ abstract class BaseActivity : AppCompatActivity() { | |||
109 | 109 | ||
110 | protected fun notify(@StringRes msg: Int) = Snackbar.make(activity_base, msg, Snackbar.LENGTH_LONG).show() | 110 | protected fun notify(@StringRes msg: Int) = Snackbar.make(activity_base, msg, Snackbar.LENGTH_LONG).show() |
111 | protected fun notify(msg: String) = Snackbar.make(activity_base, msg, Snackbar.LENGTH_LONG).show() | 111 | protected fun notify(msg: String) = Snackbar.make(activity_base, msg, Snackbar.LENGTH_LONG).show() |
112 | protected fun showProgressDialog(@StringRes msg: Int): ProgressDialog = ProgressDialog.show(this, null, getString(msg), true, false) | 112 | protected fun showProgressDialog(@StringRes msg: Int): AlertDialog = ProgressModal.show(this, getString(msg)) |
113 | protected fun showErrorDialog(msg: String): AlertDialog = AlertDialog.Builder(this) | 113 | protected fun showErrorDialog(msg: String): AlertDialog = AlertDialog.Builder(this) |
114 | .setTitle(R.string.title_error).setMessage(msg) | 114 | .setTitle(R.string.title_error).setMessage(msg) |
115 | .setPositiveButton(R.string.action_close, { _, _ -> Unit }).show() | 115 | .setPositiveButton(R.string.action_close, { _, _ -> Unit }).show() |
diff --git a/app/src/main/java/org/pacien/tincapp/activities/StartActivity.kt b/app/src/main/java/org/pacien/tincapp/activities/StartActivity.kt index c775618..fbcde81 100644 --- a/app/src/main/java/org/pacien/tincapp/activities/StartActivity.kt +++ b/app/src/main/java/org/pacien/tincapp/activities/StartActivity.kt | |||
@@ -19,7 +19,6 @@ | |||
19 | package org.pacien.tincapp.activities | 19 | package org.pacien.tincapp.activities |
20 | 20 | ||
21 | import android.app.Activity | 21 | import android.app.Activity |
22 | import android.app.ProgressDialog | ||
23 | import android.content.Intent | 22 | import android.content.Intent |
24 | import android.net.VpnService | 23 | import android.net.VpnService |
25 | import android.os.Bundle | 24 | import android.os.Bundle |
@@ -137,7 +136,7 @@ class StartActivity : BaseActivity() { | |||
137 | Actions.EVENT_CONNECTED to this::onVpnStart, | 136 | Actions.EVENT_CONNECTED to this::onVpnStart, |
138 | Actions.EVENT_ABORTED to this::onVpnStartError)) | 137 | Actions.EVENT_ABORTED to this::onVpnStartError)) |
139 | 138 | ||
140 | private var connectDialog: ProgressDialog? = null | 139 | private var connectDialog: AlertDialog? = null |
141 | 140 | ||
142 | override fun onCreate(savedInstanceState: Bundle?) { | 141 | override fun onCreate(savedInstanceState: Bundle?) { |
143 | super.onCreate(savedInstanceState) | 142 | super.onCreate(savedInstanceState) |
diff --git a/app/src/main/java/org/pacien/tincapp/activities/StatusActivity.kt b/app/src/main/java/org/pacien/tincapp/activities/StatusActivity.kt index a7a1853..cd64355 100644 --- a/app/src/main/java/org/pacien/tincapp/activities/StatusActivity.kt +++ b/app/src/main/java/org/pacien/tincapp/activities/StatusActivity.kt | |||
@@ -18,7 +18,6 @@ | |||
18 | 18 | ||
19 | package org.pacien.tincapp.activities | 19 | package org.pacien.tincapp.activities |
20 | 20 | ||
21 | import android.app.ProgressDialog | ||
22 | import android.content.Intent | 21 | import android.content.Intent |
23 | import android.os.Bundle | 22 | import android.os.Bundle |
24 | import android.support.v4.widget.SwipeRefreshLayout | 23 | import android.support.v4.widget.SwipeRefreshLayout |
@@ -51,7 +50,7 @@ import kotlin.concurrent.timerTask | |||
51 | */ | 50 | */ |
52 | class StatusActivity : BaseActivity(), AdapterView.OnItemClickListener, SwipeRefreshLayout.OnRefreshListener { | 51 | class StatusActivity : BaseActivity(), AdapterView.OnItemClickListener, SwipeRefreshLayout.OnRefreshListener { |
53 | private val broadcastMapper = BroadcastMapper(mapOf(Actions.EVENT_DISCONNECTED to this::onVpnShutdown)) | 52 | private val broadcastMapper = BroadcastMapper(mapOf(Actions.EVENT_DISCONNECTED to this::onVpnShutdown)) |
54 | private var shutdownDialog: ProgressDialog? = null | 53 | private var shutdownDialog: AlertDialog? = null |
55 | private var nodeListAdapter: ArrayAdapter<String>? = null | 54 | private var nodeListAdapter: ArrayAdapter<String>? = null |
56 | private var refreshTimer: Timer? = null | 55 | private var refreshTimer: Timer? = null |
57 | private var listNetworksAfterExit = true | 56 | private var listNetworksAfterExit = true |