Skip to content
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.

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

Cocacola #3

Open
wants to merge 162 commits into
base: master
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
162 commits
Select commit Hold shift + click to select a range
2014efa
remove old images
alexander-miroch Aug 6, 2019
38bb2f5
Agreement skin
alexander-miroch Aug 6, 2019
203b5d1
timeout
alexander-miroch Aug 7, 2019
999e39e
new screens
alexander-miroch Aug 7, 2019
52d39d6
deposit screen
alexander-miroch Aug 7, 2019
34b0766
deposit-transfer
alexander-miroch Aug 8, 2019
69db999
backup screen
alexander-miroch Aug 8, 2019
f18508c
gear screens
alexander-miroch Aug 8, 2019
189b936
backup, delete, fix screens
alexander-miroch Aug 8, 2019
f255e4b
support
alexander-miroch Aug 8, 2019
a46b740
support screen
alexander-miroch Aug 8, 2019
5b5d043
wallet name
alexander-miroch Aug 9, 2019
0c4bf4a
optimize transactions
alexander-miroch Aug 11, 2019
764ff46
email changed
alexander-miroch Aug 11, 2019
bb2057d
echo raida view
alexander-miroch Aug 11, 2019
5af5b75
receiver
alexander-miroch Aug 11, 2019
1e62d65
Transfer Servant
alexander-miroch Aug 11, 2019
00f1758
export button
alexander-miroch Aug 12, 2019
6f34041
disable double click
alexander-miroch Aug 12, 2019
cd8a26c
html removal
alexander-miroch Aug 12, 2019
5692341
printing colors
alexander-miroch Aug 12, 2019
f688e82
memo
alexander-miroch Aug 13, 2019
616e785
default wallet
alexander-miroch Aug 13, 2019
cf261be
same wallet dropdown
alexander-miroch Aug 14, 2019
e98fc99
terms
alexander-miroch Aug 15, 2019
33886d2
Support portal
alexander-miroch Aug 15, 2019
0b4cc6a
delete wallet transaction
alexander-miroch Aug 15, 2019
500d56e
Button rename
alexander-miroch Aug 15, 2019
3e15e23
Move from Imported
alexander-miroch Aug 16, 2019
5f3cd1e
wallet sort
alexander-miroch Aug 16, 2019
b2f6f4b
font size
alexander-miroch Aug 16, 2019
1a61641
config value
alexander-miroch Aug 19, 2019
e9dea40
errors and warnings
alexander-miroch Aug 21, 2019
6317d5f
src
alexander-miroch Aug 21, 2019
e71d580
blanks
alexander-miroch Aug 21, 2019
fc97bd4
use keyboard keys with scrollbar
alexander-miroch Aug 21, 2019
dd256e8
updating wallets
alexander-miroch Aug 23, 2019
a7ffff5
skywallet default directory
alexander-miroch Aug 23, 2019
909b625
delete wallet
alexander-miroch Aug 26, 2019
4507f69
Unpacker will proceed if a file is failed
alexander-miroch Aug 26, 2019
d273203
lastaction
alexander-miroch Aug 26, 2019
d47a44f
rm debug
alexander-miroch Aug 26, 2019
c72e0c5
LossFixer
alexander-miroch Aug 26, 2019
c761dd4
config
alexander-miroch Aug 29, 2019
ad55016
Exporting
alexander-miroch Aug 29, 2019
8c2d18b
top menu behaviour
alexander-miroch Aug 29, 2019
245026e
text
alexander-miroch Aug 29, 2019
7f55966
top color
alexander-miroch Aug 29, 2019
37c42c4
Error message
alexander-miroch Aug 29, 2019
09e21b4
verify SkyID coin
alexander-miroch Aug 31, 2019
d0f54eb
first wallet by default
alexander-miroch Sep 2, 2019
fb4d372
existing skywallet check
alexander-miroch Sep 2, 2019
4fa8102
rm revalidate
alexander-miroch Sep 2, 2019
e478613
placeholder
alexander-miroch Sep 3, 2019
7cc22ca
Settings
alexander-miroch Sep 6, 2019
447d4f1
Settings
alexander-miroch Sep 6, 2019
e0e7fb4
Echo text
alexander-miroch Sep 6, 2019
32148f3
Echo text
alexander-miroch Sep 6, 2019
37ab8d5
logfile
alexander-miroch Sep 6, 2019
bcf0d44
error message
alexander-miroch Sep 6, 2019
c49f23e
Deposit foleder
alexander-miroch Sep 6, 2019
9426d57
tls 1.2
alexander-miroch Sep 9, 2019
f2faa65
Change
alexander-miroch Sep 11, 2019
0e9994a
change
alexander-miroch Sep 12, 2019
ada60d7
change
alexander-miroch Sep 12, 2019
2508088
change
alexander-miroch Sep 12, 2019
915e5fd
icon
alexander-miroch Sep 13, 2019
271ad9f
icon
alexander-miroch Sep 13, 2019
bc313d6
echoer
alexander-miroch Sep 17, 2019
0df11ca
version bump
alexander-miroch Sep 17, 2019
67d00ae
Sky wallet history
alexander-miroch Sep 17, 2019
8b5f55c
select wallet after creation
alexander-miroch Sep 17, 2019
7a33eff
frackfixer without echo
alexander-miroch Sep 17, 2019
0e790b8
Fracked SkyID workflow
alexander-miroch Sep 19, 2019
8218468
autoupdate sky wallets
alexander-miroch Sep 19, 2019
78dfe6f
ps
alexander-miroch Sep 19, 2019
5a360e6
change service improvements
alexander-miroch Sep 19, 2019
c59a0e1
add warnings
alexander-miroch Sep 25, 2019
5d3513c
showcoins & showchange multi queries
alexander-miroch Sep 26, 2019
49805cc
Transfer with change
alexander-miroch Sep 27, 2019
d749da1
locale
alexander-miroch Sep 27, 2019
8dea117
locale
alexander-miroch Sep 27, 2019
566f030
dup coins will not stop Unpacker
alexander-miroch Oct 3, 2019
b2b6e66
Remove and mask sensetive data in logs
alexander-miroch Oct 3, 2019
a7825b2
transfer from sky-sky - show requested amount
alexander-miroch Oct 4, 2019
992b1c6
error handling wrap
alexander-miroch Oct 4, 2019
3c9568d
transaction auto-adjust, show coins interrupt
alexander-miroch Oct 4, 2019
775078b
showcoin log
alexander-miroch Oct 5, 2019
8d60f35
av
alexander-miroch Oct 6, 2019
83d611d
no trash for encrypted wallets
alexander-miroch Oct 6, 2019
8973979
predeposit
alexander-miroch Oct 6, 2019
6058c92
frack deletion
alexander-miroch Oct 7, 2019
c9092a0
date
alexander-miroch Oct 7, 2019
4cc5bb8
deleting
alexander-miroch Oct 7, 2019
4d62db6
deletion
alexander-miroch Oct 7, 2019
b58c6d1
Import ts
alexander-miroch Oct 7, 2019
2bd05cd
skywallet workflow
alexander-miroch Oct 7, 2019
aa04e4c
skywallet workflow
alexander-miroch Oct 7, 2019
4f90e01
ts remove
alexander-miroch Oct 7, 2019
2f286a1
sky wallet
alexander-miroch Oct 9, 2019
4581162
updates; colons; segv
alexander-miroch Oct 15, 2019
9389742
dst
alexander-miroch Oct 17, 2019
0ff7780
race condition
alexander-miroch Oct 24, 2019
7a9b945
Merge branch 'darkgui' of https://github.com/CloudCoinConsortium/Clou…
alexander-miroch Oct 24, 2019
4ccb244
race condition
alexander-miroch Oct 24, 2019
646cb2c
race condition
alexander-miroch Oct 24, 2019
9e5306f
receive round up
alexander-miroch Oct 28, 2019
385a3ea
picking algoritm
alexander-miroch Oct 31, 2019
b6bcbe3
merge
alexander-miroch Oct 31, 2019
d9eab93
change algorithm
alexander-miroch Nov 2, 2019
2df7ed2
dots
alexander-miroch Dec 18, 2019
75c38ec
export limit
alexander-miroch Dec 18, 2019
90cb354
deposit
alexander-miroch Dec 18, 2019
833ca9f
skip non-stack from ID
alexander-miroch Dec 18, 2019
9dc9a1c
skip non-stack from ID
alexander-miroch Dec 18, 2019
fac3388
fix
alexander-miroch Dec 22, 2019
3098151
version bump
alexander-miroch Dec 22, 2019
a5ac390
rm debug
alexander-miroch Dec 23, 2019
a1f6f3b
skip stack extension
alexander-miroch Dec 23, 2019
5f11f0f
sent
alexander-miroch Dec 30, 2019
beaeadf
add sent coins
alexander-miroch Dec 30, 2019
6f76f5f
stack
alexander-miroch Dec 31, 2019
c22fee8
sent
alexander-miroch Jan 1, 2020
415d89a
errmsg
alexander-miroch Jan 9, 2020
22c18d9
Merge branch 'darkgui' of https://github.com/CloudCoinConsortium/Clou…
alexander-miroch Jan 9, 2020
f7289cf
Record counterfeit and failed coins
alexander-miroch Jan 9, 2020
0cedb88
validate memo loosely
alexander-miroch Jan 9, 2020
2bdd4fe
List serials in dir
alexander-miroch Jan 9, 2020
b1131c3
export save default dir
alexander-miroch Jan 10, 2020
cf23a9c
icon color
alexander-miroch Jan 13, 2020
17e2aa9
export keys
alexander-miroch Jan 13, 2020
d089d14
cloudcoin domain bugfix
alexander-miroch Jan 14, 2020
0fc6037
setcounters reordering
alexander-miroch Jan 14, 2020
718de98
prevent hanging if send error
alexander-miroch Jan 14, 2020
d6e8ac9
show_envs add cancel point
alexander-miroch Jan 14, 2020
1289cfb
bill pay dark
alexander-miroch Jan 18, 2020
3be8b10
send mails
alexander-miroch Jan 22, 2020
a641a76
send mails
alexander-miroch Jan 22, 2020
8f88dd9
log message
alexander-miroch Jan 23, 2020
0727d93
msg
alexander-miroch Jan 23, 2020
c0f531f
Transfer done screen fix
alexander-miroch Jan 31, 2020
bccd74d
Move socket checks before export
alexander-miroch Feb 1, 2020
0939bb7
txt
alexander-miroch Feb 1, 2020
785b18f
checks
alexander-miroch Feb 1, 2020
e1e82d8
version
alexander-miroch Feb 1, 2020
46b645a
png
alexander-miroch Feb 3, 2020
730ee45
fix
alexander-miroch Feb 17, 2020
45319e8
fix
alexander-miroch Feb 17, 2020
8198943
negative transactions
alexander-miroch Feb 17, 2020
aa9b4f5
ui and bugs
alexander-miroch Feb 19, 2020
d293129
fx
alexander-miroch Feb 19, 2020
f542db5
dark export
alexander-miroch Feb 28, 2020
9b1eb5d
jpegs
alexander-miroch Mar 1, 2020
48f6454
top icon
alexander-miroch Mar 1, 2020
a7df8db
icons
alexander-miroch Mar 1, 2020
631667d
icons
alexander-miroch Mar 1, 2020
269210b
withdraw
alexander-miroch Mar 2, 2020
e263011
sign
alexander-miroch Mar 2, 2020
1eebe5b
keys and backup
alexander-miroch Mar 2, 2020
bc3e0cf
exporter
alexander-miroch Mar 3, 2020
a422f0f
randomizer
alexander-miroch Mar 3, 2020
5a33e53
cocacola
alexander-miroch Mar 12, 2020
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
Prev Previous commit
Next Next commit
errors and warnings
alexander-miroch committed Aug 21, 2019
commit e9dea408cde32570a21c15f2b313bb6fe992e84a
19 changes: 15 additions & 4 deletions src/advclient/AdvancedClient.java
Original file line number Diff line number Diff line change
@@ -2982,7 +2982,7 @@ public void actionPerformed(ActionEvent e) {
};

if (ps.typedAmount <= 0) {
ps.errText = "Invalid amount";
ps.errText = "Transfer must be higher than zero";
showScreen();
return;
}
@@ -2996,7 +2996,7 @@ public void actionPerformed(ActionEvent e) {
ps.typedMemo = ps.typedMemo.trim();
if (!ps.typedMemo.isEmpty()) {
if (!Validator.memo(ps.typedMemo)) {
ps.errText = "Memo: Non alpha number characters are not allowed";
ps.errText = "Memo: special characters not allowed! Use numbers and letters only";
showScreen();
return;
}
@@ -3049,7 +3049,7 @@ public void actionPerformed(ActionEvent e) {
}

if (ps.typedMemo.isEmpty()) {
ps.errText = "Memo cannot be empty";
ps.errText = " nnot be empty";
showScreen();
return;
}
@@ -3067,7 +3067,7 @@ public void actionPerformed(ActionEvent e) {
}
} else if (dstIdx == rvTo.idxs.length + 1) {
if (!Validator.memo(ps.typedMemo)) {
ps.errText = "Memo cannot contain dots or slashes";
ps.errText = "Memo: special characters not allowed! Use numbers and letters only";
showScreen();
return;
}
@@ -3090,6 +3090,17 @@ public void actionPerformed(ActionEvent e) {
if (ps.typedMemo.isEmpty())
ps.typedMemo = "Export";

String filename = ps.chosenFile + File.separator + ps.typedAmount + ".CloudCoin." + ps.typedMemo + ".stack";
File f = new File(filename);
if (f.exists()) {
ps.errText = "File with the same Memo already exists in "
+ ps.chosenFile + " folder. Use different Memo or change folder for your transfer";
showScreen();
return;
}



ps.sendType = ProgramState.SEND_TYPE_FOLDER;

setActiveWallet(ps.srcWallet);
2 changes: 1 addition & 1 deletion src/advclient/common/Exporter/Exporter.java
Original file line number Diff line number Diff line change
@@ -296,7 +296,7 @@ private boolean exportStack(String dir, String tag) {
if (f.exists()) {
logger.error(ltag, "File exists: " + fileName);
er.status = ExporterResult.STATUS_ERROR;
er.errText = "Exported file with the same tag already exist";
er.errText = "Exported file with the same tag already exists";
return false;
}