Merge tag '1.6.3' into trz/rebasetrz/merge_1.6.3

Conflicts:
	CHANGELOG.md
	README.md
	art/render.rb
	build.gradle
	src/main/java/eu/siacs/conversations/Config.java
	src/main/java/eu/siacs/conversations/crypto/OtrService.java
	src/main/java/eu/siacs/conversations/crypto/PgpEngine.java
	src/main/java/eu/siacs/conversations/entities/Account.java
	src/main/java/eu/siacs/conversations/entities/Contact.java
	src/main/java/eu/siacs/conversations/entities/DownloadableFile.java
	src/main/java/eu/siacs/conversations/entities/Message.java
	src/main/java/eu/siacs/conversations/generator/AbstractGenerator.java
	src/main/java/eu/siacs/conversations/generator/IqGenerator.java
	src/main/java/eu/siacs/conversations/generator/MessageGenerator.java
	src/main/java/eu/siacs/conversations/http/HttpConnectionManager.java
	src/main/java/eu/siacs/conversations/http/HttpDownloadConnection.java
	src/main/java/eu/siacs/conversations/http/HttpUploadConnection.java
	src/main/java/eu/siacs/conversations/parser/AbstractParser.java
	src/main/java/eu/siacs/conversations/parser/MessageParser.java
	src/main/java/eu/siacs/conversations/persistance/DatabaseBackend.java
	src/main/java/eu/siacs/conversations/persistance/FileBackend.java
	src/main/java/eu/siacs/conversations/services/NotificationService.java
	src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
	src/main/java/eu/siacs/conversations/ui/ContactDetailsActivity.java
	src/main/java/eu/siacs/conversations/ui/ConversationActivity.java
	src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
	src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java
	src/main/java/eu/siacs/conversations/ui/SettingsActivity.java
	src/main/java/eu/siacs/conversations/ui/XmppActivity.java
	src/main/java/eu/siacs/conversations/ui/adapter/AccountAdapter.java
	src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java
	src/main/java/eu/siacs/conversations/ui/adapter/ListItemAdapter.java
	src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
	src/main/java/eu/siacs/conversations/utils/CryptoHelper.java
	src/main/java/eu/siacs/conversations/utils/DNSHelper.java
	src/main/java/eu/siacs/conversations/utils/MimeUtils.java
	src/main/java/eu/siacs/conversations/utils/UIHelper.java
	src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java
	src/main/java/eu/siacs/conversations/xmpp/jingle/JingleConnection.java
	src/main/java/eu/siacs/conversations/xmpp/jingle/JingleInbandTransport.java
	src/main/java/eu/siacs/conversations/xmpp/jingle/JingleSocks5Transport.java
	src/main/java/eu/siacs/conversations/xmpp/stanzas/MessagePacket.java
	src/main/res/layout/account_row.xml
	src/main/res/layout/activity_edit_account.xml
	src/main/res/layout/activity_muc_details.xml
	src/main/res/layout/contact.xml
	src/main/res/layout/contact_key.xml
	src/main/res/layout/conversation_list_row.xml
	src/main/res/layout/fragment_conversation.xml
	src/main/res/layout/message_received.xml
	src/main/res/layout/message_sent.xml
	src/main/res/values-bg/strings.xml
	src/main/res/values-ca/strings.xml
	src/main/res/values-cs/strings.xml
	src/main/res/values-de/strings.xml
	src/main/res/values-el/strings.xml
	src/main/res/values-es/strings.xml
	src/main/res/values-eu/strings.xml
	src/main/res/values-id/strings.xml
	src/main/res/values-it/strings.xml
	src/main/res/values-ja/strings.xml
	src/main/res/values-ko/strings.xml
	src/main/res/values-nl/strings.xml
	src/main/res/values-pl/strings.xml
	src/main/res/values-pt/strings.xml
	src/main/res/values-ru/strings.xml
	src/main/res/values-sk/strings.xml
	src/main/res/values-sr/strings.xml
	src/main/res/values-sv/strings.xml
	src/main/res/values-v21/themes.xml
	src/main/res/values-zh-rCN/strings.xml
	src/main/res/values/arrays.xml
	src/main/res/values/colors.xml
	src/main/res/values/dimens.xml
	src/main/res/values/strings.xml
	src/main/res/xml/preferences.xml

1 files changed, 108 insertions, 26 deletions

diff --git a/art/render.rb b/art/render.rb
index 698abea5..dc55c327 100755
--- a/art/render.rb
+++ b/art/render.rb
@@ -1,11 +1,15 @@
 #!/bin/env ruby
-resolutions={
-	'mdpi'=> 1,
+
+require 'xml'
+
+resolutions = {
+	'mdpi' => 1,
 	'hdpi' => 1.5,
 	'xhdpi' => 2,
 	'xxhdpi' => 3,
 	'xxxhdpi' => 4,
 	}
+
 images = {
 	'conversations_baloon.svg' => ['ic_launcher', 48],
 	'conversations_mono.svg' => ['ic_notification', 24],
@@ -14,33 +18,111 @@ images = {
 	'ic_send_text_online.svg' => ['ic_send_text_online', 36],
 	'ic_send_text_away.svg' => ['ic_send_text_away', 36],
 	'ic_send_text_dnd.svg' => ['ic_send_text_dnd', 36],
-        'ic_send_photo_online.svg' => ['ic_send_photo_online', 36],
-        'ic_send_photo_offline.svg' => ['ic_send_photo_offline', 36],
-        'ic_send_photo_away.svg' => ['ic_send_photo_away', 36],
-        'ic_send_photo_dnd.svg' => ['ic_send_photo_dnd', 36],
+	'ic_send_photo_online.svg' => ['ic_send_photo_online', 36],
+	'ic_send_photo_offline.svg' => ['ic_send_photo_offline', 36],
+	'ic_send_photo_away.svg' => ['ic_send_photo_away', 36],
+	'ic_send_photo_dnd.svg' => ['ic_send_photo_dnd', 36],
 	'ic_send_location_online.svg' => ['ic_send_location_online', 36],
-        'ic_send_location_offline.svg' => ['ic_send_location_offline', 36],
-        'ic_send_location_away.svg' => ['ic_send_location_away', 36],
-        'ic_send_location_dnd.svg' => ['ic_send_location_dnd', 36],
+	'ic_send_location_offline.svg' => ['ic_send_location_offline', 36],
+	'ic_send_location_away.svg' => ['ic_send_location_away', 36],
+	'ic_send_location_dnd.svg' => ['ic_send_location_dnd', 36],
 	'ic_send_voice_online.svg' => ['ic_send_voice_online', 36],
-        'ic_send_voice_offline.svg' => ['ic_send_voice_offline', 36],
-        'ic_send_voice_away.svg' => ['ic_send_voice_away', 36],
-        'ic_send_voice_dnd.svg' => ['ic_send_voice_dnd', 36],
+	'ic_send_voice_offline.svg' => ['ic_send_voice_offline', 36],
+	'ic_send_voice_away.svg' => ['ic_send_voice_away', 36],
+	'ic_send_voice_dnd.svg' => ['ic_send_voice_dnd', 36],
 	'ic_send_cancel_online.svg' => ['ic_send_cancel_online', 36],
-        'ic_send_cancel_offline.svg' => ['ic_send_cancel_offline', 36],
-        'ic_send_cancel_away.svg' => ['ic_send_cancel_away', 36],
-        'ic_send_cancel_dnd.svg' => ['ic_send_cancel_dnd', 36],
-        'ic_send_picture_online.svg' => ['ic_send_picture_online', 36],
-        'ic_send_picture_offline.svg' => ['ic_send_picture_offline', 36],
-        'ic_send_picture_away.svg' => ['ic_send_picture_away', 36],
-        'ic_send_picture_dnd.svg' => ['ic_send_picture_dnd', 36]
+	'ic_send_cancel_offline.svg' => ['ic_send_cancel_offline', 36],
+	'ic_send_cancel_away.svg' => ['ic_send_cancel_away', 36],
+	'ic_send_cancel_dnd.svg' => ['ic_send_cancel_dnd', 36],
+	'ic_send_picture_online.svg' => ['ic_send_picture_online', 36],
+	'ic_send_picture_offline.svg' => ['ic_send_picture_offline', 36],
+	'ic_send_picture_away.svg' => ['ic_send_picture_away', 36],
+	'ic_send_picture_dnd.svg' => ['ic_send_picture_dnd', 36],
+	'md_switch_thumb_disable.svg' => ['switch_thumb_disable', 48],
+	'md_switch_thumb_off_normal.svg' => ['switch_thumb_off_normal', 48],
+	'md_switch_thumb_off_pressed.svg' => ['switch_thumb_off_pressed', 48],
+	'md_switch_thumb_on_normal.svg' => ['switch_thumb_on_normal', 48],
+	'md_switch_thumb_on_pressed.svg' => ['switch_thumb_on_pressed', 48],
+	'message_bubble_received.svg' => ['message_bubble_received.9', 0],
+	'message_bubble_received_warning.svg' => ['message_bubble_received_warning.9', 0],
+	'message_bubble_sent.svg' => ['message_bubble_sent.9', 0],
 	}
-images.each do |source, result|
-	resolutions.each do |name, factor|
-		size = factor * result[1]
-		path = "../src/main/res/drawable-#{name}/#{result[0]}.png"
-		cmd = "inkscape -e #{path} -C -h #{size} -w #{size} #{source}"
-		puts cmd
-		system cmd
+
+# Executable paths for Mac OSX
+# "/Applications/Inkscape.app/Contents/Resources/bin/inkscape"
+
+inkscape = "inkscape"
+imagemagick = "convert"
+
+def execute_cmd(cmd)
+	puts cmd
+	system cmd
+end
+
+images.each do |source_filename, settings|
+	svg_content = File.read(source_filename)
+
+	svg = XML::Document.string(svg_content)
+	base_width = svg.root["width"].to_i
+	base_height = svg.root["height"].to_i
+
+	guides = svg.find(".//sodipodi:guide")
+
+	resolutions.each do |resolution, factor|
+		output_filename, base_size = settings
+
+		if base_size > 0
+			width = factor * base_size
+			height = factor * base_size
+		else
+			width = factor * base_width
+			height = factor * base_height
+		end
+
+		path = "../src/main/res/drawable-#{resolution}/#{output_filename}.png"
+		execute_cmd "#{inkscape} -f #{source_filename} -z -C -w #{width} -h #{height} -e #{path}"
+
+		top = []
+		right = []
+		bottom = []
+		left = []
+
+		guides.each do |guide|
+			orientation = guide["orientation"]
+			x, y = guide["position"].split(",")
+			x, y = x.to_i, y.to_i
+
+			if orientation == "1,0" and y == base_height
+				top.push(x * factor)
+			end
+
+			if orientation == "0,1" and x == base_width
+				right.push((base_height - y) * factor)
+			end
+
+			if orientation == "1,0" and y == 0
+				bottom.push(x * factor)
+			end
+
+			if orientation == "0,1" and x == 0
+				left.push((base_height - y) * factor)
+			end
+		end
+
+		next if top.length != 2
+		next if right.length != 2
+		next if bottom.length != 2
+		next if left.length != 2
+
+		execute_cmd "#{imagemagick} -background none PNG32:#{path} -gravity center -extent #{width+2}x#{height+2} PNG32:#{path}"
+
+		draw_format = "-draw \"rectangle %d,%d %d,%d\""
+		top_line = draw_format % [top.min + 1, 0, top.max, 0]
+		right_line = draw_format % [width + 1, right.min + 1, width + 1, right.max]
+		bottom_line = draw_format % [bottom.min + 1, height + 1, bottom.max, height + 1]
+		left_line = draw_format % [0, left.min + 1, 0, left.max]
+		draws = "#{top_line} #{right_line} #{bottom_line} #{left_line}"
+
+		execute_cmd "#{imagemagick} -background none PNG32:#{path} -fill black -stroke none #{draws} PNG32:#{path}"
 	end
 end