Rename packages from com.android.keepass to com.keepassdroid.

AndroidManifest.xml

@@ -11,25 +11,25 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-    	<activity android:name=".fileselect.FileSelectActivity"></activity>
-    	<activity android:name=".PasswordActivity" android:configChanges="orientation|keyboardHidden"></activity>
-    	<activity android:name=".GroupActivity">
+    	<activity android:name="com.keepassdroid.fileselect.FileSelectActivity"></activity>
+    	<activity android:name="com.keepassdroid.PasswordActivity" android:configChanges="orientation|keyboardHidden"></activity>
+    	<activity android:name="com.keepassdroid.GroupActivity">
             <!-- This metadata entry causes .app.SearchQueryResults to be the default context -->
             <!-- whenever the user invokes search while in this Activity. -->
             <meta-data android:name="android.app.default_searchable"
                        android:value=".search.SearchResults" />
     	</activity>
-		<activity android:name=".EntryActivity"></activity>
-		<activity android:name=".LockingActivity"></activity>
-		<activity android:name=".EntryEditActivity" android:configChanges="orientation|keyboardHidden"></activity>
-		<activity android:name=".search.SearchResults" android:launchMode="standard">
+		<activity android:name="com.keepassdroid.EntryActivity"></activity>
+		<activity android:name="com.keepassdroid.LockingActivity"></activity>
+		<activity android:name="com.keepassdroid.EntryEditActivity" android:configChanges="orientation|keyboardHidden"></activity>
+		<activity android:name="com.keepassdroid.search.SearchResults" android:launchMode="standard">
 		    <intent-filter>
 			    <action android:name="android.intent.action.SEARCH" />
 			    <category android:name="android.intent.category.DEFAULT" />
 		     </intent-filter>
 			<meta-data android:name="android.app.searchable" android:resource="@xml/searchable" />
 		</activity>
-		<service android:name=".services.TimeoutService"></service>
+		<service android:name="com.keepassdroid.services.TimeoutService"></service>
 		<meta-data android:name="com.a0soft.gphone.aTrackDog.webURL" android:value="http://keepassdroid.com" />
 	</application>
 </manifest> 

src/com/android/keepass/KeePass.java

@@ -23,8 +23,9 @@ import android.app.Activity;
 import android.content.Intent;
 import android.os.Bundle;
 
-import com.android.keepass.fileselect.FileSelectActivity;
-import com.android.keepass.services.TimeoutService;
+import com.keepassdroid.Database;
+import com.keepassdroid.fileselect.FileSelectActivity;
+import com.keepassdroid.services.TimeoutService;
 
 public class KeePass extends Activity {
 

src/com/keepassdroid/AboutDialog.java

@@ -17,7 +17,7 @@
  *  along with KeePassDroid.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package com.android.keepass;
+package com.keepassdroid;
 
 import android.app.Dialog;
 import android.content.Context;
@@ -25,6 +25,8 @@ import android.os.Bundle;
 import android.view.View;
 import android.widget.Button;
 
+import com.android.keepass.R;
+
 public class AboutDialog extends Dialog {
 	Context mCtx;
 	

src/com/keepassdroid/ClickView.java

@@ -17,7 +17,7 @@
  *  along with KeePassDroid.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package com.android.keepass;
+package com.keepassdroid;
 
 import android.content.Context;
 import android.view.ContextMenu;

src/com/keepassdroid/Database.java

@@ -17,7 +17,7 @@
  *  along with KeePassDroid.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package com.android.keepass;
+package com.keepassdroid;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -39,10 +39,10 @@ import org.phoneid.keepassj2me.Types;
 
 import android.content.Context;
 
-import com.android.keepass.keepasslib.InvalidKeyFileException;
-import com.android.keepass.keepasslib.PwManagerOutput;
-import com.android.keepass.keepasslib.PwManagerOutputException;
-import com.android.keepass.search.SearchDbHelper;
+import com.keepassdroid.keepasslib.InvalidKeyFileException;
+import com.keepassdroid.keepasslib.PwManagerOutput;
+import com.keepassdroid.keepasslib.PwManagerOutputException;
+import com.keepassdroid.search.SearchDbHelper;
 
 /**
  * @author bpellin

src/com/keepassdroid/EntryActivity.java

@@ -17,7 +17,7 @@
  *  along with KeePassDroid.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package com.android.keepass;
+package com.keepassdroid;
 
 import java.text.DateFormat;
 import java.util.Calendar;
@@ -42,6 +42,9 @@ import android.widget.Button;
 import android.widget.TextView;
 import android.widget.Toast;
 
+import com.android.keepass.KeePass;
+import com.android.keepass.R;
+
 public class EntryActivity extends LockingActivity {
 	public static final String KEY_ENTRY = "entry";
 	public static final String KEY_REFRESH_POS = "refresh_pos";

src/com/keepassdroid/EntryEditActivity.java

@@ -17,7 +17,7 @@
  *  along with KeePassDroid.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package com.android.keepass;
+package com.keepassdroid;
 
 import java.io.UnsupportedEncodingException;
 import java.util.Calendar;
@@ -41,6 +41,9 @@ import android.widget.Button;
 import android.widget.TextView;
 import android.widget.Toast;
 
+import com.android.keepass.KeePass;
+import com.android.keepass.R;
+
 public class EntryEditActivity extends LockingActivity {
 	public static final String KEY_ENTRY = "entry";
 	public static final String KEY_PARENT = "parent";

src/com/keepassdroid/GroupActivity.java

@@ -17,7 +17,7 @@
  *  along with KeePassDroid.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package com.android.keepass;
+package com.keepassdroid;
 
 import java.lang.ref.WeakReference;
 
@@ -37,6 +37,9 @@ import android.view.ContextMenu.ContextMenuInfo;
 import android.widget.Button;
 import android.widget.AdapterView.AdapterContextMenuInfo;
 
+import com.android.keepass.KeePass;
+import com.android.keepass.R;
+
 public class GroupActivity extends GroupBaseActivity {
 	
 	public static final int UNINIT = -1;

src/com/keepassdroid/GroupBaseActivity.java

@@ -17,7 +17,7 @@
  *  along with KeePassDroid.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package com.android.keepass;
+package com.keepassdroid;
 
 import org.phoneid.keepassj2me.PwGroup;
 
@@ -32,6 +32,9 @@ import android.widget.ListAdapter;
 import android.widget.ListView;
 import android.widget.TextView;
 
+import com.android.keepass.KeePass;
+import com.android.keepass.R;
+
 public abstract class GroupBaseActivity extends LockingListActivity {
 	public static final String KEY_ENTRY = "entry";
 	public static final String KEY_MODE = "mode";

src/com/keepassdroid/GroupCreateDialog.java

@@ -17,7 +17,7 @@
  *  along with KeePassDroid.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package com.android.keepass;
+package com.keepassdroid;
 
 import android.app.Dialog;
 import android.content.Context;
@@ -27,6 +27,8 @@ import android.widget.Button;
 import android.widget.TextView;
 import android.widget.Toast;
 
+import com.android.keepass.R;
+
 public class GroupCreateDialog extends Dialog {
 	Context mCtx;
 	String mRes;

src/com/keepassdroid/LockManager.java

@@ -17,12 +17,12 @@
  *  along with KeePassDroid.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package com.android.keepass;
+package com.keepassdroid;
 
 import android.app.Activity;
 import android.content.Intent;
 
-import com.android.keepass.intents.TimeoutIntents;
+import com.keepassdroid.intents.TimeoutIntents;
 
 public class LockManager {
 	private final Activity mAct;

src/com/keepassdroid/LockingActivity.java

@@ -17,7 +17,9 @@
  *  along with KeePassDroid.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package com.android.keepass;
+package com.keepassdroid;
+
+import com.android.keepass.KeePass;
 
 import android.app.Activity;
 import android.os.Bundle;

src/com/keepassdroid/LockingListActivity.java

@@ -17,7 +17,9 @@
  *  along with KeePassDroid.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package com.android.keepass;
+package com.keepassdroid;
+
+import com.android.keepass.KeePass;
 
 import android.app.ListActivity;
 import android.os.Bundle;

src/com/keepassdroid/PasswordActivity.java

@@ -17,7 +17,7 @@
  *  along with KeePassDroid.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package com.android.keepass;
+package com.keepassdroid;
 
 import java.io.File;
 import java.io.FileNotFoundException;
@@ -29,7 +29,6 @@ import android.app.Activity;
 import android.app.ProgressDialog;
 import android.content.Intent;
 import android.os.Bundle;
-import android.os.Debug;
 import android.os.Handler;
 import android.view.Menu;
 import android.view.MenuItem;
@@ -38,9 +37,11 @@ import android.widget.Button;
 import android.widget.TextView;
 import android.widget.Toast;
 
-import com.android.keepass.fileselect.FileDbHelper;
-import com.android.keepass.intents.TimeoutIntents;
-import com.android.keepass.keepasslib.InvalidKeyFileException;
+import com.android.keepass.KeePass;
+import com.android.keepass.R;
+import com.keepassdroid.fileselect.FileDbHelper;
+import com.keepassdroid.intents.TimeoutIntents;
+import com.keepassdroid.keepasslib.InvalidKeyFileException;
 
 public class PasswordActivity extends Activity {
 

src/com/keepassdroid/ProgressTask.java

@@ -17,7 +17,7 @@
  *  along with KeePassDroid.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package com.android.keepass;
+package com.keepassdroid;
 
 import android.app.ProgressDialog;
 import android.content.Context;

src/com/keepassdroid/PwEntryView.java

@@ -17,7 +17,7 @@
  *  along with KeePassDroid.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package com.android.keepass;
+package com.keepassdroid;
 
 import org.phoneid.keepassj2me.PwEntry;
 
@@ -29,6 +29,8 @@ import android.view.View;
 import android.view.ContextMenu.ContextMenuInfo;
 import android.widget.TextView;
 
+import com.android.keepass.R;
+
 public class PwEntryView extends ClickView {
 
 	private Activity mAct;

src/com/keepassdroid/PwGroupView.java

@@ -17,7 +17,7 @@
  *  along with KeePassDroid.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package com.android.keepass;
+package com.keepassdroid;
 
 import org.phoneid.keepassj2me.PwGroup;
 
@@ -29,7 +29,9 @@ import android.view.View;
 import android.view.ContextMenu.ContextMenuInfo;
 import android.widget.TextView;
 
-import com.android.keepass.database.DeleteGroup;
+import com.android.keepass.KeePass;
+import com.android.keepass.R;
+import com.keepassdroid.database.DeleteGroup;
 
 
 public class PwGroupView extends ClickView {

src/com/keepassdroid/PwListAdapter.java

@@ -17,7 +17,7 @@
  *  along with KeePassDroid.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package com.android.keepass;
+package com.keepassdroid;
 
 import java.util.Vector;
 

src/com/keepassdroid/UIToastTask.java

@@ -17,7 +17,7 @@
  *  along with KeePassDroid.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package com.android.keepass;
+package com.keepassdroid;
 
 import android.content.Context;
 import android.widget.Toast;

src/com/keepassdroid/Util.java

@@ -17,7 +17,7 @@
  *  along with KeePassDroid.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package com.android.keepass;
+package com.keepassdroid;
 
 import android.app.Activity;
 import android.content.ActivityNotFoundException;

src/com/keepassdroid/database/DeleteGroup.java

@@ -1,4 +1,4 @@
-package com.android.keepass.database;
+package com.keepassdroid.database;
 
 import java.io.IOException;
 import java.lang.ref.WeakReference;
@@ -8,9 +8,9 @@ import org.phoneid.keepassj2me.PwGroup;
 import android.content.Context;
 import android.os.Handler;
 
-import com.android.keepass.Database;
-import com.android.keepass.UIToastTask;
-import com.android.keepass.keepasslib.PwManagerOutputException;
+import com.keepassdroid.Database;
+import com.keepassdroid.UIToastTask;
+import com.keepassdroid.keepasslib.PwManagerOutputException;
 
 public class DeleteGroup implements Runnable {
 	

src/com/keepassdroid/fileselect/FileDbHelper.java

@@ -17,7 +17,7 @@
  *  along with KeePassDroid.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package com.android.keepass.fileselect;
+package com.keepassdroid.fileselect;
 
 import android.content.ContentValues;
 import android.content.Context;

src/com/keepassdroid/fileselect/FileListAdapter.java

@@ -16,7 +16,7 @@
  *  You should have received a copy of the GNU General Public License
  *  along with KeePassDroid.  If not, see <http://www.gnu.org/licenses/>.
  *
- */package com.android.keepass.fileselect;
+ */package com.keepassdroid.fileselect;
 
 import android.content.Context;
 import android.view.View;

src/com/keepassdroid/fileselect/FileSelectActivity.java

@@ -17,7 +17,7 @@
  *  along with KeePassDroid.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package com.android.keepass.fileselect;
+package com.keepassdroid.fileselect;
 
 import java.io.FileNotFoundException;
 
@@ -26,7 +26,6 @@ import android.app.ListActivity;
 import android.content.Intent;
 import android.database.Cursor;
 import android.os.Bundle;
-import android.os.Debug;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
@@ -35,11 +34,11 @@ import android.widget.ListView;
 import android.widget.SimpleCursorAdapter;
 import android.widget.Toast;
 
-import com.android.keepass.AboutDialog;
-import com.android.keepass.PasswordActivity;
 import com.android.keepass.R;
-import com.android.keepass.Util;
-import com.android.keepass.intents.TimeoutIntents;
+import com.keepassdroid.AboutDialog;
+import com.keepassdroid.PasswordActivity;
+import com.keepassdroid.Util;
+import com.keepassdroid.intents.TimeoutIntents;
 
 public class FileSelectActivity extends ListActivity {
 

src/com/keepassdroid/intents/TimeoutIntents.java

@@ -16,9 +16,9 @@
  *  You should have received a copy of the GNU General Public License
  *  along with KeePassDroid.  If not, see <http://www.gnu.org/licenses/>.
  *
- */package com.android.keepass.intents;
+ */package com.keepassdroid.intents;
 
 public class TimeoutIntents {
-	public static final String START = "com.android.keepass.timeout.start";
-	public static final String CANCEL = "com.android.keepass.timeout.cancel";
+	public static final String START = "com.keepassdroid.timeout.start";
+	public static final String CANCEL = "com.keepassdroid.timeout.cancel";
 }

src/com/keepassdroid/keepasslib/BufferedBlockCipherOutputStream.java

@@ -17,7 +17,7 @@
  *  along with KeePassDroid.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package com.android.keepass.keepasslib;
+package com.keepassdroid.keepasslib;
 
 import java.io.FilterOutputStream;
 import java.io.IOException;

src/com/keepassdroid/keepasslib/Exporter.java

@@ -1,4 +1,4 @@
-package com.android.keepass.keepasslib;
+package com.keepassdroid.keepasslib;
 
 import java.io.OutputStream;
 

src/com/keepassdroid/keepasslib/InvalidKeyFileException.java

@@ -16,7 +16,7 @@
  *  You should have received a copy of the GNU General Public License
  *  along with KeePassDroid.  If not, see <http://www.gnu.org/licenses/>.
  *
- */package com.android.keepass.keepasslib;
+ */package com.keepassdroid.keepasslib;
 
 public class InvalidKeyFileException extends Exception {
 	/**

src/com/keepassdroid/keepasslib/NullOutputStream.java

@@ -17,7 +17,7 @@
  *  along with KeePassDroid.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package com.android.keepass.keepasslib;
+package com.keepassdroid.keepasslib;
 
 import java.io.IOException;
 import java.io.OutputStream;

src/com/keepassdroid/keepasslib/PwDbHeaderOutput.java

@@ -17,7 +17,7 @@
  *  along with KeePassDroid.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package com.android.keepass.keepasslib;
+package com.keepassdroid.keepasslib;
 
 import java.io.IOException;
 import java.io.OutputStream;

src/com/keepassdroid/keepasslib/PwEntryOutput.java

@@ -17,7 +17,7 @@
  *  along with KeePassDroid.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package com.android.keepass.keepasslib;
+package com.keepassdroid.keepasslib;
 
 import java.io.IOException;
 import java.io.OutputStream;

src/com/keepassdroid/keepasslib/PwGroupOutput.java

@@ -17,7 +17,7 @@
  *  along with KeePassDroid.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package com.android.keepass.keepasslib;
+package com.keepassdroid.keepasslib;
 
 import java.io.IOException;
 import java.io.OutputStream;

src/com/keepassdroid/keepasslib/PwManagerOutput.java

@@ -17,7 +17,7 @@
  *  along with KeePassDroid.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package com.android.keepass.keepasslib;
+package com.keepassdroid.keepasslib;
 
 import java.io.IOException;
 import java.io.OutputStream;

src/com/keepassdroid/keepasslib/PwManagerOutputException.java

@@ -17,7 +17,7 @@
  *  along with KeePassDroid.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package com.android.keepass.keepasslib;
+package com.keepassdroid.keepasslib;
 
 public class PwManagerOutputException extends Exception {
 	public PwManagerOutputException(String string) {

src/com/keepassdroid/keepasslib/RandomFileOutputStream.java

@@ -17,7 +17,7 @@
  *  along with KeePassDroid.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package com.android.keepass.keepasslib;
+package com.keepassdroid.keepasslib;
 
 import java.io.IOException;
 import java.io.OutputStream;

src/com/keepassdroid/search/SearchDbHelper.java

@@ -17,7 +17,7 @@
  *  along with KeePassDroid.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package com.android.keepass.search;
+package com.keepassdroid.search;
 
 import java.util.UUID;
 import java.util.Vector;
@@ -34,7 +34,7 @@ import android.database.sqlite.SQLiteDatabase;
 import android.database.sqlite.SQLiteOpenHelper;
 import android.util.Log;
 
-import com.android.keepass.Database;
+import com.keepassdroid.Database;
 
 public class SearchDbHelper {
 	private static final String DATABASE_NAME = "search";

src/com/keepassdroid/search/SearchResults.java

@@ -17,7 +17,7 @@
  *  along with KeePassDroid.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package com.android.keepass.search;
+package com.keepassdroid.search;
 
 import org.phoneid.keepassj2me.PwGroup;
 
@@ -25,10 +25,10 @@ import android.app.SearchManager;
 import android.content.Intent;
 import android.os.Bundle;
 
-import com.android.keepass.GroupBaseActivity;
 import com.android.keepass.KeePass;
-import com.android.keepass.PwListAdapter;
 import com.android.keepass.R;
+import com.keepassdroid.GroupBaseActivity;
+import com.keepassdroid.PwListAdapter;
 
 public class SearchResults extends GroupBaseActivity {
 

src/com/keepassdroid/services/TimeoutService.java

@@ -17,7 +17,7 @@
  *  along with KeePassDroid.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package com.android.keepass.services;
+package com.keepassdroid.services;
 
 import java.util.Timer;
 import java.util.TimerTask;
@@ -31,7 +31,7 @@ import android.os.Binder;
 import android.os.IBinder;
 
 import com.android.keepass.KeePass;
-import com.android.keepass.intents.TimeoutIntents;
+import com.keepassdroid.intents.TimeoutIntents;
 
 public class TimeoutService extends Service {
 	private static final long DEFAULT_TIMEOUT = 5 * 60 * 1000;  // 5 minutes

src/org/phoneid/keepassj2me/ImporterV3.java

@@ -51,8 +51,8 @@ import org.phoneid.PhoneIDUtil;
 
 import android.util.Log;
 
-import com.android.keepass.keepasslib.InvalidKeyFileException;
-import com.android.keepass.keepasslib.NullOutputStream;
+import com.keepassdroid.keepasslib.InvalidKeyFileException;
+import com.keepassdroid.keepasslib.NullOutputStream;
 
 /**
  * Load a v3 database file.

src/org/phoneid/keepassj2me/PwEntry.java

@@ -27,7 +27,7 @@ package org.phoneid.keepassj2me;
 // PhoneID
 import org.phoneid.*;
 
-import com.android.keepass.Database;
+import com.keepassdroid.Database;
 
 
 // Java

src/org/phoneid/keepassj2me/PwManager.java

@@ -38,7 +38,7 @@ import java.util.Vector;
 
 import org.bouncycastle.crypto.digests.SHA256Digest;
 
-import com.android.keepass.keepasslib.InvalidKeyFileException;
+import com.keepassdroid.keepasslib.InvalidKeyFileException;
 
 /**
  * @author Naomaru Itoi <nao@phoneid.org>

tests/AndroidManifest.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-      package="com.android.keepass.tests"
+      package="com.keepassdroid.tests"
       android:versionCode="1"
       android:versionName="1.0.0">
     <application>

tests/src/com/keepassdroid/tests/AccentTest.java

@@ -17,11 +17,11 @@
 * along with KeePassDroid. If not, see <http://www.gnu.org/licenses/>.
 *
 */
-package com.android.keepass.tests;
+package com.keepassdroid.tests;
 
 import android.test.AndroidTestCase;
 
-import com.android.keepass.tests.output.TestData;
+import com.keepassdroid.tests.output.TestData;
 
 public class AccentTest extends AndroidTestCase {
 	

tests/src/com/keepassdroid/tests/AllTests.java

@@ -17,7 +17,7 @@
  *  along with KeePassDroid.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package com.android.keepass.tests;
+package com.keepassdroid.tests;
 
 import junit.framework.Test;
 import junit.framework.TestSuite;

tests/src/com/keepassdroid/tests/OutputTests.java

@@ -17,7 +17,7 @@
  *  along with KeePassDroid.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package com.android.keepass.tests;
+package com.keepassdroid.tests;
 
 import junit.framework.Test;
 import junit.framework.TestSuite;
@@ -29,7 +29,7 @@ public class OutputTests extends TestSuite {
 	public static Test suite() {
 
 		return new TestSuiteBuilder(AllTests.class)
-		.includePackages("com.android.keepass.tests.output")
+		.includePackages("com.keepassdroid.tests.output")
 		.build();
 	}
 }

tests/src/com/keepassdroid/tests/PwEntryTest.java

@@ -17,7 +17,7 @@
  *  along with KeePassDroid.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package com.android.keepass.tests;
+package com.keepassdroid.tests;
 
 import static org.junit.Assert.assertArrayEquals;
 
@@ -28,7 +28,7 @@ import org.phoneid.keepassj2me.PwEntry;
 
 import android.test.AndroidTestCase;
 
-import com.android.keepass.tests.output.TestData;
+import com.keepassdroid.tests.output.TestData;
 
 public class PwEntryTest extends AndroidTestCase {
 	PwEntry mPE;

tests/src/com/keepassdroid/tests/PwGroupTest.java

@@ -17,13 +17,13 @@
  *  along with KeePassDroid.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package com.android.keepass.tests;
+package com.keepassdroid.tests;
 
 import org.phoneid.keepassj2me.PwGroup;
 
 import android.test.AndroidTestCase;
 
-import com.android.keepass.tests.output.TestData;
+import com.keepassdroid.tests.output.TestData;
 
 public class PwGroupTest extends AndroidTestCase {
 

tests/src/com/keepassdroid/tests/TypesTest.java

@@ -17,7 +17,7 @@
  *  along with KeePassDroid.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package com.android.keepass.tests;
+package com.keepassdroid.tests;
 
 import java.util.Calendar;
 

tests/src/com/keepassdroid/tests/output/PwManagerOutputTest.java

@@ -17,7 +17,7 @@
 * along with KeePassDroid. If not, see <http://www.gnu.org/licenses/>.
 *
 */
-package com.android.keepass.tests.output;
+package com.keepassdroid.tests.output;
  
 import static org.junit.Assert.assertArrayEquals;
 
@@ -35,10 +35,10 @@ import org.phoneid.keepassj2me.PwManager;
 import android.content.res.AssetManager;
 import android.test.AndroidTestCase;
 
-import com.android.keepass.keepasslib.NullOutputStream;
-import com.android.keepass.keepasslib.PwDbHeaderOutput;
-import com.android.keepass.keepasslib.PwManagerOutput;
-import com.android.keepass.keepasslib.PwManagerOutputException;
+import com.keepassdroid.keepasslib.NullOutputStream;
+import com.keepassdroid.keepasslib.PwDbHeaderOutput;
+import com.keepassdroid.keepasslib.PwManagerOutput;
+import com.keepassdroid.keepasslib.PwManagerOutputException;
  
 public class PwManagerOutputTest extends AndroidTestCase {
   PwManager mPM;

tests/src/com/keepassdroid/tests/output/TestData.java

@@ -17,7 +17,7 @@
  *  along with KeePassDroid.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package com.android.keepass.tests.output;
+package com.keepassdroid.tests.output;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -29,8 +29,8 @@ import org.phoneid.keepassj2me.PwManager;
 import android.content.Context;
 import android.content.res.AssetManager;
 
-import com.android.keepass.Database;
-import com.android.keepass.keepasslib.InvalidKeyFileException;
+import com.keepassdroid.Database;
+import com.keepassdroid.keepasslib.InvalidKeyFileException;
 
 public class TestData {
 	private static final String TEST1_KEYFILE = "";

tests/src/com/keepassdroid/tests/search/SearchTest.java

@@ -17,14 +17,14 @@
 * along with KeePassDroid. If not, see <http://www.gnu.org/licenses/>.
 *
 */
-package com.android.keepass.tests.search;
+package com.keepassdroid.tests.search;
 
 import org.phoneid.keepassj2me.PwGroup;
 
 import android.test.AndroidTestCase;
 
-import com.android.keepass.Database;
-import com.android.keepass.tests.output.TestData;
+import com.keepassdroid.Database;
+import com.keepassdroid.tests.output.TestData;
 
 public class SearchTest extends AndroidTestCase {