Mirrors/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2026-01-02 19:10:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

Minor improvements

Browse Source
This commit is contained in:
M66B
2018-08-05 16:14:43 +00:00
parent 9f626e3489
commit d6363b7f81
12 changed files with 19 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/java/eu/faircode/email/FragmentCompose.java
View File

@@ -92,8 +92,8 @@ public class FragmentCompose extends FragmentEx {
// Get arguments
Bundle args = getArguments();
String action = args.getString("action");
final long id = (TextUtils.isEmpty(action) ? args.getLong("id") : -1);
String action = (args == null ? null : args.getString("action"));
final long id = (TextUtils.isEmpty(action) ? (args == null ? -1 : args.getLong("id")) : -1);
// Get controls
spFrom = view.findViewById(R.id.spFrom);
@@ -242,7 +242,7 @@ public class FragmentCompose extends FragmentEx {
ContactsContract.Contacts.DISPLAY_NAME
},
null, null, null);
if (cursor.moveToFirst()) {
if (cursor != null && cursor.moveToFirst()) {
int colEmail = cursor.getColumnIndex(ContactsContract.CommonDataKinds.Email.ADDRESS);
int colName = cursor.getColumnIndex(ContactsContract.Contacts.DISPLAY_NAME);
String email = cursor.getString(colEmail);