Updated on 2026-08-14

This commit is contained in:
Tangem 2018-07-24 19:57:08 +03:00
parent 74d52c9b43
commit dc14c2c0bc
4 changed files with 7 additions and 40 deletions

Binary file not shown.

5
.idea/misc.xml generated
View file

@ -25,10 +25,7 @@
</value>
</option>
</component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
<component name="ProjectRootManager">
<output url="file://$PROJECT_DIR$/build/classes" />
</component>
<component name="ProjectType">
<option name="id" value="Android" />
</component>
</project>

View file

@ -587,7 +587,6 @@ class LoadedWallet : Fragment(), NfcAdapter.ReaderCallback, CardProtocol.Notific
timerHideErrorAndMessage!!.cancel()
timerHideErrorAndMessage = null
}
tvCardID.text = mCard!!.cidDescription
if (mCard!!.error == null || mCard!!.error.isEmpty()) {
tvError.visibility = View.GONE
@ -664,33 +663,6 @@ class LoadedWallet : Fragment(), NfcAdapter.ReaderCallback, CardProtocol.Notific
tvValidationNode.text = mCard!!.validationNodeDescription
if (mCard!!.useDefaultPIN1()!!) {
ivPIN.setImageResource(R.drawable.unlock_pin1)
ivPIN.setOnClickListener { Toast.makeText(context, R.string.this_banknote_protected_default_PIN1_code, Toast.LENGTH_LONG).show() }
} else {
ivPIN!!.setImageResource(R.drawable.lock_pin1)
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())) {
ivPIN2orSecurityDelay.setImageResource(R.drawable.timer)
ivPIN2orSecurityDelay.setOnClickListener { Toast.makeText(context, String.format(getString(R.string.this_banknote_will_enforce), mCard!!.pauseBeforePIN2 / 1000.0), Toast.LENGTH_LONG).show()}
} else if (mCard!!.useDefaultPIN2()!!) {
ivPIN2orSecurityDelay.setImageResource(R.drawable.unlock_pin2)
ivPIN2orSecurityDelay.setOnClickListener { Toast.makeText(context, R.string.this_banknote_protected_default_PIN2_code, Toast.LENGTH_LONG).show() }
} else {
ivPIN2orSecurityDelay.setImageResource(R.drawable.lock_pin2)
ivPIN2orSecurityDelay.setOnClickListener { Toast.makeText(context, R.string.this_banknote_protected_user_PIN2_code, Toast.LENGTH_LONG).show() }
}
if (mCard!!.useDevelopersFirmware()!!) {
ivDeveloperVersion.setImageResource(R.drawable.ic_developer_version)
ivDeveloperVersion.visibility = View.VISIBLE
ivDeveloperVersion.setOnClickListener { v -> Toast.makeText(context, R.string.unlocked_banknote_only_development_use, Toast.LENGTH_LONG).show() }
} else
ivDeveloperVersion.visibility = View.INVISIBLE
btnExtract!!.isEnabled = mCard!!.hasBalanceInfo()
tvIssuer.text = mCard!!.issuerDescription

View file

@ -68,7 +68,8 @@
android:layout_height="180dp"
android:layout_centerHorizontal="true"
android:elevation="3dp"
android:visibility="gone">
android:visibility="gone"
tools:visibility="visible">
<TextView
android:id="@+id/textView10"
@ -431,7 +432,8 @@
android:textAlignment="center"
android:textColor="@color/black"
android:textStyle="normal|bold"
android:visibility="gone"/>
android:visibility="gone"
tools:visibility="visible"/>
<TextView
android:id="@+id/tvError"
@ -448,7 +450,8 @@
android:textAlignment="center"
android:textColor="@color/white"
android:textStyle="bold"
android:visibility="gone"/>
android:visibility="gone"
tools:visibility="visible"/>
</RelativeLayout>
@ -571,9 +574,4 @@
</RelativeLayout>
<!--<include-->
<!--layout="@layout/layout_progress_horizontal"-->
<!--android:visibility="gone"-->
<!--tools:layout_editor_absoluteY="495dp" />-->
</android.support.constraint.ConstraintLayout>