Archives/Alfis
2
0
Fork 0
mirror of https://github.com/Revertron/Alfis synced 2024-11-11 01:10:36 +00:00
Code Issues Projects Releases Wiki Activity

Small fixes.

Browse Source
This commit is contained in:
Revertron 2021-05-05 11:50:00 +02:00
parent ec635b19f2
commit 969e414907
3 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/web_ui.rs
View File

@ -166,7 +166,7 @@ fn action_load_key(context: &Arc<Mutex<Context>>, web_view: &mut WebView<()>) {
event_fail(web_view, &format!("Error loading key from \\'{}\\'!", &file_name)); event_fail(web_view, &format!("Error loading key from \\'{}\\'!", &file_name));
} }
Some(keystore) => { Some(keystore) => {
info!("Loaded keystore with key: {:?}", &keystore); info!("Loaded keystore with keys: {:?}, {:?}", &keystore.get_public(), &keystore.get_encryption_public());
let mut c = context.lock().unwrap(); let mut c = context.lock().unwrap();
let path = keystore.get_path().to_owned(); let path = keystore.get_path().to_owned();
let public = keystore.get_public().to_string(); let public = keystore.get_public().to_string();
@ -389,15 +389,10 @@ fn action_create_domain(context: Arc<Mutex<Context>>, miner: Arc<Mutex<Miner>>,
} }
} }
} }
let signing = if !signing.is_empty() { let (signing, encryption) = if signing.is_empty() || encryption.is_empty() {
Bytes::new(from_hex(&signing).unwrap()) (keystore.get_public(), keystore.get_encryption_public())
} else { } else {
Bytes::default() (Bytes::new(from_hex(&signing).unwrap()), Bytes::new(from_hex(&encryption).unwrap()))
};
let encryption = if !encryption.is_empty() {
Bytes::new(from_hex(&encryption).unwrap())
} else {
Bytes::default()
}; };
match context.chain.can_mine_domain(context.chain.get_height(), &name, &pub_key) { match context.chain.can_mine_domain(context.chain.get_height(), &name, &pub_key) {
MineResult::Fine => { MineResult::Fine => {

4
src/webview/index.html
View File

@ -265,7 +265,7 @@
Just list your contacts, separated by new line.</p> Just list your contacts, separated by new line.</p>
<div class="buttons is-grouped is-centered"> <div class="buttons is-grouped is-centered">
<button class="button is-link" id="contacts_positive_button" onclick="contactsPositiveButton();">Ok</button> <button class="button is-link" id="contacts_positive_button" onclick="contactsPositiveButton();">Ok</button>
<button class="button is-link is-light" id="contacts_negative_button" onclick="contactsCancelButton();">Cancel</button> <button class="button is-link is-light" id="contacts_negative_button" onclick="contactsNegativeButton();">Cancel</button>
</div> </div>
</div> </div>
</div> </div>
@ -284,7 +284,7 @@
<p class="help mb-3">You can add some description to your domain if you wish for users or search engines to know what is it about.</p> <p class="help mb-3">You can add some description to your domain if you wish for users or search engines to know what is it about.</p>
<div class="buttons is-grouped is-centered"> <div class="buttons is-grouped is-centered">
<button class="button is-link" id="info_positive_button" onclick="infoPositiveButton();">Ok</button> <button class="button is-link" id="info_positive_button" onclick="infoPositiveButton();">Ok</button>
<button class="button is-link is-light" id="info_negative_button" onclick="infoCancelButton();">Cancel</button> <button class="button is-link is-light" id="info_negative_button" onclick="infoNegativeButton();">Cancel</button>
</div> </div>
</div> </div>
</div> </div>

4
src/webview/scripts.js
View File

@ -248,8 +248,8 @@ function createDomain() {
function getContacts() { function getContacts() {
var result = []; var result = [];
var text = document.getElementById("contacts_text").value; var text = document.getElementById("contacts_text").value;
if (value != "") { if (text != "") {
var lines = value.split("\n"); var lines = text.split("\n");
lines.forEach(function(value, index, array) { lines.forEach(function(value, index, array) {
result.push(value); result.push(value);
}); });