移除一些恢复密钥的方法

This commit is contained in:
zhl 2023-05-17 11:28:05 +08:00
parent 60b2ca5405
commit 8007015164
4 changed files with 46 additions and 69 deletions

View File

@ -60,17 +60,6 @@ function initThirdPartyWallet(funId, chain) {
return jc.wallet.currentAccount(); return jc.wallet.currentAccount();
}); });
} }
/**
* current account for internal wallet
*/
function currentAccount(funId) {
try {
let data = jc.wallet.currentAccountData;
return JSON.stringify({ errcode: 0, data });
} catch (err) {
return JSON.stringify({ errcode: 1, errmsg: err.message || err });
}
}
/** /**
* all chain list we supported * all chain list we supported

View File

@ -434,13 +434,6 @@ public class MainActivity extends UnityPlayerActivity
checkCameraPermissions(); checkCameraPermissions();
} }
public void loadRestoreKey(String fundId, String oid) {
this.funId = fundId;
this.oid = oid;
Log.i(TAG, "loadRestoreKey: " + oid);
checkImagePermissions();
}
/** /**
* start image scan * start image scan
*/ */
@ -904,6 +897,7 @@ public class MainActivity extends UnityPlayerActivity
// openFileSelector(); // openFileSelector();
}); });
} }
public void shareToTikTok(String funId, Uri uriToImage) { public void shareToTikTok(String funId, Uri uriToImage) {
this.funId = funId; this.funId = funId;
grantUriPermission("com.zhiliaoapp.musically", grantUriPermission("com.zhiliaoapp.musically",

View File

@ -30,10 +30,8 @@ public class QRCodeActivity extends Dialog implements EasyPermissions.Permission
private String oid; private String oid;
private Bitmap bitmap; private Bitmap bitmap;
private Button localBtn; private Button localBtn;
private boolean imgSaved = false;
public static final int RC_SAVE_QR = 0X111; public static final int RC_SAVE_QR = 0X111;
public QRCodeActivity(Context context) { public QRCodeActivity(Context context) {
super(context, R.style.DialogStyle); super(context, R.style.DialogStyle);
baseContent = context; baseContent = context;
@ -65,22 +63,10 @@ public class QRCodeActivity extends Dialog implements EasyPermissions.Permission
titleLabel.setText(title); titleLabel.setText(title);
ivCode.setImageBitmap(bitmap); ivCode.setImageBitmap(bitmap);
}); });
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
String uri = FileUtils.saveBitmap(baseContent, oid, bitmap);
MainActivity.app.runOnUiThread(()->{
if (uri != null && !"".equals(uri)) {
MainActivity.app.showToast("Wallet restore key had save to System Album");
titleLabel.setText("Wallet Restore Key");
localBtn.setText("Close");
imgSaved = true;
} else {
MainActivity.app.showToast("Wallet restore key save fail");
}
});
}
}).start(); }).start();
} }
public void saveAndClose() { public void saveAndClose() {
new Thread(() -> { new Thread(() -> {
String uri = FileUtils.saveBitmap(baseContent, oid, bitmap); String uri = FileUtils.saveBitmap(baseContent, oid, bitmap);
@ -94,11 +80,8 @@ public class QRCodeActivity extends Dialog implements EasyPermissions.Permission
}); });
}).start(); }).start();
} }
protected void onClickSaveImg() { protected void onClickSaveImg() {
if (imgSaved) {
dismiss();
return;
}
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
saveAndClose(); saveAndClose();
} else { } else {
@ -128,7 +111,8 @@ public class QRCodeActivity extends Dialog implements EasyPermissions.Permission
saveAndClose(); saveAndClose();
} else { } else {
// Do not have permissions, request them now // Do not have permissions, request them now
EasyPermissions.requestPermissions(MainActivity.app, "We need Write WRITE_EXTERNAL_STORAGE for backup Wallet Restore Key", EasyPermissions.requestPermissions(MainActivity.app,
"We need Write WRITE_EXTERNAL_STORAGE for save QRCode to System Album",
RC_SAVE_QR, perms); RC_SAVE_QR, perms);
} }
} }

View File

@ -14,6 +14,7 @@ import org.json.JSONObject;
public class JcSDK { public class JcSDK {
private static final String TAG = JcSDK.class.getSimpleName(); private static final String TAG = JcSDK.class.getSimpleName();
private static UnityCallback commonCB; private static UnityCallback commonCB;
private static native int runJS(final String funId, final String methodName, final String params); private static native int runJS(final String funId, final String methodName, final String params);
public static void initCommonCB(UnityCallback callBack) { public static void initCommonCB(UnityCallback callBack) {
@ -34,6 +35,7 @@ public class JcSDK {
/** /**
* 回调至c# * 回调至c#
*
* @param funId * @param funId
* @param msg * @param msg
*/ */
@ -47,8 +49,10 @@ public class JcSDK {
/** /**
* check if metamask installed and jump to metamask * check if metamask installed and jump to metamask
*
* @param url * @param url
* sample: "https://metamask.app.link/wc?uri="+ExampleApplication.config.toWCUri(); * sample:
* "https://metamask.app.link/wc?uri="+ExampleApplication.config.toWCUri();
*/ */
public static void toWallet(String url) { public static void toWallet(String url) {
@ -67,15 +71,18 @@ public class JcSDK {
MainActivity.app.startActivity(i); MainActivity.app.startActivity(i);
} }
} }
public static void showQRCode(String funid, String content) { MainActivity.app.showQRCode(funid, content, "", "");}
public static void showWebPage(String funid, String url) { MainActivity.app.showPage(funid, url);} public static void showQRCode(String funid, String content) {
public static void showRestoreQR(String funid, String content, String title, String oid) { MainActivity.app.showQRCode(funid, content, title, oid);} MainActivity.app.showQRCode(funid, content, "", "");
}
public static void showWebPage(String funid, String url) {
MainActivity.app.showPage(funid, url);
}
public static void scanQRCode(String funid, String title) { public static void scanQRCode(String funid, String title) {
MainActivity.app.showQRScan(funid, title); MainActivity.app.showQRScan(funid, title);
} }
public static void loadRestoreKey(String funid, String oid) {
MainActivity.app.loadRestoreKey(funid, oid);
}
public static void signWithTiktok(String funid) { public static void signWithTiktok(String funid) {
MainActivity.app.signWithTiktok(funid); MainActivity.app.signWithTiktok(funid);
@ -85,7 +92,9 @@ public class JcSDK {
MainActivity.app.signWithFacebook(funid); MainActivity.app.signWithFacebook(funid);
} }
public static void shareWithFacebook(String content) { MainActivity.app.shareWithFacebook(content);} public static void shareWithFacebook(String content) {
MainActivity.app.shareWithFacebook(content);
}
public static void signWithTwitter(String funid) { public static void signWithTwitter(String funid) {
MainActivity.app.signWithTwitter(funid); MainActivity.app.signWithTwitter(funid);
@ -94,6 +103,7 @@ public class JcSDK {
public static void signWithGoogle(String funid) { public static void signWithGoogle(String funid) {
MainActivity.app.signWithGoogle(funid); MainActivity.app.signWithGoogle(funid);
} }
public static void signWithApple(String funid) { public static void signWithApple(String funid) {
MainActivity.app.signWithApple(funid); MainActivity.app.signWithApple(funid);
} }