Change launch package

2025-12-04 15:49:33 +01:00 · 2017-11-16 23:00:09 +01:00
parent 9e27ba16d7
commit 7375c7f214
53 changed files with 61 additions and 80 deletions
--- a/app/src/androidTest/java/com/keepassdroid/tests/search/SearchTest.java
+++ b/app/src/androidTest/java/com/keepassdroid/tests/search/SearchTest.java
@@ -25,7 +25,7 @@ import android.content.SharedPreferences;
 import android.preference.PreferenceManager;
 import android.test.AndroidTestCase;

-import com.android.keepass.R;
+import com.kunzisoft.keepass.R;
 import com.keepassdroid.Database;
 import com.keepassdroid.database.PwGroup;
 import com.keepassdroid.tests.database.TestData;
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/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"
+      package="com.kunzisoft.keepass"
      android:installLocation="auto">
    <supports-screens
      android:smallScreens="true"
--- a/app/src/main/java/com/keepassdroid/AboutActivity.java
+++ b/app/src/main/java/com/keepassdroid/AboutActivity.java
@@ -27,7 +27,7 @@ import android.util.Log;
 import android.view.MenuItem;
 import android.widget.TextView;

-import com.android.keepass.R;
+import com.kunzisoft.keepass.R;
 import com.keepassdroid.stylish.StylishActivity;

 public class AboutActivity extends StylishActivity {
--- a/app/src/main/java/com/keepassdroid/EntryActivity.java
+++ b/app/src/main/java/com/keepassdroid/EntryActivity.java
@@ -32,7 +32,6 @@ import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.content.SharedPreferences;
-import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
 import android.preference.PreferenceManager;
@@ -42,18 +41,16 @@ import android.text.SpannableString;
 import android.text.method.LinkMovementMethod;
 import android.text.method.PasswordTransformationMethod;
 import android.text.util.Linkify;
-import android.util.Log;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.view.View;
-import android.widget.Button;
 import android.widget.ImageView;
 import android.widget.TextView;
 import android.widget.Toast;

-import com.android.keepass.KeePass;
-import com.android.keepass.R;
+import com.kunzisoft.keepass.KeePass;
+import com.kunzisoft.keepass.R;
 import com.keepassdroid.app.App;
 import com.keepassdroid.compat.ActivityCompat;
 import com.keepassdroid.database.PwDatabase;
@@ -66,8 +63,6 @@ import com.keepassdroid.utils.MenuUtil;
 import com.keepassdroid.utils.Types;
 import com.keepassdroid.utils.Util;

-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
 import java.text.DateFormat;
 import java.util.Date;
 import java.util.Timer;
--- a/app/src/main/java/com/keepassdroid/EntryActivityV4.java
+++ b/app/src/main/java/com/keepassdroid/EntryActivityV4.java
@@ -24,7 +24,7 @@ import java.util.Map;
 import android.view.View;
 import android.view.ViewGroup;

-import com.android.keepass.R;
+import com.kunzisoft.keepass.R;
 import com.keepassdroid.app.App;
 import com.keepassdroid.database.PwDatabase;
 import com.keepassdroid.database.PwEntryV4;
--- a/app/src/main/java/com/keepassdroid/EntryEditActivity.java
+++ b/app/src/main/java/com/keepassdroid/EntryEditActivity.java
@@ -20,7 +20,6 @@
 package com.keepassdroid;

 import android.app.Activity;
-import android.content.ActivityNotFoundException;
 import android.content.Intent;
 import android.os.Bundle;
 import android.os.Handler;
@@ -35,8 +34,8 @@ import android.widget.ImageButton;
 import android.widget.TextView;
 import android.widget.Toast;

-import com.android.keepass.KeePass;
-import com.android.keepass.R;
+import com.kunzisoft.keepass.KeePass;
+import com.kunzisoft.keepass.R;
 import com.keepassdroid.app.App;
 import com.keepassdroid.database.PwDatabase;
 import com.keepassdroid.database.PwEntry;
--- a/app/src/main/java/com/keepassdroid/EntryEditActivityV4.java
+++ b/app/src/main/java/com/keepassdroid/EntryEditActivityV4.java
@@ -31,7 +31,7 @@ import android.widget.ScrollView;
 import android.widget.TextView;
 import android.widget.Toast;

-import com.android.keepass.R;
+import com.kunzisoft.keepass.R;
 import com.keepassdroid.app.App;
 import com.keepassdroid.database.PwDatabaseV4;
 import com.keepassdroid.database.PwEntry;
--- a/app/src/main/java/com/keepassdroid/GeneratePasswordFragment.java
+++ b/app/src/main/java/com/keepassdroid/GeneratePasswordFragment.java
@@ -35,7 +35,7 @@ import android.widget.EditText;
 import android.widget.SeekBar;
 import android.widget.Toast;

-import com.android.keepass.R;
+import com.kunzisoft.keepass.R;
 import com.keepassdroid.password.PasswordGenerator;

 public class GeneratePasswordFragment extends DialogFragment {
--- a/app/src/main/java/com/keepassdroid/GroupActivity.java
+++ b/app/src/main/java/com/keepassdroid/GroupActivity.java
@@ -34,8 +34,8 @@ import android.view.MenuItem;
 import android.view.View;
 import android.widget.AdapterView.AdapterContextMenuInfo;

-import com.android.keepass.KeePass;
-import com.android.keepass.R;
+import com.kunzisoft.keepass.KeePass;
+import com.kunzisoft.keepass.R;
 import com.keepassdroid.app.App;
 import com.keepassdroid.database.PwDatabase;
 import com.keepassdroid.database.PwDatabaseV3;
--- a/app/src/main/java/com/keepassdroid/GroupBaseActivity.java
+++ b/app/src/main/java/com/keepassdroid/GroupBaseActivity.java
@@ -40,8 +40,8 @@ import android.widget.ListAdapter;
 import android.widget.ListView;
 import android.widget.TextView;

-import com.android.keepass.KeePass;
-import com.android.keepass.R;
+import com.kunzisoft.keepass.KeePass;
+import com.kunzisoft.keepass.R;
 import com.keepassdroid.app.App;
 import com.keepassdroid.compat.ActivityCompat;
 import com.keepassdroid.compat.EditorCompat;
--- a/app/src/main/java/com/keepassdroid/GroupEditFragment.java
+++ b/app/src/main/java/com/keepassdroid/GroupEditFragment.java
@@ -32,7 +32,7 @@ import android.widget.ImageButton;
 import android.widget.TextView;
 import android.widget.Toast;

-import com.android.keepass.R;
+import com.kunzisoft.keepass.R;
 import com.keepassdroid.icons.Icons;

 public class GroupEditFragment extends DialogFragment
--- a/app/src/main/java/com/keepassdroid/IconPickerFragment.java
+++ b/app/src/main/java/com/keepassdroid/IconPickerFragment.java
@@ -36,7 +36,7 @@ import android.widget.GridView;
 import android.widget.ImageView;
 import android.widget.TextView;

-import com.android.keepass.R;
+import com.kunzisoft.keepass.R;
 import com.keepassdroid.icons.Icons;
 import com.keepassdroid.stylish.StylishActivity;

--- a/app/src/main/java/com/keepassdroid/LockCloseActivity.java
+++ b/app/src/main/java/com/keepassdroid/LockCloseActivity.java
@@ -22,7 +22,7 @@ package com.keepassdroid;
 import android.content.ActivityNotFoundException;
 import android.content.Intent;

-import com.android.keepass.KeePass;
+import com.kunzisoft.keepass.KeePass;
 import com.keepassdroid.app.App;

 public abstract class LockCloseActivity extends LockingActivity {
--- a/app/src/main/java/com/keepassdroid/PasswordActivity.java
+++ b/app/src/main/java/com/keepassdroid/PasswordActivity.java
@@ -37,7 +37,6 @@ import android.support.v4.hardware.fingerprint.FingerprintManagerCompat;
 import android.support.v7.widget.Toolbar;
 import android.text.Editable;
 import android.text.TextWatcher;
-import android.util.Log;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
@@ -48,8 +47,8 @@ import android.widget.EditText;
 import android.widget.TextView;
 import android.widget.Toast;

-import com.android.keepass.KeePass;
-import com.android.keepass.R;
+import com.kunzisoft.keepass.KeePass;
+import com.kunzisoft.keepass.R;
 import com.keepassdroid.app.App;
 import com.keepassdroid.compat.BackupManagerCompat;
 import com.keepassdroid.compat.ClipDataCompat;
--- a/app/src/main/java/com/keepassdroid/ProgressTask.java
+++ b/app/src/main/java/com/keepassdroid/ProgressTask.java
@@ -23,7 +23,7 @@ import android.app.ProgressDialog;
 import android.content.Context;
 import android.os.Handler;

-import com.android.keepass.R;
+import com.kunzisoft.keepass.R;
 import com.keepassdroid.database.edit.OnFinish;
 import com.keepassdroid.database.edit.RunnableOnFinish;

--- a/app/src/main/java/com/keepassdroid/PwGroupListAdapter.java
+++ b/app/src/main/java/com/keepassdroid/PwGroupListAdapter.java
@@ -30,7 +30,7 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.BaseAdapter;

-import com.android.keepass.R;
+import com.kunzisoft.keepass.R;
 import com.keepassdroid.database.PwEntry;
 import com.keepassdroid.database.PwGroup;
 import com.keepassdroid.view.PwEntryView;
--- a/app/src/main/java/com/keepassdroid/SetPasswordDialog.java
+++ b/app/src/main/java/com/keepassdroid/SetPasswordDialog.java
@@ -32,7 +32,7 @@ import android.view.View;
 import android.widget.TextView;
 import android.widget.Toast;

-import com.android.keepass.R;
+import com.kunzisoft.keepass.R;
 import com.keepassdroid.app.App;
 import com.keepassdroid.database.edit.FileOnFinish;
 import com.keepassdroid.database.edit.OnFinish;
--- a/app/src/main/java/com/keepassdroid/compat/StorageAF.java
+++ b/app/src/main/java/com/keepassdroid/compat/StorageAF.java
@@ -24,7 +24,7 @@ import android.content.Intent;
 import android.content.SharedPreferences;
 import android.preference.PreferenceManager;

-import com.android.keepass.R;
+import com.kunzisoft.keepass.R;

 import java.lang.reflect.Field;

--- a/app/src/main/java/com/keepassdroid/database/edit/LoadDB.java
+++ b/app/src/main/java/com/keepassdroid/database/edit/LoadDB.java
@@ -24,7 +24,7 @@ import android.content.SharedPreferences;
 import android.net.Uri;
 import android.preference.PreferenceManager;

-import com.android.keepass.R;
+import com.kunzisoft.keepass.R;
 import com.keepassdroid.Database;
 import com.keepassdroid.app.App;
 import com.keepassdroid.database.exception.ArcFourException;
--- a/app/src/main/java/com/keepassdroid/database/load/ImporterV3.java
+++ b/app/src/main/java/com/keepassdroid/database/load/ImporterV3.java
@@ -65,7 +65,7 @@ import javax.crypto.spec.SecretKeySpec;

 import android.util.Log;

-import com.android.keepass.R;
+import com.kunzisoft.keepass.R;
 import com.keepassdroid.UpdateStatus;
 import com.keepassdroid.crypto.CipherFactory;
 import com.keepassdroid.database.PwDatabaseV3;
--- a/app/src/main/java/com/keepassdroid/dialog/PasswordEncodingDialogHelper.java
+++ b/app/src/main/java/com/keepassdroid/dialog/PasswordEncodingDialogHelper.java
@@ -20,11 +20,10 @@
 package com.keepassdroid.dialog;

 import android.app.AlertDialog;
-import android.app.Dialog;
 import android.content.Context;
 import android.content.DialogInterface;

-import com.android.keepass.R;
+import com.kunzisoft.keepass.R;

 public class PasswordEncodingDialogHelper {
 	private AlertDialog dialog;
--- a/app/src/main/java/com/keepassdroid/dialog/ReadOnlyDialog.java
+++ b/app/src/main/java/com/keepassdroid/dialog/ReadOnlyDialog.java
@@ -21,7 +21,7 @@ package com.keepassdroid.dialog;

 import android.content.Context;

-import com.android.keepass.R;
+import com.kunzisoft.keepass.R;
 import com.keepassdroid.compat.BuildCompat;

 public class ReadOnlyDialog extends WarningDialog {
--- a/app/src/main/java/com/keepassdroid/dialog/WarningDialog.java
+++ b/app/src/main/java/com/keepassdroid/dialog/WarningDialog.java
@@ -26,7 +26,7 @@ import android.content.SharedPreferences;
 import android.os.Bundle;
 import android.preference.PreferenceManager;

-import com.android.keepass.R;
+import com.kunzisoft.keepass.R;

 public class WarningDialog extends AlertDialog {
 	
--- a/app/src/main/java/com/keepassdroid/fileselect/BrowserDialog.java
+++ b/app/src/main/java/com/keepassdroid/fileselect/BrowserDialog.java
@@ -21,15 +21,13 @@ package com.keepassdroid.fileselect;

 import android.app.Dialog;
 import android.content.Context;
-import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.content.pm.PackageManager.NameNotFoundException;
-import android.net.Uri;
 import android.os.Bundle;
 import android.view.View;
 import android.widget.Button;

-import com.android.keepass.R;
+import com.kunzisoft.keepass.R;
 import com.keepassdroid.utils.Util;

 public class BrowserDialog extends Dialog {
--- a/app/src/main/java/com/keepassdroid/fileselect/FileSelectActivity.java
+++ b/app/src/main/java/com/keepassdroid/fileselect/FileSelectActivity.java
@@ -51,7 +51,7 @@ import android.widget.ListView;
 import android.widget.TextView;
 import android.widget.Toast;

-import com.android.keepass.R;
+import com.kunzisoft.keepass.R;
 import com.keepassdroid.GroupActivity;
 import com.keepassdroid.PasswordActivity;
 import com.keepassdroid.ProgressTask;
--- a/app/src/main/java/com/keepassdroid/fileselect/RecentFileHistory.java
+++ b/app/src/main/java/com/keepassdroid/fileselect/RecentFileHistory.java
@@ -23,7 +23,7 @@ import java.io.File;
 import java.util.ArrayList;
 import java.util.List;

-import com.android.keepass.R;
+import com.kunzisoft.keepass.R;
 import com.keepassdroid.compat.EditorCompat;
 import com.keepassdroid.utils.UriUtil;

--- a/app/src/main/java/com/keepassdroid/icons/DrawableFactory.java
+++ b/app/src/main/java/com/keepassdroid/icons/DrawableFactory.java
@@ -28,7 +28,7 @@ import android.graphics.BitmapFactory;
 import android.graphics.drawable.Drawable;
 import android.widget.ImageView;

-import com.android.keepass.R;
+import com.kunzisoft.keepass.R;
 import com.keepassdroid.compat.BitmapDrawableCompat;
 import com.keepassdroid.database.PwIcon;
 import com.keepassdroid.database.PwIconCustom;
--- a/app/src/main/java/com/keepassdroid/icons/Icons.java
+++ b/app/src/main/java/com/keepassdroid/icons/Icons.java
@@ -19,11 +19,11 @@
 */
 package com.keepassdroid.icons;

-import java.lang.reflect.Field;
-
 import android.util.SparseIntArray;

-import com.android.keepass.R;
+import com.kunzisoft.keepass.R;
+
+import java.lang.reflect.Field;


 public class Icons {
@@ -33,7 +33,7 @@ public class Icons {
 		if (icons == null) {
 			icons = new SparseIntArray();
 			
-			Class<com.android.keepass.R.drawable> c = com.android.keepass.R.drawable.class;
+			Class<com.kunzisoft.keepass.R.drawable> c = com.kunzisoft.keepass.R.drawable.class;
 			
 			Field[] fields = c.getFields();
 			
--- a/app/src/main/java/com/keepassdroid/password/PasswordGenerator.java
+++ b/app/src/main/java/com/keepassdroid/password/PasswordGenerator.java
@@ -23,7 +23,7 @@ import java.security.SecureRandom;

 import android.content.Context;

-import com.android.keepass.R;
+import com.kunzisoft.keepass.R;

 public class PasswordGenerator {
 	private static final String UPPERCASE_CHARS	= "ABCDEFGHIJKLMNOPQRSTUVWXYZ";
--- a/app/src/main/java/com/keepassdroid/search/SearchDbHelper.java
+++ b/app/src/main/java/com/keepassdroid/search/SearchDbHelper.java
@@ -31,7 +31,7 @@ import android.content.SharedPreferences;
 import android.preference.PreferenceManager;
 import android.util.Log;

-import com.android.keepass.R;
+import com.kunzisoft.keepass.R;
 import com.keepassdroid.Database;
 import com.keepassdroid.database.PwDatabase;
 import com.keepassdroid.database.PwDatabaseV3;
--- a/app/src/main/java/com/keepassdroid/search/SearchResultsActivity.java
+++ b/app/src/main/java/com/keepassdroid/search/SearchResultsActivity.java
@@ -28,8 +28,8 @@ import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.view.View;

-import com.android.keepass.KeePass;
-import com.android.keepass.R;
+import com.kunzisoft.keepass.KeePass;
+import com.kunzisoft.keepass.R;
 import com.keepassdroid.Database;
 import com.keepassdroid.GroupBaseActivity;
 import com.keepassdroid.PwGroupListAdapter;
--- a/app/src/main/java/com/keepassdroid/settings/MainPreferenceFragment.java
+++ b/app/src/main/java/com/keepassdroid/settings/MainPreferenceFragment.java
@@ -5,7 +5,7 @@ import android.os.Bundle;
 import android.support.v7.preference.Preference;
 import android.support.v7.preference.PreferenceFragmentCompat;

-import com.android.keepass.R;
+import com.kunzisoft.keepass.R;
 import com.keepassdroid.Database;
 import com.keepassdroid.app.App;

--- a/app/src/main/java/com/keepassdroid/settings/NestedSettingsFragment.java
+++ b/app/src/main/java/com/keepassdroid/settings/NestedSettingsFragment.java
@@ -25,7 +25,7 @@ import android.support.v7.preference.Preference;
 import android.support.v7.preference.PreferenceFragmentCompat;
 import android.util.Log;

-import com.android.keepass.R;
+import com.kunzisoft.keepass.R;
 import com.keepassdroid.Database;
 import com.keepassdroid.app.App;
 import com.keepassdroid.database.PwEncryptionAlgorithm;
--- a/app/src/main/java/com/keepassdroid/settings/PrefsUtil.java
+++ b/app/src/main/java/com/keepassdroid/settings/PrefsUtil.java
@@ -23,7 +23,7 @@ import android.content.Context;
 import android.content.SharedPreferences;
 import android.preference.PreferenceManager;

-import com.android.keepass.R;
+import com.kunzisoft.keepass.R;

 public class PrefsUtil {
 	public static float getListTextSize(Context ctx) {
--- a/app/src/main/java/com/keepassdroid/settings/RoundsPreference.java
+++ b/app/src/main/java/com/keepassdroid/settings/RoundsPreference.java
@@ -28,7 +28,7 @@ import android.view.View;
 import android.widget.TextView;
 import android.widget.Toast;

-import com.android.keepass.R;
+import com.kunzisoft.keepass.R;
 import com.keepassdroid.Database;
 import com.keepassdroid.ProgressTask;
 import com.keepassdroid.app.App;
--- a/app/src/main/java/com/keepassdroid/settings/SettingsActivity.java
+++ b/app/src/main/java/com/keepassdroid/settings/SettingsActivity.java
@@ -23,7 +23,7 @@ import android.os.Bundle;
 import android.support.v7.widget.Toolbar;
 import android.view.MenuItem;

-import com.android.keepass.R;
+import com.kunzisoft.keepass.R;
 import com.keepassdroid.compat.BackupManagerCompat;
 import com.keepassdroid.stylish.StylishActivity;
 import com.keepassdroid.timeout.TimeoutHelper;
--- a/app/src/main/java/com/keepassdroid/stylish/Stylish.java
+++ b/app/src/main/java/com/keepassdroid/stylish/Stylish.java
@@ -5,7 +5,7 @@ import android.support.annotation.StyleRes;
 import android.support.v7.preference.PreferenceManager;
 import android.util.Log;

-import com.android.keepass.R;
+import com.kunzisoft.keepass.R;

 public class Stylish {

--- a/app/src/main/java/com/keepassdroid/timeout/TimeoutHelper.java
+++ b/app/src/main/java/com/keepassdroid/timeout/TimeoutHelper.java
@@ -23,8 +23,8 @@ import android.app.Activity;
 import android.content.SharedPreferences;
 import android.preference.PreferenceManager;

-import com.android.keepass.KeePass;
-import com.android.keepass.R;
+import com.kunzisoft.keepass.KeePass;
+import com.kunzisoft.keepass.R;
 import com.keepassdroid.app.App;
 import com.keepassdroid.compat.EditorCompat;
 import com.keepassdroid.timers.Timeout;
--- a/app/src/main/java/com/keepassdroid/timers/Timeout.java
+++ b/app/src/main/java/com/keepassdroid/timers/Timeout.java
@@ -8,7 +8,7 @@ import android.content.SharedPreferences;
 import android.preference.PreferenceManager;
 import android.util.Log;

-import com.android.keepass.R;
+import com.kunzisoft.keepass.R;
 import com.keepassdroid.intents.Intents;
 import com.keepassdroid.services.TimeoutService;

--- a/app/src/main/java/com/keepassdroid/utils/MenuUtil.java
+++ b/app/src/main/java/com/keepassdroid/utils/MenuUtil.java
@@ -7,8 +7,8 @@ import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.widget.Toast;

-import com.android.keepass.BuildConfig;
-import com.android.keepass.R;
+import com.kunzisoft.keepass.BuildConfig;
+import com.kunzisoft.keepass.R;
 import com.keepassdroid.AboutActivity;
 import com.keepassdroid.settings.SettingsActivity;
 import com.keepassdroid.stylish.StylishActivity;
--- a/app/src/main/java/com/keepassdroid/utils/Util.java
+++ b/app/src/main/java/com/keepassdroid/utils/Util.java
@@ -22,9 +22,7 @@ package com.keepassdroid.utils;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
-import java.lang.ref.WeakReference;

-import com.android.keepass.R;
 import com.keepassdroid.database.exception.SamsungClipboardException;

 import android.app.Activity;
@@ -32,10 +30,7 @@ import android.content.ActivityNotFoundException;
 import android.content.Context;
 import android.content.Intent;
 import android.net.Uri;
-import android.os.Build;
 import android.text.ClipboardManager;
-import android.view.Window;
-import android.view.WindowManager;
 import android.widget.TextView;

 public class Util {
--- a/app/src/main/java/com/keepassdroid/view/EntryContentsView.java
+++ b/app/src/main/java/com/keepassdroid/view/EntryContentsView.java
@@ -24,7 +24,7 @@ import android.util.AttributeSet;
 import android.view.LayoutInflater;
 import android.widget.LinearLayout;

-import com.android.keepass.R;
+import com.kunzisoft.keepass.R;

 public class EntryContentsView extends LinearLayout {
 	
--- a/app/src/main/java/com/keepassdroid/view/EntryEditSection.java
+++ b/app/src/main/java/com/keepassdroid/view/EntryEditSection.java
@@ -22,11 +22,10 @@ package com.keepassdroid.view;
 import android.content.Context;
 import android.util.AttributeSet;
 import android.widget.CheckBox;
-import android.widget.LinearLayout;
 import android.widget.RelativeLayout;
 import android.widget.TextView;

-import com.android.keepass.R;
+import com.kunzisoft.keepass.R;
 import com.keepassdroid.database.security.ProtectedString;

 public class EntryEditSection extends RelativeLayout {
--- a/app/src/main/java/com/keepassdroid/view/EntrySection.java
+++ b/app/src/main/java/com/keepassdroid/view/EntrySection.java
@@ -25,7 +25,7 @@ import android.view.LayoutInflater;
 import android.widget.LinearLayout;
 import android.widget.TextView;

-import com.android.keepass.R;
+import com.kunzisoft.keepass.R;

 public class EntrySection extends LinearLayout {

--- a/app/src/main/java/com/keepassdroid/view/FileNameView.java
+++ b/app/src/main/java/com/keepassdroid/view/FileNameView.java
@@ -26,7 +26,7 @@ import android.view.LayoutInflater;
 import android.widget.RelativeLayout;
 import android.widget.TextView;

-import com.android.keepass.R;
+import com.kunzisoft.keepass.R;

 public class FileNameView extends RelativeLayout {

--- a/app/src/main/java/com/keepassdroid/view/GroupAddEntryView.java
+++ b/app/src/main/java/com/keepassdroid/view/GroupAddEntryView.java
@@ -29,7 +29,7 @@ import android.view.animation.Animation;
 import android.view.animation.RotateAnimation;
 import android.widget.RelativeLayout;

-import com.android.keepass.R;
+import com.kunzisoft.keepass.R;

 public class GroupAddEntryView extends RelativeLayout {

--- a/app/src/main/java/com/keepassdroid/view/GroupHeaderView.java
+++ b/app/src/main/java/com/keepassdroid/view/GroupHeaderView.java
@@ -25,7 +25,7 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.RelativeLayout;

-import com.android.keepass.R;
+import com.kunzisoft.keepass.R;
 import com.keepassdroid.app.App;

 public class GroupHeaderView extends RelativeLayout {
--- a/app/src/main/java/com/keepassdroid/view/GroupRootView.java
+++ b/app/src/main/java/com/keepassdroid/view/GroupRootView.java
@@ -21,9 +21,6 @@ package com.keepassdroid.view;

 import android.content.Context;
 import android.util.AttributeSet;
-import android.view.View;
-
-import com.android.keepass.R;

 public class GroupRootView extends GroupAddEntryView {

--- a/app/src/main/java/com/keepassdroid/view/PwEntryView.java
+++ b/app/src/main/java/com/keepassdroid/view/PwEntryView.java
@@ -29,7 +29,7 @@ import android.view.View;
 import android.widget.ImageView;
 import android.widget.TextView;

-import com.android.keepass.R;
+import com.kunzisoft.keepass.R;
 import com.keepassdroid.EntryActivity;
 import com.keepassdroid.GroupBaseActivity;
 import com.keepassdroid.ProgressTask;
--- a/app/src/main/java/com/keepassdroid/view/PwGroupView.java
+++ b/app/src/main/java/com/keepassdroid/view/PwGroupView.java
@@ -28,7 +28,7 @@ import android.view.ContextMenu.ContextMenuInfo;
 import android.widget.ImageView;
 import android.widget.TextView;

-import com.android.keepass.R;
+import com.kunzisoft.keepass.R;
 import com.keepassdroid.GroupActivity;
 import com.keepassdroid.GroupBaseActivity;
 import com.keepassdroid.app.App;
--- a/app/src/main/java/com/keepassdroid/view/PwGroupViewV3.java
+++ b/app/src/main/java/com/keepassdroid/view/PwGroupViewV3.java
@@ -24,7 +24,7 @@ import android.view.ContextMenu;
 import android.view.MenuItem;
 import android.view.ContextMenu.ContextMenuInfo;

-import com.android.keepass.R;
+import com.kunzisoft.keepass.R;
 import com.keepassdroid.GroupBaseActivity;
 import com.keepassdroid.ProgressTask;
 import com.keepassdroid.app.App;
--- a/app/src/main/java/com/kunzisoft/keepass/KeePass.java
+++ b/app/src/main/java/com/kunzisoft/keepass/KeePass.java
@@ -17,7 +17,7 @@
 *  along with KeePass DX.  If not, see <http://www.gnu.org/licenses/>.
 *
 */
-package com.android.keepass;
+package com.kunzisoft.keepass;

 import android.app.Activity;
 import android.content.Intent;
--- a/app/src/main/resources/com/kunzisoft/keepass/.gitignore
+++ b/app/src/main/resources/com/kunzisoft/keepass/.gitignore