changing package name back

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";

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;

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;

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;

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;
 

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;

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;

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;

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;

org_apg/src/org/thialfihar/android/apg/IApgService.aidl

@@ -1,4 +1,4 @@
-package org.apg;
+package org.thialfihar.android.apg;
 
 interface IApgService {
 

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;
 

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;
 

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;

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;

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;

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;

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;
 

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);

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;

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;

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";
     

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;

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<String, String> sKeyRingsProjection;
     public static HashMap<String, String> sKeysProjection;

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;
 

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;
 

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;
 

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 {
+
+}

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;

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;

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;

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);
                         }

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;

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;

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;

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;

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;
 

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;
 

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;
 

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;
 

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;

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;

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;

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;

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;

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;

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;

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;
 

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;

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 {

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;

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;

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;

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;

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;

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;

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;

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");

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 {

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;

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;
 

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";

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;
 

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;