3b127ab743
Update german translations
2014-12-25 09:14:34 +01:00
3ada834839
Show server info option when blocking is unavailable
...
Current head of development branch doesn't show server information if
blocking is disabled. This is due to slightly wrong logic on an if
statement. This patch ensures only the blocking option is disabled when
blocking is not supported by the server, and that the feature remains
available.
2014-12-24 20:54:56 +00:00
afbe727b17
Don't allow user to register domain only jids
2014-12-23 17:35:36 -05:00
8a467e33dd
Don't show menu on create account screen
2014-12-23 17:12:52 -05:00
d454788011
Remove old JID validator
2014-12-23 13:23:13 -05:00
01107e31ae
Add more server compatibility info.
...
Hide server info behind a checkbox.
Add XEP-0352 support to the server info list
Add XEP-0237 to server info list
Add XEP-0352 support to the server info list
Add MaM and Blocking to the account XEPs list
Also add a toggle button to hide some of the list
Rebase on current codebase
Make MAM string more descriptive
Change show more button to checkbox menu item
Shorten `MAM (History)' to `MAM'
Order XEP list and hide all by default
Supress warning (which is wrong anyways)
Change `Show more' to `Show more info'
2014-12-23 12:44:30 -05:00
d5f99560ff
made method private that is no longer required to be public
2014-12-23 18:09:29 +01:00
e152ed1e07
Simplify roster handling code
...
Merge result handling code into IqParser
Fixes #20
2014-12-22 12:53:31 -05:00
e1cb72b9ef
Fix NPEs in blocking code
2014-12-22 11:24:08 -05:00
af7a64491f
Add support for XEP-0191 (Blocking command)
...
Fixes #791
Squash of commits:
534f25d7dae3ce6852243e28fdd0a69ac01e9463
808fdf5147f27a912a60bee39aa4bf1ddd4f43b4
1eaf8a8330710ad35ba7c368e04f909af623ae4c
31585242c2359efdcd0eeddb9745077f54dbc9eb
2e69bd0bd0286ed1e98a42f4c3421ba4d8cf524b
e904fb5015bf3a1904ab941a1957edf3b1e7abd2
eebbadf3b3816bbf8fcccb763e419fed252d266f
7c5b87724ce494e5a6e8026557ed50a8fd9f23e8
b0eaaf446937794fe19cbdb4f8309c3ff83d4e42
8c652f9e8bb3512958d9ad8c6f1326505f2d98c8
ad0ea1ad948ff6f8fde7b0b10f5163dc8852032f
f5d49897e0dba691ef53a0eddb9ed34d129ad442
a08fa64c505bd895b7c626cfad182380373be20b
de67079113e08394a276048c31f6b21baa300829
9069f342173ba30c2b20c67529c7ff497a6a257d
0169fa79d161ee898c4b6762e207087682a952d8
8585a5bd75a5d56927fed8317729bd15fffe4dcc
0053528a078369e0b65dcf71bda251072a1299c7
e901a9c3554bd7cca193e92919b463991eadfea7
c5c78257434813c69ab9b7558bcc8f7cbe858433
e905af348d46d77bc46b5f7211527684acc02fab
13a0f9a10c7892b0f90f5fabd2f2615701b0fd66
2cfba1e24b0139839e4453b92be7e20634d150cf
58e074fb5bb44b05a8104250fccd7c024c808c1a
0d6cf98fc8eab212d798ac79b336f9b70a14f06d
e23620f56b85bcab9f3b5d9ce1c01524cd9674dc
d72cd2fcc8d54176c3ff53411a69b9bb4642eff3
195143dff8836623a37094a6b8fa6aa01ef31580
5f5f3caf3a1e480a99d27ee5c34ba516419c52e4
1dee3d5861c9f9c710da4cbda3688d94c622ca93
23949b8aa32c78b27bab49bb3c4f3ff588925ce1
9bf97f8ae522796e0dacb7f6fe7a7f90f86a93a1
2014-12-22 08:19:00 -05:00
1517641713
get rid of special self presence object and incorporate that into roster
2014-12-20 17:23:03 +01:00
ce4848f742
more null checks for otr fingerprints
2014-12-20 16:01:28 +01:00
40335785aa
don't include empty fingerprints in list of otrfingerprints
2014-12-20 15:21:03 +01:00
6b047bed97
fixed another break continue bug
2014-12-20 12:52:45 +01:00
88f43643bf
inject ui callback into running mam query
2014-12-20 12:52:08 +01:00
675bac7255
Merge pull request #794 from svetlemodry/development
...
Czech image transfer string fix
2014-12-20 12:14:11 +01:00
6dd75cbb07
Update spanish translations
2014-12-20 10:54:23 +01:00
c8cfd1b084
Czech image transfer string fix
2014-12-19 22:50:43 +01:00
a68cb5d364
Merge branch 'development' of https://github.com/siacs/Conversations into development
2014-12-19 13:40:35 +01:00
627982df90
fixed #755
2014-12-19 13:40:16 +01:00
7c4a306ae4
Czech translation updated
...
added missing strings
2014-12-18 18:42:50 +01:00
948112c2f3
Update german translations
2014-12-18 12:10:03 +01:00
f00e168752
clean up conversation history after swtiching to a different conversation
2014-12-17 21:05:47 +01:00
de952cc959
show error if jid couldn't be parsed in new contact dialog
2014-12-17 21:04:54 +01:00
c30108eb17
Merge branch 'development' of https://github.com/siacs/Conversations into development
2014-12-17 10:51:28 +01:00
741a0c129d
made scroling smoother + bug fixes for history loading
2014-12-17 10:50:51 +01:00
80435eca5c
smoothed out scrolling a bit
2014-12-17 09:32:51 +01:00
5603440a91
Merge pull request #783 from SamWhited/quiet-hours
...
Update summary in TimePreference change listener
2014-12-17 07:15:31 +01:00
1a7ed4ed7c
properly detect images in share with
2014-12-17 07:12:38 +01:00
fd4cf499a2
Merge branch 'issue756' of https://github.com/SamWhited/Conversations into SamWhited-issue756
2014-12-17 07:00:42 +01:00
3f6638cb64
properly count mam messages
2014-12-17 06:59:58 +01:00
0b4987581f
Handle time comparisons using longs
2014-12-16 18:03:16 -05:00
6659339eff
Allow sending of any filetype via intent
...
Fixes #756
2014-12-15 22:31:55 -05:00
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
e2f50ab855
go through mam history page by page. load mam dynamically on scroll
2014-12-15 23:06:29 +01:00
03ca971e2e
Merge pull request #782 from SamWhited/quiet-hours
...
Make some magic number constants final
2014-12-15 19:28:21 +01:00
ea61142d7e
Make some magic number constants final
2014-12-15 11:39:18 -05:00
ab2187dbdf
fixed crashing on unparsed jids
2014-12-15 17:36:16 +01:00
183e31ade1
Merge branch 'quiet-hours' of https://github.com/SamWhited/Conversations into SamWhited-quiet-hours
2014-12-15 17:35:29 +01:00
e084266595
migrated more jid parsing to use getAttributeAsJid. added error logging
2014-12-15 17:29:17 +01:00
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
25d8546ae8
Merge branch 'quiet-hours' of https://github.com/SamWhited/Conversations into SamWhited-quiet-hours
2014-12-15 17:16:49 +01:00
2bd4621245
fixed history deletion. fixed #780
2014-12-15 17:14:27 +01:00
a6cfbf2f2d
Merge pull request #775 from kruks23/translation1
...
Update spanish translations.
2014-12-15 16:57:56 +01:00
16360242d1
Merge pull request #781 from drizzt/patch-1
...
fixed typo in italian translation
2014-12-15 16:57:48 +01:00
209e62d68b
avoid npe on weird platform bugs
2014-12-15 16:55:38 +01:00
9f6537acdc
fixed typo in italian translation
...
s/gallaria/galleria/
2014-12-15 14:19:18 +01:00
f8a496a5f1
run mam queries only when online
2014-12-14 23:23:56 +01:00
a6d4b0aec5
Add quiet hours feature
2014-12-14 15:07:41 -05:00
5cbae25808
more patches for dns helper
2014-12-14 19:02:29 +01:00
50410dad33
possible dns fixes
2014-12-14 18:31:52 +01:00
de06cb38d1
refactored the way certain messages are being found within a conversation
2014-12-14 18:10:46 +01:00
fc293aaede
avoiding concurrent modification
2014-12-13 22:17:27 +01:00
6148f04d7b
fixed regression
2014-12-13 20:05:46 +01:00
899802646c
reverse through mam history when loading larger chuncks
2014-12-13 15:32:11 +01:00
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
2368ba518d
refactored phone contacts merger
2014-12-13 13:52:57 +01:00
1ffdae80a6
Update spanish translations.
2014-12-13 13:24:17 +01:00
b523518e4b
various mam improvments
2014-12-13 12:25:52 +01:00
f2510ae9f6
mark otr messages as no-store for mam
2014-12-10 14:08:06 +01:00
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
ccdb0fd971
save server id from mam messages. check for dups before adding mam
2014-12-10 14:08:06 +01:00
0ab530932a
added max history age (default 1w). automatically sort newly added mam messages
2014-12-10 14:08:06 +01:00
4a94389f05
very basic mam support
2014-12-10 14:08:06 +01:00
34558cc277
store last message received date in conversation
2014-12-10 14:08:06 +01:00
2b958e51df
removed unnecessary otr error response
2014-12-10 14:07:56 +01:00
05d1f46c15
recreate activity after theme has changed. fixed #764
2014-12-09 20:22:21 +01:00
ae3bd9c9e9
Merge pull request #767 from kruks23/translation3
...
Update spanish translations.
2014-12-09 20:16:25 +01:00
920067b8ed
Update spanish translations.
2014-12-09 18:33:13 +01:00
78370094e9
cleanup: removed unused emoticon parsing
2014-12-09 14:21:35 +01:00
9d52f62767
cleanup: removed stream compression
2014-12-09 14:14:15 +01:00
5acd471880
version bump to 0.9.3
2014-12-07 21:42:50 +01:00
490f40b196
possible work around for some weird - possibly sdk - bugs
2014-12-07 21:14:13 +01:00
9c9e22c020
fixed digest-md5
2014-12-04 12:33:56 +01:00
2274c38726
close cursors after querying phone db
2014-12-03 23:29:35 +01:00
e623e28487
fixed #651
2014-12-03 17:05:37 +01:00
46e319b241
more safety checks for listener counts
2014-12-03 14:55:09 +01:00
a38005ec89
fixed #544
2014-12-03 12:33:32 +01:00
9e97529b3d
version bump to 0.9.2
2014-12-03 11:18:49 +01:00
685f405154
display proper error in edit account details if jid is invalid
2014-12-03 10:52:55 +01:00
8f62d95e1f
further npe checks
2014-12-03 10:45:47 +01:00
aaeba697bd
refactored the message adapter a bit
2014-12-03 10:35:30 +01:00
be358b77d6
set nick and autojoin=true for new bookmarks
2014-12-03 10:34:05 +01:00
c273637156
made muc parser more compatible with legacy mucs?! (whatever that is exactly)
2014-12-03 01:46:26 +01:00
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
46b2760069
worked around concurrent modification exception
2014-12-03 00:54:07 +01:00
4a80914603
fixed another npe in hasBookmark
2014-12-03 00:18:07 +01:00
138345c5bf
Merge pull request #740 from SamWhited/jidrpfix
...
Fix RFC 6122 implementation
2014-12-03 00:12:36 +01:00
c0e997e007
Merge pull request #743 from weiss/update-german-translations
...
Update/improve German translations
2014-12-03 00:11:50 +01:00
53aaaf68d5
Merge branch 'development' of https://github.com/siacs/Conversations into development
2014-12-03 00:07:41 +01:00
eb0f8c08bd
safety net in joinMuc
2014-12-03 00:06:57 +01:00
39a3f372dd
clean up getProposedNick
2014-12-03 00:06:57 +01:00
9152e1ac95
fixed potential npes in message parser
2014-12-03 00:06:57 +01:00
241de062da
cleaned up avatar / tile creation
2014-12-03 00:06:57 +01:00
b5b6589b44
Update/improve German translations
2014-12-02 18:02:17 +01:00
29a7828c5f
Allow JIDs such as "example.net/@"
2014-12-02 10:17:50 -05:00
4f9dd82457
"example.net/@/" should be a valid JID.
...
Retab JID file
2014-12-02 10:09:31 -05:00
3fc834c067
Fix RFC 6122 implementation
...
JID resourceparts should be able to contain "@" and "/" characters
2014-12-02 09:16:09 -05:00
59402da60d
Merge pull request #737 from kruks23/translation2
...
Update spanish translations
2014-12-02 00:31:24 +01:00
85d5326c32
Merge pull request #730 from svetlemodry/development
...
Updated Czech translation file
2014-12-02 00:31:13 +01:00
2a2679cfec
Update spanish translations
2014-12-01 23:16:27 +01:00
2f34f93c3a
pref_about_message string deleted
2014-12-01 21:42:37 +01:00
59a112ebfe
Updated Czech translation file
...
added missing strings
fixing typos, improvements for better understanding
2014-12-01 16:46:17 +01:00
9dd445a507
fixed #728
2014-12-01 12:33:57 +01:00
6a429d9939
bumped cap version as well
2014-12-01 11:25:47 +01:00
8d306ac64f
clear encrypted messages on reinit
2014-12-01 11:18:55 +01:00
96bbd16ca5
worked around rare npe
2014-12-01 10:58:06 +01:00
5992d4ac00
fixed npe if roster jid couldnt be parsed
2014-12-01 10:25:36 +01:00
21f77cd1e3
fixed italian translation
2014-12-01 09:59:39 +01:00
99e3fb814d
Merge pull request #726 from Elinvention/development
...
Update Italian translations
2014-12-01 09:51:19 +01:00
a4b4c13c66
do not query service info from main server again
2014-12-01 09:48:30 +01:00
57fd763066
don't request fragment before updating
2014-11-30 22:27:11 +01:00
e039c8de25
Removed pref_about_message which is not translatable
2014-11-30 21:51:48 +01:00
6b772f4141
Added missing italian translations with some minor fixes to existing ones
2014-11-30 21:16:55 +01:00
52a43db6d6
Merge pull request #721 from SamWhited/warning_fixes
...
Warning "fixes"
2014-11-29 19:14:13 +01:00
acf446a02c
Merge pull request #718 from beriain/development
...
Update basque translation
2014-11-29 19:13:26 +01:00
d98486d1ca
fixed npe for broken bookmarks
2014-11-29 19:09:28 +01:00
e43ac27e8f
Accessibility: Add missing image descriptions
2014-11-29 08:03:35 -05:00
afc673bb15
Misc. "fixes" to correct warnings.
2014-11-29 07:50:59 -05:00
1ff9293ee1
fix for concurrency issue
2014-11-29 13:09:56 +01:00
d9182fe81c
Update basque translation
2014-11-27 18:33:42 +01:00
3d8a2e7923
Merge branch 'development' of https://github.com/siacs/Conversations into development
2014-11-27 10:30:27 +01:00
7ba41c6a8e
fixed npe. fixed #717
2014-11-27 10:30:06 +01:00
2f02d8d398
create conversation with bare jid
2014-11-27 10:26:53 +01:00
0b8032dbd6
use getAttributeAsJid method
2014-11-27 10:26:34 +01:00
e1e28e9ef6
Update german translations
...
modified translations a bit
2014-11-26 11:39:40 +01:00
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
6f21dc84d5
Merge pull request #714 from betheg/muc_bookmark_cd
...
MUC: option to set/delete bookmark in conference details.
2014-11-24 09:31:29 +01:00
31b539daf7
MUC: option to set/delete bookmark in conference details.
2014-11-23 21:37:45 +01:00
4d841587c8
Update german translations
2014-11-23 15:21:12 +01:00
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
bdfdc5fb10
MUC: do not add yourself to the muc user list.
2014-11-23 15:19:07 +01:00
ca761bac3c
Update spanish translations
2014-11-22 00:37:41 +01:00
28fefad834
work around to not confuse irc transport with real conference servers
2014-11-21 20:34:19 +01:00
36f8a31d7d
Merge pull request #706 from betheg/unused_imports
...
remove unused imports.
2014-11-21 20:03:46 +01:00
81a1a48b8d
update action bar with conversations updates as well
2014-11-21 20:02:13 +01:00
febbefefa5
MUC: set from when join muc.
2014-11-21 19:37:50 +01:00
dc0dba3faf
remove unused imports.
2014-11-21 19:17:27 +01:00
424de3ea3a
move task to back and not finish when hitting back button
2014-11-21 18:57:27 +01:00
44faec7051
STATUS_CODE_SELF_PRESENCE is not set in all case.
2014-11-21 16:14:56 +01:00
888475d4fe
additional null pointer saftey checks
2014-11-21 15:25:57 +01:00
de0b36fc78
verify contacts key only on initiating side of smp
2014-11-21 13:42:25 +01:00
92ad4cb736
changed listener timing and cache clearing after muc presences
2014-11-20 22:44:31 +01:00
66abdfccd4
create file and dirs before creating file
2014-11-20 22:02:32 +01:00
8fe3b2974b
Merge pull request #698 from kriztan/patch-1
...
Update german translations
2014-11-20 21:47:12 +01:00
3e3767cb06
change status codes string 'number' to a better readable constant.
2014-11-20 21:37:56 +01:00
13bb46d550
Update german translations
2014-11-20 19:20:49 +01:00
a207240881
fixed potential NPEs
2014-11-20 18:42:47 +01:00
a142dcc263
import fixes
2014-11-20 18:33:04 +01:00
8b10ea676c
Merge branch 'development' of https://github.com/siacs/Conversations into development
2014-11-20 18:20:45 +01:00
0ad6d0616f
brought ad hoc conferences back. fixed #688 fixed #367
2014-11-20 18:20:42 +01:00
73d184352e
Remove broken / unused imports
2014-11-19 14:57:23 -05:00
e9948f6b84
sent read marker to full jid
2014-11-19 17:40:42 +01:00
cbf42ee12c
some saftey checks before registering listeners in XmppActivity
2014-11-19 17:31:28 +01:00
4b9a507633
Merge pull request #691 from kruks23/development
...
Update spanish translation
2014-11-19 17:22:57 +01:00
393807ab2d
Merge pull request #692 from kriztan/patch-3
...
Update german translations
2014-11-19 17:22:50 +01:00
24b5d0eb26
Update basque translation
2014-11-19 16:12:31 +01:00
6847594363
Update german translations
2014-11-19 08:51:23 +01:00
3ccee22c86
Update spanish translations
2014-11-19 00:16:45 +01:00
8f33f3540a
Update spanish translations
2014-11-18 23:53:37 +01:00
66087cb360
put error notification into notification service
2014-11-18 15:26:28 +01:00
1122e084a0
simplified message merge condition
2014-11-18 14:49:49 +01:00
10bf2b77a8
synchronized message list in conversation fragment
2014-11-18 14:43:15 +01:00
dcebc120ac
show dynamic tags in contacts activity as well
2014-11-18 14:24:06 +01:00
ab832bcff7
properly remove conversations context menu
2014-11-18 13:51:04 +01:00
d29c861d03
disabled broken conversations context menu
2014-11-18 03:12:51 +01:00
018a0c7978
better usage of synchronized in some places
2014-11-18 03:10:59 +01:00
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
d2a4855a1e
added rendered versions of new icons
2014-11-18 00:42:19 +01:00
240d2d68c8
context menu for conversations. fixed #630
2014-11-18 00:07:27 +01:00
86241a260a
clear avatar cache with new roster push from server
2014-11-17 21:28:16 +01:00
abbadcb58b
avoided some null pointers
2014-11-17 20:45:00 +01:00
f41c3eee04
context menu for muc participants + refactor trueCounterpart to use Jid class
2014-11-17 20:02:46 +01:00
283d5058e5
synchronized around cache clear in avatar service
2014-11-17 20:01:56 +01:00
c058594ff5
Merge pull request #681 from SamWhited/searchlocalefix
...
Use `Locale.US' for string comparisons in search
2014-11-17 18:27:21 +01:00
b6d8977237
Use `Locale.US' for string comparisons in search
2014-11-17 12:19:45 -05:00
e664a0c936
Merge pull request #680 from ferdev1/patch-2
...
Fix string 2
2014-11-17 18:14:50 +01:00
8865cc406c
trim search before searching
2014-11-17 17:31:26 +01:00
1a5af45afb
Merge branch 'development' of https://github.com/siacs/Conversations into development
2014-11-17 17:24:56 +01:00
252c7e68d6
split search keywords by whitespaces and imply AND operatior
2014-11-17 17:24:33 +01:00
e30e84c819
slightly modified logo / launcher icon
2014-11-17 17:23:58 +01:00
6c13b8a9a1
Update strings.xml
2014-11-17 17:13:20 +01:00
55957a77b3
Fix linter suppression
2014-11-17 09:19:11 -05:00
ceecc8ffe7
Merge branch 'development' of https://github.com/siacs/Conversations into development
2014-11-17 01:54:19 +01:00
967cd922e1
highlight muc members by touching their name in muc details. fixed #503
2014-11-17 01:54:01 +01:00
81b93c763a
Merge pull request #675 from ferdev1/patch-1
...
Fix string
2014-11-17 00:04:53 +01:00
2036c58cd7
made tags searchable
2014-11-16 23:58:30 +01:00
8c4236b01b
fixed regression of xmpp uris not working
2014-11-16 22:23:42 +01:00
c147f44cf1
Fix string
2014-11-16 18:11:14 +01:00
155b607f4d
Merge pull request #673 from SamWhited/development
...
Fix fetching accounts by JIDs
2014-11-16 17:35:59 +01:00
cf00f3fade
happy hanukkah
2014-11-16 17:21:21 +01:00
5765a91db6
Fix fetching accounts by JIDs
...
Fixes a crash when publishing an avatar
2014-11-16 10:04:45 -05:00
84b2ce10b7
Merge branch 'development' of https://github.com/siacs/Conversations into development
2014-11-16 12:28:21 +01:00
ac8c2b7e62
show full time stamp in connection established field
2014-11-16 12:11:14 +01:00
f18f3086af
better error checking in ssl switch over
2014-11-16 12:00:53 +01:00
cfdda5f8fd
Don't escape passwords in SASL
...
Fixes #671
2014-11-15 21:11:14 -05:00
2067b9bd8d
made scan and show qr code more accessible in VerifyOtrActivity
2014-11-16 02:10:29 +01:00
2b21bc13fc
Merge branch 'master' into development
2014-11-16 00:34:44 +01:00
ac4eabbd22
close cursor for database
2014-11-16 00:34:16 +01:00
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
0fb1772f18
Merge pull request #669 from SamWhited/scramcaching
...
Cache SCRAM-SHA-1 keys for current session
2014-11-15 21:02:13 +01:00
4a8fa8b498
Merge pull request #670 from kruks23/translation9
...
Update Spanish Translations
2014-11-15 21:00:05 +01:00
5a634fdf47
small modifications for changing an account status in XmppConnection
2014-11-15 20:54:28 +01:00
0dc711d710
Update Spanish Translations
2014-11-15 20:48:31 +01:00
a463f82e3b
Cache SCRAM-SHA-1 keys for current session
2014-11-15 12:57:36 -05:00
69ab8a2adb
Merge pull request #668 from SamWhited/auth-pinning
...
Auth mechanism pinning
2014-11-15 17:44:51 +01:00
17cec63c14
Set security error status on TLS cert mismatch
2014-11-15 11:40:41 -05:00
d2388a5a7e
Remove extra status wrapper method
2014-11-15 11:31:15 -05:00
251f4d6d7f
Add incompatible server status
2014-11-15 11:29:58 -05:00
7ba9854c22
fixed some disco / carbon related bugs
2014-11-15 17:24:06 +01:00
c09d450db8
Add security error status
2014-11-15 11:21:47 -05:00
d94b07c916
Make account status an enum
2014-11-15 11:12:41 -05:00
847877f9d2
Add auth method pinning
2014-11-15 10:01:08 -05:00
35bf13f5ef
Merge branch 'feature/file_transfer' into development
...
Conflicts:
src/main/res/values/strings.xml
2014-11-15 15:52:15 +01:00
07b07115d6
Merge branch 'feature/foreground_service' into development
...
Conflicts:
src/main/res/values/strings.xml
2014-11-15 15:51:27 +01:00
5b9c690c47
Merge branch 'feature/otr_verification' into development
2014-11-15 15:50:35 +01:00
4c504dea7a
Merge pull request #665 from SamWhited/issue71
...
Add SCRAM-SHA1 support
2014-11-15 15:34:50 +01:00
bdc86bb8e3
added low priority and removed date in foreground noticfication
2014-11-15 15:34:34 +01:00
3c6b3506e3
turn on foreground service in expert settings
2014-11-15 15:34:34 +01:00
41f7848f2c
handled more error cases
2014-11-15 15:34:12 +01:00
ca2d86cf87
better cleanup after unsuccesful transfers
2014-11-15 15:34:12 +01:00
47d44448f3
fixed description in notifications and conversation overview
2014-11-15 15:34:12 +01:00
e0f012dba1
fixed resending for files as well
2014-11-15 15:34:12 +01:00
cc4f3702a8
made file transfers cancelable
2014-11-15 15:34:12 +01:00
4ab558715c
adepted conversationadapter to deal with files
2014-11-15 15:34:12 +01:00
af2922adea
progress for ibb transfers
2014-11-15 15:34:12 +01:00
e7a70a46e0
some mime and pgp fixes for file transfer
2014-11-15 15:34:12 +01:00
16847a30c8
support for pgp files
2014-11-15 15:34:12 +01:00
c7acfe85c3
progress for http images as well. fixed open button for sent files
2014-11-15 15:34:12 +01:00
dac12be53e
copy non local files to private storage first
2014-11-15 15:34:11 +01:00
02cbda68a7
bug fixes and various improvements for file transfer
2014-11-15 15:34:11 +01:00
7a90ca429b
basic arbitrary file transfer
2014-11-15 15:34:11 +01:00
4b5d6f5b4f
Improve auth error handling and state machine
2014-11-15 08:49:00 -05:00
e2fb32841b
Merge pull request #666 from SamWhited/localefixes
...
Spelling fixes
2014-11-15 13:12:29 +01:00
8650bc2e13
Make licenses info untranslatable
2014-11-14 22:33:18 -05:00
bae2b7ddc6
Spelling fixes in Italian translation
2014-11-14 22:16:58 -05:00
62404b234c
Spelling fix in German translation
2014-11-14 22:13:42 -05:00
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
2bb68bcbba
Added check for empty from on group chat packet
2014-11-14 11:40:43 -08:00
793671023b
Merge branch 'development' of https://github.com/siacs/Conversations into development
2014-11-14 19:49:49 +01:00
3118340ade
fixed possible npe when loading null counterpart into message
2014-11-14 19:49:44 +01:00
2bbad26fb0
Merge pull request #653 from kriztan/patch-2
...
Update German language
2014-11-14 12:16:57 +01:00
17c2ed411d
made presences synchronized
2014-11-13 14:44:41 +01:00
2db569b20f
made presences synchronized
2014-11-13 14:44:19 +01:00
77ba68d61f
more npe checks in muc packet parser
2014-11-13 14:27:27 +01:00
e6a4fa031b
more npe checks in muc packet parser
2014-11-13 14:27:10 +01:00
88c8373553
Merge pull request #656 from SamWhited/authrefactor
...
Refactor authentication code
2014-11-12 23:01:18 +01:00
2222483b42
Make sure we're storing the display JID as Unicode
2014-11-12 16:19:16 -05:00
fca3e3c756
Update German language
...
deleted 'pref_about_message'
2014-11-12 20:09:14 +01:00
14cfb60952
Refactor authentication code
2014-11-12 10:15:38 -05:00
b971965697
Update German language
2014-11-12 13:13:59 +01:00
f1e2be4096
check if account is online before doing smp
2014-11-12 12:45:59 +01:00
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
d1bf9a3f6d
use auto register for verify otr listeners
2014-11-11 17:42:09 +01:00
76f4cf1a73
small bug fix
2014-11-11 17:40:51 +01:00
e33fc26cbe
added snackbar to indicate smp. more error handling in verify activity
2014-11-11 17:40:51 +01:00
6cd2ff0d88
initial smp support
2014-11-11 17:40:51 +01:00
e555fe4b03
auto register/unregister listeners
2014-11-11 17:39:28 +01:00
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
8cb97f517f
small bug fix
2014-11-10 23:47:04 +01:00
dc98b3dbd5
added snackbar to indicate smp. more error handling in verify activity
2014-11-10 22:03:23 +01:00
8740b55d37
initial smp support
2014-11-10 19:23:54 +01:00
c8a6b05163
made Jid class parse otr session ids
2014-11-10 11:37:31 +01:00
89ee999e1b
more refactoring for presence selection. removed getTo, getFrom and getJid from Element
2014-11-10 01:24:35 +01:00
26b4788733
formating
2014-11-09 21:27:37 +01:00
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
72068d1a26
fixed private messages
2014-11-09 21:14:37 +01:00
b1da9ae3cc
add libidn to pref_about_message.
2014-11-09 21:02:35 +01:00
385bea0fe3
s/getResourcepart().isEmpty()/isBareJid()/
2014-11-09 13:13:19 -05:00
56b4ac1751
use isBareJid instead of getResourcePart().isEmpty()
2014-11-09 19:06:43 +01:00
eb9e988361
fixed muc sender history for some cases (where the previous nick was a valid jid)
2014-11-09 18:24:01 +01:00
69ef17efc0
migrated some otr stuff to new jid classes
2014-11-09 17:46:00 +01:00
c310ada8b3
Merge branch 'development' of https://github.com/siacs/Conversations into development
2014-11-09 17:05:20 +01:00
cb1a36da79
Merge pull request #642 from SamWhited/accountgetjid
...
Rework `Account.getJid()' to return full JIDs
2014-11-09 17:06:09 +01:00
e9af0d4ca7
Merge branch 'master' into development
2014-11-09 17:02:49 +01:00
61f046a675
make avatar service not break on empty names
2014-11-09 17:02:39 +01:00
180a0e4408
Rework `Account.getJid()' to return full JIDs
...
Remove `Account.getFullJid()'
2014-11-09 10:57:22 -05:00
ad6fef063b
fixed null pointer in message merger
2014-11-09 16:47:31 +01:00
377bd49ee8
refactored code to always contain full jid for counterpart
2014-11-09 16:21:13 +01:00
2b99b694eb
fixed full jid for account
2014-11-09 16:20:36 +01:00
87c4fd9050
return null if from ist not set in abstract stanza
2014-11-09 16:18:53 +01:00
8437dbd480
Merge pull request #641 from kruks23/translation8
...
Update Spanish Translations
2014-11-09 15:20:25 +01:00
53c7905631
Check for illegal arguments to the toASCII func
2014-11-09 09:05:02 -05:00
f146c203a9
add all used libs to the pref_about_message.
...
also improve the notice a bit.
2014-11-09 13:59:38 +01:00
6f6f15d563
Update Spanish Translations
2014-11-09 13:29:30 +01:00
7cfcf10f48
Fix contact highlighting in MUC
2014-11-09 07:20:08 -05:00
fc594e9b73
Fix issue with IDN SRV records
2014-11-09 07:00:40 -05:00
02db197a89
Fix crash on account creation
2014-11-09 07:00:40 -05:00
cc34c60255
Don't crash on packets with no "from" specified
2014-11-09 07:00:40 -05:00
1a3327f2b1
Create avatar's for JID's w/o localparts
2014-11-09 07:00:40 -05:00
5ce0cd3802
Fields that we sync on should be final
2014-11-09 07:00:40 -05:00
e49c2b14ed
Fix bug introduced by rebase
2014-11-09 07:00:40 -05:00
778fb9de6c
Fix letter avatar selection in MUC
2014-11-09 07:00:40 -05:00
efa4cec24d
More formatting fixes in MUC
2014-11-09 07:00:40 -05:00
dd426ca6de
Format contact names in MUC properly
2014-11-09 07:00:40 -05:00
1f5908b1d1
Fix JID parsing error
2014-11-09 07:00:40 -05:00
9db624ec7b
It builds again!
2014-11-09 07:00:40 -05:00
864f319500
Add a packet JID place I missed...
2014-11-09 07:00:40 -05:00
f108fc5a5c
Update more files to use JID objects
2014-11-09 07:00:40 -05:00
bf9207456e
Update another chunk of stuff to use JID objects
2014-11-09 07:00:40 -05:00
f15900426d
Update more files to use JID objects
2014-11-09 07:00:40 -05:00
9053f4aca0
Move a chunk of classes over to using JID objects
2014-11-09 07:00:40 -05:00
a990861316
Use factories to generate JIDs
2014-11-09 06:59:49 -05:00
a11878b139
Improve JID error handling
2014-11-09 06:59:49 -05:00
8e23b6c272
Add first attempt at JID class
2014-11-09 06:59:49 -05:00
589bf01545
version bump to 0.8.3 + changelog
2014-11-09 11:08:09 +01:00
4d7bee2e38
fixed #634
2014-11-09 10:51:54 +01:00
6f24432ae3
use proper theme for MTM
2014-11-09 10:51:35 +01:00
acfbd44529
got rid of MTM and mRandom variable in favor of using a reference to service
2014-11-09 10:50:45 +01:00
047aaf5d4f
check if socket was null before doing ssl connect
2014-11-08 20:52:02 +01:00
ea657ece0d
update conversation fragment on every backend connect
2014-11-08 20:51:27 +01:00
8a2f20b6ed
Merge pull request #549 from emdete/p2
...
adjust api level wrapping
2014-11-08 13:32:13 +01:00
014f5a195b
bug fixes for the previous ui refactoring
2014-11-07 21:49:31 +01:00
e45d7bda38
UI code refactoring
2014-11-07 15:38:59 +01:00
e42b6d715b
fixed #633
2014-11-06 17:25:14 +01:00
dace729c5b
don't show avatar on initial account creation
2014-11-06 16:51:50 +01:00
413623337b
version bump to 0.8.2
2014-11-06 10:32:04 +01:00
2253814519
fixed notifications for images
2014-11-05 21:37:40 +01:00
6a43bda4d7
fixed #617
2014-11-05 00:06:07 +01:00
f8d5d6b2b5
reformated license a bit
2014-11-04 23:47:15 +01:00
0c94804813
Merge pull request #626 from SamWhited/issue612
...
Add last seen info to the database
2014-11-04 22:59:32 +01:00
7d4e03cc9a
Merge branch 'development' of https://github.com/siacs/Conversations into development
2014-11-04 22:56:36 +01:00
96563aca52
Add last seen info to the database
...
Fixes #612
2014-11-04 16:41:35 -05:00
e22d3b4946
adjust api level wrapping
2014-11-04 20:05:45 +01:00
df786cbf01
Shorten license text and fix height of scrollview
2014-11-04 13:26:48 -05:00
7b67f1a19c
Use normal text size and color
2014-11-04 13:17:15 -05:00
55c81eaf15
Make links clickable in about text
2014-11-04 13:09:56 -05:00
88c0793694
link to account details when touching own avatar
2014-11-04 18:52:29 +01:00
f10dd428ba
Convert about dialog to activity
2014-11-04 12:48:46 -05:00
97b4b012d0
Use real copyright symbol ©
2014-11-04 12:48:25 -05:00
8bf40308c8
Move AboutDialog to correct path
2014-11-04 12:47:58 -05:00
df54ee75b4
Add about dialog with license info
2014-11-04 12:47:58 -05:00
ff10b094a0
clear avatar cache after nick name change
2014-11-04 18:27:20 +01:00
ff22f93185
Merge pull request #625 from SamWhited/linterfix
...
Make linter ignore properly checked API mismatch
2014-11-04 17:59:26 +01:00
b234b690c9
Make linter ignore properly checked API mismatch
2014-11-04 11:52:47 -05:00
cd5a56e8e7
show avatar in editaccount
2014-11-04 17:38:41 +01:00
b824e55277
register nfc callback in every activity that provides a proper sharable uri
2014-11-04 17:10:35 +01:00
2ce95b19a9
optimize code abit
2014-11-04 13:32:44 +01:00
b6c20d9260
implement "correct" ndef parsing
2014-11-04 13:32:37 +01:00
b3582c970e
made qr code available from muc and contact details as well
2014-11-04 12:15:14 +01:00
12e2f0bdd7
added missing return statement. fixed api bug
2014-11-04 11:04:05 +01:00
fb24bf98c9
be more OO
2014-11-04 10:49:10 +01:00
32396b3bde
support pre JELLY_BEAN ndef
2014-11-04 10:48:59 +01:00
7a9327d960
fixed nfc. react to ?join uris. some refactoring. code cleanup. thanks to @emdete
2014-11-03 23:47:49 +01:00
d458919c8f
unfinishd qr code implemenation. thanks to @emdete
2014-11-03 22:47:07 +01:00
08cb23a886
fixed merge error
2014-11-03 21:22:26 +01:00
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
a054a3fbb4
use different filter for nfc intents
2014-11-03 21:04:22 +01:00
28a186cd6c
basic beam code / untested
2014-11-03 20:55:46 +01:00
4614ff343e
create file explicitly before downloading image
2014-11-03 20:55:31 +01:00
c48407f3b4
Merge branch 'development' of https://github.com/siacs/Conversations into development
2014-11-03 20:28:58 +01:00
696dd07a41
basic beam code / untested
2014-11-03 20:00:20 +01:00
ec9c264cf7
more error handling for http connection
2014-11-03 19:59:11 +01:00
39ae34d3e6
Wrap "last seen" time.
...
Fixes #611
2014-11-03 08:28:20 -05:00
3e05ef77b1
version bump to 0.8.1
2014-11-03 11:20:51 +01:00
49920649db
always use exif helper
2014-11-03 11:20:32 +01:00
27f42dfb63
more error handling in xmppconnection
2014-11-03 10:03:45 +01:00
1ea2e7dc3b
fixed arrayoutofbounds + spelling
2014-11-01 14:33:34 +01:00
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
281ce3105f
Make conversations the root project
2014-10-22 15:47:11 -04:00
kriztan