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
|
d2a4855a1e
|
added rendered versions of new icons
|
2014-11-18 00:42:19 +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 |
|
Daniel Gultsch
|
c058594ff5
|
Merge pull request #681 from SamWhited/searchlocalefix
Use `Locale.US' for string comparisons in search
|
2014-11-17 18:27:21 +01:00 |
|
Sam Whited
|
b6d8977237
|
Use `Locale.US' for string comparisons in search
|
2014-11-17 12:19:45 -05:00 |
|
Daniel Gultsch
|
e664a0c936
|
Merge pull request #680 from ferdev1/patch-2
Fix string 2
|
2014-11-17 18:14:50 +01: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 |
|
iNPUTmice
|
e30e84c819
|
slightly modified logo / launcher icon
|
2014-11-17 17:23:58 +01:00 |
|
ferdev1
|
6c13b8a9a1
|
Update strings.xml
|
2014-11-17 17:13:20 +01:00 |
|
Sam Whited
|
55957a77b3
|
Fix linter suppression
|
2014-11-17 09:19:11 -05:00 |
|
iNPUTmice
|
ceecc8ffe7
|
Merge branch 'development' of https://github.com/siacs/Conversations into development
|
2014-11-17 01:54:19 +01:00 |
|
iNPUTmice
|
967cd922e1
|
highlight muc members by touching their name in muc details. fixed #503
|
2014-11-17 01:54:01 +01:00 |
|
Daniel Gultsch
|
81b93c763a
|
Merge pull request #675 from ferdev1/patch-1
Fix string
|
2014-11-17 00:04:53 +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 |
|
ferdev1
|
c147f44cf1
|
Fix string
|
2014-11-16 18:11:14 +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 |
|
Daniel Gultsch
|
4a8fa8b498
|
Merge pull request #670 from kruks23/translation9
Update Spanish Translations
|
2014-11-15 21:00:05 +01:00 |
|
iNPUTmice
|
5a634fdf47
|
small modifications for changing an account status in XmppConnection
|
2014-11-15 20:54:28 +01:00 |
|
kruks23
|
0dc711d710
|
Update Spanish Translations
|
2014-11-15 20:48:31 +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 |
|
Daniel Gultsch
|
4c504dea7a
|
Merge pull request #665 from SamWhited/issue71
Add SCRAM-SHA1 support
|
2014-11-15 15:34:50 +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 |
|
Daniel Gultsch
|
e2fb32841b
|
Merge pull request #666 from SamWhited/localefixes
Spelling fixes
|
2014-11-15 13:12:29 +01:00 |
|
Sam Whited
|
8650bc2e13
|
Make licenses info untranslatable
|
2014-11-14 22:33:18 -05:00 |
|
Sam Whited
|
bae2b7ddc6
|
Spelling fixes in Italian translation
|
2014-11-14 22:16:58 -05:00 |
|
Sam Whited
|
62404b234c
|
Spelling fix in German translation
|
2014-11-14 22:13:42 -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
|
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 |