From 123ed6c56d75feb43a1753e3bd7fccf79d563993 Mon Sep 17 00:00:00 2001
From: Steph Kraemer <purple.stephyr@proton.me>
Date: Fri, 1 Mar 2024 20:22:33 -0500
Subject: [PATCH] Fix for #965 - don't backup accounts.json

---
 mastodon/src/main/AndroidManifest.xml                       | 1 +
 .../android/api/session/AccountSessionManager.java          | 1 +
 mastodon/src/main/res/xml/backup_rules.xml                  | 6 ++++++
 3 files changed, 8 insertions(+)
 create mode 100644 mastodon/src/main/res/xml/backup_rules.xml

diff --git a/mastodon/src/main/AndroidManifest.xml b/mastodon/src/main/AndroidManifest.xml
index 3444c78189..b5011225e3 100644
--- a/mastodon/src/main/AndroidManifest.xml
+++ b/mastodon/src/main/AndroidManifest.xml
@@ -25,6 +25,7 @@
 	<application
 		android:name=".MastodonApp"
 		android:allowBackup="true"
+		android:dataExtractionRules="@xml/backup_rules"
 		android:label="@string/sk_app_name"
 		android:supportsRtl="true"
 		android:localeConfig="@xml/locales_config"
diff --git a/mastodon/src/main/java/org/joinmastodon/android/api/session/AccountSessionManager.java b/mastodon/src/main/java/org/joinmastodon/android/api/session/AccountSessionManager.java
index cd959a85ae..21381f43d6 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/api/session/AccountSessionManager.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/api/session/AccountSessionManager.java
@@ -85,6 +85,7 @@ public static AccountSessionManager getInstance(){
 
 	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;
diff --git a/mastodon/src/main/res/xml/backup_rules.xml b/mastodon/src/main/res/xml/backup_rules.xml
new file mode 100644
index 0000000000..92a3354e2f
--- /dev/null
+++ b/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>