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

Show a generic error if the encryption key is empty

Browse source
This commit is contained in:
Jakob Nixdorf 2018-01-02 14:45:00 +01:00
parent bd12b5a17f
commit 13db26f377
No known key found for this signature in database
GPG key ID: BE99BF86574A7DBC
2 changed files with 19 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
app/src/main/java/org/shadowice/flocke/andotp/Utilities/DatabaseHelper.java
View file

@ -24,9 +24,11 @@
package org.shadowice.flocke.andotp.Utilities;
import android.content.Context;
import android.widget.Toast;
import org.json.JSONArray;
import org.shadowice.flocke.andotp.Database.Entry;
import org.shadowice.flocke.andotp.R;
import java.io.File;
import java.util.ArrayList;
@ -43,6 +45,11 @@ public class DatabaseHelper {
/* Database functions */
public static boolean saveDatabase(Context context, ArrayList<Entry> entries, SecretKey encryptionKey) {
if (encryptionKey == null) {
Toast.makeText(context, R.string.toast_encryption_key_empty, Toast.LENGTH_LONG).show();
return false;
}
String jsonString = entriesToString(entries);
try {
@ -58,16 +65,20 @@ public class DatabaseHelper {
return true;
}
public static ArrayList<Entry> loadDatabase(Context context, SecretKey encryptionKey){
public static ArrayList<Entry> loadDatabase(Context context, SecretKey encryptionKey) {
ArrayList<Entry> entries = new ArrayList<>();
try {
byte[] data = FileHelper.readFileToBytes(new File(context.getFilesDir() + "/" + SETTINGS_FILE));
data = EncryptionHelper.decrypt(encryptionKey, data);
if (encryptionKey != null) {
try {
byte[] data = FileHelper.readFileToBytes(new File(context.getFilesDir() + "/" + SETTINGS_FILE));
data = EncryptionHelper.decrypt(encryptionKey, data);
entries = stringToEntries(new String(data));
} catch (Exception error) {
error.printStackTrace();
entries = stringToEntries(new String(data));
} catch (Exception error) {
error.printStackTrace();
}
} else {
Toast.makeText(context, R.string.toast_encryption_key_empty, Toast.LENGTH_LONG).show();
}
return entries;

1
app/src/main/res/values/strings_main.xml
View file

@ -55,6 +55,7 @@
<string name="toast_copied_to_clipboard">Copied to clipboard</string>
<string name="toast_entry_exists">This entry already exists</string>
<string name="toast_invalid_qr_code">Invalid QR Code</string>
<string name="toast_encryption_key_empty">Encryption key not loaded</string>
<!-- Dialogs -->
<string name="dialog_title_auth">Authenticate</string>