moparisthebest/Conversations
1
0
Fork 0
mirror of https://github.com/moparisthebest/Conversations synced 2024-11-14 04:55:04 -05:00
Code Issues Releases Wiki Activity
682 Commits 5 Branches 73 Tags 39 MiB
da0b426125
Commit Graph

398 Commits

Author SHA1 Message Date
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