Prevent crash

pull/212/head
M66B 1 year ago
parent b1aeedb115
commit 6b31b76479

@ -1828,52 +1828,68 @@ public class StyleHelper {
.replace("'", "") .replace("'", "")
.replace("\"", "")); .replace("\"", ""));
if (faces.contains("fairemail")) try {
return ResourcesCompat.getFont(context.getApplicationContext(), R.font.fantasy);
if (faces.contains("fairemail"))
if (bundled_fonts) { return ResourcesCompat.getFont(context.getApplicationContext(), R.font.fantasy);
if (faces.contains("montserrat") ||
faces.contains("gotham") || if (bundled_fonts) {
faces.contains("proxima nova")) if (faces.contains("montserrat") ||
return ResourcesCompat.getFont(context.getApplicationContext(), R.font.montserrat); faces.contains("gotham") ||
faces.contains("proxima nova"))
if (faces.contains("arimo") || return ResourcesCompat.getFont(context.getApplicationContext(), R.font.montserrat);
faces.contains("arial") ||
faces.contains("verdana") || if (faces.contains("arimo") ||
faces.contains("helvetica") || faces.contains("arial") ||
faces.contains("helvetica neue")) faces.contains("verdana") ||
return ResourcesCompat.getFont(context.getApplicationContext(), R.font.arimo); faces.contains("helvetica") ||
faces.contains("helvetica neue"))
if (faces.contains("tinos") || return ResourcesCompat.getFont(context.getApplicationContext(), R.font.arimo);
faces.contains("times") ||
faces.contains("times new roman")) if (faces.contains("tinos") ||
return ResourcesCompat.getFont(context.getApplicationContext(), R.font.tinos); faces.contains("times") ||
faces.contains("times new roman"))
if (faces.contains("cousine") || return ResourcesCompat.getFont(context.getApplicationContext(), R.font.tinos);
faces.contains("courier") ||
faces.contains("courier new")) if (faces.contains("cousine") ||
return ResourcesCompat.getFont(context.getApplicationContext(), R.font.cousine); faces.contains("courier") ||
faces.contains("courier new"))
if (faces.contains("lato") || return ResourcesCompat.getFont(context.getApplicationContext(), R.font.cousine);
faces.contains("carlito") ||
faces.contains("calibri")) if (faces.contains("lato") ||
return ResourcesCompat.getFont(context.getApplicationContext(), R.font.lato); faces.contains("carlito") ||
faces.contains("calibri"))
if (faces.contains("caladea") || return ResourcesCompat.getFont(context.getApplicationContext(), R.font.lato);
faces.contains("cambo") ||
faces.contains("cambria")) if (faces.contains("caladea") ||
return ResourcesCompat.getFont(context.getApplicationContext(), R.font.caladea); faces.contains("cambo") ||
faces.contains("cambria"))
if (faces.contains("opendyslexic") || return ResourcesCompat.getFont(context.getApplicationContext(), R.font.caladea);
faces.contains("comic sans") ||
faces.contains("comic sans ms")) if (faces.contains("opendyslexic") ||
return ResourcesCompat.getFont(context.getApplicationContext(), R.font.opendyslexic); faces.contains("comic sans") ||
} faces.contains("comic sans ms"))
return ResourcesCompat.getFont(context.getApplicationContext(), R.font.opendyslexic);
}
for (String face : faces) { for (String face : faces) {
Typeface tf = Typeface.create(face, Typeface.NORMAL); Typeface tf = Typeface.create(face, Typeface.NORMAL);
if (!tf.equals(Typeface.DEFAULT)) if (!tf.equals(Typeface.DEFAULT))
return tf; return tf;
}
} catch (Throwable ex) {
Log.e(ex);
/*
java.lang.NullPointerException: Attempt to invoke virtual method 'java.lang.Object java.lang.reflect.Constructor.newInstance(java.lang.Object[])' on a null object reference
at androidx.core.graphics.TypefaceCompatApi21Impl.newFamily(SourceFile:9)
at androidx.core.graphics.TypefaceCompatApi21Impl.createFromFontFamilyFilesResourceEntry(SourceFile:1)
at androidx.core.graphics.TypefaceCompat.createFromResourcesFamilyXml(SourceFile:86)
at androidx.core.content.res.ResourcesCompat.loadFont(SourceFile:17)
at androidx.core.content.res.ResourcesCompat.loadFont(SourceFile:3)
at androidx.core.content.res.ResourcesCompat.getFont(SourceFile:2)
at eu.faircode.email.StyleHelper.getTypeface(SourceFile:316)
at eu.faircode.email.StyleHelper.getTypefaceSpan(SourceFile:7)
*/
} }
return Typeface.DEFAULT; return Typeface.DEFAULT;

Loading…
Cancel
Save