mirror of
https://github.com/Kunzisoft/KeePassDX.git
synced 2025-12-04 15:49:33 +01:00
Fix crash with 2nd or 3rd root level group.
This commit is contained in:
@@ -1,7 +1,7 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
package="com.android.keepass"
|
||||
android:versionName="0.1.1" android:versionCode="2">
|
||||
android:versionName="0.1.2" android:versionCode="3">
|
||||
<application android:label="@string/app_name" android:icon="@drawable/keepass_icon">
|
||||
<activity android:name=".KeePass"
|
||||
android:label="@string/app_name">
|
||||
|
||||
@@ -1,3 +1,7 @@
|
||||
KeePassDroid (0.1.2)
|
||||
|
||||
* Fix crash when accessing the first root level group.
|
||||
|
||||
KeePassDroid (0.1.1)
|
||||
|
||||
* Minor tweaks to layout.
|
||||
|
||||
@@ -18,5 +18,5 @@
|
||||
<string name="menu_copy_user">Copy User</string>
|
||||
<string name="menu_copy_pass">Copy Password</string>
|
||||
<string name="pass_filename">Filename:</string>
|
||||
<color name="group">#FF00FF</color>
|
||||
|
||||
</resources>
|
||||
|
||||
@@ -72,8 +72,9 @@ public class Database {
|
||||
gRoot = cur.parent;
|
||||
gGroups.put(cur.groupId, new WeakReference<PwGroup>(cur));
|
||||
populateGlobals(cur);
|
||||
return;
|
||||
}
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
Vector childGroups = currentGroup.childGroups;
|
||||
|
||||
@@ -19,6 +19,7 @@
|
||||
*/
|
||||
package com.android.keepass;
|
||||
|
||||
import java.lang.ref.WeakReference;
|
||||
import java.util.Vector;
|
||||
|
||||
import org.phoneid.keepassj2me.PwEntry;
|
||||
@@ -76,7 +77,8 @@ public class GroupActivity extends ListActivity {
|
||||
if ( id == -1 ) {
|
||||
mGroup = Database.gRoot;
|
||||
} else {
|
||||
mGroup = Database.gGroups.get(id).get();
|
||||
WeakReference<PwGroup> wPw = Database.gGroups.get(id);
|
||||
mGroup = wPw.get();
|
||||
}
|
||||
assert(mGroup != null);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user