cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
5,828 Commits 1 Branch 0 Tags
40d6d1f750e1efe86650f3f411cbd7fba4c00cb4
Commit Graph

5828 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andrea Torlaschi
40d6d1f750 ImportKeys: Add import button to cards 
- Adapt things to material design
 2016-08-19 22:35:35 +02:00
Andrea Torlaschi
5858257bab ImportKeys: Add method for single import 2016-08-19 22:35:34 +02:00
Andrea Torlaschi
db1e8b60ca ImportKeys: Extract interface and refactoring 
ImportKeys: Extract interface and refactoring
 2016-08-19 22:35:34 +02:00
Andrea Torlaschi
7cb13bf06f ImportKeys: Extract duplicate code for permissions 2016-08-19 22:35:33 +02:00
Andrea Torlaschi
5e93b68b6e ImportKeys: Refactoring 2016-08-19 22:35:32 +02:00
Andrea Torlaschi
9f7320b857 ImportKeys: Cleanup 
- Move loader package inside keyimport package
- Change name of variables
- Remove unused images
 2016-08-19 22:35:32 +02:00
Andrea Torlaschi
155ebc4d69 ImportKeys: Add ability to import all keys in a file 
- Remove ability to select keys
(We will add ability to import a single key)
 2016-08-19 22:35:31 +02:00
Andrea Torlaschi
c41b658e8f ImportKeys: Add menu in import fragments 
- Move cloud settings to menu
- TODO: Import all keys
 2016-08-19 22:35:30 +02:00
Andrea Torlaschi
a0f371af41 ImportKeys: Refactoring 
Move loader related class to a separate package
 2016-08-19 22:35:30 +02:00
Andrea Torlaschi
96f405f5ee ImportKeys: Remove bottom toolbar 2016-08-19 22:35:29 +02:00
Andrea Torlaschi
d9562461eb ImportKeys: Add empty list message 2016-08-19 22:35:28 +02:00
Andrea Torlaschi
8ae245e6df ImportKeys: Use Toolbar for Import button 2016-08-19 22:35:28 +02:00
Andrea Torlaschi
f52e4a8c7f ImportKeys: Use CardView for the list and change layout 2016-08-19 22:35:27 +02:00
Andrea Torlaschi
0eceed88ff ImportKeys: cleanup 2016-08-19 22:35:27 +02:00
Andrea Torlaschi
53691d7315 ImportKeys: Switch from ListFragment to RecyclerView 
This is the first step for:
 - use CardView for the list
 - improve ImportKeysListFragment
 2016-08-19 22:35:26 +02:00
Dominik Schürmann
db888140d2 Merge pull request #1915 from nmikhailov/travis_fix 
Fix travis android-24 dep
 2016-08-18 20:41:11 +02:00
Nikita Mikhailov
217f6ce490 Fix travis 2016-08-19 00:40:02 +07:00
Dominik Schürmann
4d5c18b0b6 Merge pull request #1916 from runnerway/readme 
README: Fix commands to run tests
 2016-08-18 18:29:27 +02:00
Andrea Torlaschi
535fe3ebe4 README: Fix commands to run tests 2016-08-18 17:37:17 +02:00
Dominik Schürmann
9adaf1434f Block 20 most chosen PINs 2016-08-16 03:23:43 +02:00
Dominik Schürmann
0733984e3f 4.2 beta1 2016-08-15 14:31:45 +02:00
Dominik Schürmann
ac1c20f961 Update build environment to SDK 24 2016-08-15 08:37:23 +02:00
Dominik Schürmann
356eb23c5d Merge pull request #1886 from runnerway/test-01 
Instrumented unit tests: fix for execution
 2016-08-15 08:11:48 +02:00
Dominik Schürmann
de0c02e044 Merge pull request #1868 from nmikhailov/nitrokey 
WIP: Security token USB handling improvements
 2016-08-15 07:46:27 +02:00
Nikita Mikhailov
c12d62f309 Apply some CR suggestions 2016-08-15 00:27:07 +07:00
Nikita Mikhailov
f79f1609c8 Add default GNUK vid:pid to devices list 2016-08-15 00:02:35 +07:00
Nikita Mikhailov
78d48c467d Merge remote-tracking branch 'origin/master' into nitrokey 2016-08-14 22:17:58 +07:00
Dominik Schürmann
907e8aa6e6 Version 4.1 2016-08-08 17:56:42 +02:00
Dominik Schürmann
f56a755ee8 Update from transifex 2016-08-08 17:52:31 +02:00
Dominik Schürmann
4063eed531 Update changelog 2016-08-08 17:45:13 +02:00
Vincent Breitmoser
dab4edb24e inputdataoperation: Only consider data MIME if Content-Type header is present 2016-07-24 15:13:43 +02:00
Andrea Torlaschi
fa926c7241 travis: add delay to increase reliability 2016-07-12 21:50:53 +02:00
Andrea Torlaschi
635358189c androidTest: Increase activity wait time 
To be more safe.
 2016-07-12 21:50:52 +02:00
Andrea Torlaschi
4322a38097 travis: start two build jobs 
- unit tests
- androidTests
 2016-07-12 21:50:51 +02:00
Andrea Torlaschi
0f2a22cd29 androidTest: Wait for activities to start 
This is needed to correctly run tests on Travis.
I think it's not a Travis fault. Probably espresso doesn't work well with PendingIntent.
 2016-07-12 21:50:51 +02:00
Andrea Torlaschi
8d43785770 androidTest: Remove broken tests 2016-07-12 21:50:37 +02:00
Andrea Torlaschi
b214cac76e travis: add androidTests 2016-07-12 21:43:14 +02:00
Andrea Torlaschi
1a7a1f1a60 travis: cleanup 2016-07-12 21:43:14 +02:00
Andrea Torlaschi
3b4f608ba1 androidTest: Fix OpenPgpServiceTest 
- fix class to solve exception
- add sleeps to wait for activities (ugly)
 2016-07-12 21:43:13 +02:00
Andrea Torlaschi
77284a3594 androidTest: Fix errors introduced by changes of the code 2016-07-12 21:43:12 +02:00
Andrea Torlaschi
6cecb42389 androidTest: Add proguard file for test 
For now we use the same as for other configurations.
 2016-07-12 21:43:12 +02:00
Dominik Schürmann
166ac9832b Merge branch 'master' of github.com:open-keychain/open-keychain 2016-07-11 10:55:30 +02:00
Dominik Schürmann
0ad0023fac Passphrase dialog: Button to switch between keyboard layouts 2016-07-11 10:55:05 +02:00
Vincent Breitmoser
aac5ae3a2c handle first time wizard after import from token 2016-07-09 13:42:56 +02:00
Dominik Schürmann
0011c5adac Version 4.1 beta3 2016-07-07 15:59:35 +02:00
Dominik Schürmann
826607db56 Version 4.0.3 2016-07-07 15:57:27 +02:00
Vincent Breitmoser
568b9e1845 use correct method for matching user ids 2016-07-07 15:55:10 +02:00
Dominik Schürmann
fe453ff011 Version 4.1 beta2 2016-07-07 14:43:06 +02:00
Dominik Schürmann
b9fcd298df Version 4.0.2 2016-07-07 14:36:15 +02:00
Dominik Schürmann
6152553593 Pull from transifex 2016-07-07 14:33:34 +02:00