Merge branch 'master' of http://git.lattuga.net/torn/cable-service

noise2cable.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 
 ### Change the applicationId (i.d., rename the app)
 
@@ -65,7 +65,7 @@ sed -i 's/"org\.thoughtcrime\.securesms"/"im.cable.cableim"/' \
 	res/xml/syncadapter.xml
 
 
-### Change the giphy api key.
+### Change the giphy api key and proxy address
 
 # Let's use the public beta key for now
 # See: https://github.com/Giphy/GiphyAPI
@@ -74,3 +74,14 @@ sed -i 's/3o6ZsYH6U6Eri53TXy/dc6zaTOxFJmzC/' \
 	src/org/thoughtcrime/securesms/giph/net/GiphyGifLoader.java \
 	src/org/thoughtcrime/securesms/giph/net/GiphyStickerLoader.java
 
+sed -i '/GIPHY_PROXY_HOST/ s/giphy-proxy-production\.whispersystems\.org/giphy-proxy.cable.im/' build.gradle 
+
+
+### Change the logo appearance
+
+mogrify -modulate 100,70,50 \
+	artwork/logo-*.png \
+	res/*/icon.png \
+	res/*/icon_dialog.png \
+	res/*/lockscreen_watermark_*.png
+