Move LockingActivity

app/src/main/java/com/kunzisoft/keepass/activities/EntryActivity.java

@@ -47,7 +47,7 @@ import com.kunzisoft.keepass.database.ExtraFields;
 import com.kunzisoft.keepass.database.PwDatabase;
 import com.kunzisoft.keepass.database.PwEntry;
 import com.kunzisoft.keepass.database.security.ProtectedString;
-import com.kunzisoft.keepass.lock.LockingHideActivity;
+import com.kunzisoft.keepass.activities.lock.LockingHideActivity;
 import com.kunzisoft.keepass.notifications.NotificationCopyingService;
 import com.kunzisoft.keepass.notifications.NotificationField;
 import com.kunzisoft.keepass.settings.PreferencesUtil;

app/src/main/java/com/kunzisoft/keepass/activities/EntryEditActivity.java

@@ -56,7 +56,7 @@ import com.kunzisoft.keepass.database.action.node.UpdateEntryRunnable;
 import com.kunzisoft.keepass.database.security.ProtectedString;
 import com.kunzisoft.keepass.dialogs.GeneratePasswordDialogFragment;
 import com.kunzisoft.keepass.dialogs.IconPickerDialogFragment;
-import com.kunzisoft.keepass.lock.LockingHideActivity;
+import com.kunzisoft.keepass.activities.lock.LockingHideActivity;
 import com.kunzisoft.keepass.settings.PreferencesUtil;
 import com.kunzisoft.keepass.tasks.SaveDatabaseProgressTaskDialogFragment;
 import com.kunzisoft.keepass.tasks.UpdateProgressTaskStatus;

app/src/main/java/com/kunzisoft/keepass/activities/GroupActivity.java

@@ -80,7 +80,7 @@ import com.kunzisoft.keepass.dialogs.GroupEditDialogFragment;
 import com.kunzisoft.keepass.dialogs.IconPickerDialogFragment;
 import com.kunzisoft.keepass.dialogs.ReadOnlyDialog;
 import com.kunzisoft.keepass.dialogs.SortDialogFragment;
-import com.kunzisoft.keepass.lock.LockingActivity;
+import com.kunzisoft.keepass.activities.lock.LockingActivity;
 import com.kunzisoft.keepass.password.AssignPasswordHelper;
 import com.kunzisoft.keepass.selection.EntrySelectionHelper;
 import com.kunzisoft.keepass.settings.PreferencesUtil;

app/src/main/java/com/kunzisoft/keepass/activities/lock/LockingActivity.kt

@@ -17,7 +17,7 @@
  *  along with KeePass DX.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package com.kunzisoft.keepass.lock
+package com.kunzisoft.keepass.activities.lock
 
 import android.app.Activity
 import android.app.NotificationManager

app/src/main/java/com/kunzisoft/keepass/activities/lock/LockingHideActivity.kt

@@ -0,0 +1,55 @@
+/*
+ * Copyright 2017 Brian Pellin, Jeremy Jamet / Kunzisoft.
+ *     
+ * This file is part of KeePass DX.
+ *
+ *  KeePass DX is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  KeePass DX is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with KeePass DX.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+package com.kunzisoft.keepass.activities.lock
+
+import android.content.ActivityNotFoundException
+import android.content.Intent
+import android.os.Bundle
+import android.view.WindowManager
+
+/**
+ * Locking Hide Activity that sets FLAG_SECURE to prevent screenshots, and from
+ * appearing in the recent app preview
+ */
+abstract class LockingHideActivity : LockingActivity() {
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+
+        // Several gingerbread devices have problems with FLAG_SECURE
+        window.setFlags(WindowManager.LayoutParams.FLAG_SECURE, WindowManager.LayoutParams.FLAG_SECURE)
+    }
+
+    /* (non-Javadoc) Workaround for HTC Linkify issues
+	 * @see android.app.Activity#startActivity(android.content.Intent)
+	 */
+    override fun startActivity(intent: Intent) {
+        try {
+            if (intent.component != null && intent.component!!.shortClassName == ".HtcLinkifyDispatcherActivity") {
+                intent.component = null
+            }
+            super.startActivity(intent)
+        } catch (e: ActivityNotFoundException) {
+            /* Catch the bad HTC implementation case */
+            super.startActivity(Intent.createChooser(intent, null))
+        }
+
+    }
+}

app/src/main/java/com/kunzisoft/keepass/lock/LockingHideActivity.java

@@ -1,56 +0,0 @@
-/*
- * Copyright 2017 Brian Pellin, Jeremy Jamet / Kunzisoft.
- *     
- * This file is part of KeePass DX.
- *
- *  KeePass DX is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  KeePass DX is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with KeePass DX.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-package com.kunzisoft.keepass.lock;
-
-import android.content.ActivityNotFoundException;
-import android.content.Intent;
-import android.os.Bundle;
-import android.view.WindowManager;
-
-/**
- * Locking Hide Activity that sets FLAG_SECURE to prevent screenshots, and from
- * appearing in the recent app preview
- */
-public abstract class LockingHideActivity extends LockingActivity {
-
-	@Override
-	protected void onCreate(Bundle savedInstanceState) {
-		super.onCreate(savedInstanceState);
-
-		// Several gingerbread devices have problems with FLAG_SECURE
-		getWindow().setFlags(WindowManager.LayoutParams.FLAG_SECURE, WindowManager.LayoutParams.FLAG_SECURE);
-	}
-
-	/* (non-Javadoc) Workaround for HTC Linkify issues 
-	 * @see android.app.Activity#startActivity(android.content.Intent)
-	 */
-	@Override
-	public void startActivity(Intent intent) {
-		try {
-			if (intent.getComponent() != null && intent.getComponent().getShortClassName().equals(".HtcLinkifyDispatcherActivity")) {
-				intent.setComponent(null);
-			}
-			super.startActivity(intent);
-		} catch (ActivityNotFoundException e) {
-			/* Catch the bad HTC implementation case */
-			super.startActivity(Intent.createChooser(intent, null));
-		}
-	}
-}

app/src/main/java/com/kunzisoft/keepass/password/PasswordActivity.java

@@ -69,7 +69,7 @@ import com.kunzisoft.keepass.fileselect.KeyFileHelper;
 import com.kunzisoft.keepass.fingerprint.FingerPrintAnimatedVector;
 import com.kunzisoft.keepass.fingerprint.FingerPrintExplanationDialog;
 import com.kunzisoft.keepass.fingerprint.FingerPrintHelper;
-import com.kunzisoft.keepass.lock.LockingActivity;
+import com.kunzisoft.keepass.activities.lock.LockingActivity;
 import com.kunzisoft.keepass.selection.EntrySelectionHelper;
 import com.kunzisoft.keepass.settings.PreferencesUtil;
 import com.kunzisoft.keepass.stylish.StylishActivity;

app/src/main/java/com/kunzisoft/keepass/settings/MagikIMESettings.java

@@ -24,7 +24,7 @@ import android.support.v7.widget.Toolbar;
 import android.view.MenuItem;
 
 import com.kunzisoft.keepass.R;
-import com.kunzisoft.keepass.lock.LockingActivity;
+import com.kunzisoft.keepass.activities.lock.LockingActivity;
 
 public class MagikIMESettings extends LockingActivity {
 

app/src/main/java/com/kunzisoft/keepass/settings/SettingsActivity.java

@@ -29,7 +29,7 @@ import android.view.MenuItem;
 
 import com.kunzisoft.keepass.R;
 import com.kunzisoft.keepass.activities.ReadOnlyHelper;
-import com.kunzisoft.keepass.lock.LockingActivity;
+import com.kunzisoft.keepass.activities.lock.LockingActivity;
 import com.kunzisoft.keepass.timeout.TimeoutHelper;
 
 

app/src/main/java/com/kunzisoft/keepass/timeout/TimeoutHelper.kt

@@ -28,8 +28,8 @@ import android.preference.PreferenceManager
 import android.util.Log
 import com.kunzisoft.keepass.R
 import com.kunzisoft.keepass.app.App
-import com.kunzisoft.keepass.lock.LockingActivity
+import com.kunzisoft.keepass.activities.lock.LockingActivity
-import com.kunzisoft.keepass.lock.lock
+import com.kunzisoft.keepass.activities.lock.lock
 
 object TimeoutHelper {