sum7/Conversations
sum7
/
Conversations
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

revert Backup Hacks

This commit is contained in:
Martin/Geno 2019-02-11 13:15:42 +01:00
parent c26ed867e1
commit 7e1f8f1777
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/eu/siacs/conversations/utils/BackupFileHeader.java
View File

@ -39,7 +39,7 @@ public class BackupFileHeader {
public void write(DataOutputStream dataOutputStream) throws IOException { public void write(DataOutputStream dataOutputStream) throws IOException {
dataOutputStream.writeInt(VERSION); dataOutputStream.writeInt(VERSION);
dataOutputStream.writeUTF(app.replace("sum7", "siacs")); dataOutputStream.writeUTF(app);
dataOutputStream.writeUTF(jid.asBareJid().toEscapedString()); dataOutputStream.writeUTF(jid.asBareJid().toEscapedString());
dataOutputStream.writeLong(timestamp); dataOutputStream.writeLong(timestamp);
dataOutputStream.write(iv); dataOutputStream.write(iv);
@ -51,7 +51,7 @@ public class BackupFileHeader {
if (version > VERSION) { if (version > VERSION) {
throw new IllegalArgumentException("Backup File version was "+version+" but app only supports up to version "+VERSION); throw new IllegalArgumentException("Backup File version was "+version+" but app only supports up to version "+VERSION);
} }
String app = inputStream.readUTF().replace("siacs", "sum7"); String app = inputStream.readUTF();
String jid = inputStream.readUTF(); String jid = inputStream.readUTF();
long timestamp = inputStream.readLong(); long timestamp = inputStream.readLong();
byte[] iv = new byte[12]; byte[] iv = new byte[12];