Update to 0.7.7v.0.7.7

9 files changed, 158 insertions, 18 deletions

diff --git a/MessageBar b/MessageBar
-Subproject ab327207aa01a29dbab7f0595eaf26f625610b9
+Subproject bd757d09aa382bba68322db9d7552cbf9244755
diff --git a/News-Android-App.apk b/News-Android-App.apk
index 3cad3137..c3429572 100644
--- a/News-Android-App.apk
+++ b/News-Android-App.apk
diff --git a/News-Android-App/News-Android-App-News-Android-App.iml b/News-Android-App/News-Android-App-News-Android-App.iml
index 9e4ccaff..abaa347c 100644
--- a/News-Android-App/News-Android-App-News-Android-App.iml
+++ b/News-Android-App/News-Android-App-News-Android-App.iml
@@ -13,6 +13,7 @@
         <option name="COMPILE_JAVA_TASK_NAME" value="compileDebugJava" />
         <option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugTest" />
         <option name="SOURCE_GEN_TASK_NAME" value="generateDebugSources" />
+        <option name="TEST_SOURCE_GEN_TASK_NAME" value="generateDebugTestSources" />
         <option name="ALLOW_USER_CONFIGURATION" value="false" />
         <option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
         <option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
@@ -37,21 +38,21 @@
       <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/test/debug" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/aidl" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/assets" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/jni" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/assets" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
@@ -76,21 +77,41 @@
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
       <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
     </content>
-    <orderEntry type="jdk" jdkName="Android API 20 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" exported="" name="library-2.0.1" level="project" />
+    <orderEntry type="jdk" jdkName="Android API 20 Platform" jdkType="Android SDK" />
     <orderEntry type="library" exported="" name="greendao-1.3.7" level="project" />
-    <orderEntry type="library" exported="" name="eventbus-2.2.1" level="project" />
-    <orderEntry type="library" exported="" name="gson-2.2.4" level="project" />
+    <orderEntry type="library" exported="" name="library-2.0.2" level="project" />
     <orderEntry type="library" exported="" name="greendao-generator-1.3.1" level="project" />
+    <orderEntry type="library" exported="" scope="TEST" name="asm-5.0.1" level="project" />
+    <orderEntry type="library" exported="" scope="TEST" name="objenesis-1.3" level="project" />
+    <orderEntry type="library" exported="" name="support-v4-20.0.0" level="project" />
+    <orderEntry type="library" exported="" name="picasso-2.3.1" level="project" />
+    <orderEntry type="library" exported="" name="eventbus-2.2.1" level="project" />
+    <orderEntry type="library" exported="" scope="TEST" name="hamcrest-library-1.1" level="project" />
+    <orderEntry type="library" exported="" scope="TEST" name="ant-1.8.0" level="project" />
     <orderEntry type="library" exported="" name="appcompat-v7-20.0.0" level="project" />
-    <orderEntry type="library" exported="" name="jsoup-1.7.2" level="project" />
     <orderEntry type="library" exported="" name="support-annotations-20.0.0" level="project" />
-    <orderEntry type="library" exported="" name="support-v4-20.0.0" level="project" />
+    <orderEntry type="library" exported="" scope="TEST" name="sqlite4java-0.282" level="project" />
+    <orderEntry type="library" exported="" scope="TEST" name="maven-ant-tasks-2.1.3" level="project" />
     <orderEntry type="library" exported="" name="library-2.4.0" level="project" />
+    <orderEntry type="library" exported="" scope="TEST" name="junit-4.12-beta-2" level="project" />
     <orderEntry type="library" exported="" name="freemarker-2.3.18" level="project" />
-    <orderEntry type="library" exported="" name="picasso-2.3.1" level="project" />
     <orderEntry type="library" exported="" name="butterknife-5.1.2" level="project" />
+    <orderEntry type="library" exported="" scope="TEST" name="commons-codec-1.3" level="project" />
+    <orderEntry type="library" exported="" scope="TEST" name="robolectric-annotations-2.4" level="project" />
+    <orderEntry type="library" exported="" name="gson-2.2.4" level="project" />
+    <orderEntry type="library" exported="" scope="TEST" name="assertj-android-1.0.0" level="project" />
+    <orderEntry type="library" exported="" scope="TEST" name="robolectric-2.4" level="project" />
+    <orderEntry type="library" exported="" name="jsoup-1.7.2" level="project" />
+    <orderEntry type="library" exported="" scope="TEST" name="asm-commons-5.0.1" level="project" />
+    <orderEntry type="library" exported="" scope="TEST" name="vtd-xml-2.11" level="project" />
+    <orderEntry type="library" exported="" scope="TEST" name="assertj-core-1.6.1" level="project" />
+    <orderEntry type="library" exported="" scope="TEST" name="asm-tree-5.0.1" level="project" />
+    <orderEntry type="library" exported="" scope="TEST" name="asm-analysis-5.0.1" level="project" />
+    <orderEntry type="library" exported="" scope="TEST" name="hamcrest-core-1.1" level="project" />
+    <orderEntry type="library" exported="" scope="TEST" name="ant-launcher-1.8.0" level="project" />
+    <orderEntry type="library" exported="" scope="TEST" name="asm-util-5.0.1" level="project" />
+    <orderEntry type="library" exported="" scope="TEST" name="hamcrest-integration-1.1" level="project" />
     <orderEntry type="module" module-name="library" exported="" />
     <orderEntry type="module" module-name="ownCloud-Account-Importer" exported="" />
     <orderEntry type="module" module-name="android-HoloCircularProgressBar-library" exported="" />
diff --git a/News-Android-App/build.gradle b/News-Android-App/build.gradle
index dab77abf..e4e2a1d8 100644
--- a/News-Android-App/build.gradle
+++ b/News-Android-App/build.gradle
@@ -1,4 +1,14 @@
 apply plugin: 'com.android.application'
+apply plugin: 'robolectric'
+
+buildscript {
+    repositories {
+        mavenCentral()
+    }
+    dependencies {
+        classpath 'org.robolectric:robolectric-gradle-plugin:0.12.+'
+    }
+}
 
 android {
 
@@ -8,6 +18,8 @@ android {
     defaultConfig {
         minSdkVersion Integer.parseInt(project.ANDROID_BUILD_MIN_SDK_VERSION)
         targetSdkVersion Integer.parseInt(project.ANDROID_BUILD_TARGET_SDK_VERSION)
+
+        testInstrumentationRunner "com.google.android.apps.common.testing.testrunner.GoogleInstrumentationTestRunner"
     }
 
     buildTypes {
@@ -16,15 +28,26 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
         }
     }
+
+
+    productFlavors {
+    }
+
+
     sourceSets {
         main {
             aidl.srcDirs = ['src/main/java']
         }
-    }
-    productFlavors {
-    }
 
 
+        instrumentTest.setRoot('src/androidTest/java')
+
+        androidTest {
+            java.srcDir file('src/androidTest/java')
+            setRoot('src/androidTest/')
+        }
+    }
+
 
 
     lintOptions {
@@ -32,10 +55,28 @@ android {
 
         // Or, if you prefer, you can continue to check for errors in release builds,
         // but continue the build even when errors are found:
+
         abortOnError false
     }
 }
 
+configurations {
+    robolectricTests {
+        extendsFrom compile
+    }
+}
+
+sourceSets {
+    robolectricTests {
+        java.srcDir file('src/androidTest/java')
+        resources.srcDir file('src/androidTest/resources')
+        compileClasspath += configurations.robolectricTests
+        runtimeClasspath += compileClasspath
+
+    }
+}
+
+
 configurations.all {
     resolutionStrategy {
         force 'com.android.support:support-v4:20.+'
@@ -44,6 +85,7 @@ configurations.all {
 }
 
 
+
 dependencies {
     // You must install or update the Google Repository through the SDK manager to use this dependency.
     // The Google Repository (separate from the corresponding library) can be found in the Extras category.
@@ -64,4 +106,73 @@ dependencies {
     compile 'de.greenrobot:greendao:1.3.7@jar'
     compile 'de.greenrobot:greendao-generator:1.3.1@jar'
     compile 'org.freemarker:freemarker:2.3.18@jar'
+
+
+
+
+    androidTestCompile 'org.hamcrest:hamcrest-integration:1.1'
+    androidTestCompile 'org.hamcrest:hamcrest-core:1.1'
+    androidTestCompile 'org.hamcrest:hamcrest-library:1.1'
+
+    androidTestCompile('org.robolectric:robolectric:2.+'){
+        exclude module: 'classworlds'
+        exclude module: 'maven-artifact'
+        exclude module: 'maven-artifact-manager'
+        exclude module: 'maven-error-diagnostics'
+        exclude module: 'maven-model'
+        exclude module: 'maven-plugin-registry'
+        exclude module: 'maven-profile'
+        exclude module: 'maven-project'
+        exclude module: 'maven-settings'
+        exclude module: 'nekohtml'
+        exclude module: 'plexus-container-default'
+        exclude module: 'plexus-interpolation'
+        exclude module: 'plexus-utils'
+        exclude module: 'wagon-file'
+        exclude module: 'wagon-http-lightweight'
+        exclude module: 'wagon-http-shared'
+        exclude module: 'wagon-provider-api'
+        exclude group: 'com.android.support', module: 'support-v4'
+    }
+
+    androidTestCompile('junit:junit:4.+') {
+        exclude module: 'hamcrest-core'
+    }
+
+    androidTestCompile 'com.squareup.assertj:assertj-android:+'
+
+}
+
+apply plugin: 'idea'
+
+idea {
+    module {
+        testOutputDir = file('build/test-classes')
+    }
+}
+
+
+
+/*
+task robolectric(type: Test, dependsOn: assemble) {
+
+    workingDir 'src/main'
+
+    testClassesDir = sourceSets.robolectricTests.output.classesDir
+
+    android.sourceSets.main.java.srcDirs.each { dir ->
+        def buildDir = dir.getAbsolutePath().split('/')
+        buildDir = (buildDir[0..(buildDir.length - 4)] + ['build', 'classes', 'debug']).join('/')
+
+        project.getPlugins().getPlugin('android').prepareTaskMap.each {
+            sourceSets.robolectricTests.compileClasspath += files(it.value.explodedDir.getAbsolutePath() + '/classes.jar')
+            sourceSets.robolectricTests.runtimeClasspath += files(it.value.explodedDir.getAbsolutePath() + '/classes.jar')
+        }
+
+        sourceSets.robolectricTests.compileClasspath += files(buildDir)
+        sourceSets.robolectricTests.runtimeClasspath += files(buildDir)
+    }
+
+    classpath = sourceSets.robolectricTests.runtimeClasspath
 }
+*/
\ No newline at end of file
diff --git a/News-Android-App/src/main/AndroidManifest.xml b/News-Android-App/src/main/AndroidManifest.xml
index 0a6c9475..79636cbe 100644
--- a/News-Android-App/src/main/AndroidManifest.xml
+++ b/News-Android-App/src/main/AndroidManifest.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="de.luhmer.owncloudnewsreader"
-    android:versionCode="70"
-    android:versionName="0.7.6" >
+    android:versionCode="71"
+    android:versionName="0.7.7" >
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
diff --git a/README.md b/README.md
index 46c9f628..90c78165 100644
--- a/README.md
+++ b/README.md
@@ -66,10 +66,18 @@ git clone --recursive https://github.com/owncloud/News-Android-App.git -b dev
 
 Updates
 ==================================
-0.7.7 (in development)
+0.7.8 (in development)
 ---------------------
 
 
+0.7.7 (Google Play)
+---------------------
+- Bug fix - <a href="https://github.com/owncloud/News-Android-App/issues/278">#278 App broken on latest News release (4.0.1)</a>
+- Improvement - <a href="https://github.com/owncloud/News-Android-App/issues/277">#277 Blockquote not correctly rendered</a>
+- Improvement - <a href="https://github.com/owncloud/News-Android-App/issues/272">#272 Too much loading since v0.7.x</a>
+- Bug fixes/Improvements
+
+
 0.7.6 (Google Play)
 ---------------------
 - Bug fixes
diff --git a/ShowcaseView b/ShowcaseView
-Subproject 3f35ebba39cc341459113c57e59e8abc8bb5599
+Subproject 0fe55b8eeedba01cf0864171de71fad0541bc70
diff --git a/android-HoloCircularProgressBar b/android-HoloCircularProgressBar
-Subproject 98a1f817bc42c5be16221656bdac7b148581c69
+Subproject cea2318fdf41f693fd7ce2dd27fbf551c35c844
diff --git a/local.properties b/local.properties
index ac823498..a0ee113a 100644
--- a/local.properties
+++ b/local.properties
@@ -7,5 +7,5 @@
 # Location of the SDK. This is only used by Gradle.
 # For customization when using a Version Control System, please read the
 # header note.
-#Mon Sep 01 09:23:57 CEST 2014
-sdk.dir=C\:\\Program Files\\Android\\android-studio\\sdk
+#Sat Nov 01 03:37:25 CET 2014
+sdk.dir=C\:\\Program Files\\Android\\android-sdk