diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser index 7265e631a8..1e0ce20155 100644 Binary files a/.idea/caches/build_file_checksums.ser and b/.idea/caches/build_file_checksums.ser differ diff --git a/app/build.gradle b/app/build.gradle index 702fc13ec9..d9224a5b9d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -15,7 +15,7 @@ android { applicationId "com.tangem.wallet" minSdkVersion 21 targetSdkVersion 27 - versionCode 43 + versionCode 44 versionName "0.87.1." + generateVersionName() testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" } diff --git a/app/src/main/java/com/tangem/presentation/activity/CreateNewWalletActivity.java b/app/src/main/java/com/tangem/presentation/activity/CreateNewWalletActivity.java index d247810687..1e48bb63a7 100644 --- a/app/src/main/java/com/tangem/presentation/activity/CreateNewWalletActivity.java +++ b/app/src/main/java/com/tangem/presentation/activity/CreateNewWalletActivity.java @@ -35,89 +35,6 @@ public class CreateNewWalletActivity extends AppCompatActivity implements NfcAda private CreateNewWalletTask createNewWalletTask; private boolean lastReadSuccess = true; -// private class CreateNewWalletTask extends Thread { -// -// private IsoDep mIsoDep; -// private CardProtocol.Notifications mNotifications; -// private boolean isCancelled = false; -// -// public CreateNewWalletTask(IsoDep isoDep, CardProtocol.Notifications notifications) { -// mIsoDep = isoDep; -// mNotifications = notifications; -// } -// -// @Override -// public void run() { -// if (mIsoDep == null) { -// return; -// } -// CardProtocol protocol = new CardProtocol(getBaseContext(), mIsoDep, mCard, mNotifications); -// mNotifications.OnReadStart(protocol); -// try { -// // for Samsung's bugs - -// // Workaround for the Samsung Galaxy S5 (since the -// // first connection always hangs on transceive). -// int timeout = mIsoDep.getTimeout(); -// mIsoDep.connect(); -// mIsoDep.close(); -// mIsoDep.connect(); -// mIsoDep.setTimeout(timeout); -// try { -// mNotifications.OnReadProgress(protocol, 5); -// -// Log.i("CreateNewWalletTask", "[-- Start create new wallet --]"); -// -// if (isCancelled) return; -// protocol.run_VerifyCard(); -// -// Log.i("CreateNewWalletTask", "Manufacturer: " + protocol.getCard().getManufacturer().getOfficialName()); -// -// mNotifications.OnReadProgress(protocol, 30); -// if (isCancelled) return; -// -//// if (mCard.getPauseBeforePIN2() > 0) { -//// mNotifications.OnReadWait(mCard.getPauseBeforePIN2()); -//// } -//// try { -// protocol.run_CreateWallet(PINStorage.getPIN2()); -//// } finally { -//// mNotifications.OnReadWait(0); -//// } -// mNotifications.OnReadProgress(protocol, 60); -// if (isCancelled) return; -// -// protocol.run_Read(); -// -// } finally { -// mNfcManager.ignoreTag(mIsoDep.getTag()); -// } -// } catch (Exception e) { -// e.printStackTrace(); -// protocol.setError(e); -// -// } finally { -// Log.i("CreateNewWalletTask", "[-- Finish create new wallet --]"); -// mNotifications.OnReadFinish(protocol); -// } -// } -// -// public void cancel(Boolean AllowInterrupt) { -// try { -// if (this.isAlive()) { -// isCancelled = true; -// join(500); -// } -// if (this.isAlive() && AllowInterrupt) { -// interrupt(); -// mNotifications.OnReadCancel(); -// } -// } catch (Exception e) { -// e.printStackTrace(); -// } -// } -// -// } - @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); diff --git a/app/src/main/java/com/tangem/presentation/activity/EmptyWalletActivity.java b/app/src/main/java/com/tangem/presentation/activity/EmptyWalletActivity.java index 79f897068b..42f770a0c7 100644 --- a/app/src/main/java/com/tangem/presentation/activity/EmptyWalletActivity.java +++ b/app/src/main/java/com/tangem/presentation/activity/EmptyWalletActivity.java @@ -112,12 +112,12 @@ public class EmptyWalletActivity extends AppCompatActivity implements NfcAdapter startActivityForResult(intent, REQUEST_CODE_REQUEST_PIN2); }); - if (getIntent().getExtras().containsKey(NfcAdapter.EXTRA_TAG)) { - Tag tag = getIntent().getParcelableExtra(NfcAdapter.EXTRA_TAG); - if (tag != null) { - onTagDiscovered(tag); - } - } +// if (getIntent().getExtras().containsKey(NfcAdapter.EXTRA_TAG)) { +// Tag tag = getIntent().getParcelableExtra(NfcAdapter.EXTRA_TAG); +// if (tag != null) { +// onTagDiscovered(tag); +// } +// } } @Override diff --git a/app/src/main/java/com/tangem/presentation/activity/MainActivity.java b/app/src/main/java/com/tangem/presentation/activity/MainActivity.java index f2af710238..e54ed45feb 100644 --- a/app/src/main/java/com/tangem/presentation/activity/MainActivity.java +++ b/app/src/main/java/com/tangem/presentation/activity/MainActivity.java @@ -1,6 +1,5 @@ package com.tangem.presentation.activity; -import android.content.ActivityNotFoundException; import android.content.Context; import android.content.Intent; import android.content.pm.ActivityInfo; @@ -97,13 +96,6 @@ public class MainActivity extends AppCompatActivity implements PopupMenu.OnMenuI antenna = new DeviceNFCAntennaLocation(); antenna.getAntennaLocation(); - try { - - } catch (ActivityNotFoundException e) { - e.printStackTrace(); - } - - // set card orientation switch (antenna.getOrientation()) { case DeviceNFCAntennaLocation.CARD_ORIENTATION_HORIZONTAL: diff --git a/app/src/main/java/com/tangem/presentation/activity/PreparePaymentActivity.kt b/app/src/main/java/com/tangem/presentation/activity/PreparePaymentActivity.kt index 81c46c6e93..e084503acd 100644 --- a/app/src/main/java/com/tangem/presentation/activity/PreparePaymentActivity.kt +++ b/app/src/main/java/com/tangem/presentation/activity/PreparePaymentActivity.kt @@ -9,7 +9,7 @@ import android.os.Bundle import android.support.v7.app.AppCompatActivity import android.text.Html import android.text.InputFilter -import com.tangem.DecimalDigitsInputFilter +import com.tangem.util.DecimalDigitsInputFilter import com.tangem.domain.cardReader.NfcManager import com.tangem.domain.wallet.Blockchain import com.tangem.domain.wallet.CoinEngineFactory 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 e5d9218fc8..a1c1afc615 100644 --- a/app/src/main/java/com/tangem/presentation/fragment/LoadedWallet.kt +++ b/app/src/main/java/com/tangem/presentation/fragment/LoadedWallet.kt @@ -496,6 +496,14 @@ class LoadedWallet : Fragment(), NfcAdapter.ReaderCallback, CardProtocol.Notific if (needResendTX) sendTransaction(LastSignStorage.getTxForSend(mCard!!.wallet)) + + +// if (activity!!.intent.extras!!.containsKey(NfcAdapter.EXTRA_TAG)) { +// val tag = activity!!.intent.getParcelableExtra(NfcAdapter.EXTRA_TAG) +// if (tag != null) { +// onTagDiscovered(tag) +// } +// } } override fun onTagDiscovered(tag: Tag) { diff --git a/app/src/main/java/com/tangem/presentation/fragment/Main.java b/app/src/main/java/com/tangem/presentation/fragment/Main.java index 464858b772..a81bb7ebdb 100644 --- a/app/src/main/java/com/tangem/presentation/fragment/Main.java +++ b/app/src/main/java/com/tangem/presentation/fragment/Main.java @@ -36,7 +36,6 @@ import com.tangem.util.Util; import com.tangem.wallet.R; import java.util.ArrayList; -import java.util.Arrays; import java.util.Objects; /** @@ -219,7 +218,7 @@ public class Main extends Fragment implements NfcAdapter.ReaderCallback, CardLis readCardInfoTask = new ReadCardInfoTask(getActivity(), mNfcManager, isoDep, this); readCardInfoTask.start(); - Log.i(TAG, "onTagDiscovered " + Arrays.toString(tag.getId())); +// Log.i(TAG, "onTagDiscovered " + Arrays.toString(tag.getId())); } catch (Exception e) { e.printStackTrace(); diff --git a/app/src/main/java/com/tangem/presentation/fragment/VerifyCard.java b/app/src/main/java/com/tangem/presentation/fragment/VerifyCard.java index 5fb97d9003..afe07f06b7 100644 --- a/app/src/main/java/com/tangem/presentation/fragment/VerifyCard.java +++ b/app/src/main/java/com/tangem/presentation/fragment/VerifyCard.java @@ -580,7 +580,7 @@ public class VerifyCard extends Fragment implements NfcAdapter.ReaderCallback { popup.getMenu().findItem(R.id.action_set_PIN2).setVisible(mCard.allowSwapPIN2()); popup.getMenu().findItem(R.id.action_reset_PIN2).setVisible(mCard.allowSwapPIN2() && !mCard.useDefaultPIN2()); popup.getMenu().findItem(R.id.action_reset_PINs).setVisible(mCard.allowSwapPIN() && mCard.allowSwapPIN2() && !mCard.useDefaultPIN1() && !mCard.useDefaultPIN2()); - if (!mCard.isReusable() || !mCard.isWalletPublicKeyValid()) + if (!mCard.isReusable() || mCard.getStatus() != TangemCard.Status.Loaded) popup.getMenu().findItem(R.id.action_purge).setVisible(false); popup.setOnMenuItemClickListener(item -> { diff --git a/app/src/main/java/com/tangem/DecimalDigitsInputFilter.java b/app/src/main/java/com/tangem/util/DecimalDigitsInputFilter.java similarity index 98% rename from app/src/main/java/com/tangem/DecimalDigitsInputFilter.java rename to app/src/main/java/com/tangem/util/DecimalDigitsInputFilter.java index 6729baf62b..b306b1b063 100644 --- a/app/src/main/java/com/tangem/DecimalDigitsInputFilter.java +++ b/app/src/main/java/com/tangem/util/DecimalDigitsInputFilter.java @@ -1,4 +1,4 @@ -package com.tangem; +package com.tangem.util; import android.text.InputFilter; import android.text.Spanned; diff --git a/app/src/main/java/com/tangem/VerticalTextView.java b/app/src/main/java/com/tangem/util/VerticalTextView.java similarity index 98% rename from app/src/main/java/com/tangem/VerticalTextView.java rename to app/src/main/java/com/tangem/util/VerticalTextView.java index 62cf9151c6..b6713ca0a4 100644 --- a/app/src/main/java/com/tangem/VerticalTextView.java +++ b/app/src/main/java/com/tangem/util/VerticalTextView.java @@ -1,4 +1,4 @@ -package com.tangem; +package com.tangem.util; import android.content.Context; import android.graphics.Canvas; diff --git a/app/src/main/res/layout/item_list_card.xml b/app/src/main/res/layout/item_list_card.xml index c5934ab8e0..6a99ebb769 100644 --- a/app/src/main/res/layout/item_list_card.xml +++ b/app/src/main/res/layout/item_list_card.xml @@ -57,7 +57,7 @@ android:alpha="0.5" android:background="@color/white"/> -