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-29 17:39:16 +03:00
parent 984a294104
commit ec39d1a437
4 changed files with 2 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -6,10 +6,8 @@ import android.nfc.NfcAdapter;
import android.nfc.Tag;
import android.os.Bundle;
import android.support.v7.app.AppCompatActivity;
import android.widget.Toast;
import com.tangem.presentation.fragment.LoadedWallet;
import com.tangem.wallet.BuildConfig;
import com.tangem.wallet.R;
import java.util.Objects;
@ -27,8 +25,6 @@ public class LoadedWalletActivity extends AppCompatActivity {
if (tag != null) {
LoadedWallet fragment = (LoadedWallet) (getSupportFragmentManager().findFragmentById(R.id.loaded_wallet_fragment));
fragment.onTagDiscovered(tag);
if (BuildConfig.DEBUG)
Toast.makeText(this, "onNFCReaderCallback 4", Toast.LENGTH_SHORT).show();
}
}
}

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

@ -20,7 +20,6 @@ import android.view.animation.Transformation;
import android.widget.LinearLayout;
import android.widget.RelativeLayout;
import android.widget.TextView;
import android.widget.Toast;
import com.scottyab.rootbeer.RootBeer;
import com.skyfishjy.library.RippleBackground;
@ -66,8 +65,6 @@ public class MainActivity extends AppCompatActivity implements PopupMenu.OnMenuI
Tag tag = intent.getParcelableExtra(NfcAdapter.EXTRA_TAG);
if (tag != null && onNFCReaderCallback != null) {
onNFCReaderCallback.onTagDiscovered(tag);
if (BuildConfig.DEBUG)
Toast.makeText(this, "onNFCReaderCallback 1", Toast.LENGTH_SHORT).show();
}
}
}
@ -133,8 +130,6 @@ public class MainActivity extends AppCompatActivity implements PopupMenu.OnMenuI
Tag tag = intent.getParcelableExtra(NfcAdapter.EXTRA_TAG);
if (tag != null && onNFCReaderCallback != null) {
onNFCReaderCallback.onTagDiscovered(tag);
if (BuildConfig.DEBUG)
Toast.makeText(this, "onNFCReaderCallback 2", Toast.LENGTH_SHORT).show();
}
}

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

@ -910,7 +910,7 @@ public class LoadedWallet extends Fragment implements SwipeRefreshLayout.OnRefre
UpdateWalletInfoTask updateWalletInfoTask = new UpdateWalletInfoTask(nodeAddress, nodePort, data);
updateTasks.add(updateWalletInfoTask);
updateWalletInfoTask.execute(ElectrumRequest.ListUnspent(mCard.getWallet())
// ElectrumRequest.ListHistory(mCard.getWallet())
,ElectrumRequest.ListHistory(mCard.getWallet())
);
RateInfoTask taskRate = new RateInfoTask();
@ -933,7 +933,7 @@ public class LoadedWallet extends Fragment implements SwipeRefreshLayout.OnRefre
updateTasks.add(updateWalletInfoTask);
updateWalletInfoTask.execute(ElectrumRequest.ListUnspent(mCard.getWallet())
// ElectrumRequest.ListHistory(mCard.getWallet())
,ElectrumRequest.ListHistory(mCard.getWallet())
);
RateInfoTask taskRate = new RateInfoTask();

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

@ -46,7 +46,6 @@ import com.tangem.presentation.adapter.CardListAdapter;
import com.tangem.presentation.dialog.NoExtendedLengthSupportDialog;
import com.tangem.presentation.dialog.WaitSecurityDelayDialog;
import com.tangem.util.Util;
import com.tangem.wallet.BuildConfig;
import com.tangem.wallet.R;
import org.json.JSONArray;
@ -507,8 +506,6 @@ public class Main extends Fragment implements NfcAdapter.ReaderCallback, CardLis
}
} else if (resultCode == Activity.RESULT_OK && requestCode == REQUEST_CODE_ENTER_PIN_ACTIVITY) {
if (lastTag != null) onTagDiscovered(lastTag);
if (BuildConfig.DEBUG)
Toast.makeText(getContext(), "onNFCReaderCallback 3", Toast.LENGTH_SHORT).show();
}
}