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
|
5b9c690c47
|
Merge branch 'feature/otr_verification' into development
|
2014-11-15 15:50:35 +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
|
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
|
7a90ca429b
|
basic arbitrary file transfer
|
2014-11-15 15:34:11 +01:00 |
|
|
iNPUTmice
|
3118340ade
|
fixed possible npe when loading null counterpart into message
|
2014-11-14 19:49:44 +01:00 |
|
|
iNPUTmice
|
2db569b20f
|
made presences synchronized
|
2014-11-13 14:44:19 +01:00 |
|
|
iNPUTmice
|
e6a4fa031b
|
more npe checks in muc packet parser
|
2014-11-13 14:27:10 +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
|
89ee999e1b
|
more refactoring for presence selection. removed getTo, getFrom and getJid from Element
|
2014-11-10 01:24:35 +01:00 |
|
|
Sam Whited
|
385bea0fe3
|
s/getResourcepart().isEmpty()/isBareJid()/
|
2014-11-09 13:13:19 -05:00 |
|
|
iNPUTmice
|
69ef17efc0
|
migrated some otr stuff to new jid classes
|
2014-11-09 17:46:00 +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 |
|
|
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 |
|
|
Sam Whited
|
1a3327f2b1
|
Create avatar's for JID's w/o localparts
|
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
|
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 |
|
|
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 |
|
|
iNPUTmice
|
4d7bee2e38
|
fixed #634
|
2014-11-09 10:51:54 +01:00 |
|
|
Sam Whited
|
96563aca52
|
Add last seen info to the database
Fixes #612
|
2014-11-04 16:41:35 -05: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 |
|
|
Sam Whited
|
281ce3105f
|
Make conversations the root project
|
2014-10-22 15:47:11 -04:00 |
|