rixxc/KeePassDX
1
0
Fork 0
mirror of https://github.com/Kunzisoft/KeePassDX.git synced 2025-12-04 15:49:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix small variables names

Browse Source
This commit is contained in:
J-Jamet
2019-09-13 13:44:12 +02:00
parent f2666316e1
commit 9331c281fe
7 changed files with 49 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/com/kunzisoft/keepass/activities/EntryActivity.kt
View File

@@ -76,7 +76,7 @@ class EntryActivity : LockingHideActivity() {
supportActionBar?.setDisplayShowHomeEnabled(true)
val currentDatabase = Database.getInstance()
readOnly = currentDatabase.isReadOnly || readOnly
mReadOnly = currentDatabase.isReadOnly || mReadOnly
mShowPassword = !PreferencesUtil.isPasswordMask(this)
@@ -289,7 +289,7 @@ class EntryActivity : LockingHideActivity() {
inflater.inflate(R.menu.entry, menu)
inflater.inflate(R.menu.database_lock, menu)
if (readOnly) {
if (mReadOnly) {
menu.findItem(R.id.menu_edit)?.isVisible = false
}

4
app/src/main/java/com/kunzisoft/keepass/activities/EntryEditActivity.kt
View File

@@ -256,7 +256,7 @@ class EntryEditActivity : LockingHideActivity(),
newEntry,
parent,
afterActionNodeFinishRunnable,
!readOnly)
!mReadOnly)
}
} else {
@@ -266,7 +266,7 @@ class EntryEditActivity : LockingHideActivity(),
oldEntry,
newEntry,
afterActionNodeFinishRunnable,
!readOnly)
!mReadOnly)
}
}
actionRunnable?.let { runnable ->

34
app/src/main/java/com/kunzisoft/keepass/activities/GroupActivity.kt
View File

@@ -176,7 +176,7 @@ class GroupActivity : LockingActivity(),
// Initialize the fragment with the list
mListNodesFragment = supportFragmentManager.findFragmentByTag(fragmentTag) as ListNodesFragment?
if (mListNodesFragment == null)
mListNodesFragment = ListNodesFragment.newInstance(mCurrentGroup, readOnly, mCurrentGroupIsASearch)
mListNodesFragment = ListNodesFragment.newInstance(mCurrentGroup, mReadOnly, mCurrentGroupIsASearch)
// Attach fragment to content view
supportFragmentManager.beginTransaction().replace(
@@ -206,6 +206,8 @@ class GroupActivity : LockingActivity(),
}
override fun onNewIntent(intent: Intent) {
super.onNewIntent(intent)
Log.d(TAG, "setNewIntent: $intent")
setIntent(intent)
mCurrentGroupIsASearch = if (Intent.ACTION_SEARCH == intent.action) {
@@ -237,7 +239,7 @@ class GroupActivity : LockingActivity(),
// Check TimeoutHelper
TimeoutHelper.checkTimeAndLockIfTimeoutOrResetTimeout(this) {
// Open a group in a new fragment
val newListNodeFragment = ListNodesFragment.newInstance(group, readOnly, isASearch)
val newListNodeFragment = ListNodesFragment.newInstance(group, mReadOnly, isASearch)
val fragmentTransaction = supportFragmentManager.beginTransaction()
// Different animation
val fragmentTag: String
@@ -295,7 +297,7 @@ class GroupActivity : LockingActivity(),
pwGroupId = intent.getParcelableExtra(GROUP_ID_KEY)
}
readOnly = mDatabase?.isReadOnly == true || readOnly // Force read only if the database is like that
mReadOnly = mDatabase?.isReadOnly == true || mReadOnly // Force read only if the database is like that
Log.w(TAG, "Creating tree view")
val currentGroup: GroupVersioned?
@@ -355,7 +357,7 @@ class GroupActivity : LockingActivity(),
}
// Show selection mode message if needed
if (selectionMode) {
if (mSelectionMode) {
modeTitleView?.visibility = View.VISIBLE
} else {
modeTitleView?.visibility = View.GONE
@@ -365,8 +367,8 @@ class GroupActivity : LockingActivity(),
addNodeButtonView?.apply {
// To enable add button
val addGroupEnabled = !readOnly && !mCurrentGroupIsASearch
var addEntryEnabled = !readOnly && !mCurrentGroupIsASearch
val addGroupEnabled = !mReadOnly && !mCurrentGroupIsASearch
var addEntryEnabled = !mReadOnly && !mCurrentGroupIsASearch
mCurrentGroup?.let {
val isRoot = it == mRootGroup
if (!it.allowAddEntryIfIsRoot())
@@ -399,7 +401,7 @@ class GroupActivity : LockingActivity(),
val entryVersioned = node as EntryVersioned
EntrySelectionHelper.doEntrySelectionAction(intent,
{
EntryActivity.launch(this@GroupActivity, entryVersioned, readOnly)
EntryActivity.launch(this@GroupActivity, entryVersioned, mReadOnly)
},
{
// Populate Magikeyboard with entry
@@ -479,7 +481,7 @@ class GroupActivity : LockingActivity(),
entryToCopy,
newParent,
AfterAddNodeRunnable(),
!readOnly)
!mReadOnly)
}.start()
}
@@ -524,7 +526,7 @@ class GroupActivity : LockingActivity(),
groupToMove,
newParent,
AfterAddNodeRunnable(),
!readOnly)
!mReadOnly)
}.start()
}
@@ -536,7 +538,7 @@ class GroupActivity : LockingActivity(),
entryToMove,
newParent,
AfterAddNodeRunnable(),
!readOnly)
!mReadOnly)
}.start()
}
@@ -556,7 +558,7 @@ class GroupActivity : LockingActivity(),
Database.getInstance(),
group,
AfterDeleteNodeRunnable(),
!readOnly)
!mReadOnly)
}.start()
}
@@ -567,7 +569,7 @@ class GroupActivity : LockingActivity(),
Database.getInstance(),
entry,
AfterDeleteNodeRunnable(),
!readOnly)
!mReadOnly)
}.start()
}
@@ -584,7 +586,7 @@ class GroupActivity : LockingActivity(),
val inflater = menuInflater
inflater.inflate(R.menu.search, menu)
inflater.inflate(R.menu.database_lock, menu)
if (!selectionMode) {
if (!mSelectionMode) {
inflater.inflate(R.menu.default_menu, menu)
MenuUtil.contributionMenuInflater(inflater, menu)
}
@@ -733,7 +735,7 @@ class GroupActivity : LockingActivity(),
}
else -> {
// Check the time lock before launching settings
MenuUtil.onDefaultMenuOptionsItemSelected(this, item, readOnly, true)
MenuUtil.onDefaultMenuOptionsItemSelected(this, item, mReadOnly, true)
return super.onOptionsItemSelected(item)
}
}
@@ -763,7 +765,7 @@ class GroupActivity : LockingActivity(),
newGroup,
currentGroup,
AfterAddNodeRunnable(),
!readOnly)
!mReadOnly)
}.start()
}
}
@@ -785,7 +787,7 @@ class GroupActivity : LockingActivity(),
oldGroupToUpdate,
updateGroup,
AfterUpdateNodeRunnable(),
!readOnly)
!mReadOnly)
}.start()
}
}

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

@@ -51,46 +51,46 @@ abstract class LockingActivity : StylishActivity() {
const val TIMEOUT_ENABLE_KEY_DEFAULT = true
}
protected var timeoutEnable: Boolean = true
protected var mTimeoutEnable: Boolean = true
private var lockReceiver: LockReceiver? = null
private var exitLock: Boolean = false
private var mLockReceiver: LockReceiver? = null
private var mExitLock: Boolean = false
// Force readOnly if Entry Selection mode
protected var readOnly: Boolean = false
protected var mReadOnly: Boolean = false
get() {
return field || selectionMode
return field || mSelectionMode
}
protected var selectionMode: Boolean = false
protected var mSelectionMode: Boolean = false
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
if (savedInstanceState != null
&& savedInstanceState.containsKey(TIMEOUT_ENABLE_KEY)) {
timeoutEnable = savedInstanceState.getBoolean(TIMEOUT_ENABLE_KEY)
mTimeoutEnable = savedInstanceState.getBoolean(TIMEOUT_ENABLE_KEY)
} else {
if (intent != null)
timeoutEnable = intent.getBooleanExtra(TIMEOUT_ENABLE_KEY, TIMEOUT_ENABLE_KEY_DEFAULT)
mTimeoutEnable = intent.getBooleanExtra(TIMEOUT_ENABLE_KEY, TIMEOUT_ENABLE_KEY_DEFAULT)
}
if (timeoutEnable) {
lockReceiver = LockReceiver()
if (mTimeoutEnable) {
mLockReceiver = LockReceiver()
val intentFilter = IntentFilter().apply {
addAction(Intent.ACTION_SCREEN_OFF)
addAction(LOCK_ACTION)
}
registerReceiver(lockReceiver, intentFilter)
registerReceiver(mLockReceiver, intentFilter)
}
exitLock = false
readOnly = ReadOnlyHelper.retrieveReadOnlyFromInstanceStateOrIntent(savedInstanceState, intent)
mExitLock = false
mReadOnly = ReadOnlyHelper.retrieveReadOnlyFromInstanceStateOrIntent(savedInstanceState, intent)
}
override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
super.onActivityResult(requestCode, resultCode, data)
if (resultCode == RESULT_EXIT_LOCK) {
exitLock = true
mExitLock = true
if (Database.getInstance().loaded) {
lockAndExit()
}
@@ -101,9 +101,9 @@ abstract class LockingActivity : StylishActivity() {
super.onResume()
// To refresh when back to normal workflow from selection workflow
selectionMode = EntrySelectionHelper.retrieveEntrySelectionModeFromIntent(intent)
mSelectionMode = EntrySelectionHelper.retrieveEntrySelectionModeFromIntent(intent)
if (timeoutEnable) {
if (mTimeoutEnable) {
// End activity if database not loaded
if (!Database.getInstance().loaded) {
finish()
@@ -115,7 +115,7 @@ abstract class LockingActivity : StylishActivity() {
// If the time is out -> close the Activity
TimeoutHelper.checkTimeAndLockIfTimeout(this)
// If onCreate already record time
if (!exitLock)
if (!mExitLock)
TimeoutHelper.recordTime(this)
}
@@ -123,15 +123,15 @@ abstract class LockingActivity : StylishActivity() {
}
override fun onSaveInstanceState(outState: Bundle) {
ReadOnlyHelper.onSaveInstanceState(outState, readOnly)
outState.putBoolean(TIMEOUT_ENABLE_KEY, timeoutEnable)
ReadOnlyHelper.onSaveInstanceState(outState, mReadOnly)
outState.putBoolean(TIMEOUT_ENABLE_KEY, mTimeoutEnable)
super.onSaveInstanceState(outState)
}
override fun onPause() {
super.onPause()
if (timeoutEnable) {
if (mTimeoutEnable) {
// If the time is out during our navigation in activity -> close the Activity
TimeoutHelper.checkTimeAndLockIfTimeout(this)
}
@@ -139,8 +139,8 @@ abstract class LockingActivity : StylishActivity() {
override fun onDestroy() {
super.onDestroy()
if (lockReceiver != null)
unregisterReceiver(lockReceiver)
if (mLockReceiver != null)
unregisterReceiver(mLockReceiver)
}
inner class LockReceiver : BroadcastReceiver() {
@@ -184,7 +184,7 @@ abstract class LockingActivity : StylishActivity() {
}
override fun onBackPressed() {
if (timeoutEnable) {
if (mTimeoutEnable) {
TimeoutHelper.checkTimeAndLockIfTimeoutOrResetTimeout(this) {
super.onBackPressed()
}

4
app/src/main/java/com/kunzisoft/keepass/settings/SettingsActivity.kt
View File

@@ -146,7 +146,7 @@ open class SettingsActivity
supportFragmentManager.beginTransaction()
.setCustomAnimations(R.anim.slide_in_right, R.anim.slide_out_left,
R.anim.slide_in_left, R.anim.slide_out_right)
.replace(R.id.fragment_container, NestedSettingsFragment.newInstance(key, readOnly), TAG_NESTED)
.replace(R.id.fragment_container, NestedSettingsFragment.newInstance(key, mReadOnly), TAG_NESTED)
.addToBackStack(TAG_NESTED)
.commit()
@@ -154,7 +154,7 @@ open class SettingsActivity
}
override fun onNestedPreferenceSelected(key: NestedSettingsFragment.Screen) {
if (timeoutEnable)
if (mTimeoutEnable)
TimeoutHelper.checkTimeAndLockIfTimeoutOrResetTimeout(this) {
replaceFragment(key)
}

2
app/src/main/java/com/kunzisoft/keepass/settings/SettingsAdvancedUnlockActivity.kt
View File

@@ -8,7 +8,7 @@ class SettingsAdvancedUnlockActivity : SettingsActivity() {
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
timeoutEnable = false
mTimeoutEnable = false
}
override fun retrieveMainFragment(): Fragment {

2
app/src/main/java/com/kunzisoft/keepass/settings/SettingsAutofillActivity.kt
View File

@@ -26,7 +26,7 @@ class SettingsAutofillActivity : SettingsActivity() {
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
timeoutEnable = false
mTimeoutEnable = false
}
override fun retrieveMainFragment(): Fragment {