777dd4b51e
Merge branch 'master' into development
2015-08-23 17:29:46 +02:00
bbfd98b726
reformating
2015-08-23 17:29:31 +02:00
d51c4b9655
deal with another set of stream:features after bind
2015-08-23 17:26:50 +02:00
b0710cdf04
Merge branch 'master' into development
2015-08-23 13:57:14 +02:00
e1dc7f990d
Add error handling to OMEMO PEP code
...
Log received errors and abort processing
2015-08-23 13:23:51 +02:00
3d6fb9b21d
remove callbacks directly from iterator
2015-08-23 10:20:29 +02:00
1688b65965
don't make subsequent iq request when original stanza returned an error
2015-08-23 08:27:05 +02:00
496f531e2e
modified clearIqCallbacks into 2-step process
2015-08-23 08:01:47 +02:00
9e26375d2f
simulate old behaviour with messages being set to waiting while offline
2015-08-19 13:00:52 +02:00
c9b2638778
Merge branch 'master' into development
2015-08-19 12:49:24 +02:00
52f0622dd3
fixed nasty 'stuck at sending' bug that got introduced in 32826ec29d
2015-08-19 12:47:50 +02:00
dafcee6a5b
Merge branch 'master' into development
2015-08-19 12:29:23 +02:00
6e1870b00a
check if inputstream is null before cropping avatar images
2015-08-19 12:25:17 +02:00
9ebd6d503c
catch package manager has died exception
2015-08-19 12:24:42 +02:00
9edcca1045
Merge branch 'master' into development
2015-08-16 15:01:06 +02:00
5b1dda9148
deal with broken frameworks
2015-08-16 14:55:40 +02:00
d7b3060fc8
catch broken base64 in avatars
2015-08-16 14:55:24 +02:00
51a2645349
synchronize packetCallbacks
2015-08-16 12:12:22 +02:00
c082066118
catch null pointer in ScramSHA1 sasl
2015-08-16 11:50:33 +02:00
5501502e89
Merge branch 'depend_on_sm' into development
2015-08-15 19:18:38 +02:00
ecac1e5943
Merge branch 'development'
2015-08-15 19:12:51 +02:00
45d68c200e
Display error message if all contact keys purged
2015-08-15 18:52:47 +02:00
83e1e6468e
fully depend on sm
2015-08-15 16:57:07 +02:00
1f34fb742c
Merge branch 'development'
2015-08-15 14:26:37 +02:00
32826ec29d
provide extra interface to close sockets. fixes #1330
2015-08-15 14:14:33 +02:00
4539643f27
show HTTP upload availability on Edit account screen
2015-08-14 22:24:05 +02:00
dad90762b4
do not touch pictures that are already in the right format
...
fixed #522
2015-08-11 16:50:00 +02:00
3677c6ec98
use same code that is used to open files for images
...
fixes #1323
2015-08-11 15:24:06 +02:00
c0dcf4a55a
changed color of 'whispered' prefix
...
fixes #1326
2015-08-11 15:13:17 +02:00
fd81491b05
put wake locks on out of band file transfers
2015-08-10 19:48:36 +02:00
d30515a85a
report wrong file size in otr encrypted jingle file transfers to be compatible with conversations > 1.6
2015-08-10 12:55:37 +02:00
b5e90850d8
provide more detailed error toasts for http file download
2015-08-10 12:15:14 +02:00
b7f00ddac3
fixed image preview in notfications for images that arrived over jingle
2015-08-08 17:19:40 +02:00
8b9b74ff7e
renamed multi-end / axolotl to OMEMO
2015-08-08 13:29:21 +02:00
efdf3b6c1c
removed dead code
2015-08-08 13:13:23 +02:00
cac577fa4e
don't request ack for iq stanzas before stream managment is initialized
...
fixes #1322
2015-08-08 10:26:36 +02:00
7437d0fe0c
Increase number of published prekeys for release
2015-08-07 12:30:39 +02:00
53ce5d223e
request server-ACKs for iq stanzas
2015-08-06 20:48:55 +02:00
6694af8fca
fail old/invalid iq stanzas on bind
2015-08-06 14:54:37 +02:00
5c0853f302
hide multi-end and otr encryption in conferences
2015-08-06 13:09:53 +02:00
34b22dea48
Improve TrustKeysActivity slider responsiveness
...
Slider used to skip back on drag-and-drop action. The switch doesn't
trigger explicit whole UI refreshes anymore, it now directly adjusts the
"done" button's locked status.
2015-08-05 22:24:13 +02:00
a1c43d8fdf
added config.java variable to hide openpgp as an encryption method
2015-08-05 18:52:34 +02:00
c617cf6ef8
added Config.java varibale to lock account creation to specfic domain
2015-08-03 22:58:17 +02:00
a6bbe4d4ce
lets try jpeg for a while
2015-08-01 23:37:41 +02:00
5529337da3
use content-type in http slot request and stick with during upload
2015-08-01 22:37:17 +02:00
f9dec7cf86
fixed calculated file size in http slot request
2015-08-01 22:23:58 +02:00
6cd9383e53
Let UNTRUSTED/UNDECIDED keys become INACTIVE
2015-08-01 18:30:11 +02:00
60cd307f73
enable axolotl encryption for jingle supported file transfers
2015-08-01 01:19:16 +02:00
6059b96456
Provide process function for key transport message
2015-07-31 23:28:09 +02:00
909f761ca1
Refactor axolotl message processing workflow
...
XmppAxolotlMessage is now entirely responsible for handling encryption
and decryption of messages, only leveraging XmppAxolotlSession as a
packing/unpacking primitive for payload keys.
Removed pseudo-dead session generation code step from prepareMessage
function, as sessions have been created by invoking the
TrustKeysActivity for a while now.
Added prepareKeyTransportMessage function, which creates a message with
no payload. The key that is packed into the header keyElements can then
be used for other purposes (e.g. encrypted file transfer).
2015-07-31 21:31:45 +02:00
50b14434ee
Reformat code
2015-07-31 21:31:45 +02:00
5c421da1e1
Change to new wire protocol version
2015-07-31 21:31:45 +02:00
26ac7c9030
added missing carbon column message table create statement
...
fixes #1310
2015-07-31 13:08:35 +02:00
658919f239
improved 'next encryption' selection
2015-07-31 00:52:46 +02:00
74ab36fda2
Fix session logic: enforce same type of encryption
2015-07-30 19:18:09 +02:00
1ed550b5c5
fixed some colors in message adapter
2015-07-30 12:40:50 +02:00
58d80f58be
use gcm for file encryption over http
2015-07-29 23:45:37 +02:00
b7c64cd19d
Reset lock color for non-axolotl messages
2015-07-29 20:25:14 +02:00
2b3bb02261
Highlight selected message's fingerprint in list
2015-07-29 20:21:37 +02:00
e07853ea62
Rerender message bubbles on encryption change
2015-07-29 20:10:21 +02:00
e6df4d81d2
Tag carbon messages in parser, adapt session logic
...
Messages sent from another device of the own account are now explicitly
tagged as carboned message. The session detection logic now uses this
tag to find "session borders".
2015-07-29 16:41:58 +02:00
e10a6c5b87
Fix NPE: consider unknown keys UNDECIDED
2015-07-29 02:59:41 +02:00
77920c7aa6
Color plaintext messages in encrypted sessions red
...
Plaintext messages that were received while in an encrypted session are
now colored red. We define "in an encrypted session" if a) the last
message sent by our own device before the message under consideration
(or any message received between then and now) was encrypted AND b) the
next message will be sent encrypted or the next message sent after the
one under consideration was sent encrypted
2015-07-29 02:59:41 +02:00
a3991d59c9
Improve trust toggle responsiveness
...
Removed unnecessary UI refreshes, explicitly update UI where needed.
2015-07-29 02:59:41 +02:00
efcefc2e63
Refactor out inner classes, cache trust store
...
Moves SQLiteAxolotlStore and XmppAxolotlSession into proper classes.
IdentityKeys trust statuses are now cached in an LruCache to prevent
hammering the database when rendering the UI.
2015-07-29 02:59:26 +02:00
17bc4fb6cd
show http downloaded images in notification
2015-07-29 01:57:08 +02:00
8f14d2bfbd
removed recursion in message.getMerged*()
2015-07-28 23:00:30 +02:00
8924c448d1
changed logging. (work around logcat null pointer
2015-07-28 22:26:29 +02:00
6b8e1ecb95
log reason for message failure
2015-07-28 14:44:11 +02:00
ff0c114cd6
set time on resend to current time
...
fixes #1298
fixes #919
2015-07-28 12:54:54 +02:00
9c94c9ad8f
rewrote dns fallback
2015-07-24 19:06:47 +02:00
e5fae429fa
call refreshUi directly
2015-07-24 14:43:13 +02:00
c32162c280
switch/case can't deal with null pointers
2015-07-23 14:02:25 +02:00
cd204d5931
show warning when trying to highlight users that have left the conference
2015-07-22 15:57:17 +02:00
f7634a85be
treat private, non-anonymous mucs like 1:1 chats notification wise
2015-07-22 15:31:00 +02:00
db05d26433
Always build own device session automatically
2015-07-22 15:03:52 +02:00
9c1c86ed44
add no-store to chat states
2015-07-22 14:17:02 +02:00
63206e6d4a
use type=chat more often to go along with new, simple carbon and mam rules
...
* change chat states to type=chat and chat markers to type=chat
* use same type as requesting stanza for delivery receipts (which should make them type=chat most of the time)
2015-07-22 14:15:00 +02:00
a1e63944a2
use 'interactive mode' when starting downloads from the context menu
2015-07-22 12:15:09 +02:00
c2813cea29
Hide regenerate keys button
...
Can re-enable it via Config.java setting
2015-07-22 01:00:20 +02:00
4c1c2892c7
Disable trust toggle completely for INACTIVE keys
2015-07-22 00:53:54 +02:00
456d4c8b23
made image file format configurable by Config.java
2015-07-21 23:49:35 +02:00
d38228f482
fixed npe in error message handling
2015-07-21 19:45:41 +02:00
f6281a182d
fixed npe in error message handling
2015-07-21 19:44:25 +02:00
92b5081b5e
Add INACTIVE state for removed keys
...
We introduce a new trust state: INACTIVE. This state is intended for
old keys that have been removed.
When a TRUSTED device is removed from the PEP devicelist, it's status
will be set to INACTIVE. INACTIVE keys are shown in the UI as greyed
out, non-interactible key rows. Messages are not encrypted for INACTIVE
devices.
When an INACTIVE device reappears in PEP, or a message is received from
an INACTIVE device, it is set back to trusted.
2015-07-21 14:24:59 +02:00
3c5c0c7d3b
Fill own device sessions into SessionMap
2015-07-21 14:24:59 +02:00
1aeb5874b0
allow for private messages being started from muc details in anonymous mucs
2015-07-21 13:15:59 +02:00
32f90613a3
and now do that properly
2015-07-21 12:02:15 +02:00
ffa588ba3e
and now do that properly
2015-07-21 12:01:20 +02:00
af76ad0144
end otr session when receiving failed otr message warnings
2015-07-21 12:00:01 +02:00
394486b300
bugfix: also add no-permanent-storage to message hints
2015-07-21 11:59:52 +02:00
f1ee5cccf0
bugfix: changed condition of onOtrSessionEstablished being called
...
fixed #1263
fixed #1260
fixed #1293
2015-07-21 11:59:30 +02:00
5c2720efd0
bugfix: don't crash if aes key could not be set before jingle transfer
2015-07-21 11:55:48 +02:00
37cbdb8b4e
bugfix: use sendIqPacket method in service instead of invoking XmppConnection directly
2015-07-21 11:55:33 +02:00
086653b649
bugfix: accept status code 201 on http upload
2015-07-21 11:55:18 +02:00
87bc9d3a31
end otr session when receiving failed otr message warnings
2015-07-21 11:52:49 +02:00
a5027104fd
bugfix: also add no-permanent-storage to message hints
2015-07-21 11:50:32 +02:00
f74ee765a2
bugfix: changed condition of onOtrSessionEstablished being called
...
fixed #1263
fixed #1260
fixed #1293
2015-07-21 11:46:56 +02:00
b7ff2c3461
Use properly fixed numeral values in Trust enum
...
Why, oh God, why?! #thanksjamesgosling
2015-07-21 01:52:22 +02:00
639ebd644b
Remove unused import
2015-07-21 01:17:29 +02:00
122bc97ce2
Switch payload encryption to AES-GCM
...
This also ensures that the IV is generated with proper randomness.
2015-07-21 01:17:14 +02:00
971aa3a11e
Also decrypt messages from UNTRUSTED sessions
2015-07-20 23:16:06 +02:00
d2845e9ac1
Refactor axolotl send processing/caching flow
2015-07-20 23:13:28 +02:00
8be0e8a27d
Start TrustKeysActivity if no keys are TRUSTED
...
If there are no UNDECIDED keys, but none of the contact's keys are
trusted, redirect the user to the TrustKeysActivity
2015-07-20 22:35:07 +02:00
4ee3f330f5
Do not display clear devices button if not online
2015-07-20 22:19:04 +02:00
ab2d114bbc
Add purge axolotl key option
...
Can now long-press a key to permanently purge it.
2015-07-20 22:18:24 +02:00
0ee64124fe
Fix getNumTrustedKeys
2015-07-20 22:02:54 +02:00
e79f82ca72
attempt to fix the delay problem
2015-07-20 18:11:33 +02:00
e6cb12dfe4
changed message bubble appearance
2015-07-20 16:02:17 +02:00
504ef0b72e
rely on refreshUi/refreshUiReal and make sure it is being used everywhere
2015-07-20 15:48:58 +02:00
aaa8fe8978
Merge branch 'CryptoNextBeta' into development
...
* CryptoNextBeta: (60 commits)
Lock TrustKeys if no trusted keys are available
Optimize imports
Use MD style for key trust toggle switch
Fix set/remove OnUpdateBlocklistListener
Fix axolotl database migration
Remove device list from EditAccount
Add clear devices to overflow menu in EditAccount
Ask for key trust when sending messages
Encrypt files for HTTP upload in encrypted chats
Refactor trust key ui and show in account details
Send correct body for HTTP files
Handle file transmission properly in axolotl
Remove unneccessary code
Fix trust status for outgoing messages
Don't merge messages with different trust statuses
Fix copying of axolotl keys to clipboard
Add refresh icon to v21 theme
Disable Axolotl option if not usable
Show trust status of messages' originating session
Add key trust toggle to ContactDetailsActivity
...
2015-07-20 15:13:14 +02:00
19a0ae42d6
Lock TrustKeys if no trusted keys are available
2015-07-20 14:56:41 +02:00
012f036840
Optimize imports
2015-07-20 14:26:29 +02:00
9c91b9036a
don't show 'show contact details' context menu item when contact isn not in roster
2015-07-20 14:24:59 +02:00
e9d7d7e12a
Fix set/remove OnUpdateBlocklistListener
2015-07-20 14:12:24 +02:00
2d2da11bfa
Merge pull request #1289 from kriztan/patch-2
...
show contact details in conference details ...
2015-07-20 13:16:19 +02:00
dd964077b9
Fix axolotl database migration
...
Can't call getWritableDatabase in recreateAxolotlDb()
2015-07-20 13:15:49 +02:00
2240066bbe
Remove device list from EditAccount
2015-07-19 23:38:09 +02:00
480b1cde81
Add clear devices to overflow menu in EditAccount
2015-07-19 23:35:03 +02:00
14010bf5a6
Ask for key trust when sending messages
...
If the contact (or the own account) has keys that have UNDECIDED trust,
we now drop the user into the new TrustKeysActivity, where they have to
decide for each new key whether it should be TRUSTED or UNTRUSTED.
2015-07-19 22:27:26 +02:00
ec0aff4ed7
Encrypt files for HTTP upload in encrypted chats
2015-07-19 22:24:05 +02:00
6f67469bda
Refactor trust key ui and show in account details
...
Refactored the trust key row UI element so it can be used in multiple
places. It now also uses a slider to toggle the trust state, and the
redundant trust state description was removed.
EditAccountActivity now shows the keys of other devices associated with
that account.
2015-07-19 22:24:03 +02:00
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
2045a71262
Handle file transmission properly in axolotl
2015-07-19 22:23:28 +02:00
43703870e8
Remove unneccessary code
2015-07-19 22:23:28 +02:00
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
e8ec2ee628
Don't merge messages with different trust statuses
2015-07-19 22:23:28 +02:00
fca0c36757
Fix copying of axolotl keys to clipboard
2015-07-19 22:23:28 +02:00
3ab59c93a6
Add refresh icon to v21 theme
2015-07-19 22:23:27 +02:00
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
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
3d33946088
Add key trust toggle to ContactDetailsActivity
...
Can now toggle IdentityKey trust
2015-07-19 22:23:27 +02:00
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
31d375c2c3
Fix setIdentityKeyTrust update statement
2015-07-19 22:23:27 +02:00
160e4017df
Fix IdentityKey storage model
...
Added proper UNIQUE statement
2015-07-19 22:23:27 +02:00
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
23a4e1e6fa
Display trust status in ContactDetailsActivity
2015-07-19 22:23:25 +02:00
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
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
03614a0262
Fix getSubDeviceSessions SQL query
2015-07-19 22:17:57 +02:00
2628662a7f
Display axolotl chat message hint
2015-07-19 22:17:57 +02:00
f1d73b9d4e
Use full int range for device IDs
2015-07-19 22:17:57 +02:00
540faeb54b
Clean up unused constant
2015-07-19 22:17:57 +02:00
bd29653a20
Make some fields final
2015-07-19 22:17:57 +02:00
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
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
37b214a8a8
show contact details in conference details ...
2015-07-19 22:11:51 +02:00
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
7a962e5180
Refactor axolotl database recreation
2015-07-19 21:32:27 +02:00
8fd46d40d6
Adapt prettifyFingerprint() to axolotl FP sizes
2015-07-19 21:32:27 +02:00
Daniel Gultsch