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-06-26 19:51:40 +03:00
parent f773ca2b80
commit cecb958d13
4 changed files with 20 additions and 36 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.

2
app/build.gradle
View file

@ -15,7 +15,7 @@ android {
applicationId "com.tangem.wallet"
minSdkVersion 21
targetSdkVersion 27
versionCode 27
versionCode 28
versionName "0.85.5." + generateVersionName()
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
}

5
app/src/main/java/com/tangem/domain/cardReader/NfcManager.java
View file

@ -34,12 +34,7 @@ public class NfcManager {
private boolean broadcomWorkaround = false;
private static final int DELAY_PRESENCE = 1500;
// @Inject
// public NfcManager() {
//
// }
// @Inject
public NfcManager(Activity activity, NfcAdapter.ReaderCallback readerCallback) {
mActivity = activity;
mReaderCallback = readerCallback;

49
app/src/main/java/com/tangem/presentation/activity/MainActivity.java
View file

@ -10,7 +10,6 @@ import android.support.design.widget.FloatingActionButton;
import android.support.v7.app.AppCompatActivity;
import android.support.v7.widget.PopupMenu;
import android.util.Log;
import android.view.KeyEvent;
import android.view.Menu;
import android.view.MenuInflater;
import android.view.MenuItem;
@ -45,7 +44,6 @@ public class MainActivity extends AppCompatActivity implements PopupMenu.OnMenuI
private File zipFile = null;
private NfcAdapter.ReaderCallback onNFCReaderCallback;
private OnCardsClean onCardsClean;
private FloatingActionButton fab;
private LinearLayout llTapPrompt;
public interface OnCardsClean {
@ -57,7 +55,18 @@ public class MainActivity extends AppCompatActivity implements PopupMenu.OnMenuI
}
public void setNfcAdapterReaderCallback(NfcAdapter.ReaderCallback callback) {
this.onNFCReaderCallback = callback;
onNFCReaderCallback = callback;
}
@Override
protected void onNewIntent(Intent intent) {
super.onNewIntent(intent);
if (intent != null && (NfcAdapter.ACTION_TECH_DISCOVERED.equals(intent.getAction()) || NfcAdapter.ACTION_NDEF_DISCOVERED.equals(intent.getAction()))) {
Tag tag = intent.getParcelableExtra(NfcAdapter.EXTRA_TAG);
if (tag != null && onNFCReaderCallback != null) {
onNFCReaderCallback.onTagDiscovered(tag);
}
}
}
@Override
@ -70,7 +79,7 @@ public class MainActivity extends AppCompatActivity implements PopupMenu.OnMenuI
LinearLayout hand = findViewById(R.id.llHand);
LinearLayout nfc = findViewById(R.id.llNFC);
RippleBackground rippleBackground = findViewById(R.id.imNFC);
fab = findViewById(R.id.fab);
FloatingActionButton fab = findViewById(R.id.fab);
setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_NOSENSOR);
@ -78,8 +87,10 @@ public class MainActivity extends AppCompatActivity implements PopupMenu.OnMenuI
rippleBackground.startRippleAnimation();
// tvNFCHint.setText("Scan a banknote with your\n" + PhoneUtility.GetPhoneName() + "\nas shown above");
tvNFCHint.setText(R.string.scan_banknote);
if (BuildConfig.DEBUG)
tvNFCHint.setText("Scan a banknote with your\n" + PhoneUtility.GetPhoneName() + "\nas shown above");
else
tvNFCHint.setText(R.string.scan_banknote);
DeviceNFCAntennaLocation antenna = new DeviceNFCAntennaLocation();
antenna.getAntennaLocation();
@ -122,9 +133,9 @@ public class MainActivity extends AppCompatActivity implements PopupMenu.OnMenuI
}
}
// check if device root
// check if root device
RootBeer rootBeer = new RootBeer(this);
if (rootBeer.isRootedWithoutBusyBoxCheck())
if (rootBeer.isRootedWithoutBusyBoxCheck() && !BuildConfig.DEBUG)
new RootFoundDialog().show(getFragmentManager(), RootFoundDialog.TAG);
}
@ -139,28 +150,6 @@ public class MainActivity extends AppCompatActivity implements PopupMenu.OnMenuI
super.onActivityResult(requestCode, resultCode, data);
}
@Override
protected void onNewIntent(Intent intent) {
super.onNewIntent(intent);
if (intent != null && (NfcAdapter.ACTION_TECH_DISCOVERED.equals(intent.getAction()) || NfcAdapter.ACTION_NDEF_DISCOVERED.equals(intent.getAction()))) {
Tag tag = intent.getParcelableExtra(NfcAdapter.EXTRA_TAG);
if (tag != null && onNFCReaderCallback != null) {
onNFCReaderCallback.onTagDiscovered(tag);
}
}
}
@Override
public boolean onKeyDown(int keycode, KeyEvent e) {
switch (keycode) {
case KeyEvent.KEYCODE_MENU:
fab.requestFocus();
showMenu(fab);
return true;
}
return super.onKeyDown(keycode, e);
}
@Override
public boolean onMenuItemClick(MenuItem item) {
return onOptionsItemSelected(item);