GiftedHacker/tangem-app-android-audited
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Updated on 2026-08-14

Browse source
This commit is contained in:
Tangem 2018-10-16 16:30:22 +03:00
parent 840499c35a
commit cee9c927ab
8 changed files with 26 additions and 123 deletions
Download patch file Download diff file Expand all files Collapse all files

33
app/src/main/java/com/tangem/domain/wallet/TangemCard.java
View file

@ -433,7 +433,7 @@ public class TangemCard {
return failedBalanceRequestCounter.get();
}
Boolean balanceEqual;
private Boolean balanceEqual;
public Boolean isBalanceEqual() {
return balanceEqual;
@ -451,22 +451,22 @@ public class TangemCard {
public Boolean isReusable() {
if (settingsMask == null) return null;
return (settingsMask.intValue() & SettingsMask.IsReusable) != 0;
return (settingsMask & SettingsMask.IsReusable) != 0;
}
public Boolean allowSwapPIN() {
if (settingsMask == null) return null;
return (settingsMask.intValue() & SettingsMask.AllowSwapPIN) != 0;
return (settingsMask & SettingsMask.AllowSwapPIN) != 0;
}
public Boolean allowSwapPIN2() {
if (settingsMask == null) return null;
return (settingsMask.intValue() & SettingsMask.AllowSwapPIN2) != 0;
return (settingsMask & SettingsMask.AllowSwapPIN2) != 0;
}
public Boolean needCVC() {
if (settingsMask == null) return null;
return (settingsMask.intValue() & SettingsMask.UseCVC) != 0;
return (settingsMask & SettingsMask.UseCVC) != 0;
}
public Boolean useDefaultPIN1() {
@ -475,7 +475,7 @@ public class TangemCard {
public Boolean useSmartSecurityDelay() {
if (settingsMask == null) return null;
return (settingsMask.intValue() & SettingsMask.SmartSecurityDelay) != 0;
return (settingsMask & SettingsMask.SmartSecurityDelay) != 0;
}
public enum PIN2_Mode {Unchecked, DefaultPIN2, CustomPIN2}
@ -501,22 +501,22 @@ public class TangemCard {
public Boolean supportNDEF() {
if (settingsMask == null) return null;
return (settingsMask.intValue() & SettingsMask.UseNDEF) != 0;
return (settingsMask & SettingsMask.UseNDEF) != 0;
}
public Boolean supportOnlyOneCommandAtTime() {
if (settingsMask == null) return null;
return supportNDEF() && ((settingsMask.intValue() & SettingsMask.UseOneCommandAtTime) != 0);
return supportNDEF() && ((settingsMask & SettingsMask.UseOneCommandAtTime) != 0);
}
public Boolean supportDynamicNDEF() {
if (settingsMask == null) return null;
return supportNDEF() && ((settingsMask.intValue() & SettingsMask.UseDynamicNDEF) != 0);
return supportNDEF() && ((settingsMask & SettingsMask.UseDynamicNDEF) != 0);
}
public Boolean supportBlock() {
if (settingsMask == null) return null;
return (settingsMask.intValue() & SettingsMask.UseBlock) != 0;
return (settingsMask & SettingsMask.UseBlock) != 0;
}
public int getMaxSignatures() {
@ -541,7 +541,7 @@ public class TangemCard {
return getFirmwareVersion().endsWith("d") || getFirmwareVersion().endsWith("SDK");
}
public static String getFirmwareVersionNumber(String version) throws Exception {
private static String getFirmwareVersionNumber(String version) throws Exception {
if (version == null || version.length() < 4) {
throw new Exception("Firmware version has unsupported format!");
}
@ -554,7 +554,7 @@ public class TangemCard {
}
}
public static int[] getFirmwareVersionNumbers(String version) throws Exception {
private static int[] getFirmwareVersionNumbers(String version) throws Exception {
String fwNumber = getFirmwareVersionNumber(version);
String[] strNumbers = fwNumber.split("\\.");
@ -650,12 +650,11 @@ public class TangemCard {
return B;
}
public void LoadFromBundle(Bundle B) {
public void loadFromBundle(Bundle B) {
txID = B.getString("txID");
Amount = B.getInt("Amount");
Height = B.getInt("Height");
Raw = B.getString("Raw");
}
}
@ -871,11 +870,11 @@ public class TangemCard {
public Bundle getAsBundle() {
Bundle B = new Bundle();
SaveToBundle(B);
saveToBundle(B);
return B;
}
public void SaveToBundle(Bundle B) {
public void saveToBundle(Bundle B) {
B.putString("UID", UID);
B.putByteArray("CID", CID);
B.putString("PIN", PIN);
@ -1066,7 +1065,7 @@ public class TangemCard {
Integer i = 0;
while (BB.containsKey(i.toString())) {
UnspentTransaction t = new UnspentTransaction();
t.LoadFromBundle(BB.getBundle(i.toString()));
t.loadFromBundle(BB.getBundle(i.toString()));
unspentTransactions.add(t);
i++;
}

8
app/src/main/java/com/tangem/presentation/activity/MainActivity.kt
View file

@ -147,12 +147,6 @@ class MainActivity : AppCompatActivity(), NfcAdapter.ReaderCallback, CardProtoco
// set listeners
fab.setOnClickListener { showMenu(it) }
// if (BuildConfig.DEBUG) {
// fab.setOnLongClickListener {
// startActivity(Intent(this, SettingsDebugActivity::class.java))
// false
// }
// }
val apiHelper = ServerApiHelper()
apiHelper.setLastVersionListener { response ->
@ -315,7 +309,7 @@ class MainActivity : AppCompatActivity(), NfcAdapter.ReaderCallback, CardProtoco
val cardInfo = Bundle()
cardInfo.putString("UID", cardProtocol.card.uid)
val bCard = Bundle()
cardProtocol.card.SaveToBundle(bCard)
cardProtocol.card.saveToBundle(bCard)
cardInfo.putBundle("Card", bCard)
val uid = cardInfo.getString("UID")

31
app/src/main/java/com/tangem/presentation/activity/SettingsDebugActivity.kt
View file

@ -1,31 +0,0 @@
package com.tangem.presentation.activity
import android.os.Bundle
import android.support.v7.app.AppCompatActivity
import android.support.v7.widget.Toolbar
import com.tangem.wallet.R
class SettingsDebugActivity : AppCompatActivity() {
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
setContentView(R.layout.activity_settings_debug)
initToolbar()
}
private fun initToolbar() {
val toolbar = findViewById<Toolbar>(R.id.toolbar)!!
toolbar.title = getString(R.string.debug_settings)
setSupportActionBar(toolbar)
toolbar.setNavigationIcon(R.drawable.ic_arrow_left_white_24dp)
toolbar.setNavigationOnClickListener {
if (fragmentManager.backStackEntryCount == 0)
finish()
else
fragmentManager.popBackStack()
}
}
}

15
app/src/main/java/com/tangem/presentation/fragment/LoadedWallet.kt
View file

@ -698,15 +698,16 @@ class LoadedWallet : Fragment(), NfcAdapter.ReaderCallback, CardProtocol.Notific
if (cardProtocol != null) {
if (cardProtocol.error == null) {
rlProgressBar.post {
rlProgressBar.visibility = View.GONE
rlProgressBar?.post {
rlProgressBar?.visibility = View.GONE
this.cardProtocol = cardProtocol
if (!cardProtocol.card.isWalletPublicKeyValid) refresh()
else updateViews()
}
} else {
// remove last UIDs because of error and no card read
rlProgressBar.post {
rlProgressBar?.post {
lastReadSuccess = false
if (cardProtocol.error is CardProtocol.TangemException_ExtendedLengthNotSupported)
if (!NoExtendedLengthSupportDialog.allReadyShowed)
@ -717,9 +718,9 @@ class LoadedWallet : Fragment(), NfcAdapter.ReaderCallback, CardProtocol.Notific
}
}
rlProgressBar.postDelayed({
rlProgressBar?.postDelayed({
try {
rlProgressBar.visibility = View.GONE
rlProgressBar?.visibility = View.GONE
} catch (e: Exception) {
e.printStackTrace()
}
@ -728,9 +729,9 @@ class LoadedWallet : Fragment(), NfcAdapter.ReaderCallback, CardProtocol.Notific
override fun onReadCancel() {
verifyCardTask = null
rlProgressBar.postDelayed({
rlProgressBar?.postDelayed({
try {
rlProgressBar.visibility = View.GONE
rlProgressBar?.visibility = View.GONE
} catch (e: Exception) {
e.printStackTrace()
}

16
app/src/main/java/com/tangem/presentation/fragment/SettingsDebug.kt
View file

@ -1,16 +0,0 @@
package com.tangem.presentation.fragment
import android.os.Bundle
import android.preference.PreferenceFragment
import android.preference.SwitchPreference
import com.tangem.wallet.R
class SettingsDebug : PreferenceFragment() {
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
addPreferencesFromResource(R.xml.fr_settings_debug)
}
}