kumi/andOTP
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #687 from mavit/fuzzy-issuer

Browse source 
Use an thumbnail if its name appears as a word in the TOTP issuer field
This commit is contained in:
Jakob Nixdorf 2021-03-04 06:27:31 +01:00 committed by GitHub
commit b5f5492249
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/src/main/java/org/shadowice/flocke/andotp/Database/Entry.java
View file

@ -493,9 +493,13 @@ public class Entry {
try { try {
this.thumbnail = EntryThumbnail.EntryThumbnails.valueOfIgnoreCase(issuer); this.thumbnail = EntryThumbnail.EntryThumbnails.valueOfIgnoreCase(issuer);
} catch(Exception e) { } catch(Exception e) {
try {
this.thumbnail = EntryThumbnail.EntryThumbnails.valueOfFuzzy(issuer);
} catch(Exception e2) {
this.thumbnail = EntryThumbnail.EntryThumbnails.Default; this.thumbnail = EntryThumbnail.EntryThumbnails.Default;
} }
} }
}
@Override @Override
public boolean equals(Object o) { public boolean equals(Object o) {

11
app/src/main/java/org/shadowice/flocke/andotp/Utilities/EntryThumbnail.java
View file

@ -23,6 +23,8 @@
package org.shadowice.flocke.andotp.Utilities; package org.shadowice.flocke.andotp.Utilities;
import java.util.regex.Pattern;
import android.content.Context; import android.content.Context;
import android.graphics.Bitmap; import android.graphics.Bitmap;
import android.graphics.BitmapFactory; import android.graphics.BitmapFactory;
@ -398,6 +400,15 @@ public class EntryThumbnail {
throw new IllegalArgumentException(); throw new IllegalArgumentException();
} }
public static EntryThumbnails valueOfFuzzy(String thumbnail) {
for (EntryThumbnails entryThumbnails : values()) {
Pattern re = Pattern.compile("\\b" + Pattern.quote(entryThumbnails.name()) + "\\b", Pattern.CASE_INSENSITIVE);
if (re.matcher(thumbnail).find())
return entryThumbnails;
}
throw new IllegalArgumentException();
}
public int getResource() { public int getResource() {
return resource; return resource;
} }