From 2980a46b5c1c39a503d396867b1ea34b5c68bee1 Mon Sep 17 00:00:00 2001 From: M66B Date: Sat, 8 Sep 2018 07:33:17 +0000 Subject: [PATCH] 0.43 release --- .idea/caches/build_file_checksums.ser | Bin 535 -> 535 bytes app/build.gradle | 4 ++-- .../java/eu/faircode/email/FragmentAccount.java | 2 +- .../eu/faircode/email/ServiceSynchronize.java | 1 + 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser index 07d0ce2cc698cf6d16e3fcd5012d791ff1cc36a9..4ce7c878da5803521aa18866be19a1f7eefc294e 100644 GIT binary patch delta 33 pcmbQvGM#0@43-^YIeRwF$zl}TmKi9^^}20tg^2lnUfnxA6#(7u4PyWR delta 33 rcmV++0N($X1eXMmm;|@|x}>q3Y5@_FG!QB$k;;5%(zdmX#Z#tu`?C+D diff --git a/app/build.gradle b/app/build.gradle index e38fe6ed..375ef35c 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -6,8 +6,8 @@ android { applicationId "eu.faircode.email" minSdkVersion 23 targetSdkVersion 28 - versionCode 42 - versionName "0.42" + versionCode 43 + versionName "0.43" archivesBaseName = "FairEmail-v$versionName" javaCompileOptions { diff --git a/app/src/main/java/eu/faircode/email/FragmentAccount.java b/app/src/main/java/eu/faircode/email/FragmentAccount.java index f2dc25d7..08123198 100644 --- a/app/src/main/java/eu/faircode/email/FragmentAccount.java +++ b/app/src/main/java/eu/faircode/email/FragmentAccount.java @@ -774,7 +774,7 @@ public class FragmentAccount extends FragmentEx { tilPassword.getEditText().setText(account == null ? null : account.password); etName.setText(account == null ? null : account.name); - etSignature.setText(account == null ? null : Html.fromHtml(account.signature)); + etSignature.setText(account == null || account.signature == null ? null : Html.fromHtml(account.signature)); cbSynchronize.setChecked(account == null ? true : account.synchronize); cbPrimary.setChecked(account == null ? true : account.primary); diff --git a/app/src/main/java/eu/faircode/email/ServiceSynchronize.java b/app/src/main/java/eu/faircode/email/ServiceSynchronize.java index 8f34dc70..aac5d83a 100644 --- a/app/src/main/java/eu/faircode/email/ServiceSynchronize.java +++ b/app/src/main/java/eu/faircode/email/ServiceSynchronize.java @@ -1624,6 +1624,7 @@ public class ServiceSynchronize extends LifecycleService { join(main); main = null; + state = null; EntityLog.log(ServiceSynchronize.this, "Main stopped " + main); }