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

455 commits

Author SHA1 Message Date
Sam Whited f9c783085d Update summary in TimePreference change listener 
Ensures the summary is updated even if we change the time preference
programatically; also allows other places to stop the summary from being
updated by setting a new listener.
 2014-12-15 17:46:32 -05:00
iNPUTmice e2f50ab855 go through mam history page by page. load mam dynamically on scroll 2014-12-15 23:06:29 +01:00
Daniel Gultsch 03ca971e2e Merge pull request #782 from SamWhited/quiet-hours 
Make some magic number constants final
 2014-12-15 19:28:21 +01:00
Sam Whited ea61142d7e Make some magic number constants final 2014-12-15 11:39:18 -05:00
iNPUTmice ab2187dbdf fixed crashing on unparsed jids 2014-12-15 17:36:16 +01:00
iNPUTmice 183e31ade1 Merge branch 'quiet-hours' of https://github.com/SamWhited/Conversations into SamWhited-quiet-hours 2014-12-15 17:35:29 +01:00
iNPUTmice e084266595 migrated more jid parsing to use getAttributeAsJid. added error logging 2014-12-15 17:29:17 +01:00
Sam Whited af0f8e87bb Make silent notification when quiet hours are on 
Notify, just don't play a sound or vibrate
Also make the Java annoyingly verbose... I can't help myself... ahh!
 2014-12-15 11:23:50 -05:00
iNPUTmice 25d8546ae8 Merge branch 'quiet-hours' of https://github.com/SamWhited/Conversations into SamWhited-quiet-hours 2014-12-15 17:16:49 +01:00
iNPUTmice 2bd4621245 fixed history deletion. fixed #780 2014-12-15 17:14:27 +01:00
iNPUTmice 209e62d68b avoid npe on weird platform bugs 2014-12-15 16:55:38 +01:00
iNPUTmice f8a496a5f1 run mam queries only when online 2014-12-14 23:23:56 +01:00
Sam Whited a6d4b0aec5 Add quiet hours feature 2014-12-14 15:07:41 -05:00
iNPUTmice 5cbae25808 more patches for dns helper 2014-12-14 19:02:29 +01:00
iNPUTmice 50410dad33 possible dns fixes 2014-12-14 18:31:52 +01:00
iNPUTmice de06cb38d1 refactored the way certain messages are being found within a conversation 2014-12-14 18:10:46 +01:00
iNPUTmice fc293aaede avoiding concurrent modification 2014-12-13 22:17:27 +01:00
iNPUTmice 6148f04d7b fixed regression 2014-12-13 20:05:46 +01:00
iNPUTmice 899802646c reverse through mam history when loading larger chuncks 2014-12-13 15:32:11 +01:00
iNPUTmice 02a89f4ce2 Merge branch 'feature/mam' into development 
Conflicts:
	src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
 2014-12-13 13:55:24 +01:00
iNPUTmice 2368ba518d refactored phone contacts merger 2014-12-13 13:52:57 +01:00
iNPUTmice b523518e4b various mam improvments 2014-12-13 12:25:52 +01:00
iNPUTmice f2510ae9f6 mark otr messages as no-store for mam 2014-12-10 14:08:06 +01:00
iNPUTmice 1dcdc79a71 changed lastMessageReceived into lastMessageTransmitted to account for sent messages as well. (will trigger on sm ack) 2014-12-10 14:08:06 +01:00
iNPUTmice ccdb0fd971 save server id from mam messages. check for dups before adding mam 2014-12-10 14:08:06 +01:00
iNPUTmice 0ab530932a added max history age (default 1w). automatically sort newly added mam messages 2014-12-10 14:08:06 +01:00
iNPUTmice 4a94389f05 very basic mam support 2014-12-10 14:08:06 +01:00
iNPUTmice 34558cc277 store last message received date in conversation 2014-12-10 14:08:06 +01:00
iNPUTmice 2b958e51df removed unnecessary otr error response 2014-12-10 14:07:56 +01:00
iNPUTmice 05d1f46c15 recreate activity after theme has changed. fixed #764 2014-12-09 20:22:21 +01:00
iNPUTmice 78370094e9 cleanup: removed unused emoticon parsing 2014-12-09 14:21:35 +01:00
iNPUTmice 9d52f62767 cleanup: removed stream compression 2014-12-09 14:14:15 +01:00
iNPUTmice 5acd471880 version bump to 0.9.3 2014-12-07 21:42:50 +01:00
iNPUTmice 490f40b196 possible work around for some weird - possibly sdk - bugs 2014-12-07 21:14:13 +01:00
iNPUTmice 9c9e22c020 fixed digest-md5 2014-12-04 12:33:56 +01:00
iNPUTmice 2274c38726 close cursors after querying phone db 2014-12-03 23:29:35 +01:00
iNPUTmice e623e28487 fixed #651 2014-12-03 17:05:37 +01:00
iNPUTmice 46e319b241 more safety checks for listener counts 2014-12-03 14:55:09 +01:00
iNPUTmice a38005ec89 fixed #544 2014-12-03 12:33:32 +01:00
iNPUTmice 9e97529b3d version bump to 0.9.2 2014-12-03 11:18:49 +01:00
iNPUTmice 685f405154 display proper error in edit account details if jid is invalid 2014-12-03 10:52:55 +01:00
iNPUTmice 8f62d95e1f further npe checks 2014-12-03 10:45:47 +01:00
iNPUTmice aaeba697bd refactored the message adapter a bit 2014-12-03 10:35:30 +01:00
iNPUTmice be358b77d6 set nick and autojoin=true for new bookmarks 2014-12-03 10:34:05 +01:00
iNPUTmice c273637156 made muc parser more compatible with legacy mucs?! (whatever that is exactly) 2014-12-03 01:46:26 +01:00
Sam Whited feec659b08 Make sure SASL tokenizer strips strings 
Fix DIGEST-MD5 auth (make sure we're not splitting on BASE64 `==')
 2014-12-02 19:33:41 -05:00
iNPUTmice 46b2760069 worked around concurrent modification exception 2014-12-03 00:54:07 +01:00
iNPUTmice 4a80914603 fixed another npe in hasBookmark 2014-12-03 00:18:07 +01:00
Daniel Gultsch 138345c5bf Merge pull request #740 from SamWhited/jidrpfix 
Fix RFC 6122 implementation
 2014-12-03 00:12:36 +01:00
iNPUTmice eb0f8c08bd safety net in joinMuc 2014-12-03 00:06:57 +01:00
iNPUTmice 39a3f372dd clean up getProposedNick 2014-12-03 00:06:57 +01:00
iNPUTmice 9152e1ac95 fixed potential npes in message parser 2014-12-03 00:06:57 +01:00
iNPUTmice 241de062da cleaned up avatar / tile creation 2014-12-03 00:06:57 +01:00
Sam Whited 29a7828c5f Allow JIDs such as "example.net/@" 2014-12-02 10:17:50 -05:00
Sam Whited 4f9dd82457 "example.net/@/" should be a valid JID. 
Retab JID file
 2014-12-02 10:09:31 -05:00
Sam Whited 3fc834c067 Fix RFC 6122 implementation 
JID resourceparts should be able to contain "@" and "/" characters
 2014-12-02 09:16:09 -05:00
iNPUTmice 9dd445a507 fixed #728 2014-12-01 12:33:57 +01:00
iNPUTmice 6a429d9939 bumped cap version as well 2014-12-01 11:25:47 +01:00
iNPUTmice 8d306ac64f clear encrypted messages on reinit 2014-12-01 11:18:55 +01:00
iNPUTmice 96bbd16ca5 worked around rare npe 2014-12-01 10:58:06 +01:00
iNPUTmice 5992d4ac00 fixed npe if roster jid couldnt be parsed 2014-12-01 10:25:36 +01:00
iNPUTmice a4b4c13c66 do not query service info from main server again 2014-12-01 09:48:30 +01:00
iNPUTmice 57fd763066 don't request fragment before updating 2014-11-30 22:27:11 +01:00
Daniel Gultsch 52a43db6d6 Merge pull request #721 from SamWhited/warning_fixes 
Warning "fixes"
 2014-11-29 19:14:13 +01:00
iNPUTmice d98486d1ca fixed npe for broken bookmarks 2014-11-29 19:09:28 +01:00
Sam Whited afc673bb15 Misc. "fixes" to correct warnings. 2014-11-29 07:50:59 -05:00
iNPUTmice 1ff9293ee1 fix for concurrency issue 2014-11-29 13:09:56 +01:00
iNPUTmice 7ba41c6a8e fixed npe. fixed #717 2014-11-27 10:30:06 +01:00
iNPUTmice 2f02d8d398 create conversation with bare jid 2014-11-27 10:26:53 +01:00
iNPUTmice 0b8032dbd6 use getAttributeAsJid method 2014-11-27 10:26:34 +01:00
Daniel Gultsch 7a75a8bc5a Merge pull request #713 from betheg/muc 
MUC: do not add yourself to the muc user list.
 2014-11-24 11:53:28 +01:00
Michael 31b539daf7 MUC: option to set/delete bookmark in conference details. 2014-11-23 21:37:45 +01:00
Michael dbe8280662 add an listener for the muc roster update. 
this is for the ConferenceDetailsActivity to show
precence updates immediately.
 2014-11-23 15:19:44 +01:00
Michael bdfdc5fb10 MUC: do not add yourself to the muc user list. 2014-11-23 15:19:07 +01:00
iNPUTmice 28fefad834 work around to not confuse irc transport with real conference servers 2014-11-21 20:34:19 +01:00
Daniel Gultsch 36f8a31d7d Merge pull request #706 from betheg/unused_imports 
remove unused imports.
 2014-11-21 20:03:46 +01:00
iNPUTmice 81a1a48b8d update action bar with conversations updates as well 2014-11-21 20:02:13 +01:00
Michael febbefefa5 MUC: set from when join muc. 2014-11-21 19:37:50 +01:00
Michael dc0dba3faf remove unused imports. 2014-11-21 19:17:27 +01:00
iNPUTmice 424de3ea3a move task to back and not finish when hitting back button 2014-11-21 18:57:27 +01:00
Michael 44faec7051 STATUS_CODE_SELF_PRESENCE is not set in all case. 2014-11-21 16:14:56 +01:00
iNPUTmice 888475d4fe additional null pointer saftey checks 2014-11-21 15:25:57 +01:00
iNPUTmice de0b36fc78 verify contacts key only on initiating side of smp 2014-11-21 13:42:25 +01:00
iNPUTmice 92ad4cb736 changed listener timing and cache clearing after muc presences 2014-11-20 22:44:31 +01:00
iNPUTmice 66abdfccd4 create file and dirs before creating file 2014-11-20 22:02:32 +01:00
Michael 3e3767cb06 change status codes string 'number' to a better readable constant. 2014-11-20 21:37:56 +01:00
iNPUTmice a207240881 fixed potential NPEs 2014-11-20 18:42:47 +01:00
iNPUTmice a142dcc263 import fixes 2014-11-20 18:33:04 +01:00
iNPUTmice 8b10ea676c Merge branch 'development' of https://github.com/siacs/Conversations into development 2014-11-20 18:20:45 +01:00
iNPUTmice 0ad6d0616f brought ad hoc conferences back. fixed #688 fixed #367 2014-11-20 18:20:42 +01:00
Sam Whited 73d184352e Remove broken / unused imports 2014-11-19 14:57:23 -05:00
iNPUTmice e9948f6b84 sent read marker to full jid 2014-11-19 17:40:42 +01:00
iNPUTmice cbf42ee12c some saftey checks before registering listeners in XmppActivity 2014-11-19 17:31:28 +01:00
iNPUTmice 66087cb360 put error notification into notification service 2014-11-18 15:26:28 +01:00
iNPUTmice 1122e084a0 simplified message merge condition 2014-11-18 14:49:49 +01:00
iNPUTmice 10bf2b77a8 synchronized message list in conversation fragment 2014-11-18 14:43:15 +01:00
iNPUTmice dcebc120ac show dynamic tags in contacts activity as well 2014-11-18 14:24:06 +01:00
iNPUTmice ab832bcff7 properly remove conversations context menu 2014-11-18 13:51:04 +01:00
iNPUTmice d29c861d03 disabled broken conversations context menu 2014-11-18 03:12:51 +01:00
iNPUTmice 018a0c7978 better usage of synchronized in some places 2014-11-18 03:10:59 +01:00
iNPUTmice 090e6ecf09 better exception handling in XmppConnection.connect. (never return without throwing exception. use finally to release wake lock. use status.server_not_found instead of status.offline when necessary 2014-11-18 01:48:16 +01:00
iNPUTmice 240d2d68c8 context menu for conversations. fixed #630 2014-11-18 00:07:27 +01:00
iNPUTmice 86241a260a clear avatar cache with new roster push from server 2014-11-17 21:28:16 +01:00
iNPUTmice abbadcb58b avoided some null pointers 2014-11-17 20:45:00 +01:00
iNPUTmice f41c3eee04 context menu for muc participants + refactor trueCounterpart to use Jid class 2014-11-17 20:02:46 +01:00
iNPUTmice 283d5058e5 synchronized around cache clear in avatar service 2014-11-17 20:01:56 +01:00
Sam Whited b6d8977237 Use `Locale.US' for string comparisons in search 2014-11-17 12:19:45 -05:00
iNPUTmice 8865cc406c trim search before searching 2014-11-17 17:31:26 +01:00
iNPUTmice 1a5af45afb Merge branch 'development' of https://github.com/siacs/Conversations into development 2014-11-17 17:24:56 +01:00
iNPUTmice 252c7e68d6 split search keywords by whitespaces and imply AND operatior 2014-11-17 17:24:33 +01:00
Sam Whited 55957a77b3 Fix linter suppression 2014-11-17 09:19:11 -05:00
iNPUTmice 967cd922e1 highlight muc members by touching their name in muc details. fixed #503 2014-11-17 01:54:01 +01:00
iNPUTmice 2036c58cd7 made tags searchable 2014-11-16 23:58:30 +01:00
iNPUTmice 8c4236b01b fixed regression of xmpp uris not working 2014-11-16 22:23:42 +01:00
Daniel Gultsch 155b607f4d Merge pull request #673 from SamWhited/development 
Fix fetching accounts by JIDs
 2014-11-16 17:35:59 +01:00
iNPUTmice cf00f3fade happy hanukkah 2014-11-16 17:21:21 +01:00
Sam Whited 5765a91db6 Fix fetching accounts by JIDs 
Fixes a crash when publishing an avatar
 2014-11-16 10:04:45 -05:00
iNPUTmice 84b2ce10b7 Merge branch 'development' of https://github.com/siacs/Conversations into development 2014-11-16 12:28:21 +01:00
iNPUTmice ac8c2b7e62 show full time stamp in connection established field 2014-11-16 12:11:14 +01:00
iNPUTmice f18f3086af better error checking in ssl switch over 2014-11-16 12:00:53 +01:00
Sam Whited cfdda5f8fd Don't escape passwords in SASL 
Fixes #671
 2014-11-15 21:11:14 -05:00
iNPUTmice 2067b9bd8d made scan and show qr code more accessible in VerifyOtrActivity 2014-11-16 02:10:29 +01:00
iNPUTmice 2b21bc13fc Merge branch 'master' into development 2014-11-16 00:34:44 +01:00
iNPUTmice ac4eabbd22 close cursor for database 2014-11-16 00:34:16 +01:00
iNPUTmice 88c3537b68 parse otr-fingerprint in qr codes and nfc. include otr fingerprint in shareable uri where ever possible 2014-11-16 00:20:20 +01:00
Daniel Gultsch 0fb1772f18 Merge pull request #669 from SamWhited/scramcaching 
Cache SCRAM-SHA-1 keys for current session
 2014-11-15 21:02:13 +01:00
iNPUTmice 5a634fdf47 small modifications for changing an account status in XmppConnection 2014-11-15 20:54:28 +01:00
Sam Whited a463f82e3b Cache SCRAM-SHA-1 keys for current session 2014-11-15 12:57:36 -05:00
Daniel Gultsch 69ab8a2adb Merge pull request #668 from SamWhited/auth-pinning 
Auth mechanism pinning
 2014-11-15 17:44:51 +01:00
Sam Whited 17cec63c14 Set security error status on TLS cert mismatch 2014-11-15 11:40:41 -05:00
Sam Whited d2388a5a7e Remove extra status wrapper method 2014-11-15 11:31:15 -05:00
Sam Whited 251f4d6d7f Add incompatible server status 2014-11-15 11:29:58 -05:00
iNPUTmice 7ba9854c22 fixed some disco / carbon related bugs 2014-11-15 17:24:06 +01:00
Sam Whited c09d450db8 Add security error status 2014-11-15 11:21:47 -05:00
Sam Whited d94b07c916 Make account status an enum 2014-11-15 11:12:41 -05:00
Sam Whited 847877f9d2 Add auth method pinning 2014-11-15 10:01:08 -05:00
iNPUTmice 35bf13f5ef Merge branch 'feature/file_transfer' into development 
Conflicts:
	src/main/res/values/strings.xml
 2014-11-15 15:52:15 +01:00
iNPUTmice 07b07115d6 Merge branch 'feature/foreground_service' into development 
Conflicts:
	src/main/res/values/strings.xml
 2014-11-15 15:51:27 +01:00
iNPUTmice 5b9c690c47 Merge branch 'feature/otr_verification' into development 2014-11-15 15:50:35 +01:00
iNPUTmice bdc86bb8e3 added low priority and removed date in foreground noticfication 2014-11-15 15:34:34 +01:00
iNPUTmice 3c6b3506e3 turn on foreground service in expert settings 2014-11-15 15:34:34 +01:00
iNPUTmice 41f7848f2c handled more error cases 2014-11-15 15:34:12 +01:00
iNPUTmice ca2d86cf87 better cleanup after unsuccesful transfers 2014-11-15 15:34:12 +01:00
iNPUTmice 47d44448f3 fixed description in notifications and conversation overview 2014-11-15 15:34:12 +01:00
iNPUTmice e0f012dba1 fixed resending for files as well 2014-11-15 15:34:12 +01:00
iNPUTmice cc4f3702a8 made file transfers cancelable 2014-11-15 15:34:12 +01:00
iNPUTmice 4ab558715c adepted conversationadapter to deal with files 2014-11-15 15:34:12 +01:00
iNPUTmice af2922adea progress for ibb transfers 2014-11-15 15:34:12 +01:00
iNPUTmice e7a70a46e0 some mime and pgp fixes for file transfer 2014-11-15 15:34:12 +01:00
iNPUTmice 16847a30c8 support for pgp files 2014-11-15 15:34:12 +01:00
iNPUTmice c7acfe85c3 progress for http images as well. fixed open button for sent files 2014-11-15 15:34:12 +01:00
iNPUTmice dac12be53e copy non local files to private storage first 2014-11-15 15:34:11 +01:00
iNPUTmice 02cbda68a7 bug fixes and various improvements for file transfer 2014-11-15 15:34:11 +01:00
iNPUTmice 7a90ca429b basic arbitrary file transfer 2014-11-15 15:34:11 +01:00
Sam Whited 4b5d6f5b4f Improve auth error handling and state machine 2014-11-15 08:49:00 -05:00
Sam Whited 0e550789d3 Add SCRAM-SHA1 support 
Factor out GS2 tokanization into own class
Add authentication exception class

Fixes #71
 2014-11-14 18:00:12 -05:00
Kevin Rauwolf 2bb68bcbba Added check for empty from on group chat packet 2014-11-14 11:40:43 -08:00
iNPUTmice 3118340ade fixed possible npe when loading null counterpart into message 2014-11-14 19:49:44 +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
Sam Whited 14cfb60952 Refactor authentication code 2014-11-12 10:15:38 -05: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 72068d1a26 fixed private messages 2014-11-09 21:14:37 +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
Sam Whited 53c7905631 Check for illegal arguments to the toASCII func 2014-11-09 09:05:02 -05: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 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
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
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 8bf40308c8 Move AboutDialog to correct path 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 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 ec9c264cf7 more error handling for http connection 2014-11-03 19:59:11 +01:00
iNPUTmice 3e05ef77b1 version bump to 0.8.1 2014-11-03 11:20:51 +01:00