agorise/crystal-wallet-android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
599 commits 3 branches 0 tags 6.3 MiB
Commit graph

539 commits

Author SHA1 Message Date
dtvv
613f901fc9 Custom QuestionDialog for all the questions of the system 2018-09-19 21:16:10 -05:00
Javier Varona
d549e3af8d Merge branch 'develop' of https://github.com/Agorise/crystal-wallet-android into develop 2018-09-19 21:47:51 -04:00
Javier Varona
d38d0ed7ed - Fixed the error sending decimals in the send fragment 2018-09-19 21:47:26 -04:00
dtvv
054f062ce1 When account exists or not, enable or disable on main thread the button "create wallet" 2018-09-19 20:07:38 -05:00
Henry Varona
fefe7d054b Merge remote-tracking branch 'origin/develop' into develop 2018-09-19 20:30:34 -04:00
Henry Varona
95ad420cd5 Added some log to cryptonetmanager 2018-09-19 20:29:57 -04:00
dtvv
e83d3c00a0 Get better view in the import seed layout 2018-09-19 19:16:13 -05:00
Henry Varona
c08ba24d32 Fix Aplication url verification 2018-09-19 17:28:02 -04:00
Henry Varona
272843843c Arrange ser and faucet urls 2018-09-19 15:38:17 -04:00
Henry Varona
a6109fa387 arrange server list 2018-09-19 11:52:49 -04:00
Javier Varona
b9d1065e81 Merge branch 'develop' of https://github.com/Agorise/crystal-wallet-android into develop 2018-09-18 22:25:34 -04:00
Javier Varona
59b6e63297 - Removed the label "0.003€" from the balance item header 
- Changed the label "cancel" to "ok" in the backup seed page
- The user can't get back once he/she entered the backup seed page
- When the "ok" button is pressed in the backup seed page, the user gets to the balance page (and not the creation seed page)
 2018-09-18 22:25:07 -04:00
Henry Varona
90929d9ee5 arrange node list 2018-09-18 20:26:35 -04:00
Henry Varona
cea9efc07d Merge remote-tracking branch 'origin/develop' into develop 2018-09-18 15:51:32 -04:00
Henry Varona
c818eaf472 - Added wrtie timeout for the faucet request 
- Change the equivalent url to use the BTS serve
-
 2018-09-18 15:47:15 -04:00
dtvv
8a86816c76 Simplify the buttons. the text at the top already says you are importing an account. so the buttons should just say Import .bin File or Import Brainkey in the intro screen 2018-09-18 13:13:27 -05:00
dtvv
b6a9e6b59c Add new Tab called “Merchants” and inside it should be “Comming soon” text 2018-09-18 12:45:01 -05:00
dtvv
752a58b3bf Merge remote-tracking branch 'origin/develop' into develop 2018-09-18 12:43:54 -05:00
dtvv
16dc55a18b Scrollable mode in tablayout lib for board window 2018-09-18 12:41:43 -05:00
dtvv
10830b964a The modal says creating backup, when actually you are restoring from a backup. that must be reworded 2018-09-18 12:40:49 -05:00
Javier Varona
e601b90a63 Merge branch 'develop' of https://github.com/Agorise/crystal-wallet-android into develop 2018-09-17 22:02:40 -04:00
Javier Varona
35f273de23 - Fixed Transaction List not updating when it should 
- Now the transaction list searches for bitshares account names too
 2018-09-17 22:02:21 -04:00
Henry Varona
593b875f25 Added the insight apigenerator that handles all service calls to the servers, 
Added the GeneralAccountManager that handles all communication used on bitcoin likes crypto accounts
Rearrenge the send to the manager
Change estimatefee to work with the new Architecture
Added request for send generalaccount transactions (bitcoin like)
 2018-09-16 23:43:59 -04:00
Javier Varona
de2391c6f8 - Put the loading dialog code of the backup restore before the import request is added 
- Fixing an error triggered when the import seed form is filled too fast. The bitshare name request of the account gets a null listener and makes the app to crash
 2018-09-15 21:25:41 -04:00
dtvv
d43c75a501 The import backup password has to be alphanumeric 2018-09-14 01:18:41 -05:00
dtvv
9d973b995e -When you import the backup account and it runs successfully, it should to take you to the main window and not on the login one 
-When you import the backup account and it runs successfully, it should close the intro window
-When the user is restoring the backup it has to show loading dialog
-Remove Backup restored! Text when finishing importing backup
-Create class CrystalLoading extendí from CrystalDialog
 2018-09-14 01:04:10 -05:00
dtvv
8e00c08d6a -Add error text in the amount field when there is a invalid selected crypto coin 2018-09-13 22:59:35 -05:00
dtvv
da290acddc Button send transaction get better animation 2018-09-13 21:56:06 -05:00
dtvv
b7235db5f2 Merge branch 'develop' of https://github.com/Agorise/crystal-wallet-android into develop 
# Conflicts:
#	app/src/main/java/cy/agorise/crystalwallet/viewmodels/validators/validationfields/BitsharesAccountMnemonicValidationField.java
 2018-09-12 21:37:13 -05:00
dtvv
83b7a7d3d3 Fixed spinner view in transaction window 2018-09-12 21:34:27 -05:00
Javier Varona
68296f6306 - Fixing some errors importing accounts 
- After importing an account using a seed, the user gets to the balance page and the intent history is cleared
 2018-09-12 21:56:04 -04:00
Javier Varona
b2da811687 - Fixing compile errors 2018-09-12 21:08:22 -04:00
dtvv
a7ba6f5c6b Merge branch 'feat_ui_improvements' of https://github.com/Agorise/crystal-wallet-android into develop 2018-09-12 14:29:33 -05:00
dtvv
430085f8af Specialiced spinners 2018-09-12 14:17:03 -05:00
Javier Varona
7befdd4207 - FileBackupManager and ImportSeedActivity no longer add the seed to the database. Now they call the ValidateImportBitsharesAccountRequest to do so. 
- Also, the ImportSeedActivity tells the user the reason in case of a failed import.
 2018-09-11 21:40:25 -04:00
Javier Varona
fc3fe7c92c Merge branch 'develop_ui_improvements' into develop 2018-09-09 20:23:28 -04:00
Javier Varona
3cc2fb4a48 - Change import seed activity to use a request to import the account 2018-09-09 20:12:32 -04:00
dtvv
fcd5855953 Fit automatically height for the edittext in the brainkey screen 2018-09-07 11:24:27 -05:00
dtvv
ddd1073682 Disable NFC in the security options 2018-09-06 21:26:39 -05:00
Javier Varona
4a34c3a8ae - Now the import seed button sends the user to the import seed activity 
- Fixed account seed kotlin viewmodel so it can be instantiated with the ViewModelProvider
 2018-09-06 22:13:28 -04:00
hvarona
baeaa2d8d0 Change the insight serverUrl, to make it not a constant but selected by the app 2018-09-06 21:44:07 -04:00
Javier Varona
e569986864 - Fixed app asking for password when the back button is pressed after selecting import account by backup 2018-09-06 21:08:59 -04:00
dtvv
a1876733f5 In the backup seed screen there is not option for brainkey backup 2018-09-06 14:22:42 -05:00
dtvv
fd5037f1af Complete layout view for backup with brainkey 2018-09-06 11:44:05 -05:00
dtvv
65669e155c Integration of animated layout Library severiano 2018-09-06 11:31:29 -05:00
dtvv
508e30fc15 Correct manifest 2018-09-06 00:02:06 -05:00
hvarona
e6350396be Change the insight serverUrl, to make it not a constant but selected by the app 2018-09-05 23:45:03 -04:00
hvarona
8cfbb63f1c Change the insight serverUrl, to make it not a constant but selected by the app 2018-09-05 23:43:37 -04:00
dtvv
5fb847ba1c Revert network changes 2018-09-05 19:36:27 -05:00
dtvv
e0903c0a26 Remove AppTheme.NoActionBar from LicenceActivity.java 2018-09-05 14:51:07 -05:00
dtvv
72dc7abf8b Change the “cancel” button in the send assets screen to a cross 2018-09-05 14:49:35 -05:00
dtvv
018cced971 In the loading dialog when you Press back button it lets to close it 2018-09-05 13:52:27 -05:00
dtvv
8a6e8ce240 In the create seed screen, when all the Fields are complete filled and delete one character in pin field for example, the loading connection server existing account validation was fired 2018-09-05 13:20:17 -05:00
dtvv
2a1f2895d4 Set the loading dialog when connecting to server to progress() loading icon 2018-09-05 12:25:31 -05:00
Javier Varona
ac46440ed5 Merge remote-tracking branch 'remotes/origin/feat_improve_contacts' into develop_ui_improvements 
# Conflicts:
#	app/src/main/java/cy/agorise/crystalwallet/activities/BoardActivity.java
#	app/src/main/res/layout/board.xml
 2018-09-04 21:14:30 -04:00
dtvv
c7cb37347d Remove testing cases 2018-09-03 15:59:32 -06:00
dtvv
b7223e4997 Progress dialog not showing, now it is ok 2018-09-03 14:06:38 -06:00
dtvv
e9551483f0 Remove network package testing implementation 2018-09-03 10:52:39 -06:00
dtvv
e283f7cb65 Remove network package testing implementation 2018-09-03 10:49:25 -06:00
dtvv
4a566a1e3a Remove network package testing implementation 2018-09-03 10:29:35 -06:00
dtvv
f6c92963e2 Remove network package testing implementation 2018-09-03 10:07:57 -06:00
dtvv
c0acdc85a7 Remove network package testing implementation 2018-09-03 10:05:46 -06:00
dtvv
3e150be199 Remove network package testing implementation 2018-09-03 10:02:52 -06:00
dtvv
e3eeb76f0e Remove testing cases 2018-09-03 09:18:48 -06:00
dtvv
6ef9a501b7 Fix directory name 2018-08-30 17:14:47 -05:00
dtvv
576c14c6c6 Test activity class for business spinner 2018-08-30 17:13:30 -05:00
dtvv
fbaca7a1c8 Test implementation for business logic specific spinner 2018-08-28 21:22:50 -05:00
dtvv
ecb7a9b33d Remove bubble animation from BoardActivity 2018-08-27 18:55:24 -05:00
dtvv
360f855941 Remove back implementations of GUI 2018-08-27 17:06:23 -05:00
dtvv
249105ca95 Tablayout remove my implementation, waiting for severiano library 2018-08-27 15:19:43 -05:00
dtvv
e2df388aa8 Corrections of innecesaries spaces in methods and classes 2018-08-27 15:04:35 -05:00
Severiano Jaramillo
f219ccee47 Temporal fix to avoid compilation errors 2018-08-27 13:03:15 -05:00
Severiano Jaramillo Quintanar
0514e3984e
Merge branch 'feat_ui_improvements' into feat_ui_improvements 2018-08-27 09:49:41 -05:00
dtvv
850784160e Normal manifest, not tests 2018-08-27 07:48:10 -05:00
dtvv
4836c03179 New unit test implementation github style for some UI implementations 2018-08-27 07:31:55 -05:00
dtvv
1fce05145d New unit test implementation github style for some UI implementations 2018-08-23 23:45:15 -05:00
dtvv
096171f327 -New unit testing design androi model for classes and complete system 
-Modularity in unitesting activities, example:
Test_DialogMaterialActivity.kt
Changes in class DialogMaterial.kt
 2018-08-22 19:00:39 -05:00
Javier Varona
08be77e9fb Merge branch 'develop' of https://github.com/Agorise/crystal-wallet-android into develop 2018-08-20 20:34:54 -04:00
Javier Varona
77b5d956ea - Getting the response from the Yubikey through NFC 
- Added TOTP class to calculate 6 digits code using RFC6238
 2018-08-20 20:28:46 -04:00
hvarona
b3201096a7 remove the nfc testing page 2018-08-18 21:54:41 -04:00
dtvv
6d06d307f3 -whiteclear color change name 2018-08-18 13:20:42 -05:00
dtvv
17f74b4774 -Correct OnErrorWebSocker to OnErrorWebSocket 2018-08-18 12:48:37 -05:00
hvarona
6caa84481c Change Server to point to bitshares main net 2018-08-18 01:18:59 -04:00
dtvv
d2d17bb6b4 -In the Send Assets window fix the “account name to” to get better visual effects 
-Integrate nice material spinner into crystal proyect
-Change in class SendTransactionValidator for material spinner
-Change in clas SendTransactionFragment for material spinner
-At end this nice spinner did not work well and i removed it
-Integrate this new nice material spinner into crystal proyect
-Modified classes:
SendTransactionFragment
SendTransactionValidator
ToValidationField
FromValidationField
-Create the first bubble inicial design background for the BroadActivity window
-Remove the transparent squares in the BroadActivity
-In the window of BroadActivity that the Tab tittles increase size when they are selected (tonigth)
-Integrate bubble background gif to android (tonigth)
 2018-08-17 12:08:49 -05:00
dtvv
119300d545 -Create class LoadingActivity.kt 
-Create loading_activity.xml layout
-Static interface integración in LoadingActivity.kt to entable simple use
-In the Board Window in the server connection show the new loading acitivity
-Take video called “Loading screen when socket server comunicación comes”
-In the Intro Window: When the user tríes to clic button and there are not server comunication it should show loading screen
-In the board window i tested that the gestores GUI works fine in real device
-In the BoardActivity there is a grey brand below first panel gui balances
-Change the Font in the BoardAcivity to be the same as in the video
-In the BoardActivity when clicling in sections that the sections show grayed for unselected and White for selected
-Change Bitshares Font style as the video
-In the window BroadActivity set the left icon more mall and the Font as in the video
 2018-08-17 00:43:03 -05:00
dtvv
f9995bf284 -Fix code Migration of kotlin: 
annotationProcessor  to kapt
-In screen IntroActivity: Show toast when there is not connection with server
-In screen Create Seed: Code to interface when error ocurs in WebSocketThread and GrapheneApiGenerator
-Fixes to class WebSocketThread for error Report to user
-Fixes to class BitsharesCryptoNetVerifier for error Report to user
-Fixes to class CryptoNetVerifier for error Report to user
-Fixes to class CryptoNetManager for error Report to user
-In the IntroScreen: If there is not server connection show a simple user message of that
-Create class ToastIt in kotlin
-Create class NetworkUtility in kotlin
-In the IntroScreen: When the user Press button “create account” it has to validate connection to server to continue
-In the IntroScreen: When the user Press button “Import account” it has to validate connection to server to continue
 2018-08-15 17:36:20 -05:00
dtvv
da8eda93b5 Change custom implementations of classes to kotlin 
*AccountSeedViewModel
*CreateSeedActivity
*UIValidator
*UIValidatorListener
*FieldsValidator
*CustomValidationField
*PinDoubleConfirmationValidationField
*BitsharesAccountNameValidation
-In the Send Assets window in the field Memo set it to max length to 255
 2018-08-14 16:15:45 -05:00
dtvv
f57305312b -In the screen “Create Account” in the Account Name validase that the string meets: 
*255 max length
*10 min length
*At least one Number
*At least one “middle guion”
*Only numbers and characters and middle script
*At least one character
-In the screen “Create Account” in the Field PIN and PIN confirm, at least 6 digits
-In the screen “Create Account” field validation at text change event
-In the screen “Create Account” create cleaner implementation of actual functionality with the clases:
*BitsharesAccountNameInterface
*PinDoubleConfirmationInterface
*UIValidator
*UIValidatorListener
*BitsharesAccountNameValidation
*CustomValidationField
*PinDoubleConfirmationValidationField
*CustomActivity
-In the screen “Create Account” change sections of code to better clear code
-In the screen “Create Account” error Messages show diferents
-In the screen “Create Account” while connecting with the server that shows the loading screen
-Crete of LoadingDialog material dialog class
-In the screen “Create Account” when the account exists show a toast
 2018-08-09 06:50:08 -05:00
hvarona
61b50b1465 Merge remote-tracking branch 'origin/develop' into develop 2018-08-02 23:04:50 -04:00
hvarona
f40d996282 Implementation of model for alt-coin (not graphene cryptos) 
Insight api base implementation
 2018-08-02 23:02:23 -04:00
Javier Varona
c4f0e9ef41 - Added functionality to PocketRequestActivity to verify the yubikey code (still in progress...) 2018-08-02 22:59:48 -04:00
dtvv
acd1f9cfb1 -Correct the variables convenion of the changes i have made in the code 
-In the screen of Create Seed that the size of the two buttons be the same te get armonony in the visual
-In the screen of Create Seed that the button of CREATE WALLET get disabled till all fields be correctly to continue
-In the screen of Create Seed show some info about PIN functionality
-In the screen of Create Seed at the moment the window appears, the Focus automatically is set on the first PIN field and show the keyboard
-In the screen of Create Seed set the limit for the Account Name field to 255
 2018-08-01 17:11:26 -05:00
dtvv
7a9c4c0012 -Toast after copy to clipboard in backupseed window 
-Integrate https://github.com/afollestad/material-dialogs in androide app by gradle
-Change the loading dialog in the registration window for the new one material
-In the registration window in the PIN sections, i fixed the max length validation to 32 in both Fields
 2018-07-31 14:13:19 -05:00
dtvv
1cd36489eb -I fix a bug: The loading icon was static after the registraron of the user. (I attached prove in telegram) 
-Change “seed” text to “Backup brainkey”
-Add backup leyend
-Set icon for button ok
-Add button “Copy” to copy brainkey to clipboard
-Develope algoritm for copy to clipboard functionality
 2018-07-31 13:18:13 -05:00
Javier Varona
44f43cd126 Merge branch 'develop' of https://github.com/Agorise/crystal-wallet-android into develop 2018-07-26 22:58:49 -04:00
Javier Varona
6117fc0f99 - Added Pocket Security Functionality (still in progress...) 2018-07-26 22:58:12 -04:00
Severiano Jaramillo
3008415316 Improve create/modify contact UI 2018-07-12 10:32:01 -05:00
Severiano Jaramillo
bd0bbfa802 Hide add contact button when scrolling down the contacts list 2018-07-11 16:51:15 -05:00
Severiano Jaramillo
b3501a3a89 Remove contacts list bouncy efect for now 2018-07-11 13:23:54 -05:00
Severiano Jaramillo
656ce4afb2 Terminate Intro and License activities when starting the following activities to avoid memory leaks 2018-07-11 12:41:00 -05:00
Severiano Jaramillo
99a4dc254d Add bounce effect to contacts list 2018-07-10 17:43:40 -05:00
Severiano Jaramillo
7e51385dc0 Simplify Contacts section 2018-07-10 16:19:10 -05:00
Severiano Jaramillo
ff2a58bcf8 Improve Contact elements layout 2018-07-09 18:33:42 -05:00
Severiano Jaramillo
09009e003c Merge branch 'feat_ui_improvements' into develop 2018-07-09 10:52:41 -05:00
Severiano Jaramillo
d14f07f278 Fix contacts section not able to scroll 2018-07-09 10:51:32 -05:00
Javier Varona
5b21c0719e - Adjusting send and receive fragment to work with multiaccounts 2018-06-27 22:29:30 -04:00
hvarona
594bd4b816 Make the grapheneapi multi account compatible 2018-06-27 20:49:26 -04:00
hvarona
3b66b91807 Make the grapheneapi multi account compatible 2018-06-27 20:45:25 -04:00
hvarona
84cc13b5f6 Make the grapheneapi multi account compatible 2018-06-26 23:13:39 -04:00
Severiano Jaramillo
84a6b331ad Rename avatar_placeholder image 2018-06-22 12:44:23 -05:00
Severiano Jaramillo
1456b58e7a Select transaction arroy and left view color according to the direction of the payment (received or sent) 2018-06-21 16:56:24 -05:00
Severiano Jaramillo
a0075117d1 Add Body1 and Body2 text styles and use them on the transactions items 2018-06-21 16:15:36 -05:00
Severiano Jaramillo
7084be4696 Improve transactions UI/UX 2018-06-21 15:08:50 -05:00
Severiano Jaramillo
f104e49a6c Removed unused drawables 2018-06-21 11:54:07 -05:00
hvarona
c2d13087e9 Added function on bitshares manager to retrieve the accounts name from the account id 2018-06-20 23:08:03 -04:00
Javier Varona
1d87c9b307 Merge branch 'develop' of https://github.com/Agorise/crystal-wallet-android into develop 2018-06-20 22:27:02 -04:00
Javier Varona
a5dcf393bf - Added function to Crystal Service to get the bitshares account names of the transaction's accounts id 2018-06-20 22:25:53 -04:00
Severiano Jaramillo
2fef7769ae Improve Settings toolbar layout 2018-06-20 19:53:47 -05:00
Severiano Jaramillo
17b0124946 Update AnimatedTabLayout library and set Settings tab bold text 2018-06-20 19:41:31 -05:00
Severiano Jaramillo
c19839a921 Add AnimatedTabLayout library to project and use it in the SettingsActivity, the library still needs some improvements to use it correctly on the MainActivity (Board) 2018-06-20 17:25:29 -05:00
Severiano Jaramillo
cea9e8faeb Set room database's exportSchema to false to avoid the generation of unnecessary json files on the migration to each new database version 2018-06-18 21:04:00 -05:00
hvarona
0228ca54d9 fixed bitsahres account name cache dao 2018-06-18 21:13:30 -04:00
hvarona
d0df53d8e2 Bitshares manager use the new bitshares account cache 2018-06-17 09:47:32 -04:00
Javier Varona
39a8a1e446 - Now the transactions list use first the contact name, then the bitshares account name and finally the user's account name. If none of them is useful, the bitshares account id will appear instead. 2018-06-16 22:17:27 -04:00
Javier Varona
bb2e98431b Merge branch 'develop' of https://github.com/Agorise/crystal-wallet-android into develop 2018-06-15 22:00:20 -04:00
Javier Varona
edb197a981 - Deleted file that should not be in the git 2018-06-15 21:59:21 -04:00
Javier Varona
145598591a - Adding Bitshares Account Name Cache 2018-06-15 21:56:50 -04:00
Severiano Jaramillo
eaca109e41 Update ConstraintLayout dependency 2018-06-14 15:40:38 -05:00
Severiano Jaramillo
47d7be4bbe Add schemas json file 2018-06-14 15:22:35 -05:00
Javier Varona
52f5696714 Merge branch 'master' into develop 2018-06-12 20:58:45 -04:00
Javier Varona
574b61d2b7 - Fixed Toast when trying to upgrade account 
- Now the CryptoNetRequests are deleted when carry out
 2018-06-10 20:10:55 -04:00
hvarona
f482fa8354 Update Room libraries to be compatible with the gradle version 3.1.2 2018-06-10 14:35:06 -04:00
hvarona
008a24177e Merge branch 'develop' of https://github.com/Agorise/crystal-wallet-android 2018-06-10 13:28:37 -04:00
hvarona
1e96a64fb2 Merge remote-tracking branch 'origin/master' 2018-06-09 00:06:24 -04:00
hvarona
31dc5ea817 change the packing options to exclude other platform libraries 2018-06-09 00:06:02 -04:00
Severiano Jaramillo
f56d942f73 Update Gradle version to 3.1.2 and minor changes to app Gradle module 2018-06-07 10:22:25 -05:00
Javier Varona
42e8637d11 - Change account seed list in profile settings to crypto net account list 
- Added settings for crypto net accounts. General settings for any crypto net account and Bitshares settings for bitshares accounts
- Added new field in db for bitshares accounts: upgraded_to_ltm
- Added button to upgrade to ltm (still in progress...)
 2018-05-30 21:19:46 -04:00
hvarona
7e3b7a02ff Change Version 2018-05-25 14:54:07 -04:00
Severiano Jaramillo
6fe788b640 Change app logo 2018-05-25 13:51:41 -05:00
Javier Varona
3252062e74 - Making LicenseActivity save the last version of the license accepted 2018-05-25 14:30:45 -04:00
Severiano Jaramillo
a31e377d63 Add temporal application logo 2018-05-25 12:21:55 -05:00
Severiano Jaramillo
5b341fb018 Create LicenseActivity and blue and green button styles 2018-05-25 11:47:00 -05:00
Javier Varona
9989fbbb74 - Change default profile image 
- Make some visual elements, not working yet, invisible
- Put bitshares icon in balance item title
 2018-05-23 21:47:19 -04:00
Javier Varona
4f8df9deaf Merge branch 'master' of https://github.com/Agorise/crystal-wallet-android 2018-05-21 21:38:30 -04:00
Javier Varona
e9e495b366 - Transaction search implemented 
- Now the transaction list print contact name when the address match with that contact
 2018-05-21 21:38:05 -04:00
hvarona
e3ca1c903b Implemented upgrade LTM service 2018-05-16 22:21:32 -04:00
hvarona
dd78076906 Merge remote-tracking branch 'origin/master' 2018-05-16 22:07:58 -04:00
hvarona
61d2458059 Implemented the Account Upgrade to LTM operation 2018-05-16 22:07:29 -04:00
Javier Varona
17dfc3e074 Merge branch 'master' of https://github.com/Agorise/crystal-wallet-android 2018-05-13 21:25:34 -04:00
Javier Varona
f00427ed19 - Security Improved: Now when the user tries to set a new security setting gets directly to the block screen (when there is a security setting already set) 
- Now the "None" security setting works
 2018-05-13 21:25:03 -04:00