Mastodon
/
moshidon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'bugfix/965' 

# Conflicts:
#	mastodon/src/main/AndroidManifest.xml
This commit is contained in:
LucasGGamerM 2024-03-17 16:25:49 -03:00
parent 8f69358d34 123ed6c56d
commit e694715dae
3 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
mastodon/src/main/AndroidManifest.xml
View File

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

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

@ -96,6 +96,7 @@ public class AccountSessionManager{
private AccountSessionManager(){ private AccountSessionManager(){
prefs=MastodonApp.context.getSharedPreferences("account_manager", Context.MODE_PRIVATE); 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"); File file=new File(MastodonApp.context.getFilesDir(), "accounts.json");
if(!file.exists()) if(!file.exists())
return; return;

6
mastodon/src/main/res/xml/backup_rules.xml Normal file
View File

@ -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>