~singpolyma/cheogram-android

46f147a82c6b161e071f717c7686f8b78a20aaf1 — Sam Whited 8 years ago 142384e + a362bd1
Merge branch 'gradle' into development

Conflicts:
	.gitignore
	CHANGELOG.md
	README.md
	libs/MemorizingTrustManager
	libs/minidns
	libs/openpgp-api-lib
483 files changed, 9667 insertions(+), 2748 deletions(-)

M .gitignore
D .gitmodules
D .project
M README.md
A build.gradle
D custom_rules.xml
A gradle/wrapper/gradle-wrapper.jar
A gradle/wrapper/gradle-wrapper.properties
A gradlew
A gradlew.bat
D libs/MemorizingTrustManager
A libs/MemorizingTrustManager/.gitignore
A libs/MemorizingTrustManager/AndroidManifest.xml
A libs/MemorizingTrustManager/LICENSE.txt
A libs/MemorizingTrustManager/README.mdwn
A libs/MemorizingTrustManager/ant.properties
A libs/MemorizingTrustManager/build.gradle
R build.xml => libs/MemorizingTrustManager/build.xml
A libs/MemorizingTrustManager/example/AndroidManifest.xml
A libs/MemorizingTrustManager/example/ant.properties
A libs/MemorizingTrustManager/example/build.gradle
A libs/MemorizingTrustManager/example/build.xml
A libs/MemorizingTrustManager/example/proguard-project.txt
A libs/MemorizingTrustManager/example/project.properties
A libs/MemorizingTrustManager/example/res/layout/mtmexample.xml
A libs/MemorizingTrustManager/example/res/values/strings.xml
A libs/MemorizingTrustManager/example/src/de/duenndns/mtmexample/JULHandler.java
A libs/MemorizingTrustManager/example/src/de/duenndns/mtmexample/MTMExample.java
A libs/MemorizingTrustManager/libs/.android_sucks
A libs/MemorizingTrustManager/mtm-notification.png
A libs/MemorizingTrustManager/mtm-screenshot.png
A libs/MemorizingTrustManager/mtm-servername.png
A libs/MemorizingTrustManager/proguard-project.txt
A libs/MemorizingTrustManager/project.properties
A libs/MemorizingTrustManager/res/values-de/strings.xml
A libs/MemorizingTrustManager/res/values-es/strings.xml
A libs/MemorizingTrustManager/res/values-eu/strings.xml
A libs/MemorizingTrustManager/res/values-fi/strings.xml
A libs/MemorizingTrustManager/res/values-fr/strings.xml
A libs/MemorizingTrustManager/res/values-no/strings.xml
A libs/MemorizingTrustManager/res/values/strings.xml
A libs/MemorizingTrustManager/settings.gradle
A libs/MemorizingTrustManager/src/de/duenndns/ssl/MTMDecision.java
A libs/MemorizingTrustManager/src/de/duenndns/ssl/MemorizingActivity.java
A libs/MemorizingTrustManager/src/de/duenndns/ssl/MemorizingTrustManager.java
D libs/android-support-v13.jar
D libs/bcprov-jdk15on-150.jar
D libs/minidns
A libs/minidns/.gitignore
A libs/minidns/LICENCE
A libs/minidns/LICENCE_APACHE
A libs/minidns/LICENCE_LGPL2.1
A libs/minidns/LICENCE_WTFPL
A libs/minidns/README.md
A libs/minidns/build.gradle
A libs/minidns/gradle.properties.example
A libs/minidns/src/main/java/de/measite/minidns/Client.java
A libs/minidns/src/main/java/de/measite/minidns/DNSCache.java
A libs/minidns/src/main/java/de/measite/minidns/DNSMessage.java
A libs/minidns/src/main/java/de/measite/minidns/LRUCache.java
A libs/minidns/src/main/java/de/measite/minidns/Question.java
A libs/minidns/src/main/java/de/measite/minidns/Record.java
A libs/minidns/src/main/java/de/measite/minidns/record/A.java
A libs/minidns/src/main/java/de/measite/minidns/record/AAAA.java
A libs/minidns/src/main/java/de/measite/minidns/record/CNAME.java
A libs/minidns/src/main/java/de/measite/minidns/record/Data.java
A libs/minidns/src/main/java/de/measite/minidns/record/NS.java
A libs/minidns/src/main/java/de/measite/minidns/record/PTR.java
A libs/minidns/src/main/java/de/measite/minidns/record/SRV.java
A libs/minidns/src/main/java/de/measite/minidns/record/TXT.java
A libs/minidns/src/main/java/de/measite/minidns/util/NameUtil.java
D libs/openpgp-api-lib
A libs/openpgp-api-lib/.gitignore
A libs/openpgp-api-lib/.tx/config
A libs/openpgp-api-lib/AndroidManifest.xml
A libs/openpgp-api-lib/LICENSE
A libs/openpgp-api-lib/README.md
A libs/openpgp-api-lib/build.gradle
A libs/openpgp-api-lib/build.xml
A libs/openpgp-api-lib/proguard-project.txt
R project.properties => libs/openpgp-api-lib/project.properties
A libs/openpgp-api-lib/res/drawable-hdpi/ic_action_cancel_launchersize.png
A libs/openpgp-api-lib/res/drawable-hdpi/ic_action_cancel_launchersize_light.png
A libs/openpgp-api-lib/res/drawable-mdpi/ic_action_cancel_launchersize.png
A libs/openpgp-api-lib/res/drawable-mdpi/ic_action_cancel_launchersize_light.png
A libs/openpgp-api-lib/res/drawable-xhdpi/ic_action_cancel_launchersize.png
A libs/openpgp-api-lib/res/drawable-xhdpi/ic_action_cancel_launchersize_light.png
A libs/openpgp-api-lib/res/drawable-xxhdpi/ic_action_cancel_launchersize.png
A libs/openpgp-api-lib/res/drawable-xxhdpi/ic_action_cancel_launchersize_light.png
A libs/openpgp-api-lib/res/values-cs/strings.xml
A libs/openpgp-api-lib/res/values-de/strings.xml
A libs/openpgp-api-lib/res/values-es/strings.xml
A libs/openpgp-api-lib/res/values-et/strings.xml
A libs/openpgp-api-lib/res/values-fi/strings.xml
A libs/openpgp-api-lib/res/values-fr/strings.xml
A libs/openpgp-api-lib/res/values-is/strings.xml
A libs/openpgp-api-lib/res/values-it/strings.xml
A libs/openpgp-api-lib/res/values-ja/strings.xml
A libs/openpgp-api-lib/res/values-nl/strings.xml
A libs/openpgp-api-lib/res/values-pl/strings.xml
A libs/openpgp-api-lib/res/values-pt/strings.xml
A libs/openpgp-api-lib/res/values-ru/strings.xml
A libs/openpgp-api-lib/res/values-sl/strings.xml
A libs/openpgp-api-lib/res/values-tr/strings.xml
A libs/openpgp-api-lib/res/values-uk/strings.xml
A libs/openpgp-api-lib/res/values-zh/strings.xml
A libs/openpgp-api-lib/res/values/strings.xml
A libs/openpgp-api-lib/src/org/openintents/openpgp/IOpenPgpService.aidl
A libs/openpgp-api-lib/src/org/openintents/openpgp/OpenPgpError.java
A libs/openpgp-api-lib/src/org/openintents/openpgp/OpenPgpMetadata.java
A libs/openpgp-api-lib/src/org/openintents/openpgp/OpenPgpSignatureResult.java
A libs/openpgp-api-lib/src/org/openintents/openpgp/util/OpenPgpApi.java
A libs/openpgp-api-lib/src/org/openintents/openpgp/util/OpenPgpListPreference.java
A libs/openpgp-api-lib/src/org/openintents/openpgp/util/OpenPgpServiceConnection.java
A libs/openpgp-api-lib/src/org/openintents/openpgp/util/OpenPgpUtils.java
A libs/openpgp-api-lib/src/org/openintents/openpgp/util/ParcelFileDescriptorUtil.java
D libs/otr4j-0.10.jar
A proguard-rules.txt
A settings.gradle
D src/eu/siacs/conversations/entities/Presences.java
D src/eu/siacs/conversations/entities/Roster.java
D src/eu/siacs/conversations/generator/AbstractGenerator.java
D src/eu/siacs/conversations/generator/PresenceGenerator.java
D src/eu/siacs/conversations/http/HttpConnectionManager.java
D src/eu/siacs/conversations/parser/AbstractParser.java
D src/eu/siacs/conversations/parser/IqParser.java
D src/eu/siacs/conversations/persistance/OnPhoneContactsMerged.java
D src/eu/siacs/conversations/services/AbstractConnectionManager.java
D src/eu/siacs/conversations/services/EventReceiver.java
D src/eu/siacs/conversations/ui/EditMessage.java
D src/eu/siacs/conversations/ui/SettingsActivity.java
D src/eu/siacs/conversations/ui/SettingsFragment.java
D src/eu/siacs/conversations/ui/adapter/AccountAdapter.java
D src/eu/siacs/conversations/ui/adapter/KnownHostsAdapter.java
D src/eu/siacs/conversations/ui/adapter/ListItemAdapter.java
D src/eu/siacs/conversations/utils/CryptoHelper.java
D src/eu/siacs/conversations/utils/ExceptionHandler.java
D src/eu/siacs/conversations/utils/ExceptionHelper.java
D src/eu/siacs/conversations/utils/PhoneHelper.java
D src/eu/siacs/conversations/utils/Validator.java
D src/eu/siacs/conversations/utils/XmlHelper.java
D src/eu/siacs/conversations/utils/zlib/ZLibInputStream.java
D src/eu/siacs/conversations/utils/zlib/ZLibOutputStream.java
D src/eu/siacs/conversations/xml/Element.java
D src/eu/siacs/conversations/xml/Tag.java
D src/eu/siacs/conversations/xml/TagWriter.java
D src/eu/siacs/conversations/xml/XmlReader.java
D src/eu/siacs/conversations/xmpp/OnIqPacketReceived.java
D src/eu/siacs/conversations/xmpp/OnMessagePacketReceived.java
D src/eu/siacs/conversations/xmpp/OnPresencePacketReceived.java
D src/eu/siacs/conversations/xmpp/PacketReceived.java
D src/eu/siacs/conversations/xmpp/jingle/JingleCandidate.java
D src/eu/siacs/conversations/xmpp/jingle/JingleTransport.java
D src/eu/siacs/conversations/xmpp/jingle/OnFileTransmissionStatusChanged.java
D src/eu/siacs/conversations/xmpp/jingle/OnJinglePacketReceived.java
D src/eu/siacs/conversations/xmpp/jingle/stanzas/Content.java
D src/eu/siacs/conversations/xmpp/jingle/stanzas/JinglePacket.java
D src/eu/siacs/conversations/xmpp/jingle/stanzas/Reason.java
D src/eu/siacs/conversations/xmpp/pep/Avatar.java
D src/eu/siacs/conversations/xmpp/stanzas/AbstractStanza.java
D src/eu/siacs/conversations/xmpp/stanzas/IqPacket.java
D src/eu/siacs/conversations/xmpp/stanzas/MessagePacket.java
D src/eu/siacs/conversations/xmpp/stanzas/csi/ActivePacket.java
D src/eu/siacs/conversations/xmpp/stanzas/csi/InactivePacket.java
D src/eu/siacs/conversations/xmpp/stanzas/streammgmt/AckPacket.java
D src/eu/siacs/conversations/xmpp/stanzas/streammgmt/EnablePacket.java
D src/eu/siacs/conversations/xmpp/stanzas/streammgmt/RequestPacket.java
D src/eu/siacs/conversations/xmpp/stanzas/streammgmt/ResumePacket.java
R AndroidManifest.xml => src/main/AndroidManifest.xml
R src/{eu/siacs/conversations/Config.java => main/java/eu/siacs/conversations/Config.java}
R src/{eu/siacs/conversations/crypto/OtrEngine.java => main/java/eu/siacs/conversations/crypto/OtrEngine.java}
R src/{eu/siacs/conversations/crypto/PgpEngine.java => main/java/eu/siacs/conversations/crypto/PgpEngine.java}
R src/{eu/siacs/conversations/entities/AbstractEntity.java => main/java/eu/siacs/conversations/entities/AbstractEntity.java}
R src/{eu/siacs/conversations/entities/Account.java => main/java/eu/siacs/conversations/entities/Account.java}
R src/{eu/siacs/conversations/entities/Bookmark.java => main/java/eu/siacs/conversations/entities/Bookmark.java}
R src/{eu/siacs/conversations/entities/Contact.java => main/java/eu/siacs/conversations/entities/Contact.java}
R src/{eu/siacs/conversations/entities/Conversation.java => main/java/eu/siacs/conversations/entities/Conversation.java}
R src/{eu/siacs/conversations/entities/Downloadable.java => main/java/eu/siacs/conversations/entities/Downloadable.java}
R src/{eu/siacs/conversations/entities/DownloadableFile.java => main/java/eu/siacs/conversations/entities/DownloadableFile.java}
R src/{eu/siacs/conversations/entities/ListItem.java => main/java/eu/siacs/conversations/entities/ListItem.java}
R src/{eu/siacs/conversations/entities/Message.java => main/java/eu/siacs/conversations/entities/Message.java}
R src/{eu/siacs/conversations/entities/MucOptions.java => main/java/eu/siacs/conversations/entities/MucOptions.java}
A src/main/java/eu/siacs/conversations/entities/Presences.java
A src/main/java/eu/siacs/conversations/entities/Roster.java
A src/main/java/eu/siacs/conversations/generator/AbstractGenerator.java
R src/{eu/siacs/conversations/generator/IqGenerator.java => main/java/eu/siacs/conversations/generator/IqGenerator.java}
R src/{eu/siacs/conversations/generator/MessageGenerator.java => main/java/eu/siacs/conversations/generator/MessageGenerator.java}
A src/main/java/eu/siacs/conversations/generator/PresenceGenerator.java
R src/{eu/siacs/conversations/http/HttpConnection.java => main/java/eu/siacs/conversations/http/HttpConnection.java}
A src/main/java/eu/siacs/conversations/http/HttpConnectionManager.java
A src/main/java/eu/siacs/conversations/parser/AbstractParser.java
A src/main/java/eu/siacs/conversations/parser/IqParser.java
R src/{eu/siacs/conversations/parser/MessageParser.java => main/java/eu/siacs/conversations/parser/MessageParser.java}
R src/{eu/siacs/conversations/parser/PresenceParser.java => main/java/eu/siacs/conversations/parser/PresenceParser.java}
R src/{eu/siacs/conversations/persistance/DatabaseBackend.java => main/java/eu/siacs/conversations/persistance/DatabaseBackend.java}
R src/{eu/siacs/conversations/persistance/FileBackend.java => main/java/eu/siacs/conversations/persistance/FileBackend.java}
A src/main/java/eu/siacs/conversations/persistance/OnPhoneContactsMerged.java
A src/main/java/eu/siacs/conversations/services/AbstractConnectionManager.java
R src/{eu/siacs/conversations/services/AvatarService.java => main/java/eu/siacs/conversations/services/AvatarService.java}
A src/main/java/eu/siacs/conversations/services/EventReceiver.java
R src/{eu/siacs/conversations/services/NotificationService.java => main/java/eu/siacs/conversations/services/NotificationService.java}
R src/{eu/siacs/conversations/services/XmppConnectionService.java => main/java/eu/siacs/conversations/services/XmppConnectionService.java}
R src/{eu/siacs/conversations/ui/ChooseContactActivity.java => main/java/eu/siacs/conversations/ui/ChooseContactActivity.java}
R src/{eu/siacs/conversations/ui/ConferenceDetailsActivity.java => main/java/eu/siacs/conversations/ui/ConferenceDetailsActivity.java}
R src/{eu/siacs/conversations/ui/ContactDetailsActivity.java => main/java/eu/siacs/conversations/ui/ContactDetailsActivity.java}
R src/{eu/siacs/conversations/ui/ConversationActivity.java => main/java/eu/siacs/conversations/ui/ConversationActivity.java}
R src/{eu/siacs/conversations/ui/ConversationFragment.java => main/java/eu/siacs/conversations/ui/ConversationFragment.java}
R src/{eu/siacs/conversations/ui/EditAccountActivity.java => main/java/eu/siacs/conversations/ui/EditAccountActivity.java}
A src/main/java/eu/siacs/conversations/ui/EditMessage.java
R src/{eu/siacs/conversations/ui/ManageAccountActivity.java => main/java/eu/siacs/conversations/ui/ManageAccountActivity.java}
R src/{eu/siacs/conversations/ui/PublishProfilePictureActivity.java => main/java/eu/siacs/conversations/ui/PublishProfilePictureActivity.java}
A src/main/java/eu/siacs/conversations/ui/SettingsActivity.java
A src/main/java/eu/siacs/conversations/ui/SettingsFragment.java
R src/{eu/siacs/conversations/ui/ShareWithActivity.java => main/java/eu/siacs/conversations/ui/ShareWithActivity.java}
R src/{eu/siacs/conversations/ui/StartConversationActivity.java => main/java/eu/siacs/conversations/ui/StartConversationActivity.java}
R src/{eu/siacs/conversations/ui/UiCallback.java => main/java/eu/siacs/conversations/ui/UiCallback.java}
R src/{eu/siacs/conversations/ui/XmppActivity.java => main/java/eu/siacs/conversations/ui/XmppActivity.java}
A src/main/java/eu/siacs/conversations/ui/adapter/AccountAdapter.java
R src/{eu/siacs/conversations/ui/adapter/ConversationAdapter.java => main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java}
A src/main/java/eu/siacs/conversations/ui/adapter/KnownHostsAdapter.java
A src/main/java/eu/siacs/conversations/ui/adapter/ListItemAdapter.java
R src/{eu/siacs/conversations/ui/adapter/MessageAdapter.java => main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java}
A src/main/java/eu/siacs/conversations/utils/CryptoHelper.java
R src/{eu/siacs/conversations/utils/DNSHelper.java => main/java/eu/siacs/conversations/utils/DNSHelper.java}
A src/main/java/eu/siacs/conversations/utils/ExceptionHandler.java
A src/main/java/eu/siacs/conversations/utils/ExceptionHelper.java
R src/{eu/siacs/conversations/utils/ExifHelper.java => main/java/eu/siacs/conversations/utils/ExifHelper.java}
R src/{eu/siacs/conversations/utils/OnPhoneContactsLoadedListener.java => main/java/eu/siacs/conversations/utils/OnPhoneContactsLoadedListener.java}
R src/{eu/siacs/conversations/utils/PRNGFixes.java => main/java/eu/siacs/conversations/utils/PRNGFixes.java}
A src/main/java/eu/siacs/conversations/utils/PhoneHelper.java
R src/{eu/siacs/conversations/utils/UIHelper.java => main/java/eu/siacs/conversations/utils/UIHelper.java}
A src/main/java/eu/siacs/conversations/utils/Validator.java
A src/main/java/eu/siacs/conversations/utils/XmlHelper.java
A src/main/java/eu/siacs/conversations/utils/zlib/ZLibInputStream.java
A src/main/java/eu/siacs/conversations/utils/zlib/ZLibOutputStream.java
A src/main/java/eu/siacs/conversations/xml/Element.java
A src/main/java/eu/siacs/conversations/xml/Tag.java
A src/main/java/eu/siacs/conversations/xml/TagWriter.java
A src/main/java/eu/siacs/conversations/xml/XmlReader.java
R src/{eu/siacs/conversations/xmpp/OnBindListener.java => main/java/eu/siacs/conversations/xmpp/OnBindListener.java}
R src/{eu/siacs/conversations/xmpp/OnContactStatusChanged.java => main/java/eu/siacs/conversations/xmpp/OnContactStatusChanged.java}
A src/main/java/eu/siacs/conversations/xmpp/OnIqPacketReceived.java
R src/{eu/siacs/conversations/xmpp/OnMessageAcknowledged.java => main/java/eu/siacs/conversations/xmpp/OnMessageAcknowledged.java}
A src/main/java/eu/siacs/conversations/xmpp/OnMessagePacketReceived.java
A src/main/java/eu/siacs/conversations/xmpp/OnPresencePacketReceived.java
R src/{eu/siacs/conversations/xmpp/OnStatusChanged.java => main/java/eu/siacs/conversations/xmpp/OnStatusChanged.java}
A src/main/java/eu/siacs/conversations/xmpp/PacketReceived.java
R src/{eu/siacs/conversations/xmpp/XmppConnection.java => main/java/eu/siacs/conversations/xmpp/XmppConnection.java}
A src/main/java/eu/siacs/conversations/xmpp/jingle/JingleCandidate.java
R src/{eu/siacs/conversations/xmpp/jingle/JingleConnection.java => main/java/eu/siacs/conversations/xmpp/jingle/JingleConnection.java}
R src/{eu/siacs/conversations/xmpp/jingle/JingleConnectionManager.java => main/java/eu/siacs/conversations/xmpp/jingle/JingleConnectionManager.java}
R src/{eu/siacs/conversations/xmpp/jingle/JingleInbandTransport.java => main/java/eu/siacs/conversations/xmpp/jingle/JingleInbandTransport.java}
R src/{eu/siacs/conversations/xmpp/jingle/JingleSocks5Transport.java => main/java/eu/siacs/conversations/xmpp/jingle/JingleSocks5Transport.java}
A src/main/java/eu/siacs/conversations/xmpp/jingle/JingleTransport.java
A src/main/java/eu/siacs/conversations/xmpp/jingle/OnFileTransmissionStatusChanged.java
A src/main/java/eu/siacs/conversations/xmpp/jingle/OnJinglePacketReceived.java
R src/{eu/siacs/conversations/xmpp/jingle/OnPrimaryCandidateFound.java => main/java/eu/siacs/conversations/xmpp/jingle/OnPrimaryCandidateFound.java}
R src/{eu/siacs/conversations/xmpp/jingle/OnTransportConnected.java => main/java/eu/siacs/conversations/xmpp/jingle/OnTransportConnected.java}
A src/main/java/eu/siacs/conversations/xmpp/jingle/stanzas/Content.java
A src/main/java/eu/siacs/conversations/xmpp/jingle/stanzas/JinglePacket.java
A src/main/java/eu/siacs/conversations/xmpp/jingle/stanzas/Reason.java
A src/main/java/eu/siacs/conversations/xmpp/pep/Avatar.java
A src/main/java/eu/siacs/conversations/xmpp/stanzas/AbstractStanza.java
A src/main/java/eu/siacs/conversations/xmpp/stanzas/IqPacket.java
A src/main/java/eu/siacs/conversations/xmpp/stanzas/MessagePacket.java
R src/{eu/siacs/conversations/xmpp/stanzas/PresencePacket.java => main/java/eu/siacs/conversations/xmpp/stanzas/PresencePacket.java}
A src/main/java/eu/siacs/conversations/xmpp/stanzas/csi/ActivePacket.java
A src/main/java/eu/siacs/conversations/xmpp/stanzas/csi/InactivePacket.java
A src/main/java/eu/siacs/conversations/xmpp/stanzas/streammgmt/AckPacket.java
A src/main/java/eu/siacs/conversations/xmpp/stanzas/streammgmt/EnablePacket.java
A src/main/java/eu/siacs/conversations/xmpp/stanzas/streammgmt/RequestPacket.java
A src/main/java/eu/siacs/conversations/xmpp/stanzas/streammgmt/ResumePacket.java
R res/drawable-hdpi/ic_action_add_group.png => src/main/res/drawable-hdpi/ic_action_add_group.png
R res/drawable-hdpi/ic_action_add_person.png => src/main/res/drawable-hdpi/ic_action_add_person.png
R res/drawable-hdpi/ic_action_chat.png => src/main/res/drawable-hdpi/ic_action_chat.png
R res/drawable-hdpi/ic_action_copy.png => src/main/res/drawable-hdpi/ic_action_copy.png
R res/drawable-hdpi/ic_action_discard.png => src/main/res/drawable-hdpi/ic_action_discard.png
R res/drawable-hdpi/ic_action_edit.png => src/main/res/drawable-hdpi/ic_action_edit.png
R res/drawable-hdpi/ic_action_edit_dark.png => src/main/res/drawable-hdpi/ic_action_edit_dark.png
R res/drawable-hdpi/ic_action_group.png => src/main/res/drawable-hdpi/ic_action_group.png
R res/drawable-hdpi/ic_action_new.png => src/main/res/drawable-hdpi/ic_action_new.png
R res/drawable-hdpi/ic_action_new_attachment.png => src/main/res/drawable-hdpi/ic_action_new_attachment.png
R res/drawable-hdpi/ic_action_not_secure.png => src/main/res/drawable-hdpi/ic_action_not_secure.png
R res/drawable-hdpi/ic_action_refresh.png => src/main/res/drawable-hdpi/ic_action_refresh.png
R res/drawable-hdpi/ic_action_remove.png => src/main/res/drawable-hdpi/ic_action_remove.png
R res/drawable-hdpi/ic_action_search.png => src/main/res/drawable-hdpi/ic_action_search.png
R res/drawable-hdpi/ic_action_secure.png => src/main/res/drawable-hdpi/ic_action_secure.png
R res/drawable-hdpi/ic_action_send_now_away.png => src/main/res/drawable-hdpi/ic_action_send_now_away.png
R res/drawable-hdpi/ic_action_send_now_dnd.png => src/main/res/drawable-hdpi/ic_action_send_now_dnd.png
R res/drawable-hdpi/ic_action_send_now_offline.png => src/main/res/drawable-hdpi/ic_action_send_now_offline.png
R res/drawable-hdpi/ic_action_send_now_online.png => src/main/res/drawable-hdpi/ic_action_send_now_online.png
R res/drawable-hdpi/ic_activity.png => src/main/res/drawable-hdpi/ic_activity.png
R res/drawable-hdpi/ic_indicator.png => src/main/res/drawable-hdpi/ic_indicator.png
R res/drawable-hdpi/ic_launcher.png => src/main/res/drawable-hdpi/ic_launcher.png
R res/drawable-hdpi/ic_notification.png => src/main/res/drawable-hdpi/ic_notification.png
R res/drawable-hdpi/ic_profile.png => src/main/res/drawable-hdpi/ic_profile.png
R res/drawable-hdpi/ic_received_indicator.png => src/main/res/drawable-hdpi/ic_received_indicator.png
R res/drawable-hdpi/ic_secure_indicator.png => src/main/res/drawable-hdpi/ic_secure_indicator.png
R res/drawable-hdpi/tab_selected_conversations.9.png => src/main/res/drawable-hdpi/tab_selected_conversations.9.png
R res/drawable-hdpi/tab_selected_focused_conversations.9.png => src/main/res/drawable-hdpi/tab_selected_focused_conversations.9.png
R res/drawable-hdpi/tab_selected_pressed_conversations.9.png => src/main/res/drawable-hdpi/tab_selected_pressed_conversations.9.png
R res/drawable-hdpi/tab_unselected_conversations.9.png => src/main/res/drawable-hdpi/tab_unselected_conversations.9.png
R res/drawable-hdpi/tab_unselected_focused_conversations.9.png => src/main/res/drawable-hdpi/tab_unselected_focused_conversations.9.png
R res/drawable-hdpi/tab_unselected_pressed_conversations.9.png => src/main/res/drawable-hdpi/tab_unselected_pressed_conversations.9.png
R res/drawable-mdpi/ic_action_add_group.png => src/main/res/drawable-mdpi/ic_action_add_group.png
R res/drawable-mdpi/ic_action_add_person.png => src/main/res/drawable-mdpi/ic_action_add_person.png
R res/drawable-mdpi/ic_action_chat.png => src/main/res/drawable-mdpi/ic_action_chat.png
R res/drawable-mdpi/ic_action_copy.png => src/main/res/drawable-mdpi/ic_action_copy.png
R res/drawable-mdpi/ic_action_discard.png => src/main/res/drawable-mdpi/ic_action_discard.png
R res/drawable-mdpi/ic_action_edit.png => src/main/res/drawable-mdpi/ic_action_edit.png
R res/drawable-mdpi/ic_action_edit_dark.png => src/main/res/drawable-mdpi/ic_action_edit_dark.png
R res/drawable-mdpi/ic_action_group.png => src/main/res/drawable-mdpi/ic_action_group.png
R res/drawable-mdpi/ic_action_new.png => src/main/res/drawable-mdpi/ic_action_new.png
R res/drawable-mdpi/ic_action_new_attachment.png => src/main/res/drawable-mdpi/ic_action_new_attachment.png
R res/drawable-mdpi/ic_action_not_secure.png => src/main/res/drawable-mdpi/ic_action_not_secure.png
R res/drawable-mdpi/ic_action_refresh.png => src/main/res/drawable-mdpi/ic_action_refresh.png
R res/drawable-mdpi/ic_action_remove.png => src/main/res/drawable-mdpi/ic_action_remove.png
R res/drawable-mdpi/ic_action_search.png => src/main/res/drawable-mdpi/ic_action_search.png
R res/drawable-mdpi/ic_action_secure.png => src/main/res/drawable-mdpi/ic_action_secure.png
R res/drawable-mdpi/ic_action_send_now_away.png => src/main/res/drawable-mdpi/ic_action_send_now_away.png
R res/drawable-mdpi/ic_action_send_now_dnd.png => src/main/res/drawable-mdpi/ic_action_send_now_dnd.png
R res/drawable-mdpi/ic_action_send_now_offline.png => src/main/res/drawable-mdpi/ic_action_send_now_offline.png
R res/drawable-mdpi/ic_action_send_now_online.png => src/main/res/drawable-mdpi/ic_action_send_now_online.png
R res/drawable-mdpi/ic_activity.png => src/main/res/drawable-mdpi/ic_activity.png
R res/drawable-mdpi/ic_indicator.png => src/main/res/drawable-mdpi/ic_indicator.png
R res/drawable-mdpi/ic_launcher.png => src/main/res/drawable-mdpi/ic_launcher.png
R res/drawable-mdpi/ic_notification.png => src/main/res/drawable-mdpi/ic_notification.png
R res/drawable-mdpi/ic_profile.png => src/main/res/drawable-mdpi/ic_profile.png
R res/drawable-mdpi/ic_received_indicator.png => src/main/res/drawable-mdpi/ic_received_indicator.png
R res/drawable-mdpi/ic_secure_indicator.png => src/main/res/drawable-mdpi/ic_secure_indicator.png
R res/drawable-mdpi/tab_selected_conversations.9.png => src/main/res/drawable-mdpi/tab_selected_conversations.9.png
R res/drawable-mdpi/tab_selected_focused_conversations.9.png => src/main/res/drawable-mdpi/tab_selected_focused_conversations.9.png
R res/drawable-mdpi/tab_selected_pressed_conversations.9.png => src/main/res/drawable-mdpi/tab_selected_pressed_conversations.9.png
R res/drawable-mdpi/tab_unselected_conversations.9.png => src/main/res/drawable-mdpi/tab_unselected_conversations.9.png
R res/drawable-mdpi/tab_unselected_focused_conversations.9.png => src/main/res/drawable-mdpi/tab_unselected_focused_conversations.9.png
R res/drawable-mdpi/tab_unselected_pressed_conversations.9.png => src/main/res/drawable-mdpi/tab_unselected_pressed_conversations.9.png
R res/drawable-xhdpi/ic_action_add_group.png => src/main/res/drawable-xhdpi/ic_action_add_group.png
R res/drawable-xhdpi/ic_action_add_person.png => src/main/res/drawable-xhdpi/ic_action_add_person.png
R res/drawable-xhdpi/ic_action_chat.png => src/main/res/drawable-xhdpi/ic_action_chat.png
R res/drawable-xhdpi/ic_action_copy.png => src/main/res/drawable-xhdpi/ic_action_copy.png
R res/drawable-xhdpi/ic_action_discard.png => src/main/res/drawable-xhdpi/ic_action_discard.png
R res/drawable-xhdpi/ic_action_edit.png => src/main/res/drawable-xhdpi/ic_action_edit.png
R res/drawable-xhdpi/ic_action_edit_dark.png => src/main/res/drawable-xhdpi/ic_action_edit_dark.png
R res/drawable-xhdpi/ic_action_group.png => src/main/res/drawable-xhdpi/ic_action_group.png
R res/drawable-xhdpi/ic_action_new.png => src/main/res/drawable-xhdpi/ic_action_new.png
R res/drawable-xhdpi/ic_action_new_attachment.png => src/main/res/drawable-xhdpi/ic_action_new_attachment.png
R res/drawable-xhdpi/ic_action_not_secure.png => src/main/res/drawable-xhdpi/ic_action_not_secure.png
R res/drawable-xhdpi/ic_action_refresh.png => src/main/res/drawable-xhdpi/ic_action_refresh.png
R res/drawable-xhdpi/ic_action_remove.png => src/main/res/drawable-xhdpi/ic_action_remove.png
R res/drawable-xhdpi/ic_action_search.png => src/main/res/drawable-xhdpi/ic_action_search.png
R res/drawable-xhdpi/ic_action_secure.png => src/main/res/drawable-xhdpi/ic_action_secure.png
R res/drawable-xhdpi/ic_action_send_now_away.png => src/main/res/drawable-xhdpi/ic_action_send_now_away.png
R res/drawable-xhdpi/ic_action_send_now_dnd.png => src/main/res/drawable-xhdpi/ic_action_send_now_dnd.png
R res/drawable-xhdpi/ic_action_send_now_offline.png => src/main/res/drawable-xhdpi/ic_action_send_now_offline.png
R res/drawable-xhdpi/ic_action_send_now_online.png => src/main/res/drawable-xhdpi/ic_action_send_now_online.png
R res/drawable-xhdpi/ic_activity.png => src/main/res/drawable-xhdpi/ic_activity.png
R res/drawable-xhdpi/ic_indicator.png => src/main/res/drawable-xhdpi/ic_indicator.png
R res/drawable-xhdpi/ic_launcher.png => src/main/res/drawable-xhdpi/ic_launcher.png
R res/drawable-xhdpi/ic_notification.png => src/main/res/drawable-xhdpi/ic_notification.png
R res/drawable-xhdpi/ic_profile.png => src/main/res/drawable-xhdpi/ic_profile.png
R res/drawable-xhdpi/ic_received_indicator.png => src/main/res/drawable-xhdpi/ic_received_indicator.png
R res/drawable-xhdpi/ic_secure_indicator.png => src/main/res/drawable-xhdpi/ic_secure_indicator.png
R res/drawable-xhdpi/tab_selected_conversations.9.png => src/main/res/drawable-xhdpi/tab_selected_conversations.9.png
R res/drawable-xhdpi/tab_selected_focused_conversations.9.png => src/main/res/drawable-xhdpi/tab_selected_focused_conversations.9.png
R res/drawable-xhdpi/tab_selected_pressed_conversations.9.png => src/main/res/drawable-xhdpi/tab_selected_pressed_conversations.9.png
R res/drawable-xhdpi/tab_unselected_conversations.9.png => src/main/res/drawable-xhdpi/tab_unselected_conversations.9.png
R res/drawable-xhdpi/tab_unselected_focused_conversations.9.png => src/main/res/drawable-xhdpi/tab_unselected_focused_conversations.9.png
R res/drawable-xhdpi/tab_unselected_pressed_conversations.9.png => src/main/res/drawable-xhdpi/tab_unselected_pressed_conversations.9.png
R res/drawable-xxhdpi/ic_action_add_group.png => src/main/res/drawable-xxhdpi/ic_action_add_group.png
R res/drawable-xxhdpi/ic_action_add_person.png => src/main/res/drawable-xxhdpi/ic_action_add_person.png
R res/drawable-xxhdpi/ic_action_chat.png => src/main/res/drawable-xxhdpi/ic_action_chat.png
R res/drawable-xxhdpi/ic_action_copy.png => src/main/res/drawable-xxhdpi/ic_action_copy.png
R res/drawable-xxhdpi/ic_action_discard.png => src/main/res/drawable-xxhdpi/ic_action_discard.png
R res/drawable-xxhdpi/ic_action_edit.png => src/main/res/drawable-xxhdpi/ic_action_edit.png
R res/drawable-xxhdpi/ic_action_edit_dark.png => src/main/res/drawable-xxhdpi/ic_action_edit_dark.png
R res/drawable-xxhdpi/ic_action_group.png => src/main/res/drawable-xxhdpi/ic_action_group.png
R res/drawable-xxhdpi/ic_action_new.png => src/main/res/drawable-xxhdpi/ic_action_new.png
R res/drawable-xxhdpi/ic_action_new_attachment.png => src/main/res/drawable-xxhdpi/ic_action_new_attachment.png
R res/drawable-xxhdpi/ic_action_not_secure.png => src/main/res/drawable-xxhdpi/ic_action_not_secure.png
R res/drawable-xxhdpi/ic_action_refresh.png => src/main/res/drawable-xxhdpi/ic_action_refresh.png
R res/drawable-xxhdpi/ic_action_remove.png => src/main/res/drawable-xxhdpi/ic_action_remove.png
R res/drawable-xxhdpi/ic_action_search.png => src/main/res/drawable-xxhdpi/ic_action_search.png
R res/drawable-xxhdpi/ic_action_secure.png => src/main/res/drawable-xxhdpi/ic_action_secure.png
R res/drawable-xxhdpi/ic_action_send_now_away.png => src/main/res/drawable-xxhdpi/ic_action_send_now_away.png
R res/drawable-xxhdpi/ic_action_send_now_dnd.png => src/main/res/drawable-xxhdpi/ic_action_send_now_dnd.png
R res/drawable-xxhdpi/ic_action_send_now_offline.png => src/main/res/drawable-xxhdpi/ic_action_send_now_offline.png
R res/drawable-xxhdpi/ic_action_send_now_online.png => src/main/res/drawable-xxhdpi/ic_action_send_now_online.png
R res/drawable-xxhdpi/ic_activity.png => src/main/res/drawable-xxhdpi/ic_activity.png
R res/drawable-xxhdpi/ic_indicator.png => src/main/res/drawable-xxhdpi/ic_indicator.png
R res/drawable-xxhdpi/ic_launcher.png => src/main/res/drawable-xxhdpi/ic_launcher.png
R res/drawable-xxhdpi/ic_notification.png => src/main/res/drawable-xxhdpi/ic_notification.png
R res/drawable-xxhdpi/ic_profile.png => src/main/res/drawable-xxhdpi/ic_profile.png
R res/drawable-xxhdpi/ic_received_indicator.png => src/main/res/drawable-xxhdpi/ic_received_indicator.png
R res/drawable-xxhdpi/ic_secure_indicator.png => src/main/res/drawable-xxhdpi/ic_secure_indicator.png
R res/drawable-xxhdpi/tab_selected_conversations.9.png => src/main/res/drawable-xxhdpi/tab_selected_conversations.9.png
R res/drawable-xxhdpi/tab_selected_focused_conversations.9.png => src/main/res/drawable-xxhdpi/tab_selected_focused_conversations.9.png
R res/drawable-xxhdpi/tab_selected_pressed_conversations.9.png => src/main/res/drawable-xxhdpi/tab_selected_pressed_conversations.9.png
R res/drawable-xxhdpi/tab_unselected_conversations.9.png => src/main/res/drawable-xxhdpi/tab_unselected_conversations.9.png
R res/drawable-xxhdpi/tab_unselected_focused_conversations.9.png => src/main/res/drawable-xxhdpi/tab_unselected_focused_conversations.9.png
R res/drawable-xxhdpi/tab_unselected_pressed_conversations.9.png => src/main/res/drawable-xxhdpi/tab_unselected_pressed_conversations.9.png
R res/drawable/actionbar_tab_indicator.xml => src/main/res/drawable/actionbar_tab_indicator.xml
R res/drawable/es_slidingpane_shadow.xml => src/main/res/drawable/es_slidingpane_shadow.xml
R res/drawable/grey.xml => src/main/res/drawable/grey.xml
R res/drawable/greybackground.xml => src/main/res/drawable/greybackground.xml
R res/drawable/infocard_border.xml => src/main/res/drawable/infocard_border.xml
R res/drawable/message_border.xml => src/main/res/drawable/message_border.xml
R res/drawable/snackbar.xml => src/main/res/drawable/snackbar.xml
R res/layout-w360dp/fragment_conversations_overview.xml => src/main/res/layout-w360dp/fragment_conversations_overview.xml
R res/layout-w384dp/fragment_conversations_overview.xml => src/main/res/layout-w384dp/fragment_conversations_overview.xml
R res/layout-w600dp/fragment_conversations_overview.xml => src/main/res/layout-w600dp/fragment_conversations_overview.xml
R res/layout-w960dp/fragment_conversations_overview.xml => src/main/res/layout-w960dp/fragment_conversations_overview.xml
R res/layout/account_row.xml => src/main/res/layout/account_row.xml
R res/layout/actionview_search.xml => src/main/res/layout/actionview_search.xml
R res/layout/activity_choose_contact.xml => src/main/res/layout/activity_choose_contact.xml
R res/layout/activity_contact_details.xml => src/main/res/layout/activity_contact_details.xml
R res/layout/activity_edit_account.xml => src/main/res/layout/activity_edit_account.xml
R res/layout/activity_muc_details.xml => src/main/res/layout/activity_muc_details.xml
R res/layout/activity_publish_profile_picture.xml => src/main/res/layout/activity_publish_profile_picture.xml
R res/layout/activity_start_conversation.xml => src/main/res/layout/activity_start_conversation.xml
R res/layout/contact.xml => src/main/res/layout/contact.xml
R res/layout/contact_key.xml => src/main/res/layout/contact_key.xml
R res/layout/conversation_list_row.xml => src/main/res/layout/conversation_list_row.xml
R res/layout/create_contact_dialog.xml => src/main/res/layout/create_contact_dialog.xml
R res/layout/dialog_clear_history.xml => src/main/res/layout/dialog_clear_history.xml
R res/layout/dialog_verify_otr.xml => src/main/res/layout/dialog_verify_otr.xml
R res/layout/fragment_conversation.xml => src/main/res/layout/fragment_conversation.xml
R res/layout/fragment_conversations_overview.xml => src/main/res/layout/fragment_conversations_overview.xml
R res/layout/join_conference_dialog.xml => src/main/res/layout/join_conference_dialog.xml
R res/layout/manage_accounts.xml => src/main/res/layout/manage_accounts.xml
R res/layout/message_null.xml => src/main/res/layout/message_null.xml
R res/layout/message_received.xml => src/main/res/layout/message_received.xml
R res/layout/message_sent.xml => src/main/res/layout/message_sent.xml
R res/layout/message_status.xml => src/main/res/layout/message_status.xml
R res/layout/quickedit.xml => src/main/res/layout/quickedit.xml
R res/layout/share_with.xml => src/main/res/layout/share_with.xml
R res/menu/attachment_choices.xml => src/main/res/menu/attachment_choices.xml
R res/menu/choose_contact.xml => src/main/res/menu/choose_contact.xml
R res/menu/conference_context.xml => src/main/res/menu/conference_context.xml
R res/menu/contact_context.xml => src/main/res/menu/contact_context.xml
R res/menu/contact_details.xml => src/main/res/menu/contact_details.xml
R res/menu/conversations.xml => src/main/res/menu/conversations.xml
R res/menu/encryption_choices.xml => src/main/res/menu/encryption_choices.xml
R res/menu/manageaccounts.xml => src/main/res/menu/manageaccounts.xml
R res/menu/manageaccounts_context.xml => src/main/res/menu/manageaccounts_context.xml
R res/menu/message_context.xml => src/main/res/menu/message_context.xml
R res/menu/muc_details.xml => src/main/res/menu/muc_details.xml
R res/menu/share_with.xml => src/main/res/menu/share_with.xml
R res/menu/start_conversation.xml => src/main/res/menu/start_conversation.xml
R res/values-ca/arrays.xml => src/main/res/values-ca/arrays.xml
R res/values-ca/strings.xml => src/main/res/values-ca/strings.xml
R res/values-cs/arrays.xml => src/main/res/values-cs/arrays.xml
R res/values-cs/strings.xml => src/main/res/values-cs/strings.xml
R res/values-de/arrays.xml => src/main/res/values-de/arrays.xml
R res/values-de/strings.xml => src/main/res/values-de/strings.xml
R res/values-es/arrays.xml => src/main/res/values-es/arrays.xml
R res/values-es/strings.xml => src/main/res/values-es/strings.xml
R res/values-eu/arrays.xml => src/main/res/values-eu/arrays.xml
R res/values-eu/strings.xml => src/main/res/values-eu/strings.xml
R res/values-fr/arrays.xml => src/main/res/values-fr/arrays.xml
R res/values-fr/strings.xml => src/main/res/values-fr/strings.xml
R res/values-gl/arrays.xml => src/main/res/values-gl/arrays.xml
R res/values-gl/strings.xml => src/main/res/values-gl/strings.xml
R res/values-it/arrays.xml => src/main/res/values-it/arrays.xml
R res/values-it/strings.xml => src/main/res/values-it/strings.xml
R res/values-iw/arrays.xml => src/main/res/values-iw/arrays.xml
R res/values-iw/strings.xml => src/main/res/values-iw/strings.xml
R res/values-nl/arrays.xml => src/main/res/values-nl/arrays.xml
R res/values-nl/strings.xml => src/main/res/values-nl/strings.xml
R res/values-ru/arrays.xml => src/main/res/values-ru/arrays.xml
R res/values-ru/strings.xml => src/main/res/values-ru/strings.xml
R res/values-sv/arrays.xml => src/main/res/values-sv/arrays.xml
R res/values-sv/strings.xml => src/main/res/values-sv/strings.xml
R res/values-zh-rCN/arrays.xml => src/main/res/values-zh-rCN/arrays.xml
R res/values-zh-rCN/strings.xml => src/main/res/values-zh-rCN/strings.xml
R res/values-zh-rTW/arrays.xml => src/main/res/values-zh-rTW/arrays.xml
R res/values-zh-rTW/strings.xml => src/main/res/values-zh-rTW/strings.xml
R res/values/arrays.xml => src/main/res/values/arrays.xml
R res/values/attrs.xml => src/main/res/values/attrs.xml
R res/values/colors.xml => src/main/res/values/colors.xml
R res/values/strings.xml => src/main/res/values/strings.xml
R res/values/styles.xml => src/main/res/values/styles.xml
R res/values/themes.xml => src/main/res/values/themes.xml
R res/xml/preferences.xml => src/main/res/xml/preferences.xml
This diff is too large to display. Try viewing the raw diff instead.