aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'feature/file_transfer' into developmentiNPUTmice2014-11-1520-272/+755
|\ | | | | | | | | Conflicts: src/main/res/values/strings.xml
| * handled more error casesiNPUTmice2014-11-152-5/+29
| |
| * better cleanup after unsuccesful transfersiNPUTmice2014-11-153-1/+35
| |
| * fixed description in notifications and conversation overviewiNPUTmice2014-11-157-50/+91
| |
| * fixed resending for files as welliNPUTmice2014-11-152-3/+4
| |
| * made file transfers cancelableiNPUTmice2014-11-156-21/+71
| |
| * adepted conversationadapter to deal with filesiNPUTmice2014-11-151-3/+21
| |
| * progress for ibb transfersiNPUTmice2014-11-155-13/+27
| |
| * some mime and pgp fixes for file transferiNPUTmice2014-11-156-73/+70
| |
| * support for pgp filesiNPUTmice2014-11-155-23/+38
| |
| * progress for http images as well. fixed open button for sent filesiNPUTmice2014-11-156-7/+38
| |
| * copy non local files to private storage firstiNPUTmice2014-11-153-23/+77
| |
| * bug fixes and various improvements for file transferiNPUTmice2014-11-155-19/+30
| |
| * basic arbitrary file transferiNPUTmice2014-11-1511-133/+326
| |
* | Merge branch 'feature/foreground_service' into developmentiNPUTmice2014-11-153-9/+41
|\ \ | | | | | | | | | | | | Conflicts: src/main/res/values/strings.xml
| * | added low priority and removed date in foreground noticficationiNPUTmice2014-11-151-0/+2
| | |
| * | turn on foreground service in expert settingsiNPUTmice2014-11-153-9/+39
| |/
* | Merge branch 'feature/otr_verification' into developmentiNPUTmice2014-11-156-122/+445
|\ \ | |/ |/|
| * check if account is online before doing smpfeature/otr_verificationiNPUTmice2014-11-121-11/+24
| |
| * Merge branch 'feature/otr_verification' of ↵iNPUTmice2014-11-111-1/+0
| |\ | | | | | | | | | | | | | | | | | | https://github.com/siacs/Conversations into feature/otr_verification Conflicts: src/main/java/eu/siacs/conversations/ui/VerifyOTRActivity.java
| | * small bug fixiNPUTmice2014-11-101-8/+3
| | |
| | * added snackbar to indicate smp. more error handling in verify activityiNPUTmice2014-11-103-113/+144
| | |
| | * initial smp supportiNPUTmice2014-11-106-62/+356
| | |
| * | use auto register for verify otr listenersiNPUTmice2014-11-111-9/+0
| | |
| * | small bug fixiNPUTmice2014-11-111-8/+3
| | |
| * | added snackbar to indicate smp. more error handling in verify activityiNPUTmice2014-11-113-113/+144
| | |
| * | initial smp supportiNPUTmice2014-11-116-62/+356
| | |
* | | Improve auth error handling and state machineSam Whited2014-11-155-40/+43
| | |
* | | Add SCRAM-SHA1 supportSam Whited2014-11-149-381/+726
| | | | | | | | | | | | | | | | | | | | | Factor out GS2 tokanization into own class Add authentication exception class Fixes #71
* | | Added check for empty from on group chat packetKevin Rauwolf2014-11-141-0/+3
| | |
* | | fixed possible npe when loading null counterpart into messageiNPUTmice2014-11-141-1/+6
| | |
* | | made presences synchronizediNPUTmice2014-11-131-13/+27
| | |
* | | more npe checks in muc packet parseriNPUTmice2014-11-131-31/+34
| | |
* | | Merge pull request #656 from SamWhited/authrefactorDaniel Gultsch2014-11-125-88/+145
|\ \ \ | | | | | | | | Refactor authentication code
| * | | Refactor authentication codeSam Whited2014-11-125-88/+145
| |/ /
* / / Make sure we're storing the display JID as UnicodeSam Whited2014-11-121-2/+3
|/ /
* | auto register/unregister listenersiNPUTmice2014-11-117-345/+289
| |
* | temporarliy got rid of some insane work arounds in favor of some maybe less ↵iNPUTmice2014-11-113-14/+17
|/ | | | insane work arounds
* made Jid class parse otr session idsiNPUTmice2014-11-101-0/+10
|
* more refactoring for presence selection. removed getTo, getFrom and getJid ↵iNPUTmice2014-11-108-274/+283
| | | | from Element
* fixed private messagesiNPUTmice2014-11-091-2/+2
|
* s/getResourcepart().isEmpty()/isBareJid()/Sam Whited2014-11-095-7/+7
|
* use isBareJid instead of getResourcePart().isEmpty()iNPUTmice2014-11-092-2/+2
|
* fixed muc sender history for some cases (where the previous nick was a valid ↵iNPUTmice2014-11-092-8/+17
| | | | jid)
* migrated some otr stuff to new jid classesiNPUTmice2014-11-092-79/+82
|
* Merge branch 'development' of https://github.com/siacs/Conversations into ↵iNPUTmice2014-11-0927-106/+102
|\ | | | | | | development
| * Merge pull request #642 from SamWhited/accountgetjidDaniel Gultsch2014-11-0927-106/+102
| |\ | | | | | | Rework `Account.getJid()' to return full JIDs
| | * Rework `Account.getJid()' to return full JIDsSam Whited2014-11-0927-106/+102
| | | | | | | | | | | | Remove `Account.getFullJid()'
* | | Merge branch 'master' into developmentiNPUTmice2014-11-091-14/+22
|\ \ \ | |/ / |/| |
| * | make avatar service not break on empty namesiNPUTmice2014-11-091-14/+22
| | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-30 16:05:45 +0000