iNPUTmice
|
490f40b196
|
possible work around for some weird - possibly sdk - bugs
|
2014-12-07 21:14:13 +01:00 |
|
|
iNPUTmice
|
a38005ec89
|
fixed #544
|
2014-12-03 12:33:32 +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
|
46b2760069
|
worked around concurrent modification exception
|
2014-12-03 00:54:07 +01:00 |
|
|
iNPUTmice
|
9dd445a507
|
fixed #728
|
2014-12-01 12:33:57 +01:00 |
|
|
iNPUTmice
|
8d306ac64f
|
clear encrypted messages on reinit
|
2014-12-01 11:18:55 +01:00 |
|
|
iNPUTmice
|
57fd763066
|
don't request fragment before updating
|
2014-11-30 22:27:11 +01:00 |
|
|
Sam Whited
|
afc673bb15
|
Misc. "fixes" to correct warnings.
|
2014-11-29 07:50:59 -05: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 |
|
|
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 |
|
|
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
|
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 |
|
|
iNPUTmice
|
de0b36fc78
|
verify contacts key only on initiating side of smp
|
2014-11-21 13:42:25 +01:00 |
|
|
iNPUTmice
|
0ad6d0616f
|
brought ad hoc conferences back. fixed #688 fixed #367
|
2014-11-20 18:20:42 +01:00 |
|
|
iNPUTmice
|
cbf42ee12c
|
some saftey checks before registering listeners in XmppActivity
|
2014-11-19 17:31:28 +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
|
240d2d68c8
|
context menu for conversations. fixed #630
|
2014-11-18 00:07:27 +01:00 |
|
|
iNPUTmice
|
f41c3eee04
|
context menu for muc participants + refactor trueCounterpart to use Jid class
|
2014-11-17 20:02:46 +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
|
8c4236b01b
|
fixed regression of xmpp uris not working
|
2014-11-16 22:23:42 +01:00 |
|
|
iNPUTmice
|
cf00f3fade
|
happy hanukkah
|
2014-11-16 17:21:21 +01:00 |
|
|
iNPUTmice
|
ac8c2b7e62
|
show full time stamp in connection established field
|
2014-11-16 12:11:14 +01:00 |
|
|
iNPUTmice
|
2067b9bd8d
|
made scan and show qr code more accessible in VerifyOtrActivity
|
2014-11-16 02:10:29 +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 |
|
|
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 |
|
|
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 |
|
|
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
|
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
|
47d44448f3
|
fixed description in notifications and conversation overview
|
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
|
e7a70a46e0
|
some mime and pgp fixes for file transfer
|
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 |
|
|
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
|
89ee999e1b
|
more refactoring for presence selection. removed getTo, getFrom and getJid from Element
|
2014-11-10 01:24:35 +01: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 |
|
|
Sam Whited
|
180a0e4408
|
Rework `Account.getJid()' to return full JIDs
Remove `Account.getFullJid()'
|
2014-11-09 10:57:22 -05:00 |
|
|
iNPUTmice
|
377bd49ee8
|
refactored code to always contain full jid for counterpart
|
2014-11-09 16:21:13 +01:00 |
|
|
Sam Whited
|
7cfcf10f48
|
Fix contact highlighting in MUC
|
2014-11-09 07:20:08 -05:00 |
|
|
Sam Whited
|
02db197a89
|
Fix crash on account creation
|
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
|
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
|
9db624ec7b
|
It builds again!
|
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 |
|
|
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
|
7d4e03cc9a
|
Merge branch 'development' of https://github.com/siacs/Conversations into development
|
2014-11-04 22:56:36 +01: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 |
|
|
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 |
|
|
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 |
|
|
Sam Whited
|
281ce3105f
|
Make conversations the root project
|
2014-10-22 15:47:11 -04:00 |
|