Build v1.5.1.8

Fix 51 (#52 )
* Some more bug fixes. * Cleaning travis file. * Fixes #51
2017-07-25 21:17:34 +02:00 · 2017-07-22 13:12:13 +02:00 · 2017-07-21 18:48:13 +02:00 · 2017-07-21 11:44:13 +02:00
14 changed files with 133 additions and 90 deletions
--- a/.travis.yml
+++ b/.travis.yml
@ -0,0 +1,66 @@
+language: android
+
+jdk:
+  - oraclejdk8
+
+android:
+  components:
+    - tools
+    - platform-tools
+    - tools
+
+    - build-tools-26.0.0
+
+    - android-26
+    - android-22
+
+    - extra-google-google_play_services
+    - extra-google-m2repository
+    - extra-android-m2repository
+    - extra-android-support
+
+    - add-on
+    - extra
+
+    - sys-img-armeabi-v7a-android-22
+
+  licenses:
+    - 'android-sdk-license-.+'
+    - 'google-gdk-license-.+'
+
+before_script:
+  - mkdir app/src/main/res/mipmap-hdpi
+  - convert -size 72x72 xc:white app/src/main/res/mipmap-hdpi/ic_launcher.png
+  - mkdir app/src/main/res/mipmap-mdpi
+  - convert -size 48x48 xc:white app/src/main/res/mipmap-mdpi/ic_launcher.png
+  - mkdir app/src/main/res/mipmap-xhdpi
+  - convert -size 96x96 xc:white app/src/main/res/mipmap-xhdpi/ic_launcher.png
+  - mkdir app/src/main/res/mipmap-xxhdpi
+  - convert -size 192x192 xc:white app/src/main/res/mipmap-xxhdpi/ic_launcher.png
+  - mkdir app/src/main/res/mipmap-xxxhdpi
+  - convert -size 512x512 xc:white app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
+
+  - echo no | android create avd --force -n test -t android-22 --abi armeabi-v7a
+  - emulator -avd test -no-audio -no-window &
+  - android-wait-for-emulator
+  - adb shell input keyevent 82 &
+  - adb shell input tap 650 300 &
+
+script:
+  - ./gradlew assemble --configure-on-demand --no-daemon -P crashlyticsdemoApikey=$FABRIC_API_KEY -P crashlyticsdemoApisecret=$FABRIC_API_SECRET -P appLoginUrl=$LOGIN_URL -P appLoginUsername=$LOGIN_USER_NAME -P appLoginPassword=$LOGIN_PASSWORD -PdisablePreDex -Pandroid.threadPoolSize=1 -Porg.gradle.parallel=false
+  - ./gradlew connectedAndroidTest --configure-on-demand --no-daemon --stacktrace -P crashlyticsdemoApikey=$FABRIC_API_KEY -P crashlyticsdemoApisecret=$FABRIC_API_SECRET -P appLoginUrl=$LOGIN_URL -P appLoginUsername=$LOGIN_USER_NAME -P appLoginPassword=$LOGIN_PASSWORD -PdisablePreDex -Pandroid.threadPoolSize=1 -Porg.gradle.parallel=false
+
+
+before_cache:
+  - rm -f  $HOME/.gradle/caches/modules-2/modules-2.lock
+  - rm -fr $HOME/.gradle/caches/*/plugin-resolution/
+cache:
+  directories:
+    - $HOME/.gradle/caches/
+    - $HOME/.gradle/wrapper/
+    - $HOME/.android/build-cache
+
+before_install:
+  - openssl aes-256-cbc -K $encrypted_cab814aaeabc_key -iv $encrypted_cab814aaeabc_iv
+    -in secrets.tar.enc -out secrets.tar -d
+  - tar xvf secrets.tar
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -1,3 +1,13 @@
+**1.5.1.8**
+
+- Fixes and libs updates.
+
+**1.5.1.7**
+
+- Bug fixes.
+
+- Code cleaning
+
 **1.5.1.6**

 - Added back the badges after it was fixed on the library side.
--- a/README.md
+++ b/README.md
@ -1,8 +1,8 @@
 # ReaderForSelfoss

-[![Gitter chat](https://badges.gitter.im/amine-bou/ReaderForSelfoss.png)](https://gitter.im/amine-bou/ReaderForSelfoss)
+[![Build Status](https://travis-ci.org/aminecmi/ReaderforSelfoss.svg?branch=master)](https://travis-ci.org/aminecmi/ReaderforSelfoss)

-[![CircleCI](https://circleci.com/gh/aminecmi/ReaderforSelfoss/tree/master.svg?style=svg)](https://circleci.com/gh/aminecmi/ReaderforSelfoss/tree/master)
+[![Gitter chat](https://badges.gitter.im/amine-bou/ReaderForSelfoss.png)](https://gitter.im/amine-bou/ReaderForSelfoss)

 [![codebeat badge](https://codebeat.co/badges/bce66c0f-fd28-4341-a159-3b6dd22ac854)](https://codebeat.co/projects/github-com-aminecmi-readerforselfoss-master)

--- a/app/build.gradle
+++ b/app/build.gradle
@ -24,9 +24,9 @@ android {
    defaultConfig {
        applicationId "apps.amine.bou.readerforselfoss"
        minSdkVersion 16
-        targetSdkVersion 25
-        versionCode 1516
-        versionName "1.5.1.6"
+        targetSdkVersion 26
+        versionCode 1518
+        versionName "1.5.1.8"

        // Enabling multidex support.
        multiDexEnabled true
@ -80,13 +80,13 @@ dependencies {
    compile "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"

    // Android Support
-    compile 'com.android.support:appcompat-v7:26.0.0-beta2'
-    compile 'com.android.support:design:26.0.0-beta2'
-    compile 'com.android.support:recyclerview-v7:26.0.0-beta2'
-    compile 'com.android.support:support-v4:26.0.0-beta2'
-    compile 'com.android.support:support-vector-drawable:26.0.0-beta2'
-    compile 'com.android.support:customtabs:26.0.0-beta2'
-    compile 'com.android.support:cardview-v7:26.0.0-beta2'
+    compile 'com.android.support:appcompat-v7:26.0.0'
+    compile 'com.android.support:design:26.0.0'
+    compile 'com.android.support:recyclerview-v7:26.0.0'
+    compile 'com.android.support:support-v4:26.0.0'
+    compile 'com.android.support:support-vector-drawable:26.0.0'
+    compile 'com.android.support:customtabs:26.0.0'
+    compile 'com.android.support:cardview-v7:26.0.0'
    compile 'com.android.support.constraint:constraint-layout:1.0.2'

    // Firebase + crashlytics
@ -131,7 +131,7 @@ dependencies {
    compile 'com.klinkerapps:drag-dismiss-activity:1.4.2'

    // Drawer
-    compile('com.mikepenz:materialdrawer:5.9.3@aar') {
+    compile('com.mikepenz:materialdrawer:5.9.4@aar') {
        transitive = true
    }
    compile 'com.anupcowkur:reservoir:3.1.0'
--- a/app/src/main/java/apps/amine/bou/readerforselfoss/AddSourceActivity.kt
+++ b/app/src/main/java/apps/amine/bou/readerforselfoss/AddSourceActivity.kt
@ -16,7 +16,7 @@ import apps.amine.bou.readerforselfoss.api.selfoss.SelfossApi
 import apps.amine.bou.readerforselfoss.api.selfoss.Spout
 import apps.amine.bou.readerforselfoss.api.selfoss.SuccessResponse
 import apps.amine.bou.readerforselfoss.utils.Config
-import apps.amine.bou.readerforselfoss.utils.isUrlValid
+import apps.amine.bou.readerforselfoss.utils.isBaseUrlValid
 import com.ftinc.scoop.Scoop


@ -73,7 +73,7 @@ class AddSourceActivity : AppCompatActivity() {

        val config = Config(this)

-        if (config.baseUrl.isEmpty() || !config.baseUrl.isUrlValid()) {
+        if (config.baseUrl.isEmpty() || !config.baseUrl.isBaseUrlValid()) {
            mustLoginToAddSource()
        } else {

--- a/app/src/main/java/apps/amine/bou/readerforselfoss/HomeActivity.kt
+++ b/app/src/main/java/apps/amine/bou/readerforselfoss/HomeActivity.kt
@ -185,9 +185,10 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
                        } else {
                            (recyclerView.adapter as ItemListAdapter).removeItemAtIndex(position)
                        }
-                        tabNewBadge.setText("${items.size}").maybeShow()
-
-                        mayBeEmpty()
+                        if (items.size > 0)
+                            tabNewBadge.setText("${items.size}").maybeShow()
+                        else
+                            tabNewBadge.hide()

                    } catch (e: IndexOutOfBoundsException) {}

--- a/app/src/main/java/apps/amine/bou/readerforselfoss/LoginActivity.kt
+++ b/app/src/main/java/apps/amine/bou/readerforselfoss/LoginActivity.kt
@ -31,7 +31,7 @@ import apps.amine.bou.readerforselfoss.api.selfoss.SelfossApi
 import apps.amine.bou.readerforselfoss.api.selfoss.SuccessResponse
 import apps.amine.bou.readerforselfoss.utils.Config
 import apps.amine.bou.readerforselfoss.utils.checkAndDisplayStoreApk
-import apps.amine.bou.readerforselfoss.utils.isUrlValid
+import apps.amine.bou.readerforselfoss.utils.isBaseUrlValid
 import com.ftinc.scoop.Scoop


@ -149,7 +149,7 @@ class LoginActivity : AppCompatActivity() {
        var cancel = false
        var focusView: View? = null

-        if (!url.isUrlValid()) {
+        if (!url.isBaseUrlValid()) {
            mUrlView.error = getString(R.string.login_url_problem)
            focusView = mUrlView
            cancel = true
--- a/app/src/main/java/apps/amine/bou/readerforselfoss/MyApp.kt
+++ b/app/src/main/java/apps/amine/bou/readerforselfoss/MyApp.kt
@ -23,17 +23,31 @@ class MyApp : MultiDexApplication() {
        if (!BuildConfig.DEBUG)
            Fabric.with(this, Crashlytics())

-        Amplify.initSharedInstance(this)
-                .setFeedbackEmailAddress(getString(R.string.feedback_email))
-                .setAlwaysShow(BuildConfig.DEBUG)
-                .applyAllDefaultRules()
+        initAmplify()

+        initCache()
+
+        initDrawerImageLoader()
+
+        initTheme()
+
+    }
+
+    private fun initAmplify() {
+        Amplify.initSharedInstance(this)
+            .setFeedbackEmailAddress(getString(R.string.feedback_email))
+            .applyAllDefaultRules()
+    }
+
+    private fun initCache() {
        try {
            Reservoir.init(this, 8192) //in bytes
        } catch (e: IOException) {
            //failure
        }
+    }

+    private fun initDrawerImageLoader() {
        DrawerImageLoader.init(object : AbstractDrawerImageLoader() {
            override fun set(imageView: ImageView?, uri: Uri?, placeholder: Drawable?, tag: String?) {
                Glide.with(imageView?.context).load(uri).placeholder(placeholder).into(imageView)
@ -47,6 +61,9 @@ class MyApp : MultiDexApplication() {
                return baseContext.resources.getDrawable(R.mipmap.ic_launcher)
            }
        })
+    }
+
+    private fun initTheme() {
        Scoop.waffleCone()
            .addFlavor(getString(R.string.default_theme), R.style.NoBar, true)
            .addFlavor(getString(R.string.default_dark_theme), R.style.NoBarDark)
@ -64,6 +81,5 @@ class MyApp : MultiDexApplication() {
            .addFlavor(getString(R.string.red_teal_dark_theme), R.style.NoBarRedTealDark)
            .setSharedPreferences(PreferenceManager.getDefaultSharedPreferences(this))
            .initialize()
-
    }
 }
--- a/app/src/main/java/apps/amine/bou/readerforselfoss/ReaderActivity.kt
+++ b/app/src/main/java/apps/amine/bou/readerforselfoss/ReaderActivity.kt
@ -100,12 +100,13 @@ class ReaderActivity : DragDismissActivity() {
            override fun onFailure(call: Call<ParsedContent>, t: Throwable) = openInBrowserAfterFailing()

            private fun openInBrowserAfterFailing() {
-                CustomTabActivityHelper.openCustomTab(this@ReaderActivity, customTabsIntent, Uri.parse(url)
-                ) { _, uri ->
-                    val intent = Intent(Intent.ACTION_VIEW, uri)
-                    intent.flags = Intent.FLAG_ACTIVITY_NEW_TASK
-                    startActivity(intent)
-                }
+                this@ReaderActivity.openItemUrl(
+                    url,
+                    customTabsIntent,
+                    true,
+                    false,
+                    this@ReaderActivity
+                )
                finish()
            }
        })
--- a/app/src/main/java/apps/amine/bou/readerforselfoss/settings/SettingsActivity.java
+++ b/app/src/main/java/apps/amine/bou/readerforselfoss/settings/SettingsActivity.java
@ -206,7 +206,9 @@ public class SettingsActivity extends AppCompatPreferenceActivity {
    public void onHeaderClick(Header header, int position) {
        super.onHeaderClick(header, position);
        if (header.id == R.id.theme_change) {
-            getApplicationContext().startActivity(ScoopSettingsActivity.createIntent(getApplicationContext()));
+            Intent intent = ScoopSettingsActivity.createIntent(getApplicationContext());
+            intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+            getApplicationContext().startActivity(intent);
            finish();
        }
    }
--- a/app/src/main/java/apps/amine/bou/readerforselfoss/utils/AppUtils.kt
+++ b/app/src/main/java/apps/amine/bou/readerforselfoss/utils/AppUtils.kt
@ -36,7 +36,10 @@ fun Context.checkAndDisplayStoreApk() = {
    } else Unit
 }

-fun String.isUrlValid(): Boolean {
+fun String.isUrlValid(): Boolean =
+    HttpUrl.parse(this) != null && Patterns.WEB_URL.matcher(this).matches()
+
+fun String.isBaseUrlValid(): Boolean {
    val baseUrl = HttpUrl.parse(this)
    var existsAndEndsWithSlash = false
    if (baseUrl != null) {
--- a/app/src/main/java/apps/amine/bou/readerforselfoss/utils/LinksUtils.kt
+++ b/app/src/main/java/apps/amine/bou/readerforselfoss/utils/LinksUtils.kt
@ -55,7 +55,7 @@ fun Context.openItemUrl(linkDecoded: String,
                        internalBrowser: Boolean,
                        articleViewer: Boolean,
                        app: Activity) {
-    if (!internalBrowser) {
+    if (!internalBrowser || !linkDecoded.isUrlValid()) {
        openInBrowser(linkDecoded, app)
    } else {
        if (articleViewer) {
--- a/circle.yml
+++ b/circle.yml
@ -1,56 +0,0 @@
-machine:
-  timezone: Europe/Paris
-  java:
-    version: 'oraclejdk8'
-  environment:
-    ANDROID_HOME: /usr/local/android-sdk-linux
-    PATH: ANDROID_HOME:$ANDROID_HOME/platform-tools:$ANDROID_BUUILD:$ANDROID_HOME/tools:$PATH
-    _JAVA_OPTIONS: "-Xms512m -Xmx1024m"
-    GRADLE_OPTS: '-Dorg.gradle.jvmargs="-Xmx2048m -XX:+HeapDumpOnOutOfMemoryError"'
-
-dependencies:
-  pre:
-    - touch app/google-services.json
-    - echo $GOOGLE_SERVICES_JSON > app/google-services.json
-    - touch app/src/main/res/values/secrets.xml
-    - echo $SECRETS_XML > app/src/main/res/values/secrets.xml
-    - mkdir app/src/main/res/mipmap-hdpi
-    - convert -size 72x72 xc:white app/src/main/res/mipmap-hdpi/ic_launcher.png
-    - mkdir app/src/main/res/mipmap-mdpi
-    - convert -size 48x48 xc:white app/src/main/res/mipmap-mdpi/ic_launcher.png
-    - mkdir app/src/main/res/mipmap-xhdpi
-    - convert -size 96x96 xc:white app/src/main/res/mipmap-xhdpi/ic_launcher.png
-    - mkdir app/src/main/res/mipmap-xxhdpi
-    - convert -size 192x192 xc:white app/src/main/res/mipmap-xxhdpi/ic_launcher.png
-    - mkdir app/src/main/res/mipmap-xxxhdpi
-    - convert -size 512x512 xc:white app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
-
-  cache_directories:
-    - ~/.gradle
-    - ~/.android
-
-  override:
-    - echo y | android update sdk --no-ui --filter "android-26,build-tools-26.0.0"
-    - echo y | android update sdk --no-ui --all --filter "platform-tools, tools"
-    - echo y | android update sdk --no-ui --all --filter "android-26, build-tools-26.0.0"
-    - echo y | android update sdk --no-ui --all --filter "extra-android-m2repository"
-    - echo y | android update sdk --no-ui --all --filter "extra-android-support"
-    - echo y | android update sdk --no-ui --all --filter "extra-google-m2repository"
-    - echo y | android update sdk --no-ui --all --filter "extra-google-google_play_services"
-
-test:
-  override:
-    - (TERM="dumb" ./gradlew assemble --configure-on-demand --no-daemon -P crashlyticsdemoApikey=$FABRIC_API_KEY -P crashlyticsdemoApisecret=$FABRIC_API_SECRET -P appLoginUrl=$LOGIN_URL -P appLoginUsername=$LOGIN_USER_NAME -P appLoginPassword=$LOGIN_PASSWORD -PdisablePreDex -Pandroid.threadPoolSize=1 -Porg.gradle.parallel=false):
-        timeout: 1440
-    - emulator -avd circleci-android22 -no-window:
-        background: true
-        parallel: true
-    - circle-android wait-for-boot
-    - sleep 30
-    - adb shell input keyevent 82
-    - adb shell input tap 650 300
-    - (TERM="dumb" ./gradlew connectedAndroidTest --configure-on-demand --no-daemon --stacktrace -P crashlyticsdemoApikey=$FABRIC_API_KEY -P crashlyticsdemoApisecret=$FABRIC_API_SECRET -P appLoginUrl=$LOGIN_URL -P appLoginUsername=$LOGIN_USER_NAME -P appLoginPassword=$LOGIN_PASSWORD -PdisablePreDex -Pandroid.threadPoolSize=1 -Porg.gradle.parallel=false):
-        timeout: 1440
-    - cp -r app/build/outputs $CIRCLE_ARTIFACTS
-    - cp -r app/build/reports/androidTests $CIRCLE_ARTIFACTS
-    - cp -r app/build/outputs/androidTest-results/* $CIRCLE_TEST_REPORTS
--- a/secrets.tar.enc
+++ b/secrets.tar.enc
Author	SHA1	Message	Date
Amine	f12e7748c5	Build v1.5.1.8	2017-07-25 21:17:34 +02:00
Amine Bou	69a2418afc	Fix 51 (#52 ) * Some more bug fixes. * Cleaning travis file. * Fixes #51	2017-07-22 13:12:13 +02:00
Amine	4924ddd172	Changed CI from circle to travis.	2017-07-21 18:48:13 +02:00
Amine	1889b43786	Build and changelog.	2017-07-21 11:44:13 +02:00