Skip to content

Commit 2ee3168

Browse files
healergylhealergyl
committed
Optimize the function of Google drive.
1 parent 1d29df7 commit 2ee3168

8 files changed

Lines changed: 238 additions & 80 deletions

File tree

‎app/src/main/java/com/omni/wallet_mainnet/base/AppBaseActivity.java‎

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -244,15 +244,21 @@ public void onSuccess(FileList fileList) {
244244
createAddressFile();
245245
} else {
246246
List<com.google.api.services.drive.model.File> list = new ArrayList<>();
247+
List<com.google.api.services.drive.model.File> backupList = new ArrayList<>();
247248
for (int i = 0; i < fileList.getFiles().size(); i++) {
248249
if (fileList.getFiles().get(i).getName().contains("_mainnet")) {
249250
list.add(fileList.getFiles().get(i));
250251
}
251252
}
252-
if (list.size() == 0) {
253+
for (int j = 0; j < list.size(); j++) {
254+
if (list.get(j).getName().contains(User.getInstance().getWalletAddress(mContext))) {
255+
backupList.add(list.get(j));
256+
}
257+
}
258+
if (backupList.size() == 0) {
253259
createAddressFile();
254260
} else {
255-
saveAddressFile(list.get(1).getId(), list.get(0).getId(), list.get(2).getId());
261+
saveAddressFile(backupList.get(1).getId(), backupList.get(0).getId(), backupList.get(2).getId());
256262
}
257263
}
258264
}
@@ -284,7 +290,7 @@ private void createWalletFile() {
284290
LogUtils.e(TAG, "Creating wallet file.");
285291
String filePath = mContext.getExternalFilesDir(null) + "/obd" + ConstantWithNetwork.getInstance(ConstantInOB.networkType).getDownloadDirectory() + "wallet.db";
286292
LogUtils.e(TAG, filePath);
287-
mDriveServiceHelper.createFile(filePath, "wallet_mainnet.db").addOnSuccessListener(new OnSuccessListener<String>() {
293+
mDriveServiceHelper.createFile(filePath, User.getInstance().getWalletAddress(mContext) + "@wallet_mainnet.db").addOnSuccessListener(new OnSuccessListener<String>() {
288294
@Override
289295
public void onSuccess(String s) {
290296
createChannelFile();
@@ -303,7 +309,7 @@ private void createChannelFile() {
303309
LogUtils.e(TAG, "Creating channel file.");
304310
String filePath = mContext.getExternalFilesDir(null) + "/obd" + ConstantWithNetwork.getInstance(ConstantInOB.networkType).getDownloadChannelDirectory() + "channel.db";
305311
LogUtils.e(TAG, filePath);
306-
mDriveServiceHelper.createFile(filePath, "channel_mainnet.db").addOnSuccessListener(new OnSuccessListener<String>() {
312+
mDriveServiceHelper.createFile(filePath, User.getInstance().getWalletAddress(mContext) + "@channel_mainnet.db").addOnSuccessListener(new OnSuccessListener<String>() {
307313
@Override
308314
public void onSuccess(String s) {
309315
LogUtils.e(TAG, "Channel fileId" + s);
@@ -339,7 +345,7 @@ private void saveWalletFile(String walletFileId, String channelFileId) {
339345
LogUtils.e(TAG, "Save wallet file " + walletFileId);
340346

341347
String filePath = mContext.getExternalFilesDir(null) + "/obd" + ConstantWithNetwork.getInstance(ConstantInOB.networkType).getDownloadDirectory() + "wallet.db";
342-
mDriveServiceHelper.saveDbFile(walletFileId, filePath, "wallet_mainnet.db")
348+
mDriveServiceHelper.saveDbFile(walletFileId, filePath, User.getInstance().getWalletAddress(mContext) + "@wallet_mainnet.db")
343349
.addOnSuccessListener(new OnSuccessListener<String>() {
344350
@Override
345351
public void onSuccess(String s) {
@@ -356,7 +362,7 @@ private void saveChannelFile(String channelFileId) {
356362
LogUtils.e(TAG, "Save channel file " + channelFileId);
357363

358364
String filePath = mContext.getExternalFilesDir(null) + "/obd" + ConstantWithNetwork.getInstance(ConstantInOB.networkType).getDownloadChannelDirectory() + "channel.db";
359-
mDriveServiceHelper.saveDbFile(channelFileId, filePath, "channel_mainnet.db")
365+
mDriveServiceHelper.saveDbFile(channelFileId, filePath, User.getInstance().getWalletAddress(mContext) + "@channel_mainnet.db")
360366
.addOnSuccessListener(new OnSuccessListener<String>() {
361367
@Override
362368
public void onSuccess(String s) {

‎app/src/main/java/com/omni/wallet_mainnet/ui/activity/AccountLightningActivity.java‎

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1363,15 +1363,21 @@ public void onSuccess(FileList fileList) {
13631363
createAddressFile();
13641364
} else {
13651365
List<com.google.api.services.drive.model.File> list = new ArrayList<>();
1366+
List<com.google.api.services.drive.model.File> backupList = new ArrayList<>();
13661367
for (int i = 0; i < fileList.getFiles().size(); i++) {
13671368
if (fileList.getFiles().get(i).getName().contains("_mainnet")) {
13681369
list.add(fileList.getFiles().get(i));
13691370
}
13701371
}
1371-
if (list.size() == 0) {
1372+
for (int j = 0; j < list.size(); j++) {
1373+
if (list.get(j).getName().contains(User.getInstance().getWalletAddress(mContext))) {
1374+
backupList.add(list.get(j));
1375+
}
1376+
}
1377+
if (backupList.size() == 0) {
13721378
createAddressFile();
13731379
} else {
1374-
saveAddressFile(list.get(1).getId(), list.get(0).getId(), list.get(2).getId());
1380+
saveAddressFile(backupList.get(1).getId(), backupList.get(0).getId(), backupList.get(2).getId());
13751381
}
13761382
}
13771383
}
@@ -1405,7 +1411,7 @@ private void createWalletFile() {
14051411
LogUtils.e(TAG, "Creating wallet file.");
14061412
String filePath = mContext.getExternalFilesDir(null) + "/obd" + ConstantWithNetwork.getInstance(ConstantInOB.networkType).getDownloadDirectory() + "wallet.db";
14071413
LogUtils.e(TAG, filePath);
1408-
mDriveServiceHelper.createFile(filePath, "wallet_mainnet.db").addOnSuccessListener(new OnSuccessListener<String>() {
1414+
mDriveServiceHelper.createFile(filePath, User.getInstance().getWalletAddress(mContext) + "@wallet_mainnet.db").addOnSuccessListener(new OnSuccessListener<String>() {
14091415
@Override
14101416
public void onSuccess(String s) {
14111417
createChannelFile();
@@ -1424,7 +1430,7 @@ private void createChannelFile() {
14241430
LogUtils.e(TAG, "Creating channel file.");
14251431
String filePath = mContext.getExternalFilesDir(null) + "/obd" + ConstantWithNetwork.getInstance(ConstantInOB.networkType).getDownloadChannelDirectory() + "channel.db";
14261432
LogUtils.e(TAG, filePath);
1427-
mDriveServiceHelper.createFile(filePath, "channel_mainnet.db").addOnSuccessListener(new OnSuccessListener<String>() {
1433+
mDriveServiceHelper.createFile(filePath, User.getInstance().getWalletAddress(mContext) + "@channel_mainnet.db").addOnSuccessListener(new OnSuccessListener<String>() {
14281434
@Override
14291435
public void onSuccess(String s) {
14301436
LogUtils.e(TAG, "Channel fileId" + s);
@@ -1463,7 +1469,7 @@ private void saveWalletFile(String walletFileId, String channelFileId) {
14631469
LogUtils.e(TAG, "Save wallet file " + walletFileId);
14641470

14651471
String filePath = mContext.getExternalFilesDir(null) + "/obd" + ConstantWithNetwork.getInstance(ConstantInOB.networkType).getDownloadDirectory() + "wallet.db";
1466-
mDriveServiceHelper.saveDbFile(walletFileId, filePath, "wallet_mainnet.db")
1472+
mDriveServiceHelper.saveDbFile(walletFileId, filePath, User.getInstance().getWalletAddress(mContext) + "@wallet_mainnet.db")
14671473
.addOnSuccessListener(new OnSuccessListener<String>() {
14681474
@Override
14691475
public void onSuccess(String s) {
@@ -1480,7 +1486,7 @@ private void saveChannelFile(String channelFileId) {
14801486
LogUtils.e(TAG, "Save channel file " + channelFileId);
14811487

14821488
String filePath = mContext.getExternalFilesDir(null) + "/obd" + ConstantWithNetwork.getInstance(ConstantInOB.networkType).getDownloadChannelDirectory() + "channel.db";
1483-
mDriveServiceHelper.saveDbFile(channelFileId, filePath, "channel_mainnet.db")
1489+
mDriveServiceHelper.saveDbFile(channelFileId, filePath, User.getInstance().getWalletAddress(mContext) + "@channel_mainnet.db")
14841490
.addOnSuccessListener(new OnSuccessListener<String>() {
14851491
@Override
14861492
public void onSuccess(String s) {

‎app/src/main/java/com/omni/wallet_mainnet/ui/activity/BalanceDetailActivity.java‎

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2226,15 +2226,21 @@ public void onSuccess(FileList fileList) {
22262226
createAddressFile();
22272227
} else {
22282228
List<com.google.api.services.drive.model.File> list = new ArrayList<>();
2229+
List<com.google.api.services.drive.model.File> backupList = new ArrayList<>();
22292230
for (int i = 0; i < fileList.getFiles().size(); i++) {
22302231
if (fileList.getFiles().get(i).getName().contains("_mainnet")) {
22312232
list.add(fileList.getFiles().get(i));
22322233
}
22332234
}
2234-
if (list.size() == 0) {
2235+
for (int j = 0; j < list.size(); j++) {
2236+
if (list.get(j).getName().contains(User.getInstance().getWalletAddress(mContext))) {
2237+
backupList.add(list.get(j));
2238+
}
2239+
}
2240+
if (backupList.size() == 0) {
22352241
createAddressFile();
22362242
} else {
2237-
saveAddressFile(list.get(1).getId(), list.get(0).getId(), list.get(2).getId());
2243+
saveAddressFile(backupList.get(1).getId(), backupList.get(0).getId(), backupList.get(2).getId());
22382244
}
22392245
}
22402246
}
@@ -2268,7 +2274,7 @@ private void createWalletFile() {
22682274
LogUtils.e(TAG, "Creating wallet file.");
22692275
String filePath = mContext.getExternalFilesDir(null) + "/obd" + ConstantWithNetwork.getInstance(ConstantInOB.networkType).getDownloadDirectory() + "wallet.db";
22702276
LogUtils.e(TAG, filePath);
2271-
mDriveServiceHelper.createFile(filePath, "wallet_mainnet.db").addOnSuccessListener(new OnSuccessListener<String>() {
2277+
mDriveServiceHelper.createFile(filePath, User.getInstance().getWalletAddress(mContext) + "@wallet_mainnet.db").addOnSuccessListener(new OnSuccessListener<String>() {
22722278
@Override
22732279
public void onSuccess(String s) {
22742280
createChannelFile();
@@ -2287,7 +2293,7 @@ private void createChannelFile() {
22872293
LogUtils.e(TAG, "Creating channel file.");
22882294
String filePath = mContext.getExternalFilesDir(null) + "/obd" + ConstantWithNetwork.getInstance(ConstantInOB.networkType).getDownloadChannelDirectory() + "channel.db";
22892295
LogUtils.e(TAG, filePath);
2290-
mDriveServiceHelper.createFile(filePath, "channel_mainnet.db").addOnSuccessListener(new OnSuccessListener<String>() {
2296+
mDriveServiceHelper.createFile(filePath, User.getInstance().getWalletAddress(mContext) + "@channel_mainnet.db").addOnSuccessListener(new OnSuccessListener<String>() {
22912297
@Override
22922298
public void onSuccess(String s) {
22932299
LogUtils.e(TAG, "Channel fileId" + s);
@@ -2326,7 +2332,7 @@ private void saveWalletFile(String walletFileId, String channelFileId) {
23262332
LogUtils.e(TAG, "Save wallet file " + walletFileId);
23272333

23282334
String filePath = mContext.getExternalFilesDir(null) + "/obd" + ConstantWithNetwork.getInstance(ConstantInOB.networkType).getDownloadDirectory() + "wallet.db";
2329-
mDriveServiceHelper.saveDbFile(walletFileId, filePath, "wallet_mainnet.db")
2335+
mDriveServiceHelper.saveDbFile(walletFileId, filePath, User.getInstance().getWalletAddress(mContext) + "@wallet_mainnet.db")
23302336
.addOnSuccessListener(new OnSuccessListener<String>() {
23312337
@Override
23322338
public void onSuccess(String s) {
@@ -2343,7 +2349,7 @@ private void saveChannelFile(String channelFileId) {
23432349
LogUtils.e(TAG, "Save channel file " + channelFileId);
23442350

23452351
String filePath = mContext.getExternalFilesDir(null) + "/obd" + ConstantWithNetwork.getInstance(ConstantInOB.networkType).getDownloadChannelDirectory() + "channel.db";
2346-
mDriveServiceHelper.saveDbFile(channelFileId, filePath, "channel_mainnet.db")
2352+
mDriveServiceHelper.saveDbFile(channelFileId, filePath, User.getInstance().getWalletAddress(mContext) + "@channel_mainnet.db")
23472353
.addOnSuccessListener(new OnSuccessListener<String>() {
23482354
@Override
23492355
public void onSuccess(String s) {

0 commit comments

Comments
 (0)