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

677 commits

Author SHA1 Message Date
iNPUTmice 3a57f6df89 faulty otr messages now generate an error 2014-06-26 16:42:24 +02:00
iNPUTmice 3bb585c020 fixed rare bug with attach image menu 2014-06-26 12:09:12 +02:00
iNPUTmice 513b3959dc moved some try catchs around 2014-06-25 19:16:10 +02:00
iNPUTmice 66bb5c9b51 more npe fixes 2014-06-25 17:54:00 +02:00
iNPUTmice 5db04a37bd fixed two rare npe 2014-06-25 17:32:58 +02:00
iNPUTmice 31657974bf more kxml fuck ups fixed 2014-06-25 17:24:03 +02:00
iNPUTmice d63a9eb306 fixed odd occurrences of a cursor returned by the system being NULL. wtf ukas 2014-06-25 17:21:51 +02:00
iNPUTmice 16c63c91e2 wraped stanza writer in try catch 2014-06-25 17:15:40 +02:00
iNPUTmice eb21475658 removed unecessary logging 2014-06-25 17:07:55 +02:00
iNPUTmice b0a3c717d2 wrap wakelock release with try catch 2014-06-25 17:06:20 +02:00
iNPUTmice dfbc42ecd7 some fixes for otr with multiple parties 2014-06-25 16:55:47 +02:00
iNPUTmice ea261c1032 more otr fixes 2014-06-24 16:14:18 +02:00
iNPUTmice 6ef9421d35 fixes for offline otr 2014-06-24 15:07:59 +02:00
iNPUTmice 18d0e57f52 fixed regression with chat markers not working 2014-06-23 23:29:26 +02:00
iNPUTmice d7656dd420 fix for not being able to send otr encrypted images to offline contacts. unconfirmed 2014-06-23 21:48:48 +02:00
iNPUTmice 43e276e325 possible better distribution of contact picture colors 2014-06-23 21:13:58 +02:00
iNPUTmice 996bee8836 enabled otr encryption for ibb filetransfer as well 2014-06-23 16:01:51 +02:00
iNPUTmice c25f1283a1 removed warnings 2014-06-22 21:44:17 +02:00
iNPUTmice 1374fed31b fixed #220 2014-06-22 18:21:04 +02:00
iNPUTmice fafc5306d7 moved message packet creation into sperate class 2014-06-22 17:24:47 +02:00
iNPUTmice f559bd14dd establish otr connection before sending image 2014-06-22 13:57:57 +02:00
iNPUTmice 49b7c7779d fixes for otr file transfer 2014-06-20 19:28:47 +02:00
iNPUTmice 1cf055d2fd not working version of otr file transfer 2014-06-20 17:30:19 +02:00
iNPUTmice beafb06b6a clear input field after conference pgp message 2014-06-16 23:43:45 +02:00
iNPUTmice 7e8c68b698 streamlined onpresenceselected listener 2014-06-16 14:21:22 +02:00
iNPUTmice 30a0be2998 fixed bug in intent filter. cleaned share with activity 2014-06-16 14:06:50 +02:00
iNPUTmice 0102032fc5 added share image intent to android manifest for testing purposes 2014-06-16 14:06:50 +02:00
iNPUTmice 41834b5e24 code cleanup / unification 2014-06-16 14:06:34 +02:00
iNPUTmice b9477edb53 cleanup; removed unnecessary imports and log outputs 2014-06-16 12:18:04 +02:00
kruks23 febf23de1f Rounded minutes ago and last seen + Update Spanish Translations 2014-06-15 18:27:20 +02:00
Steven Dee 473cef32fa Send from our full jid (fixes #60) 
The problem wasn't with sending to bare jids, but rather sending
*from* bare jids, which we did unless we were OTR encrypted for
some reason. Google Talk supports the former, but (probably correctly)
rejects the latter.
 2014-06-15 05:38:15 -07:00
iNPUTmice 7f1a4a6fb8 infite scrolling 2014-06-14 16:59:07 +02:00
iNPUTmice 7bdee8c19b fixed #197 2014-06-14 14:27:03 +02:00
iNPUTmice 471ed7838a fixed #204 2014-06-14 10:29:26 +02:00
iNPUTmice d067448808 offline sending of images 2014-06-13 18:16:14 +02:00
iNPUTmice 76f3894107 status waiting for images sent offline 2014-06-13 15:05:35 +02:00
iNPUTmice eb7ed78605 moved last seen to contact details 2014-06-13 11:50:47 +02:00
iNPUTmice 899da61555 further bullet proofing 2014-06-13 11:16:52 +02:00
iNPUTmice a92fb88e51 fixed #201 2014-06-13 10:39:44 +02:00
iNPUTmice 592aded106 finished offline otr 2014-06-12 23:04:28 +02:00
iNPUTmice b1482212b8 fire onContactStatusChanged only on online/offline changes. not on status changes 2014-06-12 18:27:50 +02:00
iNPUTmice 18871230e1 send otr messages when contacts comes online 2014-06-12 10:41:47 +02:00
iNPUTmice e353a1c109 made muc join easier if muc server is known. added room to key words 2014-06-12 09:54:19 +02:00
iNPUTmice bb90452673 groundwork for offline otr messages 2014-06-11 21:53:25 +02:00
iNPUTmice 95f1a3d57d select presence dialog now suggests last used presence 2014-06-10 17:34:18 +02:00
iNPUTmice 285ffa86e7 fixed scrolling issues 2014-06-10 17:01:19 +02:00
iNPUTmice 2eb2bac3e6 cleanup 2014-06-10 14:12:11 +02:00
Andreas Straub c6ffb85d5f Muc Icon tile color fix 2014-06-10 13:19:17 +02:00
iNPUTmice 28b7a6c92a don't display 'enter password' message if OpenKeychain is not installed. made status messages in chat not selectable 2014-06-09 21:25:01 +02:00
iNPUTmice 794b13fcfa fixing #184 2014-06-07 19:00:08 +02:00
iNPUTmice 60d0881852 removed unnecessary variable in message class 2014-06-07 14:42:17 +02:00
iNPUTmice 71886ed2ab localized date. rounded minutes, hours and dates in last seen 2014-06-07 13:57:03 +02:00
iNPUTmice ea8f3a2675 possible fix to be able to images and encrypted messages at a faster rate 2014-06-07 13:25:27 +02:00
iNPUTmice df7f7c5c4e do not just simply resend images 2014-06-06 20:06:06 +02:00
iNPUTmice 3fd371cd53 fixed last_seen_now 2014-06-06 19:39:55 +02:00
iNPUTmice fc656c5571 removed presence from last seen 2014-06-06 19:37:34 +02:00
Daniel Gultsch 246776067a put xep333 parsing into parser class 2014-06-06 18:49:35 +02:00
Daniel Gultsch 476ab656ef refactored presence parsing into dedicated class 2014-06-06 18:26:40 +02:00
iNPUTmice c489f368b8 added abbrev_all to date format 2014-06-06 16:44:14 +02:00
kruks23 99e5098780 #158 Try to solve MM/dd date in each locale 2014-06-06 16:15:15 +02:00
iNPUTmice a1507d91ff fixes #172 2014-06-06 13:59:39 +02:00
iNPUTmice 5fe926b645 basic last seen feature. no peristancy just yet. no polish 2014-06-06 11:39:17 +02:00
iNPUTmice a583471af8 read marker is now a little less in your face 2014-06-05 01:57:00 +02:00
iNPUTmice 9a448f822f image provider path name now with .webp ending 2014-06-04 22:35:08 +02:00
iNPUTmice 83e919f8af experimental gui to display read status 2014-06-04 21:40:17 +02:00
iNPUTmice dc50e0a7e3 fixed regression with newly created conversations not being shown properly 2014-06-04 19:25:53 +02:00
iNPUTmice 7e4e7426ee received and displayed messages (xep 333) are now marked properly 2014-06-04 18:44:15 +02:00
iNPUTmice ba2ad82c7e more bug fixes for the pgp problem 2014-06-04 12:31:19 +02:00
iNPUTmice 2f2aa7aa21 fixed pgp on incoming carbon messages 2014-06-04 11:55:38 +02:00
iNPUTmice cedc1f40b3 answer to xep 184 message receipts. fixes #95 2014-06-03 15:48:51 +02:00
iNPUTmice 4e82f4337e added pgp sig on muc rename 2014-06-03 11:04:17 +02:00
iNPUTmice 5b6140dc64 long press on images revails share with intent 2014-06-02 21:27:40 +02:00
iNPUTmice 1982151630 linked openkeychain install dialog from decrypt messages box 2014-06-01 19:29:57 +02:00
iNPUTmice c17db8e34e changed roster to concurrent hashmap 2014-06-01 19:17:05 +02:00
iNPUTmice 32a21e1ab9 unified crypto messages and made lock icon work for conferences 2014-06-01 19:08:42 +02:00
iNPUTmice 8ea73feec4 added warning when public keys are missing 2014-06-01 18:52:27 +02:00
Andreas Straub f1505f9f36 Fix tile rendering for larger conferences 2014-06-01 16:30:21 +02:00
iNPUTmice 1a4b1f8a2f show dialog when no contact in a muc has pgp support 2014-06-01 11:24:35 +02:00
iNPUTmice 5d0e1374b2 OpenPGP key display in muc details is now prettier and linked to openkeychain 2014-06-01 10:22:42 +02:00
Alethea Butler 97957bcfb9 Removed TASK_ON_HOME flag from intent created from share 2014-05-31 13:33:46 -04:00
Alethea Butler d67d792409 Made the navigateUp override behave like a navigate up 2014-05-31 12:53:23 -04:00
Alethea Butler b04fd2337e Refactored into onNavigateUp 2014-05-31 11:50:09 -04:00
iNPUTmice 15096aa0dd Merge branch 'development' of github.com:siacs/Conversations into development 2014-05-31 11:55:24 +02:00
iNPUTmice 57ded7ee58 fixed regression that led to the wakelock not being released again 2014-05-31 11:54:32 +02:00
Alethea Butler 0edfd36195 Up button goes to contacts after initial setup 2014-05-30 23:41:44 -04:00
Alethea Butler 78686e9bce Disabled the Home button when it's not the Up button 2014-05-30 23:18:50 -04:00
kruks23 75b14a1d5c More harcoded translations + updated Spanish 2014-05-29 18:17:21 +02:00
Daniel Gultsch 655565eccc display pgp key id in muc details and use keys to encrypt groupchat 2014-05-28 10:41:55 +02:00
Daniel Gultsch b605577cd9 encrypted group messages are now properly decrypted 2014-05-28 10:41:55 +02:00
Daniel Gultsch fd4897e1a5 first tries on crypto muc 2014-05-28 10:41:55 +02:00
iNPUTmice e348afac54 possible fix for #149 and #142 2014-05-28 10:37:49 +02:00
Daniel Gultsch 7f825f8027 error msg on offline subscription changes 2014-05-24 11:17:55 +02:00
Daniel Gultsch 03854f30c9 Merge pull request #146 from kruks23/development 
More harcoded translations + Spanish
 2014-05-24 10:03:42 +02:00
Daniel Gultsch 00377b64c7 Merge pull request #140 from strb/mucicons 
Refactored unknown contact picture generation
 2014-05-24 10:01:51 +02:00
kruks23 d74faa3f7c More harcoded translations + Spanish 2014-05-24 00:17:42 +02:00
kruks23 d6fd0343ae Title activities translations + contacts translations + update Spanish Translations 2014-05-23 16:20:49 +02:00
Daniel Gultsch a0dde05ee5 end otr sessions earlier / more often. can lead to unesessary handshakes but can improve reliabilty 2014-05-23 10:54:40 +02:00
Daniel Gultsch 8133dcd881 fixed possible npe 2014-05-23 10:15:58 +02:00
Daniel Gultsch a5d54d70ee code cleanup 2014-05-23 10:07:17 +02:00
kruks23 950165033b Contact details translations + update spanish translations 2014-05-22 22:58:25 +02:00
Daniel Gultsch b99779432c offline crud of contacts 2014-05-22 14:33:17 +02:00
Daniel Gultsch ad960b393d implementet missing methods on the new roster mgmt 2014-05-22 12:57:47 +02:00
Daniel Gultsch f0d2ca260e fixed #136 2014-05-22 09:36:00 +02:00
Daniel Gultsch 1db807ef58 write contacts on system shutdown 2014-05-21 22:22:36 +02:00
Daniel Gultsch 5a6da5afaa Merge branch 'development' of github.com:siacs/Conversations into development 2014-05-21 20:28:09 +02:00
Daniel Gultsch 6d90a5cd57 further improvment trying to deal with large images 2014-05-21 20:27:53 +02:00
Andreas Straub 0883de0701 Refactored unknown contact picture generation 
Introduce drawTile method in order to remove code duplication
 2014-05-21 18:28:51 +02:00
Andreas Straub 2674d40704 Fix highlight detection in MUC channels 
We only detect highlights if a word starts with the nick (matched in
case insensitive manner), followed by optional punctuation, followed by
another word boundary.
 2014-05-21 18:05:20 +02:00
Daniel Gultsch 0de9d57420 cleaned up shared text 2014-05-21 16:43:19 +02:00
Daniel Gultsch 9d2ce5ff98 auto retry image compression with decreasing sample size 2014-05-21 00:39:45 +02:00
Daniel Gultsch fa9cbeb746 close input stream 2014-05-20 22:54:28 +02:00
Daniel Gultsch 7f0efa089f trying to deal with larger images 2014-05-20 22:52:57 +02:00
kruks23 aba1ca7918 Update Spanish Translations + harcoded just_now 2014-05-20 18:49:58 +02:00
Daniel Gultsch f79d92ab67 highlight people in conferences by clicken on their picture 2014-05-20 11:44:43 +02:00
Daniel Gultsch 13f9f23946 fixed ping time out after session resume 2014-05-20 11:05:03 +02:00
Daniel Gultsch 8f92d8d109 ported pending subscription support to new roster mgmt 2014-05-20 10:48:07 +02:00
Daniel Gultsch 371c985c25 made roster persistant aka enabled versioning again 2014-05-19 21:05:17 +02:00
Daniel Gultsch a6f9a742c0 some code cleanup to deal with the roster mgmt changes from earlier 2014-05-19 15:39:50 +02:00
Daniel Gultsch 993477cd83 reworked roster/contact handling. might break some stuff. not sycing to disk yet 2014-05-19 15:15:09 +02:00
Daniel Gultsch 590e2403ab bind and session request more compatible 2014-05-18 17:32:20 +02:00
Daniel Gultsch e857cf979d fixed #123 fixed122 2014-05-18 13:23:26 +02:00
Daniel Gultsch 7fc7201abb cleaned up edit account dialog a little 2014-05-18 11:49:44 +02:00
Daniel Gultsch 0cdd74417f fixed #53 aka server not found bug 2014-05-18 11:25:04 +02:00
Daniel Gultsch 66aacf7e3e sending session after unsucesfull session resume. fixed #116 2014-05-17 21:57:44 +02:00
Daniel Gultsch 736e09fbb5 added record audio button 2014-05-17 19:21:16 +02:00
Daniel Gultsch 27060e303c made sending session more compliant 2014-05-17 19:20:31 +02:00
Daniel Gultsch 4c17937640 receiving pgp images important bug fix 2014-05-17 19:19:06 +02:00
the-username e34fddd7e1 Update Validator.java 2014-05-17 12:50:17 +02:00
Daniel Gultsch bab69ffcf9 fixed #108 2014-05-17 11:08:32 +02:00
Daniel Gultsch 8bf0945f2f permanent notification disapears now when account is being deleted + code clean up 2014-05-17 10:03:15 +02:00
Daniel Gultsch b84b67268b fixed #113 2014-05-17 09:43:47 +02:00
Daniel Gultsch cd1afbd39a reworked message to conferences 2014-05-16 22:46:15 +02:00
Daniel Gultsch a0a5ca9585 fixed npe for otr sessions with non contacts 2014-05-16 22:44:54 +02:00
Daniel Gultsch aa68045c58 offline sending of pgp fixed 2014-05-16 13:42:20 +02:00
Daniel Gultsch 1cf1e62e30 fixed null in shared link 2014-05-16 12:07:58 +02:00
Benoit Bouvarel 3d0f08e319 French translation + hard-coded string > @string 2014-05-16 01:13:07 +02:00
Daniel Gultsch 13d73a196c fixed npe 2014-05-15 10:27:36 +02:00
Daniel Gultsch ca7e24c30d hiding the prepare image toast after error or success 2014-05-14 18:43:58 +02:00
Daniel Gultsch 08a26d2772 fixed possible npe 2014-05-14 18:39:59 +02:00
Daniel Gultsch f4eebd091c fixed #105 2014-05-14 18:32:58 +02:00
Daniel Gultsch 81d2760505 made message parser non static 2014-05-14 12:56:34 +02:00
Daniel Gultsch 1f600be4dd code clean up 2014-05-14 11:49:43 +02:00
Daniel Gultsch a1a90a03e0 added presence selection 2014-05-13 17:42:23 +02:00
Daniel Gultsch f1bdf1d4c5 Merge branch 'development' into feature/take_picture 2014-05-13 17:11:36 +02:00
Daniel Gultsch 71545f4f66 code cleanup 2014-05-13 17:11:27 +02:00
Daniel Gultsch 9492e28902 takeing pictures over intent 2014-05-13 16:48:39 +02:00
Daniel Gultsch a8010e7133 Merge branch 'development' into feature/take_picture 2014-05-13 15:40:59 +02:00
Daniel Gultsch 84e79040df static method for providing content uri 2014-05-13 15:37:11 +02:00
Daniel Gultsch 6dfd885d34 submenu for attach file 2014-05-13 15:25:04 +02:00
Daniel Gultsch 7e66731960 ensure that iq response is being send out for jingle packets. remove jingle connection from manager after termination 2014-05-13 14:49:09 +02:00
Daniel Gultsch f38c7b22fd further translations 2014-05-13 11:23:11 +02:00
Daniel Gultsch ad9b9b9096 fixed npe in tag writer 2014-05-13 10:23:26 +02:00
Daniel Gultsch 3455d10a4a Better error handling if attach file doesnt work (on permission denied) 
and unified encrypted and unencrypted file attachment
 2014-05-12 14:59:46 +02:00
iNPUTmice 8632954e61 fixed possible npe and possible exception 2014-05-10 11:03:32 +02:00
Daniel Gultsch ef0bc6714a added dialog for otr file transfer 2014-05-09 21:20:34 +02:00
Daniel Gultsch 3b8446e6d5 link to openkeychain from contact details 2014-05-09 20:47:03 +02:00
Daniel Gultsch a14a28973a nicer descriptions in notificaton for images and encrypted messages 2014-05-09 20:46:43 +02:00
Dominik Schürmann 8a2da100d5 Improve OTR fingerprint dialog and fix german sentence 2014-05-08 19:03:32 +02:00
Daniel Gultsch c555a9d03c sending text message after returing from pending intent 2014-05-08 17:31:53 +02:00
Daniel Gultsch 7fa61564b8 better flow after returning from openkeychain for various actions 2014-05-08 16:52:19 +02:00
Daniel Gultsch 99a56a2bde offer to announce pgp key if pgp encryption is selected from menu 2014-05-08 14:35:21 +02:00
Daniel Gultsch 0ed29c1c77 more informative dialog if contact doesn't announce public key 2014-05-08 14:23:09 +02:00
Daniel Gultsch dc73a25ae4 code cleanup 2014-05-08 11:53:00 +02:00
Daniel Gultsch 0d8bf660db fixed download button on pgp images 2014-05-08 10:14:12 +02:00
Daniel Gultsch daa000dd75 improved next encryption selection 2014-05-07 13:09:40 +02:00
Daniel Gultsch 247f45f46b remembering text. awesome 2014-05-07 12:59:15 +02:00
Daniel Gultsch 12a3865c47 correct status after error iq 2014-05-07 12:58:57 +02:00
Daniel Gultsch 955b7dbc7e wee bit of code cleanup 2014-05-07 12:33:55 +02:00
Daniel Gultsch 461f2ffb16 basic pgp encrypted file transfer 2014-05-06 21:34:30 +02:00
Daniel Gultsch f7033cb7e0 content name and creator are properly set 2014-05-03 18:47:53 +02:00
Daniel Gultsch 2df57f38a0 properly reply to iq requests. reply to disco 2014-05-03 17:42:44 +02:00
Daniel Gultsch 4822d4dce7 allow roster pushes only from bare jid or null 2014-05-03 17:07:37 +02:00
Daniel Gultsch 3cfb4a0cd6 added restart button to openkeychain dialog 2014-05-03 15:24:19 +02:00
Daniel Gultsch 82bccedf70 nicer dialog screen if openkeychain is not installed 2014-05-02 12:02:18 +02:00
Daniel Gultsch 37c8e157d0 reworked openpgp integration part #1 2014-05-01 22:33:49 +02:00
Daniel Gultsch 4b66b4b5d1 bug fix for jingle 2014-04-26 17:26:22 +02:00
Daniel Gultsch f36f218469 unified presence selection for otr and file transfer 2014-04-26 12:40:21 +02:00
Daniel Gultsch a55ddb889e fixed #75 2014-04-25 23:14:43 +02:00
Daniel Gultsch 6942840061 setting backround color if image comes directly from cache 2014-04-25 23:09:15 +02:00
Daniel Gultsch 645139eb68 couple of more optimazations on image loading 2014-04-25 23:06:20 +02:00
Daniel Gultsch bf2d0d5596 smoother scrolling (first step) 2014-04-25 16:24:56 +02:00
Daniel Gultsch 18c183a767 deny files with unknown file types 2014-04-23 21:19:56 +02:00
Daniel Gultsch 9a8e55acd1 added download button for images not accepted automatically 2014-04-22 18:46:40 +02:00
Daniel Gultsch aa5f775fc7 added support for ibb 2014-04-22 13:11:53 +02:00
Daniel Gultsch d151ad9031 code cleanup 2014-04-21 20:39:57 +02:00
Daniel Gultsch 77da0c6b5d allow images to be opened with gallary app 2014-04-21 19:51:03 +02:00
Daniel Gultsch fc6a16c31b added missing transport id 2014-04-21 12:03:26 +02:00
Daniel Gultsch 4d730fd1ed added proxy activate and a lot of code clean up. totatly untested 2014-04-20 22:34:27 +02:00
Daniel Gultsch 04418484a2 made our spanish friends happy. fixed #68 2014-04-20 20:53:36 +02:00
Daniel Gultsch d140ef6390 fixed #50 2014-04-20 20:48:16 +02:00
Daniel Gultsch 8003e53013 more jingle bug fixes 2014-04-19 11:58:35 +02:00
Daniel Gultsch 7299fe7c8b fixed replace contact in conversation 2014-04-19 02:58:34 +02:00
Daniel Gultsch 8c59668273 made debugging verbose again on specific parts 2014-04-19 02:19:26 +02:00
Daniel Gultsch 1235e3daca fixed default autoaccept file size and wrongly marked message 2014-04-19 01:51:50 +02:00
Daniel Gultsch 5c0873c7ca cleaned up debug log a little bit 2014-04-19 01:14:30 +02:00
Daniel Gultsch 7ccbf0008a fixed concurrent modification of contacts which led to missing presences 2014-04-18 21:26:01 +02:00
Daniel Gultsch 1e5f916b2a tried to avoid some more race conditions in jingle 2014-04-18 11:57:28 +02:00
Daniel Gultsch 625fbe7d81 Merge branch 'master' into development 2014-04-18 01:07:45 +02:00
Daniel Gultsch 18c0c31b65 work around for bug in xmlpullparser 2014-04-18 00:33:00 +02:00
Daniel Gultsch 07cf07ad58 lot of cleanup in jingle part 2014-04-18 00:17:34 +02:00
Daniel Gultsch 8006931f80 put more string into strings.xml 2014-04-18 00:17:34 +02:00
Daniel Gultsch 0de0cb90a0 fixed destination bug 2014-04-18 00:17:34 +02:00
Daniel Gultsch e29ce19f20 fixed #63 2014-04-18 00:17:34 +02:00
Daniel Gultsch a04d736f75 fixed possible race conditions with presences 2014-04-18 00:17:34 +02:00
Daniel Gultsch 4a36abf30f added clear history dialog (no funcionality) 2014-04-18 00:17:34 +02:00
Daniel Gultsch e711da7248 jingle sessions now get terminated proberly on success 2014-04-16 12:50:53 +02:00
Daniel Gultsch bdf9770a61 made ui with sending images a little smoother 2014-04-15 15:19:02 +02:00
Daniel Gultsch 513f3c47b2 added very basic, very untested gui on the receiving side 2014-04-14 21:21:13 +02:00
Daniel Gultsch 18c3333271 tried to fix some race conditions. not adding duplicate candidates. needs more checks though 2014-04-14 20:35:11 +02:00
Jelmer Vernooij 802c21a793 Fix two typos: assoziated -> associated. 2014-04-14 02:22:03 +02:00
Andreas Straub e4f9a38c76 Some icon tweaks 
Use Roboto Light, thinner lines between tiles, slightly smaller letters
 2014-04-13 21:13:37 +02:00
Andreas Straub 132689376c Added ellipsis tile for large conversations 
For more than 4 members in a conversation, the fourth tile now contains
an ellipsis to indicate this
 2014-04-13 21:13:37 +02:00
Andreas Straub 901ce085a7 Major Contact Picture code cleanup 
Notifications now have pseudotransparent icons, icons are generated in
the correct size.
 2014-04-13 21:13:37 +02:00
Daniel Gultsch 084ab51b1d transmitting files between two conversations works. no error handling and no ui on the receiving end 2014-04-13 21:10:36 +02:00
Daniel Gultsch 7dfe4ae082 some code cleanup. added setting to auto accept files. socks5 connections are now threaded 2014-04-13 18:09:40 +02:00
Daniel Gultsch 27d5966ac3 more efficant way of calculating the sha1 sum. closing connections 2014-04-13 11:32:45 +02:00
Daniel Gultsch 7b554f2001 fixed minor typos 2014-04-12 10:45:25 +02:00
Daniel Gultsch f57b669f83 Merge branch 'development' of https://github.com/strb/Conversations into strb-development 2014-04-12 10:22:18 +02:00
Daniel Gultsch d936a830e4 add sha1 sum to file 2014-04-12 10:02:48 +02:00
andy f3b07250dd Added tiled MUC icons 
Now, MUCs have icons with up to 4 tiles representing MUC members,
similar to the gmail app.

Some caveats:
As of now, no ordering is imposed on the members, we simply pick the
first (up to) 4 returned by the MucOptions object. This could be done
better, e.g. by picking more important members first (based on
affil/role), or even going so far as to order them by how recently they
sent a message in the MUC.
Also, the code generating the tiles is really messy right now (tons of
copy and paste). It seems to work though. I will clean this up soon.
 2014-04-12 03:47:05 +02:00
andy c230733736 More Contact Picture refactors 
Use polymorphism to avoid dynamic dispatch based on nulled parameters.
Next up: Prettier MUC icons
 2014-04-12 03:46:54 +02:00
andy 3d6f03e859 Refactor UIHelper to use getContactPicture 
Normalize the interface, reduce code duplication
 2014-04-12 03:46:43 +02:00
Daniel Gultsch 96be96f9f8 open latest conversation from notification 2014-04-11 23:05:45 +02:00
Daniel Gultsch 259bb446ca first file transfer between gajim and conversations. still a lot to do though 2014-04-11 22:49:26 +02:00
Daniel Gultsch c0e0a70869 socks5 initialisation works. doesn't get activate though 2014-04-11 21:13:09 +02:00
Daniel Gultsch 51100ab48b failed messages get now marked inline 2014-04-11 09:13:56 +02:00
Daniel Gultsch 644473205a incomming jingle packets are routed to their connection. added presence chooser in gui 2014-04-10 14:12:08 +02:00
Daniel Gultsch ba0bedc5fa changed behaviour of expecption handler to check if accounts are working before removing the stacktrace 2014-04-10 13:19:58 +02:00
Daniel Gultsch 298c7adcd1 disocover stream hosts (xep-0065) cleaned up disco 2014-04-08 23:15:55 +02:00
Daniel Gultsch 92dcf85701 fixed npe 2014-04-08 10:23:05 +02:00
Daniel Gultsch 78bd6c423f fixed #52. thanks @strb 2014-04-07 23:58:59 +02:00
Daniel Gultsch 3f403fb8a9 jingle connection and manager. able to trigger dialog in gajim 2014-04-07 20:05:45 +02:00
Daniel Gultsch c30bf75a5d gui for images 2014-04-06 15:34:08 +02:00
Daniel Gultsch 9fc7a1b980 added button to open images 2014-04-06 15:28:19 +02:00
Daniel Gultsch 7749103909 added attach file action 2014-04-06 15:28:19 +02:00
Daniel Gultsch cc977eee90 renamed [Archive conversation|Leave conference] to End this conversation 2014-04-06 15:23:40 +02:00
Daniel Gultsch 3f872ddc9f fixed npe 2014-04-06 15:22:56 +02:00
Daniel Gultsch 486f198632 use proper, advertised sm namespace 2014-04-05 12:08:35 +02:00
Daniel Gultsch 83a23ad3b1 cleaned up log output a little bit 2014-04-05 11:59:18 +02:00
Rene Treffer c82c6251b8 Switch to FULL_SYNC to make prosody happy 2014-04-05 11:39:45 +02:00
Daniel Gultsch 850b24c4db code cleanup 2014-04-05 09:45:15 +02:00
Daniel Gultsch ee24baa0fd marked incoming carbons as unread 2014-04-04 22:52:32 +02:00
Daniel Gultsch 34bd79ac04 notify on incomming received carbon messages 2014-04-04 17:58:53 +02:00
Daniel Gultsch caf214c212 fixing more notification f-ups 2014-04-04 13:01:07 +02:00
Daniel Gultsch db4559efdf nothing important 2014-04-03 23:57:26 +02:00
Daniel Gultsch bd9dba1a69 Merge branch 'compression' of https://github.com/rtreffer/Conversations into rtreffer-compression 2014-04-03 23:50:48 +02:00
Daniel Gultsch 91aeffae1b possible fix for some weird notification bugs 2014-04-03 23:50:34 +02:00
Rene Treffer a0fc1c6c77 Migrate all accounts to use compression 2014-04-03 22:28:37 +02:00
Rene Treffer 4ea11c15e3 Only apply defaults if the account is new 2014-04-03 21:25:03 +02:00
Rene Treffer 5684849249 Remove option to enable/disable TLS (now enabled by default) 2014-04-03 21:22:17 +02:00
Rene Treffer e6797e1db4 Remove option for compression (enabled by default / hidden setting) 2014-04-03 20:54:50 +02:00
Rene Treffer 7db21136a3 Add support for users with empty name 2014-04-03 18:37:48 +02:00
Rene Treffer 9502ff25dd Add compression support 2014-04-03 18:37:25 +02:00
Daniel Gultsch 2506ef82df be compatible with openkeychain api v3 2014-04-03 17:39:57 +02:00
Daniel Gultsch 10f71c53c8 increased version and fixed one last null pointer 2014-04-03 15:24:11 +02:00
Daniel Gultsch b91c9afe4b call change status listener after disable account 2014-04-03 15:13:43 +02:00
Daniel Gultsch 217d18b6ac fixed null pointer 2014-04-03 15:08:53 +02:00
Daniel Gultsch 9d2d853e1b fixed #27 2014-04-03 14:25:54 +02:00
Daniel Gultsch e70c0cfffd Merge pull request #40 from rtreffer/minidns 
Add ability to use a provided ipv4 address on connect
 2014-04-03 11:13:45 +02:00
Rene Treffer eae4e5d518 Add ability to use a provided ipv4 address on connect 2014-04-03 11:01:20 +02:00
Daniel Gultsch 01925fb2cc tryping to resolve the wake lock bug 2014-04-03 10:41:21 +02:00
Daniel Gultsch 2b8dfc2bab cleared up logging a little bit. no need for an entire stack trace at this point 2014-04-03 10:12:50 +02:00
Daniel Gultsch 2efb97efa0 Merge pull request #39 from rtreffer/minidns 
Switch to a small DNS library for DNS resolving.
 2014-04-03 09:50:57 +02:00
Rene Treffer ff88dc0eaa Switch to a small DNS library for DNS resolving. 2014-04-03 09:42:58 +02:00
Daniel Gultsch 21be7bc160 added permenant notification when one or more accounts are unable to connect 2014-04-03 09:21:45 +02:00
Daniel Gultsch d53dc28f4c fixed add account dialog showing up multiple times 2014-04-01 23:16:19 +02:00
Daniel Gultsch 1fe49a0545 fixed digest-md5 auth to work with prosody as well. thank you Florian Schmaus 2014-04-01 11:38:34 +02:00
Daniel Gultsch 601e5ca33e fixed #30 - added support for digest-md5 - only works with Icewarp 11???git add src/? 2014-03-31 15:22:27 +02:00
Daniel Gultsch aed5b01434 changed all them beautifull colors 2014-03-31 11:11:17 +02:00
Daniel Gultsch 6bb7764d72 null pointer fix 2014-03-31 09:45:39 +02:00
Daniel Gultsch 92e0713373 null pointer fix 2014-03-31 09:43:58 +02:00
Daniel Gultsch ad3e23fa7c ground work to support multiple auth mechanisms 2014-03-30 21:21:55 +02:00
Daniel Gultsch e8290d52b1 finally fixed #notificationgate 2014-03-29 20:29:03 +01:00
Daniel Gultsch 38efb84690 treat dns timeouts as temporary. also increased timeout 2014-03-28 19:00:01 +01:00
Daniel Gultsch 268eae7813 fixed login issue with latest ejabberd 2014-03-28 18:31:04 +01:00
Daniel Gultsch a649310fe2 streamlined sasl code 2014-03-28 14:48:11 +01:00
Daniel Gultsch f457c629ee fixed another null pointer reported by he crash reporter. this thing is awesome 2014-03-28 13:32:36 +01:00
Daniel Gultsch b966464324 fixed null pointer issue 2014-03-28 12:58:40 +01:00
Daniel Gultsch 0b235171a8 tryping to fix #24 - notificationgate - since i still cant reproduce this patches are all blind 2014-03-28 12:22:09 +01:00
Daniel Gultsch ea766d970f crash reporter 2014-03-27 16:09:23 +01:00
Daniel Gultsch 592068e7cf code cleanup 2014-03-27 14:41:01 +01:00
Daniel Gultsch 8988873d77 more dns fixes. hopefully the last 2014-03-27 14:31:55 +01:00
Daniel Gultsch 800c18956b dont add new muc to roster 2014-03-27 11:41:32 +01:00
Daniel Gultsch 291dc4c36c fixed null pointer with missing status msg 2014-03-27 11:09:50 +01:00
Daniel Gultsch f99887d7ca further dns improvements 2014-03-27 11:03:10 +01:00
Daniel Gultsch 4864f7200b fixed a couple of muc issues. added jingle listener (which doesn't do anything for now) 2014-03-27 02:02:59 +01:00
Daniel Gultsch 185d4d120b fixed error with leaving mucs 2014-03-26 18:56:02 +01:00
Daniel Gultsch 0c37abf1e9 made work around not being a work around any more 2014-03-26 00:17:26 +01:00
Daniel Gultsch 39c651a236 fixed settings opening twice from manage accounts activity 2014-03-25 18:38:20 +01:00
Daniel Gultsch 956b646e2a more srv lookup fixes 2014-03-25 18:12:27 +01:00
Daniel Gultsch 0b9e089ac6 using actual dns servers provided by the system 2014-03-25 17:21:56 +01:00
Daniel Gultsch 10f2231bcf fixed array out of bounds 2014-03-25 17:08:52 +01:00
Daniel Gultsch 1b3c288225 holding wake locks during onStartCommand 2014-03-23 14:15:14 +01:00
Daniel Gultsch ee1c9e611b more otr fixes 2014-03-21 23:09:14 +01:00
Daniel Gultsch a9e34d3492 tryed to fix more otr bugs. new resource setting 2014-03-21 22:14:52 +01:00
Daniel Gultsch 079712060c otr safety guard 2014-03-21 21:25:28 +01:00
Daniel Gultsch bbfe102e91 sending offline msgs 2014-03-21 19:58:47 +01:00
Daniel Gultsch 36dccb9f77 fixed users profile picture 2014-03-21 14:58:33 +01:00
Daniel Gultsch b6ea028a9d added no-copy 2014-03-20 15:49:53 +01:00
Daniel Gultsch 6be2a08f19 otr messages are now ignored if conversations isnt 100% sure the message is ours 2014-03-19 16:16:40 +01:00
Daniel Gultsch 389d4db311 rename in muc fixed 2014-03-19 15:05:01 +01:00
Daniel Gultsch 3a98a695d4 fix bug with presences with no resource attached 2014-03-18 14:35:19 +01:00
Daniel Gultsch 0116551ca9 bug fixes with leaving muc on connection loss. 2014-03-16 14:12:30 +01:00
Daniel Gultsch 8cd59bb944 better muc invitations. clearified the creation of ad hoc mucs with an alert dialog 2014-03-15 15:13:35 +01:00
Daniel Gultsch 841c6e04a9 muc invites in conference details 2014-03-15 06:20:59 +01:00
Daniel Gultsch afe1244709 muc creation 2014-03-15 04:59:18 +01:00
Daniel Gultsch 8f9712c64e added security indicator on every single message 2014-03-15 00:19:42 +01:00
Daniel Gultsch b0d57d01c4 renaming conferences over conference details 2014-03-14 23:32:48 +01:00
Daniel Gultsch b1a3d09ca6 use conference subject to identiy room 2014-03-14 22:40:56 +01:00
Daniel Gultsch 4e4a767743 added display of own fingerprint 2014-03-14 21:36:38 +01:00
Daniel Gultsch bae7418756 fixed logic bug with cleaning of presences 2014-03-14 20:43:54 +01:00
Daniel Gultsch 29e128513d nick name more persistant than ever before 2014-03-14 20:19:58 +01:00
Daniel Gultsch cc65567366 workaround for some weird clients sending empty string over otr 2014-03-14 19:31:15 +01:00
Daniel Gultsch 1bdbeb620f renaming in mucs now persistent 2014-03-14 19:12:24 +01:00
Daniel Gultsch 4e20b81bd9 fixed problem with null messages. added ask again button 2014-03-14 18:56:52 +01:00
Daniel Gultsch 71cb5548eb removed log output 2014-03-13 22:14:20 +01:00
Daniel Gultsch bf7bba0311 bug fix 2014-03-13 21:45:38 +01:00
Daniel Gultsch 9c811f8fb2 sharing text 2014-03-13 21:37:27 +01:00
Daniel Gultsch 507cfba6ad fixed logic bug where presences where cleared to early 2014-03-13 18:36:56 +01:00
Daniel Gultsch 748582e3ab start converstaion from address book (sendto) 2014-03-13 18:18:41 +01:00
Daniel Gultsch 678dbd37c6 finished registration 2014-03-13 17:29:22 +01:00
Daniel Gultsch 53fa87b414 removed unnecessary uihelper method 2014-03-13 13:28:16 +01:00
Daniel Gultsch eec3906692 fixed bug where one couldnt short click to edit in the account list 2014-03-13 04:32:19 +01:00
Daniel Gultsch 6db012ac6f ui for registry. 2014-03-13 04:21:59 +01:00
Daniel Gultsch a80e3131be contact picture generation centralized + basic registry stuff 2014-03-13 03:52:41 +01:00
Daniel Gultsch eadebeb77c added server info and deal with thi 'connecting...' bug 2014-03-12 22:31:50 +01:00
Daniel Gultsch c67238562a fixed #9 2014-03-12 19:56:06 +01:00
Daniel Gultsch 848fb2ec24 fix for otr problems 2014-03-12 19:47:42 +01:00
Daniel Gultsch d943e218a4 make conference notificaton optional 2014-03-12 14:55:23 +01:00
Daniel Gultsch 33f8747b87 notifications support vibration now 2014-03-12 01:49:11 +01:00
Daniel Gultsch 01e2a3a4cd display contact picture in notification 2014-03-11 21:56:37 +01:00
Daniel Gultsch 82fa29bfc5 possible fix for #9 2014-03-11 17:47:05 +01:00
Daniel Gultsch 11a8a747e3 fixed bug with disabling accounts 2014-03-11 16:49:42 +01:00
Daniel Gultsch 838270432f cleaner/better logging 2014-03-11 16:27:33 +01:00
Daniel Gultsch 0d516b0603 ping stuff 2014-03-11 15:44:22 +01:00
Daniel Gultsch 08023210ba basic stream managment functionality 2014-03-11 02:53:10 +01:00
Daniel Gultsch e441005c87 cleanup 2014-03-11 02:52:41 +01:00
Daniel Gultsch 05694b4c06 fixed null pointer 2014-03-10 22:05:25 +01:00
Daniel Gultsch a5de5060a9 another possible fix for notificationgate 2014-03-10 21:52:58 +01:00
Daniel Gultsch baf0d64787 exception handler 2014-03-09 13:21:28 +01:00
Daniel Gultsch 91130612d4 cleanup 2014-03-09 12:58:29 +01:00
Daniel Gultsch d543d377b7 possible null pointer fix 2014-03-09 03:33:32 +01:00
Daniel Gultsch a8dd6794f3 sending named presence 2014-03-09 03:24:59 +01:00
Daniel Gultsch 6ec5b2f055 possible bug fix for notificationgate 2014-03-08 21:22:54 +01:00
Daniel Gultsch d7ab7715ed couple of otr related bug fixes and basic ping 2014-03-08 20:14:47 +01:00
Daniel Gultsch 5a4328db7d fixed #4 - this happend when you would archive (leave) the last conversation 2014-03-08 13:40:20 +01:00
Daniel Gultsch aa31732ea3 last part. update notification if user reads them 2014-03-08 06:25:35 +01:00
Daniel Gultsch 83c5fdaf0e step three. unread if sent msg in muc arrives. to cryptic? it does awesome shit to you 2014-03-08 06:04:06 +01:00
Daniel Gultsch 9a5a429888 step two towards nicer notifications. mark read if carbon arrives 2014-03-08 05:59:31 +01:00
Daniel Gultsch 02883a7ac4 first step towards nicer notifications 2014-03-08 05:46:20 +01:00