Skip to content

Commit f673c6e

Browse files
committed
[CreateSEActivity] Added appropriate title
Now the name of the element is displayed in the creation activities
1 parent cdd7feb commit f673c6e

File tree

4 files changed

+31
-5
lines changed

4 files changed

+31
-5
lines changed

app/src/main/java/de/davis/passwordmanager/security/element/SecureElement.java

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -121,11 +121,7 @@ public int getType() {
121121

122122
@StringRes
123123
public int getTypeName(){
124-
return switch (getType()) {
125-
case TYPE_PASSWORD -> R.string.password;
126-
case TYPE_CREDIT_CARD -> R.string.credit_card;
127-
default -> throw new IllegalStateException("Unexpected value: " + getType());
128-
};
124+
return getTypeName(getType());
129125
}
130126

131127
public boolean isFavorite() {
@@ -160,4 +156,13 @@ public int compareTo(SecureElement o) {
160156
public static SecureElement createEmpty(){
161157
return new SecureElement();
162158
}
159+
160+
@StringRes
161+
public static int getTypeName(@ElementType int type){
162+
return switch (type) {
163+
case TYPE_PASSWORD -> R.string.password;
164+
case TYPE_CREDIT_CARD -> R.string.credit_card;
165+
default -> throw new IllegalStateException("Unexpected value: " + type);
166+
};
167+
}
163168
}

app/src/main/java/de/davis/passwordmanager/ui/elements/CreateSecureElementActivity.java

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
2222

2323
getSupportActionBar().setHomeAsUpIndicator(R.drawable.ic_baseline_close_24);
2424
getSupportActionBar().setDisplayHomeAsUpEnabled(true);
25+
setTitle(SecureElement.getTypeName(getSecureElementType()));
2526
}
2627

2728
@Override
@@ -62,6 +63,14 @@ protected void onRestoreInstanceState(@NonNull Bundle savedInstanceState) {
6263
fillInElement(element);
6364
}
6465

66+
@Override
67+
public void fillInElement(@NonNull SecureElement secureElement) {
68+
setTitle(secureElement.getTypeName());
69+
}
70+
71+
@SecureElement.ElementType
72+
public abstract int getSecureElementType();
73+
6574
public abstract Result check();
6675

6776
protected abstract SecureElement toElement();

app/src/main/java/de/davis/passwordmanager/ui/elements/creditcard/CreateCreditCardActivity.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,7 @@ protected void cardReceived(EmvCard card, CommunicationException e) {
9393

9494
@Override
9595
public void fillInElement(@NonNull SecureElement element) {
96+
super.fillInElement(element);
9697
binding.textInputLayoutTitle.getEditText().setText(element.getTitle());
9798

9899
CreditCardDetails details = (CreditCardDetails) element.getDetail();
@@ -205,6 +206,11 @@ protected SecureElement toElement() {
205206
return card;
206207
}
207208

209+
@Override
210+
public int getSecureElementType() {
211+
return SecureElement.TYPE_CREDIT_CARD;
212+
}
213+
208214
private void insertCard(EmvCard card){
209215
Name name = new Name(card.getHolderFirstname(), card.getHolderLastname());
210216
String cardNumber = card.getCardNumber();

app/src/main/java/de/davis/passwordmanager/ui/elements/password/CreatePasswordActivity.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ public View getContentView(@NonNull LayoutInflater inflater, @Nullable ViewGroup
4444

4545
@Override
4646
public void fillInElement(@NonNull SecureElement element) {
47+
super.fillInElement(element);
4748
binding.textInputLayoutTitle.getEditText().setText(element.getTitle());
4849
binding.textInputLayoutPassword.getEditText().setText(((PasswordDetails)element.getDetail()).getPassword());
4950
binding.textInputLayoutUsername.getEditText().setText(((PasswordDetails)element.getDetail()).getUsername());
@@ -92,4 +93,9 @@ protected SecureElement toElement(){
9293
getElement().setDetail(details);
9394
return getElement();
9495
}
96+
97+
@Override
98+
public int getSecureElementType() {
99+
return SecureElement.TYPE_PASSWORD;
100+
}
95101
}

0 commit comments

Comments
 (0)