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

1253 commits

Author SHA1 Message Date
iNPUTmice 793671023b Merge branch 'development' of https://github.com/siacs/Conversations into development 2014-11-14 19:49:49 +01:00
iNPUTmice 3118340ade fixed possible npe when loading null counterpart into message 2014-11-14 19:49:44 +01:00
Daniel Gultsch 2bbad26fb0 Merge pull request #653 from kriztan/patch-2 
Update German language
 2014-11-14 12:16:57 +01:00
iNPUTmice 17c2ed411d made presences synchronized 2014-11-13 14:44:41 +01:00
iNPUTmice 2db569b20f made presences synchronized 2014-11-13 14:44:19 +01:00
iNPUTmice 77ba68d61f more npe checks in muc packet parser 2014-11-13 14:27:27 +01:00
iNPUTmice e6a4fa031b more npe checks in muc packet parser 2014-11-13 14:27:10 +01:00
Daniel Gultsch 88c8373553 Merge pull request #656 from SamWhited/authrefactor 
Refactor authentication code
 2014-11-12 23:01:18 +01:00
Sam Whited 2222483b42 Make sure we're storing the display JID as Unicode 2014-11-12 16:19:16 -05:00
kriztan fca3e3c756 Update German language 
deleted 'pref_about_message'
 2014-11-12 20:09:14 +01:00
Sam Whited 14cfb60952 Refactor authentication code 2014-11-12 10:15:38 -05:00
kriztan b971965697 Update German language 2014-11-12 13:13:59 +01:00
iNPUTmice f1e2be4096 check if account is online before doing smp 2014-11-12 12:45:59 +01:00
iNPUTmice 52ca2e7391 Merge branch 'feature/otr_verification' of https://github.com/siacs/Conversations into feature/otr_verification 
Conflicts:
	src/main/java/eu/siacs/conversations/ui/VerifyOTRActivity.java
 2014-11-11 17:45:16 +01:00
iNPUTmice d1bf9a3f6d use auto register for verify otr listeners 2014-11-11 17:42:09 +01:00
iNPUTmice 76f4cf1a73 small bug fix 2014-11-11 17:40:51 +01:00
iNPUTmice e33fc26cbe added snackbar to indicate smp. more error handling in verify activity 2014-11-11 17:40:51 +01:00
iNPUTmice 6cd2ff0d88 initial smp support 2014-11-11 17:40:51 +01:00
iNPUTmice e555fe4b03 auto register/unregister listeners 2014-11-11 17:39:28 +01:00
iNPUTmice fce78abb1c temporarliy got rid of some insane work arounds in favor of some maybe less insane work arounds 2014-11-11 00:16:43 +01:00
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