diff options
| -rw-r--r-- | README.md | 14 | ||||
| -rwxr-xr-x | art/render.rb | 2 | ||||
| -rw-r--r-- | src/main/AndroidManifest.xml | 1 | ||||
| -rw-r--r-- | src/main/java/eu/siacs/conversations/http/HttpConnection.java | 2 | ||||
| -rw-r--r-- | src/main/res/layout/activity_contact_details.xml | 3 |
5 files changed, 12 insertions, 10 deletions
@@ -39,7 +39,7 @@ should consider either switching to an XMPP server that does or — even better run your own XMPP server for you and your friends. These XEP's are: * XEP-0065: SOCKS5 Bytestreams (or mod_proxy65). Will be used to transfer - files if both parties are behind a firewall (NAT). + files if both parties are behind a firewall (NAT). * XEP-0138: Stream Compression saves bandwidth * XEP-0163: Personal Eventing Protocol for avatars * XEP-0198: Stream Management allows XMPP to survive small network outages and @@ -271,7 +271,7 @@ Make sure to have ANDROID_HOME point to your Android SDK git clone https://github.com/siacs/Conversations.git cd Conversations - ./gradlew build + ./gradlew build ### How do I update/add external libraries? @@ -281,16 +281,16 @@ in the `libs/` directory, you can update it using a subtree merge by doing the following (using `minidns` as an example): git remote add minidns https://github.com/rtreffer/minidns.git - git fetch minidns - git merge -s subtree minidns master + git fetch minidns + git merge -s subtree minidns master To add a new dependency to the `libs/` directory (replacing "name", "branch" and "url" as necessary): git remote add name url - git merge -s ours --no-commit name/branch - git read-tree --prefix=libs/name -u name/branch - git commit -m "Subtree merged in name" + git merge -s ours --no-commit name/branch + git read-tree --prefix=libs/name -u name/branch + git commit -m "Subtree merged in name" #### How do I debug Conversations diff --git a/art/render.rb b/art/render.rb index 2847891d2..7999996d8 100755 --- a/art/render.rb +++ b/art/render.rb @@ -14,7 +14,7 @@ images = { images.each do |source, result| resolutions.each do |name, factor| size = factor * result[1] - path = "../res/drawable-#{name}/#{result[0]}.png" + path = "../src/main/res/drawable-#{name}/#{result[0]}.png" cmd = "inkscape -e #{path} -C -h #{size} -w #{size} #{source}" puts cmd system cmd diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml index d73ac79a5..db503ae81 100644 --- a/src/main/AndroidManifest.xml +++ b/src/main/AndroidManifest.xml @@ -64,6 +64,7 @@ <intent-filter> <action android:name="android.nfc.action.NDEF_DISCOVERED" /> <category android:name="android.intent.category.DEFAULT" /> + <data android:scheme="xmpp" /> <data android:mimeType="application/vnd.eu.siacs.conversations.jid" /> </intent-filter> </activity> diff --git a/src/main/java/eu/siacs/conversations/http/HttpConnection.java b/src/main/java/eu/siacs/conversations/http/HttpConnection.java index 24eb5ed3e..147ac42f2 100644 --- a/src/main/java/eu/siacs/conversations/http/HttpConnection.java +++ b/src/main/java/eu/siacs/conversations/http/HttpConnection.java @@ -229,6 +229,8 @@ public class HttpConnection implements Downloadable { connection.connect(); BufferedInputStream is = new BufferedInputStream( connection.getInputStream()); + file.getParentFile().mkdirs(); + file.createNewFile(); OutputStream os = file.createOutputStream(); if (os == null) { throw new IOException(); diff --git a/src/main/res/layout/activity_contact_details.xml b/src/main/res/layout/activity_contact_details.xml index f7cb2198c..2b94e6f67 100644 --- a/src/main/res/layout/activity_contact_details.xml +++ b/src/main/res/layout/activity_contact_details.xml @@ -63,7 +63,6 @@ android:id="@+id/details_lastseen" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:singleLine="true" android:textColor="@color/secondarytext" android:textSize="?attr/TextSizeBody" /> </LinearLayout> @@ -111,4 +110,4 @@ </LinearLayout> </LinearLayout> -</ScrollView>
\ No newline at end of file +</ScrollView> |