Commit graph

5195 commits

Author SHA1 Message Date
Daniel Gultsch 81e9afdf19 reset next encryption when archiving conversations 2015-01-07 12:20:39 +01:00
Daniel Gultsch 943a01b9bf Merge branch 'development' of https://github.com/siacs/Conversations into development 2015-01-07 10:49:40 +01:00
Daniel Gultsch a7ee9cc41b Merge pull request #846 from kruks23/translation4
Update spanish translation
2015-01-07 10:28:37 +01:00
kruks23 a1a2a39108 Update affiliation in MUC details and advance mode 2015-01-07 08:50:19 +01:00
Sam Whited 312f95b73d Update travis config to use current build tools 2015-01-06 21:57:28 -05:00
Sam Whited 45bb59dba8 Add materials theme 2015-01-06 21:37:49 -05:00
Daniel Gultsch a22c8c04d8 use copyonwritearraylist in for phone helper 2015-01-07 01:01:15 +01:00
Daniel Gultsch d502e57661 refactored UiHelper 2015-01-07 00:59:42 +01:00
Daniel Gultsch c01e866965 Merge pull request #843 from svetlemodry/development
Czech translation for - show affiliation instead of role in MucDetails
2015-01-06 21:34:48 +01:00
Jaroslav Lichtblau 066f60a23c Czech translation for - show affiliation instead of role in MucDetails 2015-01-06 21:15:32 +01:00
Daniel Gultsch f02f510c18 fixed bug in new ping strategy 2015-01-06 19:46:52 +01:00
Daniel Gultsch 353f4e38bb mark sent images as sent_received instead of sent
fixed #842
2015-01-06 18:44:34 +01:00
Daniel Gultsch 8a3ccfd456 Merge pull request #841 from BenoitBouvarel/patch-2
Update strings.xml
2015-01-06 18:33:56 +01:00
Daniel Gultsch 562699c745 run invalidateOptionsMenu on uiThread 2015-01-06 18:26:14 +01:00
Daniel Gultsch 4b0043ba91 fixed potential NPEs in ShareWithActivity 2015-01-06 18:25:31 +01:00
Benoit Bouvarel 352af145f8 Update strings.xml
char ">" was missing at line 285
2015-01-06 01:23:51 +01:00
Benoit Bouvarel f8758b7bd5 Update strings.xml
French translation updated
2015-01-05 23:42:37 +01:00
Daniel Gultsch 777e060100 Merge branch 'development' of https://github.com/siacs/Conversations into development 2015-01-05 18:47:04 +01:00
Daniel Gultsch fdcbdfdc05 added debug info + possible platform bug work arounds to message adapter 2015-01-05 18:46:42 +01:00
Daniel Gultsch 0c51245ff5 reworked ping scheduling strategy. very experimental 2015-01-05 18:45:39 +01:00
Daniel Gultsch 85f24c9106 avoid requesting blocklist after stream resumption 2015-01-05 16:17:05 +01:00
Daniel Gultsch f2cc70c58c Merge pull request #840 from kriztan/patch-1
corrected German spellings
2015-01-05 16:09:25 +01:00
Christian Schneppe 47a8a39595 corrected German spellings
and shorten some strings
2015-01-05 15:59:21 +01:00
Daniel Gultsch 2679824770 prevent QR code parser from crashing fixed #839 2015-01-05 15:08:13 +01:00
Daniel Gultsch bdb335e6b0 Show affiliation instead of role in MucDetails and offer 'advanced mode' to display role 2015-01-05 15:06:39 +01:00
Daniel Gultsch 8264474a0c Merge pull request #838 from shtrom/pebble-notifications-squash
Send notification to Pebble on new message
2015-01-05 13:14:48 +01:00
Olivier Mehani f1ebece866 Send notification to Pebble on new message
This implements basic notifications to the Pebble through the app (using
an intent).  This simply hooks into NotificationService.notify().

This is pretty basic, but it works (I haven't tested to see how the
intent is received when the Pebble app is not around, though). More
fancy stuff could probably be added to avoid getting flooded, but the
Pebble app already does a good job a filtering notification (e.g.,
screen on or quiet times).

Signed-off-by: Olivier Mehani <shtrom@ssji.net>
2015-01-05 23:06:46 +11:00
Daniel Gultsch 07dc1627df Merge pull request #836 from kriztan/development
Updated languages ...
2015-01-05 13:05:25 +01:00
Christian Schneppe ddee804a01 Updated languages for higher auto accept file sizes and changed labeling to MiB and KiB 2015-01-05 12:46:13 +01:00
Daniel Gultsch 2723c9ccb9 made checks for valid image extensions case insensitive 2015-01-04 23:04:23 +01:00
Daniel Gultsch 3522243835 do not run mam queries in findOrCreateConversation() when isn't available 2015-01-04 18:16:55 +01:00
Daniel Gultsch e6cd92a663 added higher auto accept file sizes
also changed labeling to MiB and KiB
2015-01-04 17:53:06 +01:00
Daniel Gultsch d7ac9b88cf Merge branch 'development' of https://github.com/siacs/Conversations into development 2015-01-04 17:23:51 +01:00
Daniel Gultsch 0c804af1bc added travis build icon to README 2015-01-04 17:23:34 +01:00
Daniel Gultsch 4f34a8f73f Merge pull request #833 from SamWhited/travis
Add travis config
2015-01-04 17:13:42 +01:00
Sam Whited 92f4b7161b Add travis config 2015-01-04 10:43:15 -05:00
Daniel Gultsch 0d6d09b7e9 code cleanup + logging of spoofed iq packets 2015-01-04 15:40:09 +01:00
Daniel Gultsch d64496eab6 Merge pull request #823 from SamWhited/issue20
Verify IQ responses
2015-01-04 15:05:24 +01:00
Sam Whited 88704ce5cd Verify IQ responses
Fixes #20

Move fromServer/toServer to AbstractStanza
2015-01-04 08:28:13 -05:00
Sam Whited eb7e683403 Make IqPacket type an enum 2015-01-04 08:20:30 -05:00
Daniel Gultsch 00fdac42a9 Merge pull request #832 from svetlemodry/development
Czech translation update
2015-01-04 12:45:48 +01:00
Jaroslav Lichtblau 3a4fbcd4cc Czech translation update 2015-01-04 12:43:32 +01:00
Daniel Gultsch 5c190487bc deal with prosodys muc namespace tagging of messages 2015-01-04 12:37:22 +01:00
Daniel Gultsch e32a927300 Use packet callbacks only for IqPackets. Removed unnecessary code 2015-01-04 12:09:39 +01:00
Daniel Gultsch 51f5b84ee4 Merge pull request #829 from kriztan/patch-1
corrected German 'private_message_to'
2015-01-04 11:28:38 +01:00
Daniel Gultsch 404b8e103e Merge pull request #830 from kruks23/translation4
Update spanish translations
2015-01-04 11:28:31 +01:00
sergio c674e9c3e9 Update spanish translations 2015-01-04 11:24:53 +01:00
kriztan b739a0d200 corrected German 'private_message_to' 2015-01-04 11:16:21 +01:00
Daniel Gultsch f338d89753 no longer use ConcurrentHashMap in favor of synchronize on a final HashMap 2015-01-04 00:14:40 +01:00
Daniel Gultsch 4f4eff2353 Merge branch 'development' 2015-01-03 22:39:50 +01:00