From c3584a6db7cab985fe9a1c05bf3f61bf7b935a34 Mon Sep 17 00:00:00 2001 From: Daniel Gultsch Date: Fri, 17 Jul 2015 23:58:33 +0200 Subject: fixed inactive http download --- src/main/java/eu/siacs/conversations/http/HttpDownloadConnection.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/main/java/eu/siacs/conversations/http/HttpDownloadConnection.java b/src/main/java/eu/siacs/conversations/http/HttpDownloadConnection.java index 6fcd8c870..62fe4191d 100644 --- a/src/main/java/eu/siacs/conversations/http/HttpDownloadConnection.java +++ b/src/main/java/eu/siacs/conversations/http/HttpDownloadConnection.java @@ -90,7 +90,7 @@ public class HttpDownloadConnection implements Transferable { && this.file.getKey() == null) { this.message.setEncryption(Message.ENCRYPTION_NONE); } - checkFileSize(true); + checkFileSize(interactive); } catch (MalformedURLException e) { this.cancel(); } -- cgit v1.2.3 From aa1b9de20c50069c2fbcc8cb5bc72e0c50a61c85 Mon Sep 17 00:00:00 2001 From: Daniel Gultsch Date: Fri, 17 Jul 2015 23:58:53 +0200 Subject: code cleanup --- src/main/java/eu/siacs/conversations/ui/adapter/AccountAdapter.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/main/java/eu/siacs/conversations/ui/adapter/AccountAdapter.java b/src/main/java/eu/siacs/conversations/ui/adapter/AccountAdapter.java index 95c0524d0..782a1231b 100644 --- a/src/main/java/eu/siacs/conversations/ui/adapter/AccountAdapter.java +++ b/src/main/java/eu/siacs/conversations/ui/adapter/AccountAdapter.java @@ -52,7 +52,7 @@ public class AccountAdapter extends ArrayAdapter { break; } final Switch tglAccountState = (Switch) view.findViewById(R.id.tgl_account_status); - final boolean isDisabled = (account.getStatus() == Account.State.DISABLED) ? true : false; + final boolean isDisabled = (account.getStatus() == Account.State.DISABLED); tglAccountState.setOnCheckedChangeListener(null); tglAccountState.setChecked(!isDisabled); tglAccountState.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() { -- cgit v1.2.3 From ce527c8b7699dda3cb9c5df3e482eeeeb42a1568 Mon Sep 17 00:00:00 2001 From: Daniel Gultsch Date: Sat, 18 Jul 2015 00:01:34 +0200 Subject: account for downloaded http files in dup checker --- .../eu/siacs/conversations/entities/Message.java | 26 +++++++++++++++------- 1 file changed, 18 insertions(+), 8 deletions(-) (limited to 'src') diff --git a/src/main/java/eu/siacs/conversations/entities/Message.java b/src/main/java/eu/siacs/conversations/entities/Message.java index 28ef89df1..957c2a6d7 100644 --- a/src/main/java/eu/siacs/conversations/entities/Message.java +++ b/src/main/java/eu/siacs/conversations/entities/Message.java @@ -321,15 +321,25 @@ public class Message extends AbstractEntity { return this.serverMsgId.equals(message.getServerMsgId()); } else if (this.body == null || this.counterpart == null) { return false; - } else if (message.getRemoteMsgId() != null) { - return (message.getRemoteMsgId().equals(this.remoteMsgId) || message.getRemoteMsgId().equals(this.uuid)) - && this.counterpart.equals(message.getCounterpart()) - && this.body.equals(message.getBody()); } else { - return this.remoteMsgId == null - && this.counterpart.equals(message.getCounterpart()) - && this.body.equals(message.getBody()) - && Math.abs(this.getTimeSent() - message.getTimeSent()) < Config.MESSAGE_MERGE_WINDOW * 1000; + String body, otherBody; + if (this.hasFileOnRemoteHost()) { + body = getFileParams().url.toString(); + otherBody = message.body == null ? null : message.body.trim(); + } else { + body = this.body; + otherBody = message.body; + } + if (message.getRemoteMsgId() != null) { + return (message.getRemoteMsgId().equals(this.remoteMsgId) || message.getRemoteMsgId().equals(this.uuid)) + && this.counterpart.equals(message.getCounterpart()) + && body.equals(otherBody); + } else { + return this.remoteMsgId == null + && this.counterpart.equals(message.getCounterpart()) + && body.equals(otherBody) + && Math.abs(this.getTimeSent() - message.getTimeSent()) < Config.MESSAGE_MERGE_WINDOW * 1000; + } } } -- cgit v1.2.3 From 15b880f3a1b8f82d1a23c0800235fff3fc982363 Mon Sep 17 00:00:00 2001 From: Daniel Gultsch Date: Sat, 18 Jul 2015 00:02:13 +0200 Subject: pulled translations --- src/main/res/values-bg/strings.xml | 2 ++ src/main/res/values-cs/strings.xml | 2 ++ src/main/res/values-de/strings.xml | 2 ++ src/main/res/values-es/strings.xml | 2 ++ src/main/res/values-eu/strings.xml | 4 +++- src/main/res/values-sr/strings.xml | 2 ++ src/main/res/values-sv/strings.xml | 2 ++ 7 files changed, 15 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/main/res/values-bg/strings.xml b/src/main/res/values-bg/strings.xml index 8afd3d129..cff228f7a 100644 --- a/src/main/res/values-bg/strings.xml +++ b/src/main/res/values-bg/strings.xml @@ -288,6 +288,7 @@ Тази беседа е само за членове Бяхте изритан от тази конференция използвайки профила %s + Проверяване на %s на HTTP сървъра Не сте свързани. Опитайте отново по-късно Проверете размера на %s Настройки за съобщенята @@ -449,4 +450,5 @@ Използвани наскоро Изберете бързо действие Файлът не е открит на отдалечения сървър + Търсене на контакти или групи diff --git a/src/main/res/values-cs/strings.xml b/src/main/res/values-cs/strings.xml index 2bc213211..190fd575c 100644 --- a/src/main/res/values-cs/strings.xml +++ b/src/main/res/values-cs/strings.xml @@ -288,6 +288,7 @@ Tato konference je pouze pro členy Vykopli tě z této konference za použití účtu %s + Ověřuji %s na HTTP hostiteli Bez připojení. Zkus znovu později Ověřit %s velikost Možnosti zpráv @@ -451,4 +452,5 @@ Naposledy použitá Vybrat rychlou akci Soubor nenalezen na vzdáleném serveru + Hledat kontakty či skupiny diff --git a/src/main/res/values-de/strings.xml b/src/main/res/values-de/strings.xml index c2e1a50fe..0bd4afaaa 100644 --- a/src/main/res/values-de/strings.xml +++ b/src/main/res/values-de/strings.xml @@ -288,6 +288,7 @@ Die Konferenz ist nur für Mitglieder Du wurdest aus der Konferenz geworfen Verwende Konto %s + %s auf HTTP-Host prüfen Nicht verbunden, bitte später versuchen %s-Größe prüfen Nachrichtenoptionen @@ -449,4 +450,5 @@ zuletzt verwendet wähle Schnell-Taste Datei auf Server nicht gefunden + Nach Kontakten oder Konferenzen suchen diff --git a/src/main/res/values-es/strings.xml b/src/main/res/values-es/strings.xml index 6ab0c68f3..29938612f 100644 --- a/src/main/res/values-es/strings.xml +++ b/src/main/res/values-es/strings.xml @@ -288,6 +288,7 @@ Esta conversación es solo para miembros Has sido expulsado de esta conversación Usando cuenta %s + Comprobando %s en servidor HTTP No estás conectado. Inténtalo más tarde Comprobar tamaño de %s Opciones de mensaje @@ -449,4 +450,5 @@ Usada más recientemente Elegir acción rápida Archivo no encontrado en servidor remoto + Buscar contactos o grupos diff --git a/src/main/res/values-eu/strings.xml b/src/main/res/values-eu/strings.xml index 7600be322..028acc532 100644 --- a/src/main/res/values-eu/strings.xml +++ b/src/main/res/values-eu/strings.xml @@ -288,8 +288,9 @@ Konferentzia hau kideentzat da soilik Konferentzia honetatik kanporatua izan zara %s kontua erabiltzen + %s egiaztatzen HTTP ostalarian Ez zaude konektatuta. Saiatu beranduago berriz - Egiaztatu %s neurria + Egiaztatu %sren neurria Mezuaren aukerak Testua kopiatu Jatorrizko URLa kopiatu @@ -449,4 +450,5 @@ Azkenengo aldiz erabilitakoa Ekintza azkarra aukeratu Fitxategia ez da aurkitu urruneko zerbitzarian + Kontaktuak edo taldeak bilatu diff --git a/src/main/res/values-sr/strings.xml b/src/main/res/values-sr/strings.xml index 089d2fa88..082cfa465 100644 --- a/src/main/res/values-sr/strings.xml +++ b/src/main/res/values-sr/strings.xml @@ -288,6 +288,7 @@ Ова конференција је само за чланове Шутнути сте из ове конференције преко налога %s + Проверавам %s на ХТТП домаћину Нисте повезани. Покушајте поново касније Провери величину %s Опције поруке @@ -451,4 +452,5 @@ Недавно коришћена Изаберите брзу радњу Фајл није нађен на удаљеном серверу + Тражите контакте или групе diff --git a/src/main/res/values-sv/strings.xml b/src/main/res/values-sv/strings.xml index 6a0b262e2..98ab71105 100644 --- a/src/main/res/values-sv/strings.xml +++ b/src/main/res/values-sv/strings.xml @@ -288,6 +288,7 @@ Medlemsskap krävs för denna konferens Du har blivit utsparkad från denna konferens använder konto %s + Kontrollerar %s på webbserver Du är inte ansluten. Försök igen senare Kontrollera storleken på %s Meddelandealternativ @@ -449,4 +450,5 @@ Senast använd Välj snabbfunktion Filen hittas ej på servern + Sök efter kontakter eller grupper -- cgit v1.2.3