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

1583 commits

Author SHA1 Message Date
iNPUTmice 8cb97f517f small bug fix 2014-11-10 23:47:04 +01:00
iNPUTmice dc98b3dbd5 added snackbar to indicate smp. more error handling in verify activity 2014-11-10 22:03:23 +01:00
iNPUTmice 8740b55d37 initial smp support 2014-11-10 19:23:54 +01:00
iNPUTmice c8a6b05163 made Jid class parse otr session ids 2014-11-10 11:37:31 +01:00
iNPUTmice 89ee999e1b more refactoring for presence selection. removed getTo, getFrom and getJid from Element 2014-11-10 01:24:35 +01:00
iNPUTmice 26b4788733 formating 2014-11-09 21:27:37 +01:00
Daniel Gultsch a01ff66537 Merge pull request #645 from betheg/about_all_libs 
add all used libs to the pref_about_message
 2014-11-09 21:18:32 +01:00
iNPUTmice 72068d1a26 fixed private messages 2014-11-09 21:14:37 +01:00
Michael b1da9ae3cc add libidn to pref_about_message. 2014-11-09 21:02:35 +01:00
Sam Whited 385bea0fe3 s/getResourcepart().isEmpty()/isBareJid()/ 2014-11-09 13:13:19 -05:00
iNPUTmice 56b4ac1751 use isBareJid instead of getResourcePart().isEmpty() 2014-11-09 19:06:43 +01:00
iNPUTmice eb9e988361 fixed muc sender history for some cases (where the previous nick was a valid jid) 2014-11-09 18:24:01 +01:00
iNPUTmice 69ef17efc0 migrated some otr stuff to new jid classes 2014-11-09 17:46:00 +01:00
iNPUTmice c310ada8b3 Merge branch 'development' of https://github.com/siacs/Conversations into development 2014-11-09 17:05:20 +01:00
Daniel Gultsch cb1a36da79 Merge pull request #642 from SamWhited/accountgetjid 
Rework `Account.getJid()' to return full JIDs
 2014-11-09 17:06:09 +01:00
iNPUTmice e9af0d4ca7 Merge branch 'master' into development 2014-11-09 17:02:49 +01:00
iNPUTmice 61f046a675 make avatar service not break on empty names 2014-11-09 17:02:39 +01:00
Sam Whited 180a0e4408 Rework `Account.getJid()' to return full JIDs 
Remove `Account.getFullJid()'
 2014-11-09 10:57:22 -05:00
iNPUTmice ad6fef063b fixed null pointer in message merger 2014-11-09 16:47:31 +01:00
iNPUTmice 377bd49ee8 refactored code to always contain full jid for counterpart 2014-11-09 16:21:13 +01:00
iNPUTmice 2b99b694eb fixed full jid for account 2014-11-09 16:20:36 +01:00
iNPUTmice 87c4fd9050 return null if from ist not set in abstract stanza 2014-11-09 16:18:53 +01:00
Daniel Gultsch 8437dbd480 Merge pull request #641 from kruks23/translation8 
Update Spanish Translations
 2014-11-09 15:20:25 +01:00
Sam Whited 53c7905631 Check for illegal arguments to the toASCII func 2014-11-09 09:05:02 -05:00
Michael f146c203a9 add all used libs to the pref_about_message. 
also improve the notice a bit.
 2014-11-09 13:59:38 +01:00
kruks23 6f6f15d563 Update Spanish Translations 2014-11-09 13:29:30 +01:00
Sam Whited 7cfcf10f48 Fix contact highlighting in MUC 2014-11-09 07:20:08 -05:00
Sam Whited fc594e9b73 Fix issue with IDN SRV records 2014-11-09 07:00:40 -05:00
Sam Whited 02db197a89 Fix crash on account creation 2014-11-09 07:00:40 -05:00
Sam Whited cc34c60255 Don't crash on packets with no "from" specified 2014-11-09 07:00:40 -05:00
Sam Whited 1a3327f2b1 Create avatar's for JID's w/o localparts 2014-11-09 07:00:40 -05:00
Sam Whited 5ce0cd3802 Fields that we sync on should be final 2014-11-09 07:00:40 -05:00
Sam Whited e49c2b14ed Fix bug introduced by rebase 2014-11-09 07:00:40 -05:00
Sam Whited 778fb9de6c Fix letter avatar selection in MUC 2014-11-09 07:00:40 -05:00
Sam Whited efa4cec24d More formatting fixes in MUC 2014-11-09 07:00:40 -05:00
Sam Whited dd426ca6de Format contact names in MUC properly 2014-11-09 07:00:40 -05:00
Sam Whited 1f5908b1d1 Fix JID parsing error 2014-11-09 07:00:40 -05:00
Sam Whited 9db624ec7b It builds again! 2014-11-09 07:00:40 -05:00
Sam Whited 864f319500 Add a packet JID place I missed... 2014-11-09 07:00:40 -05:00
Sam Whited f108fc5a5c Update more files to use JID objects 2014-11-09 07:00:40 -05:00
Sam Whited bf9207456e Update another chunk of stuff to use JID objects 2014-11-09 07:00:40 -05:00
Sam Whited f15900426d Update more files to use JID objects 2014-11-09 07:00:40 -05:00
Sam Whited 9053f4aca0 Move a chunk of classes over to using JID objects 2014-11-09 07:00:40 -05:00
Sam Whited a990861316 Use factories to generate JIDs 2014-11-09 06:59:49 -05:00
Sam Whited a11878b139 Improve JID error handling 2014-11-09 06:59:49 -05:00
Sam Whited 8e23b6c272 Add first attempt at JID class 2014-11-09 06:59:49 -05:00
iNPUTmice 589bf01545 version bump to 0.8.3 + changelog 2014-11-09 11:08:09 +01:00
iNPUTmice 4d7bee2e38 fixed #634 2014-11-09 10:51:54 +01:00
iNPUTmice 6f24432ae3 use proper theme for MTM 2014-11-09 10:51:35 +01:00
iNPUTmice acfbd44529 got rid of MTM and mRandom variable in favor of using a reference to service 2014-11-09 10:50:45 +01:00
iNPUTmice 047aaf5d4f check if socket was null before doing ssl connect 2014-11-08 20:52:02 +01:00
iNPUTmice ea657ece0d update conversation fragment on every backend connect 2014-11-08 20:51:27 +01:00
Daniel Gultsch 8a2f20b6ed Merge pull request #549 from emdete/p2 
adjust api level wrapping
 2014-11-08 13:32:13 +01:00
iNPUTmice 014f5a195b bug fixes for the previous ui refactoring 2014-11-07 21:49:31 +01:00
iNPUTmice e45d7bda38 UI code refactoring 2014-11-07 15:38:59 +01:00
iNPUTmice e42b6d715b fixed #633 2014-11-06 17:25:14 +01:00
iNPUTmice dace729c5b don't show avatar on initial account creation 2014-11-06 16:51:50 +01:00
iNPUTmice 413623337b version bump to 0.8.2 2014-11-06 10:32:04 +01:00
iNPUTmice 2253814519 fixed notifications for images 2014-11-05 21:37:40 +01:00
iNPUTmice 6a43bda4d7 fixed #617 2014-11-05 00:06:07 +01:00
iNPUTmice f8d5d6b2b5 reformated license a bit 2014-11-04 23:47:15 +01:00
Daniel Gultsch 0c94804813 Merge pull request #626 from SamWhited/issue612 
Add last seen info to the database
 2014-11-04 22:59:32 +01:00
iNPUTmice 7d4e03cc9a Merge branch 'development' of https://github.com/siacs/Conversations into development 2014-11-04 22:56:36 +01:00
Sam Whited 96563aca52 Add last seen info to the database 
Fixes #612
 2014-11-04 16:41:35 -05:00
M. Dietrich e22d3b4946 adjust api level wrapping 2014-11-04 20:05:45 +01:00
Sam Whited df786cbf01 Shorten license text and fix height of scrollview 2014-11-04 13:26:48 -05:00
Sam Whited 7b67f1a19c Use normal text size and color 2014-11-04 13:17:15 -05:00
Sam Whited 55c81eaf15 Make links clickable in about text 2014-11-04 13:09:56 -05:00
iNPUTmice 88c0793694 link to account details when touching own avatar 2014-11-04 18:52:29 +01:00
Sam Whited f10dd428ba Convert about dialog to activity 2014-11-04 12:48:46 -05:00
Sam Whited 97b4b012d0 Use real copyright symbol © 2014-11-04 12:48:25 -05:00
Sam Whited 8bf40308c8 Move AboutDialog to correct path 2014-11-04 12:47:58 -05:00
Sam Whited df54ee75b4 Add about dialog with license info 2014-11-04 12:47:58 -05:00
iNPUTmice ff10b094a0 clear avatar cache after nick name change 2014-11-04 18:27:20 +01:00
Daniel Gultsch ff22f93185 Merge pull request #625 from SamWhited/linterfix 
Make linter ignore properly checked API mismatch
 2014-11-04 17:59:26 +01:00
Sam Whited b234b690c9 Make linter ignore properly checked API mismatch 2014-11-04 11:52:47 -05:00
iNPUTmice cd5a56e8e7 show avatar in editaccount 2014-11-04 17:38:41 +01:00
iNPUTmice b824e55277 register nfc callback in every activity that provides a proper sharable uri 2014-11-04 17:10:35 +01:00
M. Dietrich 2ce95b19a9 optimize code abit 2014-11-04 13:32:44 +01:00
M. Dietrich b6c20d9260 implement "correct" ndef parsing 2014-11-04 13:32:37 +01:00
iNPUTmice b3582c970e made qr code available from muc and contact details as well 2014-11-04 12:15:14 +01:00
iNPUTmice 12e2f0bdd7 added missing return statement. fixed api bug 2014-11-04 11:04:05 +01:00
M. Dietrich fb24bf98c9 be more OO 2014-11-04 10:49:10 +01:00
M. Dietrich 32396b3bde support pre JELLY_BEAN ndef 2014-11-04 10:48:59 +01:00
iNPUTmice 7a9327d960 fixed nfc. react to ?join uris. some refactoring. code cleanup. thanks to @emdete 2014-11-03 23:47:49 +01:00
iNPUTmice d458919c8f unfinishd qr code implemenation. thanks to @emdete 2014-11-03 22:47:07 +01:00
iNPUTmice 08cb23a886 fixed merge error 2014-11-03 21:22:26 +01:00
iNPUTmice 7d7be8efd8 Merge branch 'nfc' of https://github.com/siacs/Conversations into nfc 
Conflicts:
	src/main/AndroidManifest.xml
 2014-11-03 21:07:24 +01:00
iNPUTmice a054a3fbb4 use different filter for nfc intents 2014-11-03 21:04:22 +01:00
iNPUTmice 28a186cd6c basic beam code / untested 2014-11-03 20:55:46 +01:00
iNPUTmice 4614ff343e create file explicitly before downloading image 2014-11-03 20:55:31 +01:00
iNPUTmice c48407f3b4 Merge branch 'development' of https://github.com/siacs/Conversations into development 2014-11-03 20:28:58 +01:00
iNPUTmice 696dd07a41 basic beam code / untested 2014-11-03 20:00:20 +01:00
iNPUTmice ec9c264cf7 more error handling for http connection 2014-11-03 19:59:11 +01:00
Sam Whited 39ae34d3e6 Wrap "last seen" time. 
Fixes #611
 2014-11-03 08:28:20 -05:00
iNPUTmice 3e05ef77b1 version bump to 0.8.1 2014-11-03 11:20:51 +01:00
iNPUTmice 49920649db always use exif helper 2014-11-03 11:20:32 +01:00
iNPUTmice 27f42dfb63 more error handling in xmppconnection 2014-11-03 10:03:45 +01:00
iNPUTmice 1ea2e7dc3b fixed arrayoutofbounds + spelling 2014-11-01 14:33:34 +01:00
Sam Whited 46f147a82c Merge branch 'gradle' into development 
Conflicts:
	.gitignore
	CHANGELOG.md
	README.md
	libs/MemorizingTrustManager
	libs/minidns
	libs/openpgp-api-lib
 2014-10-30 15:33:13 -04:00
iNPUTmice 7b4f3637db only end otr session if there is more than one contact presence. reset otherwise 2014-10-30 10:59:41 +01:00
iNPUTmice e4567e7a62 cleanup for clear conversation history. small otr fixes 2014-10-30 00:31:44 +01:00
iNPUTmice 1b62d94093 replace the exif interface with a small static class from 3d gallery 2014-10-29 18:12:32 +01:00
iNPUTmice 03593ba56f proper error state for images 2014-10-29 11:31:03 +01:00
iNPUTmice 64209829f7 fixed 'share image' context menu 2014-10-29 09:57:34 +01:00
iNPUTmice bb26a84269 fixed intent managment 2014-10-29 09:57:03 +01:00
iNPUTmice 962e8183f6 end otr session if plain text message from another instance is being received 2014-10-28 18:02:12 +01:00
iNPUTmice f256a466d8 improvements on findConversation 2014-10-28 17:15:35 +01:00
iNPUTmice 161623eca2 always show verify fingerprint if there is an active otr session 2014-10-28 17:15:13 +01:00
iNPUTmice 7dcce220cb reworked dns retry 2014-10-27 21:48:25 +01:00
iNPUTmice 915def24f9 removed unnecessary logging from avatar service 2014-10-27 21:48:09 +01:00
iNPUTmice 698572d218 proper cleanup after pgp image decryption 2014-10-27 21:47:41 +01:00
iNPUTmice f45a841caf fixed url parsing 2014-10-27 21:47:17 +01:00
iNPUTmice da822ebae8 check for links in pgp encrypted messages as well 2014-10-27 11:00:03 +01:00
iNPUTmice b045dea549 set divider for image meta information to '|' to not conflict with URL. breaks images downloaded in between 0.7.3 and now 2014-10-26 20:18:57 +01:00
Daniel Gultsch d86b7f3192 Merge pull request #588 from betheg/remove_unused_cast 
remove some unused cast
 2014-10-26 20:17:50 +01:00
Michael 020dc863b1 remove some unused cast 2014-10-26 18:54:10 +01:00
Michael 8dae4b1eb9 fix possible fallthrough. 2014-10-26 18:30:58 +01:00
iNPUTmice 8171633eb9 don't merge downloadable messages 2014-10-24 23:18:19 +02:00
iNPUTmice 8fb8985412 added message option to download images 2014-10-24 19:30:03 +02:00
iNPUTmice e1f11a5735 also show some text in new image notification 2014-10-24 18:27:53 +02:00
iNPUTmice 864f3610b3 picture notification and some drive by bug fixes 2014-10-24 14:34:46 +02:00
iNPUTmice cbc3d9bd6f notify only after image has been received over http. introduced mini grace for catching up with SM or offline messages 2014-10-24 13:29:18 +02:00
iNPUTmice d73a77643d context menu for messages. allow to resend single messages 2014-10-23 21:27:41 +02:00
Sam Whited 281ce3105f Make conversations the root project 2014-10-22 15:47:11 -04:00
iNPUTmice d04afe453a ability to download pgp encrypted files over http as well 2014-10-22 19:05:15 +02:00
iNPUTmice c067bf96b0 small bug fixes for the conversation activity 2014-10-22 17:32:59 +02:00
iNPUTmice 62b0fc3fda made httpconnection accept aes encrypted files 2014-10-22 13:06:46 +02:00
iNPUTmice 45bdadd915 better aproach on thread saftey 2014-10-22 00:25:28 +02:00
iNPUTmice df2257aed6 added hostname verifier to httpconnection 2014-10-22 00:00:01 +02:00
iNPUTmice 40c74b432e made iterating over hashmap in notification service thread safe 2014-10-21 23:59:02 +02:00
iNPUTmice 63704b114c throw exception when no servers are left to try 2014-10-21 20:13:06 +02:00
iNPUTmice 3821a72644 fixed #564 2014-10-21 19:43:34 +02:00
iNPUTmice a56ee63a3e update ui when new avatar was found 2014-10-21 15:26:17 +02:00
iNPUTmice 0d767c3971 proper avatar caching 2014-10-21 14:57:16 +02:00
iNPUTmice 21961673cb refactored avatar generation. first step 2014-10-20 21:08:33 +02:00
iNPUTmice 0bb2c3c4d5 keep reference to previous and next message in message 2014-10-20 17:01:37 +02:00
Daniel Gultsch 0b61fb0129 Merge pull request #554 from SamWhited/tls 
Enable TLSv1.1 and 1.2 and add option to enable/disable SSLv3
 2014-10-20 00:03:32 +02:00
iNPUTmice 8263e07336 mtm support for image downloader 2014-10-19 23:42:53 +02:00
iNPUTmice 44f9022d95 use new 'api' to add messages to a conversation 2014-10-19 23:15:24 +02:00
iNPUTmice c9238ef5ae force tls for registrations as well 2014-10-19 23:14:17 +02:00
iNPUTmice a201f9e53f got rid of copyonwrite array list for messages 2014-10-19 23:13:55 +02:00
Sam Whited 99ee049115 Make legacy SSL option default to false 2014-10-19 16:11:35 -04:00
Sam Whited 6c7c3ddf15 Add "Enable legacy SSL" preference 2014-10-19 15:53:03 -04:00
iNPUTmice e8bf75d79b force tls 2014-10-19 20:48:01 +02:00
iNPUTmice f824193c56 Merge branch 'srv_fix' of https://github.com/lactide/Conversations into lactide-srv_fix 2014-10-19 20:17:12 +02:00
Sam Whited 113b7d1736 Remove support for legacy SSL 2014-10-18 20:22:26 -04:00
iNPUTmice 0605390144 do not attempt to download images when not connected 2014-10-17 13:09:02 +02:00
iNPUTmice 3372e50155 made grace period on a per account basis 2014-10-17 11:01:38 +02:00
Frank Zschockelt c725da954c try all srv responses if necessary 2014-10-16 23:31:48 +02:00
iNPUTmice 5e3caf9626 additonal safty net for disabling notifications 2014-10-16 19:10:37 +02:00
iNPUTmice 0fd634ae52 simplified determination whether otr needs starting in a session 2014-10-16 16:09:54 +02:00
Sam Whited c4b9d42861 Enable all supported protocols including TLSv1.1 and 1.2 2014-10-16 10:02:47 -04:00
iNPUTmice c1a55608df log ending otr sessions on disconnect 2014-10-16 15:53:44 +02:00
iNPUTmice 6cfb14a2e4 forground/background logging without csi 2014-10-16 15:39:09 +02:00
iNPUTmice 45e0f99b88 make image download message to type=image only after completion 2014-10-16 15:29:39 +02:00
iNPUTmice 88d88ffb7b added file observer to get notified when files are deleted: fixes #396 2014-10-16 02:39:02 +02:00
iNPUTmice f5019ba966 detect deleted files on start up. got rid of lagecy image provider for performance reasons. NOTE: this will prevent you to access images older than version 0.6 2014-10-15 22:08:13 +02:00
iNPUTmice cb4069f0f2 refactored file download status. make image http download available for carbon copied (sent) messages as well 2014-10-15 19:32:12 +02:00
Daniel Gultsch 1927a3d99c Merge pull request #547 from emdete/p0 
remove warning about <> cast
 2014-10-15 15:38:33 +02:00
M. Dietrich f021ee8562 remove warning about <> cast 2014-10-15 15:25:36 +02:00
iNPUTmice 9d960f2741 synchronization for listeners 2014-10-15 14:41:27 +02:00
iNPUTmice f063b1c063 synchronization for notification 2014-10-15 14:33:13 +02:00
iNPUTmice 1428628a5d removed unecessary update 2014-10-15 14:32:37 +02:00
iNPUTmice d09739d166 changed pgp decoding mechanism 2014-10-15 02:09:20 +02:00
iNPUTmice 3c557a1bb4 don't show invalid file size 2014-10-14 19:33:35 +02:00
iNPUTmice 262128c8f9 recreate http connection after restart. fixes stale download button. better failing 2014-10-14 19:27:49 +02:00
iNPUTmice 031b739af8 catch can't open database exception 2014-10-14 18:26:45 +02:00
iNPUTmice e98460771b read image bounds on downloaded image 2014-10-14 18:16:03 +02:00
iNPUTmice 470410b389 possible work around for notification bug 2014-10-14 17:14:07 +02:00
iNPUTmice c18e986a93 fixed rare npe 2014-10-14 16:25:59 +02:00
iNPUTmice 4fdc6b2eac renaming 2014-10-14 12:02:48 +02:00
iNPUTmice bbb0693f4a basic image over http downloading 2014-10-14 01:06:45 +02:00
Daniel Gultsch 7e373bc89f Merge pull request #543 from emdete/dedepricate 
use setAlpha(float) method, not the deprecated one
 2014-10-13 18:15:51 +02:00
iNPUTmice d61e4cce10 reworked muc details and contact details a bit 2014-10-13 14:36:19 +02:00
M. Dietrich a42f0dd3bc use setAlpha(float) method, not the depricated one 2014-10-13 14:08:10 +02:00
iNPUTmice 2ec021a426 redesigned contact details a bit 2014-10-13 12:36:41 +02:00
iNPUTmice c6f9b23def fixed npes 2014-10-09 23:08:40 +02:00
M. Dietrich ce446840fc remove this.this member 2014-10-08 16:54:42 +02:00
iNPUTmice 10411944b1 bullet proofing some code 2014-10-08 14:10:37 +02:00
iNPUTmice 3d88ffc5cd fixed possible logout bugs 2014-10-08 12:21:58 +02:00
iNPUTmice 3737a96dbb refactored read marker 2014-10-07 16:02:52 +02:00
iNPUTmice 919c98207b made disabled notifications permanent across restarts 2014-10-07 15:18:09 +02:00
iNPUTmice d5227e5c25 refactored grace period 2014-10-07 13:37:50 +02:00
iNPUTmice 7f52435273 fixed regression of not showing status message 2014-10-07 11:51:16 +02:00
iNPUTmice b6f5e4a217 cleanung up the scroll fix a little 2014-10-06 22:03:01 +02:00
iNPUTmice 0a93093bc7 fixed npe 2014-10-06 19:27:58 +02:00
iNPUTmice 16d5429f80 muc options clean up 2014-10-06 13:34:19 +02:00
iNPUTmice b788b84c31 refactored muc bookmark to extend element. keep all elements the server or other clients added before 2014-10-06 00:33:52 +02:00
iNPUTmice 6b3097ee27 only delivery get and set iq packets to unhandled iq listener. only create jingle packets with type=get or set 2014-10-05 14:26:06 +02:00
iNPUTmice ddb76b0e73 fixed rare npe 2014-10-05 14:05:46 +02:00
Daniel Gultsch f7f7a73ce7 Merge pull request #524 from betheg/muc_errors_conditions 
MUC: differentiated a few more errors.
 2014-10-05 13:18:28 +02:00
Daniel Gultsch bf893bee08 Merge pull request #523 from betheg/leaked_window 
fixed an 'activity has leaked window'
 2014-10-05 13:18:18 +02:00
Michael 54e9235bfc MUC: differentiated a few more errors. 2014-10-05 12:31:49 +02:00
iNPUTmice 4a260baa12 fixed #510 2014-10-05 12:05:27 +02:00
iNPUTmice 26ce62f365 end otr session instead of only resetting 2014-10-05 11:14:50 +02:00
iNPUTmice 45bd0449fb sending initial ping before going online after login/resume to ensure that all presences and messages have been loaded 2014-10-05 10:46:31 +02:00
Michael 5250ef536f fixed an 'activity has leaked window' 2014-10-04 18:32:05 +02:00
iNPUTmice 5371dd025a no dns retry after nosrv error 2014-10-04 14:33:14 +02:00
iNPUTmice d5e62ffe89 added missing status messages after message scroll 2014-10-04 14:32:51 +02:00
iNPUTmice 79315bdd61 reset pending subscription request 2014-10-04 14:32:11 +02:00
iNPUTmice 18409946c6 implemented ping (xep-0199) fixed #517 2014-10-03 19:24:10 +02:00
Michael 9a4b48d1ec let's own otr-fingerprint copy to clipboard. 2014-10-03 16:20:39 +02:00
iNPUTmice 9ae52a235f revised tablet ui. fixed #423 2014-10-03 15:00:29 +02:00
iNPUTmice 0e56ff93e9 fixed possible npe 2014-10-03 11:55:38 +02:00
iNPUTmice facd15f037 check if display is off for notifications 2014-10-02 22:17:25 +02:00
iNPUTmice f671938e84 mark conversation as read when displayed marker from another client is received 2014-10-02 21:07:11 +02:00
iNPUTmice cc76e15b95 avoided unecessary message searchs 2014-10-02 18:54:21 +02:00
iNPUTmice f8be57d43f show displayed by contact on all devices 2014-10-02 18:31:19 +02:00
iNPUTmice 4b09f0e9d3 properly dismiss notifications 2014-10-02 17:36:02 +02:00
iNPUTmice fd6f5b0e84 calculate sample size for thumbnails as well 2014-09-30 16:22:02 +02:00
Daniel Gultsch 0733a94127 Merge pull request #505 from betheg/fix_invite 
fixed muc invite with <body/>.
 2014-09-30 11:53:07 +02:00
Daniel Gultsch 511b7a53f4 notifiy only when necessary 2014-09-29 18:28:13 +02:00
Michael c8160b010d fixed muc invite with <body/>. 2014-09-29 17:59:53 +02:00
Daniel Gultsch 87010e6094 more improvments for new notification service 2014-09-28 16:33:25 +02:00
Daniel Gultsch bff23c2e23 new notification service. first draft 2014-09-28 15:21:56 +02:00
iNPUTmice 1ae9338fc9 made muc passwords and prefereced encryption method persistant across restarts 2014-09-27 18:16:31 +02:00
Michael 1d3a6125d2 add false argument to inflate. 2014-09-27 16:45:37 +02:00
iNPUTmice 2415781ebf fixed some lint warnings. thanks @betheg 2014-09-27 11:46:56 +02:00
iNPUTmice 8fb0fb0c0d anwser to xmpp: style uris. fixed open conversations from android address book 2014-09-27 11:37:02 +02:00
iNPUTmice 6e77343407 revised send button in landscape mode 2014-09-27 10:51:46 +02:00
iNPUTmice 54278febb4 changed method that determins whether or not sm is available 2014-09-23 15:36:20 +02:00
iNPUTmice 248a1693ea refactored options menu handling a bit 2014-09-23 15:06:49 +02:00
iNPUTmice b14f693c2e dont mark message as send on resend 2014-09-23 11:49:17 +02:00
iNPUTmice 12c2fde61b fixed rare npe 2014-09-23 11:48:48 +02:00
iNPUTmice 59009ded82 fixed very rare npe 2014-09-22 16:04:37 +02:00
iNPUTmice 45aede14bd fixed #452 2014-09-22 13:23:35 +02:00
iNPUTmice bb065020ff don't show time stamp within the last 6 hours of a new day 2014-09-22 11:00:46 +02:00
iNPUTmice c2bc15f5ba added 'model' to selectable resources. fixed #461 2014-09-22 11:00:13 +02:00
iNPUTmice 1f91ed11fa show full date in message list, fixed #328 2014-09-21 23:16:23 +02:00
iNPUTmice 98a8fd4d05 changed message merger a bit 2014-09-21 22:58:19 +02:00
iNPUTmice cca5865ecb fixed #454 - added fast srcolling to some lists 2014-09-21 00:45:07 +02:00
Daniel Gultsch d806923d57 Merge pull request #460 from betheg/receipts 
indicates received messages with a tick.
 2014-09-20 19:55:53 +02:00
iNPUTmice 37aacbeb74 fixed presence splitting 2014-09-20 16:26:40 +02:00
iNPUTmice 0b86f65bdc fixed #470 2014-09-20 16:02:49 +02:00
Michael a86a09ab5b indicates received messages with a tick. 2014-09-20 15:49:25 +02:00
iNPUTmice 295bfb7f1d made xmppconnection service available in generators 2014-09-20 15:29:06 +02:00
iNPUTmice c282ef4645 scroll fixes 2014-09-19 21:09:54 +02:00
iNPUTmice 2a185c8fc9 background daemon doesn't start automatically if there are no enabled accounts. fixed #443 fixed #442 2014-09-19 17:21:33 +02:00
iNPUTmice 3da0d5adce fixed #462 2014-09-19 14:35:35 +02:00
Daniel Gultsch 8796af22d1 Merge pull request #448 from betheg/add_break 
add a forgotten break and remove some unused imports
 2014-09-19 10:32:40 +02:00
Michael b9e7f4870c add a forgotten break and remove some unused imports 2014-09-13 21:15:45 +02:00
Michael 00ff5c2dbd MUC: notify also on private messages 2014-09-13 14:02:14 +02:00
Michael 0d873903b8 add proper namespace in carbon 2014-09-12 20:14:19 +02:00
iNPUTmice db816187f8 check if market is available before starting to install openkey chain 2014-09-11 18:02:09 +02:00
iNPUTmice dee46f3453 match color in contact details to the colors in the send button. also migrated some other colors from hard coding to using resources 2014-09-11 14:24:10 +02:00
iNPUTmice ff41918cb7 missed show=chat for send button colorization 2014-09-11 13:19:46 +02:00
iNPUTmice fef41ba2a2 pare body in type=normal messages as well 2014-09-11 13:18:29 +02:00
iNPUTmice 31f11070e3 IT'S CHRISTMAS ALREADY! 2014-09-10 17:59:57 +02:00
iNPUTmice 4b2e06b9c3 version bump, changelog and one last minute change for OTR 2014-09-09 14:30:16 +02:00
iNPUTmice c02ef80086 Merge branch 'master' of github.com:siacs/Conversations 
Conflicts:
	src/eu/siacs/conversations/crypto/PgpEngine.java
	src/eu/siacs/conversations/persistance/FileBackend.java
	src/eu/siacs/conversations/ui/ShareWithActivity.java
 2014-09-09 14:16:51 +02:00
iNPUTmice facb1242b6 don't reset images from sending to waiting 2014-09-09 13:56:30 +02:00
iNPUTmice d92e8381db setting to increase font size. fixed #420 2014-09-08 23:58:37 +02:00
iNPUTmice 1871521aed simplefied some code that might have been the source for some strange bugs 2014-09-08 20:29:57 +02:00
iNPUTmice b23f8bd472 introduced downloadable interface. reverted some of the changes made to OTR 2014-09-08 20:09:44 +02:00
iNPUTmice a6f0f0cb6e bug fixes for forcing encryption 2014-09-08 14:29:35 +02:00
iNPUTmice 5cb11396f6 fixed sending offline pgp messages 2014-09-08 14:08:59 +02:00
iNPUTmice 58953e6193 settings to force encryption and setting for not saving messages to disk. fixed #353 2014-09-08 13:37:22 +02:00
iNPUTmice 3b9fd28ef4 don't fail displayed or received messages 2014-09-08 12:51:01 +02:00
iNPUTmice 19f98f5143 warn on missing presence subscription 2014-09-08 12:46:48 +02:00
iNPUTmice 409fdd8596 Merge branch 'development' of github.com:siacs/Conversations into development 2014-09-07 23:08:57 +02:00
iNPUTmice 449c2a544b fixed #321 - delete otr fingerprints 2014-09-07 23:08:40 +02:00
Daniel Gultsch 5fe3f207d4 Merge pull request #426 from betheg/remove_strings 
deleted some unused string-resources and imports, also deleted edit_account_dialog.xml.
 2014-09-07 17:13:10 +02:00
iNPUTmice 90947597e5 fixed #425 2014-09-07 16:53:10 +02:00
Michael f4d86ecff3 deleted some unused string-resources and imports, also deleted edit_account_dialog.xml. 2014-09-07 15:58:59 +02:00
iNPUTmice 27ad80afc2 trying to avoid rejectedexection 2014-09-07 15:11:40 +02:00
Michael ecd613dcdd MUC: set the password from bookmarks. 2014-09-07 14:06:23 +02:00
iNPUTmice d9990e6cd8 made shareing text with conferences possible again 2014-09-07 13:01:09 +02:00
iNPUTmice b334ebd0fa added missing breaks oO 2014-09-07 12:43:01 +02:00
iNPUTmice 890fb9a1b4 fixed npe 2014-09-07 00:09:12 +02:00
iNPUTmice 9a945af6b9 Merge branch 'development' of github.com:siacs/Conversations into development 2014-09-06 18:21:38 +02:00
iNPUTmice 0e5a0a07fd made otr a little bit more solid when there is no presence subscription 2014-09-06 18:21:31 +02:00
Michael 375ec3a686 MUC: set password from invite message. 2014-09-05 22:07:35 +02:00
iNPUTmice dc02137106 warn user if no presence subscription exists 2014-09-05 13:29:45 +02:00
iNPUTmice 34228d0e78 improved logging for avatar fetches 2014-09-05 13:29:20 +02:00
iNPUTmice b8d289a932 fixed #342 - otr with facebook and other services without resources 2014-09-04 19:56:37 +02:00
iNPUTmice 01389e900b reconnect accounts when resource has been changed in settings 2014-09-04 13:56:36 +02:00
iNPUTmice 9817251ed5 made muc password dialog hide the password (password field) 2014-09-04 11:46:13 +02:00
iNPUTmice 7a3bc5dc45 nick parsing (xep 0172) also enabled for messages and for pep 2014-09-04 10:50:06 +02:00
Daniel Gultsch 1d6c09e8ff Merge pull request #397 from GZep/development 
XEP-0172
 2014-09-04 10:28:13 +02:00
Daniel Gultsch 50f90d37b8 Merge pull request #417 from emdete/unicode_emoticons 
improve regex, implement pattern cache
 2014-09-04 10:16:28 +02:00
iNPUTmice 6b9219c5f4 added support for password protected muc - fixed #203 and fixed #395 2014-09-03 19:35:45 +02:00
iNPUTmice f19b1fb823 changed order of snackbar hints 2014-09-03 18:58:46 +02:00
M. Dietrich 0a2c73f246 improve emo mapping 2014-09-03 17:44:38 +02:00
M. Dietrich 0a686bc71c use class, use codepoint 2014-09-03 17:29:13 +02:00
M. Dietrich 584984807e make pattern static 2014-09-03 16:10:50 +02:00
M. Dietrich cb3ba4045e improve regex, implement pattern cache 2014-09-03 15:39:46 +02:00
iNPUTmice 2b941d19f8 more openpgp bug fixes 2014-09-03 15:39:35 +02:00
iNPUTmice 253438e698 more openpgp bug fixes 2014-09-03 15:33:44 +02:00
iNPUTmice 664c9c434f avoiding resource conflicts 2014-09-03 14:57:40 +02:00
iNPUTmice f1494f83ff fixed pgp signature creation 2014-09-03 13:06:06 +02:00
iNPUTmice 5ae62f18b4 fixed pgp signature creation 2014-09-03 13:05:22 +02:00
iNPUTmice 1a09a4706b added ability to disable notifications for specific conversations - fixed #322 2014-09-03 12:36:54 +02:00
iNPUTmice 1f378bffc8 made emoticon parsing enableable - default false 2014-09-03 09:15:07 +02:00
iNPUTmice 97b52abaf9 fixed #410 by removing that config option 2014-09-02 16:00:03 +02:00
iNPUTmice 0ae852a633 refactored share with activity 2014-09-02 15:51:20 +02:00
iNPUTmice 567827ffca fixed #406 2014-09-02 11:31:56 +02:00
iNPUTmice c62937016b rotate avatars 
Conflicts:
	src/eu/siacs/conversations/persistance/FileBackend.java
 2014-09-02 11:31:39 +02:00
iNPUTmice 2c9b2e6bf8 fixed #406 2014-09-02 11:27:43 +02:00
iNPUTmice f888b167c6 rotate avatars 2014-09-02 11:19:05 +02:00
Daniel Gultsch 6045bcc2eb Merge pull request #408 from emdete/unicode_emoticons 
add all whitespaces in regex
 2014-09-02 10:39:13 +02:00
M. Dietrich a7b3aa343e add all whitespaces in regex 2014-09-02 01:18:25 +02:00
Daniel Gultsch 6291ebf1a3 Merge pull request #380 from emdete/unicode_emoticons 
add translation from ascii to unicode emoticons
 2014-09-01 23:58:00 +02:00
M. Dietrich 546082147a transform ascii to emoticons (on display only) 2014-09-01 23:48:42 +02:00
iNPUTmice d42ea45b1c fixed #403 2014-09-01 14:03:21 +02:00
iNPUTmice a7881754f5 fixed #403 2014-09-01 13:51:49 +02:00
M. Dietrich 2acf510ea9 optimize string operations a bit 2014-09-01 10:40:45 +02:00
Gayaz Yusipov 5b24534ab6 Contact presenceName property 2014-08-31 23:14:05 +04:00
iNPUTmice 3558fa5f5b deleted unnecessary log 2014-08-31 21:02:14 +02:00
iNPUTmice 94389ac22a show merged time and status in message adapter 2014-08-31 18:55:15 +02:00
iNPUTmice bda7724e31 improvements for merge conditions 2014-08-31 18:21:46 +02:00
iNPUTmice 28fa48704d add missing blank before nick 2014-08-31 17:48:00 +02:00
Bahtiar `kalkin-` Gadimov 3e3451bcff Smarter nickname highlight insert in confernces 2014-08-31 17:24:52 +02:00
iNPUTmice 1ac5be4855 some code cleanup 2014-08-31 16:28:21 +02:00
Daniel Gultsch 8d456085e5 Merge pull request #391 from betheg/fix_typo 
fix forgotten spelling.
 2014-08-31 15:56:41 +02:00
iNPUTmice 1cc16161ef require encrypted to be the same for messages to get merged 2014-08-31 15:54:53 +02:00
iNPUTmice 8f8d4e320d experimental message merging 2014-08-31 14:29:12 +02:00
Michael 969cba5ee6 Merge remote-tracking branch 'upstream/development' into fix_typo 2014-08-30 14:00:53 +02:00
Gayaz Yusipov ec6220969d XEP-0172 2014-08-30 14:26:46 +04:00
iNPUTmice c494f4f7ae Merge branch 'sm' into development 
Conflicts:
	src/eu/siacs/conversations/services/XmppConnectionService.java
 2014-08-30 09:24:58 +02:00
iNPUTmice 4435b0055e reset unsend messages to waiting 2014-08-30 09:22:16 +02:00
iNPUTmice 9075d3854d properly set stanza count on session resume 2014-08-30 09:22:16 +02:00
iNPUTmice 4a6a6c8403 basic message acking 2014-08-30 09:22:16 +02:00
iNPUTmice 9de77b190b proper namespaces for xep-0352 2014-08-30 09:22:05 +02:00
iNPUTmice 6d82a69ba3 send inactive or active on every connect and resume 2014-08-30 09:22:05 +02:00
iNPUTmice 265bd06250 added basic csi 2014-08-30 09:22:05 +02:00
iNPUTmice 9ad5c6925d version bump to 0.6 with changelogs 2014-08-30 08:51:55 +02:00
iNPUTmice 8840d082ba brought npe catcher back for kxml parser 2014-08-30 08:31:05 +02:00
Michael 3714947d5f Merge remote-tracking branch 'upstream/development' into fix_typo 2014-08-29 23:30:47 +02:00
iNPUTmice 5450a2ae46 fixed link to old resource 2014-08-29 14:05:10 +02:00
iNPUTmice b0d777d9ca fixed npe 2014-08-29 12:14:10 +02:00
iNPUTmice 33172246c9 fixed #389 2014-08-29 10:24:25 +02:00
Michael 98dabe9ab4 fix forgotten spelling. 2014-08-28 16:49:52 +02:00
iNPUTmice 85b31b8d8b fixed spelling thanks @betheg 2014-08-28 11:01:24 +02:00
iNPUTmice 431d4ed44b translated missing string in settings 2014-08-27 09:43:53 +02:00
iNPUTmice 450b911cb2 fixing duplicate private muc messages 2014-08-25 19:20:53 +02:00
iNPUTmice 07b422d4c8 fixed message hint 2014-08-25 15:43:50 +02:00
iNPUTmice 4e791c8a01 fixed faulty db creation on first install 2014-08-24 20:53:13 +02:00
Daniel Gultsch a30bc8a3e2 use otr encrypiton instead of plain when contact has exactly one online presence and an otr fingerprint 2014-08-24 11:21:02 +02:00
Daniel Gultsch e0b759340d jump right into edit account if now accounts are configured 2014-08-23 21:31:27 +02:00
Daniel Gultsch d504daec16 changed workflow on inital avatar publication 2014-08-23 20:00:05 +02:00
Daniel Gultsch f7437ecc36 experimental muc message deduplication 2014-08-23 15:57:39 +02:00
Daniel Gultsch ee9872277d removed server compat value in favor of a (small xep list) 2014-08-23 15:56:30 +02:00
iNPUTmice 9b0bf9b5bc fixed another npe 2014-08-22 13:22:34 +02:00
iNPUTmice c40c8ee910 tiny redesign for private muc messages 2014-08-22 13:22:07 +02:00
iNPUTmice 4875b52f09 make avatars persisent / available even without internet 2014-08-21 12:32:50 +02:00
iNPUTmice 301477c764 save newly taken photos in DCIM dir 2014-08-21 09:19:18 +02:00
iNPUTmice 7808e5b77f added roster versioning to calculation of server compat 2014-08-21 07:47:40 +02:00
iNPUTmice 7f5456e41b check if service is bound before adding conferences or contacts 2014-08-21 07:46:55 +02:00
iNPUTmice 9f4043c679 avoid race condition for otr key in jingle 2014-08-21 07:39:14 +02:00
iNPUTmice bd467b6b9d deregister listener in editaccount 2014-08-21 07:38:44 +02:00
iNPUTmice 06da080371 revised manage account activity. removed contexual action mode 2014-08-20 11:32:49 +02:00
iNPUTmice 6345217328 fixed lint error 2014-08-19 15:27:26 +02:00
iNPUTmice 3b79cc2f23 better error display and additional infos (stats) for the edit account activity 2014-08-19 15:06:50 +02:00
iNPUTmice 38f36aa263 more error handling for avatar publication 2014-08-16 17:31:53 +02:00
iNPUTmice 5aa8afdc1c some improvements for the edit account activity 2014-08-16 09:44:37 +02:00
iNPUTmice 32c3dd4f4a moved add/edit account from dialog into seperate activity 2014-08-15 17:31:24 +02:00
iNPUTmice f7c747ef4b better handling of null streams 2014-08-15 13:34:55 +02:00
iNPUTmice 9c18d57e07 refactored Conversations Adapter into seperate class 2014-08-15 13:18:15 +02:00
iNPUTmice 2ab14a6ff2 fixed #356 2014-08-15 13:11:33 +02:00
iNPUTmice 48c780d15a fixed muc pm avatar 2014-08-14 22:09:03 +02:00
iNPUTmice e73a6525c7 fixed bug in caps hash generation. thanks Asterix of the Gajim project 2014-08-14 13:41:20 +02:00
iNPUTmice 510d8a2ae3 another rare npe fixed 2014-08-14 09:59:41 +02:00
iNPUTmice b2cc17c362 trying to fix rotation problems 2014-08-13 13:44:21 +02:00
iNPUTmice 457e7be5e2 fixed #348 2014-08-13 11:22:32 +02:00
iNPUTmice a4faa158c0 only notify ui on significant muc changes 2014-08-13 11:21:33 +02:00
iNPUTmice 07e6873025 try to make openpgp a little more reliable 2014-08-13 11:21:07 +02:00
iNPUTmice 5477ff1aea fixed weird snackbar click issues 2014-08-12 23:23:25 +02:00
iNPUTmice 721b308f28 fixed long press to bring back default in publish avatar activity 2014-08-12 21:03:45 +02:00
iNPUTmice 6952e630c4 show user name as well in confernce details if real name was shown 2014-08-12 11:36:47 +02:00
iNPUTmice 5ed9c2a805 show own avatar in muc details 2014-08-11 23:22:46 +02:00
iNPUTmice 8a82586d5b fixed avatar in notification 2014-08-11 23:18:16 +02:00
iNPUTmice f247abc2dc handle bare jid presences. fixes for otr 2014-08-11 13:46:32 +02:00
Daniel Gultsch 9960cb819e Merge pull request #344 from 1nsan3/development 
Hardware search button
 2014-08-11 12:52:03 +02:00
Gero Kraus 70423204f4 Updated StartConversationActivity to react on Search Button Pressing 2014-08-10 21:03:57 +02:00
iNPUTmice b35aa3ed07 added limited private muc chat feature (messages are now properly marked) - long press on user icon will sent private messages. fixed #259 2014-08-10 15:27:44 +02:00
iNPUTmice 6de53791b5 fixed rare npe after race condition 2014-08-10 14:04:59 +02:00
iNPUTmice 1a6e42e7c1 potential fix for rejected execution exception 2014-08-10 14:04:35 +02:00
iNPUTmice 0cda7f7819 work around xml parser issues... 2014-08-09 11:37:30 +02:00
iNPUTmice d486d5def9 trying to fix activity has been destroyed error 2014-08-09 11:37:05 +02:00
iNPUTmice a33bf0b4ae show add to roster dialog when trying to start otr session 2014-08-09 11:36:28 +02:00
iNPUTmice a059dfab2c fixed very rare npe 2014-08-09 11:35:49 +02:00
iNPUTmice 937fc51b50 added warning lable if server doesn't support pubsub. refactored feature identification into seperate class 2014-08-09 10:20:16 +02:00
iNPUTmice 0bab1a4613 bug fix for 'back to default' 2014-08-09 09:44:19 +02:00
iNPUTmice 96a41b5b51 ability to bring default picture back with long press in publish avatar 2014-08-09 09:38:52 +02:00
iNPUTmice f6615843f9 grant uri permission on share picture 2014-08-09 09:38:18 +02:00
iNPUTmice de2964cd25 more fixes for notfication in conferences 2014-08-09 09:37:37 +02:00
iNPUTmice 98a80ffc61 save images to external storage instead of internal. this requires more permissions. fixed #150 fixed #177 fixed #333 - this might need some more polish though 2014-08-08 11:49:23 +02:00
iNPUTmice 620d1df82e fixed #320 2014-08-07 14:09:52 +02:00
iNPUTmice 6536c1aeb1 bug fix for not working notification grace period in muc 2014-08-07 11:02:41 +02:00
iNPUTmice 2b4d9e8b60 fixed problems with sha sum calculation on avatar write. delete avatars with non matching sha sum 2014-08-06 18:36:33 +02:00
iNPUTmice ba63727f50 fetch missing avatars from server 2014-08-05 22:58:46 +02:00
iNPUTmice 08755e56a5 show own avatar after publication. no persistancy yet 2014-08-05 13:00:06 +02:00
iNPUTmice 9aba9a4059 error messages for publish avatar 2014-08-05 12:21:08 +02:00
iNPUTmice f8b4d5f338 publish avatars 2014-08-05 01:36:17 +02:00
iNPUTmice 629ff3afcd proper account send to publish avatar activity 2014-08-03 20:42:05 +02:00
iNPUTmice daab16bdef activity for future avatar publications. not working yet 2014-08-03 20:28:13 +02:00
iNPUTmice 88d1bd356c get rid of 'use phones self contact picture option' 2014-07-31 15:18:55 +02:00
iNPUTmice 990f0f6d73 refactored account array adapter into seperate class. added account image 2014-07-31 15:09:34 +02:00
iNPUTmice 27b306444b fixed #326 fixed #202 2014-07-31 13:26:05 +02:00
iNPUTmice 511f74116f fixed npe for the rare case that user has disabled his action bar 2014-07-30 21:30:55 +02:00
iNPUTmice 88e5713a80 fixed npe in start conversation activity 2014-07-30 21:26:33 +02:00
iNPUTmice bc24cf93ab fixed generation of muc pictures with copyonwrite user list 2014-07-30 21:25:59 +02:00
iNPUTmice fe46d36137 fixed rare npe in loading of selfi 2014-07-30 21:24:42 +02:00
iNPUTmice 1521b91b27 fixed #239 - show contact names and pictures in muc if real jid is known 2014-07-29 14:42:17 +02:00
iNPUTmice 4c90bd9b46 fixed bug in message parser 2014-07-27 22:31:33 +02:00
iNPUTmice 0e93e5ce52 trying to work around npe in androids xml parser 2014-07-27 19:06:08 +02:00
iNPUTmice f8fedeb697 fixe race conditons with newIntent 2014-07-27 19:05:39 +02:00
iNPUTmice 2e080401b1 migrated some ArrayLists to CopyOnWriteArrayLists 2014-07-27 18:07:04 +02:00
iNPUTmice 29f089c954 fixed npe with unsuccesfull bind 2014-07-26 15:44:32 +02:00
iNPUTmice 5182a92e58 fixed npe when user was very quick with starting to type in startConversationactivity 2014-07-26 15:44:13 +02:00
iNPUTmice 52ad718251 removed duplicates from muc suggestions 2014-07-24 17:21:21 +02:00
iNPUTmice c7c3db478a included version string in crash reports 2014-07-24 12:33:56 +02:00
iNPUTmice d108a5f2b6 removed more legacy tls error handling stuff 2014-07-24 01:39:46 +02:00
iNPUTmice deab99c997 removed outdated tls error 2014-07-24 01:37:38 +02:00
iNPUTmice 983104f2f0 presonalized read up to this point message 2014-07-24 01:17:34 +02:00
iNPUTmice 7ee2ef5233 answer correctly if both markers and receipts are requested 2014-07-24 01:04:25 +02:00
iNPUTmice 23e5fb5d56 fixed bug with otr session being initilized over and over again 2014-07-23 18:04:29 +02:00
iNPUTmice 5c118f6dd7 more disco. fixed chat markers with jappix 2014-07-23 14:30:27 +02:00
iNPUTmice 1f4ea552cd some cleanup 2014-07-22 18:58:20 +02:00
iNPUTmice 4607e2c546 switched to mtm 2014-07-22 17:27:44 +02:00
iNPUTmice 9fcc195a6d brought settings and manage account menu items back 2014-07-22 17:23:31 +02:00
Daniel Gultsch 84642b7492 refactored message adapter into seperate class 2014-07-22 15:31:54 +02:00
iNPUTmice 66e3ccc2dc save login nick for mucs during join 2014-07-21 22:57:41 +02:00
iNPUTmice e3ebccc762 back to normal invites. fixed #298 2014-07-21 19:55:00 +02:00
iNPUTmice b223784560 added hint to explain the contact has read up to this point 2014-07-21 19:54:26 +02:00
iNPUTmice a787f58a90 fixed #292 2014-07-21 18:20:26 +02:00
iNPUTmice 2fe20ffa8e fixed #267 2014-07-21 16:16:09 +02:00
iNPUTmice f9ed76f5e1 switched to direct invites. fixes #284 2014-07-21 16:04:53 +02:00
iNPUTmice 87aff4c6d8 fixed bug where presence requests where sent on display of contact details 2014-07-21 15:17:01 +02:00
iNPUTmice aa844df144 fixed #290 2014-07-21 15:16:06 +02:00
iNPUTmice 3b7f89bbb0 disable subscription checkboxes when account is offline 2014-07-20 13:21:21 +02:00
iNPUTmice 542cbef53b hide verify snackbar when otr session is ended. fixed npe 2014-07-20 12:36:57 +02:00
iNPUTmice b5005d60de simplified presence subscription in contact details 2014-07-20 03:14:47 +02:00
iNPUTmice 185c485fc6 fixed #254 2014-07-20 02:34:07 +02:00
iNPUTmice 22e504b8f9 ignore groupchats messages that are pending leave 2014-07-20 02:26:23 +02:00
iNPUTmice c65600edc9 pending leaves and joins for muc 2014-07-18 21:57:10 +02:00
iNPUTmice 9cfb4ee6c3 only show muc errors if actually connected 2014-07-18 19:36:29 +02:00
iNPUTmice 4307b1de72 notify ui on roster changes 2014-07-18 15:35:31 +02:00
iNPUTmice 6b74c0594e show snackbar if conference was not found 2014-07-18 12:44:33 +02:00
iNPUTmice 38a9242955 brought muc invites back. + couple of bug fixes + refactoring 2014-07-17 00:03:37 +02:00
iNPUTmice 670dead695 improvements on the dublicate muc messages issue 2014-07-16 19:03:14 +02:00
iNPUTmice 02351de94b made grace period work for muc as well 2014-07-16 12:45:56 +02:00
iNPUTmice 0ec1c022b9 fixed rare npe 2014-07-16 12:42:44 +02:00
iNPUTmice e79a34b651 redesigned muc details a little bit 2014-07-16 12:34:09 +02:00
iNPUTmice 9532a9889b couple of bug fixes related to muc renaming 2014-07-15 21:54:11 +02:00
iNPUTmice 177e802a77 fixed #276 2014-07-15 20:41:32 +02:00
iNPUTmice e20842608b unregister bookmark on conversation when bookmark is deleted 2014-07-15 20:41:10 +02:00
iNPUTmice fc5143734e added confirm dialog before contact and bookmark removal 2014-07-15 19:41:58 +02:00
iNPUTmice ed4d0d38e3 bug fix on deleting conference bookmarks 2014-07-15 17:19:47 +02:00
iNPUTmice 2a82f23f36 use nick from bookmark if available 2014-07-15 17:11:43 +02:00
iNPUTmice 2ebd92b7a7 pushing bookmarks back to server 2014-07-15 14:32:19 +02:00
iNPUTmice 6031af8606 use proper picture on bookmarked conferences when joined. use bookmark title when no subject is set 2014-07-14 17:13:59 +02:00
iNPUTmice e2f886d121 fetch bookmarks from server 2014-07-14 11:47:42 +02:00
iNPUTmice 9968ae5260 refactored ui listeners a little bit 2014-07-12 13:42:17 +02:00
iNPUTmice fd5760d27a made conversation list thread safe 2014-07-12 12:41:37 +02:00
iNPUTmice c512d98b74 moved iq parser to seperate class as well 2014-07-12 12:28:28 +02:00
iNPUTmice 99fe44a737 cleanup for presence parser 2014-07-12 11:13:18 +02:00
iNPUTmice 99935dd630 moved most of the message/presence generation into seperate classes 2014-07-12 03:44:23 +02:00
iNPUTmice 789383e5cb made message parser and presence parser implement interface On*PacketReceived 2014-07-12 02:36:37 +02:00
iNPUTmice 7a26f27212 switch SearchView with custom action view 2014-07-11 23:44:59 +02:00
iNPUTmice 610df2eddc added join conference dialog 2014-07-11 19:48:41 +02:00
iNPUTmice 690ee4988e improved iterating over hashmap 2014-07-11 19:48:02 +02:00
iNPUTmice 2b14ad51ec fishing invites and delivery reports out of carbon copied messages 2014-07-11 14:49:06 +02:00
iNPUTmice beb82310da made jingle connection array thread safe 2014-07-11 14:26:02 +02:00
iNPUTmice 0193e0291c cleanup. removed old contacts activity. WARNING: this will temporarly disable muc invites 2014-07-11 14:07:52 +02:00
iNPUTmice f6649ef838 changed 'show time threshold' to 6h 2014-07-11 13:55:29 +02:00
iNPUTmice e7a0040ec5 fixed #255 and made some other improvements to the subscription mgmt 2014-07-11 13:52:27 +02:00
Daniel Gultsch 8ebd14cef4 Merge pull request #262 from kruks23/development 
Show time in messages previous days
 2014-07-11 13:12:25 +02:00
iNPUTmice 355a6d1723 dirty push / delete flags are not set/reset correctly 2014-07-10 23:49:34 +02:00
iNPUTmice a523127a80 fixed #38 2014-07-10 19:42:37 +02:00
kruks23 bb6e732ca1 Show time in messages previous days 2014-07-10 18:04:24 +02:00
kruks23 8379f69516 Merge branch 'development' of https://github.com/siacs/Conversations into development 2014-07-10 15:13:31 +02:00
iNPUTmice e97b524455 added create contact dialog 2014-07-10 13:19:42 +02:00
iNPUTmice f8763015eb added contextual menu for contacts 2014-07-10 01:55:19 +02:00
iNPUTmice 2684ecda1e small changes 2014-07-10 00:53:44 +02:00
iNPUTmice 203c85e114 made searchview text color white 2014-07-10 00:53:44 +02:00
iNPUTmice 3bdf84b6a0 filter contacts and starting confercenes 2014-07-10 00:53:44 +02:00
iNPUTmice 7c3f3b2a3e added group add button 2014-07-10 00:53:43 +02:00
iNPUTmice c1ee9e682a added action bar menu to start conversation 2014-07-10 00:53:43 +02:00
iNPUTmice 502a1bdb9c changed support lib to v13. added tabs and fragments to start conversation activity 2014-07-10 00:53:43 +02:00
iNPUTmice 9260ed4047 inital activity 2014-07-10 00:53:43 +02:00
kruks23 c7088489bd Merge branch 'development' of https://github.com/siacs/Conversations into development 2014-07-09 22:05:48 +02:00
iNPUTmice 6e3e1d310a unified warnings/error msgs 2014-07-09 21:45:03 +02:00
kruks23 71324261e5 Show time in messages previous days 2014-07-08 21:13:53 +02:00
iNPUTmice da0b426125 contact tiles follow material colors as well 2014-07-08 11:42:08 +02:00
iNPUTmice d4ce42ac84 made account jid lowercase 2014-07-04 16:25:02 +02:00
iNPUTmice c68777c67c made contact jids lower case 2014-07-04 16:22:19 +02:00
iNPUTmice 363682065d added timeout to jingle socket 2014-07-03 22:55:20 +02:00
iNPUTmice f33d2497f8 more xmlpullparser fixes 2014-07-03 22:53:18 +02:00
iNPUTmice 32648ec859 Merge branch 'development' 2014-07-03 11:43:06 +02:00
iNPUTmice e02ae4cde2 fixed array out of bounds in isMuc 2014-07-03 11:32:54 +02:00
iNPUTmice c2af2ef812 enabled anti alising for tiles 2014-07-02 10:43:36 +02:00
iNPUTmice 655ce10843 allow state loss on fragment change 2014-07-01 14:56:53 +02:00
iNPUTmice 6028bf4ee2 fixed npe on rare occasion of show element in presence being null 2014-07-01 14:53:39 +02:00
iNPUTmice 2738d834b4 fixed #216 2014-07-01 13:31:14 +02:00
iNPUTmice 4070c33605 fixed image sharing with contacts that have multiple presences 2014-07-01 12:57:28 +02:00
iNPUTmice fcc5b3674c removed old notification icon 2014-06-30 21:07:24 +02:00
iNPUTmice c86f96e856 fixed rare npe in verify otr fingerprint dialog 2014-06-30 20:29:06 +02:00
iNPUTmice 121fb58d5e possible fix for #232 2014-06-30 12:01:43 +02:00
iNPUTmice dcb21cb9e6 couple of modifications for disco discovery 2014-06-30 11:43:00 +02:00
iNPUTmice 9a239f6589 fixed #235 2014-06-30 10:51:46 +02:00
iNPUTmice 42ad901356 fixed #228 2014-06-30 10:46:46 +02:00
iNPUTmice 53533ca74e added error message for #240 2014-06-30 10:36:21 +02:00
iNPUTmice d58d428874 more error handling for jingle connections 2014-06-29 13:44:59 +02:00
iNPUTmice 8eedc1a57f raised ping time out 2014-06-27 11:42:31 +02:00
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