From ac67ff9f21e49f8fea0327ae18f5aef5ebd9d609 Mon Sep 17 00:00:00 2001 From: Jeremy Date: Fri, 9 Feb 2018 14:21:48 +0100 Subject: [PATCH] Refactor packages --- .../tests/database/DeleteEntry.java | 2 +- .../keepassdroid/tests/database/TestData.java | 4 +-- .../keepassdroid/tests/search/SearchTest.java | 2 +- app/src/main/AndroidManifest.xml | 18 +++++------ .../{ => activities}/AboutActivity.java | 2 +- .../{ => activities}/EntryActivity.java | 4 ++- .../{ => activities}/EntryActivityV4.java | 2 +- .../{ => activities}/EntryEditActivity.java | 20 ++++++++----- .../{ => activities}/EntryEditActivityV3.java | 2 +- .../{ => activities}/EntryEditActivityV4.java | 2 +- .../GroupActivity.java | 30 +++++++++---------- .../GroupActivityV3.java | 2 +- .../GroupActivityV4.java | 2 +- .../GroupBaseActivity.java | 16 +++++----- .../{ => activities}/LockCloseActivity.java | 2 +- .../LockCloseHideActivity.java | 3 +- .../LockCloseListActivity.java | 2 +- .../{ => activities}/LockingActivity.java | 2 +- .../BasicViewHolder.java | 5 ++-- .../EntryViewHolder.java | 4 +-- .../GroupViewHolder.java | 4 +-- .../NodeAdapter.java | 4 +-- .../main/java/com/keepassdroid/app/App.java | 2 +- .../keepassdroid/{ => database}/Database.java | 3 +- .../keepassdroid/database/edit/AddEntry.java | 2 +- .../keepassdroid/database/edit/AddGroup.java | 2 +- .../keepassdroid/database/edit/CreateDB.java | 2 +- .../database/edit/DeleteEntry.java | 2 +- .../database/edit/DeleteGroup.java | 4 +-- .../keepassdroid/database/edit/LoadDB.java | 2 +- .../database/edit/RunnableOnFinish.java | 2 +- .../keepassdroid/database/edit/SaveDB.java | 2 +- .../database/edit/SetPassword.java | 2 +- .../database/edit/UpdateEntry.java | 2 +- .../keepassdroid/database/load/Importer.java | 2 +- .../database/load/ImporterV3.java | 2 +- .../database/load/ImporterV3Debug.java | 2 +- .../database/load/ImporterV4.java | 3 +- .../database/load/ImporterV4Debug.java | 2 +- .../FilePickerStylishActivity.java | 2 +- .../fileselect/FileSelectActivity.java | 22 +++++++------- .../AssignMasterKeyDialogFragment.java} | 8 ++--- .../CreateFileDialogFragment.java} | 9 +++--- .../GeneratePasswordDialogFragment.java} | 4 +-- .../GroupEditDialogFragment.java} | 18 +++++------ .../IconPickerDialogFragment.java} | 8 ++--- .../UnavailableFeatureDialogFragment.java} | 8 ++--- .../{ => password}/PasswordActivity.java | 7 +++-- .../UriIntentInitTaskCallback.java | 2 +- .../keepassdroid/search/SearchDbHelper.java | 2 +- .../search/SearchResultsActivity.java | 6 ++-- .../settings/MainPreferenceFragment.java | 2 +- .../settings/NestedSettingsFragment.java | 6 ++-- .../RoundsPreferenceDialogFragmentCompat.java | 4 +-- .../{ => tasks}/ProgressTask.java | 2 +- .../keepassdroid/{ => tasks}/UIToastTask.java | 2 +- .../{ => tasks}/UpdateStatus.java | 2 +- .../java/com/keepassdroid/utils/MenuUtil.java | 2 +- .../view/AssignPasswordHelper.java | 2 +- 59 files changed, 146 insertions(+), 144 deletions(-) rename app/src/main/java/com/keepassdroid/{ => activities}/AboutActivity.java (98%) rename app/src/main/java/com/keepassdroid/{ => activities}/EntryActivity.java (99%) rename app/src/main/java/com/keepassdroid/{ => activities}/EntryActivityV4.java (98%) rename app/src/main/java/com/keepassdroid/{ => activities}/EntryEditActivity.java (92%) rename app/src/main/java/com/keepassdroid/{ => activities}/EntryEditActivityV3.java (97%) rename app/src/main/java/com/keepassdroid/{ => activities}/EntryEditActivityV4.java (99%) rename app/src/main/java/com/keepassdroid/{activity => activities}/GroupActivity.java (88%) rename app/src/main/java/com/keepassdroid/{activity => activities}/GroupActivityV3.java (97%) rename app/src/main/java/com/keepassdroid/{activity => activities}/GroupActivityV4.java (97%) rename app/src/main/java/com/keepassdroid/{activity => activities}/GroupBaseActivity.java (95%) rename app/src/main/java/com/keepassdroid/{ => activities}/LockCloseActivity.java (97%) rename app/src/main/java/com/keepassdroid/{ => activities}/LockCloseHideActivity.java (96%) rename app/src/main/java/com/keepassdroid/{ => activities}/LockCloseListActivity.java (96%) rename app/src/main/java/com/keepassdroid/{ => activities}/LockingActivity.java (98%) rename app/src/main/java/com/keepassdroid/{groupentity => adapters}/BasicViewHolder.java (68%) rename app/src/main/java/com/keepassdroid/{groupentity => adapters}/EntryViewHolder.java (80%) rename app/src/main/java/com/keepassdroid/{groupentity => adapters}/GroupViewHolder.java (80%) rename app/src/main/java/com/keepassdroid/{groupentity => adapters}/NodeAdapter.java (98%) rename app/src/main/java/com/keepassdroid/{ => database}/Database.java (99%) rename app/src/main/java/com/keepassdroid/{ => fileselect}/FilePickerStylishActivity.java (98%) rename app/src/main/java/com/keepassdroid/{AssignMasterKeyDialog.java => fragments/AssignMasterKeyDialogFragment.java} (97%) rename app/src/main/java/com/keepassdroid/{CreateFileDialog.java => fragments/CreateFileDialogFragment.java} (95%) rename app/src/main/java/com/keepassdroid/{GeneratePasswordFragment.java => fragments/GeneratePasswordDialogFragment.java} (98%) rename app/src/main/java/com/keepassdroid/{GroupEditFragment.java => fragments/GroupEditDialogFragment.java} (86%) rename app/src/main/java/com/keepassdroid/{IconPickerFragment.java => fragments/IconPickerDialogFragment.java} (94%) rename app/src/main/java/com/keepassdroid/{UnavailableFeatureDialog.java => fragments/UnavailableFeatureDialogFragment.java} (84%) rename app/src/main/java/com/keepassdroid/{ => password}/PasswordActivity.java (99%) rename app/src/main/java/com/keepassdroid/{ => password}/UriIntentInitTaskCallback.java (80%) rename app/src/main/java/com/keepassdroid/{ => tasks}/ProgressTask.java (98%) rename app/src/main/java/com/keepassdroid/{ => tasks}/UIToastTask.java (97%) rename app/src/main/java/com/keepassdroid/{ => tasks}/UpdateStatus.java (97%) diff --git a/app/src/androidTest/java/com/keepassdroid/tests/database/DeleteEntry.java b/app/src/androidTest/java/com/keepassdroid/tests/database/DeleteEntry.java index e45c36fea..78e5c06d6 100644 --- a/app/src/androidTest/java/com/keepassdroid/tests/database/DeleteEntry.java +++ b/app/src/androidTest/java/com/keepassdroid/tests/database/DeleteEntry.java @@ -24,7 +24,7 @@ import java.util.List; import android.content.Context; import android.test.AndroidTestCase; -import com.keepassdroid.Database; +import com.keepassdroid.database.Database; import com.keepassdroid.database.PwDatabase; import com.keepassdroid.database.PwDatabaseV3; import com.keepassdroid.database.PwEntry; diff --git a/app/src/androidTest/java/com/keepassdroid/tests/database/TestData.java b/app/src/androidTest/java/com/keepassdroid/tests/database/TestData.java index cfe702a09..b32536aa7 100644 --- a/app/src/androidTest/java/com/keepassdroid/tests/database/TestData.java +++ b/app/src/androidTest/java/com/keepassdroid/tests/database/TestData.java @@ -25,12 +25,10 @@ import android.content.Context; import android.content.res.AssetManager; import android.net.Uri; -import com.keepassdroid.Database; +import com.keepassdroid.database.Database; import com.keepassdroid.database.PwDatabaseV3Debug; import com.keepassdroid.database.load.Importer; import com.keepassdroid.tests.TestUtil; -import com.keepassdroid.utils.EmptyUtils; -import com.keepassdroid.utils.UriUtil; public class TestData { private static final String TEST1_KEYFILE = ""; 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 d33852d21..0e423f719 100644 --- a/app/src/androidTest/java/com/keepassdroid/tests/search/SearchTest.java +++ b/app/src/androidTest/java/com/keepassdroid/tests/search/SearchTest.java @@ -26,7 +26,7 @@ import android.preference.PreferenceManager; import android.test.AndroidTestCase; import com.kunzisoft.keepass.R; -import com.keepassdroid.Database; +import com.keepassdroid.database.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 de30edab9..453a267fc 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -37,7 +37,7 @@ android:resource="@xml/nnf_provider_paths" /> @@ -56,10 +56,10 @@ android:launchMode="singleInstance" android:configChanges="orientation|keyboardHidden" android:windowSoftInputMode="stateHidden" /> - - @@ -91,29 +91,29 @@ - + - + diff --git a/app/src/main/java/com/keepassdroid/AboutActivity.java b/app/src/main/java/com/keepassdroid/activities/AboutActivity.java similarity index 98% rename from app/src/main/java/com/keepassdroid/AboutActivity.java rename to app/src/main/java/com/keepassdroid/activities/AboutActivity.java index a0356867d..86e44ad7a 100644 --- a/app/src/main/java/com/keepassdroid/AboutActivity.java +++ b/app/src/main/java/com/keepassdroid/activities/AboutActivity.java @@ -17,7 +17,7 @@ * along with KeePass DX. If not, see . * */ -package com.keepassdroid; +package com.keepassdroid.activities; import android.content.pm.PackageInfo; import android.content.pm.PackageManager.NameNotFoundException; diff --git a/app/src/main/java/com/keepassdroid/EntryActivity.java b/app/src/main/java/com/keepassdroid/activities/EntryActivity.java similarity index 99% rename from app/src/main/java/com/keepassdroid/EntryActivity.java rename to app/src/main/java/com/keepassdroid/activities/EntryActivity.java index 71be3a62c..dfe8d39b3 100644 --- a/app/src/main/java/com/keepassdroid/EntryActivity.java +++ b/app/src/main/java/com/keepassdroid/activities/EntryActivity.java @@ -18,7 +18,7 @@ * along with KeePass DX. If not, see . * */ -package com.keepassdroid; +package com.keepassdroid.activities; import android.app.Activity; import android.app.AlertDialog; @@ -49,6 +49,8 @@ import android.widget.ImageView; import android.widget.TextView; import android.widget.Toast; +import com.keepassdroid.database.Database; +import com.keepassdroid.tasks.UIToastTask; import com.kunzisoft.keepass.KeePass; import com.kunzisoft.keepass.R; import com.keepassdroid.app.App; diff --git a/app/src/main/java/com/keepassdroid/EntryActivityV4.java b/app/src/main/java/com/keepassdroid/activities/EntryActivityV4.java similarity index 98% rename from app/src/main/java/com/keepassdroid/EntryActivityV4.java rename to app/src/main/java/com/keepassdroid/activities/EntryActivityV4.java index af8ef747a..e16d14bb6 100644 --- a/app/src/main/java/com/keepassdroid/EntryActivityV4.java +++ b/app/src/main/java/com/keepassdroid/activities/EntryActivityV4.java @@ -17,7 +17,7 @@ * along with KeePass DX. If not, see . * */ -package com.keepassdroid; +package com.keepassdroid.activities; import java.util.Map; diff --git a/app/src/main/java/com/keepassdroid/EntryEditActivity.java b/app/src/main/java/com/keepassdroid/activities/EntryEditActivity.java similarity index 92% rename from app/src/main/java/com/keepassdroid/EntryEditActivity.java rename to app/src/main/java/com/keepassdroid/activities/EntryEditActivity.java index d05fc2cff..f2b32f9a5 100644 --- a/app/src/main/java/com/keepassdroid/EntryEditActivity.java +++ b/app/src/main/java/com/keepassdroid/activities/EntryEditActivity.java @@ -17,7 +17,7 @@ * along with KeePass DX. If not, see . * */ -package com.keepassdroid; +package com.keepassdroid.activities; import android.app.Activity; import android.content.Intent; @@ -34,6 +34,10 @@ import android.widget.ImageButton; import android.widget.TextView; import android.widget.Toast; +import com.keepassdroid.database.Database; +import com.keepassdroid.fragments.GeneratePasswordDialogFragment; +import com.keepassdroid.fragments.IconPickerDialogFragment; +import com.keepassdroid.tasks.ProgressTask; import com.kunzisoft.keepass.KeePass; import com.kunzisoft.keepass.R; import com.keepassdroid.app.App; @@ -60,8 +64,8 @@ import java.util.Date; import java.util.UUID; public abstract class EntryEditActivity extends LockCloseHideActivity - implements IconPickerFragment.IconPickerListener, - GeneratePasswordFragment.GeneratePasswordListener { + implements IconPickerDialogFragment.IconPickerListener, + GeneratePasswordDialogFragment.GeneratePasswordListener { public static final String KEY_ENTRY = "entry"; public static final String KEY_PARENT = "parent"; @@ -149,7 +153,7 @@ public abstract class EntryEditActivity extends LockCloseHideActivity View iconButton = findViewById(R.id.icon_button); iconButton.setOnClickListener(new View.OnClickListener() { public void onClick(View v) { - IconPickerFragment.Launch(EntryEditActivity.this); + IconPickerDialogFragment.Launch(EntryEditActivity.this); } }); @@ -158,8 +162,8 @@ public abstract class EntryEditActivity extends LockCloseHideActivity generatePassword.setOnClickListener(new OnClickListener() { public void onClick(View v) { - GeneratePasswordFragment generatePasswordFragment = new GeneratePasswordFragment(); - generatePasswordFragment.show(getSupportFragmentManager(), "PasswordGeneratorFragment"); + GeneratePasswordDialogFragment generatePasswordDialogFragment = new GeneratePasswordDialogFragment(); + generatePasswordDialogFragment.show(getSupportFragmentManager(), "PasswordGeneratorFragment"); } }); @@ -289,14 +293,14 @@ public abstract class EntryEditActivity extends LockCloseHideActivity @Override public void iconPicked(Bundle bundle) { - mSelectedIconID = bundle.getInt(IconPickerFragment.KEY_ICON_ID); + mSelectedIconID = bundle.getInt(IconPickerDialogFragment.KEY_ICON_ID); ImageButton currIconButton = (ImageButton) findViewById(R.id.icon_button); currIconButton.setImageResource(Icons.iconToResId(mSelectedIconID)); } @Override public void acceptPassword(Bundle bundle) { - String generatedPassword = bundle.getString(GeneratePasswordFragment.KEY_PASSWORD_ID); + String generatedPassword = bundle.getString(GeneratePasswordDialogFragment.KEY_PASSWORD_ID); EditText password = (EditText) findViewById(R.id.entry_password); EditText confPassword = (EditText) findViewById(R.id.entry_confpassword); diff --git a/app/src/main/java/com/keepassdroid/EntryEditActivityV3.java b/app/src/main/java/com/keepassdroid/activities/EntryEditActivityV3.java similarity index 97% rename from app/src/main/java/com/keepassdroid/EntryEditActivityV3.java rename to app/src/main/java/com/keepassdroid/activities/EntryEditActivityV3.java index 3bb54bfc4..bba806e4f 100644 --- a/app/src/main/java/com/keepassdroid/EntryEditActivityV3.java +++ b/app/src/main/java/com/keepassdroid/activities/EntryEditActivityV3.java @@ -17,7 +17,7 @@ * along with KeePass DX. If not, see . * */ -package com.keepassdroid; +package com.keepassdroid.activities; import android.content.Intent; diff --git a/app/src/main/java/com/keepassdroid/EntryEditActivityV4.java b/app/src/main/java/com/keepassdroid/activities/EntryEditActivityV4.java similarity index 99% rename from app/src/main/java/com/keepassdroid/EntryEditActivityV4.java rename to app/src/main/java/com/keepassdroid/activities/EntryEditActivityV4.java index e3dce1cf3..497b724cc 100644 --- a/app/src/main/java/com/keepassdroid/EntryEditActivityV4.java +++ b/app/src/main/java/com/keepassdroid/activities/EntryEditActivityV4.java @@ -17,7 +17,7 @@ * along with KeePass DX. If not, see . * */ -package com.keepassdroid; +package com.keepassdroid.activities; import android.content.Context; import android.content.Intent; diff --git a/app/src/main/java/com/keepassdroid/activity/GroupActivity.java b/app/src/main/java/com/keepassdroid/activities/GroupActivity.java similarity index 88% rename from app/src/main/java/com/keepassdroid/activity/GroupActivity.java rename to app/src/main/java/com/keepassdroid/activities/GroupActivity.java index dee1e0197..e440f5c27 100644 --- a/app/src/main/java/com/keepassdroid/activity/GroupActivity.java +++ b/app/src/main/java/com/keepassdroid/activities/GroupActivity.java @@ -17,7 +17,7 @@ * along with KeePass DX. If not, see . * */ -package com.keepassdroid.activity; +package com.keepassdroid.activities; import android.app.Activity; import android.app.Dialog; @@ -31,17 +31,15 @@ import android.util.Log; import android.view.MenuItem; import android.view.View; -import com.keepassdroid.Database; -import com.keepassdroid.EntryActivity; -import com.keepassdroid.EntryEditActivity; -import com.keepassdroid.GroupEditFragment; -import com.keepassdroid.IconPickerFragment; -import com.keepassdroid.ProgressTask; +import com.keepassdroid.database.Database; +import com.keepassdroid.fragments.GroupEditDialogFragment; +import com.keepassdroid.fragments.IconPickerDialogFragment; +import com.keepassdroid.tasks.ProgressTask; import com.keepassdroid.database.PwEntry; import com.keepassdroid.database.PwNode; import com.keepassdroid.database.edit.DeleteEntry; import com.keepassdroid.database.edit.DeleteGroup; -import com.keepassdroid.groupentity.NodeAdapter; +import com.keepassdroid.adapters.NodeAdapter; import com.kunzisoft.keepass.KeePass; import com.kunzisoft.keepass.R; import com.keepassdroid.app.App; @@ -59,7 +57,7 @@ import com.keepassdroid.view.GroupRootView; import com.keepassdroid.view.GroupViewOnlyView; public abstract class GroupActivity extends GroupBaseActivity - implements GroupEditFragment.CreateGroupListener, IconPickerFragment.IconPickerListener { + implements GroupEditDialogFragment.CreateGroupListener, IconPickerDialogFragment.IconPickerListener { private static final String TAG_CREATE_GROUP = "TAG_CREATE_GROUP"; @@ -169,8 +167,8 @@ public abstract class GroupActivity extends GroupBaseActivity addGroup.setOnClickListener(new View.OnClickListener() { public void onClick(View v) { - GroupEditFragment groupEditFragment = new GroupEditFragment(); - groupEditFragment.show(getSupportFragmentManager(), TAG_CREATE_GROUP); + GroupEditDialogFragment groupEditDialogFragment = new GroupEditDialogFragment(); + groupEditDialogFragment.show(getSupportFragmentManager(), TAG_CREATE_GROUP); } }); } @@ -247,8 +245,8 @@ public abstract class GroupActivity extends GroupBaseActivity @Override public void approveCreateGroup(Bundle bundle) { - String GroupName = bundle.getString(GroupEditFragment.KEY_NAME); - int GroupIconID = bundle.getInt(GroupEditFragment.KEY_ICON_ID); + String GroupName = bundle.getString(GroupEditDialogFragment.KEY_NAME); + int GroupIconID = bundle.getInt(GroupEditDialogFragment.KEY_ICON_ID); GroupActivity act = GroupActivity.this; Handler handler = new Handler(); AddGroup task = AddGroup.getInstance(this, App.getDB(), GroupName, GroupIconID, mGroup, act.new RefreshTask(handler), false); @@ -264,9 +262,9 @@ public abstract class GroupActivity extends GroupBaseActivity @Override // For icon in create tree dialog public void iconPicked(Bundle bundle) { - GroupEditFragment groupEditFragment = (GroupEditFragment) getSupportFragmentManager().findFragmentByTag(TAG_CREATE_GROUP); - if (groupEditFragment != null) { - groupEditFragment.iconPicked(bundle); + GroupEditDialogFragment groupEditDialogFragment = (GroupEditDialogFragment) getSupportFragmentManager().findFragmentByTag(TAG_CREATE_GROUP); + if (groupEditDialogFragment != null) { + groupEditDialogFragment.iconPicked(bundle); } } diff --git a/app/src/main/java/com/keepassdroid/activity/GroupActivityV3.java b/app/src/main/java/com/keepassdroid/activities/GroupActivityV3.java similarity index 97% rename from app/src/main/java/com/keepassdroid/activity/GroupActivityV3.java rename to app/src/main/java/com/keepassdroid/activities/GroupActivityV3.java index aabef5939..e7d72f8a2 100644 --- a/app/src/main/java/com/keepassdroid/activity/GroupActivityV3.java +++ b/app/src/main/java/com/keepassdroid/activities/GroupActivityV3.java @@ -17,7 +17,7 @@ * along with KeePass DX. If not, see . * */ -package com.keepassdroid.activity; +package com.keepassdroid.activities; import android.content.Intent; diff --git a/app/src/main/java/com/keepassdroid/activity/GroupActivityV4.java b/app/src/main/java/com/keepassdroid/activities/GroupActivityV4.java similarity index 97% rename from app/src/main/java/com/keepassdroid/activity/GroupActivityV4.java rename to app/src/main/java/com/keepassdroid/activities/GroupActivityV4.java index b7c1e1953..b13d9719a 100644 --- a/app/src/main/java/com/keepassdroid/activity/GroupActivityV4.java +++ b/app/src/main/java/com/keepassdroid/activities/GroupActivityV4.java @@ -17,7 +17,7 @@ * along with KeePass DX. If not, see . * */ -package com.keepassdroid.activity; +package com.keepassdroid.activities; import java.util.UUID; diff --git a/app/src/main/java/com/keepassdroid/activity/GroupBaseActivity.java b/app/src/main/java/com/keepassdroid/activities/GroupBaseActivity.java similarity index 95% rename from app/src/main/java/com/keepassdroid/activity/GroupBaseActivity.java rename to app/src/main/java/com/keepassdroid/activities/GroupBaseActivity.java index f8f613113..b98b72d40 100644 --- a/app/src/main/java/com/keepassdroid/activity/GroupBaseActivity.java +++ b/app/src/main/java/com/keepassdroid/activities/GroupBaseActivity.java @@ -17,7 +17,7 @@ * along with KeePass DX. If not, see . * */ -package com.keepassdroid.activity; +package com.keepassdroid.activities; import android.app.SearchManager; import android.content.ComponentName; @@ -40,19 +40,17 @@ import android.view.View; import android.widget.ImageView; import android.widget.TextView; -import com.keepassdroid.AssignMasterKeyDialog; -import com.keepassdroid.Database; -import com.keepassdroid.EntryActivity; -import com.keepassdroid.LockCloseListActivity; -import com.keepassdroid.UIToastTask; +import com.keepassdroid.fragments.AssignMasterKeyDialogFragment; +import com.keepassdroid.database.Database; import com.keepassdroid.app.App; import com.keepassdroid.compat.ActivityCompat; import com.keepassdroid.compat.EditorCompat; import com.keepassdroid.database.PwEntry; import com.keepassdroid.database.PwGroup; import com.keepassdroid.database.edit.OnFinish; -import com.keepassdroid.groupentity.NodeAdapter; +import com.keepassdroid.adapters.NodeAdapter; import com.keepassdroid.search.SearchResultsActivity; +import com.keepassdroid.tasks.UIToastTask; import com.keepassdroid.utils.MenuUtil; import com.keepassdroid.view.AssignPasswordHelper; import com.keepassdroid.view.GroupViewOnlyView; @@ -60,7 +58,7 @@ import com.kunzisoft.keepass.KeePass; import com.kunzisoft.keepass.R; public abstract class GroupBaseActivity extends LockCloseListActivity - implements AssignMasterKeyDialog.AssignPasswordDialogListener, + implements AssignMasterKeyDialogFragment.AssignPasswordDialogListener, NodeAdapter.OnNodeClickCallback { protected RecyclerView mList; protected NodeAdapter mAdapter; @@ -283,7 +281,7 @@ public abstract class GroupBaseActivity extends LockCloseListActivity } private void setPassword() { - AssignMasterKeyDialog dialog = new AssignMasterKeyDialog(); + AssignMasterKeyDialogFragment dialog = new AssignMasterKeyDialogFragment(); dialog.show(getSupportFragmentManager(), "passwordDialog"); } diff --git a/app/src/main/java/com/keepassdroid/LockCloseActivity.java b/app/src/main/java/com/keepassdroid/activities/LockCloseActivity.java similarity index 97% rename from app/src/main/java/com/keepassdroid/LockCloseActivity.java rename to app/src/main/java/com/keepassdroid/activities/LockCloseActivity.java index 3e4098a82..2b5f7d658 100644 --- a/app/src/main/java/com/keepassdroid/LockCloseActivity.java +++ b/app/src/main/java/com/keepassdroid/activities/LockCloseActivity.java @@ -17,7 +17,7 @@ * along with KeePass DX. If not, see . * */ -package com.keepassdroid; +package com.keepassdroid.activities; import android.content.ActivityNotFoundException; import android.content.Intent; diff --git a/app/src/main/java/com/keepassdroid/LockCloseHideActivity.java b/app/src/main/java/com/keepassdroid/activities/LockCloseHideActivity.java similarity index 96% rename from app/src/main/java/com/keepassdroid/LockCloseHideActivity.java rename to app/src/main/java/com/keepassdroid/activities/LockCloseHideActivity.java index ede54ae8b..4490e6a2c 100644 --- a/app/src/main/java/com/keepassdroid/LockCloseHideActivity.java +++ b/app/src/main/java/com/keepassdroid/activities/LockCloseHideActivity.java @@ -17,11 +17,10 @@ * along with KeePass DX. If not, see . * */ -package com.keepassdroid; +package com.keepassdroid.activities; import com.keepassdroid.compat.BuildCompat; -import android.os.Build; import android.os.Bundle; import android.view.WindowManager.LayoutParams; diff --git a/app/src/main/java/com/keepassdroid/LockCloseListActivity.java b/app/src/main/java/com/keepassdroid/activities/LockCloseListActivity.java similarity index 96% rename from app/src/main/java/com/keepassdroid/LockCloseListActivity.java rename to app/src/main/java/com/keepassdroid/activities/LockCloseListActivity.java index 14af8f22c..4aa3dd2bc 100644 --- a/app/src/main/java/com/keepassdroid/LockCloseListActivity.java +++ b/app/src/main/java/com/keepassdroid/activities/LockCloseListActivity.java @@ -17,7 +17,7 @@ * along with KeePass DX. If not, see . * */ -package com.keepassdroid; +package com.keepassdroid.activities; import com.keepassdroid.timeout.TimeoutHelper; diff --git a/app/src/main/java/com/keepassdroid/LockingActivity.java b/app/src/main/java/com/keepassdroid/activities/LockingActivity.java similarity index 98% rename from app/src/main/java/com/keepassdroid/LockingActivity.java rename to app/src/main/java/com/keepassdroid/activities/LockingActivity.java index a004bcecd..1f35e939a 100644 --- a/app/src/main/java/com/keepassdroid/LockingActivity.java +++ b/app/src/main/java/com/keepassdroid/activities/LockingActivity.java @@ -17,7 +17,7 @@ * along with KeePass DX. If not, see . * */ -package com.keepassdroid; +package com.keepassdroid.activities; import android.content.BroadcastReceiver; diff --git a/app/src/main/java/com/keepassdroid/groupentity/BasicViewHolder.java b/app/src/main/java/com/keepassdroid/adapters/BasicViewHolder.java similarity index 68% rename from app/src/main/java/com/keepassdroid/groupentity/BasicViewHolder.java rename to app/src/main/java/com/keepassdroid/adapters/BasicViewHolder.java index 99abe0780..b9e4a380f 100644 --- a/app/src/main/java/com/keepassdroid/groupentity/BasicViewHolder.java +++ b/app/src/main/java/com/keepassdroid/adapters/BasicViewHolder.java @@ -1,12 +1,11 @@ -package com.keepassdroid.groupentity; +package com.keepassdroid.adapters; import android.support.v7.widget.RecyclerView; import android.view.View; import android.widget.ImageView; import android.widget.TextView; -// TODO Refactor -public abstract class BasicViewHolder extends RecyclerView.ViewHolder { +abstract class BasicViewHolder extends RecyclerView.ViewHolder { View container; ImageView icon; diff --git a/app/src/main/java/com/keepassdroid/groupentity/EntryViewHolder.java b/app/src/main/java/com/keepassdroid/adapters/EntryViewHolder.java similarity index 80% rename from app/src/main/java/com/keepassdroid/groupentity/EntryViewHolder.java rename to app/src/main/java/com/keepassdroid/adapters/EntryViewHolder.java index 0fc6ca493..5c14998be 100644 --- a/app/src/main/java/com/keepassdroid/groupentity/EntryViewHolder.java +++ b/app/src/main/java/com/keepassdroid/adapters/EntryViewHolder.java @@ -1,4 +1,4 @@ -package com.keepassdroid.groupentity; +package com.keepassdroid.adapters; import android.view.View; import android.widget.ImageView; @@ -6,7 +6,7 @@ import android.widget.TextView; import com.kunzisoft.keepass.R; -public class EntryViewHolder extends BasicViewHolder { +class EntryViewHolder extends BasicViewHolder { EntryViewHolder(View itemView) { super(itemView); diff --git a/app/src/main/java/com/keepassdroid/groupentity/GroupViewHolder.java b/app/src/main/java/com/keepassdroid/adapters/GroupViewHolder.java similarity index 80% rename from app/src/main/java/com/keepassdroid/groupentity/GroupViewHolder.java rename to app/src/main/java/com/keepassdroid/adapters/GroupViewHolder.java index 81a8c2dd5..0fd6aca61 100644 --- a/app/src/main/java/com/keepassdroid/groupentity/GroupViewHolder.java +++ b/app/src/main/java/com/keepassdroid/adapters/GroupViewHolder.java @@ -1,4 +1,4 @@ -package com.keepassdroid.groupentity; +package com.keepassdroid.adapters; import android.view.View; import android.widget.ImageView; @@ -6,7 +6,7 @@ import android.widget.TextView; import com.kunzisoft.keepass.R; -public class GroupViewHolder extends BasicViewHolder { +class GroupViewHolder extends BasicViewHolder { GroupViewHolder(View itemView) { super(itemView); diff --git a/app/src/main/java/com/keepassdroid/groupentity/NodeAdapter.java b/app/src/main/java/com/keepassdroid/adapters/NodeAdapter.java similarity index 98% rename from app/src/main/java/com/keepassdroid/groupentity/NodeAdapter.java rename to app/src/main/java/com/keepassdroid/adapters/NodeAdapter.java index 5aa5d13c4..b159cefe7 100644 --- a/app/src/main/java/com/keepassdroid/groupentity/NodeAdapter.java +++ b/app/src/main/java/com/keepassdroid/adapters/NodeAdapter.java @@ -1,4 +1,4 @@ -package com.keepassdroid.groupentity; +package com.keepassdroid.adapters; import android.content.Context; import android.content.SharedPreferences; @@ -203,7 +203,7 @@ public class NodeAdapter extends RecyclerView.Adapter { private int position; private NodeMenuListener menuListener; - public ContextMenuBuilder(PwNode node, int position, NodeMenuListener menuListener) { + ContextMenuBuilder(PwNode node, int position, NodeMenuListener menuListener) { this.menuListener = menuListener; this.node = node; this.position = position; diff --git a/app/src/main/java/com/keepassdroid/app/App.java b/app/src/main/java/com/keepassdroid/app/App.java index 1746d0143..08b06db66 100644 --- a/app/src/main/java/com/keepassdroid/app/App.java +++ b/app/src/main/java/com/keepassdroid/app/App.java @@ -21,7 +21,7 @@ package com.keepassdroid.app; import android.app.Application; -import com.keepassdroid.Database; +import com.keepassdroid.database.Database; import com.keepassdroid.compat.PRNGFixes; import com.keepassdroid.fileselect.RecentFileHistory; import com.keepassdroid.stylish.Stylish; diff --git a/app/src/main/java/com/keepassdroid/Database.java b/app/src/main/java/com/keepassdroid/database/Database.java similarity index 99% rename from app/src/main/java/com/keepassdroid/Database.java rename to app/src/main/java/com/keepassdroid/database/Database.java index 24e5b7467..731657f10 100644 --- a/app/src/main/java/com/keepassdroid/Database.java +++ b/app/src/main/java/com/keepassdroid/database/Database.java @@ -17,7 +17,7 @@ * along with KeePass DX. If not, see . * */ -package com.keepassdroid; +package com.keepassdroid.database; import android.content.Context; import android.content.SharedPreferences; @@ -37,6 +37,7 @@ import com.keepassdroid.database.load.ImporterFactory; import com.keepassdroid.database.save.PwDbOutput; import com.keepassdroid.icons.DrawableFactory; import com.keepassdroid.search.SearchDbHelper; +import com.keepassdroid.tasks.UpdateStatus; import com.keepassdroid.utils.UriUtil; import com.kunzisoft.keepass.R; diff --git a/app/src/main/java/com/keepassdroid/database/edit/AddEntry.java b/app/src/main/java/com/keepassdroid/database/edit/AddEntry.java index 57c22f74a..82f94870f 100644 --- a/app/src/main/java/com/keepassdroid/database/edit/AddEntry.java +++ b/app/src/main/java/com/keepassdroid/database/edit/AddEntry.java @@ -21,7 +21,7 @@ package com.keepassdroid.database.edit; import android.content.Context; -import com.keepassdroid.Database; +import com.keepassdroid.database.Database; import com.keepassdroid.database.PwDatabase; import com.keepassdroid.database.PwEntry; import com.keepassdroid.database.PwGroup; diff --git a/app/src/main/java/com/keepassdroid/database/edit/AddGroup.java b/app/src/main/java/com/keepassdroid/database/edit/AddGroup.java index 31dbe1eba..a234a5249 100644 --- a/app/src/main/java/com/keepassdroid/database/edit/AddGroup.java +++ b/app/src/main/java/com/keepassdroid/database/edit/AddGroup.java @@ -21,7 +21,7 @@ package com.keepassdroid.database.edit; import android.content.Context; -import com.keepassdroid.Database; +import com.keepassdroid.database.Database; import com.keepassdroid.database.PwDatabase; import com.keepassdroid.database.PwGroup; diff --git a/app/src/main/java/com/keepassdroid/database/edit/CreateDB.java b/app/src/main/java/com/keepassdroid/database/edit/CreateDB.java index 5217e257f..659f8cb3c 100644 --- a/app/src/main/java/com/keepassdroid/database/edit/CreateDB.java +++ b/app/src/main/java/com/keepassdroid/database/edit/CreateDB.java @@ -21,7 +21,7 @@ package com.keepassdroid.database.edit; import android.content.Context; -import com.keepassdroid.Database; +import com.keepassdroid.database.Database; import com.keepassdroid.app.App; import com.keepassdroid.database.PwDatabase; import com.keepassdroid.utils.UriUtil; diff --git a/app/src/main/java/com/keepassdroid/database/edit/DeleteEntry.java b/app/src/main/java/com/keepassdroid/database/edit/DeleteEntry.java index 96fc5dc67..3ed13dd54 100644 --- a/app/src/main/java/com/keepassdroid/database/edit/DeleteEntry.java +++ b/app/src/main/java/com/keepassdroid/database/edit/DeleteEntry.java @@ -21,7 +21,7 @@ package com.keepassdroid.database.edit; import android.content.Context; -import com.keepassdroid.Database; +import com.keepassdroid.database.Database; import com.keepassdroid.database.PwDatabase; import com.keepassdroid.database.PwEntry; import com.keepassdroid.database.PwGroup; diff --git a/app/src/main/java/com/keepassdroid/database/edit/DeleteGroup.java b/app/src/main/java/com/keepassdroid/database/edit/DeleteGroup.java index cfb92b4de..f085486d2 100644 --- a/app/src/main/java/com/keepassdroid/database/edit/DeleteGroup.java +++ b/app/src/main/java/com/keepassdroid/database/edit/DeleteGroup.java @@ -22,8 +22,8 @@ package com.keepassdroid.database.edit; import java.util.ArrayList; import java.util.List; -import com.keepassdroid.Database; -import com.keepassdroid.activity.GroupBaseActivity; +import com.keepassdroid.database.Database; +import com.keepassdroid.activities.GroupBaseActivity; import com.keepassdroid.app.App; import com.keepassdroid.database.PwEntry; import com.keepassdroid.database.PwGroup; diff --git a/app/src/main/java/com/keepassdroid/database/edit/LoadDB.java b/app/src/main/java/com/keepassdroid/database/edit/LoadDB.java index 918d6e393..ae0ffab79 100644 --- a/app/src/main/java/com/keepassdroid/database/edit/LoadDB.java +++ b/app/src/main/java/com/keepassdroid/database/edit/LoadDB.java @@ -25,7 +25,7 @@ import android.net.Uri; import android.preference.PreferenceManager; import com.kunzisoft.keepass.R; -import com.keepassdroid.Database; +import com.keepassdroid.database.Database; import com.keepassdroid.app.App; import com.keepassdroid.database.exception.ArcFourException; import com.keepassdroid.database.exception.ContentFileNotFoundException; diff --git a/app/src/main/java/com/keepassdroid/database/edit/RunnableOnFinish.java b/app/src/main/java/com/keepassdroid/database/edit/RunnableOnFinish.java index 842d6e0cc..54f5040dd 100644 --- a/app/src/main/java/com/keepassdroid/database/edit/RunnableOnFinish.java +++ b/app/src/main/java/com/keepassdroid/database/edit/RunnableOnFinish.java @@ -19,7 +19,7 @@ */ package com.keepassdroid.database.edit; -import com.keepassdroid.UpdateStatus; +import com.keepassdroid.tasks.UpdateStatus; public abstract class RunnableOnFinish implements Runnable { diff --git a/app/src/main/java/com/keepassdroid/database/edit/SaveDB.java b/app/src/main/java/com/keepassdroid/database/edit/SaveDB.java index 634a4bba4..2b981d4fd 100644 --- a/app/src/main/java/com/keepassdroid/database/edit/SaveDB.java +++ b/app/src/main/java/com/keepassdroid/database/edit/SaveDB.java @@ -23,7 +23,7 @@ import android.content.Context; import java.io.IOException; -import com.keepassdroid.Database; +import com.keepassdroid.database.Database; import com.keepassdroid.database.exception.PwDbOutputException; public class SaveDB extends RunnableOnFinish { diff --git a/app/src/main/java/com/keepassdroid/database/edit/SetPassword.java b/app/src/main/java/com/keepassdroid/database/edit/SetPassword.java index d19a5cfe0..bce5df610 100644 --- a/app/src/main/java/com/keepassdroid/database/edit/SetPassword.java +++ b/app/src/main/java/com/keepassdroid/database/edit/SetPassword.java @@ -23,7 +23,7 @@ import android.content.Context; import android.content.DialogInterface; import android.net.Uri; -import com.keepassdroid.Database; +import com.keepassdroid.database.Database; import com.keepassdroid.database.PwDatabase; import com.keepassdroid.database.exception.InvalidKeyFileException; import com.keepassdroid.dialog.PasswordEncodingDialogHelper; diff --git a/app/src/main/java/com/keepassdroid/database/edit/UpdateEntry.java b/app/src/main/java/com/keepassdroid/database/edit/UpdateEntry.java index 03278a051..2874e82fb 100644 --- a/app/src/main/java/com/keepassdroid/database/edit/UpdateEntry.java +++ b/app/src/main/java/com/keepassdroid/database/edit/UpdateEntry.java @@ -21,7 +21,7 @@ package com.keepassdroid.database.edit; import android.content.Context; -import com.keepassdroid.Database; +import com.keepassdroid.database.Database; import com.keepassdroid.database.PwEntry; import com.keepassdroid.database.PwGroup; diff --git a/app/src/main/java/com/keepassdroid/database/load/Importer.java b/app/src/main/java/com/keepassdroid/database/load/Importer.java index 6f0e101ee..1af6b6eca 100644 --- a/app/src/main/java/com/keepassdroid/database/load/Importer.java +++ b/app/src/main/java/com/keepassdroid/database/load/Importer.java @@ -22,7 +22,7 @@ package com.keepassdroid.database.load; import java.io.IOException; import java.io.InputStream; -import com.keepassdroid.UpdateStatus; +import com.keepassdroid.tasks.UpdateStatus; import com.keepassdroid.database.PwDatabase; import com.keepassdroid.database.exception.InvalidDBException; diff --git a/app/src/main/java/com/keepassdroid/database/load/ImporterV3.java b/app/src/main/java/com/keepassdroid/database/load/ImporterV3.java index 3dde66e91..6722512b7 100644 --- a/app/src/main/java/com/keepassdroid/database/load/ImporterV3.java +++ b/app/src/main/java/com/keepassdroid/database/load/ImporterV3.java @@ -66,7 +66,7 @@ import javax.crypto.spec.SecretKeySpec; import android.util.Log; import com.kunzisoft.keepass.R; -import com.keepassdroid.UpdateStatus; +import com.keepassdroid.tasks.UpdateStatus; import com.keepassdroid.crypto.CipherFactory; import com.keepassdroid.database.PwDatabaseV3; import com.keepassdroid.database.PwDate; diff --git a/app/src/main/java/com/keepassdroid/database/load/ImporterV3Debug.java b/app/src/main/java/com/keepassdroid/database/load/ImporterV3Debug.java index eb68026b2..8daaf3f79 100644 --- a/app/src/main/java/com/keepassdroid/database/load/ImporterV3Debug.java +++ b/app/src/main/java/com/keepassdroid/database/load/ImporterV3Debug.java @@ -22,7 +22,7 @@ package com.keepassdroid.database.load; import java.io.IOException; import java.io.InputStream; -import com.keepassdroid.UpdateStatus; +import com.keepassdroid.tasks.UpdateStatus; import com.keepassdroid.database.PwDatabaseV3Debug; import com.keepassdroid.database.exception.InvalidDBException; diff --git a/app/src/main/java/com/keepassdroid/database/load/ImporterV4.java b/app/src/main/java/com/keepassdroid/database/load/ImporterV4.java index d151266f7..e8af9d791 100644 --- a/app/src/main/java/com/keepassdroid/database/load/ImporterV4.java +++ b/app/src/main/java/com/keepassdroid/database/load/ImporterV4.java @@ -46,11 +46,10 @@ import org.xmlpull.v1.XmlPullParserFactory; import biz.source_code.base64Coder.Base64Coder; -import com.keepassdroid.UpdateStatus; +import com.keepassdroid.tasks.UpdateStatus; import com.keepassdroid.crypto.CipherFactory; import com.keepassdroid.crypto.PwStreamCipherFactory; import com.keepassdroid.crypto.engine.CipherEngine; -import com.keepassdroid.database.BinaryPool; import com.keepassdroid.database.ITimeLogger; import com.keepassdroid.database.PwCompressionAlgorithm; import com.keepassdroid.database.PwDatabaseV4; diff --git a/app/src/main/java/com/keepassdroid/database/load/ImporterV4Debug.java b/app/src/main/java/com/keepassdroid/database/load/ImporterV4Debug.java index 5e6fc150c..12d8d4c57 100644 --- a/app/src/main/java/com/keepassdroid/database/load/ImporterV4Debug.java +++ b/app/src/main/java/com/keepassdroid/database/load/ImporterV4Debug.java @@ -19,7 +19,7 @@ */ package com.keepassdroid.database.load; -import com.keepassdroid.UpdateStatus; +import com.keepassdroid.tasks.UpdateStatus; import com.keepassdroid.database.PwDatabaseV4Debug; import com.keepassdroid.database.exception.InvalidDBException; diff --git a/app/src/main/java/com/keepassdroid/FilePickerStylishActivity.java b/app/src/main/java/com/keepassdroid/fileselect/FilePickerStylishActivity.java similarity index 98% rename from app/src/main/java/com/keepassdroid/FilePickerStylishActivity.java rename to app/src/main/java/com/keepassdroid/fileselect/FilePickerStylishActivity.java index 61952740e..a40cb82db 100644 --- a/app/src/main/java/com/keepassdroid/FilePickerStylishActivity.java +++ b/app/src/main/java/com/keepassdroid/fileselect/FilePickerStylishActivity.java @@ -17,7 +17,7 @@ * along with KeePass DX. If not, see . * */ -package com.keepassdroid; +package com.keepassdroid.fileselect; import android.content.Context; import android.os.Bundle; diff --git a/app/src/main/java/com/keepassdroid/fileselect/FileSelectActivity.java b/app/src/main/java/com/keepassdroid/fileselect/FileSelectActivity.java index 3335a8a26..d77850a49 100644 --- a/app/src/main/java/com/keepassdroid/fileselect/FileSelectActivity.java +++ b/app/src/main/java/com/keepassdroid/fileselect/FileSelectActivity.java @@ -41,11 +41,11 @@ import android.view.View; import android.widget.EditText; import android.widget.Toast; -import com.keepassdroid.AssignMasterKeyDialog; -import com.keepassdroid.CreateFileDialog; -import com.keepassdroid.activity.GroupActivity; -import com.keepassdroid.PasswordActivity; -import com.keepassdroid.ProgressTask; +import com.keepassdroid.fragments.AssignMasterKeyDialogFragment; +import com.keepassdroid.fragments.CreateFileDialogFragment; +import com.keepassdroid.activities.GroupActivity; +import com.keepassdroid.password.PasswordActivity; +import com.keepassdroid.tasks.ProgressTask; import com.keepassdroid.app.App; import com.keepassdroid.compat.ContentResolverCompat; import com.keepassdroid.compat.StorageAF; @@ -69,8 +69,8 @@ import java.io.IOException; import java.net.URLDecoder; public class FileSelectActivity extends StylishActivity implements - CreateFileDialog.DefinePathDialogListener , - AssignMasterKeyDialog.AssignPasswordDialogListener, + CreateFileDialogFragment.DefinePathDialogListener , + AssignMasterKeyDialogFragment.AssignPasswordDialogListener, FileSelectAdapter.FileSelectClearListener, FileSelectAdapter.FileInformationShowListener { @@ -138,8 +138,8 @@ public class FileSelectActivity extends StylishActivity implements View createButton = findViewById(R.id.create_database); createButton.setOnClickListener(new View.OnClickListener() { public void onClick(View v) { - CreateFileDialog createFileDialog = new CreateFileDialog(); - createFileDialog.show(getSupportFragmentManager(), "createFileDialog"); + CreateFileDialogFragment createFileDialogFragment = new CreateFileDialogFragment(); + createFileDialogFragment.show(getSupportFragmentManager(), "createFileDialogFragment"); } }); @@ -305,8 +305,8 @@ public class FileSelectActivity extends StylishActivity implements public boolean onDefinePathDialogPositiveClick(Uri pathFile) { databaseUri = pathFile; if(createDatabaseFile(pathFile)) { - AssignMasterKeyDialog assignMasterKeyDialog = new AssignMasterKeyDialog(); - assignMasterKeyDialog.show(getSupportFragmentManager(), "passwordDialog"); + AssignMasterKeyDialogFragment assignMasterKeyDialogFragment = new AssignMasterKeyDialogFragment(); + assignMasterKeyDialogFragment.show(getSupportFragmentManager(), "passwordDialog"); return true; } else return false; diff --git a/app/src/main/java/com/keepassdroid/AssignMasterKeyDialog.java b/app/src/main/java/com/keepassdroid/fragments/AssignMasterKeyDialogFragment.java similarity index 97% rename from app/src/main/java/com/keepassdroid/AssignMasterKeyDialog.java rename to app/src/main/java/com/keepassdroid/fragments/AssignMasterKeyDialogFragment.java index ff2dcaf3f..3dc236e6d 100644 --- a/app/src/main/java/com/keepassdroid/AssignMasterKeyDialog.java +++ b/app/src/main/java/com/keepassdroid/fragments/AssignMasterKeyDialogFragment.java @@ -17,7 +17,7 @@ * along with KeePass DX. If not, see . * */ -package com.keepassdroid; +package com.keepassdroid.fragments; import android.app.Dialog; import android.content.Context; @@ -42,7 +42,7 @@ import com.keepassdroid.utils.UriUtil; import com.keepassdroid.view.KeyFileHelper; import com.kunzisoft.keepass.R; -public class AssignMasterKeyDialog extends DialogFragment { +public class AssignMasterKeyDialogFragment extends DialogFragment { private String masterPassword; private Uri mKeyfile; @@ -226,7 +226,7 @@ public class AssignMasterKeyDialog extends DialogFragment { mListener.onAssignKeyDialogPositiveClick( passwordCheckBox.isChecked(), masterPassword, keyfileCheckBox.isChecked(), mKeyfile); - AssignMasterKeyDialog.this.dismiss(); + AssignMasterKeyDialogFragment.this.dismiss(); } } }) @@ -244,7 +244,7 @@ public class AssignMasterKeyDialog extends DialogFragment { mListener.onAssignKeyDialogPositiveClick( passwordCheckBox.isChecked(), masterPassword, keyfileCheckBox.isChecked(), mKeyfile); - AssignMasterKeyDialog.this.dismiss(); + AssignMasterKeyDialogFragment.this.dismiss(); } }) .setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() { diff --git a/app/src/main/java/com/keepassdroid/CreateFileDialog.java b/app/src/main/java/com/keepassdroid/fragments/CreateFileDialogFragment.java similarity index 95% rename from app/src/main/java/com/keepassdroid/CreateFileDialog.java rename to app/src/main/java/com/keepassdroid/fragments/CreateFileDialogFragment.java index 0f941d11a..e07181b28 100644 --- a/app/src/main/java/com/keepassdroid/CreateFileDialog.java +++ b/app/src/main/java/com/keepassdroid/fragments/CreateFileDialogFragment.java @@ -17,7 +17,7 @@ * along with KeePass DX. If not, see . * */ -package com.keepassdroid; +package com.keepassdroid.fragments; import android.app.Activity; import android.app.Dialog; @@ -38,6 +38,7 @@ import android.widget.Button; import android.widget.EditText; import android.widget.Spinner; +import com.keepassdroid.fileselect.FilePickerStylishActivity; import com.keepassdroid.utils.UriUtil; import com.kunzisoft.keepass.R; import com.nononsenseapps.filepicker.FilePickerActivity; @@ -45,7 +46,7 @@ import com.nononsenseapps.filepicker.Utils; import java.io.File; -public class CreateFileDialog extends DialogFragment implements AdapterView.OnItemSelectedListener{ +public class CreateFileDialogFragment extends DialogFragment implements AdapterView.OnItemSelectedListener{ private final int FILE_CODE = 3853; @@ -134,7 +135,7 @@ public class CreateFileDialog extends DialogFragment implements AdapterView.OnIt @Override public void onClick(final View v) { if(mListener.onDefinePathDialogPositiveClick(buildPath())) - CreateFileDialog.this.dismiss(); + CreateFileDialogFragment.this.dismiss(); } }); Button negativeButton = ((AlertDialog) dialog).getButton(DialogInterface.BUTTON_NEGATIVE); @@ -142,7 +143,7 @@ public class CreateFileDialog extends DialogFragment implements AdapterView.OnIt @Override public void onClick(final View v) { if(mListener.onDefinePathDialogNegativeClick(buildPath())) - CreateFileDialog.this.dismiss(); + CreateFileDialogFragment.this.dismiss(); } }); } diff --git a/app/src/main/java/com/keepassdroid/GeneratePasswordFragment.java b/app/src/main/java/com/keepassdroid/fragments/GeneratePasswordDialogFragment.java similarity index 98% rename from app/src/main/java/com/keepassdroid/GeneratePasswordFragment.java rename to app/src/main/java/com/keepassdroid/fragments/GeneratePasswordDialogFragment.java index 120d7382b..19bf7f1a9 100644 --- a/app/src/main/java/com/keepassdroid/GeneratePasswordFragment.java +++ b/app/src/main/java/com/keepassdroid/fragments/GeneratePasswordDialogFragment.java @@ -17,7 +17,7 @@ * along with KeePass DX. If not, see . * */ -package com.keepassdroid; +package com.keepassdroid.fragments; import android.app.Dialog; import android.content.Context; @@ -41,7 +41,7 @@ import com.kunzisoft.keepass.R; import java.util.Set; -public class GeneratePasswordFragment extends DialogFragment { +public class GeneratePasswordDialogFragment extends DialogFragment { public static final String KEY_PASSWORD_ID = "KEY_PASSWORD_ID"; diff --git a/app/src/main/java/com/keepassdroid/GroupEditFragment.java b/app/src/main/java/com/keepassdroid/fragments/GroupEditDialogFragment.java similarity index 86% rename from app/src/main/java/com/keepassdroid/GroupEditFragment.java rename to app/src/main/java/com/keepassdroid/fragments/GroupEditDialogFragment.java index abf928a15..e5dc8e513 100644 --- a/app/src/main/java/com/keepassdroid/GroupEditFragment.java +++ b/app/src/main/java/com/keepassdroid/fragments/GroupEditDialogFragment.java @@ -17,7 +17,7 @@ * along with KeePass DX. If not, see . * */ -package com.keepassdroid; +package com.keepassdroid.fragments; import android.app.Dialog; import android.content.Context; @@ -35,8 +35,8 @@ import android.widget.Toast; import com.kunzisoft.keepass.R; import com.keepassdroid.icons.Icons; -public class GroupEditFragment extends DialogFragment - implements IconPickerFragment.IconPickerListener { +public class GroupEditDialogFragment extends DialogFragment + implements IconPickerDialogFragment.IconPickerListener { public static final String KEY_NAME = "name"; public static final String KEY_ICON_ID = "icon_id"; @@ -57,7 +57,7 @@ public class GroupEditFragment extends DialogFragment } catch (ClassCastException e) { // The activity doesn't implement the interface, throw exception throw new ClassCastException(context.toString() - + " must implement " + GroupEditFragment.class.getName()); + + " must implement " + GroupEditDialogFragment.class.getName()); } } @@ -81,7 +81,7 @@ public class GroupEditFragment extends DialogFragment bundle.putInt(KEY_ICON_ID, mSelectedIconID); createGroupListener.approveCreateGroup(bundle); - GroupEditFragment.this.getDialog().cancel(); + GroupEditDialogFragment.this.getDialog().cancel(); } else { Toast.makeText(getContext(), R.string.error_no_name, Toast.LENGTH_LONG).show(); @@ -93,15 +93,15 @@ public class GroupEditFragment extends DialogFragment Bundle bundle = new Bundle(); createGroupListener.cancelCreateGroup(bundle); - GroupEditFragment.this.getDialog().cancel(); + GroupEditDialogFragment.this.getDialog().cancel(); } }); final ImageButton iconButton = (ImageButton) root.findViewById(R.id.icon_button); iconButton.setOnClickListener(new View.OnClickListener() { public void onClick(View v) { - IconPickerFragment iconPickerFragment = new IconPickerFragment(); - iconPickerFragment.show(getFragmentManager(), "IconPickerFragment"); + IconPickerDialogFragment iconPickerDialogFragment = new IconPickerDialogFragment(); + iconPickerDialogFragment.show(getFragmentManager(), "IconPickerDialogFragment"); } }); @@ -110,7 +110,7 @@ public class GroupEditFragment extends DialogFragment @Override public void iconPicked(Bundle bundle) { - mSelectedIconID = bundle.getInt(IconPickerFragment.KEY_ICON_ID); + mSelectedIconID = bundle.getInt(IconPickerDialogFragment.KEY_ICON_ID); ImageButton currIconButton = (ImageButton) root.findViewById(R.id.icon_button); currIconButton.setImageResource(Icons.iconToResId(mSelectedIconID)); } diff --git a/app/src/main/java/com/keepassdroid/IconPickerFragment.java b/app/src/main/java/com/keepassdroid/fragments/IconPickerDialogFragment.java similarity index 94% rename from app/src/main/java/com/keepassdroid/IconPickerFragment.java rename to app/src/main/java/com/keepassdroid/fragments/IconPickerDialogFragment.java index bd6e8c6e2..118c8c319 100644 --- a/app/src/main/java/com/keepassdroid/IconPickerFragment.java +++ b/app/src/main/java/com/keepassdroid/fragments/IconPickerDialogFragment.java @@ -17,7 +17,7 @@ * along with KeePass DX. If not, see . * */ -package com.keepassdroid; +package com.keepassdroid.fragments; import android.app.Dialog; import android.content.Context; @@ -41,13 +41,13 @@ import com.keepassdroid.icons.Icons; import com.keepassdroid.stylish.StylishActivity; -public class IconPickerFragment extends DialogFragment { +public class IconPickerDialogFragment extends DialogFragment { public static final String KEY_ICON_ID = "icon_id"; private IconPickerListener iconPickerListener; public static void Launch(StylishActivity activity) { // Create an instance of the dialog fragment and show it - IconPickerFragment dialog = new IconPickerFragment(); + IconPickerDialogFragment dialog = new IconPickerDialogFragment(); dialog.show(activity.getSupportFragmentManager(), "NoticeDialogFragment"); } @@ -90,7 +90,7 @@ public class IconPickerFragment extends DialogFragment { builder.setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() { public void onClick(DialogInterface dialog, int id) { - IconPickerFragment.this.getDialog().cancel(); + IconPickerDialogFragment.this.getDialog().cancel(); } }); diff --git a/app/src/main/java/com/keepassdroid/UnavailableFeatureDialog.java b/app/src/main/java/com/keepassdroid/fragments/UnavailableFeatureDialogFragment.java similarity index 84% rename from app/src/main/java/com/keepassdroid/UnavailableFeatureDialog.java rename to app/src/main/java/com/keepassdroid/fragments/UnavailableFeatureDialogFragment.java index 32ba49dcf..15dae90d0 100644 --- a/app/src/main/java/com/keepassdroid/UnavailableFeatureDialog.java +++ b/app/src/main/java/com/keepassdroid/fragments/UnavailableFeatureDialogFragment.java @@ -1,4 +1,4 @@ -package com.keepassdroid; +package com.keepassdroid.fragments; import android.app.Dialog; import android.content.DialogInterface; @@ -10,13 +10,13 @@ import android.support.v7.app.AlertDialog; import com.kunzisoft.keepass.R; -public class UnavailableFeatureDialog extends DialogFragment { +public class UnavailableFeatureDialogFragment extends DialogFragment { private static final String MIN_REQUIRED_VERSION_ARG = "MIN_REQUIRED_VERSION_ARG"; private int minVersionRequired = Build.VERSION_CODES.M; - public static UnavailableFeatureDialog getInstance(int minVersionRequired) { - UnavailableFeatureDialog fragment = new UnavailableFeatureDialog(); + public static UnavailableFeatureDialogFragment getInstance(int minVersionRequired) { + UnavailableFeatureDialogFragment fragment = new UnavailableFeatureDialogFragment(); Bundle args = new Bundle(); args.putInt(MIN_REQUIRED_VERSION_ARG, minVersionRequired); fragment.setArguments(args); diff --git a/app/src/main/java/com/keepassdroid/PasswordActivity.java b/app/src/main/java/com/keepassdroid/password/PasswordActivity.java similarity index 99% rename from app/src/main/java/com/keepassdroid/PasswordActivity.java rename to app/src/main/java/com/keepassdroid/password/PasswordActivity.java index 778eb213f..d7ded74fd 100644 --- a/app/src/main/java/com/keepassdroid/PasswordActivity.java +++ b/app/src/main/java/com/keepassdroid/password/PasswordActivity.java @@ -17,7 +17,7 @@ * along with KeePass DX. If not, see . * */ -package com.keepassdroid; +package com.keepassdroid.password; import android.app.Activity; import android.content.DialogInterface; @@ -45,6 +45,9 @@ import android.widget.ImageView; import android.widget.TextView; import android.widget.Toast; +import com.keepassdroid.database.Database; +import com.keepassdroid.activities.LockingActivity; +import com.keepassdroid.tasks.ProgressTask; import com.keepassdroid.app.App; import com.keepassdroid.compat.BackupManagerCompat; import com.keepassdroid.compat.ClipDataCompat; @@ -54,7 +57,7 @@ import com.keepassdroid.database.edit.OnFinish; import com.keepassdroid.dialog.PasswordEncodingDialogHelper; import com.keepassdroid.fingerprint.FingerPrintAnimatedVector; import com.keepassdroid.fingerprint.FingerPrintHelper; -import com.keepassdroid.activity.GroupActivity; +import com.keepassdroid.activities.GroupActivity; import com.keepassdroid.settings.PrefsUtil; import com.keepassdroid.utils.EmptyUtils; import com.keepassdroid.utils.MenuUtil; diff --git a/app/src/main/java/com/keepassdroid/UriIntentInitTaskCallback.java b/app/src/main/java/com/keepassdroid/password/UriIntentInitTaskCallback.java similarity index 80% rename from app/src/main/java/com/keepassdroid/UriIntentInitTaskCallback.java rename to app/src/main/java/com/keepassdroid/password/UriIntentInitTaskCallback.java index 846488712..52eeef9ea 100644 --- a/app/src/main/java/com/keepassdroid/UriIntentInitTaskCallback.java +++ b/app/src/main/java/com/keepassdroid/password/UriIntentInitTaskCallback.java @@ -1,4 +1,4 @@ -package com.keepassdroid; +package com.keepassdroid.password; import android.net.Uri; diff --git a/app/src/main/java/com/keepassdroid/search/SearchDbHelper.java b/app/src/main/java/com/keepassdroid/search/SearchDbHelper.java index 15008b521..3ca004bf3 100644 --- a/app/src/main/java/com/keepassdroid/search/SearchDbHelper.java +++ b/app/src/main/java/com/keepassdroid/search/SearchDbHelper.java @@ -32,7 +32,7 @@ import android.preference.PreferenceManager; import android.util.Log; import com.kunzisoft.keepass.R; -import com.keepassdroid.Database; +import com.keepassdroid.database.Database; import com.keepassdroid.database.PwDatabase; import com.keepassdroid.database.PwDatabaseV3; import com.keepassdroid.database.PwDatabaseV4; diff --git a/app/src/main/java/com/keepassdroid/search/SearchResultsActivity.java b/app/src/main/java/com/keepassdroid/search/SearchResultsActivity.java index bd83e6362..986097e8c 100644 --- a/app/src/main/java/com/keepassdroid/search/SearchResultsActivity.java +++ b/app/src/main/java/com/keepassdroid/search/SearchResultsActivity.java @@ -28,11 +28,11 @@ import android.view.MenuInflater; import android.view.MenuItem; import android.view.View; -import com.keepassdroid.groupentity.NodeAdapter; +import com.keepassdroid.adapters.NodeAdapter; import com.kunzisoft.keepass.KeePass; import com.kunzisoft.keepass.R; -import com.keepassdroid.Database; -import com.keepassdroid.activity.GroupBaseActivity; +import com.keepassdroid.database.Database; +import com.keepassdroid.activities.GroupBaseActivity; import com.keepassdroid.app.App; import com.keepassdroid.utils.MenuUtil; diff --git a/app/src/main/java/com/keepassdroid/settings/MainPreferenceFragment.java b/app/src/main/java/com/keepassdroid/settings/MainPreferenceFragment.java index 2add3aaa5..192c1432a 100644 --- a/app/src/main/java/com/keepassdroid/settings/MainPreferenceFragment.java +++ b/app/src/main/java/com/keepassdroid/settings/MainPreferenceFragment.java @@ -6,7 +6,7 @@ import android.support.v4.app.DialogFragment; import android.support.v7.preference.Preference; import android.support.v7.preference.PreferenceFragmentCompat; -import com.keepassdroid.Database; +import com.keepassdroid.database.Database; import com.keepassdroid.app.App; import com.kunzisoft.keepass.R; diff --git a/app/src/main/java/com/keepassdroid/settings/NestedSettingsFragment.java b/app/src/main/java/com/keepassdroid/settings/NestedSettingsFragment.java index 1a206231a..671ef33cb 100644 --- a/app/src/main/java/com/keepassdroid/settings/NestedSettingsFragment.java +++ b/app/src/main/java/com/keepassdroid/settings/NestedSettingsFragment.java @@ -32,8 +32,8 @@ import android.support.v7.preference.PreferenceFragmentCompat; import android.util.Log; import android.widget.Toast; -import com.keepassdroid.Database; -import com.keepassdroid.UnavailableFeatureDialog; +import com.keepassdroid.database.Database; +import com.keepassdroid.fragments.UnavailableFeatureDialogFragment; import com.keepassdroid.app.App; import com.keepassdroid.database.PwEncryptionAlgorithm; import com.keepassdroid.fingerprint.FingerPrintHelper; @@ -115,7 +115,7 @@ public class NestedSettingsFragment extends PreferenceFragmentCompat { @Override public boolean onPreferenceClick(Preference preference) { ((SwitchPreference) preference).setChecked(false); - UnavailableFeatureDialog.getInstance(Build.VERSION_CODES.M) + UnavailableFeatureDialogFragment.getInstance(Build.VERSION_CODES.M) .show(getFragmentManager(), "unavailableFeatureDialog"); return false; } diff --git a/app/src/main/java/com/keepassdroid/settings/RoundsPreferenceDialogFragmentCompat.java b/app/src/main/java/com/keepassdroid/settings/RoundsPreferenceDialogFragmentCompat.java index 6bffa6d67..1a7f4fc64 100644 --- a/app/src/main/java/com/keepassdroid/settings/RoundsPreferenceDialogFragmentCompat.java +++ b/app/src/main/java/com/keepassdroid/settings/RoundsPreferenceDialogFragmentCompat.java @@ -9,8 +9,8 @@ import android.view.View; import android.widget.TextView; import android.widget.Toast; -import com.keepassdroid.Database; -import com.keepassdroid.ProgressTask; +import com.keepassdroid.database.Database; +import com.keepassdroid.tasks.ProgressTask; import com.keepassdroid.app.App; import com.keepassdroid.database.PwDatabase; import com.keepassdroid.database.edit.OnFinish; diff --git a/app/src/main/java/com/keepassdroid/ProgressTask.java b/app/src/main/java/com/keepassdroid/tasks/ProgressTask.java similarity index 98% rename from app/src/main/java/com/keepassdroid/ProgressTask.java rename to app/src/main/java/com/keepassdroid/tasks/ProgressTask.java index 1af50eef9..58c08e382 100644 --- a/app/src/main/java/com/keepassdroid/ProgressTask.java +++ b/app/src/main/java/com/keepassdroid/tasks/ProgressTask.java @@ -17,7 +17,7 @@ * along with KeePass DX. If not, see . * */ -package com.keepassdroid; +package com.keepassdroid.tasks; import android.app.ProgressDialog; import android.content.Context; diff --git a/app/src/main/java/com/keepassdroid/UIToastTask.java b/app/src/main/java/com/keepassdroid/tasks/UIToastTask.java similarity index 97% rename from app/src/main/java/com/keepassdroid/UIToastTask.java rename to app/src/main/java/com/keepassdroid/tasks/UIToastTask.java index 7f95f8a45..68f245bd3 100644 --- a/app/src/main/java/com/keepassdroid/UIToastTask.java +++ b/app/src/main/java/com/keepassdroid/tasks/UIToastTask.java @@ -17,7 +17,7 @@ * along with KeePass DX. If not, see . * */ -package com.keepassdroid; +package com.keepassdroid.tasks; import android.content.Context; import android.widget.Toast; diff --git a/app/src/main/java/com/keepassdroid/UpdateStatus.java b/app/src/main/java/com/keepassdroid/tasks/UpdateStatus.java similarity index 97% rename from app/src/main/java/com/keepassdroid/UpdateStatus.java rename to app/src/main/java/com/keepassdroid/tasks/UpdateStatus.java index 06444f24a..9b31e6d88 100644 --- a/app/src/main/java/com/keepassdroid/UpdateStatus.java +++ b/app/src/main/java/com/keepassdroid/tasks/UpdateStatus.java @@ -17,7 +17,7 @@ * along with KeePass DX. If not, see . * */ -package com.keepassdroid; +package com.keepassdroid.tasks; import android.app.ProgressDialog; import android.content.Context; diff --git a/app/src/main/java/com/keepassdroid/utils/MenuUtil.java b/app/src/main/java/com/keepassdroid/utils/MenuUtil.java index 132312b23..605841225 100644 --- a/app/src/main/java/com/keepassdroid/utils/MenuUtil.java +++ b/app/src/main/java/com/keepassdroid/utils/MenuUtil.java @@ -9,7 +9,7 @@ import android.widget.Toast; import com.kunzisoft.keepass.BuildConfig; import com.kunzisoft.keepass.R; -import com.keepassdroid.AboutActivity; +import com.keepassdroid.activities.AboutActivity; import com.keepassdroid.settings.SettingsActivity; import com.keepassdroid.stylish.StylishActivity; diff --git a/app/src/main/java/com/keepassdroid/view/AssignPasswordHelper.java b/app/src/main/java/com/keepassdroid/view/AssignPasswordHelper.java index 878957f8d..278a7b3eb 100644 --- a/app/src/main/java/com/keepassdroid/view/AssignPasswordHelper.java +++ b/app/src/main/java/com/keepassdroid/view/AssignPasswordHelper.java @@ -6,7 +6,7 @@ import android.content.DialogInterface; import android.net.Uri; import android.os.Handler; -import com.keepassdroid.ProgressTask; +import com.keepassdroid.tasks.ProgressTask; import com.keepassdroid.app.App; import com.keepassdroid.database.edit.FileOnFinish; import com.keepassdroid.database.edit.OnFinish;