mirror/monocles_chat_clean
1
0
Fork 1
Code Activity

added changelog, make OTR not hang, corrected Database Backend

Browse source
This commit is contained in:
Arne 2022-01-02 17:48:42 +01:00
parent 3848bd0aec
commit 66bbb2f8b0
6 changed files with 29 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
fastlane/metadata/android/de/changelogs/111.txt Normal file
View file

@ -0,0 +1,10 @@
* Angefangen OTR Verschlüsselung zu integrieren
* aktualisierter Webrtc-Link
* Verbesserung der Übersetzungen
* Möglichkeit versteckten Speicher für Anhänge zu benutzen
* Verbesserung der Korrekturfunktion
* Verbesserung der Löschfunktion
* Verbesserung der A/V-Telefonie
* Neue Möglichkeit von Textformatierung
* Änderung der Registrierungsseite
* und vieles mehr

9
fastlane/metadata/android/en-US/changelogs/111.txt Normal file
View file

@ -0,0 +1,9 @@
* starting to integrate OTR encryption
* updated Webrtc
* improved translations
* option to use hidden storage for files
* improvement of text correction and deletion
* improvement of A/V calls and connection
* new text formatting function
* changed registration process
* and many more..

2
src/main/java/eu/siacs/conversations/crypto/OtrService.java
View file

@ -309,4 +309,4 @@ public class OtrService extends OtrCryptoEngineImpl implements OtrEngineHost {
return null;
}
}
}

16
src/main/java/eu/siacs/conversations/persistance/DatabaseBackend.java
View file

@ -483,13 +483,13 @@ public class DatabaseBackend extends SQLiteOpenHelper {
}
if (oldVersion < 36 && newVersion >= 36) {
// only rename videos, images, audios and other files directories
final File oldPicturesDirectory = new File(Environment.getExternalStorageDirectory().getAbsolutePath() + "/Monocles Messenger/Images/");
final File oldFilesDirectory = new File(Environment.getExternalStorageDirectory().getAbsolutePath() + "/Monocles Messenger/Files/");
final File oldAudiosDirectory = new File(Environment.getExternalStorageDirectory().getAbsolutePath() + "/Monocles Messenger/Audios/");
final File oldVideosDirectory = new File(Environment.getExternalStorageDirectory().getAbsolutePath() + "/Monocles Messenger/Videos/");
final File oldPicturesDirectory = new File(Environment.getExternalStorageDirectory().getAbsolutePath() + "/Pix-Art Messenger/Images/");
final File oldFilesDirectory = new File(Environment.getExternalStorageDirectory().getAbsolutePath() + "/Pix-Art Messenger/Files/");
final File oldAudiosDirectory = new File(Environment.getExternalStorageDirectory().getAbsolutePath() + "/Pix-Art Messenger/Audios/");
final File oldVideosDirectory = new File(Environment.getExternalStorageDirectory().getAbsolutePath() + "/Pix-Art Messenger/Videos/");
if (oldPicturesDirectory.exists() && oldPicturesDirectory.isDirectory()) {
final File newPicturesDirectory = new File(Environment.getExternalStorageDirectory() + "/Monocles Messenger/Media/Monocles Messenger Images/");
final File newPicturesDirectory = new File(Environment.getExternalStorageDirectory() + "/Pix-Art Messenger/Media/Pix-Art Messenger Images/");
newPicturesDirectory.getParentFile().mkdirs();
final File[] files = oldPicturesDirectory.listFiles();
if (files == null) {
@ -500,7 +500,7 @@ public class DatabaseBackend extends SQLiteOpenHelper {
}
}
if (oldFilesDirectory.exists() && oldFilesDirectory.isDirectory()) {
final File newFilesDirectory = new File(Environment.getExternalStorageDirectory() + "/Monocles Messenger/Media/Monocles Messenger Files/");
final File newFilesDirectory = new File(Environment.getExternalStorageDirectory() + "/Pix-Art Messenger/Media/Pix-Art Messenger Files/");
newFilesDirectory.mkdirs();
final File[] files = oldFilesDirectory.listFiles();
if (files == null) {
@ -511,7 +511,7 @@ public class DatabaseBackend extends SQLiteOpenHelper {
}
}
if (oldAudiosDirectory.exists() && oldAudiosDirectory.isDirectory()) {
final File newAudiosDirectory = new File(Environment.getExternalStorageDirectory() + "/Monocles Messenger/Media/Monocles Messenger Audios/");
final File newAudiosDirectory = new File(Environment.getExternalStorageDirectory() + "/Pix-Art Messenger/Media/Pix-Art Messenger Audios/");
newAudiosDirectory.mkdirs();
final File[] files = oldAudiosDirectory.listFiles();
if (files == null) {
@ -522,7 +522,7 @@ public class DatabaseBackend extends SQLiteOpenHelper {
}
}
if (oldVideosDirectory.exists() && oldVideosDirectory.isDirectory()) {
final File newVideosDirectory = new File(Environment.getExternalStorageDirectory() + "/Monocles Messenger/Media/Monocles Messenger Videos/");
final File newVideosDirectory = new File(Environment.getExternalStorageDirectory() + "/Pix-Art Messenger/Media/Pix-Art Messenger Videos/");
newVideosDirectory.mkdirs();
final File[] files = oldVideosDirectory.listFiles();
if (files == null) {

3
src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
View file

@ -2897,9 +2897,6 @@ public class ConversationFragment extends XmppFragment implements EditMessage.Ke
} else if (mode == Conversation.MODE_SINGLE
&& conversation.smpRequested()) {
showSnackbar(R.string.smp_requested, R.string.verify, this.mAnswerSmpClickListener);
// } else if (mode == Conversation.MODE_SINGLE
// && conversation.getNextEncryption() == Message.ENCRYPTION_OTR) {
// showSnackbar(R.string.otr_warning, R.string.readmore, OTRwarning);
} else if (mode == Conversation.MODE_SINGLE
&& conversation.hasValidOtrSession()
&& (conversation.getOtrSession().getSessionStatus() == SessionStatus.ENCRYPTED)

5
src/main/java/eu/siacs/conversations/ui/XmppActivity.java
View file

@ -437,10 +437,7 @@ public abstract class XmppActivity extends ActionBarActivity {
}
conversation.setNextCounterpart(jid);
listener.onPresenceSelected();
} else if (!contact.showInRoster()) {
showAddToRosterDialog(conversation);
}
if (contact.showInRoster() || contact.isSelf()) {
} else if (contact.showInRoster() || contact.isSelf()) {
final Presences presences = contact.getPresences();
if (presences.size() == 0) {
if (contact.isSelf()) {