From aa8b3db139c90d33d3ce20c5a76157dd73691e21 Mon Sep 17 00:00:00 2001
From: cketti <cketti@gmail.com>
Date: Wed, 26 Nov 2014 04:40:58 +0100
Subject: Fix spelling of 'K-9 Mail' in FAQ

---
 OpenKeychain/src/main/res/raw/help_faq.html | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/OpenKeychain/src/main/res/raw/help_faq.html b/OpenKeychain/src/main/res/raw/help_faq.html
index 6f8763f36..094065909 100644
--- a/OpenKeychain/src/main/res/raw/help_faq.html
+++ b/OpenKeychain/src/main/res/raw/help_faq.html
@@ -12,10 +12,10 @@ And don't add newlines before or after p tags because of transifex -->
 <h2>A wrong primary user id is shown when searching on a Keyserver</h2>
 <p>Unfortunately, this is a bug in the SKS Keyserver software. Its machine-readable output returns the user ids in an arbitrary order. Read the <a href="https://bitbucket.org/skskeyserver/sks-keyserver/issue/28/primary-uid-in-machine-readable-index">related bug report</a> for more information.</p>
 
-<h2>How do I activate OpenKeychain in K9-Mail?</h2>
-<p>To use OpenKeychain with K9-Mail, you want to follow these steps:</p>
+<h2>How do I activate OpenKeychain in K-9 Mail?</h2>
+<p>To use OpenKeychain with K-9 Mail, you want to follow these steps:</p>
 <ol>
-    <li>Open K9-Mail and long-tap on the account you want to use OpenKeychain with.</li>
+    <li>Open K-9 Mail and long-tap on the account you want to use OpenKeychain with.</li>
     <li>Select "Account settings" and scroll to the very bottom and click "Cryptography".</li>
     <li>Click on "OpenPGP Provider" and select OpenKeychain from the list.</li>
 </ol>
-- 
cgit v1.2.3


From d50213e0b0606d3469b647e0063cbeab51054259 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Thu, 4 Dec 2014 18:57:09 +0100
Subject: Update for Android Studio 1.0 RC

---
 build.gradle                             |   4 ++--
 gradle/wrapper/gradle-wrapper.jar        | Bin 50557 -> 51018 bytes
 gradle/wrapper/gradle-wrapper.properties |   4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/build.gradle b/build.gradle
index 2e7ab3d86..59f05e73a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,7 +5,7 @@ buildscript {
 
     dependencies {
         // NOTE: Always use fixed version codes not dynamic ones, e.g. 0.7.3 instead of 0.7.+, see README for more information
-        classpath 'com.android.tools.build:gradle:0.12.2'
+        classpath 'com.android.tools.build:gradle:1.0.0-rc3'
     }
 }
 
@@ -16,7 +16,7 @@ allprojects {
 }
 
 task wrapper(type: Wrapper) {
-    gradleVersion = '1.12'
+    gradleVersion = '2.2.1'
 }
 
 subprojects {
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 583859812..c97a8bdb9 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index cc3d5d9a3..120a028f4 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Mon Jun 09 22:04:23 CEST 2014
+#Thu Dec 04 18:50:40 CET 2014
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=http\://services.gradle.org/distributions/gradle-1.12-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-bin.zip
-- 
cgit v1.2.3


From e41dcd37950113667253c69851cbfa54b15ea393 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Thu, 4 Dec 2014 19:02:50 +0100
Subject: Update for Android Studio 1.0 RC

---
 extern/KeybaseLib                | 2 +-
 extern/StickyListHeaders         | 2 +-
 extern/SuperToasts               | 2 +-
 extern/TokenAutoComplete         | 2 +-
 extern/minidns                   | 2 +-
 extern/openkeychain-api-lib      | 2 +-
 extern/openpgp-api-lib           | 2 +-
 extern/zxing-android-integration | 2 +-
 extern/zxing-qr-code             | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/extern/KeybaseLib b/extern/KeybaseLib
index 981cfe402..2b26d163d 160000
--- a/extern/KeybaseLib
+++ b/extern/KeybaseLib
@@ -1 +1 @@
-Subproject commit 981cfe4029319b2b1828f320775f8bed334c8659
+Subproject commit 2b26d163df84a3d26c1c8da088ed3811b5ca6ec7
diff --git a/extern/StickyListHeaders b/extern/StickyListHeaders
index 911f8ddfd..62cc58c12 160000
--- a/extern/StickyListHeaders
+++ b/extern/StickyListHeaders
@@ -1 +1 @@
-Subproject commit 911f8ddfd007ce65aededae7e7b79e5a8d903a43
+Subproject commit 62cc58c12d0c09b50984caf26e5afceda8873784
diff --git a/extern/SuperToasts b/extern/SuperToasts
index 8578cfe69..77042d633 160000
--- a/extern/SuperToasts
+++ b/extern/SuperToasts
@@ -1 +1 @@
-Subproject commit 8578cfe6917cf16a9f123c1964e4bbff2a15be59
+Subproject commit 77042d633f4dd430bcc86101e31dda52433db9c1
diff --git a/extern/TokenAutoComplete b/extern/TokenAutoComplete
index 000fa6539..ca46b4261 160000
--- a/extern/TokenAutoComplete
+++ b/extern/TokenAutoComplete
@@ -1 +1 @@
-Subproject commit 000fa65390b98106201a0ffaad76c5d85a35396c
+Subproject commit ca46b4261c97221ddd4db135e7838d6fa145adf4
diff --git a/extern/minidns b/extern/minidns
index dcf62a8ac..f3a19080f 160000
--- a/extern/minidns
+++ b/extern/minidns
@@ -1 +1 @@
-Subproject commit dcf62a8ac59d84072e66e71ec8a5d137784e760d
+Subproject commit f3a19080f15e220fbacab5045c1f15fd12513b35
diff --git a/extern/openkeychain-api-lib b/extern/openkeychain-api-lib
index 57e58e7f7..0cdbf3223 160000
--- a/extern/openkeychain-api-lib
+++ b/extern/openkeychain-api-lib
@@ -1 +1 @@
-Subproject commit 57e58e7f7f51c4eecd7ee4b0f22c856485a243b7
+Subproject commit 0cdbf32231739eac47999be71d6d01fc28375181
diff --git a/extern/openpgp-api-lib b/extern/openpgp-api-lib
index 0be263d5d..e0ad1086a 160000
--- a/extern/openpgp-api-lib
+++ b/extern/openpgp-api-lib
@@ -1 +1 @@
-Subproject commit 0be263d5d3effd2df5f976fa4a127017268749cc
+Subproject commit e0ad1086a55eab66d963b4d5c6ca5544b454ef2d
diff --git a/extern/zxing-android-integration b/extern/zxing-android-integration
index 1d7878456..e2d0064bd 160000
--- a/extern/zxing-android-integration
+++ b/extern/zxing-android-integration
@@ -1 +1 @@
-Subproject commit 1d787845663fd232f98f5e8e0923733c1a188f2a
+Subproject commit e2d0064bd3171b7333af044bb30c25c85ee993dd
diff --git a/extern/zxing-qr-code b/extern/zxing-qr-code
index 9ef2f3b66..8fd0657d3 160000
--- a/extern/zxing-qr-code
+++ b/extern/zxing-qr-code
@@ -1 +1 @@
-Subproject commit 9ef2f3b66ea7cc283e865ec39434d023a18d17f3
+Subproject commit 8fd0657d33d8277aadbdc1604fd3aaa2e8d4b487
-- 
cgit v1.2.3


From 450ac161b9ec8510828877adb33d63ffd7363647 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Thu, 4 Dec 2014 19:26:10 +0100
Subject: Set version to 3.2beta1

---
 OpenKeychain/src/main/AndroidManifest.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/OpenKeychain/src/main/AndroidManifest.xml b/OpenKeychain/src/main/AndroidManifest.xml
index 18fcc4b42..100f584c1 100644
--- a/OpenKeychain/src/main/AndroidManifest.xml
+++ b/OpenKeychain/src/main/AndroidManifest.xml
@@ -3,8 +3,8 @@
     xmlns:tools="http://schemas.android.com/tools"
     package="org.sufficientlysecure.keychain"
     android:installLocation="auto"
-    android:versionCode="31200"
-    android:versionName="3.1.2">
+    android:versionCode="31201"
+    android:versionName="3.2beta1">
 
     <!--
         General remarks
@@ -15,7 +15,7 @@
         Association of file types to Keychain
         =====================================
         General remarks about file ending conventions:
-        - *.gpg for binary files 
+        - *.gpg for binary files
         - *.asc for ascii armored files The actual content can be anything.
         
         The file ending only shows if it is binary or ascii encoded.
-- 
cgit v1.2.3


From 8f5295f2d13e895490813c0ced19cfd738e591ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Thu, 4 Dec 2014 19:42:30 +0100
Subject: Update to com.novoda:gradle-android-test-plugin:0.10.0, no snapshot
 version anymore, jacoco disabled for now

---
 OpenKeychain-Test/build.gradle | 51 +++++++++++++++++++++---------------------
 prepare-tests.sh               | 20 ++++++++---------
 2 files changed, 35 insertions(+), 36 deletions(-)

diff --git a/OpenKeychain-Test/build.gradle b/OpenKeychain-Test/build.gradle
index bb6c3d181..83932161f 100644
--- a/OpenKeychain-Test/build.gradle
+++ b/OpenKeychain-Test/build.gradle
@@ -1,14 +1,11 @@
 buildscript {
     repositories {
-        mavenCentral()
-        // need this for com.novoda:gradle-android-test-plugin:0.9.9-SNAPSHOT below (0.9.3 in repos doesn't work!)
-        // run ./install-custom-gradle-test-plugin.sh to pull the thing into the local repository
-        mavenLocal()
+        jcenter()
     }
 
     dependencies {
         // NOTE: Always use fixed version codes not dynamic ones, e.g. 0.7.3 instead of 0.7.+, see README for more information
-        classpath 'com.novoda:gradle-android-test-plugin:0.9.9-SNAPSHOT'
+        classpath 'com.novoda:gradle-android-test-plugin:0.10.0'
     }
 }
 
@@ -50,28 +47,30 @@ android {
     projectUnderTest ':OpenKeychain'
 }
 
-jacoco {
-    toolVersion = "0.7.0.201403182114"
-}
-
-coverageSourceDirs = [
-        '../OpenKeychain/src/main/java',
-        '../OpenKeychain/src/gen',
-        '../OpenKeychain/build/source/apt/debug',
-        '../OpenKeychain/build/source/generated/buildConfig/debug',
-        '../OpenKeychain/build/source/generated/r/debug'
-        ]
+//jacoco {
+//    //toolVersion = "0.7.0.201403182114"
+//    toolVersion = "0.7.2.201409121644"
+//}
+//
+//
+//coverageSourceDirs = [
+//        '../OpenKeychain/src/main/java',
+//        '../OpenKeychain/src/gen',
+//        '../OpenKeychain/build/source/apt/debug',
+//        '../OpenKeychain/build/source/generated/buildConfig/debug',
+//        '../OpenKeychain/build/source/generated/r/debug'
+//        ]
 
-jacocoTestReport {
-    reports {
-        xml.enabled = true
-        html.destination "${buildDir}/jacocoHtml"
-    }
-    // class R is used, but usage will not be covered, so ignore this class from report
-    classDirectories = fileTree(dir: '../OpenKeychain/build/intermediates/classes/debug/org/sufficientlysecure/keychain', exclude: [ 'R*.class' ])
-    additionalSourceDirs = files(coverageSourceDirs)
-    executionData = files('build/jacoco/testDebug.exec')
-}
+//jacocoTestReport {
+//    reports {
+//        xml.enabled = true
+//        html.destination "${buildDir}/jacocoHtml"
+//    }
+//    // class R is used, but usage will not be covered, so ignore this class from report
+//    classDirectories = fileTree(dir: '../OpenKeychain/build/intermediates/classes/debug/org/sufficientlysecure/keychain', exclude: [ 'R*.class' ])
+//    additionalSourceDirs = files(coverageSourceDirs)
+//    executionData = files('build/jacoco/testDebug.exec')
+//}
 
 // new workaround to force add custom output dirs for android studio
 task addTest {
diff --git a/prepare-tests.sh b/prepare-tests.sh
index 027c76f84..623c4a233 100755
--- a/prepare-tests.sh
+++ b/prepare-tests.sh
@@ -10,16 +10,16 @@ if ! java -version 2>&1 | grep OpenJDK; then
     return
 fi
 
-tmpdir="$(mktemp -d)"
-(
-  cd "$tmpdir";
-  git clone https://github.com/nenick/gradle-android-test-plugin.git
-  cd gradle-android-test-plugin
-  echo "rootProject.name = 'gradle-android-test-plugin-parent'" > settings.gradle
-  echo "include ':gradle-android-test-plugin'" >> settings.gradle
-  ./gradlew :gradle-android-test-plugin:install
-)
-rm -rf "$tmpdir"
+#tmpdir="$(mktemp -d)"
+#(
+#  cd "$tmpdir";
+#  git clone https://github.com/nenick/gradle-android-test-plugin.git
+#  cd gradle-android-test-plugin
+#  echo "rootProject.name = 'gradle-android-test-plugin-parent'" > settings.gradle
+#  echo "include ':gradle-android-test-plugin'" >> settings.gradle
+#  ./gradlew :gradle-android-test-plugin:install
+#)
+#rm -rf "$tmpdir"
 
 echo -n "ok, adding tests to include list.. "
 if grep OpenKeychain-Test settings.gradle >/dev/null ; then
-- 
cgit v1.2.3


From 9df7147c8bf6e83c7a02b664d7e0bb1613570c3a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Thu, 4 Dec 2014 19:58:08 +0100
Subject: Fix jacoco

---
 OpenKeychain-Test/build.gradle | 47 +++++++++++++++++++++---------------------
 1 file changed, 23 insertions(+), 24 deletions(-)

diff --git a/OpenKeychain-Test/build.gradle b/OpenKeychain-Test/build.gradle
index 83932161f..f621428ed 100644
--- a/OpenKeychain-Test/build.gradle
+++ b/OpenKeychain-Test/build.gradle
@@ -47,30 +47,29 @@ android {
     projectUnderTest ':OpenKeychain'
 }
 
-//jacoco {
-//    //toolVersion = "0.7.0.201403182114"
-//    toolVersion = "0.7.2.201409121644"
-//}
-//
-//
-//coverageSourceDirs = [
-//        '../OpenKeychain/src/main/java',
-//        '../OpenKeychain/src/gen',
-//        '../OpenKeychain/build/source/apt/debug',
-//        '../OpenKeychain/build/source/generated/buildConfig/debug',
-//        '../OpenKeychain/build/source/generated/r/debug'
-//        ]
-
-//jacocoTestReport {
-//    reports {
-//        xml.enabled = true
-//        html.destination "${buildDir}/jacocoHtml"
-//    }
-//    // class R is used, but usage will not be covered, so ignore this class from report
-//    classDirectories = fileTree(dir: '../OpenKeychain/build/intermediates/classes/debug/org/sufficientlysecure/keychain', exclude: [ 'R*.class' ])
-//    additionalSourceDirs = files(coverageSourceDirs)
-//    executionData = files('build/jacoco/testDebug.exec')
-//}
+jacoco {
+    toolVersion = "0.7.2.201409121644"
+}
+
+
+def coverageSourceDirs = [
+        '../OpenKeychain/src/main/java',
+        '../OpenKeychain/src/gen',
+        '../OpenKeychain/build/source/apt/debug',
+        '../OpenKeychain/build/source/generated/buildConfig/debug',
+        '../OpenKeychain/build/source/generated/r/debug'
+    ]
+
+jacocoTestReport {
+    reports {
+        xml.enabled = true
+        html.destination "${buildDir}/jacocoHtml"
+    }
+    // class R is used, but usage will not be covered, so ignore this class from report
+    classDirectories = fileTree(dir: '../OpenKeychain/build/intermediates/classes/debug/org/sufficientlysecure/keychain', exclude: [ 'R*.class' ])
+    additionalSourceDirs = files(coverageSourceDirs)
+    executionData = files('build/jacoco/testDebug.exec')
+}
 
 // new workaround to force add custom output dirs for android studio
 task addTest {
-- 
cgit v1.2.3


From ac1cbad3ffe426b0f35ba4c15dddf4584e9b8cb4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Thu, 4 Dec 2014 20:02:06 +0100
Subject: Switch from mavenCentral to jcenter

---
 build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/build.gradle b/build.gradle
index 59f05e73a..17e112d68 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,6 +1,6 @@
 buildscript {
     repositories {
-        mavenCentral()
+        jcenter()
     }
 
     dependencies {
@@ -11,7 +11,7 @@ buildscript {
 
 allprojects {
     repositories {
-        mavenCentral()
+        jcenter()
     }
 }
 
-- 
cgit v1.2.3


From 26341a325bb225d769823259895b11339a29306f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Thu, 4 Dec 2014 22:48:40 +0100
Subject: Update target and support libs to SDK 21, fixing compile issues

---
 OpenKeychain/build.gradle                                      | 10 +++++-----
 .../keychain/service/PassphraseCacheService.java               |  2 +-
 .../src/main/res/layout/actionbar_custom_view_done.xml         |  1 -
 .../src/main/res/layout/actionbar_custom_view_done_cancel.xml  |  1 -
 4 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/OpenKeychain/build.gradle b/OpenKeychain/build.gradle
index 6b957b622..6bea6954e 100644
--- a/OpenKeychain/build.gradle
+++ b/OpenKeychain/build.gradle
@@ -3,8 +3,8 @@ apply plugin: 'com.android.application'
 dependencies {
     // NOTE: Always use fixed version codes not dynamic ones, e.g. 0.7.3 instead of 0.7.+, see README for more information
 
-    compile 'com.android.support:support-v4:19.1.0'
-    compile 'com.android.support:appcompat-v7:19.1.0'
+    compile 'com.android.support:support-v4:21.0.2'
+    compile 'com.android.support:appcompat-v7:21.0.2'
     compile project(':extern:openpgp-api-lib')
     compile project(':extern:openkeychain-api-lib')
     compile project(':extern:html-textview')
@@ -23,12 +23,12 @@ dependencies {
 }
 
 android {
-    compileSdkVersion 19
-    buildToolsVersion '19.1'
+    compileSdkVersion 21
+    buildToolsVersion '21.1.1'
 
     defaultConfig {
         minSdkVersion 9
-        targetSdkVersion 19
+        targetSdkVersion 21
     }
 
     /*
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/PassphraseCacheService.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/PassphraseCacheService.java
index 63cb6494d..869d2e71b 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/PassphraseCacheService.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/PassphraseCacheService.java
@@ -456,7 +456,7 @@ public class PassphraseCacheService extends Service {
             Intent intent = new Intent(getApplicationContext(), PassphraseCacheService.class);
             intent.setAction(ACTION_PASSPHRASE_CACHE_CLEAR);
             builder.addAction(
-                    R.drawable.abc_ic_clear_normal,
+                    R.drawable.abc_ic_clear_mtrl_alpha,
                     getString(R.string.passp_cache_notif_clear),
                     PendingIntent.getService(
                             getApplicationContext(),
diff --git a/OpenKeychain/src/main/res/layout/actionbar_custom_view_done.xml b/OpenKeychain/src/main/res/layout/actionbar_custom_view_done.xml
index 50134f4e7..b219038b2 100644
--- a/OpenKeychain/src/main/res/layout/actionbar_custom_view_done.xml
+++ b/OpenKeychain/src/main/res/layout/actionbar_custom_view_done.xml
@@ -19,7 +19,6 @@
     android:layout_height="match_parent"
     android:dividerPadding="12dp"
     android:orientation="horizontal"
-    android:divider="@drawable/abc_list_divider_holo_light"
     android:showDividers="end" >
 
     <include layout="@layout/actionbar_include_done_button" />
diff --git a/OpenKeychain/src/main/res/layout/actionbar_custom_view_done_cancel.xml b/OpenKeychain/src/main/res/layout/actionbar_custom_view_done_cancel.xml
index 1d0476361..e9047e759 100644
--- a/OpenKeychain/src/main/res/layout/actionbar_custom_view_done_cancel.xml
+++ b/OpenKeychain/src/main/res/layout/actionbar_custom_view_done_cancel.xml
@@ -18,7 +18,6 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:dividerPadding="12dp"
-    android:divider="@drawable/abc_list_divider_holo_light"
     android:orientation="horizontal"
     android:showDividers="middle">
 
-- 
cgit v1.2.3


From b4c5337624c278f08757bf2dd211b3e04b719bef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Thu, 4 Dec 2014 23:37:57 +0100
Subject: Fix travis

---
 .travis.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 2cf2f98f7..987c378a4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,14 +4,14 @@ before_install:
     # Install base Android SDK
     - sudo apt-get update -qq
     - if [ `uname -m` = x86_64 ]; then sudo apt-get install -qq --force-yes libgd2-xpm lib32z1 lib32stdc++6; fi
-    - wget http://dl.google.com/android/android-sdk_r23-linux.tgz
-    - tar xzf android-sdk_r23-linux.tgz
+    - wget http://dl.google.com/android/android-sdk_r23.0.2-linux.tgz
+    - tar xzf android-sdk_r23.0.2-linux.tgz
     - export ANDROID_HOME=$PWD/android-sdk-linux
     - export PATH=${PATH}:${ANDROID_HOME}/tools:${ANDROID_HOME}/platform-tools
 
     # Install required Android components.
     #- echo "y" | android update sdk -a --filter build-tools-19.1.0,android-19,platform-tools,extra-android-support,extra-android-m2repository --no-ui --force
-    - ( sleep 5 && while [ 1 ]; do sleep 1; echo y; done ) | android update sdk --no-ui --all --force --filter build-tools-19.1.0,android-19,platform-tools,extra-android-support,extra-android-m2repository
+    - ( sleep 5 && while [ 1 ]; do sleep 1; echo y; done ) | android update sdk --no-ui --all --force --filter build-tools-21.1.1,android-21,platform-tools,extra-android-support,extra-android-m2repository
     - ./prepare-tests.sh
 install: echo "Installation done"
 script:
-- 
cgit v1.2.3


From 584ba94f208c02019586b345d44f49b2d0362673 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Fri, 5 Dec 2014 00:13:38 +0100
Subject: Fix travis

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 987c378a4..c42c636de 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,7 +11,7 @@ before_install:
 
     # Install required Android components.
     #- echo "y" | android update sdk -a --filter build-tools-19.1.0,android-19,platform-tools,extra-android-support,extra-android-m2repository --no-ui --force
-    - ( sleep 5 && while [ 1 ]; do sleep 1; echo y; done ) | android update sdk --no-ui --all --force --filter build-tools-21.1.1,android-21,platform-tools,extra-android-support,extra-android-m2repository
+    - ( sleep 5 && while [ 1 ]; do sleep 1; echo y; done ) | android update sdk --no-ui --all --force --filter build-tools-21.1.1,android-21,android-19,platform-tools,extra-android-support,extra-android-m2repository
     - ./prepare-tests.sh
 install: echo "Installation done"
 script:
-- 
cgit v1.2.3


From fda01143e0b1c64039baa5cef7e9b084a3c4da96 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Fri, 5 Dec 2014 00:27:33 +0100
Subject: Fix travis

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index c42c636de..81ef10638 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,7 +11,7 @@ before_install:
 
     # Install required Android components.
     #- echo "y" | android update sdk -a --filter build-tools-19.1.0,android-19,platform-tools,extra-android-support,extra-android-m2repository --no-ui --force
-    - ( sleep 5 && while [ 1 ]; do sleep 1; echo y; done ) | android update sdk --no-ui --all --force --filter build-tools-21.1.1,android-21,android-19,platform-tools,extra-android-support,extra-android-m2repository
+    - ( sleep 5 && while [ 1 ]; do sleep 1; echo y; done ) | android update sdk --no-ui --all --force --filter build-tools-21.1.1,build-tools-19.1.0,android-21,android-19,platform-tools,extra-android-support,extra-android-m2repository
     - ./prepare-tests.sh
 install: echo "Installation done"
 script:
-- 
cgit v1.2.3


From 99047aae6db5915b5011bda6e4534099ee4da66b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Fri, 5 Dec 2014 13:47:25 +0100
Subject: Add passhrase attacking screens for wiki

---
 Resources/docs/passphrase1.png | Bin 0 -> 77188 bytes
 Resources/docs/passphrase2.png | Bin 0 -> 90809 bytes
 Resources/docs/passphrase3.png | Bin 0 -> 63079 bytes
 3 files changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 Resources/docs/passphrase1.png
 create mode 100644 Resources/docs/passphrase2.png
 create mode 100644 Resources/docs/passphrase3.png

diff --git a/Resources/docs/passphrase1.png b/Resources/docs/passphrase1.png
new file mode 100644
index 000000000..689025ec7
Binary files /dev/null and b/Resources/docs/passphrase1.png differ
diff --git a/Resources/docs/passphrase2.png b/Resources/docs/passphrase2.png
new file mode 100644
index 000000000..2fc80fd2b
Binary files /dev/null and b/Resources/docs/passphrase2.png differ
diff --git a/Resources/docs/passphrase3.png b/Resources/docs/passphrase3.png
new file mode 100644
index 000000000..7f3dbca62
Binary files /dev/null and b/Resources/docs/passphrase3.png differ
-- 
cgit v1.2.3