From e95ec50b468958db084cdbb03b275fb2d0e6aa4d Mon Sep 17 00:00:00 2001 From: Dominik Date: Sat, 14 Apr 2012 16:18:06 +0200 Subject: [PATCH] changing package name back --- org_apg/AndroidManifest.xml | 50 +++++++++---------- org_apg/res/layout/edit_key_key_item.xml | 4 +- org_apg/res/layout/edit_key_section.xml | 4 +- org_apg/res/layout/edit_key_user_id_item.xml | 4 +- org_apg/res/layout/key_server_editor.xml | 4 +- org_apg/res/layout/main.xml | 4 +- org_apg/res/values/static_strings.xml | 2 +- org_apg/res/values/strings.xml | 4 +- org_apg/res/xml/apg_preferences.xml | 10 ++-- .../org/{ => thialfihar/android}/apg/Apg.java | 32 ++++++------ .../android}/apg/ApgService.java | 11 ++-- .../apg/AskForSecretKeyPassPhrase.java | 4 +- .../android}/apg/CachedPassPhrase.java | 2 +- .../android}/apg/Constants.java | 2 +- .../android}/apg/DataDestination.java | 6 +-- .../android}/apg/DataSource.java | 6 +-- .../android}/apg/FileDialog.java | 4 +- .../android}/apg/HkpKeyServer.java | 2 +- .../android}/apg/IApgService.aidl | 2 +- .../org/{ => thialfihar/android}/apg/Id.java | 2 +- .../android}/apg/InputData.java | 2 +- .../android}/apg/KeyServer.java | 2 +- .../android}/apg/PausableThread.java | 2 +- .../apg/PositionAwareInputStream.java | 2 +- .../android}/apg/Preferences.java | 2 +- .../{ => thialfihar/android}/apg/Primes.java | 2 +- .../android}/apg/ProgressDialogUpdater.java | 2 +- .../{ => thialfihar/android}/apg/Service.java | 2 +- .../apg/provider/ApgServiceBlobDatabase.java | 4 +- .../apg/provider/ApgServiceBlobProvider.java | 8 +-- .../android}/apg/provider/DataProvider.java | 6 +-- .../android}/apg/provider/Database.java | 10 ++-- .../android}/apg/provider/KeyRings.java | 2 +- .../android}/apg/provider/Keys.java | 2 +- .../android}/apg/provider/UserIds.java | 2 +- .../android/apg/service/ApgService.java | 12 +++++ .../android}/apg/ui/AboutActivity.java | 6 +-- .../android}/apg/ui/BaseActivity.java | 20 ++++---- .../android}/apg/ui/DecryptActivity.java | 24 ++++----- .../android}/apg/ui/EditKeyActivity.java | 20 ++++---- .../android}/apg/ui/EncryptActivity.java | 24 ++++----- .../android}/apg/ui/GeneralActivity.java | 10 ++-- .../android}/apg/ui/HelpActivity.java | 6 +-- .../apg/ui/ImportFromQRCodeActivity.java | 14 +++--- .../android}/apg/ui/KeyListActivity.java | 20 ++++---- .../apg/ui/KeyServerExportActivity.java | 12 ++--- .../apg/ui/KeyServerPreferenceActivity.java | 12 ++--- .../apg/ui/KeyServerQueryActivity.java | 20 ++++---- .../android}/apg/ui/MailListActivity.java | 8 +-- .../android}/apg/ui/MainActivity.java | 8 +-- .../android}/apg/ui/PreferencesActivity.java | 14 +++--- .../apg/ui/PublicKeyListActivity.java | 10 ++-- .../apg/ui/SecretKeyListActivity.java | 12 ++--- .../apg/ui/SelectPublicKeyListActivity.java | 10 ++-- .../apg/ui/SelectSecretKeyListActivity.java | 10 ++-- .../android}/apg/ui/SignKeyActivity.java | 12 ++--- .../apg/ui/widget/DashboardLayout.java | 2 +- .../android}/apg/ui/widget/Editor.java | 2 +- .../apg/ui/widget/IntegerListPreference.java | 2 +- .../android}/apg/ui/widget/KeyEditor.java | 10 ++-- .../apg/ui/widget/KeyServerEditor.java | 4 +- .../android}/apg/ui/widget/SectionView.java | 12 ++--- .../ui/widget/SelectPublicKeyListAdapter.java | 14 +++--- .../ui/widget/SelectSecretKeyListAdapter.java | 14 +++--- .../android}/apg/ui/widget/UserIdEditor.java | 4 +- .../android}/apg/util/ApgCon.java | 12 ++--- .../android}/apg/util/ApgConInterface.java | 2 +- .../android}/apg/util/Choice.java | 2 +- .../android}/apg/util/Compatibility.java | 2 +- .../android}/apg/util/Constants.java | 2 +- .../android}/apg/util/IterableIterator.java | 2 +- .../android}/apg/util/Utils.java | 2 +- org_apg_integration_demo/AndroidManifest.xml | 7 +-- .../android/apg/demo}/BaseActivity.java | 4 +- .../android/apg/demo}/IntentDemoActivity.java | 8 +-- org_apg_integration_lib/AndroidManifest.xml | 2 +- .../android}/apg/integration/ApgData.java | 2 +- .../apg/integration/ApgIntentHelper.java | 2 +- .../android}/apg/integration/Constants.java | 8 +-- .../android}/apg/integration/Util.java | 2 +- 80 files changed, 314 insertions(+), 302 deletions(-) rename org_apg/src/org/{ => thialfihar/android}/apg/Apg.java (98%) rename org_apg/src/org/{ => thialfihar/android}/apg/ApgService.java (99%) rename org_apg/src/org/{ => thialfihar/android}/apg/AskForSecretKeyPassPhrase.java (98%) rename org_apg/src/org/{ => thialfihar/android}/apg/CachedPassPhrase.java (97%) rename org_apg/src/org/{ => thialfihar/android}/apg/Constants.java (98%) rename org_apg/src/org/{ => thialfihar/android}/apg/DataDestination.java (95%) rename org_apg/src/org/{ => thialfihar/android}/apg/DataSource.java (96%) rename org_apg/src/org/{ => thialfihar/android}/apg/FileDialog.java (98%) rename org_apg/src/org/{ => thialfihar/android}/apg/HkpKeyServer.java (99%) rename org_apg/src/org/{ => thialfihar/android}/apg/IApgService.aidl (99%) rename org_apg/src/org/{ => thialfihar/android}/apg/Id.java (99%) rename org_apg/src/org/{ => thialfihar/android}/apg/InputData.java (96%) rename org_apg/src/org/{ => thialfihar/android}/apg/KeyServer.java (98%) rename org_apg/src/org/{ => thialfihar/android}/apg/PausableThread.java (97%) rename org_apg/src/org/{ => thialfihar/android}/apg/PositionAwareInputStream.java (98%) rename org_apg/src/org/{ => thialfihar/android}/apg/Preferences.java (99%) rename org_apg/src/org/{ => thialfihar/android}/apg/Primes.java (99%) rename org_apg/src/org/{ => thialfihar/android}/apg/ProgressDialogUpdater.java (95%) rename org_apg/src/org/{ => thialfihar/android}/apg/Service.java (98%) rename org_apg/src/org/{ => thialfihar/android}/apg/provider/ApgServiceBlobDatabase.java (96%) rename org_apg/src/org/{ => thialfihar/android}/apg/provider/ApgServiceBlobProvider.java (96%) rename org_apg/src/org/{ => thialfihar/android}/apg/provider/DataProvider.java (98%) rename org_apg/src/org/{ => thialfihar/android}/apg/provider/Database.java (98%) rename org_apg/src/org/{ => thialfihar/android}/apg/provider/KeyRings.java (96%) rename org_apg/src/org/{ => thialfihar/android}/apg/provider/Keys.java (98%) rename org_apg/src/org/{ => thialfihar/android}/apg/provider/UserIds.java (96%) create mode 100644 org_apg/src/org/thialfihar/android/apg/service/ApgService.java rename org_apg/src/org/{ => thialfihar/android}/apg/ui/AboutActivity.java (94%) rename org_apg/src/org/{ => thialfihar/android}/apg/ui/BaseActivity.java (96%) rename org_apg/src/org/{ => thialfihar/android}/apg/ui/DecryptActivity.java (98%) rename org_apg/src/org/{ => thialfihar/android}/apg/ui/EditKeyActivity.java (97%) rename org_apg/src/org/{ => thialfihar/android}/apg/ui/EncryptActivity.java (98%) rename org_apg/src/org/{ => thialfihar/android}/apg/ui/GeneralActivity.java (96%) rename org_apg/src/org/{ => thialfihar/android}/apg/ui/HelpActivity.java (94%) rename org_apg/src/org/{ => thialfihar/android}/apg/ui/ImportFromQRCodeActivity.java (95%) rename org_apg/src/org/{ => thialfihar/android}/apg/ui/KeyListActivity.java (98%) rename org_apg/src/org/{ => thialfihar/android}/apg/ui/KeyServerExportActivity.java (93%) rename org_apg/src/org/{ => thialfihar/android}/apg/ui/KeyServerPreferenceActivity.java (93%) rename org_apg/src/org/{ => thialfihar/android}/apg/ui/KeyServerQueryActivity.java (95%) rename org_apg/src/org/{ => thialfihar/android}/apg/ui/MailListActivity.java (98%) rename org_apg/src/org/{ => thialfihar/android}/apg/ui/MainActivity.java (97%) rename org_apg/src/org/{ => thialfihar/android}/apg/ui/PreferencesActivity.java (97%) rename org_apg/src/org/{ => thialfihar/android}/apg/ui/PublicKeyListActivity.java (97%) rename org_apg/src/org/{ => thialfihar/android}/apg/ui/SecretKeyListActivity.java (96%) rename org_apg/src/org/{ => thialfihar/android}/apg/ui/SelectPublicKeyListActivity.java (96%) rename org_apg/src/org/{ => thialfihar/android}/apg/ui/SelectSecretKeyListActivity.java (94%) rename org_apg/src/org/{ => thialfihar/android}/apg/ui/SignKeyActivity.java (97%) rename org_apg/src/org/{ => thialfihar/android}/apg/ui/widget/DashboardLayout.java (99%) rename org_apg/src/org/{ => thialfihar/android}/apg/ui/widget/Editor.java (94%) rename org_apg/src/org/{ => thialfihar/android}/apg/ui/widget/IntegerListPreference.java (98%) rename org_apg/src/org/{ => thialfihar/android}/apg/ui/widget/KeyEditor.java (97%) rename org_apg/src/org/{ => thialfihar/android}/apg/ui/widget/KeyServerEditor.java (96%) rename org_apg/src/org/{ => thialfihar/android}/apg/ui/widget/SectionView.java (97%) rename org_apg/src/org/{ => thialfihar/android}/apg/ui/widget/SelectPublicKeyListAdapter.java (96%) rename org_apg/src/org/{ => thialfihar/android}/apg/ui/widget/SelectSecretKeyListAdapter.java (95%) rename org_apg/src/org/{ => thialfihar/android}/apg/ui/widget/UserIdEditor.java (98%) rename org_apg/src/org/{ => thialfihar/android}/apg/util/ApgCon.java (98%) rename org_apg/src/org/{ => thialfihar/android}/apg/util/ApgConInterface.java (94%) rename org_apg/src/org/{ => thialfihar/android}/apg/util/Choice.java (96%) rename org_apg/src/org/{ => thialfihar/android}/apg/util/Compatibility.java (98%) rename org_apg/src/org/{ => thialfihar/android}/apg/util/Constants.java (64%) rename org_apg/src/org/{ => thialfihar/android}/apg/util/IterableIterator.java (95%) rename org_apg/src/org/{ => thialfihar/android}/apg/util/Utils.java (98%) rename org_apg_integration_demo/src/org/{apg/api_demo => thialfihar/android/apg/demo}/BaseActivity.java (96%) rename org_apg_integration_demo/src/org/{apg/api_demo => thialfihar/android/apg/demo}/IntentDemoActivity.java (94%) rename org_apg_integration_lib/src/org/{ => thialfihar/android}/apg/integration/ApgData.java (98%) rename org_apg_integration_lib/src/org/{ => thialfihar/android}/apg/integration/ApgIntentHelper.java (99%) rename org_apg_integration_lib/src/org/{ => thialfihar/android}/apg/integration/Constants.java (93%) rename org_apg_integration_lib/src/org/{ => thialfihar/android}/apg/integration/Util.java (97%) diff --git a/org_apg/AndroidManifest.xml b/org_apg/AndroidManifest.xml index 4c1eaea63..ca39827fa 100644 --- a/org_apg/AndroidManifest.xml +++ b/org_apg/AndroidManifest.xml @@ -2,12 +2,12 @@ + android:versionName="2.0" > - + @@ -78,8 +78,8 @@ android:uiOptions="splitActionBarWhenNarrow" android:windowSoftInputMode="stateHidden" > - - + + @@ -91,7 +91,7 @@ android:launchMode="singleTop" android:uiOptions="splitActionBarWhenNarrow" > - + @@ -109,7 +109,7 @@ android:label="@string/title_selectSignature" android:launchMode="singleTop" > - + @@ -128,10 +128,10 @@ android:uiOptions="splitActionBarWhenNarrow" android:windowSoftInputMode="stateHidden" > - - - - + + + + @@ -145,9 +145,9 @@ android:uiOptions="splitActionBarWhenNarrow" android:windowSoftInputMode="stateHidden" > - - - + + + @@ -220,18 +220,18 @@ android:label="@string/title_about" android:theme="@style/Theme.Sherlock.Light.Dialog" /> - + + android:authorities="org.thialfihar.android.apg.provider" + android:readPermission="org.thialfihar.android.apg.permission.READ_KEY_DETAILS" /> + android:name="org.thialfihar.android.apg.provider.ApgServiceBlobProvider" + android:authorities="org.thialfihar.android.apg.provider.apgserviceblobprovider" + android:permission="org.thialfihar.android.apg.permission.STORE_BLOBS" /> \ No newline at end of file diff --git a/org_apg/res/layout/edit_key_key_item.xml b/org_apg/res/layout/edit_key_key_item.xml index cf816c797..5556ec22e 100644 --- a/org_apg/res/layout/edit_key_key_item.xml +++ b/org_apg/res/layout/edit_key_key_item.xml @@ -15,7 +15,7 @@ limitations under the License. --> - @@ -131,4 +131,4 @@ android:layout_height="1dip" android:background="?android:attr/listDivider" /> - \ No newline at end of file + \ No newline at end of file diff --git a/org_apg/res/layout/edit_key_section.xml b/org_apg/res/layout/edit_key_section.xml index 333d0b753..e8f788f6d 100644 --- a/org_apg/res/layout/edit_key_section.xml +++ b/org_apg/res/layout/edit_key_section.xml @@ -15,7 +15,7 @@ limitations under the License. --> - @@ -54,4 +54,4 @@ android:orientation="vertical" android:paddingBottom="6dip" /> - \ No newline at end of file + \ No newline at end of file diff --git a/org_apg/res/layout/edit_key_user_id_item.xml b/org_apg/res/layout/edit_key_user_id_item.xml index 1961cf109..26a7304e0 100644 --- a/org_apg/res/layout/edit_key_user_id_item.xml +++ b/org_apg/res/layout/edit_key_user_id_item.xml @@ -15,7 +15,7 @@ limitations under the License. --> - @@ -104,4 +104,4 @@ android:layout_height="1dip" android:background="?android:attr/listDivider" /> - \ No newline at end of file + \ No newline at end of file diff --git a/org_apg/res/layout/key_server_editor.xml b/org_apg/res/layout/key_server_editor.xml index a02540c2c..e4c25b316 100644 --- a/org_apg/res/layout/key_server_editor.xml +++ b/org_apg/res/layout/key_server_editor.xml @@ -14,7 +14,7 @@ limitations under the License. --> - - + diff --git a/org_apg/res/layout/main.xml b/org_apg/res/layout/main.xml index 6f0a66a71..e4c509c70 100644 --- a/org_apg/res/layout/main.xml +++ b/org_apg/res/layout/main.xml @@ -20,7 +20,7 @@ android:layout_height="fill_parent" android:orientation="vertical" > - @@ -66,7 +66,7 @@ android:drawableTop="@drawable/dashboard_help" android:onClick="helpOnClick" android:text="@string/dashboard_help" /> - + diff --git a/org_apg/res/values/static_strings.xml b/org_apg/res/values/static_strings.xml index c8a6a5026..c69cf8adf 100644 --- a/org_apg/res/values/static_strings.xml +++ b/org_apg/res/values/static_strings.xml @@ -1,7 +1,7 @@ - APG+ + APG https://github.com/dschuermann/apg \ No newline at end of file diff --git a/org_apg/res/values/strings.xml b/org_apg/res/values/strings.xml index 5499c2bc8..606e351b1 100644 --- a/org_apg/res/values/strings.xml +++ b/org_apg/res/values/strings.xml @@ -327,10 +327,10 @@ - Android Privacy Guard (APG) is a OpenPGP implementation for Android.\n\nAPG+ is a fork based on the original APG to introduce more features and a new user interface. + Android Privacy Guard (APG) is a OpenPGP implementation for Android. License: Apache License 2.0 Version: - Developer: Thialfihar (Main developer), Senecaso (QRCode, sign key, upload key), Markus Doits (AIDL), Oliver Runge, Dominik Schürmann (APG+ fork) + Developer: Thialfihar (Main developer), Senecaso (QRCode, sign key, upload key), Markus Doits (AIDL), Oliver Runge, Dominik Schürmann (New user interface) Manage Keys diff --git a/org_apg/res/xml/apg_preferences.xml b/org_apg/res/xml/apg_preferences.xml index f32c2d73f..778f51375 100644 --- a/org_apg/res/xml/apg_preferences.xml +++ b/org_apg/res/xml/apg_preferences.xml @@ -18,7 +18,7 @@ - - - - - diff --git a/org_apg/src/org/apg/Apg.java b/org_apg/src/org/thialfihar/android/apg/Apg.java similarity index 98% rename from org_apg/src/org/apg/Apg.java rename to org_apg/src/org/thialfihar/android/apg/Apg.java index ec4c202e7..b742f9159 100644 --- a/org_apg/src/org/apg/Apg.java +++ b/org_apg/src/org/thialfihar/android/apg/Apg.java @@ -14,20 +14,8 @@ * limitations under the License. */ -package org.apg; +package org.thialfihar.android.apg; -import org.apg.KeyServer.AddKeyException; -import org.apg.provider.DataProvider; -import org.apg.provider.Database; -import org.apg.provider.KeyRings; -import org.apg.provider.Keys; -import org.apg.provider.UserIds; -import org.apg.ui.BaseActivity; -import org.apg.ui.widget.KeyEditor; -import org.apg.ui.widget.SectionView; -import org.apg.ui.widget.UserIdEditor; -import org.apg.util.IterableIterator; -import org.apg.util.Utils; import org.spongycastle.bcpg.ArmoredInputStream; import org.spongycastle.bcpg.ArmoredOutputStream; import org.spongycastle.bcpg.BCPGOutputStream; @@ -65,7 +53,19 @@ import org.spongycastle.openpgp.PGPSignatureSubpacketGenerator; import org.spongycastle.openpgp.PGPSignatureSubpacketVector; import org.spongycastle.openpgp.PGPUtil; import org.spongycastle.openpgp.PGPV3SignatureGenerator; -import org.apg.R; +import org.thialfihar.android.apg.KeyServer.AddKeyException; +import org.thialfihar.android.apg.provider.DataProvider; +import org.thialfihar.android.apg.provider.Database; +import org.thialfihar.android.apg.provider.KeyRings; +import org.thialfihar.android.apg.provider.Keys; +import org.thialfihar.android.apg.provider.UserIds; +import org.thialfihar.android.apg.ui.BaseActivity; +import org.thialfihar.android.apg.ui.widget.KeyEditor; +import org.thialfihar.android.apg.ui.widget.SectionView; +import org.thialfihar.android.apg.ui.widget.UserIdEditor; +import org.thialfihar.android.apg.util.IterableIterator; +import org.thialfihar.android.apg.util.Utils; +import org.thialfihar.android.apg.R; import android.app.Activity; import android.content.Context; @@ -109,8 +109,8 @@ import java.util.Vector; import java.util.regex.Pattern; public class Apg { - private static final String PACKAGE_NAME = "org.apg"; - private static final String INTENT_PREFIX = "org.apg.intent."; + private static final String PACKAGE_NAME = "org.thialfihar.android.apg"; + private static final String INTENT_PREFIX = "org.thialfihar.android.apg.intent."; public static class Intent { public static final String DECRYPT = INTENT_PREFIX + "DECRYPT"; diff --git a/org_apg/src/org/apg/ApgService.java b/org_apg/src/org/thialfihar/android/apg/ApgService.java similarity index 99% rename from org_apg/src/org/apg/ApgService.java rename to org_apg/src/org/thialfihar/android/apg/ApgService.java index 2d41f88ae..f154e8132 100644 --- a/org_apg/src/org/apg/ApgService.java +++ b/org_apg/src/org/thialfihar/android/apg/ApgService.java @@ -12,7 +12,7 @@ * limitations under the License. */ -package org.apg; +package org.thialfihar.android.apg; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; @@ -25,10 +25,11 @@ import java.util.HashMap; import java.util.HashSet; import java.util.Iterator; -import org.apg.provider.KeyRings; -import org.apg.provider.Keys; -import org.apg.provider.UserIds; -import org.apg.IApgService; +import org.thialfihar.android.apg.IApgService; +import org.thialfihar.android.apg.R; +import org.thialfihar.android.apg.provider.KeyRings; +import org.thialfihar.android.apg.provider.Keys; +import org.thialfihar.android.apg.provider.UserIds; import android.content.ContentResolver; import android.content.Intent; diff --git a/org_apg/src/org/apg/AskForSecretKeyPassPhrase.java b/org_apg/src/org/thialfihar/android/apg/AskForSecretKeyPassPhrase.java similarity index 98% rename from org_apg/src/org/apg/AskForSecretKeyPassPhrase.java rename to org_apg/src/org/thialfihar/android/apg/AskForSecretKeyPassPhrase.java index ac3b678d8..35198d7b4 100644 --- a/org_apg/src/org/apg/AskForSecretKeyPassPhrase.java +++ b/org_apg/src/org/thialfihar/android/apg/AskForSecretKeyPassPhrase.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package org.apg; +package org.thialfihar.android.apg; import org.spongycastle.jce.provider.BouncyCastleProvider; import org.spongycastle.openpgp.PGPException; import org.spongycastle.openpgp.PGPPrivateKey; import org.spongycastle.openpgp.PGPSecretKey; -import org.apg.R; +import org.thialfihar.android.apg.R; import android.app.Activity; import android.app.AlertDialog; diff --git a/org_apg/src/org/apg/CachedPassPhrase.java b/org_apg/src/org/thialfihar/android/apg/CachedPassPhrase.java similarity index 97% rename from org_apg/src/org/apg/CachedPassPhrase.java rename to org_apg/src/org/thialfihar/android/apg/CachedPassPhrase.java index 857136b8c..85fcdd201 100644 --- a/org_apg/src/org/apg/CachedPassPhrase.java +++ b/org_apg/src/org/thialfihar/android/apg/CachedPassPhrase.java @@ -12,7 +12,7 @@ * limitations under the License. */ -package org.apg; +package org.thialfihar.android.apg; public class CachedPassPhrase { public final long timestamp; diff --git a/org_apg/src/org/apg/Constants.java b/org_apg/src/org/thialfihar/android/apg/Constants.java similarity index 98% rename from org_apg/src/org/apg/Constants.java rename to org_apg/src/org/thialfihar/android/apg/Constants.java index 9669d4b0d..a0aaf5b5f 100644 --- a/org_apg/src/org/apg/Constants.java +++ b/org_apg/src/org/thialfihar/android/apg/Constants.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.apg; +package org.thialfihar.android.apg; import android.os.Environment; diff --git a/org_apg/src/org/apg/DataDestination.java b/org_apg/src/org/thialfihar/android/apg/DataDestination.java similarity index 95% rename from org_apg/src/org/apg/DataDestination.java rename to org_apg/src/org/thialfihar/android/apg/DataDestination.java index 99e40e3ed..2ab530619 100644 --- a/org_apg/src/org/apg/DataDestination.java +++ b/org_apg/src/org/thialfihar/android/apg/DataDestination.java @@ -12,7 +12,7 @@ * limitations under the License. */ -package org.apg; +package org.thialfihar.android.apg; import java.io.ByteArrayOutputStream; import java.io.FileNotFoundException; @@ -20,8 +20,8 @@ import java.io.FileOutputStream; import java.io.IOException; import java.io.OutputStream; -import org.apg.Apg.GeneralException; -import org.apg.R; +import org.thialfihar.android.apg.R; +import org.thialfihar.android.apg.Apg.GeneralException; import android.content.Context; import android.os.Environment; diff --git a/org_apg/src/org/apg/DataSource.java b/org_apg/src/org/thialfihar/android/apg/DataSource.java similarity index 96% rename from org_apg/src/org/apg/DataSource.java rename to org_apg/src/org/thialfihar/android/apg/DataSource.java index 89afd2150..637304012 100644 --- a/org_apg/src/org/apg/DataSource.java +++ b/org_apg/src/org/thialfihar/android/apg/DataSource.java @@ -12,7 +12,7 @@ * limitations under the License. */ -package org.apg; +package org.thialfihar.android.apg; import java.io.ByteArrayInputStream; import java.io.File; @@ -21,8 +21,8 @@ import java.io.FileNotFoundException; import java.io.IOException; import java.io.InputStream; -import org.apg.Apg.GeneralException; -import org.apg.R; +import org.thialfihar.android.apg.R; +import org.thialfihar.android.apg.Apg.GeneralException; import android.content.Context; import android.net.Uri; diff --git a/org_apg/src/org/apg/FileDialog.java b/org_apg/src/org/thialfihar/android/apg/FileDialog.java similarity index 98% rename from org_apg/src/org/apg/FileDialog.java rename to org_apg/src/org/thialfihar/android/apg/FileDialog.java index d8956d978..1a8cc0846 100644 --- a/org_apg/src/org/apg/FileDialog.java +++ b/org_apg/src/org/thialfihar/android/apg/FileDialog.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.apg; +package org.thialfihar.android.apg; -import org.apg.R; +import org.thialfihar.android.apg.R; import android.app.Activity; import android.app.AlertDialog; diff --git a/org_apg/src/org/apg/HkpKeyServer.java b/org_apg/src/org/thialfihar/android/apg/HkpKeyServer.java similarity index 99% rename from org_apg/src/org/apg/HkpKeyServer.java rename to org_apg/src/org/thialfihar/android/apg/HkpKeyServer.java index cd6a31ed4..bfbb30c8c 100644 --- a/org_apg/src/org/apg/HkpKeyServer.java +++ b/org_apg/src/org/thialfihar/android/apg/HkpKeyServer.java @@ -12,7 +12,7 @@ * limitations under the License. */ -package org.apg; +package org.thialfihar.android.apg; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/org_apg/src/org/apg/IApgService.aidl b/org_apg/src/org/thialfihar/android/apg/IApgService.aidl similarity index 99% rename from org_apg/src/org/apg/IApgService.aidl rename to org_apg/src/org/thialfihar/android/apg/IApgService.aidl index 8101bd2a4..25780f366 100644 --- a/org_apg/src/org/apg/IApgService.aidl +++ b/org_apg/src/org/thialfihar/android/apg/IApgService.aidl @@ -1,4 +1,4 @@ -package org.apg; +package org.thialfihar.android.apg; interface IApgService { diff --git a/org_apg/src/org/apg/Id.java b/org_apg/src/org/thialfihar/android/apg/Id.java similarity index 99% rename from org_apg/src/org/apg/Id.java rename to org_apg/src/org/thialfihar/android/apg/Id.java index 9a2d7f90d..7308d5d25 100644 --- a/org_apg/src/org/apg/Id.java +++ b/org_apg/src/org/thialfihar/android/apg/Id.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.apg; +package org.thialfihar.android.apg; import org.spongycastle.bcpg.CompressionAlgorithmTags; diff --git a/org_apg/src/org/apg/InputData.java b/org_apg/src/org/thialfihar/android/apg/InputData.java similarity index 96% rename from org_apg/src/org/apg/InputData.java rename to org_apg/src/org/thialfihar/android/apg/InputData.java index e82b4a555..ba6caa1c5 100644 --- a/org_apg/src/org/apg/InputData.java +++ b/org_apg/src/org/thialfihar/android/apg/InputData.java @@ -12,7 +12,7 @@ * limitations under the License. */ -package org.apg; +package org.thialfihar.android.apg; import java.io.InputStream; diff --git a/org_apg/src/org/apg/KeyServer.java b/org_apg/src/org/thialfihar/android/apg/KeyServer.java similarity index 98% rename from org_apg/src/org/apg/KeyServer.java rename to org_apg/src/org/thialfihar/android/apg/KeyServer.java index c928b3f82..bf9335a0c 100644 --- a/org_apg/src/org/apg/KeyServer.java +++ b/org_apg/src/org/thialfihar/android/apg/KeyServer.java @@ -12,7 +12,7 @@ * limitations under the License. */ -package org.apg; +package org.thialfihar.android.apg; import java.io.Serializable; import java.util.Date; diff --git a/org_apg/src/org/apg/PausableThread.java b/org_apg/src/org/thialfihar/android/apg/PausableThread.java similarity index 97% rename from org_apg/src/org/apg/PausableThread.java rename to org_apg/src/org/thialfihar/android/apg/PausableThread.java index 2fc3737d7..87e7c7ee9 100644 --- a/org_apg/src/org/apg/PausableThread.java +++ b/org_apg/src/org/thialfihar/android/apg/PausableThread.java @@ -12,7 +12,7 @@ * limitations under the License. */ -package org.apg; +package org.thialfihar.android.apg; public class PausableThread extends Thread { private boolean mPaused = false; diff --git a/org_apg/src/org/apg/PositionAwareInputStream.java b/org_apg/src/org/thialfihar/android/apg/PositionAwareInputStream.java similarity index 98% rename from org_apg/src/org/apg/PositionAwareInputStream.java rename to org_apg/src/org/thialfihar/android/apg/PositionAwareInputStream.java index 41ec7618d..d49713ae6 100644 --- a/org_apg/src/org/apg/PositionAwareInputStream.java +++ b/org_apg/src/org/thialfihar/android/apg/PositionAwareInputStream.java @@ -12,7 +12,7 @@ * limitations under the License. */ -package org.apg; +package org.thialfihar.android.apg; import java.io.IOException; import java.io.InputStream; diff --git a/org_apg/src/org/apg/Preferences.java b/org_apg/src/org/thialfihar/android/apg/Preferences.java similarity index 99% rename from org_apg/src/org/apg/Preferences.java rename to org_apg/src/org/thialfihar/android/apg/Preferences.java index 60d9db8e8..ea6a36368 100644 --- a/org_apg/src/org/apg/Preferences.java +++ b/org_apg/src/org/thialfihar/android/apg/Preferences.java @@ -12,7 +12,7 @@ * limitations under the License. */ -package org.apg; +package org.thialfihar.android.apg; import org.spongycastle.bcpg.HashAlgorithmTags; import org.spongycastle.openpgp.PGPEncryptedData; diff --git a/org_apg/src/org/apg/Primes.java b/org_apg/src/org/thialfihar/android/apg/Primes.java similarity index 99% rename from org_apg/src/org/apg/Primes.java rename to org_apg/src/org/thialfihar/android/apg/Primes.java index 1fd6482b2..f0f391291 100644 --- a/org_apg/src/org/apg/Primes.java +++ b/org_apg/src/org/thialfihar/android/apg/Primes.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.apg; +package org.thialfihar.android.apg; import java.math.BigInteger; diff --git a/org_apg/src/org/apg/ProgressDialogUpdater.java b/org_apg/src/org/thialfihar/android/apg/ProgressDialogUpdater.java similarity index 95% rename from org_apg/src/org/apg/ProgressDialogUpdater.java rename to org_apg/src/org/thialfihar/android/apg/ProgressDialogUpdater.java index 043cca906..55e177eef 100644 --- a/org_apg/src/org/apg/ProgressDialogUpdater.java +++ b/org_apg/src/org/thialfihar/android/apg/ProgressDialogUpdater.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.apg; +package org.thialfihar.android.apg; public interface ProgressDialogUpdater { void setProgress(String message, int current, int total); diff --git a/org_apg/src/org/apg/Service.java b/org_apg/src/org/thialfihar/android/apg/Service.java similarity index 98% rename from org_apg/src/org/apg/Service.java rename to org_apg/src/org/thialfihar/android/apg/Service.java index 58677b737..a1e298ef6 100644 --- a/org_apg/src/org/apg/Service.java +++ b/org_apg/src/org/thialfihar/android/apg/Service.java @@ -12,7 +12,7 @@ * limitations under the License. */ -package org.apg; +package org.thialfihar.android.apg; import android.content.Intent; import android.os.Binder; diff --git a/org_apg/src/org/apg/provider/ApgServiceBlobDatabase.java b/org_apg/src/org/thialfihar/android/apg/provider/ApgServiceBlobDatabase.java similarity index 96% rename from org_apg/src/org/apg/provider/ApgServiceBlobDatabase.java rename to org_apg/src/org/thialfihar/android/apg/provider/ApgServiceBlobDatabase.java index 2dab048a3..1c57e4b7f 100644 --- a/org_apg/src/org/apg/provider/ApgServiceBlobDatabase.java +++ b/org_apg/src/org/thialfihar/android/apg/provider/ApgServiceBlobDatabase.java @@ -12,9 +12,9 @@ * limitations under the License. */ -package org.apg.provider; +package org.thialfihar.android.apg.provider; -import org.apg.ApgService; +import org.thialfihar.android.apg.ApgService; import android.content.ContentUris; import android.content.ContentValues; diff --git a/org_apg/src/org/apg/provider/ApgServiceBlobProvider.java b/org_apg/src/org/thialfihar/android/apg/provider/ApgServiceBlobProvider.java similarity index 96% rename from org_apg/src/org/apg/provider/ApgServiceBlobProvider.java rename to org_apg/src/org/thialfihar/android/apg/provider/ApgServiceBlobProvider.java index 72f70a590..c53076c41 100644 --- a/org_apg/src/org/apg/provider/ApgServiceBlobProvider.java +++ b/org_apg/src/org/thialfihar/android/apg/provider/ApgServiceBlobProvider.java @@ -12,10 +12,10 @@ * limitations under the License. */ -package org.apg.provider; +package org.thialfihar.android.apg.provider; -import org.apg.ApgService; -import org.apg.Constants; +import org.thialfihar.android.apg.ApgService; +import org.thialfihar.android.apg.Constants; import android.content.ContentProvider; import android.content.ContentValues; @@ -34,7 +34,7 @@ public class ApgServiceBlobProvider extends ContentProvider { private static final String TAG = "ApgServiceBlobProvider"; - public static final Uri CONTENT_URI = Uri.parse("content://org.apg.provider.apgserviceblobprovider"); + public static final Uri CONTENT_URI = Uri.parse("content://org.thialfihar.android.apg.provider.apgserviceblobprovider"); private static final String COLUMN_KEY = "key"; diff --git a/org_apg/src/org/apg/provider/DataProvider.java b/org_apg/src/org/thialfihar/android/apg/provider/DataProvider.java similarity index 98% rename from org_apg/src/org/apg/provider/DataProvider.java rename to org_apg/src/org/thialfihar/android/apg/provider/DataProvider.java index bafcc3c28..9cf083528 100644 --- a/org_apg/src/org/apg/provider/DataProvider.java +++ b/org_apg/src/org/thialfihar/android/apg/provider/DataProvider.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package org.apg.provider; +package org.thialfihar.android.apg.provider; import java.io.File; import java.io.FileNotFoundException; import java.util.HashMap; -import org.apg.Id; +import org.thialfihar.android.apg.Id; import android.content.ContentProvider; import android.content.ContentValues; @@ -33,7 +33,7 @@ import android.os.ParcelFileDescriptor; import android.text.TextUtils; public class DataProvider extends ContentProvider { - public static final String AUTHORITY = "org.apg.provider"; + public static final String AUTHORITY = "org.thialfihar.android.apg.provider"; private static final int PUBLIC_KEY_RING = 101; private static final int PUBLIC_KEY_RING_ID = 102; diff --git a/org_apg/src/org/apg/provider/Database.java b/org_apg/src/org/thialfihar/android/apg/provider/Database.java similarity index 98% rename from org_apg/src/org/apg/provider/Database.java rename to org_apg/src/org/thialfihar/android/apg/provider/Database.java index a41df2ced..8040eb56c 100644 --- a/org_apg/src/org/apg/provider/Database.java +++ b/org_apg/src/org/thialfihar/android/apg/provider/Database.java @@ -12,16 +12,16 @@ * limitations under the License. */ -package org.apg.provider; +package org.thialfihar.android.apg.provider; -import org.apg.Apg; -import org.apg.Id; -import org.apg.util.IterableIterator; import org.spongycastle.openpgp.PGPException; import org.spongycastle.openpgp.PGPPublicKey; import org.spongycastle.openpgp.PGPPublicKeyRing; import org.spongycastle.openpgp.PGPSecretKey; import org.spongycastle.openpgp.PGPSecretKeyRing; +import org.thialfihar.android.apg.Apg; +import org.thialfihar.android.apg.Id; +import org.thialfihar.android.apg.util.IterableIterator; import android.content.ContentValues; import android.content.Context; @@ -47,7 +47,7 @@ public class Database extends SQLiteOpenHelper { private static final String DATABASE_NAME = "apg"; private static final int DATABASE_VERSION = 2; - public static final String AUTHORITY = "org.apg.database"; + public static final String AUTHORITY = "org.thialfihar.android.apg.database"; public static HashMap sKeyRingsProjection; public static HashMap sKeysProjection; diff --git a/org_apg/src/org/apg/provider/KeyRings.java b/org_apg/src/org/thialfihar/android/apg/provider/KeyRings.java similarity index 96% rename from org_apg/src/org/apg/provider/KeyRings.java rename to org_apg/src/org/thialfihar/android/apg/provider/KeyRings.java index 304afd24f..58e95eba6 100644 --- a/org_apg/src/org/apg/provider/KeyRings.java +++ b/org_apg/src/org/thialfihar/android/apg/provider/KeyRings.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.apg.provider; +package org.thialfihar.android.apg.provider; import android.provider.BaseColumns; diff --git a/org_apg/src/org/apg/provider/Keys.java b/org_apg/src/org/thialfihar/android/apg/provider/Keys.java similarity index 98% rename from org_apg/src/org/apg/provider/Keys.java rename to org_apg/src/org/thialfihar/android/apg/provider/Keys.java index 63eaee54f..618c5e920 100644 --- a/org_apg/src/org/apg/provider/Keys.java +++ b/org_apg/src/org/thialfihar/android/apg/provider/Keys.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.apg.provider; +package org.thialfihar.android.apg.provider; import android.provider.BaseColumns; diff --git a/org_apg/src/org/apg/provider/UserIds.java b/org_apg/src/org/thialfihar/android/apg/provider/UserIds.java similarity index 96% rename from org_apg/src/org/apg/provider/UserIds.java rename to org_apg/src/org/thialfihar/android/apg/provider/UserIds.java index e8ddc677d..2050ccf9c 100644 --- a/org_apg/src/org/apg/provider/UserIds.java +++ b/org_apg/src/org/thialfihar/android/apg/provider/UserIds.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.apg.provider; +package org.thialfihar.android.apg.provider; import android.provider.BaseColumns; diff --git a/org_apg/src/org/thialfihar/android/apg/service/ApgService.java b/org_apg/src/org/thialfihar/android/apg/service/ApgService.java new file mode 100644 index 000000000..bcf336d46 --- /dev/null +++ b/org_apg/src/org/thialfihar/android/apg/service/ApgService.java @@ -0,0 +1,12 @@ + +/** + * TODO: + * - Reimplement all the threads in the activitys as intents in this intentService + * - This IntentService stopps itself after an action is executed + */ + +package org.thialfihar.android.apg.service; + +public class ApgService { + +} diff --git a/org_apg/src/org/apg/ui/AboutActivity.java b/org_apg/src/org/thialfihar/android/apg/ui/AboutActivity.java similarity index 94% rename from org_apg/src/org/apg/ui/AboutActivity.java rename to org_apg/src/org/thialfihar/android/apg/ui/AboutActivity.java index e9a97d370..1988292ae 100644 --- a/org_apg/src/org/apg/ui/AboutActivity.java +++ b/org_apg/src/org/thialfihar/android/apg/ui/AboutActivity.java @@ -12,10 +12,10 @@ * limitations under the License. */ -package org.apg.ui; +package org.thialfihar.android.apg.ui; -import org.apg.Constants; -import org.apg.R; +import org.thialfihar.android.apg.R; +import org.thialfihar.android.apg.Constants; import android.app.Activity; import android.content.pm.PackageInfo; diff --git a/org_apg/src/org/apg/ui/BaseActivity.java b/org_apg/src/org/thialfihar/android/apg/ui/BaseActivity.java similarity index 96% rename from org_apg/src/org/apg/ui/BaseActivity.java rename to org_apg/src/org/thialfihar/android/apg/ui/BaseActivity.java index 43c5c0bfe..022daf420 100644 --- a/org_apg/src/org/apg/ui/BaseActivity.java +++ b/org_apg/src/org/thialfihar/android/apg/ui/BaseActivity.java @@ -14,21 +14,21 @@ * limitations under the License. */ -package org.apg.ui; +package org.thialfihar.android.apg.ui; import java.io.File; import java.io.FileNotFoundException; import java.io.IOException; -import org.apg.Apg; -import org.apg.AskForSecretKeyPassPhrase; -import org.apg.Constants; -import org.apg.Id; -import org.apg.PausableThread; -import org.apg.Preferences; -import org.apg.ProgressDialogUpdater; -import org.apg.Service; -import org.apg.R; +import org.thialfihar.android.apg.R; +import org.thialfihar.android.apg.Apg; +import org.thialfihar.android.apg.AskForSecretKeyPassPhrase; +import org.thialfihar.android.apg.Constants; +import org.thialfihar.android.apg.Id; +import org.thialfihar.android.apg.PausableThread; +import org.thialfihar.android.apg.Preferences; +import org.thialfihar.android.apg.ProgressDialogUpdater; +import org.thialfihar.android.apg.Service; import com.actionbarsherlock.app.ActionBar; import com.actionbarsherlock.app.SherlockActivity; diff --git a/org_apg/src/org/apg/ui/DecryptActivity.java b/org_apg/src/org/thialfihar/android/apg/ui/DecryptActivity.java similarity index 98% rename from org_apg/src/org/apg/ui/DecryptActivity.java rename to org_apg/src/org/thialfihar/android/apg/ui/DecryptActivity.java index 575a08c8c..ca8d2f018 100644 --- a/org_apg/src/org/apg/ui/DecryptActivity.java +++ b/org_apg/src/org/thialfihar/android/apg/ui/DecryptActivity.java @@ -14,22 +14,22 @@ * limitations under the License. */ -package org.apg.ui; +package org.thialfihar.android.apg.ui; -import org.apg.Apg; -import org.apg.Constants; -import org.apg.DataDestination; -import org.apg.DataSource; -import org.apg.FileDialog; -import org.apg.Id; -import org.apg.InputData; -import org.apg.PausableThread; -import org.apg.provider.DataProvider; -import org.apg.util.Compatibility; import org.spongycastle.jce.provider.BouncyCastleProvider; import org.spongycastle.openpgp.PGPException; import org.spongycastle.openpgp.PGPPublicKeyRing; -import org.apg.R; +import org.thialfihar.android.apg.Apg; +import org.thialfihar.android.apg.Constants; +import org.thialfihar.android.apg.DataDestination; +import org.thialfihar.android.apg.DataSource; +import org.thialfihar.android.apg.FileDialog; +import org.thialfihar.android.apg.Id; +import org.thialfihar.android.apg.InputData; +import org.thialfihar.android.apg.PausableThread; +import org.thialfihar.android.apg.provider.DataProvider; +import org.thialfihar.android.apg.util.Compatibility; +import org.thialfihar.android.apg.R; import com.actionbarsherlock.app.ActionBar; import com.actionbarsherlock.view.Menu; diff --git a/org_apg/src/org/apg/ui/EditKeyActivity.java b/org_apg/src/org/thialfihar/android/apg/ui/EditKeyActivity.java similarity index 97% rename from org_apg/src/org/apg/ui/EditKeyActivity.java rename to org_apg/src/org/thialfihar/android/apg/ui/EditKeyActivity.java index 27a94fd1f..e5f4f634d 100644 --- a/org_apg/src/org/apg/ui/EditKeyActivity.java +++ b/org_apg/src/org/thialfihar/android/apg/ui/EditKeyActivity.java @@ -15,19 +15,19 @@ * limitations under the License. */ -package org.apg.ui; +package org.thialfihar.android.apg.ui; -import org.apg.Apg; -import org.apg.Constants; -import org.apg.Id; -import org.apg.provider.Database; -import org.apg.ui.widget.KeyEditor; -import org.apg.ui.widget.SectionView; -import org.apg.util.IterableIterator; import org.spongycastle.openpgp.PGPException; import org.spongycastle.openpgp.PGPSecretKey; import org.spongycastle.openpgp.PGPSecretKeyRing; -import org.apg.R; +import org.thialfihar.android.apg.Apg; +import org.thialfihar.android.apg.Constants; +import org.thialfihar.android.apg.Id; +import org.thialfihar.android.apg.provider.Database; +import org.thialfihar.android.apg.ui.widget.KeyEditor; +import org.thialfihar.android.apg.ui.widget.SectionView; +import org.thialfihar.android.apg.util.IterableIterator; +import org.thialfihar.android.apg.R; import com.actionbarsherlock.app.ActionBar; import com.actionbarsherlock.view.Menu; @@ -176,8 +176,6 @@ public class EditKeyActivity extends BaseActivity { keys.add(subKey); keysUsages.add(Id.choice.usage.encrypt_only); - - // define usage of this key } catch (Exception e) { Log.e(Constants.TAG, "Creating initial key failed: +" + e); } diff --git a/org_apg/src/org/apg/ui/EncryptActivity.java b/org_apg/src/org/thialfihar/android/apg/ui/EncryptActivity.java similarity index 98% rename from org_apg/src/org/apg/ui/EncryptActivity.java rename to org_apg/src/org/thialfihar/android/apg/ui/EncryptActivity.java index 68b2c893b..a6a4efb18 100644 --- a/org_apg/src/org/apg/ui/EncryptActivity.java +++ b/org_apg/src/org/thialfihar/android/apg/ui/EncryptActivity.java @@ -14,24 +14,24 @@ * limitations under the License. */ -package org.apg.ui; +package org.thialfihar.android.apg.ui; -import org.apg.Apg; -import org.apg.Constants; -import org.apg.DataDestination; -import org.apg.DataSource; -import org.apg.FileDialog; -import org.apg.Id; -import org.apg.InputData; -import org.apg.provider.DataProvider; -import org.apg.util.Choice; -import org.apg.util.Compatibility; import org.spongycastle.openpgp.PGPException; import org.spongycastle.openpgp.PGPPublicKey; import org.spongycastle.openpgp.PGPPublicKeyRing; import org.spongycastle.openpgp.PGPSecretKey; import org.spongycastle.openpgp.PGPSecretKeyRing; -import org.apg.R; +import org.thialfihar.android.apg.Apg; +import org.thialfihar.android.apg.Constants; +import org.thialfihar.android.apg.DataDestination; +import org.thialfihar.android.apg.DataSource; +import org.thialfihar.android.apg.FileDialog; +import org.thialfihar.android.apg.Id; +import org.thialfihar.android.apg.InputData; +import org.thialfihar.android.apg.provider.DataProvider; +import org.thialfihar.android.apg.util.Choice; +import org.thialfihar.android.apg.util.Compatibility; +import org.thialfihar.android.apg.R; import com.actionbarsherlock.app.ActionBar; import com.actionbarsherlock.view.Menu; diff --git a/org_apg/src/org/apg/ui/GeneralActivity.java b/org_apg/src/org/thialfihar/android/apg/ui/GeneralActivity.java similarity index 96% rename from org_apg/src/org/apg/ui/GeneralActivity.java rename to org_apg/src/org/thialfihar/android/apg/ui/GeneralActivity.java index e165dd140..76a5dc92c 100644 --- a/org_apg/src/org/apg/ui/GeneralActivity.java +++ b/org_apg/src/org/thialfihar/android/apg/ui/GeneralActivity.java @@ -12,7 +12,7 @@ * limitations under the License. */ -package org.apg.ui; +package org.thialfihar.android.apg.ui; import java.io.ByteArrayInputStream; import java.io.FileNotFoundException; @@ -20,10 +20,10 @@ import java.io.IOException; import java.io.InputStream; import java.util.Vector; -import org.apg.Apg; -import org.apg.Id; -import org.apg.util.Choice; -import org.apg.R; +import org.thialfihar.android.apg.R; +import org.thialfihar.android.apg.Apg; +import org.thialfihar.android.apg.Id; +import org.thialfihar.android.apg.util.Choice; import android.content.Intent; import android.net.Uri; diff --git a/org_apg/src/org/apg/ui/HelpActivity.java b/org_apg/src/org/thialfihar/android/apg/ui/HelpActivity.java similarity index 94% rename from org_apg/src/org/apg/ui/HelpActivity.java rename to org_apg/src/org/thialfihar/android/apg/ui/HelpActivity.java index 9a4dc7f76..dda4cbf36 100644 --- a/org_apg/src/org/apg/ui/HelpActivity.java +++ b/org_apg/src/org/thialfihar/android/apg/ui/HelpActivity.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.apg.ui; +package org.thialfihar.android.apg.ui; -import org.apg.R; -import org.apg.util.Utils; +import org.thialfihar.android.apg.R; +import org.thialfihar.android.apg.util.Utils; import com.actionbarsherlock.app.ActionBar; import com.actionbarsherlock.app.SherlockActivity; diff --git a/org_apg/src/org/apg/ui/ImportFromQRCodeActivity.java b/org_apg/src/org/thialfihar/android/apg/ui/ImportFromQRCodeActivity.java similarity index 95% rename from org_apg/src/org/apg/ui/ImportFromQRCodeActivity.java rename to org_apg/src/org/thialfihar/android/apg/ui/ImportFromQRCodeActivity.java index 27e2be621..6f1043467 100644 --- a/org_apg/src/org/apg/ui/ImportFromQRCodeActivity.java +++ b/org_apg/src/org/thialfihar/android/apg/ui/ImportFromQRCodeActivity.java @@ -12,19 +12,19 @@ * limitations under the License. */ -package org.apg.ui; +package org.thialfihar.android.apg.ui; import java.io.ByteArrayInputStream; import java.io.IOException; -import org.apg.Apg; -import org.apg.Constants; -import org.apg.HkpKeyServer; -import org.apg.Id; -import org.apg.KeyServer.QueryException; import org.spongycastle.openpgp.PGPKeyRing; import org.spongycastle.openpgp.PGPPublicKeyRing; -import org.apg.R; +import org.thialfihar.android.apg.Apg; +import org.thialfihar.android.apg.Constants; +import org.thialfihar.android.apg.HkpKeyServer; +import org.thialfihar.android.apg.Id; +import org.thialfihar.android.apg.KeyServer.QueryException; +import org.thialfihar.android.apg.R; import android.content.Intent; import android.os.Bundle; diff --git a/org_apg/src/org/apg/ui/KeyListActivity.java b/org_apg/src/org/thialfihar/android/apg/ui/KeyListActivity.java similarity index 98% rename from org_apg/src/org/apg/ui/KeyListActivity.java rename to org_apg/src/org/thialfihar/android/apg/ui/KeyListActivity.java index 74942a797..787afd431 100644 --- a/org_apg/src/org/apg/ui/KeyListActivity.java +++ b/org_apg/src/org/thialfihar/android/apg/ui/KeyListActivity.java @@ -14,20 +14,20 @@ * limitations under the License. */ -package org.apg.ui; +package org.thialfihar.android.apg.ui; -import org.apg.Apg; -import org.apg.Constants; -import org.apg.FileDialog; -import org.apg.Id; -import org.apg.InputData; -import org.apg.provider.KeyRings; -import org.apg.provider.Keys; -import org.apg.provider.UserIds; import org.spongycastle.openpgp.PGPException; import org.spongycastle.openpgp.PGPPublicKeyRing; import org.spongycastle.openpgp.PGPSecretKeyRing; -import org.apg.R; +import org.thialfihar.android.apg.Apg; +import org.thialfihar.android.apg.Constants; +import org.thialfihar.android.apg.FileDialog; +import org.thialfihar.android.apg.Id; +import org.thialfihar.android.apg.InputData; +import org.thialfihar.android.apg.provider.KeyRings; +import org.thialfihar.android.apg.provider.Keys; +import org.thialfihar.android.apg.provider.UserIds; +import org.thialfihar.android.apg.R; import com.actionbarsherlock.view.MenuItem; diff --git a/org_apg/src/org/apg/ui/KeyServerExportActivity.java b/org_apg/src/org/thialfihar/android/apg/ui/KeyServerExportActivity.java similarity index 93% rename from org_apg/src/org/apg/ui/KeyServerExportActivity.java rename to org_apg/src/org/thialfihar/android/apg/ui/KeyServerExportActivity.java index 999c45b16..877ae0164 100644 --- a/org_apg/src/org/apg/ui/KeyServerExportActivity.java +++ b/org_apg/src/org/thialfihar/android/apg/ui/KeyServerExportActivity.java @@ -12,15 +12,15 @@ * limitations under the License. */ -package org.apg.ui; +package org.thialfihar.android.apg.ui; -import org.apg.Apg; -import org.apg.Constants; -import org.apg.HkpKeyServer; -import org.apg.Id; import org.spongycastle.openpgp.PGPKeyRing; import org.spongycastle.openpgp.PGPPublicKeyRing; -import org.apg.R; +import org.thialfihar.android.apg.Apg; +import org.thialfihar.android.apg.Constants; +import org.thialfihar.android.apg.HkpKeyServer; +import org.thialfihar.android.apg.Id; +import org.thialfihar.android.apg.R; import com.actionbarsherlock.view.MenuItem; diff --git a/org_apg/src/org/apg/ui/KeyServerPreferenceActivity.java b/org_apg/src/org/thialfihar/android/apg/ui/KeyServerPreferenceActivity.java similarity index 93% rename from org_apg/src/org/apg/ui/KeyServerPreferenceActivity.java rename to org_apg/src/org/thialfihar/android/apg/ui/KeyServerPreferenceActivity.java index 69f9772ef..e1233661f 100644 --- a/org_apg/src/org/apg/ui/KeyServerPreferenceActivity.java +++ b/org_apg/src/org/thialfihar/android/apg/ui/KeyServerPreferenceActivity.java @@ -14,15 +14,15 @@ * limitations under the License. */ -package org.apg.ui; +package org.thialfihar.android.apg.ui; import java.util.Vector; -import org.apg.Apg; -import org.apg.ui.widget.Editor; -import org.apg.ui.widget.KeyServerEditor; -import org.apg.ui.widget.Editor.EditorListener; -import org.apg.R; +import org.thialfihar.android.apg.R; +import org.thialfihar.android.apg.Apg; +import org.thialfihar.android.apg.ui.widget.Editor; +import org.thialfihar.android.apg.ui.widget.KeyServerEditor; +import org.thialfihar.android.apg.ui.widget.Editor.EditorListener; import com.actionbarsherlock.view.Menu; diff --git a/org_apg/src/org/apg/ui/KeyServerQueryActivity.java b/org_apg/src/org/thialfihar/android/apg/ui/KeyServerQueryActivity.java similarity index 95% rename from org_apg/src/org/apg/ui/KeyServerQueryActivity.java rename to org_apg/src/org/thialfihar/android/apg/ui/KeyServerQueryActivity.java index cc65769de..2009441ab 100644 --- a/org_apg/src/org/apg/ui/KeyServerQueryActivity.java +++ b/org_apg/src/org/thialfihar/android/apg/ui/KeyServerQueryActivity.java @@ -12,20 +12,20 @@ * limitations under the License. */ -package org.apg.ui; +package org.thialfihar.android.apg.ui; import java.util.List; import java.util.Vector; -import org.apg.Apg; -import org.apg.Constants; -import org.apg.HkpKeyServer; -import org.apg.Id; -import org.apg.KeyServer.InsufficientQuery; -import org.apg.KeyServer.KeyInfo; -import org.apg.KeyServer.QueryException; -import org.apg.KeyServer.TooManyResponses; -import org.apg.R; +import org.thialfihar.android.apg.R; +import org.thialfihar.android.apg.Apg; +import org.thialfihar.android.apg.Constants; +import org.thialfihar.android.apg.HkpKeyServer; +import org.thialfihar.android.apg.Id; +import org.thialfihar.android.apg.KeyServer.InsufficientQuery; +import org.thialfihar.android.apg.KeyServer.KeyInfo; +import org.thialfihar.android.apg.KeyServer.QueryException; +import org.thialfihar.android.apg.KeyServer.TooManyResponses; import com.actionbarsherlock.view.MenuItem; diff --git a/org_apg/src/org/apg/ui/MailListActivity.java b/org_apg/src/org/thialfihar/android/apg/ui/MailListActivity.java similarity index 98% rename from org_apg/src/org/apg/ui/MailListActivity.java rename to org_apg/src/org/thialfihar/android/apg/ui/MailListActivity.java index aee0d2967..07e7196d5 100644 --- a/org_apg/src/org/apg/ui/MailListActivity.java +++ b/org_apg/src/org/thialfihar/android/apg/ui/MailListActivity.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package org.apg.ui; +package org.thialfihar.android.apg.ui; import java.util.Vector; import java.util.regex.Matcher; -import org.apg.Apg; -import org.apg.Preferences; -import org.apg.R; +import org.thialfihar.android.apg.R; +import org.thialfihar.android.apg.Apg; +import org.thialfihar.android.apg.Preferences; import android.app.ListActivity; import android.content.Context; diff --git a/org_apg/src/org/apg/ui/MainActivity.java b/org_apg/src/org/thialfihar/android/apg/ui/MainActivity.java similarity index 97% rename from org_apg/src/org/apg/ui/MainActivity.java rename to org_apg/src/org/thialfihar/android/apg/ui/MainActivity.java index d53757e12..ff888cd81 100644 --- a/org_apg/src/org/apg/ui/MainActivity.java +++ b/org_apg/src/org/thialfihar/android/apg/ui/MainActivity.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package org.apg.ui; +package org.thialfihar.android.apg.ui; import java.security.Security; -import org.apg.Apg; -import org.apg.Id; import org.spongycastle.jce.provider.BouncyCastleProvider; -import org.apg.R; +import org.thialfihar.android.apg.Apg; +import org.thialfihar.android.apg.Id; +import org.thialfihar.android.apg.R; import com.actionbarsherlock.app.ActionBar; import com.actionbarsherlock.view.Menu; diff --git a/org_apg/src/org/apg/ui/PreferencesActivity.java b/org_apg/src/org/thialfihar/android/apg/ui/PreferencesActivity.java similarity index 97% rename from org_apg/src/org/apg/ui/PreferencesActivity.java rename to org_apg/src/org/thialfihar/android/apg/ui/PreferencesActivity.java index 2e2c8fa29..8b7ed59a7 100644 --- a/org_apg/src/org/apg/ui/PreferencesActivity.java +++ b/org_apg/src/org/thialfihar/android/apg/ui/PreferencesActivity.java @@ -14,16 +14,16 @@ * limitations under the License. */ -package org.apg.ui; +package org.thialfihar.android.apg.ui; -import org.apg.Apg; -import org.apg.Constants; -import org.apg.Id; -import org.apg.Preferences; -import org.apg.ui.widget.IntegerListPreference; import org.spongycastle.bcpg.HashAlgorithmTags; import org.spongycastle.openpgp.PGPEncryptedData; -import org.apg.R; +import org.thialfihar.android.apg.Apg; +import org.thialfihar.android.apg.Constants; +import org.thialfihar.android.apg.Id; +import org.thialfihar.android.apg.Preferences; +import org.thialfihar.android.apg.ui.widget.IntegerListPreference; +import org.thialfihar.android.apg.R; import com.actionbarsherlock.app.ActionBar; import com.actionbarsherlock.app.SherlockPreferenceActivity; diff --git a/org_apg/src/org/apg/ui/PublicKeyListActivity.java b/org_apg/src/org/thialfihar/android/apg/ui/PublicKeyListActivity.java similarity index 97% rename from org_apg/src/org/apg/ui/PublicKeyListActivity.java rename to org_apg/src/org/thialfihar/android/apg/ui/PublicKeyListActivity.java index 5759350ec..a2551b769 100644 --- a/org_apg/src/org/apg/ui/PublicKeyListActivity.java +++ b/org_apg/src/org/thialfihar/android/apg/ui/PublicKeyListActivity.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package org.apg.ui; +package org.thialfihar.android.apg.ui; -import org.apg.Apg; -import org.apg.Constants; -import org.apg.Id; import org.spongycastle.openpgp.PGPPublicKeyRing; -import org.apg.R; +import org.thialfihar.android.apg.Apg; +import org.thialfihar.android.apg.Constants; +import org.thialfihar.android.apg.Id; +import org.thialfihar.android.apg.R; import com.actionbarsherlock.view.Menu; import com.actionbarsherlock.view.MenuItem; diff --git a/org_apg/src/org/apg/ui/SecretKeyListActivity.java b/org_apg/src/org/thialfihar/android/apg/ui/SecretKeyListActivity.java similarity index 96% rename from org_apg/src/org/apg/ui/SecretKeyListActivity.java rename to org_apg/src/org/thialfihar/android/apg/ui/SecretKeyListActivity.java index 23ec694ce..a1b5e753d 100644 --- a/org_apg/src/org/apg/ui/SecretKeyListActivity.java +++ b/org_apg/src/org/thialfihar/android/apg/ui/SecretKeyListActivity.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package org.apg.ui; +package org.thialfihar.android.apg.ui; -import org.apg.Apg; -import org.apg.AskForSecretKeyPassPhrase; -import org.apg.Constants; -import org.apg.Id; -import org.apg.R; +import org.thialfihar.android.apg.R; +import org.thialfihar.android.apg.Apg; +import org.thialfihar.android.apg.AskForSecretKeyPassPhrase; +import org.thialfihar.android.apg.Constants; +import org.thialfihar.android.apg.Id; import com.actionbarsherlock.view.Menu; import com.actionbarsherlock.view.MenuItem; diff --git a/org_apg/src/org/apg/ui/SelectPublicKeyListActivity.java b/org_apg/src/org/thialfihar/android/apg/ui/SelectPublicKeyListActivity.java similarity index 96% rename from org_apg/src/org/apg/ui/SelectPublicKeyListActivity.java rename to org_apg/src/org/thialfihar/android/apg/ui/SelectPublicKeyListActivity.java index e2dcc8d4d..07ad60d89 100644 --- a/org_apg/src/org/apg/ui/SelectPublicKeyListActivity.java +++ b/org_apg/src/org/thialfihar/android/apg/ui/SelectPublicKeyListActivity.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package org.apg.ui; +package org.thialfihar.android.apg.ui; import java.util.Vector; -import org.apg.Apg; -import org.apg.Id; -import org.apg.R; -import org.apg.ui.widget.SelectPublicKeyListAdapter; +import org.thialfihar.android.apg.R; +import org.thialfihar.android.apg.Apg; +import org.thialfihar.android.apg.Id; +import org.thialfihar.android.apg.ui.widget.SelectPublicKeyListAdapter; import com.actionbarsherlock.app.ActionBar; import com.actionbarsherlock.view.Menu; diff --git a/org_apg/src/org/apg/ui/SelectSecretKeyListActivity.java b/org_apg/src/org/thialfihar/android/apg/ui/SelectSecretKeyListActivity.java similarity index 94% rename from org_apg/src/org/apg/ui/SelectSecretKeyListActivity.java rename to org_apg/src/org/thialfihar/android/apg/ui/SelectSecretKeyListActivity.java index dadc6f5bf..dec88dd7f 100644 --- a/org_apg/src/org/apg/ui/SelectSecretKeyListActivity.java +++ b/org_apg/src/org/thialfihar/android/apg/ui/SelectSecretKeyListActivity.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.apg.ui; +package org.thialfihar.android.apg.ui; -import org.apg.Apg; -import org.apg.Id; -import org.apg.R; -import org.apg.ui.widget.SelectSecretKeyListAdapter; +import org.thialfihar.android.apg.R; +import org.thialfihar.android.apg.Apg; +import org.thialfihar.android.apg.Id; +import org.thialfihar.android.apg.ui.widget.SelectSecretKeyListAdapter; import com.actionbarsherlock.app.ActionBar; import com.actionbarsherlock.view.Menu; diff --git a/org_apg/src/org/apg/ui/SignKeyActivity.java b/org_apg/src/org/thialfihar/android/apg/ui/SignKeyActivity.java similarity index 97% rename from org_apg/src/org/apg/ui/SignKeyActivity.java rename to org_apg/src/org/thialfihar/android/apg/ui/SignKeyActivity.java index 012118cac..d853873e1 100644 --- a/org_apg/src/org/apg/ui/SignKeyActivity.java +++ b/org_apg/src/org/thialfihar/android/apg/ui/SignKeyActivity.java @@ -12,17 +12,13 @@ * limitations under the License. */ -package org.apg.ui; +package org.thialfihar.android.apg.ui; import java.security.NoSuchAlgorithmException; import java.security.NoSuchProviderException; import java.security.SignatureException; import java.util.Iterator; -import org.apg.Apg; -import org.apg.Constants; -import org.apg.HkpKeyServer; -import org.apg.Id; import org.spongycastle.jce.provider.BouncyCastleProvider; import org.spongycastle.openpgp.PGPException; import org.spongycastle.openpgp.PGPPrivateKey; @@ -34,7 +30,11 @@ import org.spongycastle.openpgp.PGPSignatureGenerator; import org.spongycastle.openpgp.PGPSignatureSubpacketGenerator; import org.spongycastle.openpgp.PGPSignatureSubpacketVector; import org.spongycastle.openpgp.PGPUtil; -import org.apg.R; +import org.thialfihar.android.apg.Apg; +import org.thialfihar.android.apg.Constants; +import org.thialfihar.android.apg.HkpKeyServer; +import org.thialfihar.android.apg.Id; +import org.thialfihar.android.apg.R; import com.actionbarsherlock.view.MenuItem; diff --git a/org_apg/src/org/apg/ui/widget/DashboardLayout.java b/org_apg/src/org/thialfihar/android/apg/ui/widget/DashboardLayout.java similarity index 99% rename from org_apg/src/org/apg/ui/widget/DashboardLayout.java rename to org_apg/src/org/thialfihar/android/apg/ui/widget/DashboardLayout.java index 8cd97ca05..8a516ad41 100644 --- a/org_apg/src/org/apg/ui/widget/DashboardLayout.java +++ b/org_apg/src/org/thialfihar/android/apg/ui/widget/DashboardLayout.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.apg.ui.widget; +package org.thialfihar.android.apg.ui.widget; import android.content.Context; import android.util.AttributeSet; diff --git a/org_apg/src/org/apg/ui/widget/Editor.java b/org_apg/src/org/thialfihar/android/apg/ui/widget/Editor.java similarity index 94% rename from org_apg/src/org/apg/ui/widget/Editor.java rename to org_apg/src/org/thialfihar/android/apg/ui/widget/Editor.java index be95ad656..a7200fad0 100644 --- a/org_apg/src/org/apg/ui/widget/Editor.java +++ b/org_apg/src/org/thialfihar/android/apg/ui/widget/Editor.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.apg.ui.widget; +package org.thialfihar.android.apg.ui.widget; public interface Editor { public interface EditorListener { diff --git a/org_apg/src/org/apg/ui/widget/IntegerListPreference.java b/org_apg/src/org/thialfihar/android/apg/ui/widget/IntegerListPreference.java similarity index 98% rename from org_apg/src/org/apg/ui/widget/IntegerListPreference.java rename to org_apg/src/org/thialfihar/android/apg/ui/widget/IntegerListPreference.java index fa411a786..1d5f9e3d7 100644 --- a/org_apg/src/org/apg/ui/widget/IntegerListPreference.java +++ b/org_apg/src/org/thialfihar/android/apg/ui/widget/IntegerListPreference.java @@ -14,7 +14,7 @@ * the License. */ -package org.apg.ui.widget; +package org.thialfihar.android.apg.ui.widget; import android.content.Context; import android.preference.ListPreference; diff --git a/org_apg/src/org/apg/ui/widget/KeyEditor.java b/org_apg/src/org/thialfihar/android/apg/ui/widget/KeyEditor.java similarity index 97% rename from org_apg/src/org/apg/ui/widget/KeyEditor.java rename to org_apg/src/org/thialfihar/android/apg/ui/widget/KeyEditor.java index 0e2bd145f..9f7b756eb 100644 --- a/org_apg/src/org/apg/ui/widget/KeyEditor.java +++ b/org_apg/src/org/thialfihar/android/apg/ui/widget/KeyEditor.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package org.apg.ui.widget; +package org.thialfihar.android.apg.ui.widget; -import org.apg.Apg; -import org.apg.Id; -import org.apg.util.Choice; import org.spongycastle.openpgp.PGPPublicKey; import org.spongycastle.openpgp.PGPSecretKey; -import org.apg.R; +import org.thialfihar.android.apg.Apg; +import org.thialfihar.android.apg.Id; +import org.thialfihar.android.apg.util.Choice; +import org.thialfihar.android.apg.R; import android.app.DatePickerDialog; import android.app.Dialog; diff --git a/org_apg/src/org/apg/ui/widget/KeyServerEditor.java b/org_apg/src/org/thialfihar/android/apg/ui/widget/KeyServerEditor.java similarity index 96% rename from org_apg/src/org/apg/ui/widget/KeyServerEditor.java rename to org_apg/src/org/thialfihar/android/apg/ui/widget/KeyServerEditor.java index 3d8634c76..cbea7f031 100644 --- a/org_apg/src/org/apg/ui/widget/KeyServerEditor.java +++ b/org_apg/src/org/thialfihar/android/apg/ui/widget/KeyServerEditor.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.apg.ui.widget; +package org.thialfihar.android.apg.ui.widget; -import org.apg.R; +import org.thialfihar.android.apg.R; import android.content.Context; import android.util.AttributeSet; diff --git a/org_apg/src/org/apg/ui/widget/SectionView.java b/org_apg/src/org/thialfihar/android/apg/ui/widget/SectionView.java similarity index 97% rename from org_apg/src/org/apg/ui/widget/SectionView.java rename to org_apg/src/org/thialfihar/android/apg/ui/widget/SectionView.java index 556164ca8..8f55c9133 100644 --- a/org_apg/src/org/apg/ui/widget/SectionView.java +++ b/org_apg/src/org/thialfihar/android/apg/ui/widget/SectionView.java @@ -14,15 +14,15 @@ * limitations under the License. */ -package org.apg.ui.widget; +package org.thialfihar.android.apg.ui.widget; -import org.apg.Apg; -import org.apg.Id; -import org.apg.ui.widget.Editor.EditorListener; -import org.apg.util.Choice; import org.spongycastle.openpgp.PGPException; import org.spongycastle.openpgp.PGPSecretKey; -import org.apg.R; +import org.thialfihar.android.apg.Apg; +import org.thialfihar.android.apg.Id; +import org.thialfihar.android.apg.ui.widget.Editor.EditorListener; +import org.thialfihar.android.apg.util.Choice; +import org.thialfihar.android.apg.R; import android.app.AlertDialog; import android.app.ProgressDialog; diff --git a/org_apg/src/org/apg/ui/widget/SelectPublicKeyListAdapter.java b/org_apg/src/org/thialfihar/android/apg/ui/widget/SelectPublicKeyListAdapter.java similarity index 96% rename from org_apg/src/org/apg/ui/widget/SelectPublicKeyListAdapter.java rename to org_apg/src/org/thialfihar/android/apg/ui/widget/SelectPublicKeyListAdapter.java index b98a76661..39e68fb81 100644 --- a/org_apg/src/org/apg/ui/widget/SelectPublicKeyListAdapter.java +++ b/org_apg/src/org/thialfihar/android/apg/ui/widget/SelectPublicKeyListAdapter.java @@ -14,16 +14,16 @@ * limitations under the License. */ -package org.apg.ui.widget; +package org.thialfihar.android.apg.ui.widget; import java.util.Date; -import org.apg.Apg; -import org.apg.Id; -import org.apg.provider.KeyRings; -import org.apg.provider.Keys; -import org.apg.provider.UserIds; -import org.apg.R; +import org.thialfihar.android.apg.R; +import org.thialfihar.android.apg.Apg; +import org.thialfihar.android.apg.Id; +import org.thialfihar.android.apg.provider.KeyRings; +import org.thialfihar.android.apg.provider.Keys; +import org.thialfihar.android.apg.provider.UserIds; import android.app.Activity; import android.content.Context; diff --git a/org_apg/src/org/apg/ui/widget/SelectSecretKeyListAdapter.java b/org_apg/src/org/thialfihar/android/apg/ui/widget/SelectSecretKeyListAdapter.java similarity index 95% rename from org_apg/src/org/apg/ui/widget/SelectSecretKeyListAdapter.java rename to org_apg/src/org/thialfihar/android/apg/ui/widget/SelectSecretKeyListAdapter.java index 1b6d115b7..0f4c8e6d1 100644 --- a/org_apg/src/org/apg/ui/widget/SelectSecretKeyListAdapter.java +++ b/org_apg/src/org/thialfihar/android/apg/ui/widget/SelectSecretKeyListAdapter.java @@ -12,16 +12,16 @@ * limitations under the License. */ -package org.apg.ui.widget; +package org.thialfihar.android.apg.ui.widget; import java.util.Date; -import org.apg.Apg; -import org.apg.Id; -import org.apg.provider.KeyRings; -import org.apg.provider.Keys; -import org.apg.provider.UserIds; -import org.apg.R; +import org.thialfihar.android.apg.R; +import org.thialfihar.android.apg.Apg; +import org.thialfihar.android.apg.Id; +import org.thialfihar.android.apg.provider.KeyRings; +import org.thialfihar.android.apg.provider.Keys; +import org.thialfihar.android.apg.provider.UserIds; import android.app.Activity; import android.content.Context; diff --git a/org_apg/src/org/apg/ui/widget/UserIdEditor.java b/org_apg/src/org/thialfihar/android/apg/ui/widget/UserIdEditor.java similarity index 98% rename from org_apg/src/org/apg/ui/widget/UserIdEditor.java rename to org_apg/src/org/thialfihar/android/apg/ui/widget/UserIdEditor.java index ce5594c8e..6b058e31f 100644 --- a/org_apg/src/org/apg/ui/widget/UserIdEditor.java +++ b/org_apg/src/org/thialfihar/android/apg/ui/widget/UserIdEditor.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.apg.ui.widget; +package org.thialfihar.android.apg.ui.widget; import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.apg.R; +import org.thialfihar.android.apg.R; import android.content.Context; import android.util.AttributeSet; diff --git a/org_apg/src/org/apg/util/ApgCon.java b/org_apg/src/org/thialfihar/android/apg/util/ApgCon.java similarity index 98% rename from org_apg/src/org/apg/util/ApgCon.java rename to org_apg/src/org/thialfihar/android/apg/util/ApgCon.java index fb57f7eea..22a9a7eb5 100644 --- a/org_apg/src/org/apg/util/ApgCon.java +++ b/org_apg/src/org/thialfihar/android/apg/util/ApgCon.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.apg.util; +package org.thialfihar.android.apg.util; -import org.apg.util.ApgConInterface.OnCallFinishListener; -import org.apg.IApgService; +import org.thialfihar.android.apg.IApgService; +import org.thialfihar.android.apg.util.ApgConInterface.OnCallFinishListener; import android.content.ComponentName; import android.content.ContentResolver; @@ -60,7 +60,7 @@ public class ApgCon { private final static String TAG = "ApgCon"; private final static int API_VERSION = 2; // aidl api-version it expects - private final static String BLOB_URI = "content://org.apg.provider.apgserviceblobprovider"; + private final static String BLOB_URI = "content://org.thialfihar.android.apg.provider.apgserviceblobprovider"; /** * How many seconds to wait for a connection to AGP when connecting. @@ -175,7 +175,7 @@ public class ApgCon { error tmpError = null; try { if( LOCAL_LOGV ) Log.v(TAG, "Searching for the right APG version"); - ServiceInfo apgServices[] = ctx.getPackageManager().getPackageInfo("org.apg", + ServiceInfo apgServices[] = ctx.getPackageManager().getPackageInfo("org.thialfihar.android.apg", PackageManager.GET_SERVICES | PackageManager.GET_META_DATA).services; if (apgServices == null) { Log.e(TAG, "Could not fetch services"); @@ -184,7 +184,7 @@ public class ApgCon { boolean apgServiceFound = false; for (ServiceInfo inf : apgServices) { if( LOCAL_LOGV ) Log.v(TAG, "Found service of APG: " + inf.name); - if (inf.name.equals("org.apg.ApgService")) { + if (inf.name.equals("org.thialfihar.android.apg.ApgService")) { apgServiceFound = true; if (inf.metaData == null) { Log.w(TAG, "Could not determine ApgService API"); diff --git a/org_apg/src/org/apg/util/ApgConInterface.java b/org_apg/src/org/thialfihar/android/apg/util/ApgConInterface.java similarity index 94% rename from org_apg/src/org/apg/util/ApgConInterface.java rename to org_apg/src/org/thialfihar/android/apg/util/ApgConInterface.java index 54d6af9b8..406427231 100644 --- a/org_apg/src/org/apg/util/ApgConInterface.java +++ b/org_apg/src/org/thialfihar/android/apg/util/ApgConInterface.java @@ -12,7 +12,7 @@ * limitations under the License. */ -package org.apg.util; +package org.thialfihar.android.apg.util; public interface ApgConInterface { public static interface OnCallFinishListener { diff --git a/org_apg/src/org/apg/util/Choice.java b/org_apg/src/org/thialfihar/android/apg/util/Choice.java similarity index 96% rename from org_apg/src/org/apg/util/Choice.java rename to org_apg/src/org/thialfihar/android/apg/util/Choice.java index 1dbd9b215..94cc58f55 100644 --- a/org_apg/src/org/apg/util/Choice.java +++ b/org_apg/src/org/thialfihar/android/apg/util/Choice.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.apg.util; +package org.thialfihar.android.apg.util; public class Choice { private String mName; diff --git a/org_apg/src/org/apg/util/Compatibility.java b/org_apg/src/org/thialfihar/android/apg/util/Compatibility.java similarity index 98% rename from org_apg/src/org/apg/util/Compatibility.java rename to org_apg/src/org/thialfihar/android/apg/util/Compatibility.java index 03053335b..9daa7f73e 100644 --- a/org_apg/src/org/apg/util/Compatibility.java +++ b/org_apg/src/org/thialfihar/android/apg/util/Compatibility.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.apg.util; +package org.thialfihar.android.apg.util; import java.lang.reflect.Method; diff --git a/org_apg/src/org/apg/util/Constants.java b/org_apg/src/org/thialfihar/android/apg/util/Constants.java similarity index 64% rename from org_apg/src/org/apg/util/Constants.java rename to org_apg/src/org/thialfihar/android/apg/util/Constants.java index 819d13700..fac9be649 100644 --- a/org_apg/src/org/apg/util/Constants.java +++ b/org_apg/src/org/thialfihar/android/apg/util/Constants.java @@ -1,4 +1,4 @@ -package org.apg.util; +package org.thialfihar.android.apg.util; public class Constants { public static final String TAG = "APG"; diff --git a/org_apg/src/org/apg/util/IterableIterator.java b/org_apg/src/org/thialfihar/android/apg/util/IterableIterator.java similarity index 95% rename from org_apg/src/org/apg/util/IterableIterator.java rename to org_apg/src/org/thialfihar/android/apg/util/IterableIterator.java index be6632ac0..1071cc81c 100644 --- a/org_apg/src/org/apg/util/IterableIterator.java +++ b/org_apg/src/org/thialfihar/android/apg/util/IterableIterator.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.apg.util; +package org.thialfihar.android.apg.util; import java.util.Iterator; diff --git a/org_apg/src/org/apg/util/Utils.java b/org_apg/src/org/thialfihar/android/apg/util/Utils.java similarity index 98% rename from org_apg/src/org/apg/util/Utils.java rename to org_apg/src/org/thialfihar/android/apg/util/Utils.java index 83a65213d..4ea2a48af 100644 --- a/org_apg/src/org/apg/util/Utils.java +++ b/org_apg/src/org/thialfihar/android/apg/util/Utils.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.apg.util; +package org.thialfihar.android.apg.util; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/org_apg_integration_demo/AndroidManifest.xml b/org_apg_integration_demo/AndroidManifest.xml index a8aa9394b..4656193f9 100644 --- a/org_apg_integration_demo/AndroidManifest.xml +++ b/org_apg_integration_demo/AndroidManifest.xml @@ -1,11 +1,11 @@ - + + android:label="Intent Demo 1" + android:windowSoftInputMode="stateHidden" /> \ No newline at end of file diff --git a/org_apg_integration_demo/src/org/apg/api_demo/BaseActivity.java b/org_apg_integration_demo/src/org/thialfihar/android/apg/demo/BaseActivity.java similarity index 96% rename from org_apg_integration_demo/src/org/apg/api_demo/BaseActivity.java rename to org_apg_integration_demo/src/org/thialfihar/android/apg/demo/BaseActivity.java index 9319782a7..821fc5a8d 100644 --- a/org_apg_integration_demo/src/org/apg/api_demo/BaseActivity.java +++ b/org_apg_integration_demo/src/org/thialfihar/android/apg/demo/BaseActivity.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.apg.api_demo; +package org.thialfihar.android.apg.demo; -import org.apg.api_demo.R; +import org.thialfihar.android.apg.demo.R; import android.app.Activity; import android.content.Intent; diff --git a/org_apg_integration_demo/src/org/apg/api_demo/IntentDemoActivity.java b/org_apg_integration_demo/src/org/thialfihar/android/apg/demo/IntentDemoActivity.java similarity index 94% rename from org_apg_integration_demo/src/org/apg/api_demo/IntentDemoActivity.java rename to org_apg_integration_demo/src/org/thialfihar/android/apg/demo/IntentDemoActivity.java index b6b1a693f..5af9e88e9 100644 --- a/org_apg_integration_demo/src/org/apg/api_demo/IntentDemoActivity.java +++ b/org_apg_integration_demo/src/org/thialfihar/android/apg/demo/IntentDemoActivity.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.apg.api_demo; +package org.thialfihar.android.apg.demo; -import org.apg.api_demo.R; -import org.apg.integration.ApgData; -import org.apg.integration.ApgIntentHelper; +import org.thialfihar.android.apg.demo.R; +import org.thialfihar.android.apg.integration.ApgData; +import org.thialfihar.android.apg.integration.ApgIntentHelper; import android.app.Activity; import android.content.Intent; diff --git a/org_apg_integration_lib/AndroidManifest.xml b/org_apg_integration_lib/AndroidManifest.xml index 646c383b7..3d99ae603 100644 --- a/org_apg_integration_lib/AndroidManifest.xml +++ b/org_apg_integration_lib/AndroidManifest.xml @@ -1,6 +1,6 @@ diff --git a/org_apg_integration_lib/src/org/apg/integration/ApgData.java b/org_apg_integration_lib/src/org/thialfihar/android/apg/integration/ApgData.java similarity index 98% rename from org_apg_integration_lib/src/org/apg/integration/ApgData.java rename to org_apg_integration_lib/src/org/thialfihar/android/apg/integration/ApgData.java index 759e3ca12..bcc21c096 100644 --- a/org_apg_integration_lib/src/org/apg/integration/ApgData.java +++ b/org_apg_integration_lib/src/org/thialfihar/android/apg/integration/ApgData.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apg.integration; +package org.thialfihar.android.apg.integration; import java.io.Serializable; import java.util.Arrays; diff --git a/org_apg_integration_lib/src/org/apg/integration/ApgIntentHelper.java b/org_apg_integration_lib/src/org/thialfihar/android/apg/integration/ApgIntentHelper.java similarity index 99% rename from org_apg_integration_lib/src/org/apg/integration/ApgIntentHelper.java rename to org_apg_integration_lib/src/org/thialfihar/android/apg/integration/ApgIntentHelper.java index b06a42a0c..ee8754e51 100644 --- a/org_apg_integration_lib/src/org/apg/integration/ApgIntentHelper.java +++ b/org_apg_integration_lib/src/org/thialfihar/android/apg/integration/ApgIntentHelper.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apg.integration; +package org.thialfihar.android.apg.integration; import java.util.ArrayList; import java.util.List; diff --git a/org_apg_integration_lib/src/org/apg/integration/Constants.java b/org_apg_integration_lib/src/org/thialfihar/android/apg/integration/Constants.java similarity index 93% rename from org_apg_integration_lib/src/org/apg/integration/Constants.java rename to org_apg_integration_lib/src/org/thialfihar/android/apg/integration/Constants.java index 35410bbb9..1ab11154d 100644 --- a/org_apg_integration_lib/src/org/apg/integration/Constants.java +++ b/org_apg_integration_lib/src/org/thialfihar/android/apg/integration/Constants.java @@ -15,17 +15,17 @@ * limitations under the License. */ -package org.apg.integration; +package org.thialfihar.android.apg.integration; import android.net.Uri; public class Constants { public static final String NAME = "apg"; - public static final String APG_PACKAGE_NAME = "org.apg"; + public static final String APG_PACKAGE_NAME = "org.thialfihar.android.apg"; public static final int MIN_REQUIRED_VERSION = 50; - public static final String AUTHORITY = "org.apg.provider"; + public static final String AUTHORITY = "org.thialfihar.android.apg.provider"; public static final Uri CONTENT_URI_SECRET_KEY_RING_BY_KEY_ID = Uri.parse("content://" + AUTHORITY + "/key_rings/secret/key_id/"); public static final Uri CONTENT_URI_SECRET_KEY_RING_BY_EMAILS = Uri.parse("content://" @@ -36,7 +36,7 @@ public class Constants { public static final Uri CONTENT_URI_PUBLIC_KEY_RING_BY_EMAILS = Uri.parse("content://" + AUTHORITY + "/key_rings/public/emails/"); - public static final String APG_INTENT_PREFIX = "org.apg.intent."; + public static final String APG_INTENT_PREFIX = "org.thialfihar.android.apg.intent."; public static class Intent { public static final String DECRYPT = APG_INTENT_PREFIX + "DECRYPT"; diff --git a/org_apg_integration_lib/src/org/apg/integration/Util.java b/org_apg_integration_lib/src/org/thialfihar/android/apg/integration/Util.java similarity index 97% rename from org_apg_integration_lib/src/org/apg/integration/Util.java rename to org_apg_integration_lib/src/org/thialfihar/android/apg/integration/Util.java index 8991245f5..ca7fa21b5 100644 --- a/org_apg_integration_lib/src/org/apg/integration/Util.java +++ b/org_apg_integration_lib/src/org/thialfihar/android/apg/integration/Util.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apg.integration; +package org.thialfihar.android.apg.integration; import android.content.Context; import android.content.pm.PackageInfo;