Skip to content

NFC backup. can store wallet address, spend key ,view key, seed, block height in NFC(Authenticated by the NFC default key now) #282

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 20 commits into
base: master
Choose a base branch
from
Open

NFC backup. can store wallet address, spend key ,view key, seed, block height in NFC(Authenticated by the NFC default key now) #282

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
a8c9dbd
Merge pull request #1 from m2049r/master
jianjunchu Mar 7, 2018
c115109
add nfc backup ui
longyli Apr 19, 2018
6ce4b42
Merge pull request #2 from longyli/master
jianjunchu Apr 20, 2018
6be8bbd
a
jianjunchu Apr 20, 2018
48efe12
Merge branch 'master' of https://github.com/m2049r/xmrwallet into m20…
jianjunchu Apr 20, 2018
a003d25
Merge branch 'm2049r-master'
jianjunchu Apr 22, 2018
2e31f11
merge
jianjunchu Apr 22, 2018
49acbb1
delete
jianjunchu May 2, 2018
1e35b9a
update
jianjunchu May 2, 2018
e2a33bf
update
jianjunchu May 2, 2018
4b846dc
add nfc support
jianjunchu May 8, 2018
086ae99
nfc support
jianjunchu May 8, 2018
0705d56
Merge pull request #1 from jianjunchu/master
longyli May 9, 2018
85d35d5
Add Input NFC Password
longyli May 11, 2018
70e80c8
Merge pull request #5 from longyli/master
jianjunchu May 11, 2018
5362504
now can write view/spend key and seed to NFC with NFC default key
jianjunchu May 13, 2018
503082d
delete some useless files
jianjunchu May 13, 2018
8e38fa0
1.remove Jacksum 2.code clean 3.add hint for nfc backup
jianjunchu May 17, 2018
e9ea326
modify writeNewKey method
jianjunchu Mar 10, 2019
e50be08
modify writeNewKey method
jianjunchu Mar 10, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 0 additions & 12 deletions .idea/runConfigurations.xml
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ dependencies {
implementation "com.jakewharton.timber:timber:$rootProject.ext.timberVersion"

implementation 'com.nulab-inc:zxcvbn:1.2.3'

//compile files('lib/sunjce_provider.jar')
testImplementation "junit:junit:$rootProject.ext.junitVersion"
testImplementation "org.mockito:mockito-all:$rootProject.ext.mockitoVersion"
testImplementation "com.squareup.okhttp3:mockwebserver:$rootProject.ext.okHttpVersion"
Expand Down
Binary file added app/lib/sunjce_provider.jar
View file
Open in desktop
Binary file not shown.
2 changes: 2 additions & 0 deletions app/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
<uses-permission android:name="android.permission.WAKE_LOCK" />
<uses-permission android:name="android.permission.CAMERA" />
<uses-permission android:name="android.permission.USE_FINGERPRINT" />
<uses-permission android:name="android.permission.NFC" />

<application
android:allowBackup="true"
Expand All @@ -26,6 +27,7 @@

<activity
android:name=".LoginActivity"
android:launchMode="singleTop"
android:configChanges="orientation|keyboardHidden"
android:label="@string/app_name"
android:screenOrientation="portrait">
Expand Down
35 changes: 35 additions & 0 deletions app/src/main/java/com/m2049r/xmrwallet/GenerateFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
import android.app.AlertDialog;
import android.content.Context;
import android.content.DialogInterface;
import android.graphics.drawable.AnimationDrawable;
import android.os.Bundle;
import android.support.annotation.Nullable;
import android.support.design.widget.TextInputLayout;
Expand All @@ -35,6 +36,7 @@
import android.view.ViewGroup;
import android.view.inputmethod.EditorInfo;
import android.widget.Button;
import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.Switch;
import android.widget.TextView;
Expand Down Expand Up @@ -71,6 +73,15 @@ public class GenerateFragment extends Fragment {
private TextInputLayout etWalletViewKey;
private TextInputLayout etWalletSpendKey;
private TextInputLayout etWalletRestoreHeight;

private LinearLayout llNfcPasswordSeed;
private TextInputLayout etNfcPasswordSeed;
private ImageView ivNfcPasswordSeed;

private LinearLayout llNfcPasswordkey;
private TextInputLayout etNfcPasswordkey;
private ImageView ivNfcPasswordkey;

private Button bGenerate;

private String type = null;
Expand All @@ -92,8 +103,26 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
etWalletViewKey = (TextInputLayout) view.findViewById(R.id.etWalletViewKey);
etWalletSpendKey = (TextInputLayout) view.findViewById(R.id.etWalletSpendKey);
etWalletRestoreHeight = (TextInputLayout) view.findViewById(R.id.etWalletRestoreHeight);

llNfcPasswordSeed = (LinearLayout) view.findViewById(R.id.llNfcPasswordSeed);
etNfcPasswordSeed = (TextInputLayout) view.findViewById(R.id.etNfcPasswordSeed);
ivNfcPasswordSeed = (ImageView) view.findViewById(R.id.ivNfcPasswordSeed);
llNfcPasswordkey = (LinearLayout) view.findViewById(R.id.llNfcPasswordkey);
etNfcPasswordkey = (TextInputLayout) view.findViewById(R.id.etNfcPasswordkey);
ivNfcPasswordkey = (ImageView) view.findViewById(R.id.ivNfcPasswordkey);

bGenerate = (Button) view.findViewById(R.id.bGenerate);

ivNfcPasswordkey.setImageResource(R.drawable.nfc_signal);
ivNfcPasswordSeed.setImageResource(R.drawable.nfc_signal);
AnimationDrawable nfcAnimationkey = (AnimationDrawable) ivNfcPasswordkey.getDrawable();
nfcAnimationkey.setOneShot(false);
nfcAnimationkey.start();

AnimationDrawable nfcAnimationSeed = (AnimationDrawable) ivNfcPasswordSeed.getDrawable();
nfcAnimationSeed.setOneShot(false);
nfcAnimationSeed.start();

etWalletMnemonic.getEditText().setRawInputType(InputType.TYPE_CLASS_TEXT);
etWalletAddress.getEditText().setRawInputType(InputType.TYPE_TEXT_FLAG_NO_SUGGESTIONS);
etWalletViewKey.getEditText().setRawInputType(InputType.TYPE_TEXT_FLAG_NO_SUGGESTIONS);
Expand Down Expand Up @@ -212,6 +241,8 @@ public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
return false;
}
});
llNfcPasswordSeed.setVisibility(View.VISIBLE);

} else if (type.equals(TYPE_KEY) || type.equals(TYPE_VIEWONLY)) {
etWalletPassword.getEditText().setOnEditorActionListener(new TextView.OnEditorActionListener() {
public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
Expand Down Expand Up @@ -252,6 +283,8 @@ public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
return false;
}
});

llNfcPasswordkey.setVisibility(View.VISIBLE);
}
if (type.equals(TYPE_KEY)) {
etWalletSpendKey.setVisibility(View.VISIBLE);
Expand All @@ -268,6 +301,7 @@ public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
return false;
}
});
llNfcPasswordkey.setVisibility(View.VISIBLE);
}
if (!type.equals(TYPE_NEW)) {
etWalletRestoreHeight.setVisibility(View.VISIBLE);
Expand All @@ -281,6 +315,7 @@ public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
return false;
}
});

}
bGenerate.setOnClickListener(new View.OnClickListener()

Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/com/m2049r/xmrwallet/GenerateReviewFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -562,4 +562,4 @@ public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
return openDialog;
}

}
}
Loading