Skip to content

Commit ca882ae

Browse files
rchtgptluckyman20
authored andcommitted
Fix: Add Confirmation Dialog in Passcode Activity (openMF#95)
1 parent 4ec1202 commit ca882ae

File tree

2 files changed

+20
-4
lines changed

2 files changed

+20
-4
lines changed

app/src/main/kotlin/org/mifos/mobile/cn/ui/mifos/passcode/PasscodeActivity.kt

+18-4
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,15 @@
11
package org.mifos.mobile.cn.ui.mifos.passcode
22

3+
import android.content.DialogInterface
34
import android.content.Intent
45
import android.view.View
6+
import android.widget.Toast
57
import com.mifos.mobile.passcode.MifosPassCodeActivity
68
import com.mifos.mobile.passcode.utils.EncryptionUtil
79
import org.mifos.mobile.cn.R
810
import org.mifos.mobile.cn.ui.mifos.DashboardActivity
911
import org.mifos.mobile.cn.ui.mifos.login.LoginActivity
12+
import org.mifos.mobile.cn.ui.utils.MaterialDialog
1013
import org.mifos.mobile.cn.ui.utils.Toaster
1114

1215

@@ -22,10 +25,21 @@ class PasscodeActivity : MifosPassCodeActivity(){
2225
}
2326

2427
override fun startLoginActivity() {
25-
val intentLogin = Intent(this, LoginActivity::class.java)
26-
intentLogin.flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK
27-
startActivity(intentLogin)
28-
finish()
28+
MaterialDialog.Builder().init(this)
29+
.setMessage(R.string.login_using_password_confirmation)
30+
.setPositiveButton(getString(R.string.logout),
31+
DialogInterface.OnClickListener { dialog, which ->
32+
val intent = Intent(this, LoginActivity::class.java)
33+
intent.flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK
34+
startActivity(intent)
35+
finish()
36+
//Show successful logout Toast.
37+
Toast.makeText(applicationContext, "Logged Out Successfully", Toast.LENGTH_SHORT).show()
38+
})
39+
.setNegativeButton(getString(R.string.cancel),
40+
DialogInterface.OnClickListener { dialog, which -> dialog.dismiss() })
41+
.createMaterialDialog()
42+
.show()
2943
}
3044

3145
override fun showToaster(view: View, msg: Int) {

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

+2
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@
2626
<string name="error_validation_minimum_chars">%1$s cannot be less than %2$d characters</string>
2727
<string name="error_validation_cannot_contain_spaces">%1$s cannot contain spaces</string>
2828
<string name="error_logging_in">Error logging in</string>
29+
<string name="login_using_password_confirmation">Are you sure you want to login using Password?
30+
</string>
2931

3032

3133
<!--Dashboard Activity-->

0 commit comments

Comments
 (0)