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-07-20 12:26:04 +03:00
parent d6e56d69d5
commit 7130b72624
6 changed files with 155 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

29
app/src/main/java/com/tangem/presentation/activity/VerifyCardActivity.java
View file

@ -1,29 +0,0 @@
package com.tangem.presentation.activity;
import android.content.Intent;
import android.os.Bundle;
import android.support.v7.app.AppCompatActivity;
import com.tangem.presentation.fragment.VerifyCard;
import com.tangem.wallet.R;
public class VerifyCardActivity extends AppCompatActivity {
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_verify_card);
MainActivity.commonInit(getApplicationContext());
}
@Override
public void onBackPressed() {
super.onBackPressed();
VerifyCard verifyCard = (VerifyCard) getSupportFragmentManager().findFragmentById(R.id.verify_card_fragment);
Intent data = verifyCard.prepareResultIntent();
data.putExtra("modification", "update");
finish();
}
}

25
app/src/main/java/com/tangem/presentation/activity/VerifyCardActivity.kt Normal file
View file

@ -0,0 +1,25 @@
package com.tangem.presentation.activity
import android.os.Bundle
import android.support.v7.app.AppCompatActivity
import com.tangem.presentation.fragment.VerifyCard
import com.tangem.wallet.R
class VerifyCardActivity : AppCompatActivity() {
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
setContentView(R.layout.activity_verify_card)
MainActivity.commonInit(applicationContext)
}
override fun onBackPressed() {
super.onBackPressed()
val verifyCard = supportFragmentManager.findFragmentById(R.id.verify_card_fragment) as VerifyCard
val data = verifyCard.prepareResultIntent()
data.putExtra("modification", "update")
finish()
}
}

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

@ -104,7 +104,7 @@ class LoadedWallet : Fragment(), NfcAdapter.ReaderCallback, CardProtocol.Notific
val params = HashMap<String, String>()
params["CID"] = Util.bytesToHex(mCard!!.cid)
params["publicKey"] = Util.bytesToHex(mCard!!.cardPublicKey)
VolleyHelper().doRequest(context!!, URL_CARD_VALIDATE, params)
VolleyHelper().doRequestString(context!!, URL_CARD_VALIDATE, params)
}
override fun onCreate(savedInstanceState: Bundle?) {
@ -112,11 +112,9 @@ class LoadedWallet : Fragment(), NfcAdapter.ReaderCallback, CardProtocol.Notific
mNfcManager = NfcManager(activity, this)
mCard = TangemCard(activity!!.intent.getStringExtra(TangemCard.EXTRA_CARD))
mCard!!.LoadFromBundle(activity!!.intent.extras!!.getBundle(TangemCard.EXTRA_CARD))
mCard!!.LoadFromBundle(activity!!.intent.extras.getBundle(TangemCard.EXTRA_CARD))
lastTag = activity!!.intent.getParcelableExtra(Main.EXTRA_LAST_DISCOVERED_TAG)
// requestCardValidate();
}
override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
@ -186,7 +184,7 @@ class LoadedWallet : Fragment(), NfcAdapter.ReaderCallback, CardProtocol.Notific
intent.addCategory(Intent.CATEGORY_DEFAULT)
startActivity(intent)
} catch (e: ActivityNotFoundException) {
e.printStackTrace()
Toast.makeText(context, R.string.no_compatible_wallet, Toast.LENGTH_LONG).show()
}
}