eff9e417e0
use dedicated colors for primary and primary_dark
2015-08-26 21:17:29 +02:00
c5abddc584
fixed highlight text color for white chat bubbles
2015-08-26 21:12:19 +02:00
1156ccbce2
Fix error handling for announce check retrieval
...
Only aborts when a timeout was received. Error conditions (most notably
item-not-found) are interpreted as no other devices existing.
2015-08-26 20:52:44 +02:00
cd451856b2
explictitly handle iq timeouts in bind and session iqs
2015-08-26 20:47:08 +02:00
c4a548ada0
Only announce device after publishing bundle
2015-08-26 15:45:21 +02:00
f6b7a25e29
moved actual iq callback out of synchronized find callback block
2015-08-26 14:01:37 +02:00
ea2ce78d6e
be more restrictive about marking messages as sent_received in muc parser
2015-08-26 12:11:12 +02:00
3e0636367a
Revert "improved compatibility with muc components that change the message id"
...
This reverts commit df86b0fc47
2015-08-26 11:39:18 +02:00
0eeaccd974
Fix key publishing
...
Remove invalid check for result code, which prevented publishing if the
node was empty to begin with.
Fix pepBroken check
2015-08-26 00:27:39 +02:00
25a9d59412
Add more logging to pep attemp counter logic
2015-08-25 18:52:36 +02:00
eafcf38ec9
Limit number of PEP publish tries
...
If PEP publish tries are repeatedly triggered by empty PEP updates, stop
attempting to publish after 3 tries. This should work around broken PEP
implementations in older ejabberd and OpenFire versions.
2015-08-25 18:43:44 +02:00
ae9de26f59
remove unused imports.
2015-08-25 12:40:22 +02:00
b84fecf51a
Pass through device IDs when updating own list
2015-08-25 12:17:09 +02:00
5eae1e52d2
cleared up some error messages in axolotl service and execute publishOwnDevicesWhenNeeded() only if processing our own jid
2015-08-25 11:43:10 +02:00
25c49d5e34
catch some db query exceptions
2015-08-25 11:12:10 +02:00
7617a19280
additonal null checks in file backend
2015-08-25 11:11:53 +02:00
476db24c10
fixed session time
2015-08-25 11:11:32 +02:00
f6374f466b
increased carbon grace period to 90s
2015-08-24 21:25:04 +02:00
98e7d9c74e
pulled translations from transifex
2015-08-24 21:24:48 +02:00
730a5c644b
renamed plain text to unencrypted. fixes #1331
2015-08-24 21:15:47 +02:00
865e08401b
fixed regression with mlinks stream managment. fixes #1206
2015-08-24 20:56:36 +02:00
fb0b4bb445
added setting to allow for white backgrounds in incoming message bubbles
2015-08-24 20:56:25 +02:00
d36ae091b6
Merge branch 'master' into development
2015-08-24 18:18:24 +02:00
d0b8bd0f8a
catch invalid base64 in axolotl key parsing
2015-08-24 18:18:01 +02:00
deb9c20e5e
Merge branch 'master' into development
2015-08-23 21:06:58 +02:00
c19adebaf0
open files with capital extensions as well. fixes #1354
2015-08-23 21:00:51 +02:00
91a3cee6d2
Merge branch 'master' into development
2015-08-23 19:44:58 +02:00
8043833156
bugfix: next encryption is now being properly detected
2015-08-23 19:40:45 +02:00
7bd0f31244
Merge branch 'master' into development
2015-08-23 17:57:53 +02:00
0dfb9bd1a0
introduce special iq type for internal timeouts. always use != result to check for error in callbacks
2015-08-23 17:53:23 +02:00
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
c0502c2165
remove the READ_PHONE_STATE permission.
2015-08-23 13:07:27 +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
06fffc13cd
Merge branch 'master' into development
2015-08-19 13:16:59 +02:00
7c822c9b75
pulled translations from transifex
2015-08-19 13:03:14 +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
6aec49f06d
Update license string with libraries
2015-08-15 19:07:55 +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
a6e00837af
decreased right hand side padding in contact keys
2015-08-08 14:09:02 +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
e10e9942de
changed text selection color
2015-08-05 18:30:49 +02:00
c617cf6ef8
added Config.java varibale to lock account creation to specfic domain
2015-08-03 22:58:17 +02:00
9b91d0bf75
sync translations with transifex
2015-08-03 14:04:26 +02:00
a6bbe4d4ce
lets try jpeg for a while
2015-08-01 23:37:41 +02:00
2bf30bb296
temporarily renamed new encryption method to 'Multi-End' until a better name has been found
2015-08-01 23:36:59 +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
5191e4ce95
removed expert setting to 'force encryption'. merged certifcate and encryption settings into same category
2015-07-31 00:51:30 +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
d9bdce0104
add new received message bubble drawable
2015-07-29 02:01:28 +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
0d679a7abb
decreased saturation of received message bubbles by 25 units
2015-07-21 18:29:24 +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
96f38324f8
pulled new translations from transifex
2015-07-21 11:58:03 +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
74e05023b4
very subtle
2015-07-21 02:21:34 +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
5ab0d5d1c1
pulled new translations from transifex
2015-07-20 19:13:08 +02:00
e79f82ca72
attempt to fix the delay problem
2015-07-20 18:11:33 +02:00
dcf9117451
changed sizes of avatars and padding in new message bubbles
2015-07-20 16:02:18 +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
8559ca05ab
fixed monospace font and android L
2015-07-20 15:43:28 +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
576330f6a9
Use MD style for key trust toggle switch
2015-07-20 14:14:27 +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
eea8c28612
Change CAB to accent color in v21
2015-07-19 16:36:24 -05: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
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
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
6867b5c3ab
Return empty set on invalid PEP devicelist
2015-07-19 21:32:27 +02:00
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
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
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
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
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
9a0232f7e7
Formatting fixes
2015-07-19 21:32:27 +02:00
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
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
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
cb7980c65e
Use bareJid for own session retrieval
2015-07-19 21:32:26 +02:00
c1d23b2395
Migrate to new PEP layout
...
Merge prekeys into bundle node
2015-07-19 21:32:26 +02:00
6492801b89
Formatting fixes
2015-07-19 21:32:26 +02:00
74026b742b
Save IdentityKeys in database
2015-07-19 21:32:26 +02:00
9e07fc5651
DatabaseBackend bugfixes
...
Don't leak cursors, initially create tables
2015-07-19 21:32:26 +02:00
299bbdf27f
Reformat code to use tabs
...
This really sucks to do it like this. Sorry. :(
2015-07-19 21:32:26 +02:00
065519d3f3
Added axolotl activation code to UI
2015-07-19 21:32:26 +02:00
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
f73aa1a200
Reworked axolotl protocol layer
...
Numerous fixes
2015-07-19 21:32:25 +02:00
077932eb55
CryptoNext Menu entries added
2015-07-19 21:32:25 +02:00
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
9b70c7e68c
bugfix: don't crash if aes key could not be set before jingle transfer
2015-07-19 14:51:04 +02:00
5c017e5186
bugfix: use sendIqPacket method in service instead of invoking XmppConnection directly
2015-07-19 14:25:30 +02:00
0166ced46c
bugfix: accept status code 201 on http upload
2015-07-19 13:36:02 +02:00
f58b2afcaa
changed switch widget
2015-07-18 19:38:52 +02:00
15b880f3a1
pulled translations
2015-07-18 00:02:13 +02:00
ce527c8b76
account for downloaded http files in dup checker
2015-07-18 00:01:34 +02:00
aa1b9de20c
code cleanup
2015-07-17 23:58:53 +02:00
c3584a6db7
fixed inactive http download
2015-07-17 23:58:33 +02:00
13cce172ab
show error message in account details when info has not been edited
2015-07-17 13:14:24 +02:00
1f43115544
increased ibb block size
2015-07-17 13:06:51 +02:00
4f62793a67
version bump to 1.5.0-beta.2
2015-07-16 14:27:36 +02:00
425f0479a8
even less jumpy
2015-07-16 14:06:54 +02:00
6a329c7465
fixed some ux glitches in editaccount
2015-07-16 13:42:52 +02:00
babbd389f6
removed empty translation file
2015-07-16 13:29:59 +02:00
7bd66549d8
made 'check image on http host' message more generic. fixed #1281
2015-07-16 13:25:52 +02:00
b477b8f57b
fixed some npes
2015-07-16 13:14:51 +02:00
b525b42e59
fixed crash on invalid muc bookmarks
2015-07-15 17:42:08 +02:00
ffffca10f0
renamed colors
2015-07-13 12:55:13 +02:00
84bfe8c721
catch exception on broken android phones
2015-07-12 20:17:12 +02:00
558d065d48
made lock button reflect encryption status of the next messages instead of the last
2015-07-12 17:59:22 +02:00
58bc4cba06
only try to change affilations for known jids
2015-07-11 21:24:51 +02:00
4274fe90ac
try to catch weird npe in android sdk
2015-07-11 21:24:30 +02:00
5dd83a5fe6
null check otr fingerprint before display
2015-07-11 21:23:58 +02:00
78aff1329f
renamed HttpConnection to HttpDownloadConnection
2015-07-10 15:14:13 +02:00
ce79f4bbe3
renamed downloadable to transferable
2015-07-10 15:11:03 +02:00
925801c14e
get file upload ready to work with https
2015-07-10 14:14:45 +02:00
0f5c87ca1f
display toast in ui on failed http download
...
fixes #954
2015-07-10 13:28:50 +02:00
b02ef0c62f
show timestamp on images in mucs
...
fixes #1178
2015-07-10 12:42:41 +02:00
492e387482
added null check in sasl response verifier
2015-07-10 12:16:30 +02:00
7eac30d1f4
catch number format exception in server ack
2015-07-10 12:09:59 +02:00
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
ef1429c9a6
show contacts name in non anonymous mucs. fixes #1213
2015-07-05 18:10:18 +02:00
bef731a3c8
refactored sendMessage and merged with resendMessage
2015-07-05 11:59:38 +02:00
2fbeb0bbb2
make sure unread count is initialized as 0. fixes #1270
2015-07-03 22:08:23 +02:00
d30fb6f0a1
avoid very rare npe
2015-07-03 21:32:46 +02:00
1c86098f3b
Merge branch 'master' into development
2015-07-03 13:09:05 +02:00
fc47969741
added fallback for non-srv dns queries
2015-07-03 13:07:48 +02:00
c745fbb562
fixed share with activity to account for http file upload
2015-07-02 23:51:59 +02:00
e4d1bd415d
also offer http download for some 'well known extensions'
2015-07-02 23:19:50 +02:00
f5ba9d4223
refactored message context menu
2015-07-02 23:13:00 +02:00
a2525346f4
moved null check for to and from in message parser
2015-07-02 18:02:32 +02:00
c20a088ea8
changed mime type handling
2015-07-01 16:01:18 +02:00
c36238141d
disable automatic aes encryption for the time being
2015-06-30 20:19:18 +02:00
9190e03076
changed namespace of the http upload feature
2015-06-30 20:11:50 +02:00
aca9d8036c
made httpconnection (download) ready all kind of files
2015-06-30 17:15:02 +02:00
6af97c724c
made storage path decision entirely based upon file extension
2015-06-30 14:04:39 +02:00
d7de311379
refactored bodyContainsDownloadable to be more flexible
2015-06-30 13:52:53 +02:00
5b42b392a1
always show copy original url in context menu when url is available
2015-06-30 13:01:04 +02:00
0030bbf472
untested pgp support for http upload
2015-06-29 15:38:16 +02:00
fdd46f1c91
added trigger to Config.java to always enable aes encryption for uploaded files
2015-06-29 15:21:41 +02:00
82714dedfe
make quick actions available in conferences when file attachment is available
2015-06-29 15:21:41 +02:00
7e11570f2c
show attach button in conferences when http upload is available
2015-06-29 15:21:41 +02:00
9eb9a52205
initial http upload support
...
be careful: little error handling and no encryption
2015-06-29 15:21:41 +02:00
0d01e51da5
don't parse body from muc status messages
2015-06-28 22:14:40 +02:00
46595b6d43
fixed parsing of muc status messages in new message parser
2015-06-28 20:11:28 +02:00
3578263686
pulled new translations from transifex
2015-06-23 12:19:33 +02:00
5a48afdd4d
don't perform dns lookups on domain parts that obviously look like ip addresses
2015-06-19 16:25:08 +02:00
58201b4408
changed paragraph divider
2015-06-10 03:30:17 +02:00
0ea83832cd
pulled new translations from transifex
2015-06-10 03:29:52 +02:00
9d1e8205a2
made i/o and memory intensive operations execute in serial order
2015-06-05 08:46:06 +02:00
a4e9f0c9c0
fixed obvious bug in dns helper
2015-06-04 16:26:51 +02:00
8f07e4c441
streamlined dns helper by ignoring weight
2015-06-04 02:48:07 +02:00
6b794eca2c
send_received muc messages will mark a conversation a read
2015-06-04 02:47:24 +02:00
53e8964dc1
reworked handeling of system contacts
2015-06-03 14:05:54 +02:00
3eab3291de
properly calculate remaining size. should fix #1243
2015-06-03 03:05:20 +02:00
b40922d747
upgrade build tools
2015-06-02 14:10:49 +02:00
fe1cff016f
avoid unnessary muc mam queries when message count is 0 after subject
2015-06-02 13:33:20 +02:00
8ac933be9f
fixed more edge cases in muc message parser
2015-06-02 12:21:35 +02:00
df86b0fc47
improved compatibility with muc components that change the message id
2015-06-02 06:23:32 +02:00
a577ec7c31
let dns library take care of no-srv style hosts as well
2015-05-28 17:31:46 +02:00
5373956e19
use dns library to resolve missing ipv6 or ipv4 addresses
2015-05-28 16:55:48 +02:00
165965bb83
parse nick and avatar only from available presences to avoid potential error reflection
2015-05-27 11:44:44 +02:00
0f6f6adca0
removed unnecessary / inacurate debug logging
2015-05-26 13:04:22 +02:00
402e5363d1
deduplicate private muc messages
2015-05-26 12:00:55 +02:00
6059ed4738
update unread count badge only when necessary
2015-05-26 12:00:38 +02:00
9debf8037b
added default iq handler to print some iq error messages
2015-05-26 11:31:33 +02:00
a423fc04fa
pulled translations from transifex
2015-05-26 11:09:17 +02:00
997b11dbec
added choose picture as another quick action. fixes #1221
2015-05-26 05:34:58 +02:00
dc91ff8f29
renamed OtrEngine to OtrService
2015-05-26 04:36:32 +02:00
f579602456
Merge branch 'master' into development
2015-05-25 11:15:14 +02:00
36034815ee
use same sm check inside xmppconnection and out
2015-05-25 04:54:11 +02:00
a535d45ec3
log connection age and reshedule ping check
2015-05-25 04:49:36 +02:00
9d1a8c607f
Merge branch 'development' of github.com:siacs/Conversations into development
2015-05-21 09:19:56 +02:00
75977818ea
Merge branch 'master' into development
2015-05-21 09:19:26 +02:00
3cdac228f9
fixed with attaching wrong files when returning to activity and background service is still alive
2015-05-21 05:21:22 +02:00
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
4759607a77
fix to detect the sender jid correctly
2015-05-20 15:45:08 +02:00
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
2364710afb
added ShortcutBadger as a dependency to create unread counts on launcher icon
2015-05-20 12:47:04 +02:00
a4ec7a7df1
pulled translations from transifex
2015-05-20 12:26:38 +02:00
78847d0749
add extra jid to intend "show location"
2015-05-20 11:37:10 +02:00
70ebe35ffe
Merge branch 'master' into development
2015-05-20 08:25:42 +02:00
8064832dca
don't allow user to accidentally send empty messages
2015-05-20 08:25:00 +02:00
201bc158bd
proper error parsing. some clean up
2015-05-20 03:48:14 +02:00
9658146575
fixed npe in new message parser
2015-05-20 03:48:14 +02:00
1b5631c835
fixed muc mam. added a few security checks
2015-05-20 03:48:14 +02:00
eeebebe32a
fixed read/unread markers
2015-05-20 03:48:14 +02:00
b731995a51
added mam stuff to new message parser
2015-05-20 03:48:14 +02:00
d261feda74
rewrote parser code. mam id and possible other stuff still missing. also massivly untested
2015-05-20 03:48:14 +02:00
e32f380dae
provide helper function for getting the content of a child directly
2015-05-20 03:48:14 +02:00
73a4ffefdf
added fall back package id for voice recorder plugin
2015-05-20 03:27:52 +02:00
bb60364488
hide block contact from context menu when server feature is not available fixed #1207
2015-05-19 08:31:56 +02:00
a0575c81ab
use same socket time out for jingle and xmpp connections
2015-05-18 08:48:08 +02:00
1446a59fa5
use a 20s timeout on socks5 connections
2015-05-18 08:46:04 +02:00
fbc43a8d38
don't offer initiator his own candidates
2015-05-18 08:45:50 +02:00
d672d578c9
fixed crash on failed account registry
2015-05-17 12:32:04 +02:00
fce30f22c9
made white space check in bodyContainsDownloadable less aggresive
2015-05-16 12:49:04 +02:00
b4a8984b18
pulled new translations from transifex
2015-05-16 10:19:05 +02:00
4151b72a6e
let jingle connection and manager handle message status
2015-05-16 04:12:53 +02:00
b6a7e56bf6
call StartConversationActivity in init mode only after adding the first account
2015-05-15 13:58:11 +02:00
b69ee7125d
Force Nameprepping of JID domain parts
...
The IDN.toAscii()/IDN.toUnicode() family only namepreps the original
domain passed to it if it contained non-ASCII characters. This means
that for all-ASCII domains, no canonicalization is performed, which
leads to issues like case-sensitivity. This workaround explicitly
namepreps domain parts before calling IDN.toAscii() on them, in order to
get a canonicalized representation (most notably, case invariance). A
basic DB migration is also included.
2015-05-14 15:52:55 +02:00
8dfa701043
added a few location questions
2015-05-14 12:08:43 +02:00
8d472157a4
always log reason for failed file transfer
2015-05-14 11:57:51 +02:00
4414cf3b27
ignore question marks in location question
2015-05-13 17:10:11 +02:00
82878cded1
show location quick action after receiving a question about the users location
2015-05-13 16:23:20 +02:00
6489ddac6c
clear avatar cache when uploading new avatar
2015-05-13 14:33:52 +02:00
51aeeb766c
use zero width white space as message seperator
2015-05-13 11:56:59 +02:00
93e620d685
removed debug logging
2015-05-12 04:40:57 +02:00
d3a6aa9f7a
handle conference invites differently to deal with killed activities. fixes #1188
2015-05-12 04:33:04 +02:00
93e444ac3a
don't set unknown error in muc
2015-05-12 03:57:05 +02:00
fe5c4cab46
don't reinit conversation when coming back to activity. avoids unnecessary scrolling
2015-05-12 03:56:13 +02:00
ceadf2f6fb
pulled updated translations from transifex
2015-05-11 14:28:36 +02:00
b6f85ba0dd
avoid using paragraph style breaks by accident
2015-05-11 14:18:30 +02:00
9156665add
increased space between merged messages a bit
2015-05-11 09:20:08 +02:00
53e43daa0d
add a little bit of space between merged messages.
2015-05-11 09:08:56 +02:00
21deda7b00
no font padding on red hearts
2015-05-11 08:45:38 +02:00
22b12091a1
rewrote parts of message adapter to avoid using NULL views
2015-05-11 07:57:52 +02:00
239e86a98a
optimized heart render code a bit
2015-05-10 12:04:11 +02:00
33d1621e3b
added white heart to new rendering as well
2015-05-10 11:56:23 +02:00
Daniel Gultsch