Mirrors/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2025-12-26 07:32:08 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed warnings

Browse Source
This commit is contained in:
M66B
2018-12-09 15:49:43 +01:00
parent 70b5c51db9
commit d73544c584
15 changed files with 49 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
app/src/main/java/eu/faircode/email/DB.java
View File

@@ -96,7 +96,7 @@ public abstract class DB extends RoomDatabase {
return sInstance;
}
static String exec(DB db, String command) {
private static String exec(DB db, String command) {
Cursor cursor = null;
try {
cursor = db.query(command, new Object[0]);
@@ -309,26 +309,25 @@ public abstract class DB extends RoomDatabase {
if (addresses == null)
return null;
JSONArray jaddresses = new JSONArray();
if (addresses != null)
for (Address address : addresses)
try {
if (address instanceof InternetAddress) {
String a = ((InternetAddress) address).getAddress();
String p = ((InternetAddress) address).getPersonal();
JSONObject jaddress = new JSONObject();
if (a != null)
jaddress.put("address", a);
if (p != null)
jaddress.put("personal", p);
jaddresses.put(jaddress);
} else {
JSONObject jaddress = new JSONObject();
jaddress.put("address", address.toString());
jaddresses.put(jaddress);
}
} catch (JSONException ex) {
Log.e(Helper.TAG, ex + "\n" + Log.getStackTraceString(ex));
for (Address address : addresses)
try {
if (address instanceof InternetAddress) {
String a = ((InternetAddress) address).getAddress();
String p = ((InternetAddress) address).getPersonal();
JSONObject jaddress = new JSONObject();
if (a != null)
jaddress.put("address", a);
if (p != null)
jaddress.put("personal", p);
jaddresses.put(jaddress);
} else {
JSONObject jaddress = new JSONObject();
jaddress.put("address", address.toString());
jaddresses.put(jaddress);
}
} catch (JSONException ex) {
Log.e(Helper.TAG, ex + "\n" + Log.getStackTraceString(ex));
}
return jaddresses.toString();
}