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-04 16:26:44 +03:00
parent c19268210d
commit 7e618664bf
7 changed files with 14 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

BIN
.idea/caches/build_file_checksums.ser generated
View file

Binary file not shown.

4
app/src/main/java/com/tangem/presentation/activity/ConfirmPaymentActivity.java
View file

@ -594,10 +594,6 @@ public class ConfirmPaymentActivity extends AppCompatActivity implements NfcAdap
intent.putExtra("Card", mCard.getAsBundle());
intent.putExtra("Wallet", etWallet.getText().toString());
intent.putExtra(SignPaymentActivity.EXTRA_AMOUNT, etAmount.getText().toString());
// if (BuildConfig.DEBUG)
// Toast.makeText(this, etAmount.getText().toString(), Toast.LENGTH_LONG).show();
intent.putExtra("Fee", etFee.getText().toString());
startActivityForResult(intent, REQUEST_CODE_SIGN_PAYMENT);
} else {

5
app/src/main/java/com/tangem/presentation/activity/PreparePaymentActivity.java
View file

@ -16,7 +16,6 @@ import android.widget.Button;
import android.widget.EditText;
import android.widget.ImageView;
import android.widget.TextView;
import android.widget.Toast;
import com.tangem.domain.cardReader.NfcManager;
import com.tangem.domain.wallet.Blockchain;
@ -24,7 +23,6 @@ import com.tangem.domain.wallet.CoinEngine;
import com.tangem.domain.wallet.CoinEngineFactory;
import com.tangem.domain.wallet.TangemCard;
import com.tangem.util.FormatUtil;
import com.tangem.wallet.BuildConfig;
import com.tangem.wallet.R;
import java.io.IOException;
@ -141,9 +139,6 @@ public class PreparePaymentActivity extends AppCompatActivity implements NfcAdap
String strAmount;
strAmount = etAmount.getText().toString().replace(",", ".");
if (BuildConfig.DEBUG)
Toast.makeText(this, strAmount, Toast.LENGTH_LONG).show();
CoinEngine engine1 = CoinEngineFactory.Create(mCard.getBlockchain());
Log.i(TAG, mCard.getBlockchain().getOfficialName());

2
app/src/main/java/com/tangem/presentation/activity/SignPaymentActivity.java
View file

File diff suppressed because one or more lines are too long

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

@ -561,7 +561,6 @@ public class LoadedWallet extends Fragment implements SwipeRefreshLayout.OnRefre
}
}
@Override
public void onCreate(@Nullable Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
@ -702,6 +701,8 @@ public class LoadedWallet extends Fragment implements SwipeRefreshLayout.OnRefre
startActivityForResult(intent, REQUEST_CODE_SEND_PAYMENT);
});
tvWallet.setText(mCard.getWallet());
return v;
}

7
app/src/main/java/com/tangem/presentation/fragment/VerifyCard.java
View file

@ -66,7 +66,6 @@ public class VerifyCard extends Fragment implements NfcAdapter.ReaderCallback {
private SwipeRefreshLayout mSwipeRefreshLayout;
private Tag lastTag;
public VerifyCard() {
}
@ -78,9 +77,6 @@ public class VerifyCard extends Fragment implements NfcAdapter.ReaderCallback {
mCard = new TangemCard(Objects.requireNonNull(getActivity()).getIntent().getStringExtra("UID"));
mCard.LoadFromBundle(Objects.requireNonNull(getActivity().getIntent().getExtras()).getBundle("Card"));
// LoadedWallet.needOpenVerify = true;
}
@Override
@ -384,7 +380,8 @@ public class VerifyCard extends Fragment implements NfcAdapter.ReaderCallback {
//tvBlockchain.setText(mCard.getBlockchain().getOfficialName());
tvBlockchain.setText(mCard.getBlockchainName());
ivBlockchain.setImageResource(mCard.getBlockchain().getImageResource(this.getContext(), mCard.getTokenSymbol()));
ivBlockchain.setImageResource(mCard.getBlockchain().getImageResource(getContext(), mCard.getTokenSymbol()));
if (mCard.isReusable())
tvReusable.setText(R.string.reusable);

17
app/src/main/res/layout/fr_loaded_wallet.xml
View file

@ -37,7 +37,6 @@
android:orientation="vertical">
<TextView
android:visibility="gone"
android:id="@+id/tvCaution"
android:layout_width="match_parent"
android:layout_height="20dp"
@ -47,7 +46,8 @@
android:text="@string/do_not_accept"
android:textAlignment="center"
android:textColor="@color/white"
android:textSize="@dimen/text_size_1_small"/>
android:textSize="@dimen/text_size_1_small"
android:visibility="gone"/>
<ImageView
android:id="@+id/ivTangemCard"
@ -71,16 +71,17 @@
android:text="Verified balance"
android:textColor="@color/black"
android:textSize="@dimen/text_size_large"
tools:text="Verified balance" />
tools:text="Verified balance"/>
<TextView
android:id="@+id/tvBalance"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:fontFamily="@font/montserrat_light"
android:text="@string/no_data_string"
android:textColor="@color/black"
android:textSize="@dimen/text_size_large"
tools:text="0.05 BTC (Bitcoin)" />
tools:text="0.05 BTC (Bitcoin)"/>
<TextView
android:id="@+id/tvBalanceLine2"
@ -88,7 +89,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:fontFamily="@font/montserrat_light"
android:text="100% safe. Confirmed balance and banknote identity" />
android:text="100% safe. Confirmed balance and banknote identity"/>
</LinearLayout>
@ -411,7 +412,7 @@
android:text="@string/message"
android:textAlignment="center"
android:textColor="@color/black"
android:textStyle="normal|bold" />
android:textStyle="normal|bold"/>
<TextView
android:id="@+id/tvError"
@ -460,18 +461,18 @@
<android.support.design.widget.FloatingActionButton
android:id="@+id/fabNFC"
android:layout_margin="10dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="10dp"
android:layout_marginStart="5dp"
app:fabSize="mini"
app:srcCompat="@drawable/ic_nfc_white_24dp"/>
<android.support.v7.widget.AppCompatButton
android:id="@+id/btnExtract"
android:layout_margin="10dp"
style="@style/AppTheme.RoundedCornerMaterialButton"
android:layout_width="wrap_content"
android:layout_margin="10dp"
android:width="100dp"
android:text="@string/extract"/>