aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysAdapter.java
Commit message (Collapse)AuthorAgeFilesLines
* Shifted duplicate method implementations from KeyRing to openpgp-api submoduleAlex Fong2016-05-151-1/+2
|
* Make import keys activity honour the themeThialfihar2015-07-211-3/+3
| | | | | | | | | This changes the light theme slightly as well, it uses the actual background instead of pure white and removes the thick superfluous divider on top. The divider at the bottom now has no margin, making the separation from the FrameLayout on top more consistent, especially when there is scrollable content.
* Make main text color themeableThialfihar2015-07-211-2/+2
|
* Give key flag colors their own color namesThialfihar2015-07-211-7/+7
| | | | | This removes "bg_gray" and selector_transparent_button.xml, which is unused and the last file to reference "bg_gray".
* split import and export opsAdithya Abraham Philip2015-06-271-2/+3
|
* object oriented split user idDominik Schürmann2015-03-161-6/+6
|
* #1042 replaced some int constants with enumsDaniel Nelz2015-03-041-2/+3
| | | | | Created enum FragAction in CreateKeyActivity.java and enum State in KeyFormattingUtils.java and replaced int constants with them
* Merge keybase-proof branchDominik Schürmann2015-02-271-1/+17
|\
| * In the ImportKeysList display, arrange for Keybase UserIDs to sort below the ↵Tim Bray2014-11-181-1/+17
| | | | | | | | rest. Also mention Keybase stuff other than Twitter/GitHub/Website
* | First work on new key view toolbarDominik Schürmann2015-02-251-2/+2
| |
* | lift language level to java 7, and some code cleanupVincent Breitmoser2015-01-251-2/+2
|/
* Merge branch 'development' of github.com:open-keychain/open-keychain into ↵Dominik Schürmann2014-10-251-1/+10
|\ | | | | | | development
| * remove unnecessary (and buggy) BufferedInputStream wrappingVincent Breitmoser2014-10-251-1/+10
| |
* | Fix color in import listDominik Schürmann2014-10-251-6/+8
|/
* consistency for import UIDominik Schürmann2014-10-161-5/+27
|
* fix nullpointer on button push while data is still loadingVincent Breitmoser2014-10-031-0/+3
| | | | fixes #934
* actually use iterator interface for ParcelableFileCache in activitiesVincent Breitmoser2014-10-031-8/+3
|
* Merge user ids in import list for better displayDominik Schürmann2014-09-211-17/+32
|
* Beautify key id (thanks to Tim Bray)Dominik Schürmann2014-09-191-1/+1
|
* Use key icons in import, prettify itemsDominik Schürmann2014-09-181-4/+19
|
* package reordering: merge util and helper, there were no real difference; ↵Dominik Schürmann2014-09-171-1/+1
| | | | created ui.util for everything related to formatting
* add ecc supportVincent Breitmoser2014-08-241-2/+2
|
* Edit key: subkey adding, not finishedDominik Schürmann2014-08-041-1/+1
|
* fix nullpointerexception in importkeyactivityVincent Breitmoser2014-06-281-0/+4
|
* Work on Qr code importDominik Schürmann2014-06-201-1/+1
|
* Clean up keyimport.ImportKeysListEntryTim Bray2014-06-051-9/+8
|
* Merge pull request #645 from timbray/masterDominik Schürmann2014-06-051-6/+2
|\ | | | | Don't show full fingerprint in key search result lists
| * Don't show full fingerprint in key search resultsTim Bray2014-06-051-6/+2
| |
* | neatness refactoringVincent Breitmoser2014-06-041-2/+2
|/
* wrapped-key-ring: move key data around in ParcelableKeyRing instead of ↵Vincent Breitmoser2014-06-021-1/+2
| | | | ImportKeysListEntry
* Add highlighting to keyserver/keybase searchThialfihar2014-05-161-3/+5
|
* Rename fingerPrint to fingerprintThialfihar2014-05-141-2/+2
|
* Don't guess keybase key algorithm and sizeThialfihar2014-05-141-1/+6
| | | | | Once keybase reports them, we can display them. Until then we simply don't know and shouldn't lie about it.
* Move logic classes for import into own sub-packageDominik Schürmann2014-05-061-0/+1
|
* New key view design, using Android flat buttons and Android iconsDominik Schürmann2014-05-051-2/+1
|
* More code cleanupDominik Schürmann2014-04-191-3/+3
|
* Fix ViewHolder in ImportKeysAdapterDominik Schürmann2014-04-151-24/+28
|
* Update license header for 2014Dominik Schürmann2014-04-131-1/+1
|
* Prettify more layoutsDominik Schürmann2014-04-111-5/+5
|
* Rename folder structure from OpenPGP Keychain to OpenKeychainDominik Schürmann2014-04-061-0/+186