Rename account: don't crash when content providers are not accessible

app/build.gradle

@@ -17,7 +17,7 @@ android {
         minSdkVersion 15
         targetSdkVersion 24
 
-        versionCode 128
+        versionCode 129
 
         buildConfigField "long", "buildTime", System.currentTimeMillis() + "L"
         buildConfigField "boolean", "customCerts", "true"

app/src/main/java/at/bitfire/davdroid/resource/LocalAddressBook.java

@@ -233,9 +233,11 @@ public class LocalAddressBook extends AndroidAddressBook implements LocalCollect
 
     public static void onRenameAccount(@NonNull ContentResolver resolver, @NonNull String oldName, @NonNull String newName) throws RemoteException {
         @Cleanup("release") ContentProviderClient client = resolver.acquireContentProviderClient(ContactsContract.AUTHORITY);
-        ContentValues values = new ContentValues(1);
-        values.put(RawContacts.ACCOUNT_NAME, newName);
-        client.update(RawContacts.CONTENT_URI, values, RawContacts.ACCOUNT_NAME + "=?", new String[] { oldName });
+        if (client != null) {
+            ContentValues values = new ContentValues(1);
+            values.put(RawContacts.ACCOUNT_NAME, newName);
+            client.update(RawContacts.CONTENT_URI, values, RawContacts.ACCOUNT_NAME + "=?", new String[]{oldName});
+        }
     }
 
 }

app/src/main/java/at/bitfire/davdroid/resource/LocalTaskList.java

@@ -172,9 +172,11 @@ public class LocalTaskList extends AndroidTaskList implements LocalCollection {
 
     public static void onRenameAccount(@NonNull ContentResolver resolver, @NonNull String oldName, @NonNull String newName) throws RemoteException {
         @Cleanup("release") ContentProviderClient client = resolver.acquireContentProviderClient(TaskProvider.ProviderName.OpenTasks.authority);
-        ContentValues values = new ContentValues(1);
-        values.put(Tasks.ACCOUNT_NAME, newName);
-        client.update(Tasks.getContentUri(TaskProvider.ProviderName.OpenTasks.authority), values, Tasks.ACCOUNT_NAME + "=?", new String[] { oldName });
+        if (client != null) {
+            ContentValues values = new ContentValues(1);
+            values.put(Tasks.ACCOUNT_NAME, newName);
+            client.update(Tasks.getContentUri(TaskProvider.ProviderName.OpenTasks.authority), values, Tasks.ACCOUNT_NAME + "=?", new String[]{oldName});
+        }
     }
 
 }