Merge remote-tracking branch 'origin/custom-images'

This commit is contained in:
Alexander Bakker 2018-06-07 12:27:42 +02:00
commit 04dbb71cd7
17 changed files with 302 additions and 93 deletions

View file

@ -6,6 +6,7 @@ import org.json.JSONObject;
import java.util.List;
import me.impy.aegis.encoding.Base64Exception;
import me.impy.aegis.otp.OtpInfoException;
public class Database {
@ -43,7 +44,7 @@ public class Database {
entry.deserialize(array.getJSONObject(i));
addEntry(entry);
}
} catch (OtpInfoException | JSONException e) {
} catch (Base64Exception | OtpInfoException | JSONException e) {
throw new DatabaseException(e);
}
}