From 7375c7f214e227d64cd43cc05cc2cfdf0030eafe Mon Sep 17 00:00:00 2001 From: J-Jamet Date: Thu, 16 Nov 2017 23:00:09 +0100 Subject: [PATCH] Change launch package --- .../java/com/keepassdroid/tests/search/SearchTest.java | 2 +- app/src/main/AndroidManifest.xml | 2 +- app/src/main/java/com/keepassdroid/AboutActivity.java | 2 +- app/src/main/java/com/keepassdroid/EntryActivity.java | 9 ++------- app/src/main/java/com/keepassdroid/EntryActivityV4.java | 2 +- .../main/java/com/keepassdroid/EntryEditActivity.java | 5 ++--- .../main/java/com/keepassdroid/EntryEditActivityV4.java | 2 +- .../java/com/keepassdroid/GeneratePasswordFragment.java | 2 +- app/src/main/java/com/keepassdroid/GroupActivity.java | 4 ++-- .../main/java/com/keepassdroid/GroupBaseActivity.java | 4 ++-- .../main/java/com/keepassdroid/GroupEditFragment.java | 2 +- .../main/java/com/keepassdroid/IconPickerFragment.java | 2 +- .../main/java/com/keepassdroid/LockCloseActivity.java | 2 +- app/src/main/java/com/keepassdroid/PasswordActivity.java | 5 ++--- app/src/main/java/com/keepassdroid/ProgressTask.java | 2 +- .../main/java/com/keepassdroid/PwGroupListAdapter.java | 2 +- .../main/java/com/keepassdroid/SetPasswordDialog.java | 2 +- app/src/main/java/com/keepassdroid/compat/StorageAF.java | 2 +- .../main/java/com/keepassdroid/database/edit/LoadDB.java | 2 +- .../java/com/keepassdroid/database/load/ImporterV3.java | 2 +- .../dialog/PasswordEncodingDialogHelper.java | 3 +-- .../java/com/keepassdroid/dialog/ReadOnlyDialog.java | 2 +- .../main/java/com/keepassdroid/dialog/WarningDialog.java | 2 +- .../java/com/keepassdroid/fileselect/BrowserDialog.java | 4 +--- .../com/keepassdroid/fileselect/FileSelectActivity.java | 2 +- .../com/keepassdroid/fileselect/RecentFileHistory.java | 2 +- .../java/com/keepassdroid/icons/DrawableFactory.java | 2 +- app/src/main/java/com/keepassdroid/icons/Icons.java | 8 ++++---- .../com/keepassdroid/password/PasswordGenerator.java | 2 +- .../java/com/keepassdroid/search/SearchDbHelper.java | 2 +- .../com/keepassdroid/search/SearchResultsActivity.java | 4 ++-- .../keepassdroid/settings/MainPreferenceFragment.java | 2 +- .../keepassdroid/settings/NestedSettingsFragment.java | 2 +- .../main/java/com/keepassdroid/settings/PrefsUtil.java | 2 +- .../java/com/keepassdroid/settings/RoundsPreference.java | 2 +- .../java/com/keepassdroid/settings/SettingsActivity.java | 2 +- app/src/main/java/com/keepassdroid/stylish/Stylish.java | 2 +- .../java/com/keepassdroid/timeout/TimeoutHelper.java | 4 ++-- app/src/main/java/com/keepassdroid/timers/Timeout.java | 2 +- app/src/main/java/com/keepassdroid/utils/MenuUtil.java | 4 ++-- app/src/main/java/com/keepassdroid/utils/Util.java | 5 ----- .../java/com/keepassdroid/view/EntryContentsView.java | 2 +- .../java/com/keepassdroid/view/EntryEditSection.java | 3 +-- .../main/java/com/keepassdroid/view/EntrySection.java | 2 +- .../main/java/com/keepassdroid/view/FileNameView.java | 2 +- .../java/com/keepassdroid/view/GroupAddEntryView.java | 2 +- .../main/java/com/keepassdroid/view/GroupHeaderView.java | 2 +- .../main/java/com/keepassdroid/view/GroupRootView.java | 3 --- app/src/main/java/com/keepassdroid/view/PwEntryView.java | 2 +- app/src/main/java/com/keepassdroid/view/PwGroupView.java | 2 +- .../main/java/com/keepassdroid/view/PwGroupViewV3.java | 2 +- .../java/com/{android => kunzisoft}/keepass/KeePass.java | 2 +- .../com/{android => kunzisoft}/keepass/.gitignore | 0 53 files changed, 61 insertions(+), 80 deletions(-) rename app/src/main/java/com/{android => kunzisoft}/keepass/KeePass.java (98%) rename app/src/main/resources/com/{android => kunzisoft}/keepass/.gitignore (100%) diff --git a/app/src/androidTest/java/com/keepassdroid/tests/search/SearchTest.java b/app/src/androidTest/java/com/keepassdroid/tests/search/SearchTest.java index 95872b57d..d33852d21 100644 --- 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; diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index e1d6fe101..af6612d57 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,6 +1,6 @@ c = com.android.keepass.R.drawable.class; + Class c = com.kunzisoft.keepass.R.drawable.class; Field[] fields = c.getFields(); diff --git a/app/src/main/java/com/keepassdroid/password/PasswordGenerator.java b/app/src/main/java/com/keepassdroid/password/PasswordGenerator.java index 043f2a2a6..1fff7e186 100644 --- 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"; diff --git a/app/src/main/java/com/keepassdroid/search/SearchDbHelper.java b/app/src/main/java/com/keepassdroid/search/SearchDbHelper.java index c1a91bd94..15008b521 100644 --- 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; diff --git a/app/src/main/java/com/keepassdroid/search/SearchResultsActivity.java b/app/src/main/java/com/keepassdroid/search/SearchResultsActivity.java index 5b1d1c508..7ee178a66 100644 --- 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; diff --git a/app/src/main/java/com/keepassdroid/settings/MainPreferenceFragment.java b/app/src/main/java/com/keepassdroid/settings/MainPreferenceFragment.java index a917452cf..f60f3ca4d 100644 --- 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; diff --git a/app/src/main/java/com/keepassdroid/settings/NestedSettingsFragment.java b/app/src/main/java/com/keepassdroid/settings/NestedSettingsFragment.java index 3b003dc7b..811e247c3 100644 --- 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; diff --git a/app/src/main/java/com/keepassdroid/settings/PrefsUtil.java b/app/src/main/java/com/keepassdroid/settings/PrefsUtil.java index 538bfc7fe..5c49f964a 100644 --- 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) { diff --git a/app/src/main/java/com/keepassdroid/settings/RoundsPreference.java b/app/src/main/java/com/keepassdroid/settings/RoundsPreference.java index af17a7be1..e0e09fe22 100644 --- 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; diff --git a/app/src/main/java/com/keepassdroid/settings/SettingsActivity.java b/app/src/main/java/com/keepassdroid/settings/SettingsActivity.java index 6592a2bf0..c82f10015 100644 --- 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; diff --git a/app/src/main/java/com/keepassdroid/stylish/Stylish.java b/app/src/main/java/com/keepassdroid/stylish/Stylish.java index 02521499b..3ef7f3e5d 100644 --- 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 { diff --git a/app/src/main/java/com/keepassdroid/timeout/TimeoutHelper.java b/app/src/main/java/com/keepassdroid/timeout/TimeoutHelper.java index 9bcdf3b24..18d5a6d9c 100644 --- 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; diff --git a/app/src/main/java/com/keepassdroid/timers/Timeout.java b/app/src/main/java/com/keepassdroid/timers/Timeout.java index dd27b4fc2..9106d3312 100644 --- 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; diff --git a/app/src/main/java/com/keepassdroid/utils/MenuUtil.java b/app/src/main/java/com/keepassdroid/utils/MenuUtil.java index e3eca0c8f..132312b23 100644 --- 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; diff --git a/app/src/main/java/com/keepassdroid/utils/Util.java b/app/src/main/java/com/keepassdroid/utils/Util.java index d0069f687..707a639ca 100644 --- 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 { diff --git a/app/src/main/java/com/keepassdroid/view/EntryContentsView.java b/app/src/main/java/com/keepassdroid/view/EntryContentsView.java index 5116b747a..d81985c81 100644 --- 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 { diff --git a/app/src/main/java/com/keepassdroid/view/EntryEditSection.java b/app/src/main/java/com/keepassdroid/view/EntryEditSection.java index 48e1156e9..e458bc23b 100644 --- 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 { diff --git a/app/src/main/java/com/keepassdroid/view/EntrySection.java b/app/src/main/java/com/keepassdroid/view/EntrySection.java index 56e4f7996..7ec69121a 100644 --- 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 { diff --git a/app/src/main/java/com/keepassdroid/view/FileNameView.java b/app/src/main/java/com/keepassdroid/view/FileNameView.java index 0287a5815..828d7abc1 100644 --- 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 { diff --git a/app/src/main/java/com/keepassdroid/view/GroupAddEntryView.java b/app/src/main/java/com/keepassdroid/view/GroupAddEntryView.java index 5fc4d62b1..18c459d20 100644 --- 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 { diff --git a/app/src/main/java/com/keepassdroid/view/GroupHeaderView.java b/app/src/main/java/com/keepassdroid/view/GroupHeaderView.java index 2924980f8..cb6e2049a 100644 --- 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 { diff --git a/app/src/main/java/com/keepassdroid/view/GroupRootView.java b/app/src/main/java/com/keepassdroid/view/GroupRootView.java index d21987edd..14f473fd3 100644 --- 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 { diff --git a/app/src/main/java/com/keepassdroid/view/PwEntryView.java b/app/src/main/java/com/keepassdroid/view/PwEntryView.java index a33985db3..faa96c611 100644 --- 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; diff --git a/app/src/main/java/com/keepassdroid/view/PwGroupView.java b/app/src/main/java/com/keepassdroid/view/PwGroupView.java index be4a30ec0..14242ab24 100644 --- 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; diff --git a/app/src/main/java/com/keepassdroid/view/PwGroupViewV3.java b/app/src/main/java/com/keepassdroid/view/PwGroupViewV3.java index 969a583e0..0797d419c 100644 --- 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; diff --git a/app/src/main/java/com/android/keepass/KeePass.java b/app/src/main/java/com/kunzisoft/keepass/KeePass.java similarity index 98% rename from app/src/main/java/com/android/keepass/KeePass.java rename to app/src/main/java/com/kunzisoft/keepass/KeePass.java index 009cb3691..93da807d1 100644 --- a/app/src/main/java/com/android/keepass/KeePass.java +++ b/app/src/main/java/com/kunzisoft/keepass/KeePass.java @@ -17,7 +17,7 @@ * along with KeePass DX. If not, see . * */ -package com.android.keepass; +package com.kunzisoft.keepass; import android.app.Activity; import android.content.Intent; diff --git a/app/src/main/resources/com/android/keepass/.gitignore b/app/src/main/resources/com/kunzisoft/keepass/.gitignore similarity index 100% rename from app/src/main/resources/com/android/keepass/.gitignore rename to app/src/main/resources/com/kunzisoft/keepass/.gitignore