narayana/anotherim
narayana/anotherim
3
2
Fork 0
Code Issues 3 Pull requests 2 Actions Packages Projects Releases 4 Wiki Activity
7563 commits 6 branches 4 tags 61 MiB
Commit graph

671 commits

Author SHA1 Message Date
Daniel Gultsch 94bb7c423c added splash screen 2018-03-07 22:30:36 +01:00
Daniel Gultsch 6aee638432 refactor disable notifications dialog to make use of timeframeutils 2018-03-07 22:30:36 +01:00
Daniel Gultsch 89992f541c calculate automatic timeout labels dynamically 2018-03-07 22:30:36 +01:00
Daniel Gultsch 78fd19195d finished 'Set Status Message' dialog 2018-03-07 22:30:36 +01:00
Daniel Gultsch 57bcf824e9 finished app compat themeing 2018-03-07 22:30:36 +01:00
Daniel Gultsch 97f728351b fixed highlighted caption style 2018-03-07 22:30:35 +01:00
Daniel Gultsch 157ca65b0a use text styles in more places 2018-03-07 22:30:35 +01:00
Daniel Gultsch a283d00013 request camera permissions when attaching taking picture or recording video 2018-03-07 22:30:35 +01:00
Daniel Gultsch 71beb92dd3 migrated some views over to app compat text styles 2018-03-07 22:30:35 +01:00
Daniel Gultsch 3130d40262 changed some of the jid entering dialogs to textinputlayout 2018-03-07 22:30:35 +01:00
Daniel Gultsch 9d15d3b408 introduced expert setting to not scroll down after sending a message 2018-03-07 22:30:35 +01:00
Daniel Gultsch ac22007e28 removed 'preemptive grant' setting 2018-03-07 22:30:35 +01:00
Daniel Gultsch b393f54a03 get rid of customizable resources 2018-03-07 22:30:35 +01:00
Daniel Gultsch 521a711fbc use cards views in about and publish avatar activity 2018-03-07 22:30:35 +01:00
Daniel Gultsch acc47fbeda add scan action to contact details 2018-03-07 22:30:35 +01:00
Daniel Gultsch dfb4e4eb46 integrate qr code scanner. temporarily break omemo activity scan 2018-03-07 22:30:35 +01:00
Daniel Gultsch 5f502e908e replace camera action bar icon with scan qr button 2018-03-07 22:30:35 +01:00
Daniel Gultsch b0bec2c390 added dedicated scan button 2018-03-07 22:30:34 +01:00
Daniel Gultsch 354b182968 made swipe and select work 2018-03-07 22:30:34 +01:00
Daniel Gultsch 1b8a437b1e create dedicated button to enable undecided accounts 2018-03-07 22:30:33 +01:00
Daniel Gultsch b9f6b792a9 fixed paddings 2018-03-07 22:30:33 +01:00
Daniel Gultsch 0262975635 started to change text style to app compat 2018-03-07 22:30:33 +01:00
Daniel Gultsch 5ebcb1ae71 ported presence activity to cardview 2018-03-07 22:30:33 +01:00
Daniel Gultsch 22a722c06d change image button background 2018-03-07 22:30:33 +01:00
Daniel Gultsch 1307cfe728 switch to switchcompat 2018-03-07 22:30:33 +01:00
Daniel Gultsch de0272fd1a integrate trust manager into conversations 2018-03-07 22:30:33 +01:00
Daniel Gultsch 9d25ecc21b remove pre api 21 theme 2018-03-07 22:30:33 +01:00
Marc Schink 8713fc8a06 Use 'Jabber' instead of 'XMPP' in the welcome message 2018-02-22 22:04:03 +01:00
Daniel Gultsch 4541ac8b7b direct link from settings to huaweis protected apps 2018-01-28 13:31:12 +01:00
Daniel Gultsch 3e9224bde9 add snooze button to notification 2018-01-28 13:14:30 +01:00
Daniel Gultsch 0dbad2eea5 updated year in copyright info 2018-01-23 22:01:56 +01:00
Daniel Gultsch 6663eb0a12 show warning toast if PM is disabled in MUC 2018-01-18 17:35:42 +01:00
daivat15 de23b37ee2 Gradle Update to 3.0.1 with aapt 
Gradle Update to 3.0.1 with aapt

Gradle Update to 3.0.1 with aapt fix try
 2018-01-11 18:30:09 +05:30
Daniel Gultsch ccf75ef45a removed 'contact-only' hint from publish avtar screen 2017-12-15 21:47:16 +01:00
Daniel Gultsch 6a9abd0e49
Merge pull request #2720 from af8a524db1/uri_message 
Handle 'message action' XMPP URIs
 2017-12-15 16:17:05 +01:00
Daniel Gultsch 60ae269870 removed password repeat field in favor of show password field 2017-12-15 02:51:54 +01:00
Marc Schink edf3c41e58 Add ShareViaAccountActivity 2017-12-12 17:15:16 +01:00
Daniel Gultsch 946d97074f try to detect invalid nick (w/ emoji) in MUCs 2017-12-11 15:55:10 +01:00
Daniel Gultsch 9bdaeb340b fix format string 2017-12-09 10:42:24 +01:00
Daniel Gultsch 03c34649b4 shorten >4 names to a, b, c +n more 2017-11-22 17:57:28 +01:00
Daniel Gultsch 28e005f926 send and show read markers in private, non-anonymous groups 2017-11-20 11:26:20 +01:00
licaon-kter 1cc8a446f0
Fix typo 2017-11-16 17:02:14 +02:00
Daniel Gultsch 3dbe5db44b Rename 'conference' to 'group chat' 2017-11-16 13:30:27 +01:00
Daniel Gultsch 949d3280d3 open links in new tabs 2017-11-09 20:49:44 +01:00
Daniel Gultsch e5210bbaa0 brought back 'copy to clipboard' and 'quote' context menu options 2017-11-07 15:58:27 +01:00
Daniel Gultsch 3205d763cf MessageAdapter: Display emojis slightly larger in text 2017-10-28 13:15:31 +02:00
Dennis Schridde 87b1cc6b38 Fix typo in error_no_keys_to_trust_server_error 
Contact should be genitive (contact's), not plural (contacts)
 2017-09-30 16:30:12 +02:00
Daniel Gultsch 9b4149a63d limit audio player width on small screens 2017-09-27 10:21:34 +02:00
Daniel Gultsch 20b14091d6 play audio files inline 2017-09-20 15:35:35 +02:00
Daniel Gultsch 0603378c75 show permanent notification while transcoding video 2017-09-18 17:56:25 +02:00
Daniel Gultsch d4c16b5a85 added dedicated 'record video' attachment button. fixes #2592 
thank you @BlauerHunger
 2017-09-18 11:51:47 +02:00
licaon-kter 200fda141b Cleanup some unused strings 2017-09-09 18:58:21 +03:00
Daniel Gultsch 5cc92acbee use 'partial' in server info if publish-options is n/a 
fixes #2621
 2017-09-09 13:34:51 +02:00
Daniel Gultsch 57ca77aa0c (re)enable message correction by default 2017-09-06 08:38:14 +02:00
Daniel Gultsch ccb47c5727 get rid of uneccessary 'own omemo fingerprint' string. fixes #2599 2017-08-28 18:15:39 +02:00
Daniel Gultsch e0fa820436 improved error messages on missing omemo keys 2017-08-21 14:08:20 +02:00
Daniel Gultsch 1383d3d2e4 fixed regression that set the autojoin default to false 2017-08-18 13:43:24 +02:00
Daniel Gultsch 4a43df8c97 do not crash on some very rare logging 2017-08-07 15:55:56 +02:00
Daniel Gultsch 225cca4566 provide extra 'network is unreachable' account state 2017-08-02 18:58:51 +02:00
Daniel Gultsch 82c5924434 display messages that only contain emoji slightly larger 2017-07-30 22:04:58 +02:00
Daniel Gultsch abf84e065d made DNSEC hostname validation opt-in 2017-07-10 09:59:25 +02:00
Daniel Gultsch ef980ff5cf show date separators. fixes #2271 2017-07-04 11:01:20 +02:00
Daniel Gultsch 311c99bb6d put settings defaults into resource file 2017-06-30 21:22:35 +02:00
Daniel Gultsch 59e39304dd use DND instead of XA when phone is silent 2017-06-27 12:24:26 +02:00
Ferdinand Pöll f8e031ac86 Added preference to control Heads-up Notifications (turned off by default) 2017-06-24 15:38:16 +02:00
Daniel Gultsch 5d9d725446 offer to open website if ibb offers oob redirect. fixes #2503 2017-06-19 20:02:41 +02:00
Daniel Gultsch 012f60be56 use proper alpha for dark themed icons 2017-06-04 00:05:02 +02:00
Daniel Gultsch 7b271bcf67 pulled translations from transifex 2017-05-31 11:38:16 +02:00
Daniel Gultsch fe29b51290 rename downgrade attack to downgraded sasl mechanism 2017-05-24 19:12:37 +02:00
Daniel Gultsch 7b6d49f329 unified all account state exceptions 2017-05-05 09:33:05 +02:00
Daniel Gultsch f98888d796 display open pgp key id in account details and allow to delete. fixes #2470 2017-05-04 13:02:46 +02:00
Daniel Gultsch ef78721f94 fixed regression from previous commit and brought back 'select text' 2017-05-02 10:42:50 +02:00
Daniel Gultsch 7c31a981bb unified copy text and share with context menu entries 2017-04-30 21:03:44 +02:00
participante0 48e3726071 Update strings.xml 
Added a comma.
 2017-04-25 18:06:03 -03:00
Sam Whited 4a915c60e9 Add content description to send button 
This can be used by screen readers and other accessibility aids.
 2017-04-16 16:37:32 -05:00
Daniel Gultsch 76b9010c39 rework last activity logic to something that should work pretty well in Conversations only enviroments 2017-03-20 17:58:58 +01:00
Daniel Gultsch c2c6904eda offer to block entire domain in message from stranger snackbar. fixes #2391 2017-03-20 12:55:48 +01:00
Daniel Gultsch 1fd3bbfe25 display chat states in conferences 2017-03-09 10:58:44 +01:00
Daniel Gultsch 5fae9465d1 show snackbar in conversations with stranger to block. fixes #2358 2017-03-07 11:07:57 +01:00
Daniel Gultsch 7306e0286f do not notify for messages from strangers by default 2017-03-07 10:50:46 +01:00
Daniel Gultsch 79b2f34685 added colon to seperate sender and message preview. only show first name 2017-03-06 19:42:27 +01:00
Daniel Gultsch 1c56b74e41 closing the corresponding conversations after blocking a contact. fixes #2347 2017-03-06 16:53:54 +01:00
Daniel Gultsch bb7780eae6 Merge branch 'issue_#2336' of https://github.com/vikiCoder/Conversations into vikiCoder-issue_#2336 2017-03-05 08:48:01 +01:00
Daniel Gultsch b0ada55b28 use min width of 32dp for swipe handle 2017-03-04 21:20:39 +01:00
vikiCoder 72537b76c5 fixes #2336 : added an option to directly add a jid to block list from blocklist activity 2017-03-05 01:01:41 +05:30
Daniel Gultsch b86dd584dc made swipe handle more unified and smaller across various screen sizes 2017-03-04 15:07:25 +01:00
Haresh Khanna f2d2966b31 Squash : Adds number of unread messages for every conversation. Fixes #2181 2017-03-04 04:26:19 +05:30
Daniel Gultsch 768d79c621 Merge branch 'issue_#1200' of https://github.com/vikiCoder/Conversations into vikiCoder-issue_#1200 2017-03-03 12:01:00 +01:00
Daniel Gultsch 469cf72e56 make notification icon size depend on 'Large Text' setting 2017-03-03 11:55:07 +01:00
vikiCoder 51ef096e01 fixes #1200 : Added icons for the attach options according to material design guidlines 2017-03-03 16:01:44 +05:30
Daniel Gultsch 8cce653a1f changed default setting for enter_is_send on devices with keyboard 2017-03-02 13:03:30 +01:00
Daniel Gultsch c37117b940 update copyright information 2017-02-07 19:31:54 +01:00
Daniel Gultsch e459616123 fixed wording for not getting messages from server 2017-02-07 14:03:48 +01:00
Daniel Gultsch 66457c9f2e transcode videos before sharing. change storage location 2017-01-24 20:17:36 +01:00
Daniel Gultsch 9b6ae6d75f configurable local message retention period. (untested) 2017-01-23 17:14:30 +01:00
Daniel Gultsch 1dcf804618 fixed pgp encrypted text quick sharing. fixes #2237 2017-01-17 15:56:21 +01:00
Daniel Gultsch bfacc180c5 don't allow to purge keys. offer distrut instead 2017-01-12 15:59:13 +01:00
Daniel Gultsch 8c34bb3c6f hide inactive devices by default in contact details 2016-12-30 13:17:45 +01:00
Daniel Gultsch 1e7b4030bb show jid monospaced in verify dialog 2016-12-04 13:39:08 +01:00
Daniel Gultsch 6e289b8738 show warning dialog beforing verifying keys via a link 2016-12-03 13:19:56 +01:00
Daniel Gultsch 599f7dad2c Merge branch 'feature-quotation' of https://github.com/Mishiranu/Conversations into Mishiranu-feature-quotation 2016-12-02 14:01:26 +01:00
Daniel Gultsch 6b0242523b Merge branch 'master' of https://github.com/Fenisu/Conversations into Fenisu-master 2016-12-02 11:25:14 +01:00
Daniel Gultsch 84a2fa0041 allow fingerprint verification via context menu 2016-11-28 15:11:44 +01:00
Mishiranu f4a769080b Add quotation support 2016-11-25 17:06:43 +03:00
Daniel Gultsch f36dff485e changed blind trust before verification summary to a slightly longer one 2016-11-24 19:59:57 +01:00
Daniel Gultsch cbd45d3ee5 changed design language to match BTBV proposal 
* untrusted messages have red background
* unverified message have normal background and red lock
 2016-11-24 11:29:26 +01:00
Daniel Gultsch 839ef8e14b introduced blind trust before verification mode 
read more about the concept on https://gultsch.de/trust.html
 2016-11-23 10:42:27 +01:00
Daniel Gultsch 4720ac94d3 Merge branch 'master' of github.com:siacs/Conversations 2016-11-22 22:32:05 +01:00
Daniel Gultsch 07fe434cc7 added share button to account details 2016-11-22 22:31:46 +01:00
Daniel Gultsch d76b0a3104 offer verification directly from the trust keys screen 2016-11-22 12:03:21 +01:00
Daniel Gultsch 1a7e0fd153 use aztec code instead of qr 2016-11-21 12:01:01 +01:00
Daniel Aleksandersen 965f73f95a Fix up the langauge in some Settings strings 2016-11-19 05:00:16 +01:00
Daniel Gultsch 7e2e42cb11 parse omemo fingerprints from uris 2016-11-17 20:09:42 +01:00
Daniel Gultsch 48afeb571b refactor omemo fingerprint UI code 2016-11-15 20:00:52 +01:00
Ignacio Quezada 297c0a792f Private files using a boolean flag from Config.java. 2016-11-08 11:45:20 +01:00
licaon-kter d341904c4d Fix typo 2016-11-08 01:46:46 +02:00
Daniel Gultsch 9edbddd7e1 show warning in account details when data saver is enabled 2016-11-07 10:49:43 +01:00
Daniel Gultsch 8557120ef8 add error message to failed messages. accessible via context menu 2016-10-26 12:26:04 +02:00
Daniel Gultsch f8c21caec9 Merge branch 'feature-selection' of https://github.com/Mishiranu/Conversations into Mishiranu-feature-selection 2016-10-17 09:53:32 +02:00
Daniel Gultsch 2a73b8d76e clarified fineprint a little bit 2016-10-13 12:17:20 +02:00
Daniel Gultsch 74087b873f added disclaimer that conversations.im account is 8 euro / year 2016-10-08 18:24:20 +02:00
Daniel Gultsch 187825d6c6 warn user if account is offline during avatar publication 2016-10-06 22:06:09 +02:00
Daniel Gultsch 5ac0e9267d fixed omemo shown as unavailable in 1:1 chats 2016-10-03 21:04:10 +02:00
Daniel Gultsch b0fb9fd9ee added nick to conference jid example 2016-09-28 13:20:52 +02:00
Daniel Gultsch f0dbcce58f expert 'setting' to remove omemo identity. fixes #2038 2016-09-28 12:24:50 +02:00
Daniel Gultsch 7eac903277 add support for XEP-0377: Spam Reporting 2016-09-18 23:21:05 +02:00
Daniel Gultsch 6b904d4de1 use proper paddings in dialogs on android < 5 2016-09-18 20:09:39 +02:00
Mishiranu 3e6747c880 Add "Select text" context menu option 2016-09-17 01:18:34 +03:00
Daniel Gultsch ac9f13a9f2 provide hint on why conference can not be encrypted 2016-09-08 11:01:27 +02:00
Daniel Gultsch 416481bb65 be a bit more careful when deleting and deactivating accounts 2016-09-07 14:34:58 +02:00
Daniel Gultsch e1d2c32e63 show server not found muc error 2016-09-06 12:15:08 +02:00
Daniel Gultsch 1dc55f72e3 don't use fileprovider when opening files on android M and below 2016-09-04 22:59:40 +02:00
Daniel Gultsch 76cbb4f727 some multi-window optimizations. set min width to 300 2016-08-26 16:05:38 +02:00
Daniel Gultsch f931c08da7 add snackbar for request presence subscription 2016-08-26 10:19:59 +02:00
Daniel Gultsch 542626758d use N style stacked notifications 2016-08-25 15:20:06 +02:00
Daniel Gultsch 285d86b375 display error status for missing internet permission 2016-08-19 21:47:08 +02:00
Daniel Gultsch 2a139a4b47 Merge pull request #1987 from licaon-kter/patch-2 
Make 'export log' option function clearer
 2016-08-16 10:49:04 +02:00
Daniel Gultsch b5d3859b22 add payment required error 2016-08-16 10:39:59 +02:00
licaon-kter 81b0f60860 Clear export option function 2016-08-11 21:07:25 +03:00
Daniel Gultsch 0e96e0a796 show identity type for device selection 2016-07-28 22:58:37 +02:00
Daniel Gultsch 3409399ef1 display specific error message when password is too weak on registration 2016-07-25 15:57:47 +02:00
Daniel Gultsch 3e50d4831f show toast hint when touching inactive omemo fingerprints 2016-07-17 20:31:04 +02:00
Daniel Gultsch 1db85e582e add more error states for stream errors 2016-07-14 17:05:43 +02:00
Daniel Gultsch 48a7818e88 mark used otr fingprint in contact details and highlight pgp 2016-06-16 12:12:24 +02:00
Daniel Gultsch 587fb3cca3 refactored pgp decryption 2016-06-13 13:32:14 +02:00
Daniel Gultsch 5017e8564c made background color of swiped conversations darker 2016-06-10 23:22:16 +02:00
Daniel Gultsch a70f57358e use darker green as background for chat bubbles in dark theme 2016-06-10 22:39:02 +02:00
Daniel Gultsch 4bf9a1e809 use darker colors for actionbar on dark theme 2016-06-10 20:15:09 +02:00
Daniel Gultsch 33a02faad9 fixed spelling in last activity summary 2016-06-08 21:36:29 +02:00
Steffen Keiper 7932244c51 Dark theme, theme switch, icons, style, strings 
added some white icons,
changed hardcoded icons to theme attributes,
changed icon_edit_dark to icon_edit_body to reflect icons position,
grey message bubbles in dark theme,
misc

purged ic_action_chat as it wasn't used

preference use_white_background changed to use_green_background, default true

grey chat bubbles darker, text white

replaced all grey600 with black icons and 0.54 alpha attribute

highlightColor in dark grey chat bubble now darker than background
 2016-06-08 20:07:40 +02:00
Daniel Gultsch 794353ad0c renamed last activity to last user interaction 2016-06-04 22:37:14 +02:00
Daniel Gultsch 71e9117176 opt-in to send last userinteraction in presence 2016-06-04 16:16:14 +02:00
Andreas Straub 17c62b5991 Fix typo 2016-06-03 18:16:44 +02:00
Daniel Gultsch 583aba1b44 print specific toast when download failed because of write error 2016-06-02 21:37:52 +02:00
Daniel Gultsch 25211f13b3 make grace period configurable 2016-06-02 00:24:37 +02:00
Daniel Gultsch 24ea66c9fc display invite again menu item for offline members 2016-06-01 00:12:14 +02:00
Daniel Gultsch 29bd1103c0 refactored toasts shown when adhoc creating mucs 2016-05-27 20:05:40 +02:00
Daniel Gultsch 21ebb35e44 add 'create conference' dialog 2016-05-26 22:53:55 +02:00
Daniel Gultsch c4e82eb3f8 change hint in edit subject dialog 2016-05-26 12:39:04 +02:00
Daniel Gultsch 83adbb6052 hide fingerprints in UI if encryption is disabled 2016-05-25 22:12:13 +02:00
Daniel Gultsch b69ab65b12 show regitration failed try again later in UI 2016-05-24 13:26:30 +02:00
Daniel Gultsch ef27055434 show password dialog when account was magic created 2016-05-19 10:46:19 +02:00
Daniel Gultsch 8d0693ed6a keep conference members in memory and show them in conference details 2016-05-16 19:58:36 +02:00
Daniel Gultsch 7113e21a43 use 'phone' or 'tablet' as default resource 2016-05-12 18:47:41 +02:00
Daniel Gultsch 549be9bb3d report host-account as account state in UI 2016-05-10 10:29:02 +02:00
Daniel Gultsch a7cd05bd4e report bind failure as account state 2016-05-05 20:22:47 +02:00
Daniel Gultsch 6e0ec9b924 republish pgp signature when changing status 2016-05-05 13:17:04 +02:00
Daniel Gultsch 16eb1bfbd0 pulled translations from transifex 2016-05-04 13:19:07 +02:00
Daniel Gultsch fad8b702aa use app name in resource suggestions 2016-05-03 12:41:37 +02:00
Daniel Gultsch d5608cb4f3 catch ActivityNotFoundException when requesting battery op 2016-04-29 13:58:37 +02:00
Daniel Gultsch 51753a1d39 cleaned up captcha dialog 2016-04-28 20:13:58 +02:00
Daniel Gultsch e6b526230a renamed welcome header to untranslatable 'Start your Conversations' 2016-04-27 09:59:25 +02:00
Daniel Gultsch 9c3e910dc4 prevent user from accidentally changing password after using magic create 2016-04-26 23:23:48 +02:00
Daniel Gultsch 1901abd05f expert setting to manually change presence 2016-04-22 21:25:06 +02:00
Daniel Gultsch 1a073ca454 added magic create welcome screen 2016-04-19 18:03:24 +02:00
Daniel Gultsch 72aa10b536 add setting for quick sharing 2016-04-14 21:12:44 +02:00
Daniel Gultsch 3e654bea0e added share uri button to conference details 2016-04-12 18:30:02 +02:00
Daniel Gultsch 83fab06508 introduced setting to turn of notification led 2016-04-09 21:48:06 +02:00
Daniel Gultsch 0460702710 check file owner when attaching files or using them as avatar 2016-04-07 20:29:40 +02:00
Daniel Gultsch a9b66e3ea5 allow to delete attachments. fixes #1539 2016-03-23 19:23:22 +01:00
Daniel Gultsch 48be5af55f reworked sharewith activity to stay open during sharing 
closing the activity prematuraly caused uri permissions to be revoked
 2016-03-16 10:46:33 +01:00
Daniel Gultsch 86fff5839a warn in conversations when account is disabled 2016-03-06 12:16:29 +01:00
Daniel Gultsch e9b4a2a021 show host in file size checker 2016-03-04 21:30:34 +01:00
Daniel Gultsch aa24a0f779 don't automatically crop avatar 2016-03-04 14:32:38 +01:00
Daniel Gultsch aaf64732b0 expert option to treat vibrate as silent mode for XA. fixes #1530 2016-03-01 19:00:18 +01:00
Daniel Gultsch 198dc2c6b4 let users confirm each member in a conference even if that contact is already trusted 2016-03-01 11:26:59 +01:00
Daniel Gultsch bbede8bbeb optionally lock conference domains as well and hide known domains in ui 2016-02-24 16:53:19 +01:00
fiaxh 894b5892a9 Retry decryption from message menu 2016-02-23 16:05:42 +01:00
Daniel Gultsch a0d0ed34ae turned muc errors into enum. added error codes for service shutdown 2016-02-22 20:19:58 +01:00
Daniel Gultsch 349dd8291d made clear that archiving preferences are server side 2016-02-16 12:52:31 +01:00
Daniel Gultsch a9b957e8a2 added setting to opt-out of message correction. renamed preferences and options to settings 2016-02-16 09:57:59 +01:00
Daniel Gultsch c0b3a3ff0c basic support for XEP-0308: Last Message Correction. fixes #864 2016-02-15 23:15:04 +01:00
Daniel Gultsch 32da65f910 client side support for XEP-0357: Push Notifications 2016-02-12 11:39:27 +01:00
Daniel Gultsch f16690ae1f allow user to set MAM preferences 2016-02-09 13:01:17 +01:00
Daniel Gultsch 4fdb0d92fe prevent previoulsly cleared messages from reloading. fixes #1110 2016-02-04 14:39:16 +01:00
Daniel Gultsch 1e7647e385 opt out handling of the autojoin flag. fixes #1666 2016-02-01 13:54:08 +01:00
Daniel Gultsch a3e11415ec refactored user handling in conferences. show try again button when conference has errors 2016-02-01 12:11:40 +01:00
Daniel Gultsch 7c0eae8059 expert setting to trigger extended connection options 2016-01-25 21:17:53 +01:00
Daniel Gultsch 8850a1fbe3 added FormWrapper and form field validation 2016-01-23 20:32:00 +01:00
Daniel Gultsch 77c0fb0b2a changed spacing in create dialogs and notify user when no accounts are activated 2016-01-22 11:14:56 +01:00
Daniel Gultsch d85854b686 show toast when image cropper get oom 2016-01-15 23:47:16 +01:00
Daniel Gultsch 14428da108 show key fetch error in activity when there are no keys to be used 2016-01-13 12:19:56 +01:00
Sam Whited a6b729df43 s/TOR/Tor/g 2016-01-12 15:41:39 -06:00
Daniel Gultsch da6076028f Revert "Add additional warnings to OMEMO purge key function" 
This reverts commit 3bea5b25cd.
 2016-01-12 09:48:49 +01:00
Andreas Straub 3bea5b25cd Add additional warnings to OMEMO purge key function 
People continue to press the "don't press this" button. Maybe adding
some warnings indicating that this button will not fix their problems
will help...
 2016-01-12 09:33:54 +01:00
Daniel Gultsch 7f1de73784 don't use the word phone in strings 2016-01-11 15:34:26 +01:00
Daniel Gultsch c296d6f446 ask to be excluded from battery optimization 2016-01-11 11:17:45 +01:00
Daniel Gultsch 4ab8fe13de let the user decide on whether or not to compress pictures 2016-01-09 16:17:39 +01:00
Daniel Gultsch 9dce42ac7f don't show snackbar when notifications are disabled or paused 2016-01-08 21:35:20 +01:00
Daniel Gultsch a3e136b550 show per conference notification settings in details activity 2016-01-08 21:30:46 +01:00
Daniel Gultsch 501034fe0e Allow entering a JID from 'choose contact'. thanks @singpolyma 
fixes #1611
fixes #1602
 2016-01-04 17:27:54 +01:00
Daniel Gultsch c40372fc0d code cleanup 2015-12-23 22:30:14 +01:00
Daniel Gultsch f46cbb38a9 show certificate information 2015-12-23 19:18:53 +01:00
Daniel Gultsch ac06cb2e4f modified contact permission dialog 2015-12-07 13:24:41 +01:00
Daniel Gultsch 739648e909 ask for contact permissions when first opening StartConversationActivity 2015-12-07 13:24:41 +01:00
Daniel Gultsch c3e8fb3446 request storage permission when needed on Android 6.0 2015-12-07 13:24:41 +01:00
Daniel Gultsch 739a2d609d implement direct sharing in android 6.0. fixes #1321 2015-12-07 13:24:41 +01:00
Daniel Gultsch 3553b15c9f renamed x509 verified omemo to v\OMEMO 2015-12-02 17:24:56 +01:00
Daniel Gultsch 0eaf7669f7 Merge pull request #1545 from SamWhited/show_new_contact_request_messages 
Show status message when contact requests presence
 2015-12-02 16:38:08 +01:00
Philip Flohr 0329c9c738 users are now able to crop their avatar pictures using the android-crop 
library
 2015-12-02 14:25:20 +01:00
Daniel Gultsch 8455e5b5dd hide message content in notifications in paranoia mode 2015-12-02 12:54:55 +01:00
Sam Whited e1aeb376ac s/.../…/ in default strings 2015-12-01 21:59:44 -06:00
Daniel Gultsch 65b5504e68 introduce config.java variable to optionally show number of connected accounts in notification 2015-12-01 17:15:36 +01:00
Daniel Gultsch 2225b0b6d5 add error state for unavailable tor network 2015-12-01 12:00:50 +01:00
Daniel Gultsch f0b1761ec3 initial tor support 2015-12-01 12:00:50 +01:00
Daniel Gultsch baf76d883c indicate cbe in chat message hint 2015-10-31 22:55:04 +01:00
Daniel Gultsch bca29cf7fd explicitly mark verified omemo keys in UI 2015-10-31 10:57:57 +01:00
fiaxh 016a57f123 Show PGP "please wait" message only when actually decrypting 2015-10-28 20:57:15 +00:00
Daniel Gultsch 569b9f4e66 open manage account + certificate chooser when cbe mode is enabled 2015-10-20 15:27:33 +02:00
Daniel Gultsch a83aae341f improved error reporting in trust keys activity 2015-10-17 14:09:26 +02:00
Daniel Gultsch 4b93351f8f changed some source strings 2015-10-14 23:03:01 +02:00
Daniel Gultsch 212d1a8c91 add config variable to enable x509 verification 2015-10-12 13:18:20 +02:00
Daniel Gultsch 7be331bbb2 add menu item in account details to renew certificate 2015-10-11 16:10:52 +02:00
Armin Novak 6a6cb43b17 Captcha support. 2015-10-11 13:11:50 +02:00
Safwat Halaby 08174e3b05 Fixed a typo in string.xml 2015-10-10 12:03:25 +03:00
Daniel Gultsch b23cb5a9e4 initial UI work to allow setting up accounts from certifcates 2015-10-09 13:37:08 +02:00
Daniel Gultsch 52a5e72b02 introduced expert options to set status to away and xa if screen is off or if phone is silenced 2015-10-08 00:35:04 +02:00
fiaxh a3a13dd9dc Export logs to SD card preference 2015-09-21 18:53:29 +01:00
Daniel Gultsch 96575d6290 added possibiltiy to set conferences as moderated (only visible in advanced mode) 2015-09-13 17:13:46 +02:00
Daniel Gultsch eff173ebc2 indicate broken pep in server info 2015-09-06 19:40:28 +02:00
Daniel Gultsch fc594e249a added special error state for dns timeout 2015-09-01 22:37:52 +02:00
Daniel Gultsch cb70df7a34 added XEP number for http file upload 2015-08-27 19:18:35 +02:00
Daniel Gultsch eff9e417e0 use dedicated colors for primary and primary_dark 2015-08-26 21:17:29 +02:00
Daniel Gultsch 730a5c644b renamed plain text to unencrypted. fixes #1331 2015-08-24 21:15:47 +02:00
Daniel Gultsch fb0b4bb445 added setting to allow for white backgrounds in incoming message bubbles 2015-08-24 20:56:25 +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
hlad 4539643f27 show HTTP upload availability on Edit account screen 2015-08-14 22:24:05 +02:00
Daniel Gultsch b5e90850d8 provide more detailed error toasts for http file download 2015-08-10 12:15:14 +02:00
Daniel Gultsch 8b9b74ff7e renamed multi-end / axolotl to OMEMO 2015-08-08 13:29:21 +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 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 5191e4ce95 removed expert setting to 'force encryption'. merged certifcate and encryption settings into same category 2015-07-31 00:51:30 +02:00
Daniel Gultsch 1ed550b5c5 fixed some colors in message adapter 2015-07-30 12:40:50 +02:00
Andreas Straub 2b3bb02261 Highlight selected message's fingerprint in list 2015-07-29 20:21:37 +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 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
Daniel Gultsch 1aeb5874b0 allow for private messages being started from muc details in anonymous mucs 2015-07-21 13:15:59 +02:00
Andreas Straub ab2d114bbc Add purge axolotl key option 
Can now long-press a key to permanently purge it.
 2015-07-20 22:18:24 +02:00
Daniel Gultsch dcf9117451 changed sizes of avatars and padding in new message bubbles 2015-07-20 16:02:18 +02:00
Raphael Pohl e6cb12dfe4 changed message bubble appearance 2015-07-20 16:02:17 +02:00
Andreas Straub 576330f6a9 Use MD style for key trust toggle switch 2015-07-20 14:14:27 +02:00
Andreas Straub 480b1cde81 Add clear devices to overflow menu in EditAccount 2015-07-19 23:35:03 +02:00
Andreas Straub 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
Andreas Straub 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
Andreas Straub 3d33946088 Add key trust toggle to ContactDetailsActivity 
Can now toggle IdentityKey trust
 2015-07-19 22:23:27 +02:00
Andreas Straub 2628662a7f Display axolotl chat message hint 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
Andreas Straub 077932eb55 CryptoNext Menu entries added 2015-07-19 21:32:25 +02:00
Daniel Gultsch f58b2afcaa changed switch widget 2015-07-18 19:38:52 +02:00
Daniel Gultsch 4f62793a67 version bump to 1.5.0-beta.2 2015-07-16 14:27:36 +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 ffffca10f0 renamed colors 2015-07-13 12:55:13 +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 f5ba9d4223 refactored message context menu 2015-07-02 23:13:00 +02:00
Daniel Gultsch 997b11dbec added choose picture as another quick action. fixes #1221 2015-05-26 05:34:58 +02:00
Daniel Gultsch 1e28f60038 changed conversation red to material red 2015-05-10 03:14:13 +02:00
Daniel Gultsch 53fea9e1fe replace send button with quick action button as long as no text has been entered 2015-05-02 11:38:56 +02:00
Daniel Gultsch 92d14c4a00 increased padding on image buttons on v21 to match material guidelines 2015-04-28 14:46:52 +02:00
BrianBlade da367dd752 Add option to remove manually approved certificates 
- "Remove certificates" option brings up a dialog that allows
  to delete certificates from MemorizingTrustManager's keystore
- Reconnect active accounts when certificate-settings are changed
- new preference category "Certificate options"
 2015-04-19 18:08:13 +02:00
iNPUTmice defb127d6e Merge branch 'dont_trust_cas_preference' of https://github.com/BrianBlade/Conversations into BrianBlade-dont_trust_cas_preference 
Conflicts:
	src/main/res/values-de/strings.xml
	src/main/res/values/strings.xml
 2015-04-14 15:17:06 +02:00
BrianBlade 878066ca99 Add option to use MTM without default TrustManager 
Add a new "Don't trust system CAs" preference under advanced options
that will change the behaviour of the MemorizingTrustManager. All
formerly unknown certificates will raise a warning if checked.
 2015-04-11 15:13:42 +02:00
BrianBlade dace8ba3d3 Enable end-conversation by swipe gesture 
Add EnhancedListView library de.timroes.android:EnhancedListView:0.3.4
to enable swipe-out for ListViews

Re-enable selectableItemBackground

Dont end selectedConversation on swipe

Call mConversationFragment.reinit() instead.
Add separate undo string for swipe MUC.

Add blacklistedConversation for undo swipe

Update title_undo_swipe_* strings

Fix undo(), rename blacklistedConversation

Fix discardUndo(); re-init selectedConversation

maintain scroll position after undo

clear notification when dismissing a conversation

modified / simplified maintain scroll position code

simplify handling of selectedConversation

change undo_muc string, remove notifyDataSetChanged()
 2015-04-08 23:29:52 +02:00
Andreas Straub f76baa5658 Added multiple select to Choose Contact Activity 
When passing the Choose Contact Activity a boolean called "multiple"
set to true, it now allows the user to select multiple contacts. Long
pressing a contact enters multiple selection mode and the selection is
confirmed using a button in the CAB. The Activity returns whether or not
multiple contacts were selected using the same boolean. If multiple
contacts were selected, an array of JID strings called "contacts" is
returned. The Choose Contact Activity now also honors "filter_contacts",
an array of strings containing JIDs that should not be displayed in
the picker.

The invite to conference dialog now uses this feature to enable inviting
multiple contacts at once. Additionally, Invite Contact uses
"filter_contacts" to only display contacts that are not yet
participating in the conversation
 2015-03-18 17:11:50 +01:00
iNPUTmice 5132cd7234 show geo uris as 'location' in overview 2015-03-10 17:20:50 +01:00
iNPUTmice 87a048fe6f display geo uris as location. show 'send loction' in share menu if request location intent can be resolved 2015-03-07 14:15:38 +01:00
iNPUTmice 7ee5e95959 added typing notifications through XEP-0085. fixed #210 2015-02-21 11:06:52 +01:00
iNPUTmice 44ee746681 added actions to error notification 2015-02-10 17:13:34 +01:00
kruks23 e76a9c06c3 Remove title_activity_conversations and use app_name instead 2015-01-30 17:02:53 +01:00
Sam Whited 48604a6620 Use Material Design Icons on API 21+ 2015-01-29 15:28:26 -05:00
iNPUTmice 4e50098e31 show checkbox to hide offline contacts 2015-01-21 17:24:02 +01:00
Sam Whited 503237087f Remove legacy SSL support 2015-01-19 11:02:13 -05:00
iNPUTmice 149a6716b8 proper desc for offering and sending images in conversations overview 2015-01-18 20:26:22 +01:00
iNPUTmice d58fadd05f use same helper methods for images and files 2015-01-18 13:00:57 +01:00
Daniel Gultsch 78ac43cfa2 Merge pull request #901 from kriztan/patch-2 
Added new file type names for file transfers
 2015-01-18 11:57:34 +01:00
Christian S ae16439bd6 Added new file type names for file transfers 
- apk
- vcard
 2015-01-18 11:17:27 +01:00
Sam Whited 83c806a774 Fix string substitutions with unknown filetypes 2015-01-17 20:53:25 -05:00
Sam Whited dfc1cea882 Correct the download file string on notifications 
Fixes #896
 2015-01-17 09:11:04 -05:00
Sam Whited edd58f19b4 Add download button on notification if applicable 2015-01-16 01:10:01 -05:00
iNPUTmice c0993a9acb show toast when avatar has been published - fixed #874 2015-01-15 16:26:46 +01:00
iNPUTmice 994c9495ba added dedicated button to disable foreground service in perma notification 2015-01-15 16:17:55 +01:00
Daniel Gultsch a3f9f30a6c Merge pull request #885 from SamWhited/display-enter-key 
Add option to swap enter/emoticon key
 2015-01-14 22:54:02 +01:00
Sam Whited 0a96bec3c1 Add option to swap enter/emoticon key 2015-01-14 16:14:14 -05:00
Sam Whited 548a585b2c Harden the TLS connection cipher suites 2015-01-14 13:10:15 -05:00
Daniel Gultsch 7d2a9624b5 make use of different dimensions for different screen sizes 2015-01-13 11:52:41 +01:00
Daniel Gultsch 8d3323e384 context menu for files and offered files. fixed #848 fixed #849 2015-01-12 16:42:20 +01:00
Daniel Gultsch 77e4e1c2ac reworked message preview / message meta information (ie file offered, received * file) 
fixed #837
 2015-01-12 16:09:39 +01:00
Daniel Gultsch 0aa50cb5a1 shortened some string 2015-01-11 01:01:33 +01:00
Daniel Gultsch 06eae476ee Introduced expert options to control enter-is-send 
(default == off)
 2015-01-09 19:23:26 +01:00
Daniel Gultsch 734a9934a3 make project translatable via transifex 2015-01-09 02:06:03 +01:00
Daniel Gultsch a9159568b9 allow for very basic muc configuration 2015-01-08 21:29:26 +01:00
Daniel Gultsch f8aa1bfec4 kick after ban 2015-01-08 01:23:53 +01:00
Daniel Gultsch 061de5205e some clean ups for affiliation change context menu 2015-01-08 00:23:26 +01:00
Daniel Gultsch 8d655f445a more muc options 
* show invite button only with admin privileges or on public conferences
* Offer to ban user in public conferences.
Thanks to @betheg for the awesome ground work for this
 2015-01-07 18:34:24 +01:00
Daniel Gultsch af1410b02a Merge pull request #845 from SamWhited/material 
Add materials theme for v21 devices
 2015-01-07 15:57:27 +01:00
Daniel Gultsch ef525fb10e basic affiliation changes in muc 2015-01-07 15:03:29 +01:00
Sam Whited 45bb59dba8 Add materials theme 2015-01-06 21:37:49 -05: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 e6cd92a663 added higher auto accept file sizes 
also changed labeling to MiB and KiB
 2015-01-04 17:53:06 +01:00
Daniel Gultsch be7de054be record voice and attachment refactor 2015-01-03 16:06:59 +01:00
Daniel Gultsch 960b7343d3 disable / enable all accounts 2015-01-03 13:36:48 +01:00
Daniel Gultsch 969044b113 migrated change password into separate activity 2015-01-03 00:11:02 +01:00
Daniel Gultsch 1988e244ef some further otr improvements 2015-01-02 15:14:06 +01:00
Daniel Gultsch 3833e6dfef improved OTR verification part one 2015-01-02 01:21:14 +01:00
Sam Whited 0882da2568 Make `app_name' string untranslatable 
Remove untranslatable about message

Escape single quote in NL translation
 2014-12-29 19:38:47 -05:00
Daniel Gultsch 193d2645e6 code cleanup for change password stuff 2014-12-25 22:28:19 +01:00
Daniel Gultsch 0c22a8d1c6 added callback to change account password to notify UI on success / failure 2014-12-25 22:08:13 +01:00
Sam Whited e4d9dca2fe Add ability to change password on server 
Fixes #260
 2014-12-25 21:38:55 +01:00
Sam Whited 01107e31ae Add more server compatibility info. 
Hide server info behind a checkbox.

Add XEP-0352 support to the server info list

Add XEP-0237 to server info list

Add XEP-0352 support to the server info list

Add MaM and Blocking to the account XEPs list

Also add a toggle button to hide some of the list
Rebase on current codebase

Make MAM string more descriptive

Change show more button to checkbox menu item

Shorten `MAM (History)' to `MAM'

Order XEP list and hide all by default

Supress warning (which is wrong anyways)

Change `Show more' to `Show more info'
 2014-12-23 12:44:30 -05:00
Sam Whited af7a64491f Add support for XEP-0191 (Blocking command) 
Fixes #791

Squash of commits:
534f25d7dae3ce6852243e28fdd0a69ac01e9463
808fdf5147f27a912a60bee39aa4bf1ddd4f43b4
1eaf8a8330710ad35ba7c368e04f909af623ae4c
31585242c2359efdcd0eeddb9745077f54dbc9eb
2e69bd0bd0286ed1e98a42f4c3421ba4d8cf524b
e904fb5015bf3a1904ab941a1957edf3b1e7abd2
eebbadf3b3816bbf8fcccb763e419fed252d266f
7c5b87724ce494e5a6e8026557ed50a8fd9f23e8
b0eaaf446937794fe19cbdb4f8309c3ff83d4e42
8c652f9e8bb3512958d9ad8c6f1326505f2d98c8
ad0ea1ad948ff6f8fde7b0b10f5163dc8852032f
f5d49897e0dba691ef53a0eddb9ed34d129ad442
a08fa64c505bd895b7c626cfad182380373be20b
de67079113e08394a276048c31f6b21baa300829
9069f342173ba30c2b20c67529c7ff497a6a257d
0169fa79d161ee898c4b6762e207087682a952d8
8585a5bd75a5d56927fed8317729bd15fffe4dcc
0053528a078369e0b65dcf71bda251072a1299c7
e901a9c3554bd7cca193e92919b463991eadfea7
c5c78257434813c69ab9b7558bcc8f7cbe858433
e905af348d46d77bc46b5f7211527684acc02fab
13a0f9a10c7892b0f90f5fabd2f2615701b0fd66
2cfba1e24b0139839e4453b92be7e20634d150cf
58e074fb5bb44b05a8104250fccd7c024c808c1a
0d6cf98fc8eab212d798ac79b336f9b70a14f06d
e23620f56b85bcab9f3b5d9ce1c01524cd9674dc
d72cd2fcc8d54176c3ff53411a69b9bb4642eff3
195143dff8836623a37094a6b8fa6aa01ef31580
5f5f3caf3a1e480a99d27ee5c34ba516419c52e4
1dee3d5861c9f9c710da4cbda3688d94c622ca93
23949b8aa32c78b27bab49bb3c4f3ff588925ce1
9bf97f8ae522796e0dacb7f6fe7a7f90f86a93a1
 2014-12-22 08:19:00 -05:00
iNPUTmice 741a0c129d made scroling smoother + bug fixes for history loading 2014-12-17 10:50:51 +01:00
iNPUTmice 80435eca5c smoothed out scrolling a bit 2014-12-17 09:32:51 +01:00
Sam Whited a6d4b0aec5 Add quiet hours feature 2014-12-14 15:07:41 -05:00
Sam Whited e43ac27e8f Accessibility: Add missing image descriptions 2014-11-29 08:03:35 -05:00
iNPUTmice de0b36fc78 verify contacts key only on initiating side of smp 2014-11-21 13:42:25 +01:00
iNPUTmice 0ad6d0616f brought ad hoc conferences back. fixed #688 fixed #367 2014-11-20 18:20:42 +01:00
iNPUTmice 240d2d68c8 context menu for conversations. fixed #630 2014-11-18 00:07:27 +01:00
ferdev1 c147f44cf1 Fix string 2014-11-16 18:11:14 +01:00
iNPUTmice cf00f3fade happy hanukkah 2014-11-16 17:21:21 +01:00
iNPUTmice 2067b9bd8d made scan and show qr code more accessible in VerifyOtrActivity 2014-11-16 02:10:29 +01:00
Sam Whited 251f4d6d7f Add incompatible server status 2014-11-15 11:29:58 -05:00
Sam Whited c09d450db8 Add security error status 2014-11-15 11:21:47 -05:00
iNPUTmice 35bf13f5ef Merge branch 'feature/file_transfer' into development 
Conflicts:
	src/main/res/values/strings.xml
 2014-11-15 15:52:15 +01:00
iNPUTmice 07b07115d6 Merge branch 'feature/foreground_service' into development 
Conflicts:
	src/main/res/values/strings.xml
 2014-11-15 15:51:27 +01:00
iNPUTmice 5b9c690c47 Merge branch 'feature/otr_verification' into development 2014-11-15 15:50:35 +01:00
iNPUTmice 3c6b3506e3 turn on foreground service in expert settings 2014-11-15 15:34:34 +01:00
iNPUTmice 41f7848f2c handled more error cases 2014-11-15 15:34:12 +01:00
iNPUTmice 47d44448f3 fixed description in notifications and conversation overview 2014-11-15 15:34:12 +01:00