Daniel Gultsch
777dd4b51e
Merge branch 'master' into development
2015-08-23 17:29:46 +02:00
Daniel Gultsch
bbfd98b726
reformating
2015-08-23 17:29:31 +02:00
Daniel Gultsch
d51c4b9655
deal with another set of stream:features after bind
2015-08-23 17:26:50 +02:00
Daniel Gultsch
b0710cdf04
Merge branch 'master' into development
2015-08-23 13:57:14 +02:00
Andreas Straub
e1dc7f990d
Add error handling to OMEMO PEP code
...
Log received errors and abort processing
2015-08-23 13:23:51 +02:00
Michael
c0502c2165
remove the READ_PHONE_STATE permission.
2015-08-23 13:07:27 +02:00
Daniel Gultsch
3d6fb9b21d
remove callbacks directly from iterator
2015-08-23 10:20:29 +02:00
Daniel Gultsch
1688b65965
don't make subsequent iq request when original stanza returned an error
2015-08-23 08:27:05 +02:00
Daniel Gultsch
496f531e2e
modified clearIqCallbacks into 2-step process
2015-08-23 08:01:47 +02:00
Daniel Gultsch
06fffc13cd
Merge branch 'master' into development
2015-08-19 13:16:59 +02:00
Daniel Gultsch
7c822c9b75
pulled translations from transifex
2015-08-19 13:03:14 +02:00
Daniel Gultsch
9e26375d2f
simulate old behaviour with messages being set to waiting while offline
2015-08-19 13:00:52 +02:00
Daniel Gultsch
c9b2638778
Merge branch 'master' into development
2015-08-19 12:49:24 +02:00
Daniel Gultsch
52f0622dd3
fixed nasty 'stuck at sending' bug that got introduced in 32826ec29d
2015-08-19 12:47:50 +02:00
Daniel Gultsch
dafcee6a5b
Merge branch 'master' into development
2015-08-19 12:29:23 +02:00
Daniel Gultsch
6e1870b00a
check if inputstream is null before cropping avatar images
2015-08-19 12:25:17 +02:00
Daniel Gultsch
9ebd6d503c
catch package manager has died exception
2015-08-19 12:24:42 +02:00
Daniel Gultsch
9edcca1045
Merge branch 'master' into development
2015-08-16 15:01:06 +02:00
Daniel Gultsch
5b1dda9148
deal with broken frameworks
2015-08-16 14:55:40 +02:00
Daniel Gultsch
d7b3060fc8
catch broken base64 in avatars
2015-08-16 14:55:24 +02:00
Daniel Gultsch
51a2645349
synchronize packetCallbacks
2015-08-16 12:12:22 +02:00
Daniel Gultsch
c082066118
catch null pointer in ScramSHA1 sasl
2015-08-16 11:50:33 +02:00
Daniel Gultsch
5501502e89
Merge branch 'depend_on_sm' into development
2015-08-15 19:18:38 +02:00
Daniel Gultsch
ecac1e5943
Merge branch 'development'
2015-08-15 19:12:51 +02:00
Andreas Straub
6aec49f06d
Update license string with libraries
2015-08-15 19:07:55 +02:00
Andreas Straub
45d68c200e
Display error message if all contact keys purged
2015-08-15 18:52:47 +02:00
Daniel Gultsch
83e1e6468e
fully depend on sm
2015-08-15 16:57:07 +02:00
Daniel Gultsch
1f34fb742c
Merge branch 'development'
2015-08-15 14:26:37 +02:00
Daniel Gultsch
32826ec29d
provide extra interface to close sockets. fixes #1330
2015-08-15 14:14:33 +02:00
hlad
4539643f27
show HTTP upload availability on Edit account screen
2015-08-14 22:24:05 +02:00
Daniel Gultsch
dad90762b4
do not touch pictures that are already in the right format
...
fixed #522
2015-08-11 16:50:00 +02:00
Daniel Gultsch
3677c6ec98
use same code that is used to open files for images
...
fixes #1323
2015-08-11 15:24:06 +02:00
Daniel Gultsch
c0dcf4a55a
changed color of 'whispered' prefix
...
fixes #1326
2015-08-11 15:13:17 +02:00
Daniel Gultsch
fd81491b05
put wake locks on out of band file transfers
2015-08-10 19:48:36 +02:00
Daniel Gultsch
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
Daniel Gultsch
b5e90850d8
provide more detailed error toasts for http file download
2015-08-10 12:15:14 +02:00
Daniel Gultsch
b7f00ddac3
fixed image preview in notfications for images that arrived over jingle
2015-08-08 17:19:40 +02:00
Daniel Gultsch
a6e00837af
decreased right hand side padding in contact keys
2015-08-08 14:09:02 +02:00
Daniel Gultsch
8b9b74ff7e
renamed multi-end / axolotl to OMEMO
2015-08-08 13:29:21 +02:00
Daniel Gultsch
efdf3b6c1c
removed dead code
2015-08-08 13:13:23 +02:00
Daniel Gultsch
cac577fa4e
don't request ack for iq stanzas before stream managment is initialized
...
fixes #1322
2015-08-08 10:26:36 +02:00
Andreas Straub
7437d0fe0c
Increase number of published prekeys for release
2015-08-07 12:30:39 +02:00
Daniel Gultsch
53ce5d223e
request server-ACKs for iq stanzas
2015-08-06 20:48:55 +02:00
Daniel Gultsch
6694af8fca
fail old/invalid iq stanzas on bind
2015-08-06 14:54:37 +02:00
Daniel Gultsch
5c0853f302
hide multi-end and otr encryption in conferences
2015-08-06 13:09:53 +02:00
Andreas Straub
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
Daniel Gultsch
a1c43d8fdf
added config.java variable to hide openpgp as an encryption method
2015-08-05 18:52:34 +02:00
Daniel Gultsch
e10e9942de
changed text selection color
2015-08-05 18:30:49 +02:00
Daniel Gultsch
c617cf6ef8
added Config.java varibale to lock account creation to specfic domain
2015-08-03 22:58:17 +02:00
Daniel Gultsch
9b91d0bf75
sync translations with transifex
2015-08-03 14:04:26 +02:00
Daniel Gultsch
a6bbe4d4ce
lets try jpeg for a while
2015-08-01 23:37:41 +02:00
Daniel Gultsch
2bf30bb296
temporarily renamed new encryption method to 'Multi-End' until a better name has been found
2015-08-01 23:36:59 +02:00
Daniel Gultsch
5529337da3
use content-type in http slot request and stick with during upload
2015-08-01 22:37:17 +02:00
Daniel Gultsch
f9dec7cf86
fixed calculated file size in http slot request
2015-08-01 22:23:58 +02:00
Andreas Straub
6cd9383e53
Let UNTRUSTED/UNDECIDED keys become INACTIVE
2015-08-01 18:30:11 +02:00
Daniel Gultsch
60cd307f73
enable axolotl encryption for jingle supported file transfers
2015-08-01 01:19:16 +02:00
Andreas Straub
6059b96456
Provide process function for key transport message
2015-07-31 23:28:09 +02:00
Andreas Straub
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
Andreas Straub
50b14434ee
Reformat code
2015-07-31 21:31:45 +02:00
Andreas Straub
5c421da1e1
Change to new wire protocol version
2015-07-31 21:31:45 +02:00
Daniel Gultsch
26ac7c9030
added missing carbon column message table create statement
...
fixes #1310
2015-07-31 13:08:35 +02:00
Daniel Gultsch
658919f239
improved 'next encryption' selection
2015-07-31 00:52:46 +02:00
Daniel Gultsch
5191e4ce95
removed expert setting to 'force encryption'. merged certifcate and encryption settings into same category
2015-07-31 00:51:30 +02:00
Andreas Straub
74ab36fda2
Fix session logic: enforce same type of encryption
2015-07-30 19:18:09 +02:00
Daniel Gultsch
1ed550b5c5
fixed some colors in message adapter
2015-07-30 12:40:50 +02:00
Daniel Gultsch
58d80f58be
use gcm for file encryption over http
2015-07-29 23:45:37 +02:00
Andreas Straub
b7c64cd19d
Reset lock color for non-axolotl messages
2015-07-29 20:25:14 +02:00
Andreas Straub
2b3bb02261
Highlight selected message's fingerprint in list
2015-07-29 20:21:37 +02:00
Andreas Straub
e07853ea62
Rerender message bubbles on encryption change
2015-07-29 20:10:21 +02:00
Andreas Straub
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
Andreas Straub
e10a6c5b87
Fix NPE: consider unknown keys UNDECIDED
2015-07-29 02:59:41 +02:00
Andreas Straub
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
Andreas Straub
a3991d59c9
Improve trust toggle responsiveness
...
Removed unnecessary UI refreshes, explicitly update UI where needed.
2015-07-29 02:59:41 +02:00
Andreas Straub
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
Daniel Gultsch
d9bdce0104
add new received message bubble drawable
2015-07-29 02:01:28 +02:00
Daniel Gultsch
17bc4fb6cd
show http downloaded images in notification
2015-07-29 01:57:08 +02:00
Daniel Gultsch
8f14d2bfbd
removed recursion in message.getMerged*()
2015-07-28 23:00:30 +02:00
Daniel Gultsch
8924c448d1
changed logging. (work around logcat null pointer
2015-07-28 22:26:29 +02:00
Daniel Gultsch
6b8e1ecb95
log reason for message failure
2015-07-28 14:44:11 +02:00
Daniel Gultsch
ff0c114cd6
set time on resend to current time
...
fixes #1298
fixes #919
2015-07-28 12:54:54 +02:00
Daniel Gultsch
9c94c9ad8f
rewrote dns fallback
2015-07-24 19:06:47 +02:00
Daniel Gultsch
e5fae429fa
call refreshUi directly
2015-07-24 14:43:13 +02:00
Daniel Gultsch
c32162c280
switch/case can't deal with null pointers
2015-07-23 14:02:25 +02:00
Daniel Gultsch
cd204d5931
show warning when trying to highlight users that have left the conference
2015-07-22 15:57:17 +02:00
Daniel Gultsch
f7634a85be
treat private, non-anonymous mucs like 1:1 chats notification wise
2015-07-22 15:31:00 +02:00
Andreas Straub
db05d26433
Always build own device session automatically
2015-07-22 15:03:52 +02:00
Daniel Gultsch
9c1c86ed44
add no-store to chat states
2015-07-22 14:17:02 +02:00
Daniel Gultsch
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
Daniel Gultsch
a1e63944a2
use 'interactive mode' when starting downloads from the context menu
2015-07-22 12:15:09 +02:00
Andreas Straub
c2813cea29
Hide regenerate keys button
...
Can re-enable it via Config.java setting
2015-07-22 01:00:20 +02:00
Andreas Straub
4c1c2892c7
Disable trust toggle completely for INACTIVE keys
2015-07-22 00:53:54 +02:00
Daniel Gultsch
456d4c8b23
made image file format configurable by Config.java
2015-07-21 23:49:35 +02:00
Daniel Gultsch
d38228f482
fixed npe in error message handling
2015-07-21 19:45:41 +02:00
Daniel Gultsch
f6281a182d
fixed npe in error message handling
2015-07-21 19:44:25 +02:00
Daniel Gultsch
0d679a7abb
decreased saturation of received message bubbles by 25 units
2015-07-21 18:29:24 +02:00
Andreas Straub
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
Andreas Straub
3c5c0c7d3b
Fill own device sessions into SessionMap
2015-07-21 14:24:59 +02:00
Daniel Gultsch
1aeb5874b0
allow for private messages being started from muc details in anonymous mucs
2015-07-21 13:15:59 +02:00
Daniel Gultsch
32f90613a3
and now do that properly
2015-07-21 12:02:15 +02:00
Daniel Gultsch
ffa588ba3e
and now do that properly
2015-07-21 12:01:20 +02:00
