Conversations/src/main/java/eu/siacs/conversations/ui
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
..
adapter use isBareJid instead of getResourcePart().isEmpty() 2014-11-09 19:06:43 +01:00
AboutActivity.java Convert about dialog to activity 2014-11-04 12:48:46 -05:00
AboutPreference.java Convert about dialog to activity 2014-11-04 12:48:46 -05:00
ChooseContactActivity.java Rework `Account.getJid()' to return full JIDs 2014-11-09 10:57:22 -05:00
ConferenceDetailsActivity.java auto register/unregister listeners 2014-11-11 17:39:28 +01:00
ContactDetailsActivity.java auto register/unregister listeners 2014-11-11 17:39:28 +01:00
ConversationActivity.java auto register/unregister listeners 2014-11-11 17:39:28 +01:00
ConversationFragment.java added snackbar to indicate smp. more error handling in verify activity 2014-11-11 17:40:51 +01:00
EditAccountActivity.java auto register/unregister listeners 2014-11-11 17:39:28 +01:00
EditMessage.java Make conversations the root project 2014-10-22 15:47:11 -04:00
ManageAccountActivity.java auto register/unregister listeners 2014-11-11 17:39:28 +01:00
PublishProfilePictureActivity.java Rework `Account.getJid()' to return full JIDs 2014-11-09 10:57:22 -05:00
SettingsActivity.java It builds again! 2014-11-09 07:00:40 -05:00
SettingsFragment.java Make conversations the root project 2014-10-22 15:47:11 -04:00
ShareWithActivity.java Update more files to use JID objects 2014-11-09 07:00:40 -05:00
StartConversationActivity.java auto register/unregister listeners 2014-11-11 17:39:28 +01:00
UiCallback.java Make conversations the root project 2014-10-22 15:47:11 -04:00
VerifyOTRActivity.java Merge branch 'feature/otr_verification' of https://github.com/siacs/Conversations into feature/otr_verification 2014-11-11 17:45:16 +01:00
XmppActivity.java initial smp support 2014-11-11 17:40:51 +01:00