msb-public
/
FairEmail
mirror of https://github.com/M66B/FairEmail.git
1
0
Code Issues Projects Releases Wiki Activity

Prevent crash

Browse Source
pull/158/head
M66B 5 years ago
parent 930663ff76
commit 269bd11d87
11 changed files with 359 additions and 304 deletions
Show Stats Download Patch File Download Diff File

14
app/src/main/java/eu/faircode/email/ActivitySetup.java
Unescape View File

@ -361,11 +361,21 @@ public class ActivitySetup extends ActivityBase implements FragmentManager.OnBac
@Override
public void onActivityResult(int requestCode, int resultCode, Intent data) {
super.onActivityResult(requestCode, resultCode, data);
try {
switch (requestCode) {
case REQUEST_EXPORT:
if (resultCode == RESULT_OK && data != null)
if (requestCode == REQUEST_EXPORT)
handleExport(data, this.password);
else if (requestCode == REQUEST_IMPORT)
break;
case REQUEST_IMPORT:
if (resultCode == RESULT_OK && data != null)
handleImport(data, this.password);
break;
}
} catch (Throwable ex) {
Log.e(ex);
}
}
private void onMenuExport() {

4
app/src/main/java/eu/faircode/email/FragmentAccount.java
Unescape View File

@ -1293,6 +1293,7 @@ public class FragmentAccount extends FragmentBase {
public void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
super.onActivityResult(requestCode, resultCode, data);
try {
switch (requestCode) {
case REQUEST_COLOR:
if (resultCode == RESULT_OK && data != null) {
@ -1320,6 +1321,9 @@ public class FragmentAccount extends FragmentBase {
onDelete();
break;
}
} catch (Throwable ex) {
Log.e(ex);
}
}
private void setColor(int color) {

4
app/src/main/java/eu/faircode/email/FragmentAnswer.java
Unescape View File

@ -214,12 +214,16 @@ public class FragmentAnswer extends FragmentBase {
public void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
super.onActivityResult(requestCode, resultCode, data);
try {
switch (requestCode) {
case REQUEST_DELETE:
if (resultCode == RESULT_OK)
onDelete();
break;
}
} catch (Throwable ex) {
Log.e(ex);
}
}
private void onDelete() {

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

@ -1108,6 +1108,7 @@ public class FragmentCompose extends FragmentBase {
public void onActivityResult(int requestCode, int resultCode, Intent data) {
super.onActivityResult(requestCode, resultCode, data);
try {
switch (requestCode) {
case REQUEST_CONTACT_TO:
case REQUEST_CONTACT_CC:
@ -1173,6 +1174,9 @@ public class FragmentCompose extends FragmentBase {
onActionSendConfirmed();
break;
}
} catch (Throwable ex) {
Log.e(ex);
}
}
private void onPickContact(int requestCode, Intent data) {

4
app/src/main/java/eu/faircode/email/FragmentFolder.java
Unescape View File

@ -244,6 +244,7 @@ public class FragmentFolder extends FragmentBase {
public void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
super.onActivityResult(requestCode, resultCode, data);
try {
switch (requestCode) {
case REQUEST_SAVE_CHANGES:
if (resultCode == RESULT_OK) {
@ -263,6 +264,9 @@ public class FragmentFolder extends FragmentBase {
onDelete();
break;
}
} catch (Throwable ex) {
Log.e(ex);
}
}
@Override

4
app/src/main/java/eu/faircode/email/FragmentFolders.java
Unescape View File

@ -429,6 +429,7 @@ public class FragmentFolders extends FragmentBase {
public void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
super.onActivityResult(requestCode, resultCode, data);
try {
switch (requestCode) {
case REQUEST_SYNC:
if (resultCode == RESULT_OK && data != null) {
@ -449,6 +450,9 @@ public class FragmentFolders extends FragmentBase {
}
break;
}
} catch (Throwable ex) {
Log.e(ex);
}
}
private void onSync(long folder, boolean all) {

4
app/src/main/java/eu/faircode/email/FragmentIdentity.java
Unescape View File

@ -1030,6 +1030,7 @@ public class FragmentIdentity extends FragmentBase {
public void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
super.onActivityResult(requestCode, resultCode, data);
try {
switch (requestCode) {
case REQUEST_COLOR:
if (resultCode == RESULT_OK && data != null) {
@ -1061,6 +1062,9 @@ public class FragmentIdentity extends FragmentBase {
onHtml(data.getBundleExtra("args"));
break;
}
} catch (Throwable ex) {
Log.e(ex);
}
}
private void setColor(int color) {

4
app/src/main/java/eu/faircode/email/FragmentMessages.java
Unescape View File

@ -3338,6 +3338,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
public void onActivityResult(int requestCode, int resultCode, Intent data) {
super.onActivityResult(requestCode, resultCode, data);
try {
switch (requestCode) {
case REQUEST_RAW:
if (resultCode == RESULT_OK && data != null)
@ -3438,6 +3439,9 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
onPropertySet(data.getBundleExtra("args"));
break;
}
} catch (Throwable ex) {
Log.e(ex);
}
}
private void onSaveRaw(Intent data) {

17
app/src/main/java/eu/faircode/email/FragmentOptionsNotifications.java
Unescape View File

@ -258,9 +258,19 @@ public class FragmentOptionsNotifications extends FragmentBase implements Shared
public void onActivityResult(int requestCode, int resultCode, Intent data) {
super.onActivityResult(requestCode, resultCode, data);
if (requestCode == ActivitySetup.REQUEST_SOUND)
if (resultCode == RESULT_OK) {
Uri uri = data.getParcelableExtra(RingtoneManager.EXTRA_RINGTONE_PICKED_URI);
try {
switch (requestCode) {
case ActivitySetup.REQUEST_SOUND:
if (resultCode == RESULT_OK && data != null)
onSelectSound((Uri) data.getParcelableExtra(RingtoneManager.EXTRA_RINGTONE_PICKED_URI));
break;
}
} catch (Throwable ex) {
Log.e(ex);
}
}
private void onSelectSound(Uri uri) {
Log.i("Selected ringtone=" + uri);
if (uri != null && "file".equals(uri.getScheme()))
uri = null;
@ -271,7 +281,6 @@ public class FragmentOptionsNotifications extends FragmentBase implements Shared
else
prefs.edit().putString("sound", uri.toString()).apply();
}
}
private static Intent getIntentNotifications(Context context) {
return new Intent(Settings.ACTION_APP_NOTIFICATION_SETTINGS)

4
app/src/main/java/eu/faircode/email/FragmentQuickSetup.java
Unescape View File

@ -441,11 +441,15 @@ public class FragmentQuickSetup extends FragmentBase {
public void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
super.onActivityResult(requestCode, resultCode, data);
try {
switch (requestCode) {
case REQUEST_DONE:
finish();
break;
}
} catch (Throwable ex) {
Log.e(ex);
}
}
public static class FragmentDialogDone extends DialogFragmentEx {

4
app/src/main/java/eu/faircode/email/FragmentRule.java
Unescape View File

@ -417,6 +417,7 @@ public class FragmentRule extends FragmentBase {
public void onActivityResult(int requestCode, int resultCode, Intent data) {
super.onActivityResult(requestCode, resultCode, data);
try {
switch (requestCode) {
case REQUEST_SENDER:
if (resultCode == RESULT_OK && data != null)
@ -443,6 +444,9 @@ public class FragmentRule extends FragmentBase {
onDelete();
break;
}
} catch (Throwable ex) {
Log.e(ex);
}
}
private void onPickContact(Intent data, boolean sender) {

Write Preview
Loading…
Cancel
Save