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

safer file writing

This commit is contained in:
sk 2023-05-30 18:56:55 +02:00
parent 32081b71f5
commit 8df589c103
1 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -125,14 +125,16 @@ public class AccountSessionManager{
} }
public synchronized void writeAccountsFile(){ public synchronized void writeAccountsFile(){
File tmpFile = new File(MastodonApp.context.getFilesDir(), "accounts.json~");
File file = new File(MastodonApp.context.getFilesDir(), "accounts.json"); File file = new File(MastodonApp.context.getFilesDir(), "accounts.json");
try{ try{
try(FileOutputStream out=new FileOutputStream(file)){ try(FileOutputStream out=new FileOutputStream(tmpFile)){
SessionsStorageWrapper w=new SessionsStorageWrapper(); SessionsStorageWrapper w=new SessionsStorageWrapper();
w.accounts=new ArrayList<>(sessions.values()); w.accounts=new ArrayList<>(sessions.values());
OutputStreamWriter writer=new OutputStreamWriter(out, StandardCharsets.UTF_8); OutputStreamWriter writer=new OutputStreamWriter(out, StandardCharsets.UTF_8);
MastodonAPIController.gson.toJson(w, writer); MastodonAPIController.gson.toJson(w, writer);
writer.flush(); writer.flush();
if (!tmpFile.renameTo(file)) Log.e(TAG, "Error renaming " + tmpFile.getPath() + " to " + file.getPath());
} }
}catch(IOException x){ }catch(IOException x){
Log.e(TAG, "Error writing accounts file", x); Log.e(TAG, "Error writing accounts file", x);
@ -275,7 +277,7 @@ public class AccountSessionManager{
} }
private void maybeUpdateCustomEmojis(Set<String> domains){ private void maybeUpdateCustomEmojis(Set<String> domains){
long now=System.currentTimeMillis(); // long now=System.currentTimeMillis();
for(String domain:domains){ for(String domain:domains){
// Long lastUpdated=instancesLastUpdated.get(domain); // Long lastUpdated=instancesLastUpdated.get(domain);
// if(lastUpdated==null || now-lastUpdated>24L*3600_000L){ // if(lastUpdated==null || now-lastUpdated>24L*3600_000L){
@ -408,7 +410,9 @@ public class AccountSessionManager{
@Override @Override
public void onError(ErrorResponse error){ public void onError(ErrorResponse error){
InstanceInfoStorageWrapper wrapper=new InstanceInfoStorageWrapper();
wrapper.instance = instance;
MastodonAPIController.runInBackground(()->writeInstanceInfoFile(wrapper, domain));
} }
}) })
.execNoAuth(domain); .execNoAuth(domain);
@ -419,10 +423,13 @@ public class AccountSessionManager{
} }
private void writeInstanceInfoFile(InstanceInfoStorageWrapper emojis, String domain){ private void writeInstanceInfoFile(InstanceInfoStorageWrapper emojis, String domain){
try(FileOutputStream out=new FileOutputStream(getInstanceInfoFile(domain))){ File file = getInstanceInfoFile(domain);
File tmpFile = new File(file.getPath() + "~");
try(FileOutputStream out=new FileOutputStream(tmpFile)){
OutputStreamWriter writer=new OutputStreamWriter(out, StandardCharsets.UTF_8); OutputStreamWriter writer=new OutputStreamWriter(out, StandardCharsets.UTF_8);
MastodonAPIController.gson.toJson(emojis, writer); MastodonAPIController.gson.toJson(emojis, writer);
writer.flush(); writer.flush();
if (!tmpFile.renameTo(file)) Log.e(TAG, "Error renaming " + tmpFile.getPath() + " to " + file.getPath());
}catch(IOException x){ }catch(IOException x){
Log.w(TAG, "Error writing instance info file for "+domain, x); Log.w(TAG, "Error writing instance info file for "+domain, x);
} }
@ -463,12 +470,7 @@ public class AccountSessionManager{
} }
public Instance getInstanceInfo(String domain){ public Instance getInstanceInfo(String domain){
Instance instance = instances.get(domain); return instances.get(domain);
if (instance == null) {
throw new IllegalStateException("Cannot get instance for " + domain + ". Sessions: "
+ String.join(", ", instances.keySet()));
}
return instance;
} }
public void updateAccountInfo(String id, Account account){ public void updateAccountInfo(String id, Account account){