From 10c0b8e680e547bdb638315aa7dfd9cfb983db73 Mon Sep 17 00:00:00 2001 From: Tangem Date: Tue, 4 Dec 2018 15:53:05 +0300 Subject: [PATCH] Updated on 2026-08-14 --- app/src/main/java/com/tangem/Constant.kt | 20 ++++++- .../com/tangem/data/nfc/VerifyCardTask.java | 6 +- app/src/main/java/com/tangem/di/Navigator.kt | 7 ++- .../activity/LoadedWalletActivity.kt | 3 +- .../presentation/activity/MainActivity.kt | 18 ++---- .../activity/VerifyCardActivity.kt | 4 +- .../presentation/dialog/RootFoundDialog.kt | 2 +- .../presentation/fragment/LoadedWallet.kt | 60 ++++++++----------- .../presentation/fragment/VerifyCard.kt | 3 +- tangemcard/build.gradle | 9 +-- 10 files changed, 66 insertions(+), 66 deletions(-) diff --git a/app/src/main/java/com/tangem/Constant.kt b/app/src/main/java/com/tangem/Constant.kt index 5fb46a7a5f..c3d29195f6 100644 --- a/app/src/main/java/com/tangem/Constant.kt +++ b/app/src/main/java/com/tangem/Constant.kt @@ -2,7 +2,6 @@ package com.tangem object Constant { - const val EXTRA_BLOCKCHAIN_DATA = "BLOCKCHAIN_DATA" const val MESSAGE = "Message" @@ -10,4 +9,23 @@ object Constant { const val EXTRA_MODIFICATION = "modification" + // LoadedWallet + const val REQUEST_CODE_SEND_PAYMENT = 1 + const val REQUEST_CODE_PURGE = 2 + const val REQUEST_CODE_REQUEST_PIN2_FOR_PURGE = 3 + const val REQUEST_CODE_VERIFY_CARD = 4 + const val REQUEST_CODE_ENTER_NEW_PIN = 5 + const val REQUEST_CODE_ENTER_NEW_PIN2 = 6 + const val REQUEST_CODE_REQUEST_PIN2_FOR_SWAP_PIN = 7 + const val REQUEST_CODE_SWAP_PIN = 8 + const val REQUEST_CODE_RECEIVE_PAYMENT = 9 + + // MainActivity + const val REQUEST_CODE_SHOW_CARD_ACTIVITY = 1 + const val REQUEST_CODE_ENTER_PIN_ACTIVITY = 2 + const val REQUEST_CODE_SEND_EMAIL = 3 + const val REQUEST_CODE_REQUEST_CAMERA_PERMISSIONS = 3 + + const val EXTRA_LAST_DISCOVERED_TAG = "extra_last_tag" + } \ No newline at end of file diff --git a/app/src/main/java/com/tangem/data/nfc/VerifyCardTask.java b/app/src/main/java/com/tangem/data/nfc/VerifyCardTask.java index 9db5b0f682..f90849fd38 100644 --- a/app/src/main/java/com/tangem/data/nfc/VerifyCardTask.java +++ b/app/src/main/java/com/tangem/data/nfc/VerifyCardTask.java @@ -73,12 +73,12 @@ public class VerifyCardTask extends Thread { mNotifications.onReadProgress(protocol, 80); } if (isCancelled) return; - Firmwares.VerifyCodeRecord record=Firmwares.selectRandomVerifyCodeBlock(mCard.getFirmwareVersion()); + Firmwares.VerifyCodeRecord record = Firmwares.selectRandomVerifyCodeBlock(mCard.getFirmwareVersion()); if (isCancelled) return; - if( record!=null ) { + if (record != null) { byte[] returnedDigest = protocol.run_VerifyCode(record.hashAlg, record.blockIndex, record.blockCount, record.challenge); mCard.setCodeConfirmed(Arrays.equals(returnedDigest, record.digest)); - }else{ + } else { mCard.setCodeConfirmed(null); } mNotifications.onReadProgress(protocol, 90); diff --git a/app/src/main/java/com/tangem/di/Navigator.kt b/app/src/main/java/com/tangem/di/Navigator.kt index 15eb86bb96..a64290d3b6 100644 --- a/app/src/main/java/com/tangem/di/Navigator.kt +++ b/app/src/main/java/com/tangem/di/Navigator.kt @@ -3,6 +3,7 @@ package com.tangem.di import android.app.Activity import android.nfc.Tag import android.os.Bundle +import com.tangem.Constant import com.tangem.domain.wallet.CoinData import com.tangem.domain.wallet.TangemCard import com.tangem.presentation.activity.EmptyWalletActivity @@ -18,15 +19,15 @@ class Navigator { } fun showLoadedWallet(context: Activity, lastTag: Tag, cardInfo: Bundle) { - context.startActivityForResult(LoadedWalletActivity.callingIntent(context, lastTag, cardInfo), MainActivity.REQUEST_CODE_SHOW_CARD_ACTIVITY) + context.startActivityForResult(LoadedWalletActivity.callingIntent(context, lastTag, cardInfo), Constant.REQUEST_CODE_SHOW_CARD_ACTIVITY) } fun showEmptyWallet(context: Activity) { context.startActivity(EmptyWalletActivity.callingIntent(context)) } - fun showVerifyCard(context: Activity, card: TangemCard, coinData: CoinData, message: String, error: String) { - context.startActivityForResult(VerifyCardActivity.callingIntent(context, card, coinData, message, error), LoadedWallet.REQUEST_CODE_VERIFY_CARD) + fun showVerifyCard(context: Activity, card: TangemCard, coinData: CoinData) { + context.startActivityForResult(VerifyCardActivity.callingIntent(context, card, coinData), Constant.REQUEST_CODE_VERIFY_CARD) } fun showPinSwap(context: Activity) { diff --git a/app/src/main/java/com/tangem/presentation/activity/LoadedWalletActivity.kt b/app/src/main/java/com/tangem/presentation/activity/LoadedWalletActivity.kt index 04dab07418..1356658cb8 100644 --- a/app/src/main/java/com/tangem/presentation/activity/LoadedWalletActivity.kt +++ b/app/src/main/java/com/tangem/presentation/activity/LoadedWalletActivity.kt @@ -7,6 +7,7 @@ import android.nfc.Tag import android.os.Bundle import android.support.v7.app.AppCompatActivity import com.tangem.App +import com.tangem.Constant import com.tangem.di.Navigator import com.tangem.presentation.fragment.LoadedWallet import com.tangem.wallet.R @@ -20,7 +21,7 @@ class LoadedWalletActivity : AppCompatActivity() { companion object { fun callingIntent(context: Context, lastTag: Tag, cardInfo: Bundle): Intent { val intent = Intent(context, LoadedWalletActivity::class.java) - intent.putExtra(MainActivity.EXTRA_LAST_DISCOVERED_TAG, lastTag) + intent.putExtra(Constant.EXTRA_LAST_DISCOVERED_TAG, lastTag) intent.putExtras(cardInfo) return intent } 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 f247ab61f4..91186d4325 100644 --- a/app/src/main/java/com/tangem/presentation/activity/MainActivity.kt +++ b/app/src/main/java/com/tangem/presentation/activity/MainActivity.kt @@ -25,6 +25,7 @@ import android.widget.RelativeLayout import android.widget.Toast import com.scottyab.rootbeer.RootBeer import com.tangem.App +import com.tangem.Constant import com.tangem.data.Logger import com.tangem.data.db.PINStorage import com.tangem.data.network.ServerApiCommon @@ -52,13 +53,6 @@ class MainActivity : AppCompatActivity(), NfcAdapter.ReaderCallback, CardProtoco companion object { val TAG: String = MainActivity::class.java.simpleName - private const val REQUEST_CODE_SEND_EMAIL = 3 - private const val REQUEST_CODE_ENTER_PIN_ACTIVITY = 2 - const val REQUEST_CODE_SHOW_CARD_ACTIVITY = 1 - private const val REQUEST_CODE_REQUEST_CAMERA_PERMISSIONS = 3 - - const val EXTRA_LAST_DISCOVERED_TAG = "extra_last_tag" - fun callingIntent(context: Context) = Intent(context, MainActivity::class.java) fun commonInit(context: Context) { @@ -155,7 +149,7 @@ class MainActivity : AppCompatActivity(), NfcAdapter.ReaderCallback, CardProtoco // check if root device val rootBeer = RootBeer(this) if (rootBeer.isRootedWithoutBusyBoxCheck && !BuildConfig.DEBUG) - RootFoundDialog().show(fragmentManager, RootFoundDialog.TAG) + RootFoundDialog().show(supportFragmentManager, RootFoundDialog.TAG) // set listeners fab.setOnClickListener { showMenu(it) } @@ -180,19 +174,19 @@ class MainActivity : AppCompatActivity(), NfcAdapter.ReaderCallback, CardProtoco NfcManager.verifyPermissions(this) if (ContextCompat.checkSelfPermission(this, Manifest.permission.CAMERA) != PackageManager.PERMISSION_GRANTED) { Log.e("QRScanActivity", "User hasn't granted permission to use camera") - ActivityCompat.requestPermissions(this, arrayOf(Manifest.permission.CAMERA), REQUEST_CODE_REQUEST_CAMERA_PERMISSIONS) + ActivityCompat.requestPermissions(this, arrayOf(Manifest.permission.CAMERA), Constant.REQUEST_CODE_REQUEST_CAMERA_PERMISSIONS) } } override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) { when (requestCode) { - REQUEST_CODE_SEND_EMAIL -> { + Constant.REQUEST_CODE_SEND_EMAIL -> { if (zipFile != null) { zipFile!!.delete() zipFile = null } } - REQUEST_CODE_ENTER_PIN_ACTIVITY -> { + Constant.REQUEST_CODE_ENTER_PIN_ACTIVITY -> { if (resultCode == Activity.RESULT_OK && lastTag != null) onTagDiscovered(lastTag!!) else @@ -454,7 +448,7 @@ class MainActivity : AppCompatActivity(), NfcAdapter.ReaderCallback, CardProtoco private fun doEnterPIN() { val intent = Intent(this, PinRequestActivity::class.java) intent.putExtra("mode", PinRequestActivity.Mode.RequestPIN.toString()) - startActivityForResult(intent, REQUEST_CODE_ENTER_PIN_ACTIVITY) + startActivityForResult(intent, Constant.REQUEST_CODE_ENTER_PIN_ACTIVITY) } } \ No newline at end of file diff --git a/app/src/main/java/com/tangem/presentation/activity/VerifyCardActivity.kt b/app/src/main/java/com/tangem/presentation/activity/VerifyCardActivity.kt index 402da7169c..6841d4bc83 100644 --- a/app/src/main/java/com/tangem/presentation/activity/VerifyCardActivity.kt +++ b/app/src/main/java/com/tangem/presentation/activity/VerifyCardActivity.kt @@ -19,13 +19,11 @@ class VerifyCardActivity : AppCompatActivity() { lateinit var navigator: Navigator companion object { - fun callingIntent(context: Context, card: TangemCard, coinData: CoinData, message: String, error: String): Intent { + fun callingIntent(context: Context, card: TangemCard, coinData: CoinData): Intent { val intent = Intent(context, VerifyCardActivity::class.java) intent.putExtra(TangemCard.EXTRA_UID, card.uid) intent.putExtra(TangemCard.EXTRA_CARD, card.asBundle) intent.putExtra(Constant.EXTRA_BLOCKCHAIN_DATA, coinData.asBundle()) - intent.putExtra(Constant.MESSAGE, message) - intent.putExtra(Constant.ERROR, error) return intent } } diff --git a/app/src/main/java/com/tangem/presentation/dialog/RootFoundDialog.kt b/app/src/main/java/com/tangem/presentation/dialog/RootFoundDialog.kt index b49551d716..f6aed9beb5 100644 --- a/app/src/main/java/com/tangem/presentation/dialog/RootFoundDialog.kt +++ b/app/src/main/java/com/tangem/presentation/dialog/RootFoundDialog.kt @@ -2,8 +2,8 @@ package com.tangem.presentation.dialog import android.app.AlertDialog import android.app.Dialog -import android.app.DialogFragment import android.os.Bundle +import android.support.v4.app.DialogFragment import com.tangem.wallet.R 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 7346f13445..3c315e1c07 100644 --- a/app/src/main/java/com/tangem/presentation/fragment/LoadedWallet.kt +++ b/app/src/main/java/com/tangem/presentation/fragment/LoadedWallet.kt @@ -19,6 +19,7 @@ import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import android.widget.Toast +import com.tangem.Constant import com.tangem.data.db.LocalStorage import com.tangem.data.db.PINStorage import com.tangem.data.network.ElectrumRequest @@ -53,15 +54,6 @@ import java.util.* class LoadedWallet : Fragment(), NfcAdapter.ReaderCallback, CardProtocol.Notifications, SharedPreferences.OnSharedPreferenceChangeListener { companion object { val TAG: String = LoadedWallet::class.java.simpleName - private const val REQUEST_CODE_SEND_PAYMENT = 1 - const val REQUEST_CODE_VERIFY_CARD = 4 - private const val REQUEST_CODE_PURGE = 2 - private const val REQUEST_CODE_REQUEST_PIN2_FOR_PURGE = 3 - private const val REQUEST_CODE_ENTER_NEW_PIN = 5 - private const val REQUEST_CODE_ENTER_NEW_PIN2 = 6 - private const val REQUEST_CODE_REQUEST_PIN2_FOR_SWAP_PIN = 7 - private const val REQUEST_CODE_SWAP_PIN = 8 - private const val REQUEST_CODE_RECEIVE_PAYMENT = 9 } private var nfcManager: NfcManager? = null @@ -93,7 +85,7 @@ class LoadedWallet : Fragment(), NfcAdapter.ReaderCallback, CardProtocol.Notific ctx = TangemContext.loadFromBundle(activity, activity?.intent?.extras) - lastTag = activity?.intent?.getParcelableExtra(MainActivity.EXTRA_LAST_DISCOVERED_TAG) + lastTag = activity?.intent?.getParcelableExtra(Constant.EXTRA_LAST_DISCOVERED_TAG) localStorage = activity?.let { LocalStorage(it) }!! } @@ -163,12 +155,12 @@ class LoadedWallet : Fragment(), NfcAdapter.ReaderCallback, CardProtocol.Notific getString(R.string.via_cryptonit) -> { val intent = Intent(activity, PrepareCryptonitWithdrawalActivity::class.java) ctx.saveToIntent(intent) - startActivityForResult(intent, REQUEST_CODE_RECEIVE_PAYMENT) + startActivityForResult(intent, Constant.REQUEST_CODE_RECEIVE_PAYMENT) } getString(R.string.via_kraken) -> { val intent = Intent(activity, PrepareKrakenWithdrawalActivity::class.java) ctx.saveToIntent(intent) - startActivityForResult(intent, REQUEST_CODE_RECEIVE_PAYMENT) + startActivityForResult(intent, Constant.REQUEST_CODE_RECEIVE_PAYMENT) } else -> { } @@ -192,7 +184,7 @@ class LoadedWallet : Fragment(), NfcAdapter.ReaderCallback, CardProtocol.Notific btnDetails.setOnClickListener { if (cardProtocol != null) // openVerifyCard(cardProtocol!!) - (activity as LoadedWalletActivity).navigator.showVerifyCard(context as Activity, ctx.card, ctx.coinData, ctx.message, ctx.error) + (activity as LoadedWalletActivity).navigator.showVerifyCard(context as Activity, ctx.card, ctx.coinData) else showSingleToast(R.string.need_attach_card_again) @@ -208,7 +200,7 @@ class LoadedWallet : Fragment(), NfcAdapter.ReaderCallback, CardProtocol.Notific else { val intent = Intent(activity, PreparePaymentActivity::class.java) ctx.saveToIntent(intent) - startActivityForResult(intent, REQUEST_CODE_SEND_PAYMENT) + startActivityForResult(intent, Constant.REQUEST_CODE_SEND_PAYMENT) } } else Toast.makeText(activity, getString(R.string.no_connection), Toast.LENGTH_SHORT).show() @@ -498,46 +490,46 @@ class LoadedWallet : Fragment(), NfcAdapter.ReaderCallback, CardProtocol.Notific var data = data super.onActivityResult(requestCode, resultCode, data) when (requestCode) { - REQUEST_CODE_VERIFY_CARD -> + Constant.REQUEST_CODE_VERIFY_CARD -> // action when erase wallet if (resultCode == Activity.RESULT_OK) { if (activity != null) activity?.finish() } - REQUEST_CODE_ENTER_NEW_PIN -> if (resultCode == Activity.RESULT_OK) { + Constant.REQUEST_CODE_ENTER_NEW_PIN -> if (resultCode == Activity.RESULT_OK) { if (data != null) { if (data.extras != null && data.extras!!.containsKey("confirmPIN")) { val intent = Intent(activity, PinRequestActivity::class.java) intent.putExtra("mode", PinRequestActivity.Mode.RequestPIN2.toString()) ctx.saveToIntent(intent) newPIN = data.getStringExtra("newPIN") - startActivityForResult(intent, REQUEST_CODE_REQUEST_PIN2_FOR_SWAP_PIN) + startActivityForResult(intent, Constant.REQUEST_CODE_REQUEST_PIN2_FOR_SWAP_PIN) } else { val intent = Intent(activity, PinRequestActivity::class.java) intent.putExtra("newPIN", data.getStringExtra("newPIN")) intent.putExtra("mode", PinRequestActivity.Mode.ConfirmNewPIN.toString()) - startActivityForResult(intent, REQUEST_CODE_ENTER_NEW_PIN) + startActivityForResult(intent, Constant.REQUEST_CODE_ENTER_NEW_PIN) } } } - REQUEST_CODE_ENTER_NEW_PIN2 -> if (resultCode == Activity.RESULT_OK) { + Constant.REQUEST_CODE_ENTER_NEW_PIN2 -> if (resultCode == Activity.RESULT_OK) { if (data != null) { if (data.extras != null && data.extras!!.containsKey("confirmPIN2")) { val intent = Intent(activity, PinRequestActivity::class.java) intent.putExtra("mode", PinRequestActivity.Mode.RequestPIN2.toString()) ctx.saveToIntent(intent) newPIN2 = data.getStringExtra("newPIN2") - startActivityForResult(intent, REQUEST_CODE_REQUEST_PIN2_FOR_SWAP_PIN) + startActivityForResult(intent, Constant.REQUEST_CODE_REQUEST_PIN2_FOR_SWAP_PIN) } else { val intent = Intent(activity, PinRequestActivity::class.java) intent.putExtra("newPIN2", data.getStringExtra("newPIN2")) intent.putExtra("mode", PinRequestActivity.Mode.ConfirmNewPIN2.toString()) - startActivityForResult(intent, REQUEST_CODE_ENTER_NEW_PIN2) + startActivityForResult(intent, Constant.REQUEST_CODE_ENTER_NEW_PIN2) } } } - REQUEST_CODE_REQUEST_PIN2_FOR_SWAP_PIN -> if (resultCode == Activity.RESULT_OK) { + Constant.REQUEST_CODE_REQUEST_PIN2_FOR_SWAP_PIN -> if (resultCode == Activity.RESULT_OK) { if (newPIN == "") newPIN = ctx.card!!.pin @@ -555,13 +547,13 @@ class LoadedWallet : Fragment(), NfcAdapter.ReaderCallback, CardProtocol.Notific pinSwapWarningDialog.show(activity?.supportFragmentManager, PINSwapWarningDialog.TAG) } - REQUEST_CODE_SWAP_PIN -> if (resultCode == Activity.RESULT_OK) { + Constant.REQUEST_CODE_SWAP_PIN -> if (resultCode == Activity.RESULT_OK) { if (data == null) { data = Intent() ctx.saveToIntent(data) - data.putExtra("modification", "delete") + data.putExtra(Constant.EXTRA_MODIFICATION, "delete") } else - data.putExtra("modification", "update") + data.putExtra(Constant.EXTRA_MODIFICATION, "update") activity?.setResult(Activity.RESULT_OK, data) activity?.finish() @@ -577,7 +569,7 @@ class LoadedWallet : Fragment(), NfcAdapter.ReaderCallback, CardProtocol.Notific val intent = Intent(activity, PinRequestActivity::class.java) intent.putExtra("mode", PinRequestActivity.Mode.RequestPIN2.toString()) ctx.saveToIntent(intent) - startActivityForResult(intent, REQUEST_CODE_REQUEST_PIN2_FOR_SWAP_PIN) + startActivityForResult(intent, Constant.REQUEST_CODE_REQUEST_PIN2_FOR_SWAP_PIN) return } else { if (data != null && data.extras!!.containsKey("message")) { @@ -585,18 +577,18 @@ class LoadedWallet : Fragment(), NfcAdapter.ReaderCallback, CardProtocol.Notific } } } - REQUEST_CODE_REQUEST_PIN2_FOR_PURGE -> if (resultCode == Activity.RESULT_OK) { + Constant.REQUEST_CODE_REQUEST_PIN2_FOR_PURGE -> if (resultCode == Activity.RESULT_OK) { val intent = Intent(activity, PurgeActivity::class.java) ctx.saveToIntent(intent) - startActivityForResult(intent, REQUEST_CODE_PURGE) + startActivityForResult(intent, Constant.REQUEST_CODE_PURGE) } - REQUEST_CODE_PURGE -> if (resultCode == Activity.RESULT_OK) { + Constant.REQUEST_CODE_PURGE -> if (resultCode == Activity.RESULT_OK) { if (data == null) { data = Intent() ctx.saveToIntent(data) - data.putExtra("modification", "delete") + data.putExtra(Constant.EXTRA_MODIFICATION, "delete") } else { - data.putExtra("modification", "update") + data.putExtra(Constant.EXTRA_MODIFICATION, "update") } activity?.setResult(Activity.RESULT_OK, data) @@ -613,7 +605,7 @@ class LoadedWallet : Fragment(), NfcAdapter.ReaderCallback, CardProtocol.Notific val intent = Intent(activity, PinRequestActivity::class.java) intent.putExtra("mode", PinRequestActivity.Mode.RequestPIN2.toString()) ctx.saveToIntent(intent) - startActivityForResult(intent, REQUEST_CODE_REQUEST_PIN2_FOR_PURGE) + startActivityForResult(intent, Constant.REQUEST_CODE_REQUEST_PIN2_FOR_PURGE) return } else { if (data != null && data.extras!!.containsKey("message")) { @@ -622,7 +614,7 @@ class LoadedWallet : Fragment(), NfcAdapter.ReaderCallback, CardProtocol.Notific } updateViews() } - REQUEST_CODE_SEND_PAYMENT, REQUEST_CODE_RECEIVE_PAYMENT -> { + Constant.REQUEST_CODE_SEND_PAYMENT, Constant.REQUEST_CODE_RECEIVE_PAYMENT -> { if (resultCode == Activity.RESULT_OK) { ctx.coinData?.clearInfo() srl?.postDelayed({ this.refresh() }, 5000) @@ -955,7 +947,7 @@ class LoadedWallet : Fragment(), NfcAdapter.ReaderCallback, CardProtocol.Notific ctx.saveToIntent(intent) intent.putExtra("newPIN", newPIN) intent.putExtra("newPIN2", newPIN2) - startActivityForResult(intent, REQUEST_CODE_SWAP_PIN) + startActivityForResult(intent, Constant.REQUEST_CODE_SWAP_PIN) } private var showTime: Date = Date() diff --git a/app/src/main/java/com/tangem/presentation/fragment/VerifyCard.kt b/app/src/main/java/com/tangem/presentation/fragment/VerifyCard.kt index 618aaee44c..e9c1f257b1 100644 --- a/app/src/main/java/com/tangem/presentation/fragment/VerifyCard.kt +++ b/app/src/main/java/com/tangem/presentation/fragment/VerifyCard.kt @@ -13,6 +13,7 @@ import android.view.View import android.view.ViewGroup import android.widget.PopupMenu import android.widget.Toast +import com.tangem.Constant import com.tangem.data.db.PINStorage import com.tangem.domain.cardReader.NfcManager import com.tangem.domain.wallet.* @@ -72,7 +73,7 @@ class VerifyCard : Fragment(), NfcAdapter.ReaderCallback { fabMenu.setOnClickListener { showMenu(fabMenu) } btnOk.setOnClickListener { val data = prepareResultIntent() - data.putExtra("modification", "update") + data.putExtra(Constant.EXTRA_MODIFICATION, "update") activity?.finish() } } diff --git a/tangemcard/build.gradle b/tangemcard/build.gradle index e5d36fc391..049f9d32bd 100644 --- a/tangemcard/build.gradle +++ b/tangemcard/build.gradle @@ -4,16 +4,12 @@ apply plugin: 'kotlin-android' android { compileSdkVersion 28 - - defaultConfig { minSdkVersion 16 targetSdkVersion 28 versionCode 1 versionName "1.0" - testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" - } buildTypes { @@ -22,18 +18,17 @@ android { proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } } - } dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) - implementation 'com.android.support:appcompat-v7:28.0.0' testImplementation 'junit:junit:4.12' androidTestImplementation 'com.android.support.test:runner:1.0.2' androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2' implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" } + repositories { mavenCentral() -} +} \ No newline at end of file