Skip to content

Commit

Permalink
temporarily remove unfinished caravan integration
Browse files Browse the repository at this point in the history
  • Loading branch information
zhangjun725 committed Feb 7, 2021
1 parent bf6a236 commit 67bdb68
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -492,13 +492,16 @@ public LiveData<Map<String, JSONObject>> loadWalletFile() {
if (object != null) {
fileList.put(f.getName(), object);
}
} else if (f.getName().endsWith(".json")) {
}
/*
else if (f.getName().endsWith(".json")) {
String fileContent = FileUtils.readString(f);
JSONObject object = decodeCaravanWalletFile(fileContent);
if (object != null) {
fileList.put(f.getName(), object);
}
}
*/
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/res/layout/multisig_wallet.xml
Original file line number Diff line number Diff line change
Expand Up @@ -63,12 +63,12 @@
android:layout_height="wrap_content"
android:onClick="@{()->clickHandler.onClick((int)@id/action_export_wallet_to_cosigner)}"
app:title="@string/export_multisig_to_cosigner"/>
<com.cobo.cold.ui.views.SelectableItem
<!--com.cobo.cold.ui.views.SelectableItem
android:id="@+id/export_wallet_to_electrum"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:onClick="@{()->clickHandler.onClick((int)@id/action_export_multisig_wallet_watch_only_guide)}"
app:title="@string/export_wallet_to_caravan"/>
app:title="@string/export_wallet_to_caravan"/-->
<com.cobo.cold.ui.views.SelectableItem
android:id="@+id/wallet_info"
android:layout_width="match_parent"
Expand Down

0 comments on commit 67bdb68

Please sign in to comment.