diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 5e29909f23..330db2e0da 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -10,7 +10,7 @@
-
+
@@ -129,11 +129,6 @@
android:screenOrientation="portrait"
android:theme="@style/AppTheme.NoActionBar" />
-
-
-
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/domain/wallet/TangemCard.java b/app/src/main/java/com/tangem/domain/wallet/TangemCard.java
index 9c8cda200e..8f257a3464 100644
--- a/app/src/main/java/com/tangem/domain/wallet/TangemCard.java
+++ b/app/src/main/java/com/tangem/domain/wallet/TangemCard.java
@@ -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++;
}
diff --git a/app/src/main/java/com/tangem/presentation/activity/MainActivity.kt b/app/src/main/java/com/tangem/presentation/activity/MainActivity.kt
index 757f10f7f7..b249e75d1a 100644
--- a/app/src/main/java/com/tangem/presentation/activity/MainActivity.kt
+++ b/app/src/main/java/com/tangem/presentation/activity/MainActivity.kt
@@ -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")
diff --git a/app/src/main/java/com/tangem/presentation/activity/SettingsDebugActivity.kt b/app/src/main/java/com/tangem/presentation/activity/SettingsDebugActivity.kt
deleted file mode 100644
index 56acc42878..0000000000
--- a/app/src/main/java/com/tangem/presentation/activity/SettingsDebugActivity.kt
+++ /dev/null
@@ -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(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()
- }
- }
-
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/presentation/fragment/LoadedWallet.kt b/app/src/main/java/com/tangem/presentation/fragment/LoadedWallet.kt
index a976e10cec..cb082cecda 100644
--- a/app/src/main/java/com/tangem/presentation/fragment/LoadedWallet.kt
+++ b/app/src/main/java/com/tangem/presentation/fragment/LoadedWallet.kt
@@ -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()
}
diff --git a/app/src/main/java/com/tangem/presentation/fragment/SettingsDebug.kt b/app/src/main/java/com/tangem/presentation/fragment/SettingsDebug.kt
deleted file mode 100644
index f9776064d5..0000000000
--- a/app/src/main/java/com/tangem/presentation/fragment/SettingsDebug.kt
+++ /dev/null
@@ -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)
-
- }
-
-}
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_settings_debug.xml b/app/src/main/res/layout/activity_settings_debug.xml
deleted file mode 100644
index f33e45cc9a..0000000000
--- a/app/src/main/res/layout/activity_settings_debug.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/app/src/main/res/xml/fr_settings_debug.xml b/app/src/main/res/xml/fr_settings_debug.xml
deleted file mode 100644
index 783dffc8eb..0000000000
--- a/app/src/main/res/xml/fr_settings_debug.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file