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

Merge branch 'feature/ListNodesFragment' into feature/NodeMenu

Browse Source
This commit is contained in:
J-Jamet
2018-05-28 18:10:06 +02:00
parent 7c54946c4b 31f7b0d5be
commit eb8ca9355c
3 changed files with 35 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -99,7 +99,7 @@ public class GroupActivity extends ListNodesActivity
private PwGroup oldGroupToUpdate;
public static void launch(Activity act) {
recordFirstTimeBeforeLaunch(act);
startRecordTime(act);
launch(act, (PwGroup) null);
}
@@ -116,7 +116,7 @@ public class GroupActivity extends ListNodesActivity
@RequiresApi(api = Build.VERSION_CODES.O)
public static void launch(Activity act, AssistStructure assistStructure) {
if ( assistStructure != null ) {
recordFirstTimeBeforeLaunch(act);
startRecordTime(act);
launch(act, null, assistStructure);
} else {
launch(act);

45
app/src/main/java/com/kunzisoft/keepass/activities/ListNodesActivity.java
View File

@@ -185,18 +185,23 @@ public abstract class ListNodesActivity extends LockingActivity
}
private void openGroup(PwGroup group) {
ListNodesFragment newListNodeFragment = ListNodesFragment.newInstance(group.getId());
getSupportFragmentManager().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.nodes_list_fragment_container,
newListNodeFragment,
LIST_NODES_FRAGMENT_TAG)
.addToBackStack(LIST_NODES_FRAGMENT_TAG)
.commit();
listNodesFragment = newListNodeFragment;
mCurrentGroup = group;
assignToolbarElements();
// Check Timeout
if (checkTimeIsAllowedOrFinish(this)) {
startRecordTime(this);
ListNodesFragment newListNodeFragment = ListNodesFragment.newInstance(group.getId());
getSupportFragmentManager().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.nodes_list_fragment_container,
newListNodeFragment,
LIST_NODES_FRAGMENT_TAG)
.addToBackStack(LIST_NODES_FRAGMENT_TAG)
.commit();
listNodesFragment = newListNodeFragment;
mCurrentGroup = group;
assignToolbarElements();
}
}
@Override
@@ -253,12 +258,16 @@ public abstract class ListNodesActivity extends LockingActivity
@Override
public void onBackPressed() {
super.onBackPressed();
if (checkTimeIsAllowedOrFinish(this)) {
startRecordTime(this);
listNodesFragment = (ListNodesFragment) getSupportFragmentManager().findFragmentByTag(LIST_NODES_FRAGMENT_TAG);
// to refresh fragment
listNodesFragment.rebuildList();
mCurrentGroup = listNodesFragment.getMainGroup();
assignToolbarElements();
super.onBackPressed();
listNodesFragment = (ListNodesFragment) getSupportFragmentManager().findFragmentByTag(LIST_NODES_FRAGMENT_TAG);
// to refresh fragment
listNodesFragment.rebuildList();
mCurrentGroup = listNodesFragment.getMainGroup();
assignToolbarElements();
}
}
}

7
app/src/main/java/com/kunzisoft/keepass/activities/LockingActivity.java
View File

@@ -44,7 +44,12 @@ public abstract class LockingActivity extends StylishActivity {
private ScreenReceiver screenReceiver;
private boolean exitLock;
protected static void recordFirstTimeBeforeLaunch(Activity activity) {
/**
* Called to start a record time,
* Generally used for a first launch or for a fragment change
*/
protected static void startRecordTime(Activity activity) {
TimeoutHelper.recordTime(activity);
}