Updated on 2026-08-14

This commit is contained in:
Tangem 2018-07-23 10:05:49 +03:00
parent eda078384e
commit 542a830306
3 changed files with 7 additions and 20 deletions

View file

@ -80,13 +80,11 @@
<activity <activity
android:name="com.tangem.presentation.activity.LoadedWalletActivity" android:name="com.tangem.presentation.activity.LoadedWalletActivity"
android:label="@string/title_activity_loaded_wallet"
android:screenOrientation="portrait" android:screenOrientation="portrait"
android:theme="@style/AppTheme.NoActionBar"/> android:theme="@style/AppTheme.NoActionBar"/>
<activity <activity
android:name="com.tangem.presentation.activity.VerifyCardActivity" android:name="com.tangem.presentation.activity.VerifyCardActivity"
android:label="@string/title_activity_loaded_wallet"
android:screenOrientation="portrait" android:screenOrientation="portrait"
android:theme="@style/AppTheme.NoActionBar"/> android:theme="@style/AppTheme.NoActionBar"/>

View file

@ -665,22 +665,22 @@ class LoadedWallet : Fragment(), NfcAdapter.ReaderCallback, CardProtocol.Notific
if (mCard!!.useDefaultPIN1()!!) { if (mCard!!.useDefaultPIN1()!!) {
ivPIN.setImageResource(R.drawable.unlock_pin1) ivPIN.setImageResource(R.drawable.unlock_pin1)
ivPIN.setOnClickListener { v -> Toast.makeText(context, R.string.this_banknote_protected_default_PIN1_code, Toast.LENGTH_LONG).show() } ivPIN.setOnClickListener { Toast.makeText(context, R.string.this_banknote_protected_default_PIN1_code, Toast.LENGTH_LONG).show() }
} else { } else {
ivPIN!!.setImageResource(R.drawable.lock_pin1) ivPIN!!.setImageResource(R.drawable.lock_pin1)
ivPIN!!.setOnClickListener { v -> Toast.makeText(context, R.string.this_banknote_protected_user_PIN1_code, Toast.LENGTH_LONG).show() } ivPIN!!.setOnClickListener { Toast.makeText(context, R.string.this_banknote_protected_user_PIN1_code, Toast.LENGTH_LONG).show() }
} }
if (mCard!!.pauseBeforePIN2 > 0 && (mCard!!.useDefaultPIN2()!! || !mCard!!.useSmartSecurityDelay())) { if (mCard!!.pauseBeforePIN2 > 0 && (mCard!!.useDefaultPIN2()!! || !mCard!!.useSmartSecurityDelay())) {
ivPIN2orSecurityDelay.setImageResource(R.drawable.timer) ivPIN2orSecurityDelay.setImageResource(R.drawable.timer)
ivPIN2orSecurityDelay.setOnClickListener { v -> Toast.makeText(context, String.format("This banknote will enforce %.0f seconds security delay for all operations requiring PIN2 code", mCard!!.pauseBeforePIN2 / 1000.0), Toast.LENGTH_LONG).show() } ivPIN2orSecurityDelay.setOnClickListener { Toast.makeText(context, String.format("This banknote will enforce %.0f seconds security delay for all operations requiring PIN2 code", mCard!!.pauseBeforePIN2 / 1000.0), Toast.LENGTH_LONG).show() }
} else if (mCard!!.useDefaultPIN2()!!) { } else if (mCard!!.useDefaultPIN2()!!) {
ivPIN2orSecurityDelay.setImageResource(R.drawable.unlock_pin2) ivPIN2orSecurityDelay.setImageResource(R.drawable.unlock_pin2)
ivPIN2orSecurityDelay.setOnClickListener { v -> Toast.makeText(context, R.string.this_banknote_protected_default_PIN2_code, Toast.LENGTH_LONG).show() } ivPIN2orSecurityDelay.setOnClickListener { Toast.makeText(context, R.string.this_banknote_protected_default_PIN2_code, Toast.LENGTH_LONG).show() }
} else { } else {
ivPIN2orSecurityDelay.setImageResource(R.drawable.lock_pin2) ivPIN2orSecurityDelay.setImageResource(R.drawable.lock_pin2)
ivPIN2orSecurityDelay.setOnClickListener { v -> Toast.makeText(context, R.string.this_banknote_protected_user_PIN2_code, Toast.LENGTH_LONG).show() } ivPIN2orSecurityDelay.setOnClickListener { Toast.makeText(context, R.string.this_banknote_protected_user_PIN2_code, Toast.LENGTH_LONG).show() }
} }
if (mCard!!.useDevelopersFirmware()!!) { if (mCard!!.useDevelopersFirmware()!!) {
@ -695,18 +695,8 @@ class LoadedWallet : Fragment(), NfcAdapter.ReaderCallback, CardProtocol.Notific
tvIssuer.text = mCard!!.issuerDescription tvIssuer.text = mCard!!.issuerDescription
timerHideErrorAndMessage = Timer() mCard!!.error = null
mCard!!.message = null
timerHideErrorAndMessage!!.schedule(object : TimerTask() {
override fun run() {
tvError.post {
tvMessage!!.visibility = View.GONE
tvError.visibility = View.GONE
mCard!!.error = null
mCard!!.message = null
}
}
}, 5000)
} catch (e: Exception) { } catch (e: Exception) {
e.printStackTrace() e.printStackTrace()

View file

@ -27,7 +27,6 @@
<item>@string/bcBitcoin</item> <item>@string/bcBitcoin</item>
<item>@string/bcEtherium</item> <item>@string/bcEtherium</item>
</array> </array>
<string name="title_activity_loaded_wallet">LoadedWalletActivity</string>
<string name="title_activity_settings_feature">Settings</string> <string name="title_activity_settings_feature">Settings</string>
<string name="balance">Balance</string> <string name="balance">Balance</string>
<string name="verified_offline">verified offline</string> <string name="verified_offline">verified offline</string>