From 36eb640a456d35c79da136df64141801a7ebd766 Mon Sep 17 00:00:00 2001 From: Apostolof Date: Sat, 29 Jun 2019 10:00:36 +0300 Subject: [PATCH 1/3] Revert libs upgrade --- app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 44028151..9f6c919e 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -75,7 +75,7 @@ dependencies { implementation 'com.google.firebase:firebase-messaging:19.0.1' implementation 'com.crashlytics.sdk.android:crashlytics:2.10.1' implementation 'com.snatik:storage:2.1.0' - implementation 'com.squareup.okhttp3:okhttp:3.14.2' + implementation 'com.squareup.okhttp3:okhttp:3.12.0' //TODO: Warning: okhttp has dropped support for Android v.19 since okhttp 3.13! implementation 'com.squareup.picasso:picasso:2.5.2' implementation 'com.jakewharton.picasso:picasso2-okhttp3-downloader:1.1.0' implementation 'org.jsoup:jsoup:1.10.3' //TODO: Warning: upgrading from 1.10.3 will break stuff! @@ -90,7 +90,7 @@ dependencies { implementation 'com.jakewharton.timber:timber:4.7.1' implementation 'ru.noties:markwon:2.0.2' implementation 'net.gotev:uploadservice:3.5.2' - implementation 'net.gotev:uploadservice-okhttp:3.5.2' + implementation 'net.gotev:uploadservice-okhttp:3.4.2' //TODO: Warning: v.3.5 depends on okhttp 3.13! implementation 'com.itkacher.okhttpprofiler:okhttpprofiler:1.0.5' //Plugin: https://plugins.jetbrains.com/plugin/11249-okhttp-profiler } From f65407d31965dc9baa99aa448915e672ad553095 Mon Sep 17 00:00:00 2001 From: Ezerous Date: Sun, 30 Jun 2019 13:03:54 +0300 Subject: [PATCH 2/3] ParseHelpers fix --- .../gr/thmmy/mthmmy/utils/CrashReporter.java | 22 ++++++------ .../mthmmy/utils/parsing/ParseHelpers.java | 34 +++++++++---------- build.gradle | 2 +- 3 files changed, 28 insertions(+), 30 deletions(-) diff --git a/app/src/main/java/gr/thmmy/mthmmy/utils/CrashReporter.java b/app/src/main/java/gr/thmmy/mthmmy/utils/CrashReporter.java index b9907e93..67ba0395 100644 --- a/app/src/main/java/gr/thmmy/mthmmy/utils/CrashReporter.java +++ b/app/src/main/java/gr/thmmy/mthmmy/utils/CrashReporter.java @@ -17,8 +17,8 @@ public class CrashReporter { public static void reportForumInfo(Document document) { ParseHelpers.Theme theme = ParseHelpers.parseTheme(document); ParseHelpers.Language language = ParseHelpers.Language.getLanguage(document); - String themeKey = "forum theme", themeValue = null; - String languageKey = "forum language", languageValue = null; + String themeKey = "forum theme", themeValue; + String languageKey = "forum language", languageValue; switch (theme) { case SCRIBBLES2: themeValue = "Scribbles2"; @@ -32,19 +32,17 @@ public class CrashReporter { case HELIOS_MULTI: themeValue = "Helios_Multi"; break; - case THEME_UNKNOWN: + default: themeValue = "Unknown theme"; - break; - } - switch (language) { - case GREEK: - languageValue = "Greek"; - break; - case ENGLISH: - languageValue = "English"; - break; } + if (language == ParseHelpers.Language.GREEK) + languageValue = "Greek"; + else if (language == ParseHelpers.Language.ENGLISH) + languageValue = "English"; + else + languageValue = "Unknown"; + Crashlytics.setString(themeKey, themeValue); Crashlytics.setString(languageKey, languageValue); Crashlytics.setBool("isLoggedIn", BaseApplication.getInstance().getSessionManager().isLoggedIn()); diff --git a/app/src/main/java/gr/thmmy/mthmmy/utils/parsing/ParseHelpers.java b/app/src/main/java/gr/thmmy/mthmmy/utils/parsing/ParseHelpers.java index 62380f80..206d4c3b 100644 --- a/app/src/main/java/gr/thmmy/mthmmy/utils/parsing/ParseHelpers.java +++ b/app/src/main/java/gr/thmmy/mthmmy/utils/parsing/ParseHelpers.java @@ -23,7 +23,7 @@ public class ParseHelpers { /** * An enum describing a forum page's language by defining the types: @@ -42,9 +42,9 @@ public class ParseHelpers { */ PAGE_INCOMPLETE, /** - * Page language is not (yet) supported. + * Page language could not be determined/ not (yet) supported. */ - UNDEFINED_LANGUAGE; + UNKNOWN_LANGUAGE; /** * Returns one of the supported forum languages. @@ -57,13 +57,12 @@ public class ParseHelpers { Element welcoming = page.select("h3").first(); if (welcoming == null) { Element welcomingGuest = page.select("div[id=myuser]").first(); - if (welcomingGuest != null) { - if (welcomingGuest.text().contains("Welcome")) return ENGLISH; - } + if (welcomingGuest != null && welcomingGuest.text().contains("Welcome")) + return ENGLISH; return PAGE_INCOMPLETE; } else if (welcoming.text().contains("Καλώς ορίσατε")) return GREEK; else if (welcoming.text().contains("Hey")) return ENGLISH; - else return UNDEFINED_LANGUAGE; + else return UNKNOWN_LANGUAGE; } } @@ -77,16 +76,17 @@ public class ParseHelpers { public static Theme parseTheme(Document page) { Element stylesheet = page.select("link[rel=stylesheet]").first(); - if (stylesheet.attr("href").contains("scribbles2")) - return Theme.SCRIBBLES2; - else if (stylesheet.attr("href").contains("helios_multi")) - return Theme.HELIOS_MULTI; - else if (stylesheet.attr("href").contains("smfone")) - return Theme.SMFONE_BLUE; - else if (stylesheet.attr("href").contains("default")) - return Theme.SMF_DEFAULT; - else - return Theme.THEME_UNKNOWN; + if(stylesheet!=null){ + if (stylesheet.attr("href").contains("scribbles2")) + return Theme.SCRIBBLES2; + else if (stylesheet.attr("href").contains("helios_multi")) + return Theme.HELIOS_MULTI; + else if (stylesheet.attr("href").contains("smfone")) + return Theme.SMFONE_BLUE; + else if (stylesheet.attr("href").contains("default")) + return Theme.SMF_DEFAULT; + } + return Theme.THEME_UNKNOWN; } /** diff --git a/build.gradle b/build.gradle index 108b8fa6..65830711 100644 --- a/build.gradle +++ b/build.gradle @@ -10,7 +10,7 @@ buildscript { } dependencies { classpath 'com.android.tools.build:gradle:3.4.1' - classpath 'com.google.gms:google-services:4.2.0' + classpath 'com.google.gms:google-services:4.3.0' classpath 'io.fabric.tools:gradle:1.29.0' classpath 'org.ajoberstar.grgit:grgit-core:3.1.1' // Also change in app/gradle/grgit.gradle classpath "com.github.ben-manes:gradle-versions-plugin:0.21.0" From e12e7e3507b54d339cd448b7f8006c263369da84 Mon Sep 17 00:00:00 2001 From: Ezerous Date: Sun, 30 Jun 2019 19:56:14 +0300 Subject: [PATCH 3/3] Up version --- app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 9f6c919e..1219d9fa 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -13,8 +13,8 @@ android { applicationId "gr.thmmy.mthmmy" minSdkVersion 19 targetSdkVersion 28 - versionCode 18 - versionName "1.7.0" + versionCode 19 + versionName "1.7.1" archivesBaseName = "mTHMMY-v$versionName" buildConfigField "String", "CURRENT_BRANCH", "\"" + getCurrentBranch() + "\"" buildConfigField "String", "COMMIT_HASH", "\"" + getCommitHash() + "\""