cogentleman/xmpp_client
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
2,618 Commits 1 Branch 0 Tags 47 MiB
3677c6ec98
Commit Graph

993 Commits

Author SHA1 Message Date
Andreas Straub
9c4d55f82c Send correct body for HTTP files 
When using HTTP upload to send files, take care to transmit only the URL
rather than the entire body, which contains metadata.
 2015-07-19 22:23:28 +02:00
Andreas Straub
2045a71262 Handle file transmission properly in axolotl 2015-07-19 22:23:28 +02:00
Andreas Straub
43703870e8 Remove unneccessary code 2015-07-19 22:23:28 +02:00
Andreas Straub
4038af2f47 Fix trust status for outgoing messages 
Tag sent messages with own fingerprint, set own fingerprint as always
trusted, include own fingerprint in database trust search, explicitly
reset trust colorfilter
 2015-07-19 22:23:28 +02:00
Andreas Straub
e8ec2ee628 Don't merge messages with different trust statuses 2015-07-19 22:23:28 +02:00
Sam Whited
fca0c36757 Fix copying of axolotl keys to clipboard 2015-07-19 22:23:28 +02:00
Sam Whited
3ab59c93a6 Add refresh icon to v21 theme 2015-07-19 22:23:27 +02:00
Andreas Straub
6c38e53128 Disable Axolotl option if not usable 
In MUCs or if contact is not axolotl capable, disable axolotl menu
option
 2015-07-19 22:23:27 +02:00
Andreas Straub
9e8d9a6401 Show trust status of messages' originating session 
Shade lock icon red if message was received in a session that has not
been marked trusted by the user or fingerprint is unknown
 2015-07-19 22:23:27 +02:00
Andreas Straub
3d33946088 Add key trust toggle to ContactDetailsActivity 
Can now toggle IdentityKey trust
 2015-07-19 22:23:27 +02:00
Andreas Straub
35714d3d08 Ensure that available sessions are always used 
Any time a new session is established, call syncRosterToDisk() to ensure
that on subsequent restoreFromDatabase() calls, the roster is actually
available. This is important so that initAccountServices() can properly
initialize the SessionMap. This prevents a race condition where after
adding a new account and initiating sessions with it, if the app is
killed (e.g. by reinstall) before triggering a syncRosterToDisk(),
subsequent restores will not have the roster available, leading to
missing XmppAxolotlSessions in the SessionMap cache. As a result of
this, a new session was initiated when sending a new message, and
received messages could not be tagged with the originating session's
fingerprint.

As an added sanity check, go to the database to confirm no records are
present before creating fresh XmppAxolotlSession objects (both in the
sending and receiving case).
 2015-07-19 22:23:27 +02:00
Andreas Straub
31d375c2c3 Fix setIdentityKeyTrust update statement 2015-07-19 22:23:27 +02:00
Andreas Straub
160e4017df Fix IdentityKey storage model 
Added proper UNIQUE statement
 2015-07-19 22:23:27 +02:00
Andreas Straub
461d0446f7 Fix and expand key regeneration function 
Wipe session cache to prevent stale sessions being used. Wipe fetch
status cache to enable recreation of sessions. Regenerate deviceId, so
that foreign devices will talk to us again.
 2015-07-19 22:23:27 +02:00
Andreas Straub
23a4e1e6fa Display trust status in ContactDetailsActivity 2015-07-19 22:23:25 +02:00
Andreas Straub
d173913eba Overhauled Message tagging 
Messages are now tagged with the IdentityKey fingerprint of the
originating session. IdentityKeys have one of three trust states:
undecided (default), trusted, and untrusted/not yet trusted.
 2015-07-19 22:17:58 +02:00
Andreas Straub
7f918542c8 Postpone initAccountService until roster loaded 
The AxolotlService depends on the roster being loaded when it is
initialized so that it can fill its in-memory SessionMap.
 2015-07-19 22:17:57 +02:00
Andreas Straub
03614a0262 Fix getSubDeviceSessions SQL query 2015-07-19 22:17:57 +02:00
Andreas Straub
2628662a7f Display axolotl chat message hint 2015-07-19 22:17:57 +02:00
Andreas Straub
f1d73b9d4e Use full int range for device IDs 2015-07-19 22:17:57 +02:00
Andreas Straub
540faeb54b Clean up unused constant 2015-07-19 22:17:57 +02:00
Andreas Straub
bd29653a20 Make some fields final 2015-07-19 22:17:57 +02:00
Andreas Straub
3458f5bb91 Clean up logging 
Add a fixed prefix to axolotl-related log messages, set log levels
sensibly.
 2015-07-19 22:17:57 +02:00
Andreas Straub
7049904c32 Add basic PEP managemend UI to EditAccountActivity 
EditAccountActivity now show own fingerprint, and gives an option to
regenerate local keying material (and wipe all sessions associated with
the old keys in the process).

It also now displays a list of other own devices, and gives an option to
remove all but the current device.
 2015-07-19 22:17:55 +02:00
Christian S
37b214a8a8 show contact details in conference details ... 2015-07-19 22:11:51 +02:00
Andreas Straub
968410ae33 Fix devicelist update handling 
No longer store own device ID (so that we don't encrypt messages for
ourselves), verify that own device ID is present in update list
(otherwise republish), reflect update in UI.
 2015-07-19 21:32:27 +02:00
Andreas Straub
7a962e5180 Refactor axolotl database recreation 2015-07-19 21:32:27 +02:00
Andreas Straub
8fd46d40d6 Adapt prettifyFingerprint() to axolotl FP sizes 2015-07-19 21:32:27 +02:00
Andreas Straub
491f623708 Fix displaying Contact IdentityKeys 
Migrate ContactDetailsActivity to use new SQL IdentityKeys storage,
remove dead code from Contact class.
 2015-07-19 21:32:27 +02:00
Andreas Straub
0cf64857cf Only cache session if successfully established 
When receiving a message, only remember the XmppAxolotlSession wrapper
if the prospective session was actually established. This prevents us
from erroneously adding empty sessions that are never established using
received PreKeyWhisperMessages, which would lead to errors if we try to
use them for sending.
 2015-07-19 21:32:27 +02:00
Andreas Straub
6867b5c3ab Return empty set on invalid PEP devicelist 2015-07-19 21:32:27 +02:00
Andreas Straub
25450bf6d3 Trust all IdentityKeys 
The trust-on-first-use policy leads to problems when receiving messages
from two different devices of a contact before sending a message to them
(as their IdentityKeys will not have been added yet). Since session
trust will be managed externally anyway, this change is not a security
problem, and will allow us to decrypt messages from yet-untrusted
sessions.
 2015-07-19 21:32:27 +02:00
Andreas Straub
bf4185ac08 Refresh PEP on session establish 
We now track preKeys used to establish incoming sessions with us. On
each new established session, we remove the used prekey from PEP. We
have to do this because libaxolotl-java internally clears the used
preKey from its storage, so we will not be able to establish any future
sessions using that key.
 2015-07-19 21:32:27 +02:00
Andreas Straub
69600502d2 Fix asynchronous axolotl message sending 
XmppConnectionService.sendMessage() now dispatches messages to the
AxolotlService, where they only are prepared for sending and cached.
AxolotlService now triggers a XmppConnectionService.resendMessage(),
which then handles sending the cached message packet.

This transparently fixes, e.g., handling of messages sent while we are
offline.
 2015-07-19 21:32:27 +02:00
Andreas Straub
ec6870307e Properly track message sender 
Previously, the sender was assumed to be the conversation counterpart.
This broke carboned own-device messages. We now track the sender
properly, and also set the status (sent by one of the own devices vs
received from the counterpart) accordingly.
 2015-07-19 21:32:27 +02:00
Andreas Straub
18c1e15d00 Rework PEP content verification 
Now checks which part(s) are out of sync w/ local storage, and updates
only those, rather than assuming the entire node corrupt and
overwriting it all (especially relevant for preKey list)
 2015-07-19 21:32:27 +02:00
Andreas Straub
9a0232f7e7 Formatting fixes 2015-07-19 21:32:27 +02:00
Andreas Straub
992cf5652e When receiving, add mock session if none exists 
We need a session object in order to build a session from a
PreKeyWhisperMessage, so add an empty one when none exists on receiving
a message.

Warning: this will break right now if the session can not be constructed
from the received message.There will be an invalid session which will
break if we try to send using it.
 2015-07-19 21:32:26 +02:00
Andreas Straub
1b0596d574 Tag messages with originating session 
This can be used later in order to display trust status of messages, as
well as for potential resending of messages in case of preKey conflicts.
 2015-07-19 21:32:26 +02:00
Andreas Straub
3815d4efa3 Fetch bundles on-demand, encrypt in background 
Bundles are now fetched on demand when a session needs to be
established. This should lessen the chance of changes to the bundles
occuring before they're used, as well as lessen the load of fetching
bundles.

Also, the message encryption is now done in a background thread, as this
can be somewhat costly if many sessions are present. This is probably
not going to be an issue in real use, but it's good practice anyway.
 2015-07-19 21:32:26 +02:00
Andreas Straub
cb7980c65e Use bareJid for own session retrieval 2015-07-19 21:32:26 +02:00
Andreas Straub
c1d23b2395 Migrate to new PEP layout 
Merge prekeys into bundle node
 2015-07-19 21:32:26 +02:00
Andreas Straub
6492801b89 Formatting fixes 2015-07-19 21:32:26 +02:00
Andreas Straub
74026b742b Save IdentityKeys in database 2015-07-19 21:32:26 +02:00
Andreas Straub
9e07fc5651 DatabaseBackend bugfixes 
Don't leak cursors, initially create tables
 2015-07-19 21:32:26 +02:00
Andreas Straub
299bbdf27f Reformat code to use tabs 
This really sucks to do it like this. Sorry. :(
 2015-07-19 21:32:26 +02:00
Andreas Straub
065519d3f3 Added axolotl activation code to UI 2015-07-19 21:32:26 +02:00
Andreas Straub
77619b55e4 Added PEP and message protocol layers 
Can now fetch/retrieve from PEP, as well as encode/decode messages
 2015-07-19 21:32:26 +02:00
Andreas Straub
f73aa1a200 Reworked axolotl protocol layer 
Numerous fixes
 2015-07-19 21:32:25 +02:00
Andreas Straub
077932eb55 CryptoNext Menu entries added 2015-07-19 21:32:25 +02:00
Andreas Straub
b8048a5538 CryptoNext persistance layer mockup 
Initial sketch of the peripheral storage infrastructure for the new
axolotl-based encryption scheme.
 2015-07-19 21:32:21 +02:00
Daniel Gultsch
9b70c7e68c bugfix: don't crash if aes key could not be set before jingle transfer 2015-07-19 14:51:04 +02:00
Daniel Gultsch
5c017e5186 bugfix: use sendIqPacket method in service instead of invoking XmppConnection directly 2015-07-19 14:25:30 +02:00
Daniel Gultsch
0166ced46c bugfix: accept status code 201 on http upload 2015-07-19 13:36:02 +02:00
Daniel Gultsch
f58b2afcaa changed switch widget 2015-07-18 19:38:52 +02:00
Daniel Gultsch
15b880f3a1 pulled translations 2015-07-18 00:02:13 +02:00
Daniel Gultsch
ce527c8b76 account for downloaded http files in dup checker 2015-07-18 00:01:34 +02:00
Daniel Gultsch
aa1b9de20c code cleanup 2015-07-17 23:58:53 +02:00
Daniel Gultsch
c3584a6db7 fixed inactive http download 2015-07-17 23:58:33 +02:00
Daniel Gultsch
13cce172ab show error message in account details when info has not been edited 2015-07-17 13:14:24 +02:00
Daniel Gultsch
1f43115544 increased ibb block size 2015-07-17 13:06:51 +02:00
Daniel Gultsch
4f62793a67 version bump to 1.5.0-beta.2 2015-07-16 14:27:36 +02:00
Daniel Gultsch
425f0479a8 even less jumpy 2015-07-16 14:06:54 +02:00
Daniel Gultsch
6a329c7465 fixed some ux glitches in editaccount 2015-07-16 13:42:52 +02:00
Daniel Gultsch
babbd389f6 removed empty translation file 2015-07-16 13:29:59 +02:00
Daniel Gultsch
7bd66549d8 made 'check image on http host' message more generic. fixed #1281 2015-07-16 13:25:52 +02:00
Daniel Gultsch
b477b8f57b fixed some npes 2015-07-16 13:14:51 +02:00
Daniel Gultsch
b525b42e59 fixed crash on invalid muc bookmarks 2015-07-15 17:42:08 +02:00
Daniel Gultsch
ffffca10f0 renamed colors 2015-07-13 12:55:13 +02:00
Daniel Gultsch
84bfe8c721 catch exception on broken android phones 2015-07-12 20:17:12 +02:00
Daniel Gultsch
558d065d48 made lock button reflect encryption status of the next messages instead of the last 2015-07-12 17:59:22 +02:00
Daniel Gultsch
58bc4cba06 only try to change affilations for known jids 2015-07-11 21:24:51 +02:00
Daniel Gultsch
4274fe90ac try to catch weird npe in android sdk 2015-07-11 21:24:30 +02:00
Daniel Gultsch
5dd83a5fe6 null check otr fingerprint before display 2015-07-11 21:23:58 +02:00
Daniel Gultsch
78aff1329f renamed HttpConnection to HttpDownloadConnection 2015-07-10 15:14:13 +02:00
Daniel Gultsch
ce79f4bbe3 renamed downloadable to transferable 2015-07-10 15:11:03 +02:00
Daniel Gultsch
925801c14e get file upload ready to work with https 2015-07-10 14:14:45 +02:00
Daniel Gultsch
0f5c87ca1f display toast in ui on failed http download 
fixes #954
 2015-07-10 13:28:50 +02:00
Daniel Gultsch
b02ef0c62f show timestamp on images in mucs 
fixes #1178
 2015-07-10 12:42:41 +02:00
Daniel Gultsch
492e387482 added null check in sasl response verifier 2015-07-10 12:16:30 +02:00
Daniel Gultsch
7eac30d1f4 catch number format exception in server ack 2015-07-10 12:09:59 +02:00
Daniel Gultsch
26044ca229 print stack trace instead of writing error message to log in case of unknown exception in dnsutil 2015-07-09 13:40:08 +02:00
Daniel Gultsch
ef1429c9a6 show contacts name in non anonymous mucs. fixes #1213 2015-07-05 18:10:18 +02:00
Daniel Gultsch
bef731a3c8 refactored sendMessage and merged with resendMessage 2015-07-05 11:59:38 +02:00
Daniel Gultsch
2fbeb0bbb2 make sure unread count is initialized as 0. fixes #1270 2015-07-03 22:08:23 +02:00
Daniel Gultsch
d30fb6f0a1 avoid very rare npe 2015-07-03 21:32:46 +02:00
Daniel Gultsch
1c86098f3b Merge branch 'master' into development 2015-07-03 13:09:05 +02:00
Daniel Gultsch
fc47969741 added fallback for non-srv dns queries 2015-07-03 13:07:48 +02:00
Daniel Gultsch
c745fbb562 fixed share with activity to account for http file upload 2015-07-02 23:51:59 +02:00
Daniel Gultsch
e4d1bd415d also offer http download for some 'well known extensions' 2015-07-02 23:19:50 +02:00
Daniel Gultsch
f5ba9d4223 refactored message context menu 2015-07-02 23:13:00 +02:00
Daniel Gultsch
a2525346f4 moved null check for to and from in message parser 2015-07-02 18:02:32 +02:00
Daniel Gultsch
c20a088ea8 changed mime type handling 2015-07-01 16:01:18 +02:00
Daniel Gultsch
c36238141d disable automatic aes encryption for the time being 2015-06-30 20:19:18 +02:00
Daniel Gultsch
9190e03076 changed namespace of the http upload feature 2015-06-30 20:11:50 +02:00
Daniel Gultsch
aca9d8036c made httpconnection (download) ready all kind of files 2015-06-30 17:15:02 +02:00
Daniel Gultsch
6af97c724c made storage path decision entirely based upon file extension 2015-06-30 14:04:39 +02:00
Daniel Gultsch
d7de311379 refactored bodyContainsDownloadable to be more flexible 2015-06-30 13:52:53 +02:00
Daniel Gultsch
5b42b392a1 always show copy original url in context menu when url is available 2015-06-30 13:01:04 +02:00
Daniel Gultsch
0030bbf472 untested pgp support for http upload 2015-06-29 15:38:16 +02:00
Daniel Gultsch
fdd46f1c91 added trigger to Config.java to always enable aes encryption for uploaded files 2015-06-29 15:21:41 +02:00
Daniel Gultsch
82714dedfe make quick actions available in conferences when file attachment is available 2015-06-29 15:21:41 +02:00
Daniel Gultsch
7e11570f2c show attach button in conferences when http upload is available 2015-06-29 15:21:41 +02:00
Daniel Gultsch
9eb9a52205 initial http upload support 
be careful: little error handling and no encryption
 2015-06-29 15:21:41 +02:00
Daniel Gultsch
0d01e51da5 don't parse body from muc status messages 2015-06-28 22:14:40 +02:00
Daniel Gultsch
46595b6d43 fixed parsing of muc status messages in new message parser 2015-06-28 20:11:28 +02:00
Daniel Gultsch
3578263686 pulled new translations from transifex 2015-06-23 12:19:33 +02:00
Daniel Gultsch
5a48afdd4d don't perform dns lookups on domain parts that obviously look like ip addresses 2015-06-19 16:25:08 +02:00
Daniel Gultsch
58201b4408 changed paragraph divider 2015-06-10 03:30:17 +02:00
Daniel Gultsch
0ea83832cd pulled new translations from transifex 2015-06-10 03:29:52 +02:00
Daniel Gultsch
9d1e8205a2 made i/o and memory intensive operations execute in serial order 2015-06-05 08:46:06 +02:00
Daniel Gultsch
a4e9f0c9c0 fixed obvious bug in dns helper 2015-06-04 16:26:51 +02:00
Daniel Gultsch
8f07e4c441 streamlined dns helper by ignoring weight 2015-06-04 02:48:07 +02:00
Daniel Gultsch
6b794eca2c send_received muc messages will mark a conversation a read 2015-06-04 02:47:24 +02:00
Daniel Gultsch
53e8964dc1 reworked handeling of system contacts 2015-06-03 14:05:54 +02:00
Daniel Gultsch
3eab3291de properly calculate remaining size. should fix #1243 2015-06-03 03:05:20 +02:00
Daniel Gultsch
b40922d747 upgrade build tools 2015-06-02 14:10:49 +02:00
Daniel Gultsch
fe1cff016f avoid unnessary muc mam queries when message count is 0 after subject 2015-06-02 13:33:20 +02:00
Daniel Gultsch
8ac933be9f fixed more edge cases in muc message parser 2015-06-02 12:21:35 +02:00
Daniel Gultsch
df86b0fc47 improved compatibility with muc components that change the message id 2015-06-02 06:23:32 +02:00
Daniel Gultsch
a577ec7c31 let dns library take care of no-srv style hosts as well 2015-05-28 17:31:46 +02:00
Daniel Gultsch
5373956e19 use dns library to resolve missing ipv6 or ipv4 addresses 2015-05-28 16:55:48 +02:00
Daniel Gultsch
165965bb83 parse nick and avatar only from available presences to avoid potential error reflection 2015-05-27 11:44:44 +02:00
Daniel Gultsch
0f6f6adca0 removed unnecessary / inacurate debug logging 2015-05-26 13:04:22 +02:00
Daniel Gultsch
402e5363d1 deduplicate private muc messages 2015-05-26 12:00:55 +02:00
Daniel Gultsch
6059ed4738 update unread count badge only when necessary 2015-05-26 12:00:38 +02:00
Daniel Gultsch
9debf8037b added default iq handler to print some iq error messages 2015-05-26 11:31:33 +02:00
Daniel Gultsch
a423fc04fa pulled translations from transifex 2015-05-26 11:09:17 +02:00
Daniel Gultsch
997b11dbec added choose picture as another quick action. fixes #1221 2015-05-26 05:34:58 +02:00
Daniel Gultsch
dc91ff8f29 renamed OtrEngine to OtrService 2015-05-26 04:36:32 +02:00
Daniel Gultsch
f579602456 Merge branch 'master' into development 2015-05-25 11:15:14 +02:00
Daniel Gultsch
36034815ee use same sm check inside xmppconnection and out 2015-05-25 04:54:11 +02:00
Daniel Gultsch
a535d45ec3 log connection age and reshedule ping check 2015-05-25 04:49:36 +02:00
Daniel Gultsch
9d1a8c607f Merge branch 'development' of github.com:siacs/Conversations into development 2015-05-21 09:19:56 +02:00
Daniel Gultsch
75977818ea Merge branch 'master' into development 2015-05-21 09:19:26 +02:00
Daniel Gultsch
3cdac228f9 fixed with attaching wrong files when returning to activity and background service is still alive 2015-05-21 05:21:22 +02:00
Daniel Gultsch
d908b70340 Merge pull request #1212 from emdete/add_jid_to_show_location 
fix to detect the sender jid correctly
 2015-05-20 18:31:18 +02:00
M. Dietrich
4759607a77 fix to detect the sender jid correctly 2015-05-20 15:45:08 +02:00
Daniel Gultsch
bb065680e5 Merge pull request #1211 from emdete/add_jid_to_show_location 
add extra jid to intend "show location"
 2015-05-20 12:48:03 +02:00
Daniel Gultsch
2364710afb added ShortcutBadger as a dependency to create unread counts on launcher icon 2015-05-20 12:47:04 +02:00
Daniel Gultsch
a4ec7a7df1 pulled translations from transifex 2015-05-20 12:26:38 +02:00
M. Dietrich
78847d0749 add extra jid to intend "show location" 2015-05-20 11:37:10 +02:00
Daniel Gultsch
70ebe35ffe Merge branch 'master' into development 2015-05-20 08:25:42 +02:00
Daniel Gultsch
8064832dca don't allow user to accidentally send empty messages 2015-05-20 08:25:00 +02:00
Daniel Gultsch
201bc158bd proper error parsing. some clean up 2015-05-20 03:48:14 +02:00
Daniel Gultsch
9658146575 fixed npe in new message parser 2015-05-20 03:48:14 +02:00
Daniel Gultsch
1b5631c835 fixed muc mam. added a few security checks 2015-05-20 03:48:14 +02:00
Daniel Gultsch
eeebebe32a fixed read/unread markers 2015-05-20 03:48:14 +02:00
Daniel Gultsch
b731995a51 added mam stuff to new message parser 2015-05-20 03:48:14 +02:00
Daniel Gultsch
d261feda74 rewrote parser code. mam id and possible other stuff still missing. also massivly untested 2015-05-20 03:48:14 +02:00