From 42faf0eb07a1b37becbae5beae29ef5ecf00e746 Mon Sep 17 00:00:00 2001 From: Thialfihar Date: Tue, 8 Apr 2014 11:46:41 +0200 Subject: Update copyright timespan for Thialfihar --- .../src/main/java/org/sufficientlysecure/keychain/Constants.java | 2 +- .../src/main/java/org/sufficientlysecure/keychain/Id.java | 8 ++++---- .../java/org/sufficientlysecure/keychain/helper/Preferences.java | 2 +- .../org/sufficientlysecure/keychain/pgp/PgpDecryptVerify.java | 2 +- .../main/java/org/sufficientlysecure/keychain/pgp/PgpHelper.java | 2 +- .../java/org/sufficientlysecure/keychain/pgp/PgpImportExport.java | 2 +- .../java/org/sufficientlysecure/keychain/pgp/PgpKeyHelper.java | 2 +- .../java/org/sufficientlysecure/keychain/pgp/PgpKeyOperation.java | 2 +- .../java/org/sufficientlysecure/keychain/pgp/PgpSignEncrypt.java | 2 +- .../main/java/org/sufficientlysecure/keychain/pgp/PgpToX509.java | 2 +- .../keychain/pgp/exception/NoAsymmetricEncryptionException.java | 2 +- .../keychain/pgp/exception/PgpGeneralException.java | 2 +- .../keychain/pgp/exception/PgpGeneralMsgIdException.java | 2 +- .../sufficientlysecure/keychain/provider/KeychainProvider.java | 2 +- .../java/org/sufficientlysecure/keychain/ui/DecryptActivity.java | 2 +- .../java/org/sufficientlysecure/keychain/ui/EditKeyActivity.java | 2 +- .../java/org/sufficientlysecure/keychain/ui/EncryptActivity.java | 2 +- .../org/sufficientlysecure/keychain/ui/PreferencesActivity.java | 2 +- .../keychain/ui/PreferencesKeyServerActivity.java | 2 +- .../sufficientlysecure/keychain/ui/SelectPublicKeyActivity.java | 2 +- .../sufficientlysecure/keychain/ui/SelectPublicKeyFragment.java | 2 +- .../sufficientlysecure/keychain/ui/SelectSecretKeyFragment.java | 2 +- .../java/org/sufficientlysecure/keychain/ui/widget/Editor.java | 2 +- .../java/org/sufficientlysecure/keychain/ui/widget/KeyEditor.java | 2 +- .../sufficientlysecure/keychain/ui/widget/KeyServerEditor.java | 2 +- .../org/sufficientlysecure/keychain/ui/widget/SectionView.java | 2 +- .../org/sufficientlysecure/keychain/ui/widget/UserIdEditor.java | 2 +- .../main/java/org/sufficientlysecure/keychain/util/Choice.java | 2 +- .../java/org/sufficientlysecure/keychain/util/HkpKeyServer.java | 2 +- .../org/sufficientlysecure/keychain/util/IterableIterator.java | 2 +- .../main/java/org/sufficientlysecure/keychain/util/KeyServer.java | 2 +- .../main/java/org/sufficientlysecure/keychain/util/Primes.java | 2 +- .../sufficientlysecure/keychain/util/ProgressDialogUpdater.java | 2 +- OpenKeychain/src/main/res/layout/import_keys_list_entry.xml | 2 +- .../src/main/res/layout/import_keys_list_entry_user_id.xml | 2 +- OpenKeychain/src/main/res/xml/adv_preferences.xml | 2 +- OpenKeychain/src/main/res/xml/gen_preferences.xml | 4 ++-- OpenKeychain/src/main/res/xml/preference_headers.xml | 4 ++-- OpenKeychain/src/main/res/xml/preference_headers_legacy.xml | 4 ++-- OpenKeychain/src/main/res/xml/searchable_public_keys.xml | 4 ++-- OpenKeychain/src/main/res/xml/searchable_secret_keys.xml | 4 ++-- 41 files changed, 49 insertions(+), 49 deletions(-) diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/Constants.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/Constants.java index b3bfaa229..740360598 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/Constants.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/Constants.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 Thialfihar + * Copyright (C) 2010-2014 Thialfihar * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/Id.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/Id.java index 784ec340e..85baee45d 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/Id.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/Id.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 Thialfihar + * Copyright (C) 2010-2014 Thialfihar * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -19,11 +19,11 @@ package org.sufficientlysecure.keychain; import org.spongycastle.bcpg.CompressionAlgorithmTags; /** - * + * * TODO: - * + * * - refactor ids, some are not needed and can be done with xml - * + * */ public final class Id { diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/helper/Preferences.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/helper/Preferences.java index ca5555fea..fae757cbd 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/helper/Preferences.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/helper/Preferences.java @@ -1,6 +1,6 @@ /* * Copyright (C) 2012 Dominik Schürmann - * Copyright (C) 2010 Thialfihar + * Copyright (C) 2010-2014 Thialfihar * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpDecryptVerify.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpDecryptVerify.java index 8a0bf99d7..f75d6929f 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpDecryptVerify.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpDecryptVerify.java @@ -1,6 +1,6 @@ /* * Copyright (C) 2012-2014 Dominik Schürmann - * Copyright (C) 2010 Thialfihar + * Copyright (C) 2010-2014 Thialfihar * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpHelper.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpHelper.java index f884b1776..1ca6dd088 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpHelper.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpHelper.java @@ -1,6 +1,6 @@ /* * Copyright (C) 2012-2013 Dominik Schürmann - * Copyright (C) 2010 Thialfihar + * Copyright (C) 2010-2014 Thialfihar * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpImportExport.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpImportExport.java index d03f3ccc2..0fe281e65 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpImportExport.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpImportExport.java @@ -1,6 +1,6 @@ /* * Copyright (C) 2012-2013 Dominik Schürmann - * Copyright (C) 2010 Thialfihar + * Copyright (C) 2010-2014 Thialfihar * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyHelper.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyHelper.java index 4c786f555..d47095143 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyHelper.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyHelper.java @@ -1,6 +1,6 @@ /* * Copyright (C) 2012-2013 Dominik Schürmann - * Copyright (C) 2010 Thialfihar + * Copyright (C) 2010-2014 Thialfihar * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperation.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperation.java index 48b959738..b830efdf5 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperation.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperation.java @@ -1,6 +1,6 @@ /* * Copyright (C) 2012-2013 Dominik Schürmann - * Copyright (C) 2010 Thialfihar + * Copyright (C) 2010-2014 Thialfihar * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncrypt.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncrypt.java index a864a165d..9f8383826 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncrypt.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncrypt.java @@ -1,6 +1,6 @@ /* * Copyright (C) 2012-2014 Dominik Schürmann - * Copyright (C) 2010 Thialfihar + * Copyright (C) 2010-2014 Thialfihar * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpToX509.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpToX509.java index 5bb1665b6..da1783f8a 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpToX509.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpToX509.java @@ -1,6 +1,6 @@ /* * Copyright (C) 2012-2014 Dominik Schürmann - * Copyright (C) 2010 Thialfihar + * Copyright (C) 2010-2014 Thialfihar * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/exception/NoAsymmetricEncryptionException.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/exception/NoAsymmetricEncryptionException.java index 23c4bbbd9..51f19fc7a 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/exception/NoAsymmetricEncryptionException.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/exception/NoAsymmetricEncryptionException.java @@ -1,6 +1,6 @@ /* * Copyright (C) 2012-2013 Dominik Schürmann - * Copyright (C) 2010 Thialfihar + * Copyright (C) 2010-2014 Thialfihar * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/exception/PgpGeneralException.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/exception/PgpGeneralException.java index 418445367..03f6c6e3f 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/exception/PgpGeneralException.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/exception/PgpGeneralException.java @@ -1,6 +1,6 @@ /* * Copyright (C) 2012-2013 Dominik Schürmann - * Copyright (C) 2010 Thialfihar + * Copyright (C) 2010-2014 Thialfihar * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/exception/PgpGeneralMsgIdException.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/exception/PgpGeneralMsgIdException.java index caa7842db..02895023d 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/exception/PgpGeneralMsgIdException.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/exception/PgpGeneralMsgIdException.java @@ -1,6 +1,6 @@ /* * Copyright (C) 2012-2013 Dominik Schürmann - * Copyright (C) 2010 Thialfihar + * Copyright (C) 2010-2014 Thialfihar * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainProvider.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainProvider.java index 9b9e4991d..9aa2ac76f 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainProvider.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainProvider.java @@ -1,6 +1,6 @@ /* * Copyright (C) 2012-2014 Dominik Schürmann - * Copyright (C) 2010 Thialfihar + * Copyright (C) 2010-2014 Thialfihar * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptActivity.java index 8533e9072..f67e6db26 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptActivity.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptActivity.java @@ -1,6 +1,6 @@ /* * Copyright (C) 2012-2014 Dominik Schürmann - * Copyright (C) 2010 Thialfihar + * Copyright (C) 2010-2014 Thialfihar * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyActivity.java index 93d5688b9..302dec34e 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyActivity.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyActivity.java @@ -1,6 +1,6 @@ /* * Copyright (C) 2012-2014 Dominik Schürmann - * Copyright (C) 2010 Thialfihar + * Copyright (C) 2010-2014 Thialfihar * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptActivity.java index a03c7d797..288a64690 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptActivity.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptActivity.java @@ -1,6 +1,6 @@ /* * Copyright (C) 2012-2014 Dominik Schürmann - * Copyright (C) 2010 Thialfihar + * Copyright (C) 2010-2014 Thialfihar * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/PreferencesActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/PreferencesActivity.java index 265bb2139..538797caa 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/PreferencesActivity.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/PreferencesActivity.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 Thialfihar + * Copyright (C) 2010-2014 Thialfihar * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/PreferencesKeyServerActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/PreferencesKeyServerActivity.java index 719378274..91daa8c46 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/PreferencesKeyServerActivity.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/PreferencesKeyServerActivity.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 Thialfihar + * Copyright (C) 2010-2014 Thialfihar * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/SelectPublicKeyActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/SelectPublicKeyActivity.java index 874703704..5a2a12232 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/SelectPublicKeyActivity.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/SelectPublicKeyActivity.java @@ -1,6 +1,6 @@ /* * Copyright (C) 2012 Dominik Schürmann - * Copyright (C) 2010 Thialfihar + * Copyright (C) 2010-2014 Thialfihar * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/SelectPublicKeyFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/SelectPublicKeyFragment.java index 9bfe3eaa9..98a5a6779 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/SelectPublicKeyFragment.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/SelectPublicKeyFragment.java @@ -1,6 +1,6 @@ /* * Copyright (C) 2012-2013 Dominik Schürmann - * Copyright (C) 2010 Thialfihar + * Copyright (C) 2010-2014 Thialfihar * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/SelectSecretKeyFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/SelectSecretKeyFragment.java index 9987facbc..389ad74a9 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/SelectSecretKeyFragment.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/SelectSecretKeyFragment.java @@ -1,6 +1,6 @@ /* * Copyright (C) 2012-2014 Dominik Schürmann - * Copyright (C) 2010 Thialfihar + * Copyright (C) 2010-2014 Thialfihar * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/Editor.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/Editor.java index 7b21c189d..80c77823c 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/Editor.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/Editor.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 Thialfihar + * Copyright (C) 2010-2014 Thialfihar * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/KeyEditor.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/KeyEditor.java index c7bd1c987..3f5b61494 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/KeyEditor.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/KeyEditor.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 Thialfihar + * Copyright (C) 2010-2014 Thialfihar * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/KeyServerEditor.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/KeyServerEditor.java index 171763672..dc7596393 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/KeyServerEditor.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/KeyServerEditor.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 Thialfihar + * Copyright (C) 2010-2014 Thialfihar * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/SectionView.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/SectionView.java index fb59cd3b7..eb4dcae26 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/SectionView.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/SectionView.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 Thialfihar + * Copyright (C) 2010-2014 Thialfihar * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/UserIdEditor.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/UserIdEditor.java index 2253872d5..767c218a1 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/UserIdEditor.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/UserIdEditor.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 Thialfihar + * Copyright (C) 2010-2014 Thialfihar * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/Choice.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/Choice.java index 1a6184d9c..6ba9d4d0d 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/Choice.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/Choice.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 Thialfihar + * Copyright (C) 2010-2014 Thialfihar * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/HkpKeyServer.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/HkpKeyServer.java index 5efc732e4..d1753de83 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/HkpKeyServer.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/HkpKeyServer.java @@ -1,6 +1,6 @@ /* * Copyright (C) 2012-2014 Dominik Schürmann - * Copyright (C) 2011 Thialfihar + * Copyright (C) 2011-2014 Thialfihar * Copyright (C) 2011 Senecaso * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/IterableIterator.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/IterableIterator.java index 3af674526..322c035db 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/IterableIterator.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/IterableIterator.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 Thialfihar + * Copyright (C) 2010-2014 Thialfihar * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/KeyServer.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/KeyServer.java index 7f70867a5..2b97165ac 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/KeyServer.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/KeyServer.java @@ -1,6 +1,6 @@ /* * Copyright (C) 2012-2014 Dominik Schürmann - * Copyright (C) 2011 Thialfihar + * Copyright (C) 2011-2014 Thialfihar * Copyright (C) 2011 Senecaso * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/Primes.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/Primes.java index 28a12bf37..a3bbd5389 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/Primes.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/Primes.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 Thialfihar + * Copyright (C) 2010-2014 Thialfihar * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/ProgressDialogUpdater.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/ProgressDialogUpdater.java index 26c05ad0a..e4f763e2e 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/ProgressDialogUpdater.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/ProgressDialogUpdater.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 Thialfihar + * Copyright (C) 2010-2014 Thialfihar * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/OpenKeychain/src/main/res/layout/import_keys_list_entry.xml b/OpenKeychain/src/main/res/layout/import_keys_list_entry.xml index f5a39f115..3068567ce 100644 --- a/OpenKeychain/src/main/res/layout/import_keys_list_entry.xml +++ b/OpenKeychain/src/main/res/layout/import_keys_list_entry.xml @@ -1,6 +1,6 @@