luckyimnotanigger/Aegis
1
0
Fork 0
mirror of https://github.com/beemdevelopment/Aegis.git synced 2025-05-16 15:02:54 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

add note field to entry

Browse source
This commit is contained in:
modelorona 2021-08-30 10:21:54 +01:00
parent 3464f93c39
commit 97f28c6089
5 changed files with 49 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/src/main/java/com/beemdevelopment/aegis/ui/EditEntryActivity.java
View file

@ -102,6 +102,7 @@ public class EditEntryActivity extends AegisActivity {
private TextInputLayout _textDigitsLayout;
private TextInputEditText _textSecret;
private TextInputEditText _textUsageCount;
private TextInputEditText _textNote;
private AutoCompleteTextView _dropdownType;
private AutoCompleteTextView _dropdownAlgo;
@ -153,6 +154,7 @@ public class EditEntryActivity extends AegisActivity {
_textDigitsLayout = findViewById(R.id.text_digits_layout);
_textSecret = findViewById(R.id.text_secret);
_textUsageCount = findViewById(R.id.text_usage_count);
_textNote = findViewById(R.id.text_note);
_dropdownType = findViewById(R.id.dropdown_type);
DropdownHelper.fillDropdown(this, _dropdownType, R.array.otp_types_array);
_dropdownAlgoLayout = findViewById(R.id.dropdown_algo_layout);
@ -201,6 +203,7 @@ public class EditEntryActivity extends AegisActivity {
_textName.setText(_origEntry.getName());
_textIssuer.setText(_origEntry.getIssuer());
_textNote.setText(_origEntry.getNote());
OtpInfo info = _origEntry.getInfo();
if (info instanceof TotpInfo) {
@ -675,6 +678,7 @@ public class EditEntryActivity extends AegisActivity {
entry.setInfo(info);
entry.setIssuer(_textIssuer.getText().toString());
entry.setName(_textName.getText().toString());
entry.setNote(_textNote.getText().toString());
int groupPos = _dropdownGroupList.indexOf(_dropdownGroup.getText().toString());
if (groupPos != 0) {

10
app/src/main/java/com/beemdevelopment/aegis/vault/VaultEntry.java
View file

@ -27,6 +27,7 @@ public class VaultEntry extends UUIDMap.Value {
private byte[] _icon;
private IconType _iconType = IconType.INVALID;
private int _usageCount;
private String _note = "";
private VaultEntry(UUID uuid, OtpInfo info) {
super(uuid);
@ -64,6 +65,7 @@ public class VaultEntry extends UUIDMap.Value {
obj.put("name", _name);
obj.put("issuer", _issuer);
obj.put("group", _group);
obj.put("note", _note);
obj.put("icon", _icon == null ? JSONObject.NULL : Base64.encode(_icon));
obj.put("icon_mime", _icon == null ? null : _iconType.toMimeType());
obj.put("info", _info.toJson());
@ -89,6 +91,7 @@ public class VaultEntry extends UUIDMap.Value {
entry.setName(obj.getString("name"));
entry.setIssuer(obj.getString("issuer"));
entry.setGroup(obj.optString("group", null));
entry.setNote(obj.optString("note", ""));
Object icon = obj.get("icon");
if (icon != JSONObject.NULL) {
@ -137,6 +140,8 @@ public class VaultEntry extends UUIDMap.Value {
return _usageCount;
}
public String getNote() { return _note; }
public void setName(String name) {
_name = name;
}
@ -164,6 +169,8 @@ public class VaultEntry extends UUIDMap.Value {
public void setUsageCount(int usageCount) { _usageCount = usageCount; }
public void setNote(String note) { _note = note; }
@Override
public boolean equals(Object o) {
if (!(o instanceof VaultEntry)) {
@ -185,7 +192,8 @@ public class VaultEntry extends UUIDMap.Value {
&& Objects.equals(getGroup(), entry.getGroup())
&& getInfo().equals(entry.getInfo())
&& Arrays.equals(getIcon(), entry.getIcon())
&& getIconType().equals(entry.getIconType());
&& getIconType().equals(entry.getIconType())
&& getNote().equals(entry.getNote());
}
/**