Merge branch 'bugfix/965'

# Conflicts:
#	mastodon/src/main/AndroidManifest.xml

mastodon/src/main/AndroidManifest.xml

@@ -31,6 +31,7 @@
 		android:name=".MastodonApp"
 		android:allowBackup="true"
 		android:label="@string/mo_app_name"
+		android:dataExtractionRules="@xml/backup_rules"
 		android:supportsRtl="true"
 		android:localeConfig="@xml/locales_config"
 		android:icon="@mipmap/ic_launcher"

mastodon/src/main/java/org/joinmastodon/android/api/session/AccountSessionManager.java

@@ -96,6 +96,7 @@ public class AccountSessionManager{
 
 	private AccountSessionManager(){
 		prefs=MastodonApp.context.getSharedPreferences("account_manager", Context.MODE_PRIVATE);
+		// This file should not be backed up, otherwise the app may start with accounts already logged in. See res/xml/backup_rules.xml
 		File file=new File(MastodonApp.context.getFilesDir(), "accounts.json");
 		if(!file.exists())
 			return;

mastodon/src/main/res/xml/backup_rules.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<data-extraction-rules>
+	<cloud-backup>
+		<exclude domain="file" path="accounts.json"/>
+	</cloud-backup>
+</data-extraction-rules>