From 052cd57c8b71c8170721326fd65f9898899903db Mon Sep 17 00:00:00 2001
From: Ezerous <ezerous@gmail.com>
Date: Sun, 12 Nov 2017 21:10:15 +0200
Subject: [PATCH 01/29] Up libraries

---
 .gitlab-ci.yml                                |  4 +-
 app/build.gradle                              | 46 +++++++++----------
 app/src/main/assets/apache_libraries.html     |  5 +-
 app/src/main/assets/mit_libraries.html        |  4 +-
 .../gr/thmmy/mthmmy/receiver/Receiver.java    |  2 +-
 5 files changed, 32 insertions(+), 29 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1788ca59..928856f9 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,8 +1,8 @@
 image: openjdk:8-jdk
 
 variables:
-  ANDROID_TARGET_SDK: "26"
-  ANDROID_BUILD_TOOLS: "27.0.0"
+  ANDROID_TARGET_SDK: "27"
+  ANDROID_BUILD_TOOLS: "27.0.1"
   ANDROID_SDK_TOOLS_REV: "3859397"
 
 before_script:
diff --git a/app/build.gradle b/app/build.gradle
index d6341ed7..5d19f14f 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,14 +1,14 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 26
-    buildToolsVersion "27.0.0"
+    compileSdkVersion 27
+    buildToolsVersion "27.0.1"
 
     defaultConfig {
         vectorDrawables.useSupportLibrary = true
         applicationId "gr.thmmy.mthmmy"
         minSdkVersion 19
-        targetSdkVersion 26
+        targetSdkVersion 27
         versionCode 11
         versionName "1.3.3"
         archivesBaseName = "mTHMMY-v$versionName"
@@ -27,28 +27,28 @@ android {
 }
 
 dependencies {
-    compile fileTree(dir: 'libs', include: ['*.jar'])
-    compile 'com.android.support:appcompat-v7:26.1.0'
-    compile 'com.android.support:design:26.1.0'
-    compile 'com.android.support:support-v4:26.1.0'
-    compile 'com.android.support:cardview-v7:26.1.0'
-    compile 'com.android.support:recyclerview-v7:26.1.0'
-    compile 'com.google.firebase:firebase-crash:11.4.2'
-    compile 'com.squareup.okhttp3:okhttp:3.9.0'
-    compile 'com.squareup.picasso:picasso:2.5.2'
-    compile 'com.jakewharton.picasso:picasso2-okhttp3-downloader:1.1.0'
-    compile 'org.jsoup:jsoup:1.10.3'
-    compile 'com.github.franmontiel:PersistentCookieJar:v1.0.1'
-    compile 'com.github.PhilJay:MPAndroidChart:v3.0.2'
-    compile('com.mikepenz:materialdrawer:5.9.3@aar') {
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
+    implementation 'com.android.support:appcompat-v7:27.0.1'
+    implementation 'com.android.support:design:27.0.1'
+    implementation 'com.android.support:support-v4:27.0.1'
+    implementation 'com.android.support:cardview-v7:27.0.1'
+    implementation 'com.android.support:recyclerview-v7:27.0.1'
+    implementation 'com.google.firebase:firebase-crash:11.6.0'
+    implementation 'com.squareup.okhttp3:okhttp:3.9.0'
+    implementation 'com.squareup.picasso:picasso:2.5.2'
+    implementation 'com.jakewharton.picasso:picasso2-okhttp3-downloader:1.1.0'
+    implementation 'org.jsoup:jsoup:1.11.1'
+    implementation 'com.github.franmontiel:PersistentCookieJar:v1.0.1'
+    implementation 'com.github.PhilJay:MPAndroidChart:v3.0.2'
+    implementation("com.mikepenz:materialdrawer:6.0.1@aar") {
         transitive = true
     }
-    compile 'com.mikepenz:fontawesome-typeface:4.7.0.0@aar'
-    compile 'com.mikepenz:google-material-typeface:3.0.1.2.original@aar'
-    compile 'pl.droidsonroids.gif:android-gif-drawable:1.2.7'
-    compile 'com.bignerdranch.android:expandablerecyclerview:3.0.0-RC1' //TODO: Deprecated - needs replacement!
-    compile 'me.zhanghai.android.materialprogressbar:library:1.4.2'
-    compile 'com.jakewharton.timber:timber:4.5.1'
+    implementation 'com.mikepenz:fontawesome-typeface:4.7.0.0@aar'
+    implementation 'com.mikepenz:google-material-typeface:3.0.1.2.original@aar'
+    implementation 'pl.droidsonroids.gif:android-gif-drawable:1.2.8'
+    implementation 'com.bignerdranch.android:expandablerecyclerview:3.0.0-RC1' //TODO: Deprecated - needs replacement!
+    implementation 'me.zhanghai.android.materialprogressbar:library:1.4.2'
+    implementation 'com.jakewharton.timber:timber:4.6.0'
 }
 
 if (getGradle().getStartParameter().getTaskRequests().toString().contains("Release")){
diff --git a/app/src/main/assets/apache_libraries.html b/app/src/main/assets/apache_libraries.html
index 090b8039..817ee602 100644
--- a/app/src/main/assets/apache_libraries.html
+++ b/app/src/main/assets/apache_libraries.html
@@ -51,7 +51,7 @@
             <h5><a href="https://github.com/PhilJay/MPAndroidChart">MPAndroidChart</a>&nbsp;v3.0.2 (Copyright ©2016 Philipp Jahoda)</h5>
         </li>
         <li>
-            <h5><a href="https://github.com/mikepenz/MaterialDrawer">MaterialDrawer</a>&nbsp;v5.9.3 (Copyright ©2016 Mike Penz)</h5>
+            <h5><a href="https://github.com/mikepenz/MaterialDrawer">MaterialDrawer</a>&nbsp;v6.0.1 (Copyright ©2016 Mike Penz)</h5>
         </li>
         <li>
             <h5><a href="https://github.com/mikepenz/Android-Iconics">Android-Iconics</a>&nbsp;v2.9.5 (Copyright ©2016 Mike Penz)</h5>
@@ -59,6 +59,9 @@
         <li>
             <h5><a href="https://github.com/DreaminginCodeZH/MaterialProgressBar">MaterialProgressBar</a>&nbsp;v1.4.2 (Copyright ©2015 Zhang Hai)</h5>
         </li>
+        <li>
+            <h5><a href="https://github.com/JakeWharton/timber">Timber</a>&nbsp;v4.6.0 (Copyright ©2013 Jake Wharton)</h5>
+        </li>
     </ul>
 
 
diff --git a/app/src/main/assets/mit_libraries.html b/app/src/main/assets/mit_libraries.html
index c0fa7697..76527173 100644
--- a/app/src/main/assets/mit_libraries.html
+++ b/app/src/main/assets/mit_libraries.html
@@ -39,10 +39,10 @@
 <body>
 <ul>
     <li>
-        <h5><a href="https://jsoup.org//">jsoup</a>&nbsp;v1.10.3 (Copyright ©2009-2017, Jonathan Hedley &lt;jonathan@hedley.net&gt;)</h5>
+        <h5><a href="https://jsoup.org//">jsoup</a>&nbsp;v1.11.1 (Copyright ©2009-2017, Jonathan Hedley &lt;jonathan@hedley.net&gt;)</h5>
     </li>
     <li>
-        <h5><a href="https://github.com/koral--/android-gif-drawable">android-gif-drawable</a>&nbsp;v1.2.7 (Copyright ©2016 Karol Wrótniak, Droids on Roids)</h5>
+        <h5><a href="https://github.com/koral--/android-gif-drawable">android-gif-drawable</a>&nbsp;v1.2.8 (Copyright ©2013 -2017 Karol Wrótniak, Droids on Roids)</h5>
     </li>
     <li>
         <h5><a href="https://github.com/bignerdranch/expandable-recycler-view">Expandable RecyclerView</a>&nbsp;v3.0.0-RC1 (Copyright ©2015, Big Nerd Ranch)</h5>
diff --git a/app/src/main/java/gr/thmmy/mthmmy/receiver/Receiver.java b/app/src/main/java/gr/thmmy/mthmmy/receiver/Receiver.java
index 971475ff..3430ead9 100644
--- a/app/src/main/java/gr/thmmy/mthmmy/receiver/Receiver.java
+++ b/app/src/main/java/gr/thmmy/mthmmy/receiver/Receiver.java
@@ -8,7 +8,7 @@ import android.content.Context;
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
-import android.support.v7.app.NotificationCompat;
+import android.support.v4.app.NotificationCompat;
 import android.webkit.MimeTypeMap;
 
 import java.io.File;

From 903a88df1cc2a246fc1767ad13f1b49366d0705e Mon Sep 17 00:00:00 2001
From: Ezerous <ezerous@gmail.com>
Date: Mon, 13 Nov 2017 13:17:38 +0200
Subject: [PATCH 02/29] MaterialDrawer Hotfix (library update broke user's
 avatar)

---
 app/src/main/java/gr/thmmy/mthmmy/base/BaseActivity.java    | 2 +-
 app/src/main/java/gr/thmmy/mthmmy/base/BaseApplication.java | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/gr/thmmy/mthmmy/base/BaseActivity.java b/app/src/main/java/gr/thmmy/mthmmy/base/BaseActivity.java
index efc78db9..56cb7419 100644
--- a/app/src/main/java/gr/thmmy/mthmmy/base/BaseActivity.java
+++ b/app/src/main/java/gr/thmmy/mthmmy/base/BaseActivity.java
@@ -251,7 +251,7 @@ public abstract class BaseActivity extends AppCompatActivity {
                 .withSelectedIcon(aboutIconSelected);
 
         //Profile
-        profileDrawerItem = new ProfileDrawerItem().withName(sessionManager.getUsername());
+        profileDrawerItem = new ProfileDrawerItem().withName(sessionManager.getUsername()).withIdentifier(0);
 
         //AccountHeader
         accountHeader = new AccountHeaderBuilder()
diff --git a/app/src/main/java/gr/thmmy/mthmmy/base/BaseApplication.java b/app/src/main/java/gr/thmmy/mthmmy/base/BaseApplication.java
index 24c84558..35318579 100644
--- a/app/src/main/java/gr/thmmy/mthmmy/base/BaseApplication.java
+++ b/app/src/main/java/gr/thmmy/mthmmy/base/BaseApplication.java
@@ -97,7 +97,7 @@ public class BaseApplication extends Application {
         //Initialize and create the image loader logic
         DrawerImageLoader.init(new AbstractDrawerImageLoader() {
             @Override
-            public void set(ImageView imageView, Uri uri, Drawable placeholder) {
+            public void set(ImageView imageView, Uri uri, Drawable placeholder, String tag) {
                 Picasso.with(imageView.getContext()).load(uri).placeholder(placeholder).into(imageView);
             }
 

From 3cf14f305ae8e46d9681626e242e66654cc6fa31 Mon Sep 17 00:00:00 2001
From: Ezerous <ezerous@gmail.com>
Date: Mon, 13 Nov 2017 18:26:54 +0200
Subject: [PATCH 03/29] TopicActivity title hotfix

---
 .../thmmy/mthmmy/activities/topic/TopicActivity.java  | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/gr/thmmy/mthmmy/activities/topic/TopicActivity.java b/app/src/main/java/gr/thmmy/mthmmy/activities/topic/TopicActivity.java
index ecffb2f2..94354543 100644
--- a/app/src/main/java/gr/thmmy/mthmmy/activities/topic/TopicActivity.java
+++ b/app/src/main/java/gr/thmmy/mthmmy/activities/topic/TopicActivity.java
@@ -214,17 +214,12 @@ public class TopicActivity extends BaseActivity {
         toolbarTitle.setMarqueeRepeatLimit(-1);
         toolbarTitle.setText(topicTitle);
         toolbarTitle.setSelected(true);
-        toolbarTitle.setEnabled(false);
         setSupportActionBar(toolbar);
         if (getSupportActionBar() != null) {
             getSupportActionBar().setDisplayHomeAsUpEnabled(true);
             getSupportActionBar().setDisplayShowHomeEnabled(true);
         }
 
-        //Makes title scrollable
-        toolbarTitle.setHorizontallyScrolling(true);
-        toolbarTitle.setMovementMethod(new ScrollingMovementMethod());
-
         createDrawer();
 
         progressBar = findViewById(R.id.progressBar);
@@ -696,11 +691,11 @@ public class TopicActivity extends BaseActivity {
                 parsedTitle = topic.select("td[id=top_subject]").first().text();
                 if (parsedTitle.contains("Topic:")) {
                     parsedTitle = parsedTitle.substring(parsedTitle.indexOf("Topic:") + 7
-                            , parsedTitle.indexOf("(Read") - 2);
+                            , parsedTitle.indexOf("(Read") - 1);
                 } else {
                     parsedTitle = parsedTitle.substring(parsedTitle.indexOf("Θέμα:") + 6
-                            , parsedTitle.indexOf("(Αναγνώστηκε") - 2);
-                    Timber.d(parsedTitle);
+                            , parsedTitle.indexOf("(Αναγνώστηκε") - 1);
+                    Timber.d("Parsed title: %s", parsedTitle);
                 }
             }
 

From 9e59917a39a79c9d3a2f5b5a091a1e1aaec9ad1a Mon Sep 17 00:00:00 2001
From: Ezerous <ezerous@gmail.com>
Date: Tue, 14 Nov 2017 10:48:53 +0200
Subject: [PATCH 04/29] Rolled back jsoup

---
 app/build.gradle                                              | 2 +-
 app/src/main/assets/mit_libraries.html                        | 2 +-
 .../java/gr/thmmy/mthmmy/activities/topic/TopicActivity.java  | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 5d19f14f..6f763839 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -37,7 +37,7 @@ dependencies {
     implementation 'com.squareup.okhttp3:okhttp:3.9.0'
     implementation 'com.squareup.picasso:picasso:2.5.2'
     implementation 'com.jakewharton.picasso:picasso2-okhttp3-downloader:1.1.0'
-    implementation 'org.jsoup:jsoup:1.11.1'
+    implementation 'org.jsoup:jsoup:1.10.3'
     implementation 'com.github.franmontiel:PersistentCookieJar:v1.0.1'
     implementation 'com.github.PhilJay:MPAndroidChart:v3.0.2'
     implementation("com.mikepenz:materialdrawer:6.0.1@aar") {
diff --git a/app/src/main/assets/mit_libraries.html b/app/src/main/assets/mit_libraries.html
index 76527173..f9d92c13 100644
--- a/app/src/main/assets/mit_libraries.html
+++ b/app/src/main/assets/mit_libraries.html
@@ -39,7 +39,7 @@
 <body>
 <ul>
     <li>
-        <h5><a href="https://jsoup.org//">jsoup</a>&nbsp;v1.11.1 (Copyright ©2009-2017, Jonathan Hedley &lt;jonathan@hedley.net&gt;)</h5>
+        <h5><a href="https://jsoup.org//">jsoup</a>&nbsp;v1.10.3 (Copyright ©2009-2017, Jonathan Hedley &lt;jonathan@hedley.net&gt;)</h5>
     </li>
     <li>
         <h5><a href="https://github.com/koral--/android-gif-drawable">android-gif-drawable</a>&nbsp;v1.2.8 (Copyright ©2013 -2017 Karol Wrótniak, Droids on Roids)</h5>
diff --git a/app/src/main/java/gr/thmmy/mthmmy/activities/topic/TopicActivity.java b/app/src/main/java/gr/thmmy/mthmmy/activities/topic/TopicActivity.java
index 94354543..cf3d7c8e 100644
--- a/app/src/main/java/gr/thmmy/mthmmy/activities/topic/TopicActivity.java
+++ b/app/src/main/java/gr/thmmy/mthmmy/activities/topic/TopicActivity.java
@@ -691,10 +691,10 @@ public class TopicActivity extends BaseActivity {
                 parsedTitle = topic.select("td[id=top_subject]").first().text();
                 if (parsedTitle.contains("Topic:")) {
                     parsedTitle = parsedTitle.substring(parsedTitle.indexOf("Topic:") + 7
-                            , parsedTitle.indexOf("(Read") - 1);
+                            , parsedTitle.indexOf("(Read") - 2);
                 } else {
                     parsedTitle = parsedTitle.substring(parsedTitle.indexOf("Θέμα:") + 6
-                            , parsedTitle.indexOf("(Αναγνώστηκε") - 1);
+                            , parsedTitle.indexOf("(Αναγνώστηκε") - 2);
                     Timber.d("Parsed title: %s", parsedTitle);
                 }
             }

From 2725e08e03573b114d749d74be97a0ae865b162f Mon Sep 17 00:00:00 2001
From: Ezerous <ezerous@gmail.com>
Date: Fri, 17 Nov 2017 13:22:38 +0200
Subject: [PATCH 05/29] UnreadFragment date/time fix & other minor fixes

---
 README.md                                            |  2 +-
 .../activities/downloads/DownloadsActivity.java      | 12 +++++++-----
 .../activities/main/unread/UnreadFragment.java       |  7 ++++++-
 3 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/README.md b/README.md
index f27cc28a..0a93376c 100644
--- a/README.md
+++ b/README.md
@@ -29,4 +29,4 @@ Do not hesitate to contact us for any matter, either by sending an email to `thm
 **Legal attribution: Google Play and the Google Play logo are trademarks of Google Inc.*
 
 [discord-server]: https://discord.gg/CVt3yrn
-[trello-board]: https://trello.com/invite/b/4MVlkrkg/44a931707bd0b84a5e0bdfc42b9ae4f1/mthmmy
+[trello-board]: https://trello.com/b/4MVlkrkg/mthmmy
diff --git a/app/src/main/java/gr/thmmy/mthmmy/activities/downloads/DownloadsActivity.java b/app/src/main/java/gr/thmmy/mthmmy/activities/downloads/DownloadsActivity.java
index 3df917af..7e3a4526 100644
--- a/app/src/main/java/gr/thmmy/mthmmy/activities/downloads/DownloadsActivity.java
+++ b/app/src/main/java/gr/thmmy/mthmmy/activities/downloads/DownloadsActivity.java
@@ -64,7 +64,7 @@ public class DownloadsActivity extends BaseActivity implements DownloadsAdapter.
         if (downloadsUrl != null && !Objects.equals(downloadsUrl, "")) {
             ThmmyPage.PageCategory target = ThmmyPage.resolvePageCategory(Uri.parse(downloadsUrl));
             if (!target.is(ThmmyPage.PageCategory.DOWNLOADS)) {
-                Timber.e("Bundle came with a non board url!\nUrl:\n%s" , downloadsUrl);
+                Timber.e("Bundle came with a non downloads url!\nUrl:\n%s" , downloadsUrl);
                 Toast.makeText(this, "An error has occurred\nAborting.", Toast.LENGTH_SHORT).show();
                 finish();
             }
@@ -72,9 +72,10 @@ public class DownloadsActivity extends BaseActivity implements DownloadsAdapter.
 
         //Initialize toolbar
         toolbar = findViewById(R.id.toolbar);
-        if (downloadsTitle == null || Objects.equals(downloadsTitle, ""))
+        if (downloadsTitle == null || downloadsTitle.equals(""))
             toolbar.setTitle("Downloads");
-        toolbar.setTitle(downloadsTitle);
+        else
+            toolbar.setTitle(downloadsTitle);
         setSupportActionBar(toolbar);
         if (getSupportActionBar() != null) {
             getSupportActionBar().setDisplayHomeAsUpEnabled(true);
@@ -235,8 +236,9 @@ public class DownloadsActivity extends BaseActivity implements DownloadsAdapter.
 
         @Override
         protected void postParsing(ResultCode result) {
-            if (downloadsTitle != null && !Objects.equals(downloadsTitle, "") &&
-                    toolbar.getTitle() != downloadsTitle)
+            if (downloadsTitle != null && !downloadsTitle.equals("")
+                    && !downloadsTitle.equals("Αρχεία για λήψη")
+                    && toolbar.getTitle() != downloadsTitle)
                 toolbar.setTitle(downloadsTitle);
 
             ++pagesLoaded;
diff --git a/app/src/main/java/gr/thmmy/mthmmy/activities/main/unread/UnreadFragment.java b/app/src/main/java/gr/thmmy/mthmmy/activities/main/unread/UnreadFragment.java
index 0141f646..93824a61 100644
--- a/app/src/main/java/gr/thmmy/mthmmy/activities/main/unread/UnreadFragment.java
+++ b/app/src/main/java/gr/thmmy/mthmmy/activities/main/unread/UnreadFragment.java
@@ -174,7 +174,12 @@ public class UnreadFragment extends BaseFragment {
                     dateTime = dateTime.substring(0, dateTime.indexOf("<br>"));
                     dateTime = dateTime.replace("<b>", "");
                     dateTime = dateTime.replace("</b>", "");
-                    dateTime = dateTime.replaceAll(":[0-5][0-9] ", " ");
+                    if (dateTime.contains(" am") || dateTime.contains(" pm") ||
+                            dateTime.contains(" πμ") || dateTime.contains(" μμ")) {
+                        dateTime = dateTime.replaceAll(":[0-5][0-9] ", " ");
+                    } else {
+                        dateTime=dateTime.substring(0,dateTime.lastIndexOf(":"));
+                    }
                     if (!dateTime.contains(",")) {
                         dateTime = dateTime.replaceAll(".+? ([0-9])", "$1");
                     }

From c267814a14317a69609102177cee5281753c7e28 Mon Sep 17 00:00:00 2001
From: Ezerous <ezerous@gmail.com>
Date: Tue, 6 Mar 2018 13:35:31 +0200
Subject: [PATCH 06/29] Fixed Guest names not displaying Sanitized titles of
 recent posts Up few libs

---
 app/build.gradle                                   | 14 +++++++-------
 .../activities/main/recent/RecentFragment.java     |  1 +
 .../mthmmy/activities/topic/TopicAdapter.java      |  4 ++--
 .../thmmy/mthmmy/activities/topic/TopicParser.java |  6 +++---
 build.gradle                                       |  2 +-
 5 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 6f763839..d1c5c4a9 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -2,7 +2,7 @@ apply plugin: 'com.android.application'
 
 android {
     compileSdkVersion 27
-    buildToolsVersion "27.0.1"
+    buildToolsVersion "27.0.3"
 
     defaultConfig {
         vectorDrawables.useSupportLibrary = true
@@ -28,12 +28,12 @@ android {
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation 'com.android.support:appcompat-v7:27.0.1'
-    implementation 'com.android.support:design:27.0.1'
-    implementation 'com.android.support:support-v4:27.0.1'
-    implementation 'com.android.support:cardview-v7:27.0.1'
-    implementation 'com.android.support:recyclerview-v7:27.0.1'
-    implementation 'com.google.firebase:firebase-crash:11.6.0'
+    implementation 'com.android.support:appcompat-v7:27.1.0'
+    implementation 'com.android.support:design:27.1.0'
+    implementation 'com.android.support:support-v4:27.1.0'
+    implementation 'com.android.support:cardview-v7:27.1.0'
+    implementation 'com.android.support:recyclerview-v7:27.1.0'
+    implementation 'com.google.firebase:firebase-crash:11.8.0'
     implementation 'com.squareup.okhttp3:okhttp:3.9.0'
     implementation 'com.squareup.picasso:picasso:2.5.2'
     implementation 'com.jakewharton.picasso:picasso2-okhttp3-downloader:1.1.0'
diff --git a/app/src/main/java/gr/thmmy/mthmmy/activities/main/recent/RecentFragment.java b/app/src/main/java/gr/thmmy/mthmmy/activities/main/recent/RecentFragment.java
index 3191cbb9..593b5542 100644
--- a/app/src/main/java/gr/thmmy/mthmmy/activities/main/recent/RecentFragment.java
+++ b/app/src/main/java/gr/thmmy/mthmmy/activities/main/recent/RecentFragment.java
@@ -153,6 +153,7 @@ public class RecentFragment extends BaseFragment {
                 for (int i = 0; i < recent.size(); i += 3) {
                     String link = recent.get(i).child(0).attr("href");
                     String title = recent.get(i).child(0).attr("title");
+                    title = title.trim();
 
                     String lastUser = recent.get(i + 1).text();
                     Pattern pattern = Pattern.compile("\\b (.*)");
diff --git a/app/src/main/java/gr/thmmy/mthmmy/activities/topic/TopicAdapter.java b/app/src/main/java/gr/thmmy/mthmmy/activities/topic/TopicAdapter.java
index 8a94d901..6ea8f2c5 100644
--- a/app/src/main/java/gr/thmmy/mthmmy/activities/topic/TopicAdapter.java
+++ b/app/src/main/java/gr/thmmy/mthmmy/activities/topic/TopicAdapter.java
@@ -203,6 +203,7 @@ class TopicAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
                     .into(holder.thumbnail);
 
             //Sets username,submit date, index number, subject, post's and attached files texts
+            Timber.i("ASDF " + currentPost.getAuthor());
             holder.username.setText(currentPost.getAuthor());
             holder.postDate.setText(currentPost.getPostDate());
             if (currentPost.getPostNumber() != 0)
@@ -274,7 +275,6 @@ class TopicAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
                 mNumberOfPosts = currentPost.getNumberOfPosts();
                 mPersonalText = currentPost.getPersonalText();
                 mNumberOfStars = currentPost.getNumberOfStars();
-                mUserColor = currentPost.getUserColor();
             } else {
                 mSpecialRank = null;
                 mRank = null;
@@ -282,8 +282,8 @@ class TopicAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
                 mNumberOfPosts = null;
                 mPersonalText = null;
                 mNumberOfStars = 0;
-                mUserColor = 0;
             }
+            mUserColor = currentPost.getUserColor();
 
             if (!Objects.equals(mSpecialRank, "") && mSpecialRank != null) {
                 holder.specialRank.setText(mSpecialRank);
diff --git a/app/src/main/java/gr/thmmy/mthmmy/activities/topic/TopicParser.java b/app/src/main/java/gr/thmmy/mthmmy/activities/topic/TopicParser.java
index 6a05d83f..b8811ed7 100644
--- a/app/src/main/java/gr/thmmy/mthmmy/activities/topic/TopicParser.java
+++ b/app/src/main/java/gr/thmmy/mthmmy/activities/topic/TopicParser.java
@@ -223,7 +223,7 @@ class TopicParser {
                             .select("td:has(div.smalltext:containsOwn(Επισκέπτης))[style^=overflow]")
                             .first().text();
                     p_userName = p_userName.substring(0, p_userName.indexOf(" Επισκέπτης"));
-                    p_userColor = USER_COLOR_BLACK;
+                    p_userColor = USER_COLOR_YELLOW;
                 } else {
                     p_userName = userName.html();
                     p_profileURL = userName.attr("href");
@@ -283,7 +283,7 @@ class TopicParser {
                             .select("td:has(div.smalltext:containsOwn(Guest))[style^=overflow]")
                             .first().text();
                     p_userName = p_userName.substring(0, p_userName.indexOf(" Guest"));
-                    p_userColor = USER_COLOR_BLACK;
+                    p_userColor = USER_COLOR_YELLOW;
                 } else {
                     p_userName = userName.html();
                     p_profileURL = userName.attr("href");
@@ -319,7 +319,7 @@ class TopicParser {
                         try {
                             attachedUrl = new URL(tmpAttachedFileUrlAndName.attr("href"));
                         } catch (MalformedURLException e) {
-                            Timber.e("Attached file malformed url", e);
+                            Timber.e(e, "Attached file malformed url");
                             break;
                         }
                         String attachedFileName = tmpAttachedFileUrlAndName.text().substring(1);
diff --git a/build.gradle b/build.gradle
index cee0d09e..d494b63e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -7,7 +7,7 @@ buildscript {
         maven { url "https://maven.google.com" }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.0.0'
+        classpath 'com.android.tools.build:gradle:3.0.1'
         classpath 'com.google.gms:google-services:3.1.0'
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

From 701251df34d85d24833383d7f9ce0d1f87b8364c Mon Sep 17 00:00:00 2001
From: Ezerous <ezerous@gmail.com>
Date: Tue, 6 Mar 2018 17:00:50 +0200
Subject: [PATCH 07/29] Added share button in TopicActivity

---
 .../mthmmy/activities/topic/TopicActivity.java   |  10 ++++++++--
 app/src/main/res/drawable-hdpi/ic_share.png      | Bin 0 -> 541 bytes
 app/src/main/res/drawable-mdpi/ic_share.png      | Bin 0 -> 365 bytes
 app/src/main/res/drawable-xhdpi/ic_share.png     | Bin 0 -> 675 bytes
 app/src/main/res/drawable-xxhdpi/ic_share.png    | Bin 0 -> 1068 bytes
 app/src/main/res/drawable-xxxhdpi/ic_share.png   | Bin 0 -> 1404 bytes
 app/src/main/res/layout/activity_topic.xml       |   1 +
 app/src/main/res/menu/topic_menu.xml             |   6 ++++++
 app/src/main/res/values/strings.xml              |   1 +
 9 files changed, 16 insertions(+), 2 deletions(-)
 create mode 100644 app/src/main/res/drawable-hdpi/ic_share.png
 create mode 100644 app/src/main/res/drawable-mdpi/ic_share.png
 create mode 100644 app/src/main/res/drawable-xhdpi/ic_share.png
 create mode 100644 app/src/main/res/drawable-xxhdpi/ic_share.png
 create mode 100644 app/src/main/res/drawable-xxxhdpi/ic_share.png

diff --git a/app/src/main/java/gr/thmmy/mthmmy/activities/topic/TopicActivity.java b/app/src/main/java/gr/thmmy/mthmmy/activities/topic/TopicActivity.java
index cf3d7c8e..f8e7ea01 100644
--- a/app/src/main/java/gr/thmmy/mthmmy/activities/topic/TopicActivity.java
+++ b/app/src/main/java/gr/thmmy/mthmmy/activities/topic/TopicActivity.java
@@ -15,7 +15,6 @@ import android.text.Html;
 import android.text.SpannableStringBuilder;
 import android.text.TextUtils;
 import android.text.method.LinkMovementMethod;
-import android.text.method.ScrollingMovementMethod;
 import android.text.style.ClickableSpan;
 import android.text.style.URLSpan;
 import android.util.SparseArray;
@@ -103,6 +102,7 @@ public class TopicActivity extends BaseActivity {
      * bundle one and gets rendered in the toolbar.
      */
     private String parsedTitle;
+    private String topicPageUrl;
     private RecyclerView recyclerView;
     /**
      * Holds the url of this page
@@ -195,7 +195,7 @@ public class TopicActivity extends BaseActivity {
 
         Bundle extras = getIntent().getExtras();
         topicTitle = extras.getString(BUNDLE_TOPIC_TITLE);
-        String topicPageUrl = extras.getString(BUNDLE_TOPIC_URL);
+        topicPageUrl = extras.getString(BUNDLE_TOPIC_URL);
         ThmmyPage.PageCategory target = ThmmyPage.resolvePageCategory(
                 Uri.parse(topicPageUrl));
         if (!target.is(ThmmyPage.PageCategory.TOPIC)) {
@@ -310,6 +310,12 @@ public class TopicActivity extends BaseActivity {
                 AlertDialog dialog = builder.create();
                 dialog.show();
                 return true;
+            case R.id.menu_share:
+                Intent sendIntent  = new Intent(android.content.Intent.ACTION_SEND);
+                sendIntent.setType("text/plain");
+                sendIntent.putExtra(android.content.Intent.EXTRA_TEXT, topicPageUrl);
+                startActivity(Intent.createChooser(sendIntent, "Share via"));
+                return true;
             default:
                 return super.onOptionsItemSelected(item);
         }
diff --git a/app/src/main/res/drawable-hdpi/ic_share.png b/app/src/main/res/drawable-hdpi/ic_share.png
new file mode 100644
index 0000000000000000000000000000000000000000..c832502c0795518af86607a24ad356c81c94e3d1
GIT binary patch
literal 541
zcmV+&0^<FNP)<h;3K|Lk000e1NJLTq001Na001Ni1^@s6;Q*MJ00006VoOIv0RI60
z0RN!9r;`8x0n$lCK~z|U?bo|&6j2z4@iRu!h^%Q;3|fdtYE8sM6fEqt7A^cM)XL6I
z5DPm+3qeakSTBgJ=~8GV1_cR-;4O<bUe=$*jyQXEb{%BSY_m`KaSq=zbG~_JCWHwS
z`oR+J<0C$xjf3NoIfb7F`GJ#7%gkWCMCK2l(TewNNa%DTgfP&sz?Klg@wk{$Xtu(d
zopB+F5V8=$OogRuDf;(;c|094J0oYPPLXZ6fo`GcI=(mhlwlfY(J3_S;ySis5s&c&
zU!}?+WH^Jh=;|L~uJ(p`(<3;Kb2w0_&*5Pt@-`RDQi!zhq~z@H;z~3Z-*5?=YZoa9
zwM%5mc!0ghL~@zM3L>i*NZC3l3&y1i`>tkL)~;J7g#S<K`UiIy6_4x{P9x>JuurP$
zP_N)v6GAQAD-pPD@Uf?t#QT~MJM3>TE)?oz!T1YzusgZf2;rl67KwFn3p>UoHJ#tV
zP9)aB1#H4ayv*gVVNVlc+i_F>=LftinZ-}opIj;zTflOOM9eBSHYJti$Mr7`#e0(k
zTb5-)2(K$F-4z#7CT*1u_%{jr_k*c?PKNOUQ;iAbQuBKM^D*x=k?cdHX7ye-&-HTX
fvT=pxgcSS+uVT0(g3>Ua00000NkvXXu0mjfT@3ZL

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-mdpi/ic_share.png b/app/src/main/res/drawable-mdpi/ic_share.png
new file mode 100644
index 0000000000000000000000000000000000000000..31ebd45aa7dab0e094060670dfe8ca15723ee2b4
GIT binary patch
literal 365
zcmV-z0h0cSP)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv00006VoOIv0RI60
z0RN!9r;`8x0U}96K~zYI<<v1s15p%(;X9(Df)F?0Dgy2%jUW~xv2g<dO>1kVYj6)1
z3L<tkDoA2XV=5bk&%#%XaYD><3c&-fnYr(rJNN!f#J?66(ZxeLhghgHpzFI1>I`_Q
z2<Vq<=6+$m8WD|Ybu$N`Kr13{BVwtd<YZRQvUwBdX%sJLqk{p4*-OSc&XVyPjxcpR
zRYqm(?o)T|)UDKgb7tdGKoxe-M+-%^c?#%Nn7<}svNTT7B&xD;9=~{6QL`Koci6{D
zZcs#gS@JNU*TEh}X<R*QXQ4PHcrBs%o`N2+h55RJHgHh_;08Om#1(eyAZ-qtc%FcC
zyRNTkq+N~cx?GoyUr`jJh!|A8swE)l_=nH(<n!0vP7AJQ$$w5CWWT7v@zQVt00000
LNkvXXu0mjf6+)S*

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xhdpi/ic_share.png b/app/src/main/res/drawable-xhdpi/ic_share.png
new file mode 100644
index 0000000000000000000000000000000000000000..4560123d14d7eac6a299901f33da38480d9ef86e
GIT binary patch
literal 675
zcmV;U0$lxxP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00006VoOIv0RI60
z0RN!9r;`8x0$52zK~!jg?b%IB6;T|=@iUp41VM{7+O`a;rHdZiv@LrFZF^XR5QWsL
zO|Ky$tT1ZbrhEmWSz*sX1qCgF77}R@SbbW|7;?Qc_a41^4DJ_ZbLY(A`@eG@elrt7
zn>KBdf^J;EQ_L2}49=q~wO=LZD`d-fg5K1gb-@-qtB_x02HmNBmw|Il$S*RS+IJav
z6j8ubSwGo&N-qWTA%v|>HlNF~Y+Jn(n_8z7%|a_WNm2j?LkJ=+dA(LHQD7(T;!ni*
zPd|y}o7E-EM~ahr8O3qDuOs#wH}J4RKHWx!evFrhO=6&E*NHQj#?RuI#wm2B5Z{5Z
z;vcT%1BTXJsu|FMVR;y<<p(aKCxuwOv^ZVd_RgZs0H#WY%Q*ViUAz!$loqGt6S3ZK
zd6#s!Xg)30GLMT=CrEK=k$iKygTAEVi-=2$vpAf>vowv0ON(E#EZg21r8rWi(UwqE
zz?+DE;K*uaTFMG0F+9Nj)b1gKRV|~xFlr;LMpn0xea98leH2{JBD!!|zN{`yi?vZ=
zvZTl_I4ec6j0HpT#95C|IEjwbo|T{nBbX~G<Q0yk_G}1t<9<mIa1VQmw!3f>k1>I3
zIF!1E5JCtzink?2EZ}Ozup6}zUhv8nf)RYHxFcoUPVN5>^vWMMV_&OmxLy7LK1LKU
zTGm&RFqdW7WC-DN#3lR6PNYnun_JOI$^u?Qw0*v27ApmV5p&>RYTvrZgJ2`Br}ivG
zzCYZmT75Lw$dY}bS&IC7!HE#U-r}d1A%w9k%O=uUwQ2Kz@E4F4M)jplRPg`+002ov
JPDHLkV1fsqF>e3>

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xxhdpi/ic_share.png b/app/src/main/res/drawable-xxhdpi/ic_share.png
new file mode 100644
index 0000000000000000000000000000000000000000..df3f943f175688e2f3187fbfb35bcde184dc2882
GIT binary patch
literal 1068
zcmV+{1k?M8P)<h;3K|Lk000e1NJLTq002k;002k`1^@s6RqeA!00006VoOIv0RI60
z0RN!9r;`8x1K~+TK~#90?b^+&RaF?r@n@;M7>Z#~Qey8#L<NBar75LhG-~1?$Qnqq
zMg`KWpn>@(^fm~B8bw5unF<Nn3qsD!$cW0ouI5XLg4a)jeQt(a?pf!Yb@#g4&KJ()
zu+Foe-;cBR^Q>p>h%sZvj2SbgtEAcqlmZ(fVq-+CiioAXua8B<o``rqrSw^?+^T}R
z@s<93iMwj&+bUR#;~C~m@h2Xxop&qX&Ys{wIf~nA=Rd0;;p-vHnPN|E4YLZ?k6_Le
zkK|ly-fWARC7x<4Mpq4but1E5au#*fpz907xFKgzR}GqM>q1>M=%)fPe#=?3pumM%
z1D8j{^AS;^kNKiNjJX3I$AJRneV{Tw=fOSLRnQpNUR&45U@>09*}~>@d#j<@Mr^|2
z46)x}VgPd{u)4O!p}|V*%@BIHXJWz%e4g=}9k{u+#-YG6yp72|BF}1WyT#MQScf-p
z5NCRyAMqB}*U&XGScsSLcOPTU;~gxoopWpSZjoOyZjJp|Q#;?*z`gRy_K}{6-R$<U
zLG#==sHqMUnnvyotea+iZrPsf#l5bEu91;HB;TQ_FbU7dE8BaqvbM&dG5C;t0^eq=
z`?qY@);KhVACk|+8EiF8+3plZACh0pRN2lNTFrTs8In(NKywOu>7eOQN97b=z-6`d
z6bIiIFlb+G9m9~@gq0YQ-%=n(>*N~L-SRskxdvqoxcg9I(B3+^29-F=z8za|Wr0|8
z3uVjvA#Bv;u6a7-P3;C@pG#?sVRp6}=kYF9)Yex7tkIkb<dVBtJ&jkfsJ6zD!L8Vt
zA$pi`$M4vT`L%V93?9=Awhp;4BtK~8f!Q{B=Um_6(Hgp{gXNl?d=5KtU+tW$pc%gH
z&oF7SXXvupIkyhxX(owBGK~65b40YT%^c@Mv)21}Y>kLb(LbjjB4SHQ>4S@6EQ*LH
zBVv6-TpJPRBI4I*UUS)=QaV~X@7BQs@+X(Oaewc3Yt4Mdb_%a(-Y@Dlz1!|tP08=a
zq^8l#JxJJzCABpc0at0BIj1wl=duS^)YexF+<}h^oAgp`UB$r@nntt)CvbIbO~t_i
zJcmCDnDlhcH9PfUKuYOcO6m28c&|XXRXK|~Wzc`PsX&aZca6GgP;2jZch#U0hX`3Q
zx@yqw0x@>wESeL0u|dJoi1;}ohMhp3jEEakO2_*x?BqWvrF1MJwv7;CYmPac2J`XJ
z5dF`Gy87PZpkN8M4`9wGE|tw{E}HIo3r@~p%n7_`h{J$RKBT7u*F?mIh*%vLn!u@n
m*{8kd)|fG4#*7*BKjI&>einMmJ?p>#0000<MNUMnLSTYH9~MXe

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xxxhdpi/ic_share.png b/app/src/main/res/drawable-xxxhdpi/ic_share.png
new file mode 100644
index 0000000000000000000000000000000000000000..43c930ebf7d881f47bc1d4babe918792ea7b29e7
GIT binary patch
literal 1404
zcmV-?1%vvDP)<h;3K|Lk000e1NJLTq003YB003YJ1^@s6;+S_h00006VoOIv0RI60
z0RN!9r;`8x1u;oPK~#90?VVkSRaF$n*KthBbjm(V%`wv&!yb|zDu{?6KN^x4dWc?n
z2o&leiI84;umUmcp`QAnr#>JmaA?XBUz8&3B`BD|)R_oH%dw%T{Fv^&zaI7()ZyyA
zYu~fa-skT9d)2+pUTfX6&)IAJ_Zg8yB9TZW5{X125gVEB34{c&SVRUz<S`NH6OkM9
zf0_`HqardSB12i0o$xcmE(N$9_ynlantJ|!Z}UCxt^jx(_@|A)&*X1l(D(c+4e$cc
zun7J%4d8j-epC|R$qs{mVG^G3?N6lumSUEWqWB9~Vl$UnMLSm!c8JKl0`2vR$ab57
z(Y=NO%SB{NivRJ|Mda2j%Z_RW#drq{iW|Rsa@#6mOu%}Fwl`=8#F&7U4sEZ{4u~-U
ziyYckzX`>dfZ4t$a3L`!;CF|%k820Sn1DkLZI5dQM3VquHLzDi);he*utVF`1egoF
z44f{o^w5kN(C6FVU;t(Tn}HLK13%4MzI_e`U=6Upq`*T5#kj5lScd6V6;Wnxmm1*m
zxe`9WY+ws8sSMsJ+G|5ziqwz+)&e8Sz?}nj0=>Y7JP}&rZb<?wfgy{)eF^l>u(b$y
z6FAex_$lBW;AUUGdj*&WYzNLN1Ah=0XkmLHun8Cj4(Hc63ycAKfM+n$mG}U9Fzfsu
z%D|rlo&uuTbQTWq0Puq{@c&_!l?A@%Us-_V`EsD;E8q^_^RFzxRlqjjUuEFOfsMZB
z?+suv@GRzmH402%*5DD~bIb#7VGA1rz|YFSpTRtsi&Q#P2cQpl7qjlR6RbCYn`YQp
zg?UBPvI|hR0=ow6wUraVddy~MCuVb`VFY;CxBp(Db8TfE{VsG8cn%1vwOBe7r>$(4
zbHEPZTHn5VhvK!Bt=JE&@$Gjo03VhV_)%hC=VyZ19CcE{ZHLpCeZXAb{<_BILFP(Z
zDI(Gkk@rMoTRMkz34pI1{_^+u_OEPge#tI3J<%O}vq^x<dbms7W{}t<Ai6^xF0n~~
zTK}lvH;1-^#3li1{iA{-4s8dCO#;3sd=}?f2kZq_JG@4<p}dXQD@3pnvjS85FN0H<
zMtqNNpM!$(i*erocl-7`C@{^GT8T+$V053i`1U;*@Y9g_Gr#T?zWomZifKu{j*<Ln
zXsL9I28wIS?^Y%OOe24lFW-ZLi)AU}oYz(!rhQq;qrf3$5~eVB(KTiH+SOq6{+lt&
zl!i&*MPQC^AG!kII*h(k`?hruc*OVoy9Vsfd<_FGzYP%=z((K~WfG<^cTunJ`8T6-
zwf#JhFNw$&5z(ymzlzA#EXzJ^VgGs&StlZQipVlCF*+vZg#GR;%UpiypgI8k*l9`k
z0e3aAcRxnfe!1sOJs<y|51)esJ2iC;cpJC@bL8nGZ5Dygfcd`t4+3BguoZJ)TEir8
z#3K09{79^a^_l@J!0xrR6GllJz>5Ly0S=Uygb#fC93<Giw%U?3tjz%C1FxY!0HS4|
zZ(oB3)5UuqcV`+Jz*66S1`qJ6qXYmvt({Mdr^l~$Xj`pqjWGe~yP=+`Ikc^=t;LuC
zm)h22+5s^pU@Rotl`BVg3PucYT-^NqfF)U$ozx79?heT7`QJG({jE0m(E{8@u^X}m
zaIbH_Dh2RyfeA>(I4ziO5`AAl@DBi2`u3-iVCq9ZbrAg2km(eRHg%Up@KZ~&NPveh
z+M~;z{wcgEAKgBn6_|a(fQa;q$aHx*$x;%DL?V$$Boc{4Vf+tt##j;dq>Z`&0000<
KMNUMnLSTYPnwJ>>

literal 0
HcmV?d00001

diff --git a/app/src/main/res/layout/activity_topic.xml b/app/src/main/res/layout/activity_topic.xml
index e7aa2a66..cb98088e 100644
--- a/app/src/main/res/layout/activity_topic.xml
+++ b/app/src/main/res/layout/activity_topic.xml
@@ -21,6 +21,7 @@
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"
             android:background="?attr/colorPrimary"
+            app:contentInsetStartWithNavigation="0dp"
             app:popupTheme="@style/ToolbarTheme">
 
             <TextView
diff --git a/app/src/main/res/menu/topic_menu.xml b/app/src/main/res/menu/topic_menu.xml
index 516a4a48..a6321db2 100644
--- a/app/src/main/res/menu/topic_menu.xml
+++ b/app/src/main/res/menu/topic_menu.xml
@@ -7,6 +7,12 @@
         app:showAsAction="ifRoom"
         android:title="@string/bookmark">
     </item>
+    <item
+        android:id="@+id/menu_share"
+        android:icon="@drawable/ic_share"
+        app:showAsAction="ifRoom"
+        android:title="@string/share">
+    </item>
     <item
         android:id="@+id/menu_info"
         android:icon="@drawable/ic_info"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index a2341790..34d43367 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -31,6 +31,7 @@
     <string name="topic_last_post">Last post on: %1$s</string>
 
     <!--Topic Activity-->
+    <string name="share">Share</string>
     <string name="post_author">Post author</string>
     <string name="post_subject">Post subject</string>
     <string name="post">Post</string>

From 08a7f484395fb173a5b5ab80678c4cf79e07164e Mon Sep 17 00:00:00 2001
From: Ezerous <ezerous@gmail.com>
Date: Sat, 7 Apr 2018 19:36:28 +0300
Subject: [PATCH 08/29] Improvements (Login, Quickreply onBackPressed) Up libs

---
 .gitlab-ci.yml                                |  2 +-
 app/build.gradle                              | 24 +++++++-------
 app/src/main/assets/apache_libraries.html     |  8 ++---
 app/src/main/assets/mit_libraries.html        |  2 +-
 .../activities/topic/TopicActivity.java       | 13 +++++++-
 .../mthmmy/activities/topic/TopicAdapter.java | 13 +++++++-
 .../thmmy/mthmmy/session/SessionManager.java  | 33 +++++++++----------
 build.gradle                                  |  5 +--
 gradle/wrapper/gradle-wrapper.properties      |  4 +--
 9 files changed, 63 insertions(+), 41 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 928856f9..0050acd3 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -2,7 +2,7 @@ image: openjdk:8-jdk
 
 variables:
   ANDROID_TARGET_SDK: "27"
-  ANDROID_BUILD_TOOLS: "27.0.1"
+  ANDROID_BUILD_TOOLS: "27.0.3"
   ANDROID_SDK_TOOLS_REV: "3859397"
 
 before_script:
diff --git a/app/build.gradle b/app/build.gradle
index d1c5c4a9..ab4808bf 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -28,27 +28,27 @@ android {
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation 'com.android.support:appcompat-v7:27.1.0'
-    implementation 'com.android.support:design:27.1.0'
-    implementation 'com.android.support:support-v4:27.1.0'
-    implementation 'com.android.support:cardview-v7:27.1.0'
-    implementation 'com.android.support:recyclerview-v7:27.1.0'
-    implementation 'com.google.firebase:firebase-crash:11.8.0'
-    implementation 'com.squareup.okhttp3:okhttp:3.9.0'
+    implementation 'com.android.support:appcompat-v7:27.1.1'
+    implementation 'com.android.support:design:27.1.1'
+    implementation 'com.android.support:support-v4:27.1.1'
+    implementation 'com.android.support:cardview-v7:27.1.1'
+    implementation 'com.android.support:recyclerview-v7:27.1.1'
+    implementation 'com.google.firebase:firebase-crash:12.0.1'
+    implementation 'com.squareup.okhttp3:okhttp:3.10.0'
     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'
+    implementation 'org.jsoup:jsoup:1.10.3' //Warning: upgrading from 1.10.3 will break stuff!
     implementation 'com.github.franmontiel:PersistentCookieJar:v1.0.1'
-    implementation 'com.github.PhilJay:MPAndroidChart:v3.0.2'
-    implementation("com.mikepenz:materialdrawer:6.0.1@aar") {
+    implementation 'com.github.PhilJay:MPAndroidChart:v3.0.3'
+    implementation("com.mikepenz:materialdrawer:6.0.7@aar") {
         transitive = true
     }
     implementation 'com.mikepenz:fontawesome-typeface:4.7.0.0@aar'
     implementation 'com.mikepenz:google-material-typeface:3.0.1.2.original@aar'
-    implementation 'pl.droidsonroids.gif:android-gif-drawable:1.2.8'
+    implementation 'pl.droidsonroids.gif:android-gif-drawable:1.2.12'
     implementation 'com.bignerdranch.android:expandablerecyclerview:3.0.0-RC1' //TODO: Deprecated - needs replacement!
     implementation 'me.zhanghai.android.materialprogressbar:library:1.4.2'
-    implementation 'com.jakewharton.timber:timber:4.6.0'
+    implementation 'com.jakewharton.timber:timber:4.7.0'
 }
 
 if (getGradle().getStartParameter().getTaskRequests().toString().contains("Release")){
diff --git a/app/src/main/assets/apache_libraries.html b/app/src/main/assets/apache_libraries.html
index 817ee602..fd866258 100644
--- a/app/src/main/assets/apache_libraries.html
+++ b/app/src/main/assets/apache_libraries.html
@@ -39,7 +39,7 @@
   <body>
     <ul>
         <li>
-            <h5><a href="https://square.github.io/okhttp/">OkHttp</a>&nbsp;v3.9.0 (Copyright ©2016 Square, Inc.)</h5>
+            <h5><a href="https://square.github.io/okhttp/">OkHttp</a>&nbsp;v3.10.0 (Copyright ©2016 Square, Inc.)</h5>
         </li>
         <li>
             <h5><a href="https://square.github.io/picasso/">Picasso</a>&nbsp;v2.5.2 (Copyright ©2013 Square, Inc.)</h5>
@@ -48,10 +48,10 @@
             <h5><a href="https://github.com/franmontiel/PersistentCookieJar">PersistentCookieJar</a>&nbsp;v1.0.1 (Copyright ©2016 Francisco José Montiel Navarro)</h5>
         </li>
         <li>
-            <h5><a href="https://github.com/PhilJay/MPAndroidChart">MPAndroidChart</a>&nbsp;v3.0.2 (Copyright ©2016 Philipp Jahoda)</h5>
+            <h5><a href="https://github.com/PhilJay/MPAndroidChart">MPAndroidChart</a>&nbsp;v3.0.3 (Copyright ©2018 Philipp Jahoda)</h5>
         </li>
         <li>
-            <h5><a href="https://github.com/mikepenz/MaterialDrawer">MaterialDrawer</a>&nbsp;v6.0.1 (Copyright ©2016 Mike Penz)</h5>
+            <h5><a href="https://github.com/mikepenz/MaterialDrawer">MaterialDrawer</a>&nbsp;v6.0.7 (Copyright ©2018 Mike Penz)</h5>
         </li>
         <li>
             <h5><a href="https://github.com/mikepenz/Android-Iconics">Android-Iconics</a>&nbsp;v2.9.5 (Copyright ©2016 Mike Penz)</h5>
@@ -60,7 +60,7 @@
             <h5><a href="https://github.com/DreaminginCodeZH/MaterialProgressBar">MaterialProgressBar</a>&nbsp;v1.4.2 (Copyright ©2015 Zhang Hai)</h5>
         </li>
         <li>
-            <h5><a href="https://github.com/JakeWharton/timber">Timber</a>&nbsp;v4.6.0 (Copyright ©2013 Jake Wharton)</h5>
+            <h5><a href="https://github.com/JakeWharton/timber">Timber</a>&nbsp;v4.7.0 (Copyright ©2013 Jake Wharton)</h5>
         </li>
     </ul>
 
diff --git a/app/src/main/assets/mit_libraries.html b/app/src/main/assets/mit_libraries.html
index f9d92c13..e5681966 100644
--- a/app/src/main/assets/mit_libraries.html
+++ b/app/src/main/assets/mit_libraries.html
@@ -42,7 +42,7 @@
         <h5><a href="https://jsoup.org//">jsoup</a>&nbsp;v1.10.3 (Copyright ©2009-2017, Jonathan Hedley &lt;jonathan@hedley.net&gt;)</h5>
     </li>
     <li>
-        <h5><a href="https://github.com/koral--/android-gif-drawable">android-gif-drawable</a>&nbsp;v1.2.8 (Copyright ©2013 -2017 Karol Wrótniak, Droids on Roids)</h5>
+        <h5><a href="https://github.com/koral--/android-gif-drawable">android-gif-drawable</a>&nbsp;v1.2.12 (Copyright ©2013 -2018 Karol Wrótniak, Droids on Roids)</h5>
     </li>
     <li>
         <h5><a href="https://github.com/bignerdranch/expandable-recycler-view">Expandable RecyclerView</a>&nbsp;v3.0.0-RC1 (Copyright ©2015, Big Nerd Ranch)</h5>
diff --git a/app/src/main/java/gr/thmmy/mthmmy/activities/topic/TopicActivity.java b/app/src/main/java/gr/thmmy/mthmmy/activities/topic/TopicActivity.java
index f8e7ea01..f5f2c06e 100644
--- a/app/src/main/java/gr/thmmy/mthmmy/activities/topic/TopicActivity.java
+++ b/app/src/main/java/gr/thmmy/mthmmy/activities/topic/TopicActivity.java
@@ -327,6 +327,17 @@ public class TopicActivity extends BaseActivity {
             drawer.closeDrawer();
             return;
         }
+        else if(postsList.get(postsList.size()-1)==null)
+        {
+            postsList.remove(postsList.size() - 1);
+            topicAdapter.notifyItemRemoved(postsList.size());
+            topicAdapter.setBackButtonHidden();
+            replyFAB.setVisibility(View.INVISIBLE);
+            bottomNavBar.setVisibility(View.INVISIBLE);
+            paginationEnabled(true);
+            replyFAB.setEnabled(true);
+            return;
+        }
         super.onBackPressed();
     }
 
@@ -528,7 +539,7 @@ public class TopicActivity extends BaseActivity {
 //------------------------------------BOTTOM NAV BAR METHODS END------------------------------------
 
     /**
-     * An {@link AsyncTask} that handles asynchronous fetching of this topic page and parsing of it's
+     * An {@link AsyncTask} that handles asynchronous fetching of this topic page and parsing of its
      * data.
      * <p>TopicTask's {@link AsyncTask#execute execute} method needs a topic's url as String
      * parameter.</p>
diff --git a/app/src/main/java/gr/thmmy/mthmmy/activities/topic/TopicAdapter.java b/app/src/main/java/gr/thmmy/mthmmy/activities/topic/TopicAdapter.java
index 6ea8f2c5..8cb33275 100644
--- a/app/src/main/java/gr/thmmy/mthmmy/activities/topic/TopicAdapter.java
+++ b/app/src/main/java/gr/thmmy/mthmmy/activities/topic/TopicAdapter.java
@@ -203,7 +203,6 @@ class TopicAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
                     .into(holder.thumbnail);
 
             //Sets username,submit date, index number, subject, post's and attached files texts
-            Timber.i("ASDF " + currentPost.getAuthor());
             holder.username.setText(currentPost.getAuthor());
             holder.postDate.setText(currentPost.getPostDate());
             if (currentPost.getPostNumber() != 0)
@@ -474,6 +473,11 @@ class TopicAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
                     holder.submitButton.setEnabled(true);
                 }
             });
+            if(backPressHidden)
+            {
+                holder.quickReply.requestFocus();
+                backPressHidden = false;
+            }
         }
     }
 
@@ -537,6 +541,13 @@ class TopicAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
         }
     }
 
+    private boolean backPressHidden = false;
+
+    void setBackButtonHidden() {
+        this.backPressHidden = true;
+    }
+
+
     /**
      * Custom {@link RecyclerView.ViewHolder} implementation
      */
diff --git a/app/src/main/java/gr/thmmy/mthmmy/session/SessionManager.java b/app/src/main/java/gr/thmmy/mthmmy/session/SessionManager.java
index 4c2c60cc..961b998d 100644
--- a/app/src/main/java/gr/thmmy/mthmmy/session/SessionManager.java
+++ b/app/src/main/java/gr/thmmy/mthmmy/session/SessionManager.java
@@ -108,9 +108,7 @@ public class SessionManager {
             Response response = client.newCall(request).execute();
             Document document = Jsoup.parse(response.body().string());
 
-            Elements unreadRepliesLinks = document.select("a[href=https://www.thmmy.gr/smf/index.php?action=unreadreplies]");
-
-            if (unreadRepliesLinks.size() >= 2) //Normally it's just == 2, but who knows what can be posted by users
+            if (validateRetrievedCookies())
             {
                 Timber.i("Login successful!");
                 setPersistentCookieSession();   //Store cookies
@@ -262,23 +260,24 @@ public class SessionManager {
     //--------------------------------------GETTERS END---------------------------------------------
 
     //------------------------------------OTHER FUNCTIONS-------------------------------------------
+    private boolean validateRetrievedCookies() {
+        List<Cookie> cookieList = cookieJar.loadForRequest(indexUrl);
+        return (cookieList.size() == 2) && (cookieList.get(0).name().equals("THMMYgrC00ki3")) && (cookieList.get(1).name().equals("PHPSESSID"));
+    }
+
+    // Call validateRetrievedCookies() first
     private void setPersistentCookieSession() {
         List<Cookie> cookieList = cookieJar.loadForRequest(indexUrl);
+        Cookie.Builder builder = new Cookie.Builder();
+        builder.name(cookieList.get(1).name())
+                .value(cookieList.get(1).value())
+                .domain(cookieList.get(1).domain())
+                .expiresAt(cookieList.get(0).expiresAt());
+        cookieList.remove(1);
+        cookieList.add(builder.build());
+        cookiePersistor.clear();
+        cookiePersistor.saveAll(cookieList);
 
-        if (cookieList.size() == 2) {
-            if ((cookieList.get(0).name().equals("THMMYgrC00ki3"))
-                    && (cookieList.get(1).name().equals("PHPSESSID"))) {
-                Cookie.Builder builder = new Cookie.Builder();
-                builder.name(cookieList.get(1).name())
-                        .value(cookieList.get(1).value())
-                        .domain(cookieList.get(1).domain())
-                        .expiresAt(cookieList.get(0).expiresAt());
-                cookieList.remove(1);
-                cookieList.add(builder.build());
-                cookiePersistor.clear();
-                cookiePersistor.saveAll(cookieList);
-            }
-        }
     }
 
     private void clearSessionData() {
diff --git a/build.gradle b/build.gradle
index d494b63e..a748ded8 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,10 +5,11 @@ buildscript {
         jcenter()
         maven { url "https://jitpack.io" }
         maven { url "https://maven.google.com" }
+        google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.0.1'
-        classpath 'com.google.gms:google-services:3.1.0'
+        classpath 'com.android.tools.build:gradle:3.1.0'
+        classpath 'com.google.gms:google-services:3.1.1'
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
     }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 9a77e6f4..3cae3bf9 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Thu Oct 26 11:21:06 EEST 2017
+#Sat Apr 07 11:11:36 EEST 2018
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip

From 50337daf5ba1b5e542776e139304a64294b4c8a4 Mon Sep 17 00:00:00 2001
From: Ezerous <ezerous@gmail.com>
Date: Thu, 19 Apr 2018 20:20:16 +0300
Subject: [PATCH 09/29] Github migration changes

---
 .gitlab-ci.yml  | 39 ---------------------------------------
 CONTRIBUTING.md | 18 +++++++++---------
 README.md       |  1 -
 3 files changed, 9 insertions(+), 49 deletions(-)
 delete mode 100644 .gitlab-ci.yml

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
deleted file mode 100644
index 0050acd3..00000000
--- a/.gitlab-ci.yml
+++ /dev/null
@@ -1,39 +0,0 @@
-image: openjdk:8-jdk
-
-variables:
-  ANDROID_TARGET_SDK: "27"
-  ANDROID_BUILD_TOOLS: "27.0.3"
-  ANDROID_SDK_TOOLS_REV: "3859397"
-
-before_script:
-  - apt-get --quiet update --yes
-  - apt-get --quiet install --yes wget unzip lib32stdc++6 lib32z1
-  - mkdir $HOME/.android # for sdkmanager configs
-  - echo 'count=0' > $HOME/.android/repositories.cfg # avoid warning
-  - wget --quiet --output-document=android-sdk.zip https://dl.google.com/android/repository/sdk-tools-linux-${ANDROID_SDK_TOOLS_REV}.zip
-  - mkdir $PWD/android-sdk-linux
-  - unzip -qq android-sdk.zip -d $PWD/android-sdk-linux
-  - export ANDROID_HOME=$PWD/android-sdk-linux
-  - echo y | $ANDROID_HOME/tools/bin/sdkmanager --update  > /dev/null
-  - echo y | $ANDROID_HOME/tools/bin/sdkmanager 'tools' > /dev/null
-  - echo y | $ANDROID_HOME/tools/bin/sdkmanager 'platform-tools'  > /dev/null
-  - echo y | $ANDROID_HOME/tools/bin/sdkmanager 'build-tools;'$ANDROID_BUILD_TOOLS  > /dev/null
-  - echo y | $ANDROID_HOME/tools/bin/sdkmanager 'platforms;android-'$ANDROID_TARGET_SDK > /dev/null
-  - echo y | $ANDROID_HOME/tools/bin/sdkmanager 'extras;android;m2repository' > /dev/null
-  - echo y | $ANDROID_HOME/tools/bin/sdkmanager 'extras;google;google_play_services'  > /dev/null
-  - echo y | $ANDROID_HOME/tools/bin/sdkmanager 'extras;google;m2repository'  > /dev/null
-  - chmod +x ./gradlew
-
-stages:
-  - build
-
-build:
-  stage: build
-  script:
-    - ./gradlew assembleDebug > /dev/null
-  except:
-    - master
-  artifacts:
-    name: "${CI_BUILD_NAME}"
-    paths:
-    - app/build/outputs/
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 6f5733a4..9901c71c 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -16,7 +16,7 @@ There are many ways of contributing to mTHMMY:
 - Simply using the [latest release version][google-play] from Google Play (anonymous reports are sent automatically)
 - Joining our [Discord server][discord-server]
 - Submitting bugs and ideas on our [Trello board][trello-board]
-- Forking mTHMMY and submitting [merge requests](#merge-requests)
+- Forking mTHMMY and submitting [pull requests](#pull-requests)
 - Joining our core team
 - Contacting us by email at `thmmynolife@gmail.com`
 
@@ -25,18 +25,18 @@ There are many ways of contributing to mTHMMY:
 The [mTHMMY Board on trello.com][trello-board] is used as an Issue Tracker, for bugs and improvements concerning the available mTHMMY releases.
 Before creating a card to submit an issue please **search the board** for similar entries.
 
-## Merge requests
+## Pull requests
 
-Merge requests with fixes and improvements to mTHMMY are most welcome. Any developer that wants to work independently from the core team can simply
-follow the workflow below to make a merge request:
+Pull requests with fixes and improvements to mTHMMY are most welcome. Any developer that wants to work independently from the core team can simply
+follow the workflow below to make a pull request:
 
-1. Fork the project into your personal space on GitLab.com
+1. Fork the project into your personal space on Github
 1. Create a feature branch, away from `develop`
 1. Push the commit(s) to your fork
-1. Create a merge request (MR) targeting `develop` [at mTHMMY](https://gitlab.com/ThmmyNoLife/mTHMMY/tree/develop)
-1. Fill the MR title describing the change you want to make
-1. Fill the MR description with a brief motive for your change and the method you used to achieve it
-1. Submit the MR.
+1. Create a pull request (PR) targeting `develop` [at mTHMMY](https://github.com/ThmmyNoLife/mTHMMY/tree/develop)
+1. Fill the PR title describing the change you want to make
+1. Fill the PR description with a brief motive for your change and the method you used to achieve it
+1. Submit the PR.
 
 
 
diff --git a/README.md b/README.md
index 0a93376c..caa249d7 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,5 @@
 # mTHMMY
 
-[![build status](https://gitlab.com/ThmmyNoLife/mTHMMY/badges/develop/build.svg)](https://gitlab.com/ThmmyNoLife/mTHMMY/commits/develop)
 [![API](https://img.shields.io/badge/API-19%2B-blue.svg?style=flat)](https://android-arsenal.com/api?level=19)
 [![Discord Channel](https://img.shields.io/badge/discord-public@mTHMMY-738bd7.svg?style=flat)][discord-server]
 [![Trello Board](https://img.shields.io/badge/trello-mTHMMY-red.svg?style=flat)][trello-board]

From 9db1630b5032c8f3b79fd81b698d870092517226 Mon Sep 17 00:00:00 2001
From: Ezerous <ezerous@gmail.com>
Date: Fri, 20 Apr 2018 12:38:34 +0300
Subject: [PATCH 10/29] Minor improvements

Added Share button on every post
Added "sent from mTHMMY" when posting
Github migration changes
Changed Login/Logout messages
Up Gradle
---
 .../mthmmy/activities/LoginActivity.java      |  2 +-
 .../activities/topic/TopicActivity.java       |  4 ++--
 .../mthmmy/activities/topic/TopicAdapter.java | 22 ++++++++++++++-----
 .../mthmmy/activities/topic/TopicParser.java  | 19 +++++++++-------
 .../gr/thmmy/mthmmy/base/BaseActivity.java    |  1 -
 .../main/java/gr/thmmy/mthmmy/model/Post.java | 22 ++++++++++++++++---
 .../layout-v21/activity_topic_post_row.xml    | 17 ++++++++++----
 .../res/layout/activity_topic_post_row.xml    | 17 ++++++++++----
 app/src/main/res/values-w820dp/dimens.xml     |  2 +-
 app/src/main/res/values/dimens.xml            |  2 +-
 app/src/main/res/values/strings.xml           |  3 ++-
 build.gradle                                  |  2 +-
 12 files changed, 80 insertions(+), 33 deletions(-)

diff --git a/app/src/main/java/gr/thmmy/mthmmy/activities/LoginActivity.java b/app/src/main/java/gr/thmmy/mthmmy/activities/LoginActivity.java
index dddd0158..89a1d8f8 100644
--- a/app/src/main/java/gr/thmmy/mthmmy/activities/LoginActivity.java
+++ b/app/src/main/java/gr/thmmy/mthmmy/activities/LoginActivity.java
@@ -157,7 +157,7 @@ public class LoginActivity extends BaseActivity {
             switch (result) {
                 case SUCCESS: //Successful login
                     Toast.makeText(getApplicationContext(),
-                            "Login successful!", Toast.LENGTH_LONG)
+                            "Welcome, " + sessionManager.getUsername() + "!", Toast.LENGTH_LONG)
                             .show();
                     //Go to main
                     Intent intent = new Intent(LoginActivity.this, MainActivity.class);
diff --git a/app/src/main/java/gr/thmmy/mthmmy/activities/topic/TopicActivity.java b/app/src/main/java/gr/thmmy/mthmmy/activities/topic/TopicActivity.java
index f5f2c06e..25cab734 100644
--- a/app/src/main/java/gr/thmmy/mthmmy/activities/topic/TopicActivity.java
+++ b/app/src/main/java/gr/thmmy/mthmmy/activities/topic/TopicActivity.java
@@ -855,16 +855,16 @@ public class TopicActivity extends BaseActivity {
 
         @Override
         protected Boolean doInBackground(String... args) {
+            final String sentFrommTHMMY = "\n[right][size=7pt][i]sent from [url=https://play.google.com/store/apps/details?id=gr.thmmy.mthmmy]mTHMMY[/url][/i][/size][/right]";
             RequestBody postBody = new MultipartBody.Builder()
                     .setType(MultipartBody.FORM)
-                    .addFormDataPart("message", args[1])
+                    .addFormDataPart("message", args[1] + sentFrommTHMMY)
                     .addFormDataPart("num_replies", args[2])
                     .addFormDataPart("seqnum", args[3])
                     .addFormDataPart("sc", args[4])
                     .addFormDataPart("subject", args[0])
                     .addFormDataPart("topic", args[5])
                     .build();
-
             Request post = new Request.Builder()
                     .url("https://www.thmmy.gr/smf/index.php?action=post2")
                     .header("User-Agent", "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/56.0.2924.87 Safari/537.36")
diff --git a/app/src/main/java/gr/thmmy/mthmmy/activities/topic/TopicAdapter.java b/app/src/main/java/gr/thmmy/mthmmy/activities/topic/TopicAdapter.java
index 8cb33275..40bb41f1 100644
--- a/app/src/main/java/gr/thmmy/mthmmy/activities/topic/TopicAdapter.java
+++ b/app/src/main/java/gr/thmmy/mthmmy/activities/topic/TopicAdapter.java
@@ -192,7 +192,7 @@ class TopicAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
 
             //noinspection ConstantConditions
             Picasso.with(context)
-                    .load(currentPost.getThumbnailUrl())
+                    .load(currentPost.getThumbnailURL())
                     .resize(THUMBNAIL_SIZE, THUMBNAIL_SIZE)
                     .centerCrop()
                     .error(ResourcesCompat.getDrawable(context.getResources()
@@ -369,10 +369,10 @@ class TopicAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
                         Intent intent = new Intent(context, ProfileActivity.class);
                         Bundle extras = new Bundle();
                         extras.putString(BUNDLE_PROFILE_URL, currentPost.getProfileURL());
-                        if (currentPost.getThumbnailUrl() == null)
+                        if (currentPost.getThumbnailURL() == null)
                             extras.putString(BUNDLE_PROFILE_THUMBNAIL_URL, "");
                         else
-                            extras.putString(BUNDLE_PROFILE_THUMBNAIL_URL, currentPost.getThumbnailUrl());
+                            extras.putString(BUNDLE_PROFILE_THUMBNAIL_URL, currentPost.getThumbnailURL());
                         extras.putString(BUNDLE_PROFILE_USERNAME, currentPost.getAuthor());
                         intent.putExtras(extras);
                         intent.setFlags(FLAG_ACTIVITY_NEW_TASK);
@@ -409,6 +409,16 @@ class TopicAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
                 holder.userExtraInfo.setOnClickListener(null);
             }
 
+            holder.sharePostButton.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View view) {
+                    Intent sendIntent  = new Intent(android.content.Intent.ACTION_SEND);
+                    sendIntent.setType("text/plain");
+                    sendIntent.putExtra(android.content.Intent.EXTRA_TEXT, currentPost.getPostURL());
+                    context.startActivity(Intent.createChooser(sendIntent, "Share via"));
+                }
+            });
+
             //noinspection PointlessBooleanExpression,ConstantConditions
             if (!BaseActivity.getSessionManager().isLoggedIn() || !canReply) {
                 holder.quoteToggle.setVisibility(View.GONE);
@@ -426,8 +436,7 @@ class TopicAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
                             if (toQuoteList.contains(postsList.indexOf(currentPost))) {
                                 toQuoteList.remove(toQuoteList.indexOf(postsList.indexOf(currentPost)));
                             } else
-                                Timber.i("An error occurred while trying to exclude post from" +
-                                        "toQuoteList, post wasn't there!");
+                                Timber.i("An error occurred while trying to exclude post fromtoQuoteList, post wasn't there!");
                             holder.quoteToggle.setImageResource(R.drawable.ic_format_quote_unchecked);
                         } else {
                             toQuoteList.add(postsList.indexOf(currentPost));
@@ -505,7 +514,7 @@ class TopicAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
         final TextView postDate, postNum, username, subject;
         final ImageView thumbnail;
         final public WebView post;
-        final ImageButton quoteToggle;
+        final ImageButton quoteToggle, sharePostButton;
         final RelativeLayout header;
         final LinearLayout userExtraInfo;
         final View bodyFooterDivider;
@@ -526,6 +535,7 @@ class TopicAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
             post = view.findViewById(R.id.post);
             post.setBackgroundColor(Color.argb(1, 255, 255, 255));
             quoteToggle = view.findViewById(R.id.toggle_quote_button);
+            sharePostButton = view.findViewById(R.id.post_share_button);
             bodyFooterDivider = view.findViewById(R.id.body_footer_divider);
             postFooter = view.findViewById(R.id.post_footer);
 
diff --git a/app/src/main/java/gr/thmmy/mthmmy/activities/topic/TopicParser.java b/app/src/main/java/gr/thmmy/mthmmy/activities/topic/TopicParser.java
index b8811ed7..3589f4cf 100644
--- a/app/src/main/java/gr/thmmy/mthmmy/activities/topic/TopicParser.java
+++ b/app/src/main/java/gr/thmmy/mthmmy/activities/topic/TopicParser.java
@@ -155,8 +155,8 @@ class TopicParser {
 
         for (Element thisRow : postRows) {
             //Variables for Post constructor
-            String p_userName, p_thumbnailUrl, p_subject, p_post, p_postDate, p_profileURL, p_rank,
-                    p_specialRank, p_gender, p_personalText, p_numberOfPosts, p_postLastEditDate;
+            String p_userName, p_thumbnailURL, p_subject, p_post, p_postDate, p_profileURL, p_rank,
+                    p_specialRank, p_gender, p_personalText, p_numberOfPosts, p_postLastEditDate, p_postURL;
             int p_postNum, p_postIndex, p_numberOfStars, p_userColor;
             boolean p_isDeleted = false;
             ArrayList<ThmmyFile> p_attachedFiles;
@@ -176,14 +176,17 @@ class TopicParser {
             //Language independent parsing
             //Finds thumbnail url
             Element thumbnailUrl = thisRow.select("img.avatar").first();
-            p_thumbnailUrl = null; //In case user doesn't have an avatar
+            p_thumbnailURL = null; //In case user doesn't have an avatar
             if (thumbnailUrl != null) {
-                p_thumbnailUrl = thumbnailUrl.attr("abs:src");
+                p_thumbnailURL = thumbnailUrl.attr("abs:src");
             }
 
             //Finds subject
             p_subject = thisRow.select("div[id^=subject_]").first().select("a").first().text();
 
+            //Finds post's link
+            p_postURL = thisRow.select("div[id^=subject_]").first().select("a").first() .attr("href");
+
             //Finds post's text
             p_post = ParseHelpers.youtubeEmbeddedFix(thisRow.select("div").select(".post").first());
 
@@ -410,15 +413,15 @@ class TopicParser {
                     }
                 }
                 //Add new post in postsList, extended information needed
-                parsedPostsList.add(new Post(p_thumbnailUrl, p_userName, p_subject, p_post, p_postIndex
+                parsedPostsList.add(new Post(p_thumbnailURL, p_userName, p_subject, p_post, p_postIndex
                         , p_postNum, p_postDate, p_profileURL, p_rank, p_specialRank, p_gender
                         , p_numberOfPosts, p_personalText, p_numberOfStars, p_userColor
-                        , p_attachedFiles, p_postLastEditDate));
+                        , p_attachedFiles, p_postLastEditDate, p_postURL));
 
             } else { //Deleted user
                 //Add new post in postsList, only standard information needed
-                parsedPostsList.add(new Post(p_thumbnailUrl, p_userName, p_subject, p_post, p_postIndex
-                        , p_postNum, p_postDate, p_userColor, p_attachedFiles, p_postLastEditDate));
+                parsedPostsList.add(new Post(p_thumbnailURL, p_userName, p_subject, p_post, p_postIndex
+                        , p_postNum, p_postDate, p_userColor, p_attachedFiles, p_postLastEditDate, p_postURL));
             }
         }
         return parsedPostsList;
diff --git a/app/src/main/java/gr/thmmy/mthmmy/base/BaseActivity.java b/app/src/main/java/gr/thmmy/mthmmy/base/BaseActivity.java
index 56cb7419..559b297a 100644
--- a/app/src/main/java/gr/thmmy/mthmmy/base/BaseActivity.java
+++ b/app/src/main/java/gr/thmmy/mthmmy/base/BaseActivity.java
@@ -406,7 +406,6 @@ public abstract class BaseActivity extends AppCompatActivity {
         }
 
         protected void onPostExecute(Integer result) {
-            Toast.makeText(getBaseContext(), "Logged out successfully!", Toast.LENGTH_LONG).show();
             updateDrawer();
             if (mainActivity != null)
                 mainActivity.updateTabs();
diff --git a/app/src/main/java/gr/thmmy/mthmmy/model/Post.java b/app/src/main/java/gr/thmmy/mthmmy/model/Post.java
index baf8cc20..76a335fd 100644
--- a/app/src/main/java/gr/thmmy/mthmmy/model/Post.java
+++ b/app/src/main/java/gr/thmmy/mthmmy/model/Post.java
@@ -28,6 +28,7 @@ public class Post {
     private final int userColor;
     private final ArrayList<ThmmyFile> attachedFiles;
     private final String lastEdit;
+    private final String postURL;
 
     //Extra info
     private final String profileURL;
@@ -59,6 +60,7 @@ public class Post {
         numberOfStars = 0;
         attachedFiles = null;
         lastEdit = null;
+        postURL = null;
     }
 
     /**
@@ -83,12 +85,13 @@ public class Post {
      * @param userColor     author's user color
      * @param attachedFiles post's attached files
      * @param lastEdit      post's last edit date
+     * @param postURL      post's URL
      */
     public Post(@Nullable String thumbnailUrl, String author, String subject, String content
             , int postIndex, int postNumber, String postDate, String profileURl, @Nullable String rank
             , @Nullable String special_rank, @Nullable String gender, @Nullable String numberOfPosts
             , @Nullable String personalText, int numberOfStars, int userColor
-            , @Nullable ArrayList<ThmmyFile> attachedFiles, @Nullable String lastEdit) {
+            , @Nullable ArrayList<ThmmyFile> attachedFiles, @Nullable String lastEdit, String postURL) {
         if (Objects.equals(thumbnailUrl, "")) this.thumbnailUrl = null;
         else this.thumbnailUrl = thumbnailUrl;
         this.author = author;
@@ -108,6 +111,7 @@ public class Post {
         this.numberOfPosts = numberOfPosts;
         this.personalText = personalText;
         this.numberOfStars = numberOfStars;
+        this.postURL = postURL;
     }
 
     /**
@@ -125,10 +129,11 @@ public class Post {
      * @param userColor     author's user color
      * @param attachedFiles post's attached files
      * @param lastEdit      post's last edit date
+     * @param postURL      post's URL
      */
     public Post(@Nullable String thumbnailUrl, String author, String subject, String content
             , int postIndex, int postNumber, String postDate, int userColor
-            , @Nullable ArrayList<ThmmyFile> attachedFiles, @Nullable String lastEdit) {
+            , @Nullable ArrayList<ThmmyFile> attachedFiles, @Nullable String lastEdit, String postURL) {
         if (Objects.equals(thumbnailUrl, "")) this.thumbnailUrl = null;
         else this.thumbnailUrl = thumbnailUrl;
         this.author = author;
@@ -148,6 +153,7 @@ public class Post {
         numberOfPosts = "Posts: 0";
         personalText = "";
         numberOfStars = 0;
+        this.postURL = postURL;
     }
 
     //Getters
@@ -158,7 +164,7 @@ public class Post {
      * @return author's thumbnail url
      */
     @Nullable
-    public String getThumbnailUrl() {
+    public String getThumbnailURL() {
         return thumbnailUrl;
     }
 
@@ -326,4 +332,14 @@ public class Post {
     public String getLastEdit() {
         return lastEdit;
     }
+
+    /**
+     * Gets this post's url.
+     *
+     * @return post's url
+     */
+    @Nullable
+    public String getPostURL() {
+        return postURL;
+    }
 }
diff --git a/app/src/main/res/layout-v21/activity_topic_post_row.xml b/app/src/main/res/layout-v21/activity_topic_post_row.xml
index 7f384f10..6f00298e 100644
--- a/app/src/main/res/layout-v21/activity_topic_post_row.xml
+++ b/app/src/main/res/layout-v21/activity_topic_post_row.xml
@@ -85,18 +85,27 @@
                         android:maxLines="1"
                         android:text="@string/post_subject" />
                 </RelativeLayout>
-
                 <ImageButton
                     android:id="@+id/toggle_quote_button"
-                    android:layout_width="@dimen/quote_button"
-                    android:layout_height="@dimen/quote_button"
-                    android:layout_marginEnd="9dp"
+                    android:layout_width="@dimen/post_image_button"
+                    android:layout_height="@dimen/post_image_button"
                     android:layout_marginTop="9dp"
                     android:background="@color/card_background"
                     android:clickable="true"
                     android:contentDescription="@string/post_quote_button"
                     android:focusable="true"
                     android:src="@drawable/ic_format_quote_unchecked" />
+                <ImageButton
+                    android:id="@+id/post_share_button"
+                    android:layout_width="@dimen/post_image_button"
+                    android:layout_height="@dimen/post_image_button"
+                    android:layout_marginEnd="9dp"
+                    android:layout_marginTop="9dp"
+                    android:background="@color/card_background"
+                    android:clickable="true"
+                    android:contentDescription="@string/post_share_button"
+                    android:focusable="true"
+                    android:src="@drawable/ic_share" />
             </LinearLayout>
 
             <LinearLayout
diff --git a/app/src/main/res/layout/activity_topic_post_row.xml b/app/src/main/res/layout/activity_topic_post_row.xml
index cc004897..9805fd2b 100644
--- a/app/src/main/res/layout/activity_topic_post_row.xml
+++ b/app/src/main/res/layout/activity_topic_post_row.xml
@@ -84,18 +84,27 @@
                         android:maxLines="1"
                         android:text="@string/post_subject" />
                 </RelativeLayout>
-
                 <ImageButton
                     android:id="@+id/toggle_quote_button"
-                    android:layout_width="@dimen/quote_button"
-                    android:layout_height="@dimen/quote_button"
-                    android:layout_marginEnd="9dp"
+                    android:layout_width="@dimen/post_image_button"
+                    android:layout_height="@dimen/post_image_button"
                     android:layout_marginTop="9dp"
                     android:background="@color/card_background"
                     android:clickable="true"
                     android:contentDescription="@string/post_quote_button"
                     android:focusable="true"
                     android:src="@drawable/ic_format_quote_unchecked" />
+                <ImageButton
+                    android:id="@+id/post_share_button"
+                    android:layout_width="@dimen/post_image_button"
+                    android:layout_height="@dimen/post_image_button"
+                    android:layout_marginEnd="9dp"
+                    android:layout_marginTop="9dp"
+                    android:background="@color/card_background"
+                    android:clickable="true"
+                    android:contentDescription="@string/post_share_button"
+                    android:focusable="true"
+                    android:src="@drawable/ic_share" />
             </LinearLayout>
 
             <LinearLayout
diff --git a/app/src/main/res/values-w820dp/dimens.xml b/app/src/main/res/values-w820dp/dimens.xml
index 2efd3b5a..e1c4971b 100644
--- a/app/src/main/res/values-w820dp/dimens.xml
+++ b/app/src/main/res/values-w820dp/dimens.xml
@@ -6,7 +6,7 @@
     <dimen name="activity_vertical_margin">64dp</dimen>
     <dimen name="appbar_padding_top">32dp</dimen>
     <dimen name="thumbnail_size">176dp</dimen>
-    <dimen name="quote_button">144dp</dimen>
+    <dimen name="post_image_button">144dp</dimen>
     <dimen name="fab_margins">64dp</dimen>
     <dimen name="progress_bar_height">40dp</dimen>
     <dimen name="big_text">24sp</dimen>
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 914c6e3d..20a265af 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -4,7 +4,7 @@
     <dimen name="activity_vertical_margin">16dp</dimen>
     <dimen name="appbar_padding_top">8dp</dimen>
     <dimen name="thumbnail_size">44dp</dimen>
-    <dimen name="quote_button">36dp</dimen>
+    <dimen name="post_image_button">36dp</dimen>
     <dimen name="fab_margins">16dp</dimen>
     <dimen name="progress_bar_height">10dp</dimen>
     <dimen name="big_text">24sp</dimen>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 34d43367..73a8c8e4 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -37,6 +37,7 @@
     <string name="post">Post</string>
     <string name="post_thumbnail">Thumbnail</string>
     <string name="post_quote_button">Quote button</string>
+    <string name="post_share_button">Share button</string>
     <string name="user_number_of_posts">#%1$d</string>
     <string name="button_first">first</string>
     <string name="button_previous">previous</string>
@@ -66,7 +67,7 @@
     <string name="contact">Contact</string>
     <string name="contact_text">Do not hesitate to contact us for any matter either by email at thmmynolife@gmail.com, or by joining our discord server at https://discord.gg/CVt3yrn.</string>
     <string name="open_source">Open Source</string>
-    <string name="open_source_text">The source code of mTHMMY can be found on GitLab (https://gitlab.com/ThmmyNoLife/mTHMMY) along with further details of how one can contribute.</string>
+    <string name="open_source_text">The source code of mTHMMY can be found on Github (https://github.com/ThmmyNoLife/mTHMMY) along with further details of how one can contribute.</string>
     <string name="trollPic">You should see a funny pic!</string>
 
     <!--Bookmarks-->
diff --git a/build.gradle b/build.gradle
index a748ded8..c7eceb56 100644
--- a/build.gradle
+++ b/build.gradle
@@ -8,7 +8,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.1.0'
+        classpath 'com.android.tools.build:gradle:3.1.1'
         classpath 'com.google.gms:google-services:3.1.1'
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

From dbb5ab39d6f5f44d83657baf10876716275de542 Mon Sep 17 00:00:00 2001
From: Ezerous <ezerous@gmail.com>
Date: Fri, 20 Apr 2018 13:46:23 +0300
Subject: [PATCH 11/29] Migrated to Crashlytics

---
 app/build.gradle                                | 17 +++++++++++++----
 .../thmmy/mthmmy/utils/CrashReportingTree.java  |  8 ++++----
 build.gradle                                    |  6 +++---
 3 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index ab4808bf..7faa0dd0 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,5 +1,9 @@
 apply plugin: 'com.android.application'
 
+if (buildInRelease()){
+    apply plugin: 'io.fabric'
+}
+
 android {
     compileSdkVersion 27
     buildToolsVersion "27.0.3"
@@ -33,11 +37,12 @@ dependencies {
     implementation 'com.android.support:support-v4:27.1.1'
     implementation 'com.android.support:cardview-v7:27.1.1'
     implementation 'com.android.support:recyclerview-v7:27.1.1'
-    implementation 'com.google.firebase:firebase-crash:12.0.1'
+    implementation 'com.google.firebase:firebase-core:15.0.0'
+    implementation 'com.crashlytics.sdk.android:crashlytics:2.9.1'
     implementation 'com.squareup.okhttp3:okhttp:3.10.0'
     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' //Warning: upgrading from 1.10.3 will break stuff!
+    implementation 'org.jsoup:jsoup:1.10.3' //TODO: Warning: upgrading from 1.10.3 will break stuff!
     implementation 'com.github.franmontiel:PersistentCookieJar:v1.0.1'
     implementation 'com.github.PhilJay:MPAndroidChart:v3.0.3'
     implementation("com.mikepenz:materialdrawer:6.0.7@aar") {
@@ -46,11 +51,15 @@ dependencies {
     implementation 'com.mikepenz:fontawesome-typeface:4.7.0.0@aar'
     implementation 'com.mikepenz:google-material-typeface:3.0.1.2.original@aar'
     implementation 'pl.droidsonroids.gif:android-gif-drawable:1.2.12'
-    implementation 'com.bignerdranch.android:expandablerecyclerview:3.0.0-RC1' //TODO: Deprecated - needs replacement!
+    implementation 'com.bignerdranch.android:expandablerecyclerview:3.0.0-RC1' //TODO: needs replacement
     implementation 'me.zhanghai.android.materialprogressbar:library:1.4.2'
     implementation 'com.jakewharton.timber:timber:4.7.0'
 }
 
-if (getGradle().getStartParameter().getTaskRequests().toString().contains("Release")){
+if (buildInRelease()){
     apply plugin: 'com.google.gms.google-services'
 }
+
+def buildInRelease() {
+    return getGradle().getStartParameter().getTaskRequests().toString().contains("Release")
+}
diff --git a/app/src/main/java/gr/thmmy/mthmmy/utils/CrashReportingTree.java b/app/src/main/java/gr/thmmy/mthmmy/utils/CrashReportingTree.java
index a3407254..c4674134 100644
--- a/app/src/main/java/gr/thmmy/mthmmy/utils/CrashReportingTree.java
+++ b/app/src/main/java/gr/thmmy/mthmmy/utils/CrashReportingTree.java
@@ -2,7 +2,7 @@ package gr.thmmy.mthmmy.utils;
 
 import android.util.Log;
 
-import com.google.firebase.crash.FirebaseCrash;
+import com.crashlytics.android.Crashlytics;
 
 import timber.log.Timber.DebugTree;
 
@@ -25,14 +25,14 @@ public class CrashReportingTree extends DebugTree {
         else
             level = 'A';
 
-        FirebaseCrash.log(level + "/" + tag + ": " + message);
+        Crashlytics.log(level + "/" + tag + ": " + message);
 
         if(priority == Log.ERROR)
         {
             if (t!=null)
-                FirebaseCrash.report(t);
+                Crashlytics.logException(t);
             else
-                FirebaseCrash.report(new Exception(message));
+                Crashlytics.logException(new Exception(message));
         }
 
     }
diff --git a/build.gradle b/build.gradle
index c7eceb56..c9e5f745 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,13 +5,13 @@ buildscript {
         jcenter()
         maven { url "https://jitpack.io" }
         maven { url "https://maven.google.com" }
+        maven { url "https://maven.fabric.io/public" }
         google()
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:3.1.1'
-        classpath 'com.google.gms:google-services:3.1.1'
-        // NOTE: Do not place your application dependencies here; they belong
-        // in the individual module build.gradle files
+        classpath 'com.google.gms:google-services:3.2.0'
+        classpath 'io.fabric.tools:gradle:1.25.1'
     }
 }
 

From 6ac9c5ae0d6b1f803d60240f376bfbf2671977c3 Mon Sep 17 00:00:00 2001
From: Ezerous <ezerous@gmail.com>
Date: Fri, 20 Apr 2018 14:43:23 +0300
Subject: [PATCH 12/29] Proguard hotfix

---
 app/proguard-rules.pro | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
index 5b6e2458..c06e027a 100644
--- a/app/proguard-rules.pro
+++ b/app/proguard-rules.pro
@@ -20,9 +20,12 @@
 -dontobfuscate
 
 # OkHttp
+-dontwarn okhttp3.**
 -dontwarn okio.**
--dontwarn javax.annotation.Nullable
--dontwarn javax.annotation.ParametersAreNonnullByDefault
+-dontwarn javax.annotation.**
+-dontwarn org.conscrypt.**
+# A resource is loaded with a relative path so the package of this class must be preserved.
+-keepnames class okhttp3.internal.publicsuffix.PublicSuffixDatabase
 
 # Picasso
 -dontwarn com.squareup.okhttp.**

From 99f6f9a9c1c910478b29bde50578e5e1837f95a3 Mon Sep 17 00:00:00 2001
From: Ezerous <ezerous@gmail.com>
Date: Sat, 21 Apr 2018 14:40:41 +0300
Subject: [PATCH 13/29] Minor auth and activity improvements

---
 app/src/main/AndroidManifest.xml              |  2 +-
 .../mthmmy/activities/LoginActivity.java      |  6 ++++
 .../thmmy/mthmmy/session/SessionManager.java  | 34 +++++++++++++------
 3 files changed, 30 insertions(+), 12 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 118026f0..bf5256cd 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -61,7 +61,7 @@
             android:windowSoftInputMode="adjustPan" />
         <activity
             android:name=".activities.AboutActivity"
-            android:launchMode="singleInstance"
+            android:launchMode="singleTop"
             android:parentActivityName=".activities.main.MainActivity"
             android:theme="@style/AppTheme.NoActionBar">
             <meta-data
diff --git a/app/src/main/java/gr/thmmy/mthmmy/activities/LoginActivity.java b/app/src/main/java/gr/thmmy/mthmmy/activities/LoginActivity.java
index 89a1d8f8..6f632f97 100644
--- a/app/src/main/java/gr/thmmy/mthmmy/activities/LoginActivity.java
+++ b/app/src/main/java/gr/thmmy/mthmmy/activities/LoginActivity.java
@@ -16,6 +16,7 @@ import gr.thmmy.mthmmy.activities.main.MainActivity;
 import gr.thmmy.mthmmy.base.BaseActivity;
 import timber.log.Timber;
 
+import static gr.thmmy.mthmmy.session.SessionManager.BANNED_USER;
 import static gr.thmmy.mthmmy.session.SessionManager.CONNECTION_ERROR;
 import static gr.thmmy.mthmmy.session.SessionManager.EXCEPTION;
 import static gr.thmmy.mthmmy.session.SessionManager.FAILURE;
@@ -175,6 +176,11 @@ public class LoginActivity extends BaseActivity {
                             "Wrong password!", Toast.LENGTH_LONG).show();
                     inputPassword.requestFocus();
                     break;
+                case BANNED_USER:
+                    Toast.makeText(getApplicationContext(),
+                            "You are banned!", Toast.LENGTH_LONG).show();
+                    inputPassword.requestFocus();
+                    break;
                 case FAILURE:
                     Toast.makeText(getApplicationContext(),
                             "Login failed...", Toast.LENGTH_LONG).show();
diff --git a/app/src/main/java/gr/thmmy/mthmmy/session/SessionManager.java b/app/src/main/java/gr/thmmy/mthmmy/session/SessionManager.java
index 961b998d..8d534293 100644
--- a/app/src/main/java/gr/thmmy/mthmmy/session/SessionManager.java
+++ b/app/src/main/java/gr/thmmy/mthmmy/session/SessionManager.java
@@ -47,6 +47,7 @@ public class SessionManager {
     public static final int CANCELLED = 4;
     public static final int CONNECTION_ERROR = 5;
     public static final int EXCEPTION = 6;
+    public static final int BANNED_USER = 7;
 
     // Client & Cookies
     private final OkHttpClient client;
@@ -114,8 +115,8 @@ public class SessionManager {
                 setPersistentCookieSession();   //Store cookies
 
                 //Edit SharedPreferences, save session's data
+                setLoginScreenAsDefault(false);
                 sharedPrefs.edit().putBoolean(LOGGED_IN, true).apply();
-                sharedPrefs.edit().putBoolean(LOGIN_SCREEN_AS_DEFAULT, false).apply();
                 sharedPrefs.edit().putString(USERNAME, extractUserName(document)).apply();
                 String avatar = extractAvatarLink(document);
                 if (avatar != null) {
@@ -133,17 +134,23 @@ public class SessionManager {
 
                 //Investigate login failure
                 Elements error = document.select("b:contains(That username does not exist.)");
-                if (error.size() == 1) { //Wrong username
+                if (error.size() > 0) { //Wrong username
                     Timber.i("Wrong Username");
                     return WRONG_USER;
                 }
 
                 error = document.select("body:contains(Password incorrect)");
-                if (error.size() == 1) { //Wrong password
+                if (error.size() > 0) { //Wrong password
                     Timber.i("Wrong Password");
                     return WRONG_PASSWORD;
                 }
 
+                error = document.select("body:contains(you are banned from using this forum!),body:contains(έχετε αποκλειστεί από αυτή τη δημόσια συζήτηση!)");
+                if (error.size() > 0) { //User is banned
+                    Timber.i("User is banned");
+                    return BANNED_USER;
+                }
+
                 //Other error e.g. session was reset server-side
                 clearSessionData(); //Clear invalid saved data
                 return FAILURE;
@@ -180,7 +187,7 @@ public class SessionManager {
         } else if (isLoginScreenDefault())
             return;
 
-        sharedPrefs.edit().putBoolean(LOGIN_SCREEN_AS_DEFAULT, true).apply();
+        setLoginScreenAsDefault(true);
         clearSessionData();
     }
 
@@ -190,7 +197,7 @@ public class SessionManager {
     public void guestLogin() {
         Timber.i("Continuing as a guest, as chosen by the user.");
         clearSessionData();
-        sharedPrefs.edit().putBoolean(LOGIN_SCREEN_AS_DEFAULT, false).apply();
+        setLoginScreenAsDefault(false);
     }
 
 
@@ -219,7 +226,7 @@ public class SessionManager {
                 return FAILURE;
             }
         } catch (IOException e) {
-            Timber.w("Logout IOException", e);
+            Timber.w(e, "Logout IOException");
             return CONNECTION_ERROR;
         } catch (Exception e) {
             Timber.e(e, "Logout Exception");
@@ -253,16 +260,17 @@ public class SessionManager {
         return sharedPrefs.getBoolean(LOGIN_SCREEN_AS_DEFAULT, true);
     }
 
-    public String getCookieHeader() {
-        return cookiePersistor.loadAll().get(0).toString();
-    }
-
     //--------------------------------------GETTERS END---------------------------------------------
 
     //------------------------------------OTHER FUNCTIONS-------------------------------------------
     private boolean validateRetrievedCookies() {
         List<Cookie> cookieList = cookieJar.loadForRequest(indexUrl);
-        return (cookieList.size() == 2) && (cookieList.get(0).name().equals("THMMYgrC00ki3")) && (cookieList.get(1).name().equals("PHPSESSID"));
+        for(Cookie cookie: cookieList)
+        {
+            if(cookie.name().equals("THMMYgrC00ki3"))
+                return true;
+        }
+        return false;
     }
 
     // Call validateRetrievedCookies() first
@@ -288,6 +296,10 @@ public class SessionManager {
         Timber.i("Session data cleared.");
     }
 
+    private void setLoginScreenAsDefault(boolean b){
+        sharedPrefs.edit().putBoolean(LOGIN_SCREEN_AS_DEFAULT, b).apply();
+    }
+
     @NonNull
     private String extractUserName(@NonNull Document doc) {
         //Scribbles2 Theme

From c3a8086edaa8d4cbd5f586828ba2709444aa3553 Mon Sep 17 00:00:00 2001
From: Ezerous <ezerous@gmail.com>
Date: Mon, 14 May 2018 11:11:17 +0300
Subject: [PATCH 14/29] Notifications init

---
 app/build.gradle                              |  9 +--
 app/src/main/AndroidManifest.xml              |  7 ++
 .../mthmmy/activities/BookmarkActivity.java   | 10 ++-
 .../mthmmy/services/FirebaseService.java      | 72 +++++++++++++++++++
 .../main/res/drawable/ic_notification_off.xml |  9 +++
 .../main/res/drawable/ic_notification_on.xml  |  5 ++
 ...ow.xml => activity_bookmark_board_row.xml} |  4 +-
 .../layout/activity_bookmark_topic_row.xml    | 42 +++++++++++
 app/src/main/res/values/strings.xml           |  1 +
 build.gradle                                  |  4 +-
 10 files changed, 153 insertions(+), 10 deletions(-)
 create mode 100644 app/src/main/java/gr/thmmy/mthmmy/services/FirebaseService.java
 create mode 100644 app/src/main/res/drawable/ic_notification_off.xml
 create mode 100644 app/src/main/res/drawable/ic_notification_on.xml
 rename app/src/main/res/layout/{activity_bookmark_row.xml => activity_bookmark_board_row.xml} (87%)
 create mode 100644 app/src/main/res/layout/activity_bookmark_topic_row.xml

diff --git a/app/build.gradle b/app/build.gradle
index 7faa0dd0..83430d97 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,6 +1,6 @@
 apply plugin: 'com.android.application'
 
-if (buildInRelease()){
+if (buildInRelease()) {
     apply plugin: 'io.fabric'
 }
 
@@ -37,8 +37,9 @@ dependencies {
     implementation 'com.android.support:support-v4:27.1.1'
     implementation 'com.android.support:cardview-v7:27.1.1'
     implementation 'com.android.support:recyclerview-v7:27.1.1'
-    implementation 'com.google.firebase:firebase-core:15.0.0'
-    implementation 'com.crashlytics.sdk.android:crashlytics:2.9.1'
+    implementation 'com.google.firebase:firebase-core:15.0.2'
+    implementation 'com.google.firebase:firebase-messaging:15.0.2'
+    implementation 'com.crashlytics.sdk.android:crashlytics:2.9.2'
     implementation 'com.squareup.okhttp3:okhttp:3.10.0'
     implementation 'com.squareup.picasso:picasso:2.5.2'
     implementation 'com.jakewharton.picasso:picasso2-okhttp3-downloader:1.1.0'
@@ -56,7 +57,7 @@ dependencies {
     implementation 'com.jakewharton.timber:timber:4.7.0'
 }
 
-if (buildInRelease()){
+if (buildInRelease()) {
     apply plugin: 'com.google.gms.google-services'
 }
 
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index bf5256cd..49b5d305 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -119,6 +119,13 @@
         <service
             android:name=".services.DownloadService"
             android:exported="false" />
+        <service
+            android:name=".services.FirebaseService"
+            android:exported="false">
+            <intent-filter>
+                <action android:name="com.google.firebase.MESSAGING_EVENT"/>
+            </intent-filter>
+        </service>
 
         <receiver
             android:name=".receiver.Receiver"
diff --git a/app/src/main/java/gr/thmmy/mthmmy/activities/BookmarkActivity.java b/app/src/main/java/gr/thmmy/mthmmy/activities/BookmarkActivity.java
index ddc076ff..45220494 100644
--- a/app/src/main/java/gr/thmmy/mthmmy/activities/BookmarkActivity.java
+++ b/app/src/main/java/gr/thmmy/mthmmy/activities/BookmarkActivity.java
@@ -67,7 +67,7 @@ public class BookmarkActivity extends BaseActivity {
             for (final Bookmark bookmarkedBoard : getBoardsBookmarked()) {
                 if (bookmarkedBoard != null && bookmarkedBoard.getTitle() != null) {
                     final LinearLayout row = (LinearLayout) layoutInflater.inflate(
-                            R.layout.activity_bookmark_row, bookmarksLinearView, false);
+                            R.layout.activity_bookmark_board_row, bookmarksLinearView, false);
                     row.setOnClickListener(new View.OnClickListener() {
                         @Override
                         public void onClick(View view) {
@@ -116,7 +116,7 @@ public class BookmarkActivity extends BaseActivity {
             for (final Bookmark bookmarkedTopic : getTopicsBookmarked()) {
                 if (bookmarkedTopic != null && bookmarkedTopic.getTitle() != null) {
                     final LinearLayout row = (LinearLayout) layoutInflater.inflate(
-                            R.layout.activity_bookmark_row, bookmarksLinearView, false);
+                            R.layout.activity_bookmark_topic_row, bookmarksLinearView, false);
                     row.setOnClickListener(new View.OnClickListener() {
                         @Override
                         public void onClick(View view) {
@@ -131,6 +131,12 @@ public class BookmarkActivity extends BaseActivity {
                         }
                     });
                     ((TextView) row.findViewById(R.id.bookmark_title)).setText(bookmarkedTopic.getTitle());
+                    (row.findViewById(R.id.toggle_notification)).setOnClickListener(new View.OnClickListener() {
+                        @Override
+                        public void onClick(View view) {
+                           //TODO
+                        }
+                    });
                     (row.findViewById(R.id.remove_bookmark)).setOnClickListener(new View.OnClickListener() {
                         @Override
                         public void onClick(View view) {
diff --git a/app/src/main/java/gr/thmmy/mthmmy/services/FirebaseService.java b/app/src/main/java/gr/thmmy/mthmmy/services/FirebaseService.java
new file mode 100644
index 00000000..9e4549a3
--- /dev/null
+++ b/app/src/main/java/gr/thmmy/mthmmy/services/FirebaseService.java
@@ -0,0 +1,72 @@
+package gr.thmmy.mthmmy.services;
+
+import android.app.NotificationChannel;
+import android.app.NotificationManager;
+import android.app.PendingIntent;
+import android.content.Context;
+import android.content.Intent;
+import android.media.RingtoneManager;
+import android.net.Uri;
+import android.os.Build;
+import android.support.v4.app.NotificationCompat;
+
+import com.google.firebase.messaging.FirebaseMessagingService;
+import com.google.firebase.messaging.RemoteMessage;
+
+import gr.thmmy.mthmmy.R;
+import gr.thmmy.mthmmy.activities.topic.TopicActivity;
+import timber.log.Timber;
+
+
+public class FirebaseService extends FirebaseMessagingService {
+
+    @Override
+    public void onMessageReceived(RemoteMessage remoteMessage) {
+        super.onMessageReceived(remoteMessage);
+        if (remoteMessage.getData().size() > 0) {
+
+            Timber.i("msg%s", remoteMessage.getData());
+            sendNotification("stuff");
+
+        }
+
+
+    }
+
+    /**
+     * Create and show a simple notification containing the received FCM message.
+     */
+    private void sendNotification(String message) {
+        Intent intent = new Intent(this, TopicActivity.class);
+        intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
+        PendingIntent pendingIntent = PendingIntent.getActivity(this, 0 /* Request code */, intent,
+                PendingIntent.FLAG_ONE_SHOT);
+
+        String channelId = "ASdf"; //getString(R.string.default_notification_channel_id);
+        Uri defaultSoundUri= RingtoneManager.getDefaultUri(RingtoneManager.TYPE_NOTIFICATION);
+        NotificationCompat.Builder notificationBuilder =
+                new NotificationCompat.Builder(this, channelId)
+                        .setSmallIcon(R.mipmap.ic_launcher)
+                        .setContentTitle("FCM Message")
+                        .setContentText(message)
+                        .setAutoCancel(true)
+                        .setSound(defaultSoundUri)
+                        .setContentIntent(pendingIntent);
+
+        NotificationManager notificationManager =
+                (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE);
+
+        // Since android Oreo notification channel is needed.
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            NotificationChannel channel = new NotificationChannel("Posts",
+                    "New Posts",
+                    NotificationManager.IMPORTANCE_DEFAULT);
+
+                notificationManager.createNotificationChannel(channel);
+
+        }
+
+
+            notificationManager.notify(0, notificationBuilder.build());
+    }
+}
diff --git a/app/src/main/res/drawable/ic_notification_off.xml b/app/src/main/res/drawable/ic_notification_off.xml
new file mode 100644
index 00000000..7588f1e2
--- /dev/null
+++ b/app/src/main/res/drawable/ic_notification_off.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#26A69A"
+        android:pathData="M12,22c1.1,0 2,-0.9 2,-2h-4c0,1.1 0.9,2 2,2zM18,16v-5c0,-3.07 -1.63,-5.64 -4.5,-6.32L13.5,4c0,-0.83 -0.67,-1.5 -1.5,-1.5s-1.5,0.67 -1.5,1.5v0.68C7.64,5.36 6,7.92 6,11v5l-2,2v1h16v-1l-2,-2zM16,17L8,17v-6c0,-2.48 1.51,-4.5 4,-4.5s4,2.02 4,4.5v6z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_notification_on.xml b/app/src/main/res/drawable/ic_notification_on.xml
new file mode 100644
index 00000000..948bbac1
--- /dev/null
+++ b/app/src/main/res/drawable/ic_notification_on.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp"
+    android:viewportHeight="24.0" android:viewportWidth="24.0"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#26A69A" android:pathData="M7.58,4.08L6.15,2.65C3.75,4.48 2.17,7.3 2.03,10.5h2c0.15,-2.65 1.51,-4.97 3.55,-6.42zM19.97,10.5h2c-0.15,-3.2 -1.73,-6.02 -4.12,-7.85l-1.42,1.43c2.02,1.45 3.39,3.77 3.54,6.42zM18,11c0,-3.07 -1.64,-5.64 -4.5,-6.32L13.5,4c0,-0.83 -0.67,-1.5 -1.5,-1.5s-1.5,0.67 -1.5,1.5v0.68C7.63,5.36 6,7.92 6,11v5l-2,2v1h16v-1l-2,-2v-5zM12,22c0.14,0 0.27,-0.01 0.4,-0.04 0.65,-0.14 1.18,-0.58 1.44,-1.18 0.1,-0.24 0.15,-0.5 0.15,-0.78h-4c0.01,1.1 0.9,2 2.01,2z"/>
+</vector>
diff --git a/app/src/main/res/layout/activity_bookmark_row.xml b/app/src/main/res/layout/activity_bookmark_board_row.xml
similarity index 87%
rename from app/src/main/res/layout/activity_bookmark_row.xml
rename to app/src/main/res/layout/activity_bookmark_board_row.xml
index a5245a79..7d2632a2 100644
--- a/app/src/main/res/layout/activity_bookmark_row.xml
+++ b/app/src/main/res/layout/activity_bookmark_board_row.xml
@@ -4,7 +4,7 @@
     android:id="@+id/bookmark_row"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="?attr/selectableItemBackground"
+    android:background="?android:attr/selectableItemBackground"
     android:clickable="true"
     android:focusable="true"
     android:gravity="center_vertical"
@@ -27,7 +27,7 @@
         android:id="@+id/remove_bookmark"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:background="?attr/selectableItemBackground"
+        android:background="?android:attr/selectableItemBackground"
         android:contentDescription="@string/remove_bookmark"
         android:src="@drawable/ic_remove_circle"/>
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_bookmark_topic_row.xml b/app/src/main/res/layout/activity_bookmark_topic_row.xml
new file mode 100644
index 00000000..240268e6
--- /dev/null
+++ b/app/src/main/res/layout/activity_bookmark_topic_row.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/bookmark_row"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="?android:attr/selectableItemBackground"
+    android:clickable="true"
+    android:focusable="true"
+    android:gravity="center_vertical"
+    android:orientation="horizontal"
+    android:paddingBottom="6dp"
+    android:paddingEnd="16dp"
+    android:paddingStart="16dp"
+    android:paddingTop="6dp">
+
+    <TextView
+        android:id="@+id/bookmark_title"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_weight="1"
+        android:paddingBottom="2dp"
+        android:textColor="@color/primary_text"
+        android:textSize="18sp"/>
+
+    <ImageButton
+        android:id="@+id/toggle_notification"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:background="?android:attr/selectableItemBackground"
+        android:contentDescription="@string/toggle_notification"
+        app:srcCompat="@drawable/ic_notification_off"/>
+
+    <ImageButton
+        android:id="@+id/remove_bookmark"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:background="?android:attr/selectableItemBackground"
+        android:contentDescription="@string/remove_bookmark"
+        android:src="@drawable/ic_remove_circle"/>
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 73a8c8e4..1d63348c 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -90,4 +90,5 @@
     <string name="fa_sticky">&#xf249;</string>
     <string name="fa_folder">&#xf07b;</string>
     <string name="fa_circle">&#xf111;</string>
+    <string name="toggle_notification">Toggle Notification</string>
 </resources>
diff --git a/build.gradle b/build.gradle
index c9e5f745..731a4e70 100644
--- a/build.gradle
+++ b/build.gradle
@@ -9,8 +9,8 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.1.1'
-        classpath 'com.google.gms:google-services:3.2.0'
+        classpath 'com.android.tools.build:gradle:3.1.2'
+        classpath 'com.google.gms:google-services:3.3.0'
         classpath 'io.fabric.tools:gradle:1.25.1'
     }
 }

From ca2c571f300ba31e43642ad00bee2b446ae3f8ec Mon Sep 17 00:00:00 2001
From: Apostolof <apotwohd@gmail.com>
Date: Mon, 14 May 2018 14:29:11 +0300
Subject: [PATCH 15/29] Add sync option to topic bookmarks

---
 .../mthmmy/activities/BookmarkActivity.java   | 35 +++++++++++++++++--
 .../activities/board/BoardActivity.java       |  4 +--
 .../activities/topic/TopicActivity.java       |  4 +--
 .../gr/thmmy/mthmmy/base/BaseActivity.java    | 16 +++++++--
 .../java/gr/thmmy/mthmmy/model/Bookmark.java  | 19 +++++++---
 .../layout/activity_bookmark_topic_row.xml    |  2 +-
 6 files changed, 67 insertions(+), 13 deletions(-)

diff --git a/app/src/main/java/gr/thmmy/mthmmy/activities/BookmarkActivity.java b/app/src/main/java/gr/thmmy/mthmmy/activities/BookmarkActivity.java
index 45220494..4c4614ef 100644
--- a/app/src/main/java/gr/thmmy/mthmmy/activities/BookmarkActivity.java
+++ b/app/src/main/java/gr/thmmy/mthmmy/activities/BookmarkActivity.java
@@ -2,12 +2,16 @@ package gr.thmmy.mthmmy.activities;
 
 import android.content.Intent;
 import android.graphics.Typeface;
+import android.graphics.drawable.Drawable;
 import android.os.Build;
 import android.os.Bundle;
+import android.support.graphics.drawable.VectorDrawableCompat;
 import android.view.LayoutInflater;
 import android.view.View;
+import android.widget.ImageButton;
 import android.widget.LinearLayout;
 import android.widget.TextView;
+import android.widget.Toast;
 
 import gr.thmmy.mthmmy.R;
 import gr.thmmy.mthmmy.activities.board.BoardActivity;
@@ -27,6 +31,9 @@ public class BookmarkActivity extends BaseActivity {
     private TextView boardsTitle;
     private TextView topicsTitle;
 
+    private static Drawable notificationsEnabledButtonImage;
+    private static Drawable notificationsDisabledButtonImage;
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -44,6 +51,18 @@ public class BookmarkActivity extends BaseActivity {
         createDrawer();
         drawer.setSelection(BOOKMARKS_ID);
 
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+            notificationsEnabledButtonImage = getResources().getDrawable(R.drawable.ic_notification_on, null);
+        } else {
+            notificationsEnabledButtonImage = VectorDrawableCompat.create(getResources(), R.drawable.ic_notification_on, null);
+        }
+
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+            notificationsDisabledButtonImage = getResources().getDrawable(R.drawable.ic_notification_off, null);
+        } else {
+            notificationsDisabledButtonImage = VectorDrawableCompat.create(getResources(), R.drawable.ic_notification_off, null);
+        }
+
         LinearLayout bookmarksLinearView = findViewById(R.id.bookmarks_container);
         LayoutInflater layoutInflater = getLayoutInflater();
 
@@ -131,10 +150,21 @@ public class BookmarkActivity extends BaseActivity {
                         }
                     });
                     ((TextView) row.findViewById(R.id.bookmark_title)).setText(bookmarkedTopic.getTitle());
-                    (row.findViewById(R.id.toggle_notification)).setOnClickListener(new View.OnClickListener() {
+
+                    final ImageButton notificationsEnabledButton = row.findViewById(R.id.toggle_notification);
+                    if (!bookmarkedTopic.isNotificationsEnabled()){
+                        notificationsEnabledButton.setImageDrawable(notificationsDisabledButtonImage);
+                    }
+
+                    notificationsEnabledButton.setOnClickListener(new View.OnClickListener() {
+
                         @Override
                         public void onClick(View view) {
-                           //TODO
+                            if(toggleNotification(bookmarkedTopic)){
+                                notificationsEnabledButton.setImageDrawable(notificationsEnabledButtonImage);
+                            } else {
+                                notificationsEnabledButton.setImageDrawable(notificationsDisabledButtonImage);
+                            }
                         }
                     });
                     (row.findViewById(R.id.remove_bookmark)).setOnClickListener(new View.OnClickListener() {
@@ -142,6 +172,7 @@ public class BookmarkActivity extends BaseActivity {
                         public void onClick(View view) {
                             removeBookmark(bookmarkedTopic);
                             row.setVisibility(View.GONE);
+                            Toast.makeText(BookmarkActivity.this, "Bookmark removed", Toast.LENGTH_SHORT).show();
                             updateTitles();
                         }
                     });
diff --git a/app/src/main/java/gr/thmmy/mthmmy/activities/board/BoardActivity.java b/app/src/main/java/gr/thmmy/mthmmy/activities/board/BoardActivity.java
index 742a73b3..1733986f 100644
--- a/app/src/main/java/gr/thmmy/mthmmy/activities/board/BoardActivity.java
+++ b/app/src/main/java/gr/thmmy/mthmmy/activities/board/BoardActivity.java
@@ -89,7 +89,7 @@ public class BoardActivity extends BaseActivity implements BoardAdapter.OnLoadMo
             getSupportActionBar().setDisplayShowHomeEnabled(true);
         }
 
-        thisPageBookmark = new Bookmark(boardTitle, ThmmyPage.getBoardId(boardUrl));
+        thisPageBookmark = new Bookmark(boardTitle, ThmmyPage.getBoardId(boardUrl), false);
         setBoardBookmark((ImageButton) findViewById(R.id.bookmark));
         createDrawer();
 
@@ -304,7 +304,7 @@ public class BoardActivity extends BaseActivity implements BoardAdapter.OnLoadMo
                     || !Objects.equals(boardTitle, parsedTitle)) {
                 boardTitle = parsedTitle;
                 toolbar.setTitle(boardTitle);
-                thisPageBookmark = new Bookmark(boardTitle, ThmmyPage.getBoardId(boardUrl));
+                thisPageBookmark = new Bookmark(boardTitle, ThmmyPage.getBoardId(boardUrl), false);
             }
 
             //Parse was successful
diff --git a/app/src/main/java/gr/thmmy/mthmmy/activities/topic/TopicActivity.java b/app/src/main/java/gr/thmmy/mthmmy/activities/topic/TopicActivity.java
index 25cab734..936335be 100644
--- a/app/src/main/java/gr/thmmy/mthmmy/activities/topic/TopicActivity.java
+++ b/app/src/main/java/gr/thmmy/mthmmy/activities/topic/TopicActivity.java
@@ -204,7 +204,7 @@ public class TopicActivity extends BaseActivity {
             finish();
         }
 
-        thisPageBookmark = new Bookmark(topicTitle, ThmmyPage.getTopicId(topicPageUrl));
+        thisPageBookmark = new Bookmark(topicTitle, ThmmyPage.getTopicId(topicPageUrl), true);
 
         //Initializes graphics
         toolbar = findViewById(R.id.toolbar);
@@ -631,7 +631,7 @@ public class TopicActivity extends BaseActivity {
                             || !Objects.equals(topicTitle, parsedTitle)) {
                         toolbarTitle.setText(parsedTitle);
                         topicTitle = parsedTitle;
-                        thisPageBookmark = new Bookmark(parsedTitle, ThmmyPage.getTopicId(loadedPageUrl));
+                        thisPageBookmark = new Bookmark(parsedTitle, ThmmyPage.getTopicId(loadedPageUrl), true);
                         invalidateOptionsMenu();
                     }
 
diff --git a/app/src/main/java/gr/thmmy/mthmmy/base/BaseActivity.java b/app/src/main/java/gr/thmmy/mthmmy/base/BaseActivity.java
index 559b297a..8d41f026 100644
--- a/app/src/main/java/gr/thmmy/mthmmy/base/BaseActivity.java
+++ b/app/src/main/java/gr/thmmy/mthmmy/base/BaseActivity.java
@@ -514,7 +514,7 @@ public abstract class BaseActivity extends AppCompatActivity {
         if (boardsBookmarked == null) return;
         if (bookmark.matchExists(boardsBookmarked)) {
             boardsBookmarked.remove(bookmark.findIndex(boardsBookmarked));
-        } else boardsBookmarked.add(new Bookmark(bookmark.getTitle(), bookmark.getId()));
+        } else boardsBookmarked.add(new Bookmark(bookmark.getTitle(), bookmark.getId(), false));
         updateBoardBookmarks();
     }
 
@@ -523,7 +523,7 @@ public abstract class BaseActivity extends AppCompatActivity {
         if (bookmark.matchExists(topicsBookmarked)) {
             topicsBookmarked.remove(bookmark.findIndex(topicsBookmarked));
         } else {
-            topicsBookmarked.add(new Bookmark(bookmark.getTitle(), bookmark.getId()));
+            topicsBookmarked.add(new Bookmark(bookmark.getTitle(), bookmark.getId(), true));
         }
         updateTopicBookmarks();
     }
@@ -546,6 +546,18 @@ public abstract class BaseActivity extends AppCompatActivity {
         if (bookmark.matchExists(boardsBookmarked)) toggleBoardToBookmarks(bookmark);
         else if (bookmark.matchExists(topicsBookmarked)) toggleTopicToBookmarks(bookmark);
     }
+
+    protected boolean toggleNotification(Bookmark bookmark){
+        if (bookmark.matchExists(topicsBookmarked)){
+            topicsBookmarked.get(bookmark.findIndex(topicsBookmarked)).toggleNotificationsEnabled();
+            updateTopicBookmarks();
+
+            //TODO toggle firebase here!
+
+            return topicsBookmarked.get(bookmark.findIndex(topicsBookmarked)).isNotificationsEnabled();
+        }
+        return false;
+    }
 //-------------------------------------------BOOKMARKS END------------------------------------------
 
     //-------PERMS---------
diff --git a/app/src/main/java/gr/thmmy/mthmmy/model/Bookmark.java b/app/src/main/java/gr/thmmy/mthmmy/model/Bookmark.java
index e9753046..9e2aae95 100644
--- a/app/src/main/java/gr/thmmy/mthmmy/model/Bookmark.java
+++ b/app/src/main/java/gr/thmmy/mthmmy/model/Bookmark.java
@@ -8,10 +8,12 @@ import java.util.Objects;
 
 public class Bookmark implements java.io.Serializable {
     private final String title, id;
+    private boolean isNotificationsEnabled;
 
-    public Bookmark(String title, String id) {
+    public Bookmark(String title, String id, boolean isNotificationsEnabled) {
         this.title = title;
         this.id = id;
+        this.isNotificationsEnabled = isNotificationsEnabled;
     }
 
     public String getTitle() {
@@ -22,6 +24,14 @@ public class Bookmark implements java.io.Serializable {
         return id;
     }
 
+    public boolean isNotificationsEnabled() {
+        return isNotificationsEnabled;
+    }
+
+    public void toggleNotificationsEnabled(){
+        this.isNotificationsEnabled = !this.isNotificationsEnabled;
+    }
+
     public boolean matchExists(ArrayList<Bookmark> array) {
         if (array != null && !array.isEmpty()) {
             for (Bookmark bookmark : array) {
@@ -52,7 +62,8 @@ public class Bookmark implements java.io.Serializable {
         for (Bookmark bookmark : arrayList) {
             if (bookmark != null) {
                 returnString += (bookmark.getId() + "\t");
-                returnString += (bookmark.getTitle() + "\n");
+                returnString += (bookmark.getTitle() + "\t");
+                returnString += (bookmark.isNotificationsEnabled() + "\n");
             }
         }
         if (!Objects.equals(returnString, "")) return returnString;
@@ -65,8 +76,8 @@ public class Bookmark implements java.io.Serializable {
         for (String line : lines) {
             if (line == null || line.isEmpty() || Objects.equals(line, "")) break;
             String[] parameters = line.split("\t");
-            if (parameters.length != 2) break;
-            returnArray.add(new Bookmark(parameters[1], parameters[0]));
+            if (parameters.length != 3) break;
+            returnArray.add(new Bookmark(parameters[1], parameters[0], Boolean.parseBoolean(parameters[2])));
         }
         return returnArray;
     }
diff --git a/app/src/main/res/layout/activity_bookmark_topic_row.xml b/app/src/main/res/layout/activity_bookmark_topic_row.xml
index 240268e6..c5b54d6f 100644
--- a/app/src/main/res/layout/activity_bookmark_topic_row.xml
+++ b/app/src/main/res/layout/activity_bookmark_topic_row.xml
@@ -30,7 +30,7 @@
         android:layout_height="wrap_content"
         android:background="?android:attr/selectableItemBackground"
         android:contentDescription="@string/toggle_notification"
-        app:srcCompat="@drawable/ic_notification_off"/>
+        app:srcCompat="@drawable/ic_notification_on"/>
 
     <ImageButton
         android:id="@+id/remove_bookmark"

From f200135d414eac762e69c93cf8b00015796ebe42 Mon Sep 17 00:00:00 2001
From: Ezerous <ezerous@gmail.com>
Date: Mon, 14 May 2018 14:39:31 +0300
Subject: [PATCH 16/29] Notifications improvements

---
 .../thmmy/mthmmy/model/PostNotification.java  | 81 ++++++++++++++++++
 .../mthmmy/services/FirebaseService.java      | 83 +++++++++++++------
 2 files changed, 140 insertions(+), 24 deletions(-)
 create mode 100644 app/src/main/java/gr/thmmy/mthmmy/model/PostNotification.java

diff --git a/app/src/main/java/gr/thmmy/mthmmy/model/PostNotification.java b/app/src/main/java/gr/thmmy/mthmmy/model/PostNotification.java
new file mode 100644
index 00000000..42985352
--- /dev/null
+++ b/app/src/main/java/gr/thmmy/mthmmy/model/PostNotification.java
@@ -0,0 +1,81 @@
+package gr.thmmy.mthmmy.model;
+
+/**
+ * Class that defines the model of a post as need in notifications. All member variables are
+ * declared final (thus no setters are supplied). Class has one constructor and getter methods for
+ * all variables.
+ * <p>PostNotification model is described by its post's id, its topic's id & title and by its poster
+ * </p>.
+ */
+public class PostNotification {
+    final int postId;
+    final int topicId;
+    final String topicTitle;
+    final String poster;
+
+    // Suppresses default constructor
+    @SuppressWarnings("unused")
+    PostNotification() {
+        this.postId = -1;
+        this.topicId = -1;
+        this.topicTitle = null;
+        this.poster = null;
+    }
+
+    /**
+     * Constructor specifying all class variables necessary to summarize this post. All variables
+     * are declared final, once assigned they cannot change.
+     *
+     * @param postId         this post's id
+     * @param topicId         this post's topicId
+     * @param topicTitle          this post's topicTitle
+     * @param poster         username of this post's author
+     */
+    public PostNotification(int postId, int topicId, String topicTitle, String poster) {
+        this.postId = postId;
+        this.topicId = topicId;
+        this.topicTitle = topicTitle;
+        this.poster = poster;
+    }
+
+    /**
+     * Gets this post's Id.
+     *
+     * @return this  post's Id
+     */
+    public int getPostId() {
+        return postId;
+    }
+
+    /**
+     * Gets this post's topicId.
+     *
+     * @return this post's topicId
+     */
+    public int getTopicId() {
+        return topicId;
+    }
+
+    /**
+     * Gets this post's topicTitle.
+     *
+     * @return this post's topicTitle
+     */
+    public String getTopicTitle() {
+        return topicTitle;
+    }
+
+    /**
+     * Gets username of this post's author.
+     *
+     * @return username of this post's author
+     */
+    public String getPoster() {
+        return poster;
+    }
+}
+
+
+
+
+
diff --git a/app/src/main/java/gr/thmmy/mthmmy/services/FirebaseService.java b/app/src/main/java/gr/thmmy/mthmmy/services/FirebaseService.java
index 9e4549a3..cc58c02a 100644
--- a/app/src/main/java/gr/thmmy/mthmmy/services/FirebaseService.java
+++ b/app/src/main/java/gr/thmmy/mthmmy/services/FirebaseService.java
@@ -8,65 +8,100 @@ import android.content.Intent;
 import android.media.RingtoneManager;
 import android.net.Uri;
 import android.os.Build;
+import android.os.Bundle;
 import android.support.v4.app.NotificationCompat;
 
 import com.google.firebase.messaging.FirebaseMessagingService;
 import com.google.firebase.messaging.RemoteMessage;
 
+import org.json.JSONException;
+import org.json.JSONObject;
+
 import gr.thmmy.mthmmy.R;
 import gr.thmmy.mthmmy.activities.topic.TopicActivity;
+import gr.thmmy.mthmmy.model.PostNotification;
 import timber.log.Timber;
 
+import static android.support.v4.app.NotificationCompat.PRIORITY_HIGH;
+import static gr.thmmy.mthmmy.activities.topic.TopicActivity.BUNDLE_TOPIC_TITLE;
+import static gr.thmmy.mthmmy.activities.topic.TopicActivity.BUNDLE_TOPIC_URL;
 
 public class FirebaseService extends FirebaseMessagingService {
-
     @Override
     public void onMessageReceived(RemoteMessage remoteMessage) {
         super.onMessageReceived(remoteMessage);
         if (remoteMessage.getData().size() > 0) {
-
-            Timber.i("msg%s", remoteMessage.getData());
-            sendNotification("stuff");
-
+            JSONObject json = new JSONObject(remoteMessage.getData());
+            try {
+                int topicId = Integer.parseInt(json.getString("topicId"));
+                int postId = Integer.parseInt(json.getString("postId"));
+                String topicTitle = json.getString("topicTitle");
+                String poster = json.getString("poster");
+                sendNotification(new PostNotification(postId, topicId, topicTitle, poster));
+
+            } catch (JSONException e) {
+                Timber.e(e, "JSON Exception");
+            }
         }
-
-
     }
 
+    private static final String CHANNEL_ID = "Posts";
+    private static final String GROUP_KEY = "PostsGroup";
+    private static int requestCode = 0;
+
     /**
-     * Create and show a simple notification containing the received FCM message.
+     * Create and show a new post notification.
      */
-    private void sendNotification(String message) {
+    private void sendNotification(PostNotification postNotification) {
+        String topicUrl = "https://www.thmmy.gr/smf/index.php?topic=" + postNotification.getTopicId() + "." + postNotification.getPostId();
         Intent intent = new Intent(this, TopicActivity.class);
+        Bundle extras = new Bundle();
+        extras.putString(BUNDLE_TOPIC_URL, topicUrl);
+        extras.putString(BUNDLE_TOPIC_TITLE, postNotification.getTopicTitle());
+        intent.putExtras(extras);
         intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
-        PendingIntent pendingIntent = PendingIntent.getActivity(this, 0 /* Request code */, intent,
+        PendingIntent pendingIntent = PendingIntent.getActivity(this, requestCode++, intent,
                 PendingIntent.FLAG_ONE_SHOT);
 
-        String channelId = "ASdf"; //getString(R.string.default_notification_channel_id);
         Uri defaultSoundUri= RingtoneManager.getDefaultUri(RingtoneManager.TYPE_NOTIFICATION);
         NotificationCompat.Builder notificationBuilder =
-                new NotificationCompat.Builder(this, channelId)
+                new NotificationCompat.Builder(this, CHANNEL_ID)
                         .setSmallIcon(R.mipmap.ic_launcher)
-                        .setContentTitle("FCM Message")
-                        .setContentText(message)
+                        .setContentTitle(postNotification.getTopicTitle())
+                        .setContentText("by " + postNotification.getPoster())
                         .setAutoCancel(true)
                         .setSound(defaultSoundUri)
                         .setContentIntent(pendingIntent);
 
-        NotificationManager notificationManager =
-                (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE);
+        if (Build.VERSION.SDK_INT < 26) notificationBuilder.setPriority(PRIORITY_HIGH);
+
+        NotificationCompat.Builder summaryNotificationBuilder = null;
+        if (Build.VERSION.SDK_INT >= 21) {
+            notificationBuilder.setVibrate(new long[0]);
+            notificationBuilder.setGroup(GROUP_KEY);
+
+            summaryNotificationBuilder =
+                    new NotificationCompat.Builder(this, CHANNEL_ID)
+                            .setSmallIcon(R.mipmap.ic_launcher)
+                            .setGroupSummary(true)
+                            .setGroup(GROUP_KEY)
+                            .setStyle(new NotificationCompat.InboxStyle()
+                                    .setSummaryText("New Posts"))
+                            .setSound(defaultSoundUri)
+                            .setContentIntent(pendingIntent);
+        }
+
 
-        // Since android Oreo notification channel is needed.
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-            NotificationChannel channel = new NotificationChannel("Posts",
-                    "New Posts",
-                    NotificationManager.IMPORTANCE_DEFAULT);
 
-                notificationManager.createNotificationChannel(channel);
+        NotificationManager notificationManager = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE);
 
+        // Since android Oreo notification channel is needed.
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            NotificationChannel channel = new NotificationChannel(CHANNEL_ID, "Topic Updates", NotificationManager.IMPORTANCE_HIGH);
+            notificationManager.createNotificationChannel(channel);
         }
 
 
-            notificationManager.notify(0, notificationBuilder.build());
-    }
+        notificationManager.notify(postNotification.getTopicId(), notificationBuilder.build());
+        if (Build.VERSION.SDK_INT >= 21) notificationManager.notify(0, summaryNotificationBuilder.build());}
 }

From e804ce30ebd86ae19f7c7265ad7a5c3ed444be6b Mon Sep 17 00:00:00 2001
From: Apostolof <apotwohd@gmail.com>
Date: Mon, 14 May 2018 14:44:17 +0300
Subject: [PATCH 17/29] Add connection to notifications system backend

---
 app/src/main/java/gr/thmmy/mthmmy/base/BaseActivity.java | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/gr/thmmy/mthmmy/base/BaseActivity.java b/app/src/main/java/gr/thmmy/mthmmy/base/BaseActivity.java
index 8d41f026..ca50672c 100644
--- a/app/src/main/java/gr/thmmy/mthmmy/base/BaseActivity.java
+++ b/app/src/main/java/gr/thmmy/mthmmy/base/BaseActivity.java
@@ -19,6 +19,7 @@ import android.view.View;
 import android.widget.ImageButton;
 import android.widget.Toast;
 
+import com.google.firebase.messaging.FirebaseMessaging;
 import com.mikepenz.fontawesome_typeface_library.FontAwesome;
 import com.mikepenz.google_material_typeface_library.GoogleMaterial;
 import com.mikepenz.iconics.IconicsDrawable;
@@ -522,8 +523,10 @@ public abstract class BaseActivity extends AppCompatActivity {
         if (topicsBookmarked == null) return;
         if (bookmark.matchExists(topicsBookmarked)) {
             topicsBookmarked.remove(bookmark.findIndex(topicsBookmarked));
+            FirebaseMessaging.getInstance().unsubscribeFromTopic(bookmark.getId());
         } else {
             topicsBookmarked.add(new Bookmark(bookmark.getTitle(), bookmark.getId(), true));
+            FirebaseMessaging.getInstance().subscribeToTopic(bookmark.getId());
         }
         updateTopicBookmarks();
     }
@@ -552,7 +555,11 @@ public abstract class BaseActivity extends AppCompatActivity {
             topicsBookmarked.get(bookmark.findIndex(topicsBookmarked)).toggleNotificationsEnabled();
             updateTopicBookmarks();
 
-            //TODO toggle firebase here!
+            if (topicsBookmarked.get(bookmark.findIndex(topicsBookmarked)).isNotificationsEnabled()){
+                FirebaseMessaging.getInstance().subscribeToTopic(bookmark.getId());
+            } else {
+                FirebaseMessaging.getInstance().unsubscribeFromTopic(bookmark.getId());
+            }
 
             return topicsBookmarked.get(bookmark.findIndex(topicsBookmarked)).isNotificationsEnabled();
         }

From 79c30bbb47af8a420449e3a067c9bcde30139488 Mon Sep 17 00:00:00 2001
From: Ezerous <ezerous@gmail.com>
Date: Mon, 14 May 2018 15:35:48 +0300
Subject: [PATCH 18/29] TopicActivity onBackPressed hotfix

---
 .../java/gr/thmmy/mthmmy/activities/topic/TopicActivity.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/gr/thmmy/mthmmy/activities/topic/TopicActivity.java b/app/src/main/java/gr/thmmy/mthmmy/activities/topic/TopicActivity.java
index 936335be..0dc6ce6b 100644
--- a/app/src/main/java/gr/thmmy/mthmmy/activities/topic/TopicActivity.java
+++ b/app/src/main/java/gr/thmmy/mthmmy/activities/topic/TopicActivity.java
@@ -327,7 +327,7 @@ public class TopicActivity extends BaseActivity {
             drawer.closeDrawer();
             return;
         }
-        else if(postsList.get(postsList.size()-1)==null)
+        else if(postsList!=null && postsList.size()>0 && postsList.get(postsList.size()-1)==null)
         {
             postsList.remove(postsList.size() - 1);
             topicAdapter.notifyItemRemoved(postsList.size());

From 31c45128cb1f3af334bca5d24f508c9b33a0ad0c Mon Sep 17 00:00:00 2001
From: Ezerous <ezerous@gmail.com>
Date: Mon, 14 May 2018 18:23:42 +0300
Subject: [PATCH 19/29] Disable notifications if own userID

---
 .../mthmmy/services/FirebaseService.java      | 19 ++++++++----
 .../thmmy/mthmmy/session/SessionManager.java  | 30 +++++++++++++++++--
 .../layout/activity_bookmark_topic_row.xml    |  1 +
 3 files changed, 42 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/gr/thmmy/mthmmy/services/FirebaseService.java b/app/src/main/java/gr/thmmy/mthmmy/services/FirebaseService.java
index cc58c02a..b6fcda79 100644
--- a/app/src/main/java/gr/thmmy/mthmmy/services/FirebaseService.java
+++ b/app/src/main/java/gr/thmmy/mthmmy/services/FirebaseService.java
@@ -19,7 +19,9 @@ import org.json.JSONObject;
 
 import gr.thmmy.mthmmy.R;
 import gr.thmmy.mthmmy.activities.topic.TopicActivity;
+import gr.thmmy.mthmmy.base.BaseApplication;
 import gr.thmmy.mthmmy.model.PostNotification;
+import gr.thmmy.mthmmy.session.SessionManager;
 import timber.log.Timber;
 
 import static android.support.v4.app.NotificationCompat.PRIORITY_HIGH;
@@ -33,12 +35,16 @@ public class FirebaseService extends FirebaseMessagingService {
         if (remoteMessage.getData().size() > 0) {
             JSONObject json = new JSONObject(remoteMessage.getData());
             try {
-                int topicId = Integer.parseInt(json.getString("topicId"));
-                int postId = Integer.parseInt(json.getString("postId"));
-                String topicTitle = json.getString("topicTitle");
-                String poster = json.getString("poster");
-                sendNotification(new PostNotification(postId, topicId, topicTitle, poster));
-
+                int userId = BaseApplication.getInstance().getSessionManager().getUserId();
+                //Don't notify me if the sender is me!
+                if(Integer.parseInt(json.getString("posterId"))!= userId)
+                {
+                    int topicId = Integer.parseInt(json.getString("topicId"));
+                    int postId = Integer.parseInt(json.getString("postId"));
+                    String topicTitle = json.getString("topicTitle");
+                    String poster = json.getString("poster");
+                    sendNotification(new PostNotification(postId, topicId, topicTitle, poster));
+                }
             } catch (JSONException e) {
                 Timber.e(e, "JSON Exception");
             }
@@ -85,6 +91,7 @@ public class FirebaseService extends FirebaseMessagingService {
                             .setSmallIcon(R.mipmap.ic_launcher)
                             .setGroupSummary(true)
                             .setGroup(GROUP_KEY)
+                            .setAutoCancel(true)
                             .setStyle(new NotificationCompat.InboxStyle()
                                     .setSummaryText("New Posts"))
                             .setSound(defaultSoundUri)
diff --git a/app/src/main/java/gr/thmmy/mthmmy/session/SessionManager.java b/app/src/main/java/gr/thmmy/mthmmy/session/SessionManager.java
index 8d534293..7f976aaa 100644
--- a/app/src/main/java/gr/thmmy/mthmmy/session/SessionManager.java
+++ b/app/src/main/java/gr/thmmy/mthmmy/session/SessionManager.java
@@ -57,6 +57,7 @@ public class SessionManager {
     //Shared Preferences & its keys
     private final SharedPreferences sharedPrefs;
     private static final String USERNAME = "Username";
+    private static final String USER_ID = "UserID";
     private static final String AVATAR_LINK = "AvatarLink";
     private static final String HAS_AVATAR = "HasAvatar";
     private static final String LOGOUT_LINK = "LogoutLink";
@@ -118,6 +119,7 @@ public class SessionManager {
                 setLoginScreenAsDefault(false);
                 sharedPrefs.edit().putBoolean(LOGGED_IN, true).apply();
                 sharedPrefs.edit().putString(USERNAME, extractUserName(document)).apply();
+                sharedPrefs.edit().putInt(USER_ID, extractUserId(document)).apply();
                 String avatar = extractAvatarLink(document);
                 if (avatar != null) {
                     sharedPrefs.edit().putBoolean(HAS_AVATAR, true).apply();
@@ -241,11 +243,15 @@ public class SessionManager {
 
     //---------------------------------------GETTERS------------------------------------------------
     public String getUsername() {
-        return sharedPrefs.getString(USERNAME, "Username");
+        return sharedPrefs.getString(USERNAME, USERNAME);
+    }
+
+    public int getUserId() {
+        return sharedPrefs.getInt(USER_ID, -1);
     }
 
     public String getAvatarLink() {
-        return sharedPrefs.getString(AVATAR_LINK, "AvatarLink");
+        return sharedPrefs.getString(AVATAR_LINK, AVATAR_LINK);
     }
 
     public boolean hasAvatar() {
@@ -292,6 +298,7 @@ public class SessionManager {
         cookieJar.clear();
         sharedPrefs.edit().clear().apply(); //Clear session data
         sharedPrefs.edit().putString(USERNAME, guestName).apply();
+        sharedPrefs.edit().putInt(USER_ID, -1).apply();
         sharedPrefs.edit().putBoolean(LOGGED_IN, false).apply(); //User logs out
         Timber.i("Session data cleared.");
     }
@@ -333,6 +340,25 @@ public class SessionManager {
         return "User"; //return a default username
     }
 
+    @NonNull
+    private int extractUserId(@NonNull Document doc) {
+        try{
+            Elements elements = doc.select("a:containsOwn(Εμφάνιση των μηνυμάτων σας), a:containsOwn(Show own posts)");
+            if (elements.size() == 1) {
+                String link = elements.first().attr("href");
+
+                Pattern pattern = Pattern.compile("https://www.thmmy.gr/smf/index.php\\?action=profile;u=(\\d*);sa=showPosts");
+                Matcher matcher = pattern.matcher(link);
+                if (matcher.find())
+                    return Integer.parseInt(matcher.group(1));
+            }
+        } catch (Exception e) {
+            Timber.e(new ParseException("Parsing failed(user id extraction)"),"ParseException");
+        }
+        Timber.e(new ParseException("Parsing failed(user id extraction)"),"ParseException");
+        return -1;
+    }
+
 
     @Nullable
     private String extractAvatarLink(@NonNull Document doc) {
diff --git a/app/src/main/res/layout/activity_bookmark_topic_row.xml b/app/src/main/res/layout/activity_bookmark_topic_row.xml
index c5b54d6f..09158cb6 100644
--- a/app/src/main/res/layout/activity_bookmark_topic_row.xml
+++ b/app/src/main/res/layout/activity_bookmark_topic_row.xml
@@ -28,6 +28,7 @@
         android:id="@+id/toggle_notification"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_marginEnd="12dp"
         android:background="?android:attr/selectableItemBackground"
         android:contentDescription="@string/toggle_notification"
         app:srcCompat="@drawable/ic_notification_on"/>

From 9fa70b4853e237d364d6c98cbe38167ca656da45 Mon Sep 17 00:00:00 2001
From: Ezerous <ezerous@gmail.com>
Date: Wed, 6 Jun 2018 21:38:55 +0300
Subject: [PATCH 20/29] Notifications improvements, small doc changes

---
 CONTRIBUTING.md                               | 16 +--
 README.md                                     |  1 -
 app/build.gradle                              | 18 +---
 app/src/main/AndroidManifest.xml              |  2 +-
 ...eService.java => NotificationService.java} | 99 ++++++++++++++++---
 5 files changed, 100 insertions(+), 36 deletions(-)
 rename app/src/main/java/gr/thmmy/mthmmy/services/{FirebaseService.java => NotificationService.java} (54%)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 9901c71c..f04586a0 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -15,15 +15,19 @@ There are many ways of contributing to mTHMMY:
 
 - Simply using the [latest release version][google-play] from Google Play (anonymous reports are sent automatically)
 - Joining our [Discord server][discord-server]
-- Submitting bugs and ideas on our [Trello board][trello-board]
+- Submitting bugs and ideas to our [issue tracker][github-issues]
 - Forking mTHMMY and submitting [pull requests](#pull-requests)
 - Joining our core team
 - Contacting us by email at `thmmynolife@gmail.com`
 
 ## Issue tracker
 
-The [mTHMMY Board on trello.com][trello-board] is used as an Issue Tracker, for bugs and improvements concerning the available mTHMMY releases.
-Before creating a card to submit an issue please **search the board** for similar entries.
+For bugs and improvements we use [GitHub’s issue tracking][github-issues].
+Before creating a new issue make sure to **search the tracker** for similar ones.
+
+## Compiling
+
+Due to the app's integration with Firebase, a `google-services.json` is required inside the `app` directory. To get one, either [set up your own Firebase project][firebase-console] (with or without a self hosted [backend][sisyphus], or ask us to provide you the one we use for development.
 
 ## Pull requests
 
@@ -38,8 +42,8 @@ follow the workflow below to make a pull request:
 1. Fill the PR description with a brief motive for your change and the method you used to achieve it
 1. Submit the PR.
 
-
-
 [google-play]: https://play.google.com/store/apps/details?id=gr.thmmy.mthmmy
-[trello-board]: https://trello.com/invite/b/4MVlkrkg/44a931707bd0b84a5e0bdfc42b9ae4f1/mthmmy
+[github-issues]: https://github.com/ThmmyNoLife/mTHMMY/issues
 [discord-server]: https://discord.gg/CVt3yrn
+[sisyphus]: https://github.com/ThmmyNoLife/Sisyphus
+[firebase-console]: https://console.firebase.google.com/
diff --git a/README.md b/README.md
index caa249d7..c69fe09d 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,6 @@
 
 [![API](https://img.shields.io/badge/API-19%2B-blue.svg?style=flat)](https://android-arsenal.com/api?level=19)
 [![Discord Channel](https://img.shields.io/badge/discord-public@mTHMMY-738bd7.svg?style=flat)][discord-server]
-[![Trello Board](https://img.shields.io/badge/trello-mTHMMY-red.svg?style=flat)][trello-board]
 
 
 mTHMMY is a mobile app for the [thmmy.gr](https://www.thmmy.gr) community.
diff --git a/app/build.gradle b/app/build.gradle
index 83430d97..d8a01d0d 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,8 +1,6 @@
 apply plugin: 'com.android.application'
+apply plugin: 'io.fabric'
 
-if (buildInRelease()) {
-    apply plugin: 'io.fabric'
-}
 
 android {
     compileSdkVersion 27
@@ -37,9 +35,9 @@ dependencies {
     implementation 'com.android.support:support-v4:27.1.1'
     implementation 'com.android.support:cardview-v7:27.1.1'
     implementation 'com.android.support:recyclerview-v7:27.1.1'
-    implementation 'com.google.firebase:firebase-core:15.0.2'
-    implementation 'com.google.firebase:firebase-messaging:15.0.2'
-    implementation 'com.crashlytics.sdk.android:crashlytics:2.9.2'
+    implementation 'com.google.firebase:firebase-core:16.0.0'
+    implementation 'com.google.firebase:firebase-messaging:17.0.0'
+    implementation 'com.crashlytics.sdk.android:crashlytics:2.9.3'
     implementation 'com.squareup.okhttp3:okhttp:3.10.0'
     implementation 'com.squareup.picasso:picasso:2.5.2'
     implementation 'com.jakewharton.picasso:picasso2-okhttp3-downloader:1.1.0'
@@ -57,10 +55,4 @@ dependencies {
     implementation 'com.jakewharton.timber:timber:4.7.0'
 }
 
-if (buildInRelease()) {
-    apply plugin: 'com.google.gms.google-services'
-}
-
-def buildInRelease() {
-    return getGradle().getStartParameter().getTaskRequests().toString().contains("Release")
-}
+apply plugin: 'com.google.gms.google-services'
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 49b5d305..98f8b187 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -120,7 +120,7 @@
             android:name=".services.DownloadService"
             android:exported="false" />
         <service
-            android:name=".services.FirebaseService"
+            android:name=".services.NotificationService"
             android:exported="false">
             <intent-filter>
                 <action android:name="com.google.firebase.MESSAGING_EVENT"/>
diff --git a/app/src/main/java/gr/thmmy/mthmmy/services/FirebaseService.java b/app/src/main/java/gr/thmmy/mthmmy/services/NotificationService.java
similarity index 54%
rename from app/src/main/java/gr/thmmy/mthmmy/services/FirebaseService.java
rename to app/src/main/java/gr/thmmy/mthmmy/services/NotificationService.java
index b6fcda79..64e8e1a2 100644
--- a/app/src/main/java/gr/thmmy/mthmmy/services/FirebaseService.java
+++ b/app/src/main/java/gr/thmmy/mthmmy/services/NotificationService.java
@@ -1,5 +1,6 @@
 package gr.thmmy.mthmmy.services;
 
+import android.app.Notification;
 import android.app.NotificationChannel;
 import android.app.NotificationManager;
 import android.app.PendingIntent;
@@ -9,6 +10,8 @@ import android.media.RingtoneManager;
 import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
+import android.service.notification.StatusBarNotification;
+import android.support.annotation.RequiresApi;
 import android.support.v4.app.NotificationCompat;
 
 import com.google.firebase.messaging.FirebaseMessagingService;
@@ -21,14 +24,15 @@ import gr.thmmy.mthmmy.R;
 import gr.thmmy.mthmmy.activities.topic.TopicActivity;
 import gr.thmmy.mthmmy.base.BaseApplication;
 import gr.thmmy.mthmmy.model.PostNotification;
-import gr.thmmy.mthmmy.session.SessionManager;
 import timber.log.Timber;
 
 import static android.support.v4.app.NotificationCompat.PRIORITY_HIGH;
 import static gr.thmmy.mthmmy.activities.topic.TopicActivity.BUNDLE_TOPIC_TITLE;
 import static gr.thmmy.mthmmy.activities.topic.TopicActivity.BUNDLE_TOPIC_URL;
 
-public class FirebaseService extends FirebaseMessagingService {
+public class NotificationService extends FirebaseMessagingService {
+    private static final int buildVersion = Build.VERSION.SDK_INT;
+
     @Override
     public void onMessageReceived(RemoteMessage remoteMessage) {
         super.onMessageReceived(remoteMessage);
@@ -55,6 +59,10 @@ public class FirebaseService extends FirebaseMessagingService {
     private static final String GROUP_KEY = "PostsGroup";
     private static int requestCode = 0;
 
+    private static final String NEW_POSTS_COUNT = "newPostsCount";
+    private static final String NEW_POST_TAG = "NEW_POST"; //notification tag
+    private static final String SUMMARY_TAG = "SUMMARY";
+
     /**
      * Create and show a new post notification.
      */
@@ -69,23 +77,50 @@ public class FirebaseService extends FirebaseMessagingService {
         PendingIntent pendingIntent = PendingIntent.getActivity(this, requestCode++, intent,
                 PendingIntent.FLAG_ONE_SHOT);
 
+        final int topicId = postNotification.getTopicId();
+        String contentText = "New post by " + postNotification.getPoster();
+        int newPostsCount = 1;
+
+        if (buildVersion >= Build.VERSION_CODES.M){
+            Notification existingNotification = getActiveNotification(topicId);
+            if(existingNotification!=null)
+            {
+                newPostsCount = existingNotification.extras.getInt(NEW_POSTS_COUNT) + 1;
+                contentText = newPostsCount + " new posts";
+            }
+        }
+
+        Bundle notificationExtras = new Bundle();
+        notificationExtras.putInt(NEW_POSTS_COUNT, newPostsCount);
+
         Uri defaultSoundUri= RingtoneManager.getDefaultUri(RingtoneManager.TYPE_NOTIFICATION);
         NotificationCompat.Builder notificationBuilder =
                 new NotificationCompat.Builder(this, CHANNEL_ID)
                         .setSmallIcon(R.mipmap.ic_launcher)
                         .setContentTitle(postNotification.getTopicTitle())
-                        .setContentText("by " + postNotification.getPoster())
+                        .setContentText(contentText)
                         .setAutoCancel(true)
                         .setSound(defaultSoundUri)
-                        .setContentIntent(pendingIntent);
+                        .setContentIntent(pendingIntent)
+                        .addExtras(notificationExtras);
+
+        if (buildVersion < Build.VERSION_CODES.O)
+            notificationBuilder.setPriority(PRIORITY_HIGH);
+
+        boolean createSummaryNotification = false;
+        if(buildVersion >= Build.VERSION_CODES.LOLLIPOP)
+        {
+            createSummaryNotification = true;
+            if(buildVersion >= Build.VERSION_CODES.M)
+                createSummaryNotification = otherNotificationsExist(topicId);
+        }
 
-        if (Build.VERSION.SDK_INT < 26) notificationBuilder.setPriority(PRIORITY_HIGH);
+        notificationBuilder.setVibrate(new long[0]);
+        notificationBuilder.setGroup(GROUP_KEY);
 
         NotificationCompat.Builder summaryNotificationBuilder = null;
-        if (Build.VERSION.SDK_INT >= 21) {
-            notificationBuilder.setVibrate(new long[0]);
-            notificationBuilder.setGroup(GROUP_KEY);
-
+        if(createSummaryNotification)
+        {
             summaryNotificationBuilder =
                     new NotificationCompat.Builder(this, CHANNEL_ID)
                             .setSmallIcon(R.mipmap.ic_launcher)
@@ -94,21 +129,55 @@ public class FirebaseService extends FirebaseMessagingService {
                             .setAutoCancel(true)
                             .setStyle(new NotificationCompat.InboxStyle()
                                     .setSummaryText("New Posts"))
-                            .setSound(defaultSoundUri)
-                            .setContentIntent(pendingIntent);
+                            .setSound(defaultSoundUri);
         }
 
 
 
+
         NotificationManager notificationManager = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE);
 
-        // Since android Oreo notification channel is needed.
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+        // Since Android Oreo notification channel is needed.
+        if (buildVersion >= Build.VERSION_CODES.O) {
             NotificationChannel channel = new NotificationChannel(CHANNEL_ID, "Topic Updates", NotificationManager.IMPORTANCE_HIGH);
             notificationManager.createNotificationChannel(channel);
         }
 
 
-        notificationManager.notify(postNotification.getTopicId(), notificationBuilder.build());
-        if (Build.VERSION.SDK_INT >= 21) notificationManager.notify(0, summaryNotificationBuilder.build());}
+        notificationManager.notify(NEW_POST_TAG, topicId, notificationBuilder.build());
+
+
+        if(createSummaryNotification)
+            notificationManager.notify(SUMMARY_TAG,0, summaryNotificationBuilder.build());
+    }
+
+    @RequiresApi(api = Build.VERSION_CODES.M)
+    private Notification getActiveNotification(int notificationId) {
+        NotificationManager notificationManager = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE);
+        if(notificationManager!=null)
+        {
+            StatusBarNotification[] barNotifications = notificationManager.getActiveNotifications();
+            for(StatusBarNotification notification: barNotifications) {
+                if (notification.getId() == notificationId)
+                    return notification.getNotification();
+            }
+
+        }
+        return null;
+    }
+
+    @RequiresApi(api = Build.VERSION_CODES.M)
+    private boolean otherNotificationsExist(int notificationId){
+        NotificationManager notificationManager = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE);
+        if(notificationManager!=null) {
+            StatusBarNotification[] barNotifications = notificationManager.getActiveNotifications();
+            for (StatusBarNotification notification : barNotifications) {
+                if (notification.getTag().equals(NEW_POST_TAG) && notification.getId() != notificationId)
+                    return true;
+            }
+        }
+        return false;
+    }
+
+
 }

From ab5a6584923dbfb54a53a2e0b5fab66b37b8c321 Mon Sep 17 00:00:00 2001
From: Ezerous <ezerous@gmail.com>
Date: Tue, 12 Jun 2018 12:51:19 +0300
Subject: [PATCH 21/29] Downloads fixes & notifications improvements

---
 CONTRIBUTING.md                               |  2 +-
 .../gr/thmmy/mthmmy/receiver/Receiver.java    | 21 +++++---
 .../mthmmy/services/DownloadService.java      | 26 +++++----
 .../mthmmy/services/NotificationService.java  | 53 +++++++++++++------
 build.gradle                                  |  6 +--
 5 files changed, 66 insertions(+), 42 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index f04586a0..556dfb11 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -27,7 +27,7 @@ Before creating a new issue make sure to **search the tracker** for similar ones
 
 ## Compiling
 
-Due to the app's integration with Firebase, a `google-services.json` is required inside the `app` directory. To get one, either [set up your own Firebase project][firebase-console] (with or without a self hosted [backend][sisyphus], or ask us to provide you the one we use for development.
+Due to the app's integration with Firebase, a `google-services.json` is required inside the `app` directory. To get one, either [set up your own Firebase project][firebase-console] (with or without a self hosted [backend][sisyphus]), or ask us to provide you the one we use for development.
 
 ## Pull requests
 
diff --git a/app/src/main/java/gr/thmmy/mthmmy/receiver/Receiver.java b/app/src/main/java/gr/thmmy/mthmmy/receiver/Receiver.java
index 3430ead9..8d805922 100644
--- a/app/src/main/java/gr/thmmy/mthmmy/receiver/Receiver.java
+++ b/app/src/main/java/gr/thmmy/mthmmy/receiver/Receiver.java
@@ -1,12 +1,13 @@
 package gr.thmmy.mthmmy.receiver;
 
-import android.app.Notification;
+import android.app.NotificationChannel;
 import android.app.NotificationManager;
 import android.app.PendingIntent;
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 import android.net.Uri;
+import android.os.Build;
 import android.os.Bundle;
 import android.support.v4.app.NotificationCompat;
 import android.webkit.MimeTypeMap;
@@ -27,12 +28,14 @@ import static gr.thmmy.mthmmy.services.DownloadService.SAVE_DIR;
 import static gr.thmmy.mthmmy.services.DownloadService.STARTED;
 
 public class Receiver extends BroadcastReceiver {
+    private static final String DOWNLOADS_CHANNEL_ID = "Downloads";
+    private static final String DOWNLOADS_CHANNEL_NAME = "Downloads";
 
     public Receiver() {}
 
     @Override
     public void onReceive(Context context, Intent intent) {
-        NotificationCompat.Builder builder = new NotificationCompat.Builder(context);
+        NotificationCompat.Builder notificationBuilder = new NotificationCompat.Builder(context, DOWNLOADS_CHANNEL_ID);
         NotificationManager notificationManager = (NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE);
 
         if (intent.getAction().equals(ACTION_DOWNLOAD)) {
@@ -43,13 +46,13 @@ public class Receiver extends BroadcastReceiver {
             String text = extras.getString(EXTRA_NOTIFICATION_TEXT);
             String ticker = extras.getString(EXTRA_NOTIFICATION_TICKER);
 
-            builder.setContentTitle(title)
+            notificationBuilder.setContentTitle(title)
                     .setContentText(text)
                     .setTicker(ticker)
                     .setAutoCancel(true);
 
             if (state.equals(STARTED))
-                builder.setOngoing(true)
+                notificationBuilder.setOngoing(true)
                         .setSmallIcon(android.R.drawable.stat_sys_download);
             else if (state.equals(COMPLETED)) {
                 String fileName = extras.getString(EXTRA_FILE_NAME, "NONE");
@@ -66,14 +69,18 @@ public class Receiver extends BroadcastReceiver {
                     Intent chooser = Intent.createChooser(chooserIntent, "Open With...");
 
                     PendingIntent pendingIntent = PendingIntent.getActivity(context, 0, chooser, PendingIntent.FLAG_CANCEL_CURRENT);
-                    builder.setContentIntent(pendingIntent)
+                    notificationBuilder.setContentIntent(pendingIntent)
                             .setSmallIcon(android.R.drawable.stat_sys_download_done);
 
                 } else
                     Timber.w("File doesn't exist.");
             }
-            Notification notification = builder.build();
-            notificationManager.notify(id, notification);
+
+            // Since Android Oreo notification channel is needed.
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O)
+                notificationManager.createNotificationChannel(new NotificationChannel(DOWNLOADS_CHANNEL_ID, DOWNLOADS_CHANNEL_NAME, NotificationManager.IMPORTANCE_HIGH));
+
+            notificationManager.notify(id, notificationBuilder.build());
         }
     }
 
diff --git a/app/src/main/java/gr/thmmy/mthmmy/services/DownloadService.java b/app/src/main/java/gr/thmmy/mthmmy/services/DownloadService.java
index a00cffb0..15aa0d98 100644
--- a/app/src/main/java/gr/thmmy/mthmmy/services/DownloadService.java
+++ b/app/src/main/java/gr/thmmy/mthmmy/services/DownloadService.java
@@ -134,9 +134,8 @@ public class DownloadService extends IntentService {
                 File file = new File(dirPath, fileName);
 
                 for (int i = 1; ; i++) {
-                    if (!file.exists()) {
+                    if (!file.exists())
                         break;
-                    }
 
                     file = new File(dirPath, String.format(nameFormat, i));
                 }
@@ -155,7 +154,7 @@ public class DownloadService extends IntentService {
                 // Register download
                 DownloadManager mManager = (DownloadManager) getSystemService(Context.DOWNLOAD_SERVICE);
                 long length = file.length();
-                mManager.addCompletedDownload(fileName, "edo mporei na mpei ena description", false, getMimeType(file), SAVE_DIR +File.separator+ fileName, length, false);
+                mManager.addCompletedDownload(fileName, fileName, false, getMimeType(file), SAVE_DIR +File.separator+ fileName, length, false);
 
             } else
                 Timber.e("No attachment in response!");
@@ -182,20 +181,20 @@ public class DownloadService extends IntentService {
         Intent intent = new Intent(ACTION_DOWNLOAD);
         switch (type) {
             case STARTED: {
-                intent.putExtra(EXTRA_NOTIFICATION_TITLE, "Download Started");
-                intent.putExtra(EXTRA_NOTIFICATION_TEXT, "\"" + fileName + "\" downloading...");
+                intent.putExtra(EXTRA_NOTIFICATION_TITLE, "\"" + fileName + "\" downloading...");
+                intent.putExtra(EXTRA_NOTIFICATION_TEXT, "Download Started");
                 intent.putExtra(EXTRA_NOTIFICATION_TICKER, "Downloading...");
                 break;
             }
             case COMPLETED: {
-                intent.putExtra(EXTRA_NOTIFICATION_TITLE, "Download Completed");
-                intent.putExtra(EXTRA_NOTIFICATION_TEXT, "\"" + fileName + "\" finished downloading.");
+                intent.putExtra(EXTRA_NOTIFICATION_TITLE, "\"" + fileName + "\" finished downloading.");
+                intent.putExtra(EXTRA_NOTIFICATION_TEXT, "Download Completed");
                 intent.putExtra(EXTRA_NOTIFICATION_TICKER, "Download Completed");
                 break;
             }
             case FAILED: {
-                intent.putExtra(EXTRA_NOTIFICATION_TITLE, "Download Failed");
-                intent.putExtra(EXTRA_NOTIFICATION_TEXT, "\"" + fileName + "\" failed.");
+                intent.putExtra(EXTRA_NOTIFICATION_TITLE, "\"" + fileName + "\" failed.");
+                intent.putExtra(EXTRA_NOTIFICATION_TEXT, "Download Failed");
                 intent.putExtra(EXTRA_NOTIFICATION_TICKER, "Download Failed");
                 break;
             }
@@ -216,12 +215,11 @@ public class DownloadService extends IntentService {
         String type = null;
         final String url = file.toString();
         final String extension = MimeTypeMap.getFileExtensionFromUrl(url);
-        if (extension != null) {
+        if (extension != null)
             type = MimeTypeMap.getSingleton().getMimeTypeFromExtension(extension.toLowerCase());
-        }
-        if (type == null) {
-            type = ""; // fallback type. You might set it to */*
-        }
+        if (type == null)
+            type = "*/*";
+
         return type;
     }
 
diff --git a/app/src/main/java/gr/thmmy/mthmmy/services/NotificationService.java b/app/src/main/java/gr/thmmy/mthmmy/services/NotificationService.java
index 64e8e1a2..3bf9b658 100644
--- a/app/src/main/java/gr/thmmy/mthmmy/services/NotificationService.java
+++ b/app/src/main/java/gr/thmmy/mthmmy/services/NotificationService.java
@@ -6,8 +6,6 @@ import android.app.NotificationManager;
 import android.app.PendingIntent;
 import android.content.Context;
 import android.content.Intent;
-import android.media.RingtoneManager;
-import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
 import android.service.notification.StatusBarNotification;
@@ -26,7 +24,7 @@ import gr.thmmy.mthmmy.base.BaseApplication;
 import gr.thmmy.mthmmy.model.PostNotification;
 import timber.log.Timber;
 
-import static android.support.v4.app.NotificationCompat.PRIORITY_HIGH;
+import static android.support.v4.app.NotificationCompat.PRIORITY_MAX;
 import static gr.thmmy.mthmmy.activities.topic.TopicActivity.BUNDLE_TOPIC_TITLE;
 import static gr.thmmy.mthmmy.activities.topic.TopicActivity.BUNDLE_TOPIC_URL;
 
@@ -49,6 +47,8 @@ public class NotificationService extends FirebaseMessagingService {
                     String poster = json.getString("poster");
                     sendNotification(new PostNotification(postId, topicId, topicTitle, poster));
                 }
+                else
+                    Timber.v("Notification suppressed (own userID).");
             } catch (JSONException e) {
                 Timber.e(e, "JSON Exception");
             }
@@ -56,17 +56,20 @@ public class NotificationService extends FirebaseMessagingService {
     }
 
     private static final String CHANNEL_ID = "Posts";
+    private static final String CHANNEL_NAME = "New Posts";
     private static final String GROUP_KEY = "PostsGroup";
     private static int requestCode = 0;
 
     private static final String NEW_POSTS_COUNT = "newPostsCount";
     private static final String NEW_POST_TAG = "NEW_POST"; //notification tag
     private static final String SUMMARY_TAG = "SUMMARY";
+    private static final String DELETED_MESSAGES_TAG = "DELETED_MESSAGES_TAG"; //notification tag
 
     /**
      * Create and show a new post notification.
      */
     private void sendNotification(PostNotification postNotification) {
+        Timber.i("Creating a notification...");
         String topicUrl = "https://www.thmmy.gr/smf/index.php?topic=" + postNotification.getTopicId() + "." + postNotification.getPostId();
         Intent intent = new Intent(this, TopicActivity.class);
         Bundle extras = new Bundle();
@@ -93,19 +96,19 @@ public class NotificationService extends FirebaseMessagingService {
         Bundle notificationExtras = new Bundle();
         notificationExtras.putInt(NEW_POSTS_COUNT, newPostsCount);
 
-        Uri defaultSoundUri= RingtoneManager.getDefaultUri(RingtoneManager.TYPE_NOTIFICATION);
         NotificationCompat.Builder notificationBuilder =
                 new NotificationCompat.Builder(this, CHANNEL_ID)
                         .setSmallIcon(R.mipmap.ic_launcher)
                         .setContentTitle(postNotification.getTopicTitle())
                         .setContentText(contentText)
                         .setAutoCancel(true)
-                        .setSound(defaultSoundUri)
                         .setContentIntent(pendingIntent)
+                        .setDefaults(Notification.DEFAULT_ALL)
+                        .setGroup(GROUP_KEY)
                         .addExtras(notificationExtras);
 
         if (buildVersion < Build.VERSION_CODES.O)
-            notificationBuilder.setPriority(PRIORITY_HIGH);
+            notificationBuilder.setPriority(PRIORITY_MAX);
 
         boolean createSummaryNotification = false;
         if(buildVersion >= Build.VERSION_CODES.LOLLIPOP)
@@ -115,9 +118,6 @@ public class NotificationService extends FirebaseMessagingService {
                 createSummaryNotification = otherNotificationsExist(topicId);
         }
 
-        notificationBuilder.setVibrate(new long[0]);
-        notificationBuilder.setGroup(GROUP_KEY);
-
         NotificationCompat.Builder summaryNotificationBuilder = null;
         if(createSummaryNotification)
         {
@@ -129,7 +129,7 @@ public class NotificationService extends FirebaseMessagingService {
                             .setAutoCancel(true)
                             .setStyle(new NotificationCompat.InboxStyle()
                                     .setSummaryText("New Posts"))
-                            .setSound(defaultSoundUri);
+                            .setDefaults(Notification.DEFAULT_ALL);
         }
 
 
@@ -138,15 +138,11 @@ public class NotificationService extends FirebaseMessagingService {
         NotificationManager notificationManager = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE);
 
         // Since Android Oreo notification channel is needed.
-        if (buildVersion >= Build.VERSION_CODES.O) {
-            NotificationChannel channel = new NotificationChannel(CHANNEL_ID, "Topic Updates", NotificationManager.IMPORTANCE_HIGH);
-            notificationManager.createNotificationChannel(channel);
-        }
-
+        if (buildVersion >= Build.VERSION_CODES.O)
+            notificationManager.createNotificationChannel(new NotificationChannel(CHANNEL_ID, CHANNEL_NAME, NotificationManager.IMPORTANCE_HIGH));
 
         notificationManager.notify(NEW_POST_TAG, topicId, notificationBuilder.build());
 
-
         if(createSummaryNotification)
             notificationManager.notify(SUMMARY_TAG,0, summaryNotificationBuilder.build());
     }
@@ -172,12 +168,35 @@ public class NotificationService extends FirebaseMessagingService {
         if(notificationManager!=null) {
             StatusBarNotification[] barNotifications = notificationManager.getActiveNotifications();
             for (StatusBarNotification notification : barNotifications) {
-                if (notification.getTag().equals(NEW_POST_TAG) && notification.getId() != notificationId)
+                String tag = notification.getTag();
+                if (tag!=null && tag.equals(NEW_POST_TAG) && notification.getId() != notificationId)
                     return true;
             }
         }
         return false;
     }
 
+    @Override
+    public void onDeletedMessages() {
+        super.onDeletedMessages();
+        NotificationCompat.Builder notificationBuilder =
+                new NotificationCompat.Builder(this, CHANNEL_ID)
+                        .setSmallIcon(R.mipmap.ic_launcher)
+                        .setContentTitle("Error fetching notifications!")
+                        .setContentText("Some notifications may not have arrived successfully either due to" +
+                                "the amount of pending messages (>100) or if the device hasn't come online for more than a month.")
+                        .setAutoCancel(true)
+                        .setDefaults(Notification.DEFAULT_ALL);
+
+        if (buildVersion < Build.VERSION_CODES.O)
+            notificationBuilder.setPriority(Notification.PRIORITY_MAX);
+
+        NotificationManager notificationManager = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE);
+
+        // Since Android Oreo notification channel is needed.
+        if (buildVersion >= Build.VERSION_CODES.O)
+            notificationManager.createNotificationChannel(new NotificationChannel(CHANNEL_ID, CHANNEL_NAME, NotificationManager.IMPORTANCE_HIGH));
 
+        notificationManager.notify(DELETED_MESSAGES_TAG, 0, notificationBuilder.build());
+    }
 }
diff --git a/build.gradle b/build.gradle
index 731a4e70..3a61f691 100644
--- a/build.gradle
+++ b/build.gradle
@@ -9,9 +9,9 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.1.2'
-        classpath 'com.google.gms:google-services:3.3.0'
-        classpath 'io.fabric.tools:gradle:1.25.1'
+        classpath 'com.android.tools.build:gradle:3.1.3'
+        classpath 'com.google.gms:google-services:4.0.1'
+        classpath 'io.fabric.tools:gradle:1.25.4'
     }
 }
 

From d0e19100b65cabbd9f6c188e3f833b5adfa134ab Mon Sep 17 00:00:00 2001
From: Ezerous <ezerous@gmail.com>
Date: Wed, 13 Jun 2018 16:03:05 +0300
Subject: [PATCH 22/29] Fixed a RecentFragment bug (hopefully)

---
 .../mthmmy/activities/main/recent/RecentFragment.java  | 10 ++++++++--
 .../main/java/gr/thmmy/mthmmy/receiver/Receiver.java   |  3 ++-
 .../java/gr/thmmy/mthmmy/services/DownloadService.java |  6 +++---
 .../gr/thmmy/mthmmy/services/NotificationService.java  |  4 ++--
 4 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/gr/thmmy/mthmmy/activities/main/recent/RecentFragment.java b/app/src/main/java/gr/thmmy/mthmmy/activities/main/recent/RecentFragment.java
index 593b5542..9f9be77e 100644
--- a/app/src/main/java/gr/thmmy/mthmmy/activities/main/recent/RecentFragment.java
+++ b/app/src/main/java/gr/thmmy/mthmmy/activities/main/recent/RecentFragment.java
@@ -140,16 +140,18 @@ public class RecentFragment extends BaseFragment {
 
     //---------------------------------------ASYNC TASK-----------------------------------
     private class RecentTask extends ParseTask {
+        private List<TopicSummary> fetchedRecent;
+
         @Override
         protected void onPreExecute() {
             progressBar.setVisibility(ProgressBar.VISIBLE);
+            fetchedRecent = new ArrayList<>();
         }
 
         @Override
         public void parse(Document document) throws ParseException {
             Elements recent = document.select("#block8 :first-child div");
             if (!recent.isEmpty()) {
-                topicSummaries.clear();
                 for (int i = 0; i < recent.size(); i += 3) {
                     String link = recent.get(i).child(0).attr("href");
                     String title = recent.get(i).child(0).attr("title");
@@ -180,7 +182,7 @@ public class RecentFragment extends BaseFragment {
                     } else
                         throw new ParseException("Parsing failed (dateTime)");
 
-                    topicSummaries.add(new TopicSummary(link, title, lastUser, dateTime));
+                    fetchedRecent.add(new TopicSummary(link, title, lastUser, dateTime));
                 }
                 return;
             }
@@ -190,7 +192,11 @@ public class RecentFragment extends BaseFragment {
         @Override
         protected void postParsing(ParseTask.ResultCode result) {
             if (result == ResultCode.SUCCESS)
+            {
+                topicSummaries.clear();
+                topicSummaries.addAll(fetchedRecent);
                 recentAdapter.notifyDataSetChanged();
+            }
 
             progressBar.setVisibility(ProgressBar.INVISIBLE);
             swipeRefreshLayout.setRefreshing(false);
diff --git a/app/src/main/java/gr/thmmy/mthmmy/receiver/Receiver.java b/app/src/main/java/gr/thmmy/mthmmy/receiver/Receiver.java
index 8d805922..f37e5078 100644
--- a/app/src/main/java/gr/thmmy/mthmmy/receiver/Receiver.java
+++ b/app/src/main/java/gr/thmmy/mthmmy/receiver/Receiver.java
@@ -28,6 +28,7 @@ import static gr.thmmy.mthmmy.services.DownloadService.SAVE_DIR;
 import static gr.thmmy.mthmmy.services.DownloadService.STARTED;
 
 public class Receiver extends BroadcastReceiver {
+    private static final String NOTIFICATION_TAG = "DOWNLOADS";
     private static final String DOWNLOADS_CHANNEL_ID = "Downloads";
     private static final String DOWNLOADS_CHANNEL_NAME = "Downloads";
 
@@ -80,7 +81,7 @@ public class Receiver extends BroadcastReceiver {
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O)
                 notificationManager.createNotificationChannel(new NotificationChannel(DOWNLOADS_CHANNEL_ID, DOWNLOADS_CHANNEL_NAME, NotificationManager.IMPORTANCE_HIGH));
 
-            notificationManager.notify(id, notificationBuilder.build());
+            notificationManager.notify(NOTIFICATION_TAG, id, notificationBuilder.build());
         }
     }
 
diff --git a/app/src/main/java/gr/thmmy/mthmmy/services/DownloadService.java b/app/src/main/java/gr/thmmy/mthmmy/services/DownloadService.java
index 15aa0d98..be081a25 100644
--- a/app/src/main/java/gr/thmmy/mthmmy/services/DownloadService.java
+++ b/app/src/main/java/gr/thmmy/mthmmy/services/DownloadService.java
@@ -181,19 +181,19 @@ public class DownloadService extends IntentService {
         Intent intent = new Intent(ACTION_DOWNLOAD);
         switch (type) {
             case STARTED: {
-                intent.putExtra(EXTRA_NOTIFICATION_TITLE, "\"" + fileName + "\" downloading...");
+                intent.putExtra(EXTRA_NOTIFICATION_TITLE, "\"" + fileName + "\"");
                 intent.putExtra(EXTRA_NOTIFICATION_TEXT, "Download Started");
                 intent.putExtra(EXTRA_NOTIFICATION_TICKER, "Downloading...");
                 break;
             }
             case COMPLETED: {
-                intent.putExtra(EXTRA_NOTIFICATION_TITLE, "\"" + fileName + "\" finished downloading.");
+                intent.putExtra(EXTRA_NOTIFICATION_TITLE, "\"" + fileName + "\"");
                 intent.putExtra(EXTRA_NOTIFICATION_TEXT, "Download Completed");
                 intent.putExtra(EXTRA_NOTIFICATION_TICKER, "Download Completed");
                 break;
             }
             case FAILED: {
-                intent.putExtra(EXTRA_NOTIFICATION_TITLE, "\"" + fileName + "\" failed.");
+                intent.putExtra(EXTRA_NOTIFICATION_TITLE, "\"" + fileName + "\"");
                 intent.putExtra(EXTRA_NOTIFICATION_TEXT, "Download Failed");
                 intent.putExtra(EXTRA_NOTIFICATION_TICKER, "Download Failed");
                 break;
diff --git a/app/src/main/java/gr/thmmy/mthmmy/services/NotificationService.java b/app/src/main/java/gr/thmmy/mthmmy/services/NotificationService.java
index 3bf9b658..6e4419c0 100644
--- a/app/src/main/java/gr/thmmy/mthmmy/services/NotificationService.java
+++ b/app/src/main/java/gr/thmmy/mthmmy/services/NotificationService.java
@@ -61,9 +61,9 @@ public class NotificationService extends FirebaseMessagingService {
     private static int requestCode = 0;
 
     private static final String NEW_POSTS_COUNT = "newPostsCount";
-    private static final String NEW_POST_TAG = "NEW_POST"; //notification tag
+    private static final String NEW_POST_TAG = "NEW_POST";
     private static final String SUMMARY_TAG = "SUMMARY";
-    private static final String DELETED_MESSAGES_TAG = "DELETED_MESSAGES_TAG"; //notification tag
+    private static final String DELETED_MESSAGES_TAG = "DELETED_MESSAGES";
 
     /**
      * Create and show a new post notification.

From 9fdbdee6c75bfa9dd17a1353293d0e3321ceab2c Mon Sep 17 00:00:00 2001
From: Ezerous <ezerous@gmail.com>
Date: Thu, 14 Jun 2018 12:29:56 +0300
Subject: [PATCH 23/29] TopicActivity minor improvements (sanitized URL, added
 Unauthorized support)

---
 app/src/main/AndroidManifest.xml              |   4 +-
 .../activities/board/BoardActivity.java       |   4 +-
 .../downloads/DownloadsActivity.java          |   4 +-
 .../activities/main/forum/ForumFragment.java  |   4 +-
 .../main/recent/RecentFragment.java           |   4 +-
 .../main/unread/UnreadFragment.java           |   4 +-
 .../latestPosts/LatestPostsFragment.java      |   2 +-
 .../profile/summary/SummaryFragment.java      |   2 +-
 .../activities/topic/TopicActivity.java       | 151 +++++++++++-------
 .../mthmmy/activities/topic/TopicParser.java  |  26 +--
 .../gr/thmmy/mthmmy/base/BaseActivity.java    |   6 +-
 .../java/gr/thmmy/mthmmy/model/ThmmyPage.java |  16 ++
 .../downloads/DownloadsReceiver.java}         |  28 ++--
 .../DownloadsService.java}                    |  19 ++-
 .../thmmy/mthmmy/session/SessionManager.java  |   2 +-
 .../ParseException.java                       |   2 +-
 .../utils/{ => parsing}/ParseHelpers.java     |   2 +-
 .../mthmmy/utils/{ => parsing}/ParseTask.java |   3 +-
 18 files changed, 163 insertions(+), 120 deletions(-)
 rename app/src/main/java/gr/thmmy/mthmmy/{receiver/Receiver.java => services/downloads/DownloadsReceiver.java} (76%)
 rename app/src/main/java/gr/thmmy/mthmmy/services/{DownloadService.java => downloads/DownloadsService.java} (94%)
 rename app/src/main/java/gr/thmmy/mthmmy/utils/{exceptions => parsing}/ParseException.java (84%)
 rename app/src/main/java/gr/thmmy/mthmmy/utils/{ => parsing}/ParseHelpers.java (99%)
 rename app/src/main/java/gr/thmmy/mthmmy/utils/{ => parsing}/ParseTask.java (96%)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 98f8b187..bca9ca45 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -117,7 +117,7 @@
         </provider>
 
         <service
-            android:name=".services.DownloadService"
+            android:name=".services.downloads.DownloadsService"
             android:exported="false" />
         <service
             android:name=".services.NotificationService"
@@ -128,7 +128,7 @@
         </service>
 
         <receiver
-            android:name=".receiver.Receiver"
+            android:name=".services.downloads.DownloadsReceiver"
             android:enabled="true"
             android:exported="false">
             <intent-filter>
diff --git a/app/src/main/java/gr/thmmy/mthmmy/activities/board/BoardActivity.java b/app/src/main/java/gr/thmmy/mthmmy/activities/board/BoardActivity.java
index 1733986f..c6620218 100644
--- a/app/src/main/java/gr/thmmy/mthmmy/activities/board/BoardActivity.java
+++ b/app/src/main/java/gr/thmmy/mthmmy/activities/board/BoardActivity.java
@@ -25,8 +25,8 @@ import gr.thmmy.mthmmy.model.Board;
 import gr.thmmy.mthmmy.model.Bookmark;
 import gr.thmmy.mthmmy.model.ThmmyPage;
 import gr.thmmy.mthmmy.model.Topic;
-import gr.thmmy.mthmmy.utils.ParseTask;
-import gr.thmmy.mthmmy.utils.exceptions.ParseException;
+import gr.thmmy.mthmmy.utils.parsing.ParseTask;
+import gr.thmmy.mthmmy.utils.parsing.ParseException;
 import me.zhanghai.android.materialprogressbar.MaterialProgressBar;
 import timber.log.Timber;
 
diff --git a/app/src/main/java/gr/thmmy/mthmmy/activities/downloads/DownloadsActivity.java b/app/src/main/java/gr/thmmy/mthmmy/activities/downloads/DownloadsActivity.java
index 7e3a4526..6d899d23 100644
--- a/app/src/main/java/gr/thmmy/mthmmy/activities/downloads/DownloadsActivity.java
+++ b/app/src/main/java/gr/thmmy/mthmmy/activities/downloads/DownloadsActivity.java
@@ -22,8 +22,8 @@ import gr.thmmy.mthmmy.R;
 import gr.thmmy.mthmmy.base.BaseActivity;
 import gr.thmmy.mthmmy.model.Download;
 import gr.thmmy.mthmmy.model.ThmmyPage;
-import gr.thmmy.mthmmy.utils.ParseTask;
-import gr.thmmy.mthmmy.utils.exceptions.ParseException;
+import gr.thmmy.mthmmy.utils.parsing.ParseTask;
+import gr.thmmy.mthmmy.utils.parsing.ParseException;
 import me.zhanghai.android.materialprogressbar.MaterialProgressBar;
 import timber.log.Timber;
 
diff --git a/app/src/main/java/gr/thmmy/mthmmy/activities/main/forum/ForumFragment.java b/app/src/main/java/gr/thmmy/mthmmy/activities/main/forum/ForumFragment.java
index dcd9ab3c..02da2734 100644
--- a/app/src/main/java/gr/thmmy/mthmmy/activities/main/forum/ForumFragment.java
+++ b/app/src/main/java/gr/thmmy/mthmmy/activities/main/forum/ForumFragment.java
@@ -27,8 +27,8 @@ import gr.thmmy.mthmmy.model.Board;
 import gr.thmmy.mthmmy.model.Category;
 import gr.thmmy.mthmmy.session.SessionManager;
 import gr.thmmy.mthmmy.utils.CustomRecyclerView;
-import gr.thmmy.mthmmy.utils.ParseTask;
-import gr.thmmy.mthmmy.utils.exceptions.ParseException;
+import gr.thmmy.mthmmy.utils.parsing.ParseTask;
+import gr.thmmy.mthmmy.utils.parsing.ParseException;
 import me.zhanghai.android.materialprogressbar.MaterialProgressBar;
 import okhttp3.HttpUrl;
 import okhttp3.Request;
diff --git a/app/src/main/java/gr/thmmy/mthmmy/activities/main/recent/RecentFragment.java b/app/src/main/java/gr/thmmy/mthmmy/activities/main/recent/RecentFragment.java
index 9f9be77e..5dab8c1e 100644
--- a/app/src/main/java/gr/thmmy/mthmmy/activities/main/recent/RecentFragment.java
+++ b/app/src/main/java/gr/thmmy/mthmmy/activities/main/recent/RecentFragment.java
@@ -24,8 +24,8 @@ import gr.thmmy.mthmmy.base.BaseFragment;
 import gr.thmmy.mthmmy.model.TopicSummary;
 import gr.thmmy.mthmmy.session.SessionManager;
 import gr.thmmy.mthmmy.utils.CustomRecyclerView;
-import gr.thmmy.mthmmy.utils.ParseTask;
-import gr.thmmy.mthmmy.utils.exceptions.ParseException;
+import gr.thmmy.mthmmy.utils.parsing.ParseTask;
+import gr.thmmy.mthmmy.utils.parsing.ParseException;
 import me.zhanghai.android.materialprogressbar.MaterialProgressBar;
 import timber.log.Timber;
 
diff --git a/app/src/main/java/gr/thmmy/mthmmy/activities/main/unread/UnreadFragment.java b/app/src/main/java/gr/thmmy/mthmmy/activities/main/unread/UnreadFragment.java
index 93824a61..7b42fb20 100644
--- a/app/src/main/java/gr/thmmy/mthmmy/activities/main/unread/UnreadFragment.java
+++ b/app/src/main/java/gr/thmmy/mthmmy/activities/main/unread/UnreadFragment.java
@@ -25,8 +25,8 @@ import gr.thmmy.mthmmy.base.BaseFragment;
 import gr.thmmy.mthmmy.model.TopicSummary;
 import gr.thmmy.mthmmy.session.SessionManager;
 import gr.thmmy.mthmmy.utils.CustomRecyclerView;
-import gr.thmmy.mthmmy.utils.ParseTask;
-import gr.thmmy.mthmmy.utils.exceptions.ParseException;
+import gr.thmmy.mthmmy.utils.parsing.ParseTask;
+import gr.thmmy.mthmmy.utils.parsing.ParseException;
 import me.zhanghai.android.materialprogressbar.MaterialProgressBar;
 import okhttp3.Request;
 import timber.log.Timber;
diff --git a/app/src/main/java/gr/thmmy/mthmmy/activities/profile/latestPosts/LatestPostsFragment.java b/app/src/main/java/gr/thmmy/mthmmy/activities/profile/latestPosts/LatestPostsFragment.java
index a8d75451..277b01a0 100644
--- a/app/src/main/java/gr/thmmy/mthmmy/activities/profile/latestPosts/LatestPostsFragment.java
+++ b/app/src/main/java/gr/thmmy/mthmmy/activities/profile/latestPosts/LatestPostsFragment.java
@@ -24,7 +24,7 @@ import gr.thmmy.mthmmy.R;
 import gr.thmmy.mthmmy.base.BaseActivity;
 import gr.thmmy.mthmmy.base.BaseFragment;
 import gr.thmmy.mthmmy.model.PostSummary;
-import gr.thmmy.mthmmy.utils.ParseHelpers;
+import gr.thmmy.mthmmy.utils.parsing.ParseHelpers;
 import me.zhanghai.android.materialprogressbar.MaterialProgressBar;
 import okhttp3.Request;
 import okhttp3.Response;
diff --git a/app/src/main/java/gr/thmmy/mthmmy/activities/profile/summary/SummaryFragment.java b/app/src/main/java/gr/thmmy/mthmmy/activities/profile/summary/SummaryFragment.java
index d77d1180..8993fcf0 100644
--- a/app/src/main/java/gr/thmmy/mthmmy/activities/profile/summary/SummaryFragment.java
+++ b/app/src/main/java/gr/thmmy/mthmmy/activities/profile/summary/SummaryFragment.java
@@ -23,7 +23,7 @@ import java.util.ArrayList;
 import java.util.Objects;
 
 import gr.thmmy.mthmmy.R;
-import gr.thmmy.mthmmy.utils.ParseHelpers;
+import gr.thmmy.mthmmy.utils.parsing.ParseHelpers;
 import timber.log.Timber;
 
 
diff --git a/app/src/main/java/gr/thmmy/mthmmy/activities/topic/TopicActivity.java b/app/src/main/java/gr/thmmy/mthmmy/activities/topic/TopicActivity.java
index 0dc6ce6b..e18dc2e7 100644
--- a/app/src/main/java/gr/thmmy/mthmmy/activities/topic/TopicActivity.java
+++ b/app/src/main/java/gr/thmmy/mthmmy/activities/topic/TopicActivity.java
@@ -1,5 +1,6 @@
 package gr.thmmy.mthmmy.activities.topic;
 
+import android.annotation.SuppressLint;
 import android.content.Context;
 import android.content.Intent;
 import android.graphics.Rect;
@@ -47,7 +48,8 @@ import gr.thmmy.mthmmy.model.Bookmark;
 import gr.thmmy.mthmmy.model.Post;
 import gr.thmmy.mthmmy.model.ThmmyPage;
 import gr.thmmy.mthmmy.utils.CustomLinearLayoutManager;
-import gr.thmmy.mthmmy.utils.ParseHelpers;
+import gr.thmmy.mthmmy.utils.parsing.ParseException;
+import gr.thmmy.mthmmy.utils.parsing.ParseHelpers;
 import me.zhanghai.android.materialprogressbar.MaterialProgressBar;
 import okhttp3.MultipartBody;
 import okhttp3.Request;
@@ -204,6 +206,8 @@ public class TopicActivity extends BaseActivity {
             finish();
         }
 
+        topicPageUrl = ThmmyPage.sanitizeTopicUrl(topicPageUrl);
+
         thisPageBookmark = new Bookmark(topicTitle, ThmmyPage.getTopicId(topicPageUrl), true);
 
         //Initializes graphics
@@ -275,7 +279,7 @@ public class TopicActivity extends BaseActivity {
 
         //Gets posts
         topicTask = new TopicTask();
-        topicTask.execute(extras.getString(BUNDLE_TOPIC_URL)); //Attempt data parsing
+        topicTask.execute(topicPageUrl); //Attempt data parsing
     }
 
     @Override
@@ -413,6 +417,7 @@ public class TopicActivity extends BaseActivity {
         }
     }
 
+    @SuppressLint("ClickableViewAccessibility")
     private void initIncrementButton(ImageButton increment, final int step) {
         // Increment once for a click
         increment.setOnClickListener(new View.OnClickListener() {
@@ -461,6 +466,7 @@ public class TopicActivity extends BaseActivity {
         });
     }
 
+    @SuppressLint("ClickableViewAccessibility")
     private void initDecrementButton(ImageButton decrement, final int step) {
         // Decrement once for a click
         decrement.setOnClickListener(new View.OnClickListener() {
@@ -537,6 +543,10 @@ public class TopicActivity extends BaseActivity {
         }
     }
 //------------------------------------BOTTOM NAV BAR METHODS END------------------------------------
+    private enum ResultCode {
+        SUCCESS, NETWORK_ERROR, PARSING_ERROR, OTHER_ERROR, SAME_PAGE, UNAUTHORIZED
+    }
+
 
     /**
      * An {@link AsyncTask} that handles asynchronous fetching of this topic page and parsing of its
@@ -544,12 +554,7 @@ public class TopicActivity extends BaseActivity {
      * <p>TopicTask's {@link AsyncTask#execute execute} method needs a topic's url as String
      * parameter.</p>
      */
-    class TopicTask extends AsyncTask<String, Void, Integer> {
-        private static final int SUCCESS = 0;
-        private static final int NETWORK_ERROR = 1;
-        private static final int OTHER_ERROR = 2;
-        private static final int SAME_PAGE = 3;
-
+    class TopicTask extends AsyncTask<String, Void, ResultCode> {
         ArrayList<Post> localPostsList;
 
         @Override
@@ -559,8 +564,8 @@ public class TopicActivity extends BaseActivity {
             if (replyFAB.getVisibility() != View.GONE) replyFAB.setEnabled(false);
         }
 
-        protected Integer doInBackground(String... strings) {
-            Document document;
+        protected ResultCode doInBackground(String... strings) {
+            Document document = null;
             String newPageUrl = strings[0];
 
             //Finds the index of message focus if present
@@ -578,7 +583,7 @@ public class TopicActivity extends BaseActivity {
             if (!reloadingPage && !Objects.equals(loadedPageUrl, "") && newPageUrl.contains(base_url)) {
                 if (newPageUrl.contains("topicseen#new") || newPageUrl.contains("#new"))
                     if (thisPage == numberOfPages)
-                        return SAME_PAGE;
+                        return ResultCode.SAME_PAGE;
                 if (newPageUrl.contains("msg")) {
                     String tmpUrlSbstr = newPageUrl.substring(newPageUrl.indexOf("msg") + 3);
                     if (tmpUrlSbstr.contains("msg"))
@@ -586,12 +591,12 @@ public class TopicActivity extends BaseActivity {
                     int testAgainst = Integer.parseInt(tmpUrlSbstr);
                     for (Post post : postsList) {
                         if (post.getPostIndex() == testAgainst) {
-                            return SAME_PAGE;
+                            return ResultCode.SAME_PAGE;
                         }
                     }
                 } else if ((Objects.equals(newPageUrl, base_url) && thisPage == 1) ||
                         Integer.parseInt(newPageUrl.substring(base_url.length() + 1)) / 15 + 1 == thisPage)
-                    return SAME_PAGE;
+                    return ResultCode.SAME_PAGE;
             } else if (!Objects.equals(loadedPageUrl, "")) topicTitle = null;
             if (reloadingPage) reloadingPage = !reloadingPage;
 
@@ -614,17 +619,22 @@ public class TopicActivity extends BaseActivity {
                         break;
                     }
                 }
-                return SUCCESS;
+                return ResultCode.SUCCESS;
             } catch (IOException e) {
                 Timber.i(e, "IO Exception");
-                return NETWORK_ERROR;
+                return ResultCode.NETWORK_ERROR;
+            } catch (ParseException e) {
+                if(isUnauthorized(document))
+                    return ResultCode.UNAUTHORIZED;
+                Timber.e(e, "Parsing Error");
+                return ResultCode.PARSING_ERROR;
             } catch (Exception e) {
                 Timber.e(e, "Exception");
-                return OTHER_ERROR;
+                return ResultCode.OTHER_ERROR;
             }
         }
 
-        protected void onPostExecute(Integer parseResult) {
+        protected void onPostExecute(ResultCode parseResult) {
             switch (parseResult) {
                 case SUCCESS:
                     if (topicTitle == null || Objects.equals(topicTitle, "")
@@ -635,7 +645,7 @@ public class TopicActivity extends BaseActivity {
                         invalidateOptionsMenu();
                     }
 
-                    if (!(postsList.isEmpty() || postsList.size() == 0)) {
+                    if (!postsList.isEmpty()) {
                         recyclerView.getRecycledViewPool().clear(); //Avoid inconsistency detected bug
                         postsList.clear();
                         topicAdapter.notifyItemRangeRemoved(0, postsList.size() - 1);
@@ -661,16 +671,14 @@ public class TopicActivity extends BaseActivity {
                     Toast.makeText(getBaseContext(), "Network Error", Toast.LENGTH_SHORT).show();
                     break;
                 case SAME_PAGE:
-                    progressBar.setVisibility(ProgressBar.INVISIBLE);
-                    if (replyPageUrl == null) {
-                        replyFAB.hide();
-                        topicAdapter.resetTopic(base_url, new TopicTask(), false);
-                    } else topicAdapter.resetTopic(base_url, new TopicTask(), true);
-                    if (replyFAB.getVisibility() != View.GONE) replyFAB.setEnabled(true);
-                    paginationEnabled(true);
-                    Toast.makeText(TopicActivity.this, "That's the same page.", Toast.LENGTH_SHORT).show();
+                    stopLoading();
+                    Toast.makeText(getBaseContext(), "That's the same page", Toast.LENGTH_SHORT).show();
                     //TODO change focus
                     break;
+                case UNAUTHORIZED:
+                    stopLoading();
+                    Toast.makeText(getBaseContext(), "This topic is either missing or off limits to you", Toast.LENGTH_SHORT).show();
+                    break;
                 default:
                     //Parse failed - should never happen
                     Timber.d("Parse failed!");  //TODO report ParseException!!!
@@ -680,55 +688,76 @@ public class TopicActivity extends BaseActivity {
             }
         }
 
+        private void stopLoading(){
+            progressBar.setVisibility(ProgressBar.INVISIBLE);
+            if (replyPageUrl == null) {
+                replyFAB.hide();
+                topicAdapter.resetTopic(base_url, new TopicTask(), false);
+            } else topicAdapter.resetTopic(base_url, new TopicTask(), true);
+            if (replyFAB.getVisibility() != View.GONE) replyFAB.setEnabled(true);
+            paginationEnabled(true);
+        }
+
         /**
          * All the parsing a topic needs.
          *
          * @param topic {@link Document} object containing this topic's source code
          * @see org.jsoup.Jsoup Jsoup
          */
-        private ArrayList<Post> parse(Document topic) {
-            ParseHelpers.Language language = ParseHelpers.Language.getLanguage(topic);
+        private ArrayList<Post> parse(Document topic) throws ParseException{
+            try {
+                ParseHelpers.Language language = ParseHelpers.Language.getLanguage(topic);
 
-            //Finds topic's tree, mods and users viewing
-            {
-                topicTreeAndMods = getSpannableFromHtml(topic.select("div.nav").first().html());
-                topicViewers = getSpannableFromHtml(TopicParser.parseUsersViewingThisTopic(topic, language));
-            }
+                //Finds topic's tree, mods and users viewing
+                {
+                    topicTreeAndMods = getSpannableFromHtml(topic.select("div.nav").first().html());
+                    topicViewers = getSpannableFromHtml(TopicParser.parseUsersViewingThisTopic(topic, language));
+                }
 
-            //Finds reply page url
-            {
-                Element replyButton = topic.select("a:has(img[alt=Reply])").first();
-                if (replyButton == null)
-                    replyButton = topic.select("a:has(img[alt=Απάντηση])").first();
-                if (replyButton != null) replyPageUrl = replyButton.attr("href");
-            }
+                //Finds reply page url
+                {
+                    Element replyButton = topic.select("a:has(img[alt=Reply])").first();
+                    if (replyButton == null)
+                        replyButton = topic.select("a:has(img[alt=Απάντηση])").first();
+                    if (replyButton != null) replyPageUrl = replyButton.attr("href");
+                }
 
-            //Finds topic title if missing
-            {
-                parsedTitle = topic.select("td[id=top_subject]").first().text();
-                if (parsedTitle.contains("Topic:")) {
-                    parsedTitle = parsedTitle.substring(parsedTitle.indexOf("Topic:") + 7
-                            , parsedTitle.indexOf("(Read") - 2);
-                } else {
-                    parsedTitle = parsedTitle.substring(parsedTitle.indexOf("Θέμα:") + 6
-                            , parsedTitle.indexOf("(Αναγνώστηκε") - 2);
-                    Timber.d("Parsed title: %s", parsedTitle);
+                //Finds topic title if missing
+                {
+                    parsedTitle = topic.select("td[id=top_subject]").first().text();
+                    if (parsedTitle.contains("Topic:")) {
+                        parsedTitle = parsedTitle.substring(parsedTitle.indexOf("Topic:") + 7
+                                , parsedTitle.indexOf("(Read") - 2);
+                    } else {
+                        parsedTitle = parsedTitle.substring(parsedTitle.indexOf("Θέμα:") + 6
+                                , parsedTitle.indexOf("(Αναγνώστηκε") - 2);
+                        Timber.d("Parsed title: %s", parsedTitle);
+                    }
                 }
-            }
 
-            { //Finds current page's index
-                thisPage = TopicParser.parseCurrentPageIndex(topic, language);
-            }
-            { //Finds number of pages
-                numberOfPages = TopicParser.parseTopicNumberOfPages(topic, thisPage, language);
+                { //Finds current page's index
+                    thisPage = TopicParser.parseCurrentPageIndex(topic, language);
+                }
+                { //Finds number of pages
+                    numberOfPages = TopicParser.parseTopicNumberOfPages(topic, thisPage, language);
 
-                for (int i = 0; i < numberOfPages; i++) {
-                    //Generate each page's url from topic's base url +".15*numberOfPage"
-                    pagesUrls.put(i, base_url + "." + String.valueOf(i * 15));
+                    for (int i = 0; i < numberOfPages; i++) {
+                        //Generate each page's url from topic's base url +".15*numberOfPage"
+                        pagesUrls.put(i, base_url + "." + String.valueOf(i * 15));
+                    }
                 }
+
+                return TopicParser.parseTopic(topic, language);
+            } catch (Exception e) {
+                throw new ParseException("Parsing failed (TopicTask)");
             }
+        }
 
-            return TopicParser.parseTopic(topic, language);
+        private boolean isUnauthorized(Document document) {
+            return document != null && document.select("body:contains(The topic or board you" +
+                    " are looking for appears to be either missing or off limits to you.)," +
+                    "body:contains(Το θέμα ή πίνακας που ψάχνετε ή δεν υπάρχει ή δεν " +
+                    "είναι προσβάσιμο από εσάς.)").size() > 0;
         }
 
         private void makeLinkClickable(SpannableStringBuilder strBuilder, final URLSpan span) {
@@ -881,7 +910,7 @@ public class TopicActivity extends BaseActivity {
                         //TODO this...
                         return true;
                     default:
-                        Timber.e("Malformed post. Request string:\n" + post.toString());
+                        Timber.e("Malformed post. Request string: %s", post.toString());
                         return true;
                 }
             } catch (IOException e) {
diff --git a/app/src/main/java/gr/thmmy/mthmmy/activities/topic/TopicParser.java b/app/src/main/java/gr/thmmy/mthmmy/activities/topic/TopicParser.java
index 3589f4cf..97f134ae 100644
--- a/app/src/main/java/gr/thmmy/mthmmy/activities/topic/TopicParser.java
+++ b/app/src/main/java/gr/thmmy/mthmmy/activities/topic/TopicParser.java
@@ -16,17 +16,17 @@ import java.util.Objects;
 
 import gr.thmmy.mthmmy.model.Post;
 import gr.thmmy.mthmmy.model.ThmmyFile;
-import gr.thmmy.mthmmy.utils.ParseHelpers;
+import gr.thmmy.mthmmy.utils.parsing.ParseHelpers;
 import timber.log.Timber;
 
 
 /**
  * Singleton used for parsing a topic.
  * <p>Class contains the methods:<ul><li>{@link #parseUsersViewingThisTopic(Document,
- * gr.thmmy.mthmmy.utils.ParseHelpers.Language)}</li>
- * <li>{@link #parseCurrentPageIndex(Document, gr.thmmy.mthmmy.utils.ParseHelpers.Language)}</li>
- * <li>{@link #parseTopicNumberOfPages(Document, int, gr.thmmy.mthmmy.utils.ParseHelpers.Language)}</li>
- * <li>{@link #parseTopic(Document, gr.thmmy.mthmmy.utils.ParseHelpers.Language)}</li>
+ * ParseHelpers.Language)}</li>
+ * <li>{@link #parseCurrentPageIndex(Document, ParseHelpers.Language)}</li>
+ * <li>{@link #parseTopicNumberOfPages(Document, int, ParseHelpers.Language)}</li>
+ * <li>{@link #parseTopic(Document, ParseHelpers.Language)}</li>
  */
 class TopicParser {
     //User colors
@@ -42,9 +42,9 @@ class TopicParser {
      * Returns users currently viewing this topic.
      *
      * @param topic    {@link Document} object containing this topic's source code
-     * @param language a {@link gr.thmmy.mthmmy.utils.ParseHelpers.Language} containing this topic's
+     * @param language a {@link ParseHelpers.Language} containing this topic's
      *                 language set, this is returned by
-     *                 {@link gr.thmmy.mthmmy.utils.ParseHelpers.Language#getLanguage(Document)}
+     *                 {@link ParseHelpers.Language#getLanguage(Document)}
      * @return String containing html with the usernames of users
      * @see org.jsoup.Jsoup Jsoup
      */
@@ -58,9 +58,9 @@ class TopicParser {
      * Returns current topic's page index.
      *
      * @param topic    {@link Document} object containing this topic's source code
-     * @param language a {@link gr.thmmy.mthmmy.utils.ParseHelpers.Language} containing this topic's
+     * @param language a {@link ParseHelpers.Language} containing this topic's
      *                 language set, this is returned by
-     *                 {@link gr.thmmy.mthmmy.utils.ParseHelpers.Language#getLanguage(Document)}
+     *                 {@link ParseHelpers.Language#getLanguage(Document)}
      * @return int containing parsed topic's current page
      * @see org.jsoup.Jsoup Jsoup
      */
@@ -96,9 +96,9 @@ class TopicParser {
      *
      * @param topic       {@link Document} object containing this topic's source code
      * @param currentPage an int containing current page of this topic
-     * @param language    a {@link gr.thmmy.mthmmy.utils.ParseHelpers.Language} containing this topic's
+     * @param language    a {@link ParseHelpers.Language} containing this topic's
      *                    language set, this is returned by
-     *                    {@link gr.thmmy.mthmmy.utils.ParseHelpers.Language#getLanguage(Document)}
+     *                    {@link ParseHelpers.Language#getLanguage(Document)}
      * @return int containing the number of pages
      * @see org.jsoup.Jsoup Jsoup
      */
@@ -134,9 +134,9 @@ class TopicParser {
      * This method parses all the information of a topic and it's posts.
      *
      * @param topic    {@link Document} object containing this topic's source code
-     * @param language a {@link gr.thmmy.mthmmy.utils.ParseHelpers.Language} containing this topic's
+     * @param language a {@link ParseHelpers.Language} containing this topic's
      *                 language set, this is returned by
-     *                 {@link gr.thmmy.mthmmy.utils.ParseHelpers.Language#getLanguage(Document)}
+     *                 {@link ParseHelpers.Language#getLanguage(Document)}
      * @return {@link ArrayList} of {@link Post}s
      * @see org.jsoup.Jsoup Jsoup
      */
diff --git a/app/src/main/java/gr/thmmy/mthmmy/base/BaseActivity.java b/app/src/main/java/gr/thmmy/mthmmy/base/BaseActivity.java
index ca50672c..833f7028 100644
--- a/app/src/main/java/gr/thmmy/mthmmy/base/BaseActivity.java
+++ b/app/src/main/java/gr/thmmy/mthmmy/base/BaseActivity.java
@@ -43,7 +43,7 @@ import gr.thmmy.mthmmy.activities.main.MainActivity;
 import gr.thmmy.mthmmy.activities.profile.ProfileActivity;
 import gr.thmmy.mthmmy.model.Bookmark;
 import gr.thmmy.mthmmy.model.ThmmyFile;
-import gr.thmmy.mthmmy.services.DownloadService;
+import gr.thmmy.mthmmy.services.downloads.DownloadsService;
 import gr.thmmy.mthmmy.session.SessionManager;
 import okhttp3.OkHttpClient;
 
@@ -611,7 +611,7 @@ public abstract class BaseActivity extends AppCompatActivity {
 
     public void launchDownloadService(ThmmyFile thmmyFile) {
         if (checkPerms())
-            DownloadService.startActionDownload(this, thmmyFile.getFileUrl().toString());
+            DownloadsService.startActionDownload(this, thmmyFile.getFileUrl().toString());
         else {
             tempThmmyFile = thmmyFile;
             requestPerms();
@@ -621,7 +621,7 @@ public abstract class BaseActivity extends AppCompatActivity {
     //Uses temp file - called after permission grant
     private void launchDownloadService() {
         if (checkPerms())
-            DownloadService.startActionDownload(this, tempThmmyFile.getFileUrl().toString());
+            DownloadsService.startActionDownload(this, tempThmmyFile.getFileUrl().toString());
 
     }
 
diff --git a/app/src/main/java/gr/thmmy/mthmmy/model/ThmmyPage.java b/app/src/main/java/gr/thmmy/mthmmy/model/ThmmyPage.java
index 8962f2b9..3478b618 100644
--- a/app/src/main/java/gr/thmmy/mthmmy/model/ThmmyPage.java
+++ b/app/src/main/java/gr/thmmy/mthmmy/model/ThmmyPage.java
@@ -3,6 +3,8 @@ package gr.thmmy.mthmmy.model;
 import android.net.Uri;
 
 import java.util.Objects;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 import timber.log.Timber;
 
@@ -187,4 +189,18 @@ public class ThmmyPage {
         }
         return null;
     }
+
+    /**
+     * This method gets a VALID topic url and strips any unnecessary stuff (like e.g. wap2)
+     *
+     * @param topicUrl a valid topic url
+     * @return sanitized topic url
+     */
+    public  static String sanitizeTopicUrl(String topicUrl) {
+        Pattern pattern = Pattern.compile("http.*topic=\\d*\\.?\\d*");
+        Matcher matcher = pattern.matcher(topicUrl);
+        if (matcher.find())
+            return matcher.group(0);
+       return null;
+    }
 }
diff --git a/app/src/main/java/gr/thmmy/mthmmy/receiver/Receiver.java b/app/src/main/java/gr/thmmy/mthmmy/services/downloads/DownloadsReceiver.java
similarity index 76%
rename from app/src/main/java/gr/thmmy/mthmmy/receiver/Receiver.java
rename to app/src/main/java/gr/thmmy/mthmmy/services/downloads/DownloadsReceiver.java
index f37e5078..535372a4 100644
--- a/app/src/main/java/gr/thmmy/mthmmy/receiver/Receiver.java
+++ b/app/src/main/java/gr/thmmy/mthmmy/services/downloads/DownloadsReceiver.java
@@ -1,4 +1,4 @@
-package gr.thmmy.mthmmy.receiver;
+package gr.thmmy.mthmmy.services.downloads;
 
 import android.app.NotificationChannel;
 import android.app.NotificationManager;
@@ -16,23 +16,23 @@ import java.io.File;
 
 import timber.log.Timber;
 
-import static gr.thmmy.mthmmy.services.DownloadService.ACTION_DOWNLOAD;
-import static gr.thmmy.mthmmy.services.DownloadService.COMPLETED;
-import static gr.thmmy.mthmmy.services.DownloadService.EXTRA_DOWNLOAD_ID;
-import static gr.thmmy.mthmmy.services.DownloadService.EXTRA_DOWNLOAD_STATE;
-import static gr.thmmy.mthmmy.services.DownloadService.EXTRA_FILE_NAME;
-import static gr.thmmy.mthmmy.services.DownloadService.EXTRA_NOTIFICATION_TEXT;
-import static gr.thmmy.mthmmy.services.DownloadService.EXTRA_NOTIFICATION_TICKER;
-import static gr.thmmy.mthmmy.services.DownloadService.EXTRA_NOTIFICATION_TITLE;
-import static gr.thmmy.mthmmy.services.DownloadService.SAVE_DIR;
-import static gr.thmmy.mthmmy.services.DownloadService.STARTED;
-
-public class Receiver extends BroadcastReceiver {
+import static gr.thmmy.mthmmy.services.downloads.DownloadsService.ACTION_DOWNLOAD;
+import static gr.thmmy.mthmmy.services.downloads.DownloadsService.COMPLETED;
+import static gr.thmmy.mthmmy.services.downloads.DownloadsService.EXTRA_DOWNLOAD_ID;
+import static gr.thmmy.mthmmy.services.downloads.DownloadsService.EXTRA_DOWNLOAD_STATE;
+import static gr.thmmy.mthmmy.services.downloads.DownloadsService.EXTRA_FILE_NAME;
+import static gr.thmmy.mthmmy.services.downloads.DownloadsService.EXTRA_NOTIFICATION_TEXT;
+import static gr.thmmy.mthmmy.services.downloads.DownloadsService.EXTRA_NOTIFICATION_TICKER;
+import static gr.thmmy.mthmmy.services.downloads.DownloadsService.EXTRA_NOTIFICATION_TITLE;
+import static gr.thmmy.mthmmy.services.downloads.DownloadsService.SAVE_DIR;
+import static gr.thmmy.mthmmy.services.downloads.DownloadsService.STARTED;
+
+public class DownloadsReceiver extends BroadcastReceiver {
     private static final String NOTIFICATION_TAG = "DOWNLOADS";
     private static final String DOWNLOADS_CHANNEL_ID = "Downloads";
     private static final String DOWNLOADS_CHANNEL_NAME = "Downloads";
 
-    public Receiver() {}
+    public DownloadsReceiver() {}
 
     @Override
     public void onReceive(Context context, Intent intent) {
diff --git a/app/src/main/java/gr/thmmy/mthmmy/services/DownloadService.java b/app/src/main/java/gr/thmmy/mthmmy/services/downloads/DownloadsService.java
similarity index 94%
rename from app/src/main/java/gr/thmmy/mthmmy/services/DownloadService.java
rename to app/src/main/java/gr/thmmy/mthmmy/services/downloads/DownloadsService.java
index be081a25..9692f5ea 100644
--- a/app/src/main/java/gr/thmmy/mthmmy/services/DownloadService.java
+++ b/app/src/main/java/gr/thmmy/mthmmy/services/downloads/DownloadsService.java
@@ -1,4 +1,4 @@
-package gr.thmmy.mthmmy.services;
+package gr.thmmy.mthmmy.services.downloads;
 
 import android.app.DownloadManager;
 import android.app.IntentService;
@@ -14,7 +14,6 @@ import java.io.FileNotFoundException;
 import java.io.IOException;
 
 import gr.thmmy.mthmmy.base.BaseApplication;
-import gr.thmmy.mthmmy.receiver.Receiver;
 import okhttp3.OkHttpClient;
 import okhttp3.Request;
 import okhttp3.Response;
@@ -26,11 +25,11 @@ import timber.log.Timber;
  * An {@link IntentService} subclass for handling asynchronous task requests in
  * a service on a separate handler thread.
  */
-public class DownloadService extends IntentService {
-    private static final String TAG = "DownloadService";
+public class DownloadsService extends IntentService {
+    private static final String TAG = "DownloadsService";
     private static int sDownloadId = 0;
 
-    private Receiver receiver;
+    private DownloadsReceiver receiver;
 
     public static final String SAVE_DIR = Environment.getExternalStorageDirectory().getAbsolutePath() + File.separator + "mthmmy";
 
@@ -49,15 +48,15 @@ public class DownloadService extends IntentService {
     public static final String FAILED = "Failed";
 
 
-    public DownloadService() {
-        super("DownloadService");
+    public DownloadsService() {
+        super("DownloadsService");
     }
 
     @Override
     public void onCreate() {
         super.onCreate();
-        final IntentFilter filter = new IntentFilter(DownloadService.ACTION_DOWNLOAD);
-        receiver = new Receiver();
+        final IntentFilter filter = new IntentFilter(DownloadsService.ACTION_DOWNLOAD);
+        receiver = new DownloadsReceiver();
         registerReceiver(receiver, filter);
 
     }
@@ -75,7 +74,7 @@ public class DownloadService extends IntentService {
      * @see IntentService
      */
     public static void startActionDownload(Context context, String downloadUrl) {
-        Intent intent = new Intent(context, DownloadService.class);
+        Intent intent = new Intent(context, DownloadsService.class);
         intent.setAction(ACTION_DOWNLOAD);
         intent.putExtra(EXTRA_DOWNLOAD_URL, downloadUrl);
         context.startService(intent);
diff --git a/app/src/main/java/gr/thmmy/mthmmy/session/SessionManager.java b/app/src/main/java/gr/thmmy/mthmmy/session/SessionManager.java
index 7f976aaa..94f8a284 100644
--- a/app/src/main/java/gr/thmmy/mthmmy/session/SessionManager.java
+++ b/app/src/main/java/gr/thmmy/mthmmy/session/SessionManager.java
@@ -17,7 +17,7 @@ import java.util.List;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import gr.thmmy.mthmmy.utils.exceptions.ParseException;
+import gr.thmmy.mthmmy.utils.parsing.ParseException;
 import okhttp3.Cookie;
 import okhttp3.FormBody;
 import okhttp3.HttpUrl;
diff --git a/app/src/main/java/gr/thmmy/mthmmy/utils/exceptions/ParseException.java b/app/src/main/java/gr/thmmy/mthmmy/utils/parsing/ParseException.java
similarity index 84%
rename from app/src/main/java/gr/thmmy/mthmmy/utils/exceptions/ParseException.java
rename to app/src/main/java/gr/thmmy/mthmmy/utils/parsing/ParseException.java
index b0947f04..fea7be6b 100644
--- a/app/src/main/java/gr/thmmy/mthmmy/utils/exceptions/ParseException.java
+++ b/app/src/main/java/gr/thmmy/mthmmy/utils/parsing/ParseException.java
@@ -1,4 +1,4 @@
-package gr.thmmy.mthmmy.utils.exceptions;
+package gr.thmmy.mthmmy.utils.parsing;
 
 /**
  * ParseException is to be used for errors while parsing.
diff --git a/app/src/main/java/gr/thmmy/mthmmy/utils/ParseHelpers.java b/app/src/main/java/gr/thmmy/mthmmy/utils/parsing/ParseHelpers.java
similarity index 99%
rename from app/src/main/java/gr/thmmy/mthmmy/utils/ParseHelpers.java
rename to app/src/main/java/gr/thmmy/mthmmy/utils/parsing/ParseHelpers.java
index a2e80cca..307efab0 100644
--- a/app/src/main/java/gr/thmmy/mthmmy/utils/ParseHelpers.java
+++ b/app/src/main/java/gr/thmmy/mthmmy/utils/parsing/ParseHelpers.java
@@ -1,4 +1,4 @@
-package gr.thmmy.mthmmy.utils;
+package gr.thmmy.mthmmy.utils.parsing;
 
 import org.jsoup.nodes.Document;
 import org.jsoup.nodes.Element;
diff --git a/app/src/main/java/gr/thmmy/mthmmy/utils/ParseTask.java b/app/src/main/java/gr/thmmy/mthmmy/utils/parsing/ParseTask.java
similarity index 96%
rename from app/src/main/java/gr/thmmy/mthmmy/utils/ParseTask.java
rename to app/src/main/java/gr/thmmy/mthmmy/utils/parsing/ParseTask.java
index ce7df62a..16b21583 100644
--- a/app/src/main/java/gr/thmmy/mthmmy/utils/ParseTask.java
+++ b/app/src/main/java/gr/thmmy/mthmmy/utils/parsing/ParseTask.java
@@ -1,4 +1,4 @@
-package gr.thmmy.mthmmy.utils;
+package gr.thmmy.mthmmy.utils.parsing;
 
 import android.os.AsyncTask;
 import android.widget.Toast;
@@ -9,7 +9,6 @@ import org.jsoup.nodes.Document;
 import java.io.IOException;
 
 import gr.thmmy.mthmmy.base.BaseApplication;
-import gr.thmmy.mthmmy.utils.exceptions.ParseException;
 import okhttp3.Request;
 import okhttp3.Response;
 import timber.log.Timber;

From d6ca0319bfc13c43617fc7b39ade97460575324a Mon Sep 17 00:00:00 2001
From: Ezerous <ezerous@gmail.com>
Date: Sat, 16 Jun 2018 13:38:26 +0300
Subject: [PATCH 24/29] Hotfix (sanitizeTopicUrl)

---
 app/src/main/java/gr/thmmy/mthmmy/model/ThmmyPage.java | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/gr/thmmy/mthmmy/model/ThmmyPage.java b/app/src/main/java/gr/thmmy/mthmmy/model/ThmmyPage.java
index 3478b618..aff0a38a 100644
--- a/app/src/main/java/gr/thmmy/mthmmy/model/ThmmyPage.java
+++ b/app/src/main/java/gr/thmmy/mthmmy/model/ThmmyPage.java
@@ -191,16 +191,11 @@ public class ThmmyPage {
     }
 
     /**
-     * This method gets a VALID topic url and strips any unnecessary stuff (like e.g. wap2)
-     *
+     * This method gets a VALID topic url and strips it off any unnecessary stuff (e.g. wap2).
      * @param topicUrl a valid topic url
      * @return sanitized topic url
      */
     public  static String sanitizeTopicUrl(String topicUrl) {
-        Pattern pattern = Pattern.compile("http.*topic=\\d*\\.?\\d*");
-        Matcher matcher = pattern.matcher(topicUrl);
-        if (matcher.find())
-            return matcher.group(0);
-       return null;
+       return topicUrl.replace("action=printpage;","").replace("wap2","");
     }
 }

From 265b0705bd666a3a50ac95bec7fd1688a34a5356 Mon Sep 17 00:00:00 2001
From: Ezerous <ezerous@gmail.com>
Date: Fri, 22 Jun 2018 11:33:48 +0300
Subject: [PATCH 25/29] Improved downloading (overhauled)

---
 app/build.gradle                              |   5 +-
 app/src/main/AndroidManifest.xml              |  13 -
 .../activities/board/BoardActivity.java       |   4 +-
 .../downloads/DownloadsActivity.java          | 127 ++++++----
 .../downloads/DownloadsAdapter.java           |   4 +-
 .../activities/main/forum/ForumFragment.java  |   4 +-
 .../main/recent/RecentFragment.java           |   4 +-
 .../main/unread/UnreadFragment.java           |   4 +-
 .../mthmmy/activities/topic/TopicAdapter.java |   2 +-
 .../gr/thmmy/mthmmy/base/BaseActivity.java    |  73 +++++-
 .../java/gr/thmmy/mthmmy/model/Download.java  |   9 +
 .../java/gr/thmmy/mthmmy/model/ThmmyPage.java |   2 -
 .../thmmy/mthmmy/services/DownloadHelper.java |  73 ++++++
 .../services/downloads/DownloadsReceiver.java |  88 -------
 .../services/downloads/DownloadsService.java  | 225 ------------------
 .../thmmy/mthmmy/session/SessionManager.java  |  10 +
 .../java/gr/thmmy/mthmmy/utils/FileUtils.java |  26 ++
 .../thmmy/mthmmy/utils/parsing/ParseTask.java |   7 +-
 .../res/layout/download_prompt_dialog.xml     |  48 ++++
 app/src/main/res/values/strings.xml           |  11 +-
 app/src/main/res/xml/provider_paths.xml       |   8 +-
 build.gradle                                  |   1 -
 22 files changed, 338 insertions(+), 410 deletions(-)
 create mode 100644 app/src/main/java/gr/thmmy/mthmmy/services/DownloadHelper.java
 delete mode 100644 app/src/main/java/gr/thmmy/mthmmy/services/downloads/DownloadsReceiver.java
 delete mode 100644 app/src/main/java/gr/thmmy/mthmmy/services/downloads/DownloadsService.java
 create mode 100644 app/src/main/java/gr/thmmy/mthmmy/utils/FileUtils.java
 create mode 100644 app/src/main/res/layout/download_prompt_dialog.xml

diff --git a/app/build.gradle b/app/build.gradle
index d8a01d0d..3b463434 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -4,7 +4,6 @@ apply plugin: 'io.fabric'
 
 android {
     compileSdkVersion 27
-    buildToolsVersion "27.0.3"
 
     defaultConfig {
         vectorDrawables.useSupportLibrary = true
@@ -35,9 +34,9 @@ dependencies {
     implementation 'com.android.support:support-v4:27.1.1'
     implementation 'com.android.support:cardview-v7:27.1.1'
     implementation 'com.android.support:recyclerview-v7:27.1.1'
-    implementation 'com.google.firebase:firebase-core:16.0.0'
+    implementation 'com.google.firebase:firebase-core:16.0.1'
     implementation 'com.google.firebase:firebase-messaging:17.0.0'
-    implementation 'com.crashlytics.sdk.android:crashlytics:2.9.3'
+    implementation 'com.crashlytics.sdk.android:crashlytics:2.9.4'
     implementation 'com.squareup.okhttp3:okhttp:3.10.0'
     implementation 'com.squareup.picasso:picasso:2.5.2'
     implementation 'com.jakewharton.picasso:picasso2-okhttp3-downloader:1.1.0'
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index bca9ca45..c9bfa2af 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -116,9 +116,6 @@
                 android:resource="@xml/provider_paths" />
         </provider>
 
-        <service
-            android:name=".services.downloads.DownloadsService"
-            android:exported="false" />
         <service
             android:name=".services.NotificationService"
             android:exported="false">
@@ -126,16 +123,6 @@
                 <action android:name="com.google.firebase.MESSAGING_EVENT"/>
             </intent-filter>
         </service>
-
-        <receiver
-            android:name=".services.downloads.DownloadsReceiver"
-            android:enabled="true"
-            android:exported="false">
-            <intent-filter>
-                <action android:name="android.media.action.ACTION_DOWNLOAD" />
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
-        </receiver>
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/app/src/main/java/gr/thmmy/mthmmy/activities/board/BoardActivity.java b/app/src/main/java/gr/thmmy/mthmmy/activities/board/BoardActivity.java
index c6620218..251c7c2b 100644
--- a/app/src/main/java/gr/thmmy/mthmmy/activities/board/BoardActivity.java
+++ b/app/src/main/java/gr/thmmy/mthmmy/activities/board/BoardActivity.java
@@ -25,8 +25,8 @@ import gr.thmmy.mthmmy.model.Board;
 import gr.thmmy.mthmmy.model.Bookmark;
 import gr.thmmy.mthmmy.model.ThmmyPage;
 import gr.thmmy.mthmmy.model.Topic;
-import gr.thmmy.mthmmy.utils.parsing.ParseTask;
 import gr.thmmy.mthmmy.utils.parsing.ParseException;
+import gr.thmmy.mthmmy.utils.parsing.ParseTask;
 import me.zhanghai.android.materialprogressbar.MaterialProgressBar;
 import timber.log.Timber;
 
@@ -298,7 +298,7 @@ public class BoardActivity extends BaseActivity implements BoardAdapter.OnLoadMo
         }
 
         @Override
-        protected void postParsing(ResultCode result) {
+        protected void postExecution(ResultCode result) {
             //TODO if (result == ResultCode.SUCCESS)...
             if (boardTitle == null || Objects.equals(boardTitle, "")
                     || !Objects.equals(boardTitle, parsedTitle)) {
diff --git a/app/src/main/java/gr/thmmy/mthmmy/activities/downloads/DownloadsActivity.java b/app/src/main/java/gr/thmmy/mthmmy/activities/downloads/DownloadsActivity.java
index 6d899d23..93d92f1a 100644
--- a/app/src/main/java/gr/thmmy/mthmmy/activities/downloads/DownloadsActivity.java
+++ b/app/src/main/java/gr/thmmy/mthmmy/activities/downloads/DownloadsActivity.java
@@ -20,11 +20,15 @@ import java.util.Objects;
 
 import gr.thmmy.mthmmy.R;
 import gr.thmmy.mthmmy.base.BaseActivity;
+import gr.thmmy.mthmmy.base.BaseApplication;
 import gr.thmmy.mthmmy.model.Download;
 import gr.thmmy.mthmmy.model.ThmmyPage;
-import gr.thmmy.mthmmy.utils.parsing.ParseTask;
 import gr.thmmy.mthmmy.utils.parsing.ParseException;
+import gr.thmmy.mthmmy.utils.parsing.ParseTask;
 import me.zhanghai.android.materialprogressbar.MaterialProgressBar;
+import okhttp3.OkHttpClient;
+import okhttp3.Request;
+import okhttp3.Response;
 import timber.log.Timber;
 
 public class DownloadsActivity extends BaseActivity implements DownloadsAdapter.OnLoadMoreListener {
@@ -158,13 +162,16 @@ public class DownloadsActivity extends BaseActivity implements DownloadsAdapter.
 
     /**
      * An {@link ParseTask} that handles asynchronous fetching of a downloads page and parsing it's
-     * data. {@link ParseTask#postParsing(ResultCode) postParsing} method calls {@link RecyclerView#swapAdapter}
+     * data. {@link ParseTask#postExecution(ResultCode) postExecution} method calls {@link RecyclerView#swapAdapter}
      * to build graphics.
      * <p>
      * <p>Calling TopicTask's {@link ParseTask#execute execute} method needs to have profile's url
      * as String parameter!</p>
      */
     private class ParseDownloadPageTask extends ParseTask {
+        private Download.DownloadItemType type;
+        private Download download;
+
         @Override
         protected void onPreExecute() {
             if (!isLoadingMore) progressBar.setVisibility(ProgressBar.VISIBLE);
@@ -173,69 +180,89 @@ public class DownloadsActivity extends BaseActivity implements DownloadsAdapter.
 
         @Override
         protected void parse(Document downloadPage) throws ParseException {
-            if (downloadsTitle == null || Objects.equals(downloadsTitle, ""))
-                downloadsTitle = downloadPage.select("div.nav>b>a.nav").last().text();
+            try{
+                if (downloadsTitle == null || Objects.equals(downloadsTitle, ""))
+                    downloadsTitle = downloadPage.select("div.nav>b>a.nav").last().text();
 
-            //Removes loading item
-            if (isLoadingMore) {
-                if (parsedDownloads.size() > 0) parsedDownloads.remove(parsedDownloads.size() - 1);
-            }
-
-            Download.DownloadItemType type;
-            if (ThmmyPage.resolvePageCategory(Uri.parse(url)).is(ThmmyPage.
-                    PageCategory.DOWNLOADS_CATEGORY))
-                type = Download.DownloadItemType.DOWNLOADS_CATEGORY;
-            else type = Download.DownloadItemType.DOWNLOADS_FILE;
-
-            Elements pages = downloadPage.select("a.navPages");
-            if (pages != null) {
-                for (Element page : pages) {
-                    int pageNumber = Integer.parseInt(page.text());
-                    if (pageNumber > numberOfPages) numberOfPages = pageNumber;
+                //Removes loading item
+                if (isLoadingMore) {
+                    if (parsedDownloads.size() > 0) parsedDownloads.remove(parsedDownloads.size() - 1);
                 }
-            } else numberOfPages = 1;
-
-            Elements rows = downloadPage.select("table.tborder>tbody>tr");
-            if (type == Download.DownloadItemType.DOWNLOADS_CATEGORY) {
-                Elements navigationLinks = downloadPage.select("div.nav>b");
-                for (Element row : rows) {
-                    if (row.select("td").size() == 1) continue;
-
-                    String url = row.select("b>a").first().attr("href"),
-                            title = row.select("b>a").first().text(),
-                            subtitle = row.select("div.smalltext:not(:has(a))").text();
-                    if (!row.select("td").last().hasClass("windowbg2")) {
-                        if (navigationLinks.size() < 4) {
-
-                            parsedDownloads.add(new Download(type, url, title, subtitle, null,
-                                    true, null));
+
+                if (ThmmyPage.resolvePageCategory(Uri.parse(url)).is(ThmmyPage.PageCategory.DOWNLOADS_CATEGORY))
+                    type = Download.DownloadItemType.DOWNLOADS_CATEGORY;
+                else
+                    type = Download.DownloadItemType.DOWNLOADS_FILE;
+
+                Elements pages = downloadPage.select("a.navPages");
+                if (pages != null) {
+                    for (Element page : pages) {
+                        int pageNumber = Integer.parseInt(page.text());
+                        if (pageNumber > numberOfPages) numberOfPages = pageNumber;
+                    }
+                } else numberOfPages = 1;
+
+                Elements rows = downloadPage.select("table.tborder>tbody>tr");
+                if (type == Download.DownloadItemType.DOWNLOADS_CATEGORY) {
+                    Elements navigationLinks = downloadPage.select("div.nav>b");
+                    for (Element row : rows) {
+                        if (row.select("td").size() == 1) continue;
+
+                        String url = row.select("b>a").first().attr("href"),
+                                title = row.select("b>a").first().text(),
+                                subtitle = row.select("div.smalltext:not(:has(a))").text();
+                        if (!row.select("td").last().hasClass("windowbg2")) {
+                            if (navigationLinks.size() < 4) {
+
+                                parsedDownloads.add(new Download(type, url, title, subtitle, null,
+                                        true, null));
+                            } else {
+                                String stats = row.text();
+                                stats = stats.replace(title, "").replace(subtitle, "").trim();
+                                parsedDownloads.add(new Download(type, url, title, subtitle, stats,
+                                        false, null));
+                            }
                         } else {
                             String stats = row.text();
                             stats = stats.replace(title, "").replace(subtitle, "").trim();
                             parsedDownloads.add(new Download(type, url, title, subtitle, stats,
                                     false, null));
                         }
-                    } else {
-                        String stats = row.text();
-                        stats = stats.replace(title, "").replace(subtitle, "").trim();
-                        parsedDownloads.add(new Download(type, url, title, subtitle, stats,
-                                false, null));
                     }
+                } else {
+                    download = new Download(type,
+                    rows.select("b>a").first().attr("href"),
+                    rows.select("b>a").first().text(),
+                    rows.select("div.smalltext:not(:has(a))").text(),
+                    rows.select("span:not(:has(a))").first().text(),
+                    false,
+                    rows.select("span:has(a)").first().text());
+                    parsedDownloads.add(download);
                 }
-            } else {
-                parsedDownloads.add(new Download(type,
-                        rows.select("b>a").first().attr("href"),
-                        rows.select("b>a").first().text(),
-                        rows.select("div.smalltext:not(:has(a))").text(),
-                        rows.select("span:not(:has(a))").first().text(),
-                        false,
-                        rows.select("span:has(a)").first().text()));
+            }catch(Exception e){
+                throw new ParseException("Parsing failed (DownloadsActivity)");
             }
         }
 
+        @Override
+        protected void postParsing() {
+            if (type == Download.DownloadItemType.DOWNLOADS_FILE) {
+                OkHttpClient client = BaseApplication.getInstance().getClient();
+                String fileName = null;
+                try {
+                    Response response = client.newCall(new Request.Builder().url(download.getUrl()).build()).execute();
+                    String contentDisposition = response.headers("Content-Disposition").toString();   //check if link provides an attachment
+                    if (contentDisposition.contains("attachment"))
+                        fileName = contentDisposition.split("\"")[1];
+                    download.setFileName(fileName);
+                } catch (Exception e) {
+                    Timber.e(e, "Couldn't extract fileName.");
+                }
+            }
+        }
 
         @Override
-        protected void postParsing(ResultCode result) {
+        protected void postExecution(ResultCode result) {
             if (downloadsTitle != null && !downloadsTitle.equals("")
                     && !downloadsTitle.equals("Αρχεία για λήψη")
                     && toolbar.getTitle() != downloadsTitle)
diff --git a/app/src/main/java/gr/thmmy/mthmmy/activities/downloads/DownloadsAdapter.java b/app/src/main/java/gr/thmmy/mthmmy/activities/downloads/DownloadsAdapter.java
index 7a7bf17f..5395b447 100644
--- a/app/src/main/java/gr/thmmy/mthmmy/activities/downloads/DownloadsAdapter.java
+++ b/app/src/main/java/gr/thmmy/mthmmy/activities/downloads/DownloadsAdapter.java
@@ -127,8 +127,8 @@ class DownloadsAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
                     @Override
                     public void onClick(View view) {
                         try {
-                            ((BaseActivity) context).launchDownloadService(new ThmmyFile(
-                                    new URL(download.getUrl()), null, null));
+                            ((BaseActivity) context).downloadFile(new ThmmyFile(
+                                    new URL(download.getUrl()), download.getFileName(), null));
                         } catch (MalformedURLException e) {
                             e.printStackTrace();
                         }
diff --git a/app/src/main/java/gr/thmmy/mthmmy/activities/main/forum/ForumFragment.java b/app/src/main/java/gr/thmmy/mthmmy/activities/main/forum/ForumFragment.java
index 02da2734..3b6366b4 100644
--- a/app/src/main/java/gr/thmmy/mthmmy/activities/main/forum/ForumFragment.java
+++ b/app/src/main/java/gr/thmmy/mthmmy/activities/main/forum/ForumFragment.java
@@ -27,8 +27,8 @@ import gr.thmmy.mthmmy.model.Board;
 import gr.thmmy.mthmmy.model.Category;
 import gr.thmmy.mthmmy.session.SessionManager;
 import gr.thmmy.mthmmy.utils.CustomRecyclerView;
-import gr.thmmy.mthmmy.utils.parsing.ParseTask;
 import gr.thmmy.mthmmy.utils.parsing.ParseException;
+import gr.thmmy.mthmmy.utils.parsing.ParseTask;
 import me.zhanghai.android.materialprogressbar.MaterialProgressBar;
 import okhttp3.HttpUrl;
 import okhttp3.Request;
@@ -215,7 +215,7 @@ public class ForumFragment extends BaseFragment {
         }
 
         @Override
-        protected void postParsing(ParseTask.ResultCode result) {
+        protected void postExecution(ParseTask.ResultCode result) {
             if (result == ResultCode.SUCCESS)
                 forumAdapter.notifyParentDataSetChanged(false);
 
diff --git a/app/src/main/java/gr/thmmy/mthmmy/activities/main/recent/RecentFragment.java b/app/src/main/java/gr/thmmy/mthmmy/activities/main/recent/RecentFragment.java
index 5dab8c1e..aee35e37 100644
--- a/app/src/main/java/gr/thmmy/mthmmy/activities/main/recent/RecentFragment.java
+++ b/app/src/main/java/gr/thmmy/mthmmy/activities/main/recent/RecentFragment.java
@@ -24,8 +24,8 @@ import gr.thmmy.mthmmy.base.BaseFragment;
 import gr.thmmy.mthmmy.model.TopicSummary;
 import gr.thmmy.mthmmy.session.SessionManager;
 import gr.thmmy.mthmmy.utils.CustomRecyclerView;
-import gr.thmmy.mthmmy.utils.parsing.ParseTask;
 import gr.thmmy.mthmmy.utils.parsing.ParseException;
+import gr.thmmy.mthmmy.utils.parsing.ParseTask;
 import me.zhanghai.android.materialprogressbar.MaterialProgressBar;
 import timber.log.Timber;
 
@@ -190,7 +190,7 @@ public class RecentFragment extends BaseFragment {
         }
 
         @Override
-        protected void postParsing(ParseTask.ResultCode result) {
+        protected void postExecution(ParseTask.ResultCode result) {
             if (result == ResultCode.SUCCESS)
             {
                 topicSummaries.clear();
diff --git a/app/src/main/java/gr/thmmy/mthmmy/activities/main/unread/UnreadFragment.java b/app/src/main/java/gr/thmmy/mthmmy/activities/main/unread/UnreadFragment.java
index 7b42fb20..98be97e2 100644
--- a/app/src/main/java/gr/thmmy/mthmmy/activities/main/unread/UnreadFragment.java
+++ b/app/src/main/java/gr/thmmy/mthmmy/activities/main/unread/UnreadFragment.java
@@ -25,8 +25,8 @@ import gr.thmmy.mthmmy.base.BaseFragment;
 import gr.thmmy.mthmmy.model.TopicSummary;
 import gr.thmmy.mthmmy.session.SessionManager;
 import gr.thmmy.mthmmy.utils.CustomRecyclerView;
-import gr.thmmy.mthmmy.utils.parsing.ParseTask;
 import gr.thmmy.mthmmy.utils.parsing.ParseException;
+import gr.thmmy.mthmmy.utils.parsing.ParseTask;
 import me.zhanghai.android.materialprogressbar.MaterialProgressBar;
 import okhttp3.Request;
 import timber.log.Timber;
@@ -204,7 +204,7 @@ public class UnreadFragment extends BaseFragment {
         }
 
         @Override
-        protected void postParsing(ParseTask.ResultCode result) {
+        protected void postExecution(ParseTask.ResultCode result) {
             if (result == ResultCode.SUCCESS)
                 unreadAdapter.notifyDataSetChanged();
 
diff --git a/app/src/main/java/gr/thmmy/mthmmy/activities/topic/TopicAdapter.java b/app/src/main/java/gr/thmmy/mthmmy/activities/topic/TopicAdapter.java
index 40bb41f1..54560b58 100644
--- a/app/src/main/java/gr/thmmy/mthmmy/activities/topic/TopicAdapter.java
+++ b/app/src/main/java/gr/thmmy/mthmmy/activities/topic/TopicAdapter.java
@@ -238,7 +238,7 @@ class TopicAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
                         attached.setOnClickListener(new View.OnClickListener() {
                             @Override
                             public void onClick(View view) {
-                                ((BaseActivity) context).launchDownloadService(attachedFile);
+                                ((BaseActivity) context).downloadFile(attachedFile);
                             }
                         });
 
diff --git a/app/src/main/java/gr/thmmy/mthmmy/base/BaseActivity.java b/app/src/main/java/gr/thmmy/mthmmy/base/BaseActivity.java
index 833f7028..d5cb13ec 100644
--- a/app/src/main/java/gr/thmmy/mthmmy/base/BaseActivity.java
+++ b/app/src/main/java/gr/thmmy/mthmmy/base/BaseActivity.java
@@ -7,16 +7,21 @@ import android.content.Intent;
 import android.content.SharedPreferences;
 import android.content.pm.PackageManager;
 import android.graphics.drawable.Drawable;
+import android.net.Uri;
 import android.os.AsyncTask;
 import android.os.Build;
 import android.os.Bundle;
 import android.support.annotation.NonNull;
+import android.support.design.widget.BottomSheetDialog;
 import android.support.v4.content.ContextCompat;
+import android.support.v4.content.FileProvider;
 import android.support.v7.app.AppCompatActivity;
 import android.support.v7.widget.Toolbar;
 import android.view.MenuItem;
 import android.view.View;
+import android.widget.Button;
 import android.widget.ImageButton;
+import android.widget.TextView;
 import android.widget.Toast;
 
 import com.google.firebase.messaging.FirebaseMessaging;
@@ -32,6 +37,7 @@ import com.mikepenz.materialdrawer.model.ProfileDrawerItem;
 import com.mikepenz.materialdrawer.model.interfaces.IDrawerItem;
 import com.mikepenz.materialdrawer.model.interfaces.IProfile;
 
+import java.io.File;
 import java.util.ArrayList;
 
 import gr.thmmy.mthmmy.R;
@@ -43,9 +49,11 @@ import gr.thmmy.mthmmy.activities.main.MainActivity;
 import gr.thmmy.mthmmy.activities.profile.ProfileActivity;
 import gr.thmmy.mthmmy.model.Bookmark;
 import gr.thmmy.mthmmy.model.ThmmyFile;
-import gr.thmmy.mthmmy.services.downloads.DownloadsService;
+import gr.thmmy.mthmmy.services.DownloadHelper;
 import gr.thmmy.mthmmy.session.SessionManager;
+import gr.thmmy.mthmmy.utils.FileUtils;
 import okhttp3.OkHttpClient;
+import timber.log.Timber;
 
 import static android.content.Intent.FLAG_ACTIVITY_NEW_TASK;
 import static gr.thmmy.mthmmy.activities.downloads.DownloadsActivity.BUNDLE_DOWNLOADS_TITLE;
@@ -53,6 +61,8 @@ import static gr.thmmy.mthmmy.activities.downloads.DownloadsActivity.BUNDLE_DOWN
 import static gr.thmmy.mthmmy.activities.profile.ProfileActivity.BUNDLE_PROFILE_THUMBNAIL_URL;
 import static gr.thmmy.mthmmy.activities.profile.ProfileActivity.BUNDLE_PROFILE_URL;
 import static gr.thmmy.mthmmy.activities.profile.ProfileActivity.BUNDLE_PROFILE_USERNAME;
+import static gr.thmmy.mthmmy.services.DownloadHelper.SAVE_DIR;
+import static gr.thmmy.mthmmy.utils.FileUtils.getMimeType;
 
 public abstract class BaseActivity extends AppCompatActivity {
     // Client & Cookies
@@ -600,7 +610,7 @@ public abstract class BaseActivity extends AppCompatActivity {
             , @NonNull int[] grantResults) {
         switch (permsRequestCode) {
             case PERMISSIONS_REQUEST_CODE:
-                launchDownloadService();
+                downloadFile();
                 break;
         }
     }
@@ -609,9 +619,9 @@ public abstract class BaseActivity extends AppCompatActivity {
     //----------------------------------DOWNLOAD----------------------
     private ThmmyFile tempThmmyFile;
 
-    public void launchDownloadService(ThmmyFile thmmyFile) {
+    public void downloadFile(ThmmyFile thmmyFile) {
         if (checkPerms())
-            DownloadsService.startActionDownload(this, thmmyFile.getFileUrl().toString());
+            prepareDownload(thmmyFile);
         else {
             tempThmmyFile = thmmyFile;
             requestPerms();
@@ -619,15 +629,64 @@ public abstract class BaseActivity extends AppCompatActivity {
     }
 
     //Uses temp file - called after permission grant
-    private void launchDownloadService() {
+    private void downloadFile() {
         if (checkPerms())
-            DownloadsService.startActionDownload(this, tempThmmyFile.getFileUrl().toString());
+            prepareDownload(tempThmmyFile);
+    }
+
+    private void prepareDownload(ThmmyFile thmmyFile){
+        String fileName = thmmyFile.getFilename();
+        if(FileUtils.fileNameExists(fileName))
+            openDownloadPrompt(thmmyFile);
+        else
+            DownloadHelper.enqueueDownload(thmmyFile);
+    }
+
+    private void openDownloadPrompt(final ThmmyFile thmmyFile) {
+        View view = getLayoutInflater().inflate(R.layout.download_prompt_dialog, null);
+        final BottomSheetDialog dialog = new BottomSheetDialog(this);
+        dialog.setContentView(view);
+        TextView downloadPromptTextView = view.findViewById(R.id.downloadPromptTextView);
+        downloadPromptTextView.setText(getString(R.string.downloadPromptText,thmmyFile.getFilename()));
+        Button cancelButton = view.findViewById(R.id.cancel);
+        Button openButton = view.findViewById(R.id.open);
+        Button downloadButton = view.findViewById(R.id.download);
+        cancelButton.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                dialog.dismiss();
+            }
+        });
+        openButton.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                dialog.dismiss();
+                try{
+                    String fileName = thmmyFile.getFilename();
+                    Intent intent = new Intent(Intent.ACTION_VIEW);
+                    intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK|Intent.FLAG_GRANT_READ_URI_PERMISSION);
+                    Uri fileUri =  FileProvider.getUriForFile(getApplicationContext(), getPackageName() + ".provider", new File(SAVE_DIR, fileName));
+                    intent.setDataAndType(fileUri, getMimeType(fileName));
+                    BaseActivity.this.startActivity(intent);
+                }catch (Exception e){
+                    Timber.e(e,"Couldn't open downloaded file...");
+                    Toast.makeText(BaseActivity.this, "Couldn't open file...", Toast.LENGTH_SHORT).show();
+                }
 
+            }
+        });
+        downloadButton.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                dialog.dismiss();
+                DownloadHelper.enqueueDownload(thmmyFile);
+            }
+        });
+        dialog.show();
     }
 
     //----------------------------------MISC----------------------
     protected void setMainActivity(MainActivity mainActivity) {
         this.mainActivity = mainActivity;
     }
-
 }
diff --git a/app/src/main/java/gr/thmmy/mthmmy/model/Download.java b/app/src/main/java/gr/thmmy/mthmmy/model/Download.java
index 5216fea4..045129b8 100644
--- a/app/src/main/java/gr/thmmy/mthmmy/model/Download.java
+++ b/app/src/main/java/gr/thmmy/mthmmy/model/Download.java
@@ -6,6 +6,7 @@ public class Download {
     private final String url, title, subTitle, statNumbers, extraInfo;
     private final boolean hasSubCategory;
     private final DownloadItemType type;
+    private String fileName;
 
     public Download() {
         type = null;
@@ -55,4 +56,12 @@ public class Download {
     public boolean hasSubCategory() {
         return hasSubCategory;
     }
+
+    public String getFileName(){
+        return fileName;
+    }
+
+    public void setFileName(String fileName){
+        this.fileName = fileName;
+    }
 }
diff --git a/app/src/main/java/gr/thmmy/mthmmy/model/ThmmyPage.java b/app/src/main/java/gr/thmmy/mthmmy/model/ThmmyPage.java
index aff0a38a..bc451fd1 100644
--- a/app/src/main/java/gr/thmmy/mthmmy/model/ThmmyPage.java
+++ b/app/src/main/java/gr/thmmy/mthmmy/model/ThmmyPage.java
@@ -3,8 +3,6 @@ package gr.thmmy.mthmmy.model;
 import android.net.Uri;
 
 import java.util.Objects;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
 
 import timber.log.Timber;
 
diff --git a/app/src/main/java/gr/thmmy/mthmmy/services/DownloadHelper.java b/app/src/main/java/gr/thmmy/mthmmy/services/DownloadHelper.java
new file mode 100644
index 00000000..1e1a5c31
--- /dev/null
+++ b/app/src/main/java/gr/thmmy/mthmmy/services/DownloadHelper.java
@@ -0,0 +1,73 @@
+package gr.thmmy.mthmmy.services;
+
+import android.app.DownloadManager;
+import android.content.Context;
+import android.net.Uri;
+import android.os.Environment;
+import android.widget.Toast;
+
+import java.io.File;
+
+import gr.thmmy.mthmmy.base.BaseApplication;
+import gr.thmmy.mthmmy.model.ThmmyFile;
+import okhttp3.Cookie;
+import timber.log.Timber;
+
+import static gr.thmmy.mthmmy.utils.FileUtils.getMimeType;
+
+/**
+ * Not an actual service, but simply a helper class that adds a download to the queue of Android's
+ * DownloadManager system service.
+ */
+public class DownloadHelper {
+    public static final File SAVE_DIR = Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOWNLOADS);
+
+    public static void enqueueDownload(ThmmyFile thmmyFile){
+        Context applicationContext = BaseApplication.getInstance().getApplicationContext();
+        Toast.makeText(applicationContext, "Download started!", Toast.LENGTH_SHORT).show();
+
+        try {
+            String fileName = renameFileIfExists(thmmyFile.getFilename());
+            Uri downloadURI = Uri.parse(thmmyFile.getFileUrl().toString());
+
+            DownloadManager downloadManager = (DownloadManager)applicationContext.getSystemService(Context.DOWNLOAD_SERVICE);
+            DownloadManager.Request request = new DownloadManager.Request(downloadURI);
+
+            Cookie thmmyCookie = BaseApplication.getInstance().getSessionManager().getThmmyCookie();
+            request.addRequestHeader("Cookie", thmmyCookie.name() + "=" + thmmyCookie.value());
+            request.setTitle(fileName);
+            request.setMimeType(getMimeType(fileName));
+            request.setNotificationVisibility(DownloadManager.Request.VISIBILITY_VISIBLE_NOTIFY_COMPLETED);
+            request.setDestinationInExternalPublicDir(SAVE_DIR.getName(), fileName);
+            request.allowScanningByMediaScanner();
+
+            downloadManager.enqueue(request);
+        } catch (Exception e) {
+            Toast.makeText(applicationContext, "Download failed...", Toast.LENGTH_SHORT).show();
+            Timber.e(e, "Exception while enqueuing download.");
+        }
+    }
+
+    private static String renameFileIfExists(String originalFileName) {
+        final String dirPath = SAVE_DIR.getAbsolutePath();
+        File file = new File(dirPath, originalFileName);
+
+        String nameFormat;
+        String[] tokens = originalFileName.split("\\.(?=[^.]+$)");
+
+        if (tokens.length != 2) {
+            Timber.w("Couldn't get file extension...");
+            nameFormat = originalFileName + "(%d)";
+        } else
+            nameFormat = tokens[0] + "-%d." + tokens[1];
+
+        for (int i = 1; ; i++) {
+            if (!file.isFile())
+                break;
+
+            file = new File(dirPath, String.format(nameFormat, i));
+        }
+
+        return file.getName();
+    }
+}
diff --git a/app/src/main/java/gr/thmmy/mthmmy/services/downloads/DownloadsReceiver.java b/app/src/main/java/gr/thmmy/mthmmy/services/downloads/DownloadsReceiver.java
deleted file mode 100644
index 535372a4..00000000
--- a/app/src/main/java/gr/thmmy/mthmmy/services/downloads/DownloadsReceiver.java
+++ /dev/null
@@ -1,88 +0,0 @@
-package gr.thmmy.mthmmy.services.downloads;
-
-import android.app.NotificationChannel;
-import android.app.NotificationManager;
-import android.app.PendingIntent;
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.Intent;
-import android.net.Uri;
-import android.os.Build;
-import android.os.Bundle;
-import android.support.v4.app.NotificationCompat;
-import android.webkit.MimeTypeMap;
-
-import java.io.File;
-
-import timber.log.Timber;
-
-import static gr.thmmy.mthmmy.services.downloads.DownloadsService.ACTION_DOWNLOAD;
-import static gr.thmmy.mthmmy.services.downloads.DownloadsService.COMPLETED;
-import static gr.thmmy.mthmmy.services.downloads.DownloadsService.EXTRA_DOWNLOAD_ID;
-import static gr.thmmy.mthmmy.services.downloads.DownloadsService.EXTRA_DOWNLOAD_STATE;
-import static gr.thmmy.mthmmy.services.downloads.DownloadsService.EXTRA_FILE_NAME;
-import static gr.thmmy.mthmmy.services.downloads.DownloadsService.EXTRA_NOTIFICATION_TEXT;
-import static gr.thmmy.mthmmy.services.downloads.DownloadsService.EXTRA_NOTIFICATION_TICKER;
-import static gr.thmmy.mthmmy.services.downloads.DownloadsService.EXTRA_NOTIFICATION_TITLE;
-import static gr.thmmy.mthmmy.services.downloads.DownloadsService.SAVE_DIR;
-import static gr.thmmy.mthmmy.services.downloads.DownloadsService.STARTED;
-
-public class DownloadsReceiver extends BroadcastReceiver {
-    private static final String NOTIFICATION_TAG = "DOWNLOADS";
-    private static final String DOWNLOADS_CHANNEL_ID = "Downloads";
-    private static final String DOWNLOADS_CHANNEL_NAME = "Downloads";
-
-    public DownloadsReceiver() {}
-
-    @Override
-    public void onReceive(Context context, Intent intent) {
-        NotificationCompat.Builder notificationBuilder = new NotificationCompat.Builder(context, DOWNLOADS_CHANNEL_ID);
-        NotificationManager notificationManager = (NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE);
-
-        if (intent.getAction().equals(ACTION_DOWNLOAD)) {
-            Bundle extras = intent.getExtras();
-            int id = extras.getInt(EXTRA_DOWNLOAD_ID);
-            String state = extras.getString(EXTRA_DOWNLOAD_STATE, "NONE");
-            String title = extras.getString(EXTRA_NOTIFICATION_TITLE);
-            String text = extras.getString(EXTRA_NOTIFICATION_TEXT);
-            String ticker = extras.getString(EXTRA_NOTIFICATION_TICKER);
-
-            notificationBuilder.setContentTitle(title)
-                    .setContentText(text)
-                    .setTicker(ticker)
-                    .setAutoCancel(true);
-
-            if (state.equals(STARTED))
-                notificationBuilder.setOngoing(true)
-                        .setSmallIcon(android.R.drawable.stat_sys_download);
-            else if (state.equals(COMPLETED)) {
-                String fileName = extras.getString(EXTRA_FILE_NAME, "NONE");
-
-                File file = new File(SAVE_DIR, fileName);
-                if (file.exists()) {
-                    String type = MimeTypeMap.getSingleton().getMimeTypeFromExtension(
-                            MimeTypeMap.getFileExtensionFromUrl(file.getAbsolutePath()));
-
-
-                    Intent chooserIntent = new Intent(Intent.ACTION_VIEW);
-                    chooserIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-                    chooserIntent.setDataAndType(Uri.fromFile(file), type);
-                    Intent chooser = Intent.createChooser(chooserIntent, "Open With...");
-
-                    PendingIntent pendingIntent = PendingIntent.getActivity(context, 0, chooser, PendingIntent.FLAG_CANCEL_CURRENT);
-                    notificationBuilder.setContentIntent(pendingIntent)
-                            .setSmallIcon(android.R.drawable.stat_sys_download_done);
-
-                } else
-                    Timber.w("File doesn't exist.");
-            }
-
-            // Since Android Oreo notification channel is needed.
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O)
-                notificationManager.createNotificationChannel(new NotificationChannel(DOWNLOADS_CHANNEL_ID, DOWNLOADS_CHANNEL_NAME, NotificationManager.IMPORTANCE_HIGH));
-
-            notificationManager.notify(NOTIFICATION_TAG, id, notificationBuilder.build());
-        }
-    }
-
-}
diff --git a/app/src/main/java/gr/thmmy/mthmmy/services/downloads/DownloadsService.java b/app/src/main/java/gr/thmmy/mthmmy/services/downloads/DownloadsService.java
deleted file mode 100644
index 9692f5ea..00000000
--- a/app/src/main/java/gr/thmmy/mthmmy/services/downloads/DownloadsService.java
+++ /dev/null
@@ -1,225 +0,0 @@
-package gr.thmmy.mthmmy.services.downloads;
-
-import android.app.DownloadManager;
-import android.app.IntentService;
-import android.content.Context;
-import android.content.Intent;
-import android.content.IntentFilter;
-import android.os.Environment;
-import android.support.annotation.NonNull;
-import android.webkit.MimeTypeMap;
-
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-
-import gr.thmmy.mthmmy.base.BaseApplication;
-import okhttp3.OkHttpClient;
-import okhttp3.Request;
-import okhttp3.Response;
-import okio.BufferedSink;
-import okio.Okio;
-import timber.log.Timber;
-
-/**
- * An {@link IntentService} subclass for handling asynchronous task requests in
- * a service on a separate handler thread.
- */
-public class DownloadsService extends IntentService {
-    private static final String TAG = "DownloadsService";
-    private static int sDownloadId = 0;
-
-    private DownloadsReceiver receiver;
-
-    public static final String SAVE_DIR = Environment.getExternalStorageDirectory().getAbsolutePath() + File.separator + "mthmmy";
-
-    public static final String ACTION_DOWNLOAD = "gr.thmmy.mthmmy.services.action.DOWNLOAD";
-    public static final String EXTRA_DOWNLOAD_URL = "gr.thmmy.mthmmy.services.extra.DOWNLOAD_URL";
-
-    public static final String EXTRA_DOWNLOAD_ID = "gr.thmmy.mthmmy.services.extra.DOWNLOAD_ID";
-    public static final String EXTRA_DOWNLOAD_STATE = "gr.thmmy.mthmmy.services.extra.DOWNLOAD_STATE";
-    public static final String EXTRA_FILE_NAME = "gr.thmmy.mthmmy.services.extra.FILE_NAME";
-    public static final String EXTRA_NOTIFICATION_TITLE = "gr.thmmy.mthmmy.services.extra.NOTIFICATION_TITLE";
-    public static final String EXTRA_NOTIFICATION_TEXT = "gr.thmmy.mthmmy.services.extra.NOTIFICATION_TEXT";
-    public static final String EXTRA_NOTIFICATION_TICKER = "gr.thmmy.mthmmy.services.extra.NOTIFICATION_TICKER";
-
-    public static final String STARTED = "Started";
-    public static final String COMPLETED = "Completed";
-    public static final String FAILED = "Failed";
-
-
-    public DownloadsService() {
-        super("DownloadsService");
-    }
-
-    @Override
-    public void onCreate() {
-        super.onCreate();
-        final IntentFilter filter = new IntentFilter(DownloadsService.ACTION_DOWNLOAD);
-        receiver = new DownloadsReceiver();
-        registerReceiver(receiver, filter);
-
-    }
-
-    @Override
-    public void onDestroy() {
-        super.onDestroy();
-        this.unregisterReceiver(receiver);
-    }
-
-    /**
-     * Starts this service to perform action Download with the given parameters. If
-     * the service is already performing a task this action will be queued.
-     *
-     * @see IntentService
-     */
-    public static void startActionDownload(Context context, String downloadUrl) {
-        Intent intent = new Intent(context, DownloadsService.class);
-        intent.setAction(ACTION_DOWNLOAD);
-        intent.putExtra(EXTRA_DOWNLOAD_URL, downloadUrl);
-        context.startService(intent);
-    }
-
-    @Override
-    protected void onHandleIntent(Intent intent) {
-        if (intent != null) {
-            final String action = intent.getAction();
-            if (ACTION_DOWNLOAD.equals(action)) {
-                final String downloadLink = intent.getStringExtra(EXTRA_DOWNLOAD_URL);
-                handleActionDownload(downloadLink);
-            }
-        }
-    }
-
-    /**
-     * Handle action Foo in the provided background thread with the provided
-     * parameters.
-     */
-    private void handleActionDownload(String downloadLink) {
-        OkHttpClient client = BaseApplication.getInstance().getClient();
-        BufferedSink sink = null;
-        String fileName = "file";
-
-        int downloadId = sDownloadId;
-        sDownloadId++;
-
-        try {
-            Request request = new Request.Builder().url(downloadLink).build();
-            Response response = client.newCall(request).execute();
-
-            String contentDisposition = response.headers("Content-Disposition").toString();   //check if link provides an attachment
-            if (contentDisposition.contains("attachment")) {
-                fileName = contentDisposition.split("\"")[1];
-
-                File dirPath = new File(SAVE_DIR);
-                if (!dirPath.isDirectory()) {
-                    if (dirPath.mkdirs())
-                        Timber.i("mTHMMY's directory created successfully!");
-                    else
-                        Timber.e("Couldn't create mTHMMY's directory...");
-                }
-
-
-                String nameFormat;
-                String[] tokens = fileName.split("\\.(?=[^\\.]+$)");
-
-                if (tokens.length != 2) {
-                    Timber.w("Couldn't get file extension...");
-                    nameFormat = fileName + "(%d)";
-                } else
-                    nameFormat = tokens[0] + "(%d)." + tokens[1];
-
-
-                File file = new File(dirPath, fileName);
-
-                for (int i = 1; ; i++) {
-                    if (!file.exists())
-                        break;
-
-                    file = new File(dirPath, String.format(nameFormat, i));
-                }
-
-                fileName = file.getName();
-
-                Timber.v("Started saving file %s", fileName);
-                sendNotification(downloadId, STARTED, fileName);
-
-                sink = Okio.buffer(Okio.sink(file));
-                sink.writeAll(response.body().source());
-                sink.flush();
-                Timber.i("Download OK!");
-                sendNotification(downloadId, COMPLETED, fileName);
-
-                // Register download
-                DownloadManager mManager = (DownloadManager) getSystemService(Context.DOWNLOAD_SERVICE);
-                long length = file.length();
-                mManager.addCompletedDownload(fileName, fileName, false, getMimeType(file), SAVE_DIR +File.separator+ fileName, length, false);
-
-            } else
-                Timber.e("No attachment in response!");
-        } catch (FileNotFoundException e) {
-            Timber.i("Download failed...");
-            Timber.e(e, "FileNotFound");
-            sendNotification(downloadId, FAILED, fileName);
-        } catch (IOException e) {
-            Timber.i("Download failed...");
-            Timber.e(e, "IOException");
-            sendNotification(downloadId, FAILED, fileName);
-        } finally {
-            if (sink != null) {
-                try {
-                    sink.close();
-                } catch (IOException e) {
-                    // Ignore - Significant errors should already have been reported
-                }
-            }
-        }
-    }
-
-    private void sendNotification(int downloadId, String type, @NonNull String fileName) {
-        Intent intent = new Intent(ACTION_DOWNLOAD);
-        switch (type) {
-            case STARTED: {
-                intent.putExtra(EXTRA_NOTIFICATION_TITLE, "\"" + fileName + "\"");
-                intent.putExtra(EXTRA_NOTIFICATION_TEXT, "Download Started");
-                intent.putExtra(EXTRA_NOTIFICATION_TICKER, "Downloading...");
-                break;
-            }
-            case COMPLETED: {
-                intent.putExtra(EXTRA_NOTIFICATION_TITLE, "\"" + fileName + "\"");
-                intent.putExtra(EXTRA_NOTIFICATION_TEXT, "Download Completed");
-                intent.putExtra(EXTRA_NOTIFICATION_TICKER, "Download Completed");
-                break;
-            }
-            case FAILED: {
-                intent.putExtra(EXTRA_NOTIFICATION_TITLE, "\"" + fileName + "\"");
-                intent.putExtra(EXTRA_NOTIFICATION_TEXT, "Download Failed");
-                intent.putExtra(EXTRA_NOTIFICATION_TICKER, "Download Failed");
-                break;
-            }
-            default: {
-                Timber.e("Invalid notification case!");
-                return;
-            }
-        }
-        intent.putExtra(EXTRA_DOWNLOAD_ID, downloadId);
-        intent.putExtra(EXTRA_DOWNLOAD_STATE, type);
-        intent.putExtra(EXTRA_FILE_NAME, fileName);
-        sendBroadcast(intent);
-
-    }
-
-    @NonNull
-    static String getMimeType(@NonNull File file) {
-        String type = null;
-        final String url = file.toString();
-        final String extension = MimeTypeMap.getFileExtensionFromUrl(url);
-        if (extension != null)
-            type = MimeTypeMap.getSingleton().getMimeTypeFromExtension(extension.toLowerCase());
-        if (type == null)
-            type = "*/*";
-
-        return type;
-    }
-
-}
diff --git a/app/src/main/java/gr/thmmy/mthmmy/session/SessionManager.java b/app/src/main/java/gr/thmmy/mthmmy/session/SessionManager.java
index 94f8a284..9168ebf3 100644
--- a/app/src/main/java/gr/thmmy/mthmmy/session/SessionManager.java
+++ b/app/src/main/java/gr/thmmy/mthmmy/session/SessionManager.java
@@ -254,6 +254,16 @@ public class SessionManager {
         return sharedPrefs.getString(AVATAR_LINK, AVATAR_LINK);
     }
 
+    public Cookie getThmmyCookie() {
+        List<Cookie> cookieList = cookieJar.loadForRequest(indexUrl);
+        for(Cookie cookie: cookieList)
+        {
+            if(cookie.name().equals("THMMYgrC00ki3"))
+                return cookie;
+        }
+        return null;
+    }
+
     public boolean hasAvatar() {
         return sharedPrefs.getBoolean(HAS_AVATAR, false);
     }
diff --git a/app/src/main/java/gr/thmmy/mthmmy/utils/FileUtils.java b/app/src/main/java/gr/thmmy/mthmmy/utils/FileUtils.java
new file mode 100644
index 00000000..9f2d4757
--- /dev/null
+++ b/app/src/main/java/gr/thmmy/mthmmy/utils/FileUtils.java
@@ -0,0 +1,26 @@
+package gr.thmmy.mthmmy.utils;
+
+import android.support.annotation.NonNull;
+import android.webkit.MimeTypeMap;
+
+import java.io.File;
+
+import static gr.thmmy.mthmmy.services.DownloadHelper.SAVE_DIR;
+
+public class FileUtils {
+    @NonNull
+    public static String getMimeType(@NonNull String fileName) {
+        String type = null;
+        final String extension = MimeTypeMap.getFileExtensionFromUrl(fileName);
+        if (extension != null)
+            type = MimeTypeMap.getSingleton().getMimeTypeFromExtension(extension.toLowerCase());
+        if (type == null)
+            type = "*/*";
+
+        return type;
+    }
+
+    public static boolean fileNameExists (String fileName) {
+        return fileName != null && (new File(SAVE_DIR.getAbsolutePath(), fileName)).isFile();
+    }
+}
diff --git a/app/src/main/java/gr/thmmy/mthmmy/utils/parsing/ParseTask.java b/app/src/main/java/gr/thmmy/mthmmy/utils/parsing/ParseTask.java
index 16b21583..4f335025 100644
--- a/app/src/main/java/gr/thmmy/mthmmy/utils/parsing/ParseTask.java
+++ b/app/src/main/java/gr/thmmy/mthmmy/utils/parsing/ParseTask.java
@@ -26,7 +26,9 @@ public abstract class ParseTask extends AsyncTask<String, Void, ParseTask.Result
     }
 
     protected abstract void parse (Document document) throws ParseException;
-    protected abstract void postParsing (ParseTask.ResultCode result);  //ResultCode.NETWORK_ERROR is handled automatically
+    protected abstract void postExecution(ParseTask.ResultCode result);  //ResultCode.NETWORK_ERROR is handled automatically
+
+    protected void postParsing (){}
 
     protected Request prepareRequest(String... params) {
         url = params[0];
@@ -42,6 +44,7 @@ public abstract class ParseTask extends AsyncTask<String, Void, ParseTask.Result
             Response response = BaseApplication.getInstance().getClient().newCall(request).execute();
             Document document = Jsoup.parse(response.body().string());
             parse(document);
+            postParsing();
             return ResultCode.SUCCESS;
         } catch (ParseException e) {
             Timber.tag(this.getClass().getSimpleName());
@@ -62,7 +65,7 @@ public abstract class ParseTask extends AsyncTask<String, Void, ParseTask.Result
     protected void onPostExecute(ParseTask.ResultCode result) {
         if (result == ResultCode.NETWORK_ERROR)
             Toast.makeText(BaseApplication.getInstance().getApplicationContext(), "Network error", Toast.LENGTH_SHORT).show();
-        postParsing(result);
+        postExecution(result);
     }
 }
 
diff --git a/app/src/main/res/layout/download_prompt_dialog.xml b/app/src/main/res/layout/download_prompt_dialog.xml
new file mode 100644
index 00000000..ae98600c
--- /dev/null
+++ b/app/src/main/res/layout/download_prompt_dialog.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    android:background="@color/primary_light"
+    android:padding="4dp">
+
+
+    <TextView
+        android:id="@+id/downloadPromptTextView"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_weight="1"
+        android:padding="8dp"
+        android:textSize="16sp"
+        android:textColor="@color/white" />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_weight="1"
+        android:orientation="horizontal">
+
+        <Button
+            android:id="@+id/cancel"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            style="?android:attr/borderlessButtonStyle"
+            android:text="@string/cancel" />
+
+        <Button
+            android:id="@+id/open"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:text="@string/open" />
+
+        <Button
+            android:id="@+id/download"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:text="@string/download" />
+    </LinearLayout>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 1d63348c..a4543e86 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -75,7 +75,7 @@
     <string name="board_bookmarks_title">Boards</string>
     <string name="topic_bookmarks_title">Topics</string>
 
-    <!--FontAwesome strings-->
+    <!--FontAwesome-->
     <string name="fa_icon_star">&#xf005;</string>
     <string name="fa_file">&#xf15b;</string>
     <string name="fa_file_image_o">&#xf1c5;</string>
@@ -90,5 +90,14 @@
     <string name="fa_sticky">&#xf249;</string>
     <string name="fa_folder">&#xf07b;</string>
     <string name="fa_circle">&#xf111;</string>
+
+    <!--Notifications-->
     <string name="toggle_notification">Toggle Notification</string>
+
+    <!--Download Prompt-->
+    <string name="downloadPromptText">File \"%1$s\" already exists. Download again?"</string>
+    <string name="download_symbol">Download Symbol</string>
+    <string name="cancel">Cancel</string>
+    <string name="open">Open</string>
+    <string name="download">Download</string>
 </resources>
diff --git a/app/src/main/res/xml/provider_paths.xml b/app/src/main/res/xml/provider_paths.xml
index a0b81b43..42b53275 100644
--- a/app/src/main/res/xml/provider_paths.xml
+++ b/app/src/main/res/xml/provider_paths.xml
@@ -1,10 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <paths>
-    <external-path
-        name="my_downloads"
-        path="Downloads/"/>
-
-    <files-path
-        name="my_downloads"
-        path="Downloads/"/>
+    <external-path name="my_downloads" path="."/>
 </paths>
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index 3a61f691..42582a20 100644
--- a/build.gradle
+++ b/build.gradle
@@ -4,7 +4,6 @@ buildscript {
     repositories {
         jcenter()
         maven { url "https://jitpack.io" }
-        maven { url "https://maven.google.com" }
         maven { url "https://maven.fabric.io/public" }
         google()
     }

From e066d6a7d2a1b593321dd930623ebb900c288cd1 Mon Sep 17 00:00:00 2001
From: Ezerous <ezerous@gmail.com>
Date: Mon, 25 Jun 2018 11:46:06 +0300
Subject: [PATCH 26/29] Clear notification when manually opening topic's last
 page

---
 .../mthmmy/activities/topic/TopicActivity.java   | 16 +++++++++++++++-
 .../java/gr/thmmy/mthmmy/base/BaseActivity.java  | 10 +++++-----
 .../mthmmy/services/NotificationService.java     |  3 ++-
 3 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/gr/thmmy/mthmmy/activities/topic/TopicActivity.java b/app/src/main/java/gr/thmmy/mthmmy/activities/topic/TopicActivity.java
index e18dc2e7..e1789a12 100644
--- a/app/src/main/java/gr/thmmy/mthmmy/activities/topic/TopicActivity.java
+++ b/app/src/main/java/gr/thmmy/mthmmy/activities/topic/TopicActivity.java
@@ -1,6 +1,7 @@
 package gr.thmmy.mthmmy.activities.topic;
 
 import android.annotation.SuppressLint;
+import android.app.NotificationManager;
 import android.content.Context;
 import android.content.Intent;
 import android.graphics.Rect;
@@ -64,6 +65,7 @@ import static gr.thmmy.mthmmy.activities.profile.ProfileActivity.BUNDLE_PROFILE_
 import static gr.thmmy.mthmmy.activities.profile.ProfileActivity.BUNDLE_PROFILE_URL;
 import static gr.thmmy.mthmmy.activities.profile.ProfileActivity.BUNDLE_PROFILE_USERNAME;
 import static gr.thmmy.mthmmy.activities.topic.Posting.replyStatus;
+import static gr.thmmy.mthmmy.services.NotificationService.NEW_POST_TAG;
 
 /**
  * Activity for parsing and rendering topics. When creating an Intent of this activity you need to
@@ -110,6 +112,10 @@ public class TopicActivity extends BaseActivity {
      * Holds the url of this page
      */
     private String loadedPageUrl = "";
+    /**
+     * Holds the topicId of this page
+     */
+    private int loadedPageTopicId = -1;
     /**
      * Becomes true after user has posted in this topic and the page is being reloaded and false
      * when topic's reloading is done
@@ -612,6 +618,8 @@ public class TopicActivity extends BaseActivity {
                 document = Jsoup.parse(response.body().string());
                 localPostsList = parse(document);
 
+                loadedPageTopicId = Integer.parseInt(ThmmyPage.getTopicId(loadedPageUrl));
+
                 //Finds the position of the focused message if present
                 for (int i = 0; i < localPostsList.size(); ++i) {
                     if (localPostsList.get(i).getPostIndex() == postFocus) {
@@ -641,7 +649,7 @@ public class TopicActivity extends BaseActivity {
                             || !Objects.equals(topicTitle, parsedTitle)) {
                         toolbarTitle.setText(parsedTitle);
                         topicTitle = parsedTitle;
-                        thisPageBookmark = new Bookmark(parsedTitle, ThmmyPage.getTopicId(loadedPageUrl), true);
+                        thisPageBookmark = new Bookmark(parsedTitle, Integer.toString(loadedPageTopicId), true);
                         invalidateOptionsMenu();
                     }
 
@@ -665,6 +673,12 @@ public class TopicActivity extends BaseActivity {
                     pageIndicator.setText(String.valueOf(thisPage) + "/" + String.valueOf(numberOfPages));
                     pageRequestValue = thisPage;
 
+                    if(thisPage==numberOfPages){
+                        NotificationManager notificationManager = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE);
+                        if(notificationManager!=null)
+                            notificationManager.cancel(NEW_POST_TAG, loadedPageTopicId);
+                    }
+
                     paginationEnabled(true);
                     break;
                 case NETWORK_ERROR:
diff --git a/app/src/main/java/gr/thmmy/mthmmy/base/BaseActivity.java b/app/src/main/java/gr/thmmy/mthmmy/base/BaseActivity.java
index d5cb13ec..5a98d618 100644
--- a/app/src/main/java/gr/thmmy/mthmmy/base/BaseActivity.java
+++ b/app/src/main/java/gr/thmmy/mthmmy/base/BaseActivity.java
@@ -465,11 +465,11 @@ public abstract class BaseActivity extends AppCompatActivity {
         if (thisPageBookmark.matchExists(topicsBookmarked)) {
             thisPageBookmarkMenuButton.setIcon(notBookmarked);
             toggleTopicToBookmarks(thisPageBookmark);
-            Toast.makeText(BaseActivity.this, "Bookmark removed", Toast.LENGTH_SHORT).show();
+            Toast.makeText(getBaseContext(), "Bookmark removed", Toast.LENGTH_SHORT).show();
         } else {
             thisPageBookmarkMenuButton.setIcon(bookmarked);
             toggleTopicToBookmarks(thisPageBookmark);
-            Toast.makeText(BaseActivity.this, "Bookmark added", Toast.LENGTH_SHORT).show();
+            Toast.makeText(getBaseContext(), "Bookmark added", Toast.LENGTH_SHORT).show();
         }
     }
 
@@ -484,10 +484,10 @@ public abstract class BaseActivity extends AppCompatActivity {
             public void onClick(View view) {
                 if (thisPageBookmark.matchExists(boardsBookmarked)) {
                     thisPageBookmarkImageButton.setImageDrawable(notBookmarked);
-                    Toast.makeText(BaseActivity.this, "Bookmark removed", Toast.LENGTH_SHORT).show();
+                    Toast.makeText(getBaseContext(), "Bookmark removed", Toast.LENGTH_SHORT).show();
                 } else {
                     thisPageBookmarkImageButton.setImageDrawable(bookmarked);
-                    Toast.makeText(BaseActivity.this, "Bookmark added", Toast.LENGTH_SHORT).show();
+                    Toast.makeText(getBaseContext(), "Bookmark added", Toast.LENGTH_SHORT).show();
                 }
                 toggleBoardToBookmarks(thisPageBookmark);
             }
@@ -670,7 +670,7 @@ public abstract class BaseActivity extends AppCompatActivity {
                     BaseActivity.this.startActivity(intent);
                 }catch (Exception e){
                     Timber.e(e,"Couldn't open downloaded file...");
-                    Toast.makeText(BaseActivity.this, "Couldn't open file...", Toast.LENGTH_SHORT).show();
+                    Toast.makeText(getBaseContext(), "Couldn't open file...", Toast.LENGTH_SHORT).show();
                 }
 
             }
diff --git a/app/src/main/java/gr/thmmy/mthmmy/services/NotificationService.java b/app/src/main/java/gr/thmmy/mthmmy/services/NotificationService.java
index 6e4419c0..ae439dd9 100644
--- a/app/src/main/java/gr/thmmy/mthmmy/services/NotificationService.java
+++ b/app/src/main/java/gr/thmmy/mthmmy/services/NotificationService.java
@@ -35,6 +35,7 @@ public class NotificationService extends FirebaseMessagingService {
     public void onMessageReceived(RemoteMessage remoteMessage) {
         super.onMessageReceived(remoteMessage);
         if (remoteMessage.getData().size() > 0) {
+            Timber.i("FCM data message received.");
             JSONObject json = new JSONObject(remoteMessage.getData());
             try {
                 int userId = BaseApplication.getInstance().getSessionManager().getUserId();
@@ -61,7 +62,7 @@ public class NotificationService extends FirebaseMessagingService {
     private static int requestCode = 0;
 
     private static final String NEW_POSTS_COUNT = "newPostsCount";
-    private static final String NEW_POST_TAG = "NEW_POST";
+    public static final String NEW_POST_TAG = "NEW_POST";
     private static final String SUMMARY_TAG = "SUMMARY";
     private static final String DELETED_MESSAGES_TAG = "DELETED_MESSAGES";
 

From 926a8c1fc20d143f1d7fe17ec213fdd1ed84f751 Mon Sep 17 00:00:00 2001
From: Apostolof <apotwohd@gmail.com>
Date: Wed, 4 Jul 2018 00:12:12 +0300
Subject: [PATCH 27/29] Enhance bookmarks activity UI

---
 app/build.gradle                              |   3 +-
 app/src/main/AndroidManifest.xml              |   2 +-
 .../mthmmy/activities/BookmarkActivity.java   | 198 ------------------
 .../bookmarks/BoardBookmarksFragment.java     | 130 ++++++++++++
 .../bookmarks/BookmarkActivity.java           | 143 +++++++++++++
 .../bookmarks/TopicBookmarksFragment.java     | 163 ++++++++++++++
 .../gr/thmmy/mthmmy/base/BaseActivity.java    |   2 +-
 app/src/main/res/layout/activity_bookmark.xml |  27 +--
 .../main/res/layout/fragment_bookmarks.xml    |  22 ++
 app/src/main/res/values/strings.xml           |   7 +-
 10 files changed, 481 insertions(+), 216 deletions(-)
 delete mode 100644 app/src/main/java/gr/thmmy/mthmmy/activities/BookmarkActivity.java
 create mode 100644 app/src/main/java/gr/thmmy/mthmmy/activities/bookmarks/BoardBookmarksFragment.java
 create mode 100644 app/src/main/java/gr/thmmy/mthmmy/activities/bookmarks/BookmarkActivity.java
 create mode 100644 app/src/main/java/gr/thmmy/mthmmy/activities/bookmarks/TopicBookmarksFragment.java
 create mode 100644 app/src/main/res/layout/fragment_bookmarks.xml

diff --git a/app/build.gradle b/app/build.gradle
index 3b463434..4d8ca81d 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -49,7 +49,8 @@ dependencies {
     implementation 'com.mikepenz:fontawesome-typeface:4.7.0.0@aar'
     implementation 'com.mikepenz:google-material-typeface:3.0.1.2.original@aar'
     implementation 'pl.droidsonroids.gif:android-gif-drawable:1.2.12'
-    implementation 'com.bignerdranch.android:expandablerecyclerview:3.0.0-RC1' //TODO: needs replacement
+    implementation 'com.bignerdranch.android:expandablerecyclerview:3.0.0-RC1'
+    //TODO: needs replacement
     implementation 'me.zhanghai.android.materialprogressbar:library:1.4.2'
     implementation 'com.jakewharton.timber:timber:4.7.0'
 }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index c9bfa2af..7417185a 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -98,7 +98,7 @@
                 android:value=".activities.main.MainActivity" />
         </activity>
         <activity
-            android:name=".activities.BookmarkActivity"
+            android:name=".activities.bookmarks.BookmarkActivity"
             android:parentActivityName=".activities.main.MainActivity"
             android:theme="@style/AppTheme.NoActionBar">
             <meta-data
diff --git a/app/src/main/java/gr/thmmy/mthmmy/activities/BookmarkActivity.java b/app/src/main/java/gr/thmmy/mthmmy/activities/BookmarkActivity.java
deleted file mode 100644
index 4c4614ef..00000000
--- a/app/src/main/java/gr/thmmy/mthmmy/activities/BookmarkActivity.java
+++ /dev/null
@@ -1,198 +0,0 @@
-package gr.thmmy.mthmmy.activities;
-
-import android.content.Intent;
-import android.graphics.Typeface;
-import android.graphics.drawable.Drawable;
-import android.os.Build;
-import android.os.Bundle;
-import android.support.graphics.drawable.VectorDrawableCompat;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.widget.ImageButton;
-import android.widget.LinearLayout;
-import android.widget.TextView;
-import android.widget.Toast;
-
-import gr.thmmy.mthmmy.R;
-import gr.thmmy.mthmmy.activities.board.BoardActivity;
-import gr.thmmy.mthmmy.activities.topic.TopicActivity;
-import gr.thmmy.mthmmy.base.BaseActivity;
-import gr.thmmy.mthmmy.model.Bookmark;
-
-import static gr.thmmy.mthmmy.activities.board.BoardActivity.BUNDLE_BOARD_TITLE;
-import static gr.thmmy.mthmmy.activities.board.BoardActivity.BUNDLE_BOARD_URL;
-import static gr.thmmy.mthmmy.activities.topic.TopicActivity.BUNDLE_TOPIC_TITLE;
-import static gr.thmmy.mthmmy.activities.topic.TopicActivity.BUNDLE_TOPIC_URL;
-
-//TODO proper handling with adapter etc.
-//TODO better UI
-//TODO after clicking bookmark and then back button should return to this activity
-public class BookmarkActivity extends BaseActivity {
-    private TextView boardsTitle;
-    private TextView topicsTitle;
-
-    private static Drawable notificationsEnabledButtonImage;
-    private static Drawable notificationsDisabledButtonImage;
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_bookmark);
-
-        //Initialize toolbar
-        toolbar = findViewById(R.id.toolbar);
-        toolbar.setTitle("Bookmarks");
-        setSupportActionBar(toolbar);
-        if (getSupportActionBar() != null) {
-            getSupportActionBar().setDisplayHomeAsUpEnabled(true);
-            getSupportActionBar().setDisplayShowHomeEnabled(true);
-        }
-
-        createDrawer();
-        drawer.setSelection(BOOKMARKS_ID);
-
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-            notificationsEnabledButtonImage = getResources().getDrawable(R.drawable.ic_notification_on, null);
-        } else {
-            notificationsEnabledButtonImage = VectorDrawableCompat.create(getResources(), R.drawable.ic_notification_on, null);
-        }
-
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-            notificationsDisabledButtonImage = getResources().getDrawable(R.drawable.ic_notification_off, null);
-        } else {
-            notificationsDisabledButtonImage = VectorDrawableCompat.create(getResources(), R.drawable.ic_notification_off, null);
-        }
-
-        LinearLayout bookmarksLinearView = findViewById(R.id.bookmarks_container);
-        LayoutInflater layoutInflater = getLayoutInflater();
-
-        if(!getBoardsBookmarked().isEmpty()) {
-            boardsTitle = new TextView(this);
-            boardsTitle.setLayoutParams(new LinearLayout.LayoutParams(
-                    LinearLayout.LayoutParams.MATCH_PARENT
-                    , LinearLayout.LayoutParams.WRAP_CONTENT));
-            boardsTitle.setText(getString(R.string.board_bookmarks_title));
-            boardsTitle.setTypeface(boardsTitle.getTypeface(), Typeface.BOLD);
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-                boardsTitle.setTextColor(getColor(R.color.primary_text));
-            } else {
-                //noinspection deprecation
-                boardsTitle.setTextColor(getResources().getColor(R.color.primary_text));
-            }
-            boardsTitle.setTextAlignment(View.TEXT_ALIGNMENT_CENTER);
-            boardsTitle.setTextSize(20f);
-            bookmarksLinearView.addView(boardsTitle);
-
-            for (final Bookmark bookmarkedBoard : getBoardsBookmarked()) {
-                if (bookmarkedBoard != null && bookmarkedBoard.getTitle() != null) {
-                    final LinearLayout row = (LinearLayout) layoutInflater.inflate(
-                            R.layout.activity_bookmark_board_row, bookmarksLinearView, false);
-                    row.setOnClickListener(new View.OnClickListener() {
-                        @Override
-                        public void onClick(View view) {
-                            Intent intent = new Intent(BookmarkActivity.this, BoardActivity.class);
-                            Bundle extras = new Bundle();
-                            extras.putString(BUNDLE_BOARD_URL, "https://www.thmmy.gr/smf/index.php?board="
-                                    + bookmarkedBoard.getId() + ".0");
-                            extras.putString(BUNDLE_BOARD_TITLE, bookmarkedBoard.getTitle());
-                            intent.putExtras(extras);
-                            startActivity(intent);
-                            finish();
-                        }
-                    });
-                    ((TextView) row.findViewById(R.id.bookmark_title)).setText(bookmarkedBoard.getTitle());
-                    (row.findViewById(R.id.remove_bookmark)).setOnClickListener(new View.OnClickListener() {
-                        @Override
-                        public void onClick(View view) {
-                            removeBookmark(bookmarkedBoard);
-                            row.setVisibility(View.GONE);
-                            updateTitles();
-                        }
-                    });
-                    bookmarksLinearView.addView(row);
-                }
-            }
-        }
-
-
-        if(!getTopicsBookmarked().isEmpty()) {
-            topicsTitle = new TextView(this);
-            topicsTitle.setLayoutParams(new LinearLayout.LayoutParams(
-                    LinearLayout.LayoutParams.MATCH_PARENT
-                    , LinearLayout.LayoutParams.WRAP_CONTENT));
-            topicsTitle.setText(getString(R.string.topic_bookmarks_title));
-            topicsTitle.setTypeface(topicsTitle.getTypeface(), Typeface.BOLD);
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-                topicsTitle.setTextColor(getColor(R.color.primary_text));
-            } else {
-                //noinspection deprecation
-                topicsTitle.setTextColor(getResources().getColor(R.color.primary_text));
-            }
-            topicsTitle.setTextAlignment(View.TEXT_ALIGNMENT_CENTER);
-            topicsTitle.setTextSize(20f);
-            bookmarksLinearView.addView(topicsTitle);
-
-            for (final Bookmark bookmarkedTopic : getTopicsBookmarked()) {
-                if (bookmarkedTopic != null && bookmarkedTopic.getTitle() != null) {
-                    final LinearLayout row = (LinearLayout) layoutInflater.inflate(
-                            R.layout.activity_bookmark_topic_row, bookmarksLinearView, false);
-                    row.setOnClickListener(new View.OnClickListener() {
-                        @Override
-                        public void onClick(View view) {
-                            Intent intent = new Intent(BookmarkActivity.this, TopicActivity.class);
-                            Bundle extras = new Bundle();
-                            extras.putString(BUNDLE_TOPIC_URL, "https://www.thmmy.gr/smf/index.php?topic="
-                                    + bookmarkedTopic.getId() + "." + 2147483647);
-                            extras.putString(BUNDLE_TOPIC_TITLE, bookmarkedTopic.getTitle());
-                            intent.putExtras(extras);
-                            startActivity(intent);
-                            finish();
-                        }
-                    });
-                    ((TextView) row.findViewById(R.id.bookmark_title)).setText(bookmarkedTopic.getTitle());
-
-                    final ImageButton notificationsEnabledButton = row.findViewById(R.id.toggle_notification);
-                    if (!bookmarkedTopic.isNotificationsEnabled()){
-                        notificationsEnabledButton.setImageDrawable(notificationsDisabledButtonImage);
-                    }
-
-                    notificationsEnabledButton.setOnClickListener(new View.OnClickListener() {
-
-                        @Override
-                        public void onClick(View view) {
-                            if(toggleNotification(bookmarkedTopic)){
-                                notificationsEnabledButton.setImageDrawable(notificationsEnabledButtonImage);
-                            } else {
-                                notificationsEnabledButton.setImageDrawable(notificationsDisabledButtonImage);
-                            }
-                        }
-                    });
-                    (row.findViewById(R.id.remove_bookmark)).setOnClickListener(new View.OnClickListener() {
-                        @Override
-                        public void onClick(View view) {
-                            removeBookmark(bookmarkedTopic);
-                            row.setVisibility(View.GONE);
-                            Toast.makeText(BookmarkActivity.this, "Bookmark removed", Toast.LENGTH_SHORT).show();
-                            updateTitles();
-                        }
-                    });
-                    bookmarksLinearView.addView(row);
-                }
-            }
-        }
-    }
-
-    @Override
-    protected void onResume() {
-        drawer.setSelection(BOOKMARKS_ID);
-        super.onResume();
-    }
-
-    private void updateTitles()
-    {
-        if(getBoardsBookmarked().isEmpty()&&boardsTitle!=null)
-            boardsTitle.setVisibility(View.GONE);
-        if(getTopicsBookmarked().isEmpty()&&topicsTitle!=null)
-            topicsTitle.setVisibility(View.GONE);
-    }
-}
diff --git a/app/src/main/java/gr/thmmy/mthmmy/activities/bookmarks/BoardBookmarksFragment.java b/app/src/main/java/gr/thmmy/mthmmy/activities/bookmarks/BoardBookmarksFragment.java
new file mode 100644
index 00000000..3f93ddc4
--- /dev/null
+++ b/app/src/main/java/gr/thmmy/mthmmy/activities/bookmarks/BoardBookmarksFragment.java
@@ -0,0 +1,130 @@
+package gr.thmmy.mthmmy.activities.bookmarks;
+
+import android.app.Activity;
+import android.graphics.Typeface;
+import android.os.Build;
+import android.os.Bundle;
+import android.support.annotation.NonNull;
+import android.support.v4.app.Fragment;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+
+import java.util.ArrayList;
+
+import gr.thmmy.mthmmy.R;
+import gr.thmmy.mthmmy.model.Bookmark;
+
+/**
+ * A {@link Fragment} subclass.
+ * Use the {@link BoardBookmarksFragment#newInstance} factory method to
+ * create an instance of this fragment.
+ */
+public class BoardBookmarksFragment extends Fragment {
+    protected static final String ARG_SECTION_NUMBER = "SECTION_NUMBER";
+    protected static final String ARG_BOARD_BOOKMARKS = "BOARD_BOOKMARKS";
+
+    public static final String INTERACTION_CLICK_BOARD_BOOKMARK = "CLICK_BOARD_BOOKMARK";
+    public static final String INTERACTION_REMOVE_BOARD_BOOKMARK= "REMOVE_BOARD_BOOKMARK";
+
+    ArrayList<Bookmark> boardBookmarks = null;
+
+    // Required empty public constructor
+    public BoardBookmarksFragment() {
+    }
+
+    /**
+     * Use ONLY this factory method to create a new instance of
+     * this fragment using the provided parameters.
+     *
+     * @return A new instance of fragment Forum.
+     */
+    public static BoardBookmarksFragment newInstance(int sectionNumber, String boardBookmarks) {
+        BoardBookmarksFragment fragment = new BoardBookmarksFragment();
+        Bundle args = new Bundle();
+        args.putInt(ARG_SECTION_NUMBER, sectionNumber);
+        args.putString(ARG_BOARD_BOOKMARKS, boardBookmarks);
+        fragment.setArguments(args);
+        return fragment;
+    }
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        if (getArguments() != null) {
+            String bundledBoardBookmarks = getArguments().getString(ARG_BOARD_BOOKMARKS);
+            if (bundledBoardBookmarks != null) {
+                boardBookmarks = Bookmark.arrayFromString(bundledBoardBookmarks);
+            }
+        }
+    }
+
+    @Override
+    public View onCreateView(@NonNull LayoutInflater layoutInflater, ViewGroup container,
+                             Bundle savedInstanceState) {
+        // Inflates the layout for this fragment
+        final View rootView = layoutInflater.inflate(R.layout.fragment_bookmarks, container, false);
+        //bookmarks_board_container
+        final LinearLayout bookmarksLinearView = rootView.findViewById(R.id.bookmarks_container);
+
+        if(this.boardBookmarks != null && !this.boardBookmarks.isEmpty()) {
+            for (final Bookmark bookmarkedBoard : boardBookmarks) {
+                if (bookmarkedBoard != null && bookmarkedBoard.getTitle() != null) {
+                    final LinearLayout row = (LinearLayout) layoutInflater.inflate(
+                            R.layout.activity_bookmark_board_row, bookmarksLinearView, false);
+                    row.setOnClickListener(new View.OnClickListener() {
+                        @Override
+                        public void onClick(View view) {
+                            Activity activity = getActivity();
+                            if (activity instanceof BookmarkActivity){
+                                ((BookmarkActivity) activity).onBoardInteractionListener(INTERACTION_CLICK_BOARD_BOOKMARK, bookmarkedBoard);
+                            }
+                        }
+                    });
+                    ((TextView) row.findViewById(R.id.bookmark_title)).setText(bookmarkedBoard.getTitle());
+                    (row.findViewById(R.id.remove_bookmark)).setOnClickListener(new View.OnClickListener() {
+                        @Override
+                        public void onClick(View view) {
+                            Activity activity = getActivity();
+                            if (activity instanceof BookmarkActivity){
+                                ((BookmarkActivity) activity).onBoardInteractionListener(INTERACTION_REMOVE_BOARD_BOOKMARK, bookmarkedBoard);
+                                boardBookmarks.remove(bookmarkedBoard);
+                            }
+                            row.setVisibility(View.GONE);
+
+                            if (boardBookmarks.isEmpty()){
+                                bookmarksLinearView.addView(bookmarksListEmptyMessage());
+                            }
+                        }
+                    });
+                    bookmarksLinearView.addView(row);
+                }
+            }
+        } else {
+
+            bookmarksLinearView.addView(bookmarksListEmptyMessage());
+        }
+
+        return rootView;
+    }
+
+    private TextView bookmarksListEmptyMessage() {
+        TextView emptyBookmarksCategory = new TextView(this.getContext());
+        LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(
+                LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.WRAP_CONTENT);
+        params.setMargins(0, 12, 0, 0);
+        emptyBookmarksCategory.setLayoutParams(params);
+        emptyBookmarksCategory.setText(getString(R.string.empty_board_bookmarks));
+        emptyBookmarksCategory.setTypeface(emptyBookmarksCategory.getTypeface(), Typeface.BOLD);
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+            emptyBookmarksCategory.setTextColor(this.getContext().getColor(R.color.primary_text));
+        } else {
+            //noinspection deprecation
+            emptyBookmarksCategory.setTextColor(this.getContext().getResources().getColor(R.color.primary_text));
+        }
+        emptyBookmarksCategory.setTextAlignment(View.TEXT_ALIGNMENT_CENTER);
+        return emptyBookmarksCategory;
+    }
+}
diff --git a/app/src/main/java/gr/thmmy/mthmmy/activities/bookmarks/BookmarkActivity.java b/app/src/main/java/gr/thmmy/mthmmy/activities/bookmarks/BookmarkActivity.java
new file mode 100644
index 00000000..0408db44
--- /dev/null
+++ b/app/src/main/java/gr/thmmy/mthmmy/activities/bookmarks/BookmarkActivity.java
@@ -0,0 +1,143 @@
+package gr.thmmy.mthmmy.activities.bookmarks;
+
+import android.content.Intent;
+import android.graphics.drawable.Drawable;
+import android.os.Bundle;
+import android.support.design.widget.TabLayout;
+import android.support.v4.app.Fragment;
+import android.support.v4.app.FragmentManager;
+import android.support.v4.app.FragmentPagerAdapter;
+import android.support.v4.view.ViewPager;
+import android.widget.Toast;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import gr.thmmy.mthmmy.R;
+import gr.thmmy.mthmmy.activities.board.BoardActivity;
+import gr.thmmy.mthmmy.activities.topic.TopicActivity;
+import gr.thmmy.mthmmy.base.BaseActivity;
+import gr.thmmy.mthmmy.model.Bookmark;
+
+import static gr.thmmy.mthmmy.activities.board.BoardActivity.BUNDLE_BOARD_TITLE;
+import static gr.thmmy.mthmmy.activities.board.BoardActivity.BUNDLE_BOARD_URL;
+import static gr.thmmy.mthmmy.activities.topic.TopicActivity.BUNDLE_TOPIC_TITLE;
+import static gr.thmmy.mthmmy.activities.topic.TopicActivity.BUNDLE_TOPIC_URL;
+
+//TODO proper handling with adapter etc.
+//TODO after clicking bookmark and then back button should return to this activity
+public class BookmarkActivity extends BaseActivity {
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_bookmark);
+
+        //Initialize toolbar
+        toolbar = findViewById(R.id.toolbar);
+        toolbar.setTitle("Bookmarks");
+        setSupportActionBar(toolbar);
+        if (getSupportActionBar() != null) {
+            getSupportActionBar().setDisplayHomeAsUpEnabled(true);
+            getSupportActionBar().setDisplayShowHomeEnabled(true);
+        }
+
+        createDrawer();
+        drawer.setSelection(BOOKMARKS_ID);
+
+        //Creates the adapter that will return a fragment for each section of the activity
+        SectionsPagerAdapter sectionsPagerAdapter = new SectionsPagerAdapter(getSupportFragmentManager());
+        sectionsPagerAdapter.addFragment(TopicBookmarksFragment.newInstance(1, Bookmark.arrayToString(getTopicsBookmarked())), "Topics");
+        sectionsPagerAdapter.addFragment(BoardBookmarksFragment.newInstance(2, Bookmark.arrayToString(getBoardsBookmarked())), "Boards");
+
+        //Sets up the ViewPager with the sections adapter.
+        ViewPager viewPager = findViewById(R.id.bookmarks_container);
+        viewPager.setAdapter(sectionsPagerAdapter);
+
+        TabLayout tabLayout = findViewById(R.id.bookmark_tabs);
+        tabLayout.setupWithViewPager(viewPager);
+    }
+
+    @Override
+    protected void onResume() {
+        drawer.setSelection(BOOKMARKS_ID);
+        super.onResume();
+    }
+
+    public boolean onTopicInteractionListener(String interactionType, Bookmark bookmarkedTopic){
+        if (interactionType.equals(TopicBookmarksFragment.INTERACTION_CLICK_TOPIC_BOOKMARK)){
+            Intent intent = new Intent(BookmarkActivity.this, TopicActivity.class);
+            Bundle extras = new Bundle();
+            extras.putString(BUNDLE_TOPIC_URL, "https://www.thmmy.gr/smf/index.php?topic="
+                    + bookmarkedTopic.getId() + "." + 2147483647);
+            extras.putString(BUNDLE_TOPIC_TITLE, bookmarkedTopic.getTitle());
+            intent.putExtras(extras);
+            startActivity(intent);
+            finish();
+        } else if (interactionType.equals(TopicBookmarksFragment.INTERACTION_TOGGLE_TOPIC_NOTIFICATION)) {
+            return toggleNotification(bookmarkedTopic);
+        } else if (interactionType.equals(TopicBookmarksFragment.INTERACTION_REMOVE_TOPIC_BOOKMARK)){
+            removeBookmark(bookmarkedTopic);
+            Toast.makeText(BookmarkActivity.this, "Bookmark removed", Toast.LENGTH_SHORT).show();
+        }
+        return true;
+    }
+
+    public void onBoardInteractionListener(String interactionType, Bookmark bookmarkedBoard){
+        if (interactionType.equals(BoardBookmarksFragment.INTERACTION_CLICK_BOARD_BOOKMARK)){
+            Intent intent = new Intent(BookmarkActivity.this, BoardActivity.class);
+            Bundle extras = new Bundle();
+            extras.putString(BUNDLE_BOARD_URL, "https://www.thmmy.gr/smf/index.php?board="
+                    + bookmarkedBoard.getId() + ".0");
+            extras.putString(BUNDLE_BOARD_TITLE, bookmarkedBoard.getTitle());
+            intent.putExtras(extras);
+            startActivity(intent);
+            finish();
+        } else if (interactionType.equals(BoardBookmarksFragment.INTERACTION_REMOVE_BOARD_BOOKMARK)){
+            removeBookmark(bookmarkedBoard);
+            Toast.makeText(BookmarkActivity.this, "Bookmark removed", Toast.LENGTH_SHORT).show();
+        }
+    }
+
+    /**
+     * A {@link FragmentPagerAdapter} that returns a fragment corresponding to
+     * one of the sections/tabs/pages. If it becomes too memory intensive,
+     * it may be best to switch to a
+     * {@link android.support.v4.app.FragmentStatePagerAdapter}.
+     */
+    private class SectionsPagerAdapter extends FragmentPagerAdapter {
+        private final List<Fragment> fragmentList = new ArrayList<>();
+        private final List<String> fragmentTitleList = new ArrayList<>();
+
+        SectionsPagerAdapter(FragmentManager fm) {
+            super(fm);
+        }
+
+        void addFragment(Fragment fragment, String title) {
+            fragmentList.add(fragment);
+            fragmentTitleList.add(title);
+            notifyDataSetChanged();
+        }
+
+        @Override
+        public Fragment getItem(int position) {
+            return fragmentList.get(position);
+        }
+
+        @Override
+        public int getCount() {
+            return fragmentList.size();
+        }
+
+        @Override
+        public CharSequence getPageTitle(int position) {
+            return fragmentTitleList.get(position);
+        }
+
+        @Override
+        public int getItemPosition(Object object) {
+            @SuppressWarnings("RedundantCast")
+            int position = fragmentList.indexOf((Fragment) object);
+            return position == -1 ? POSITION_NONE : position;
+        }
+    }
+}
diff --git a/app/src/main/java/gr/thmmy/mthmmy/activities/bookmarks/TopicBookmarksFragment.java b/app/src/main/java/gr/thmmy/mthmmy/activities/bookmarks/TopicBookmarksFragment.java
new file mode 100644
index 00000000..d2b982f0
--- /dev/null
+++ b/app/src/main/java/gr/thmmy/mthmmy/activities/bookmarks/TopicBookmarksFragment.java
@@ -0,0 +1,163 @@
+package gr.thmmy.mthmmy.activities.bookmarks;
+
+import android.app.Activity;
+import android.graphics.Typeface;
+import android.graphics.drawable.Drawable;
+import android.os.Build;
+import android.os.Bundle;
+import android.support.annotation.NonNull;
+import android.support.graphics.drawable.VectorDrawableCompat;
+import android.support.v4.app.Fragment;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ImageButton;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+
+import java.util.ArrayList;
+
+import gr.thmmy.mthmmy.R;
+import gr.thmmy.mthmmy.model.Bookmark;
+
+public class TopicBookmarksFragment extends Fragment {
+    protected static final String ARG_SECTION_NUMBER = "SECTION_NUMBER";
+    protected static final String ARG_TOPIC_BOOKMARKS = "BOARD_BOOKMARKS";
+
+    public static final String INTERACTION_CLICK_TOPIC_BOOKMARK = "CLICK_BOARD_BOOKMARK";
+    public static final String INTERACTION_TOGGLE_TOPIC_NOTIFICATION = "TOGGLE_TOPIC_NOTIFICATION";
+    public static final String INTERACTION_REMOVE_TOPIC_BOOKMARK = "REMOVE_BOARD_BOOKMARK";
+
+    ArrayList<Bookmark> topicBookmarks = null;
+
+    private static Drawable notificationsEnabledButtonImage;
+    private static Drawable notificationsDisabledButtonImage;
+
+    // Required empty public constructor
+    public TopicBookmarksFragment() {
+    }
+
+    /**
+     * Use ONLY this factory method to create a new instance of
+     * this fragment using the provided parameters.
+     *
+     * @return A new instance of fragment Forum.
+     */
+    public static TopicBookmarksFragment newInstance(int sectionNumber, String boardBookmarks) {
+        TopicBookmarksFragment fragment = new TopicBookmarksFragment();
+        Bundle args = new Bundle();
+        args.putInt(ARG_SECTION_NUMBER, sectionNumber);
+        args.putString(ARG_TOPIC_BOOKMARKS, boardBookmarks);
+        fragment.setArguments(args);
+        return fragment;
+    }
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        if (getArguments() != null) {
+            String bundledBoardBookmarks = getArguments().getString(ARG_TOPIC_BOOKMARKS);
+            if (bundledBoardBookmarks != null) {
+                topicBookmarks = Bookmark.arrayFromString(bundledBoardBookmarks);
+            }
+        }
+
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+            notificationsEnabledButtonImage = getResources().getDrawable(R.drawable.ic_notification_on, null);
+        } else {
+            notificationsEnabledButtonImage = VectorDrawableCompat.create(getResources(), R.drawable.ic_notification_on, null);
+        }
+
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+            notificationsDisabledButtonImage = getResources().getDrawable(R.drawable.ic_notification_off, null);
+        } else {
+            notificationsDisabledButtonImage = VectorDrawableCompat.create(getResources(), R.drawable.ic_notification_off, null);
+        }
+    }
+
+    @Override
+    public View onCreateView(@NonNull LayoutInflater layoutInflater, ViewGroup container,
+                             Bundle savedInstanceState) {
+        // Inflates the layout for this fragment
+        final View rootView = layoutInflater.inflate(R.layout.fragment_bookmarks, container, false);
+        //bookmarks_board_container
+        final LinearLayout bookmarksLinearView = rootView.findViewById(R.id.bookmarks_container);
+
+        if(this.topicBookmarks != null && !this.topicBookmarks.isEmpty()) {
+            for (final Bookmark bookmarkedTopic : topicBookmarks) {
+                if (bookmarkedTopic != null && bookmarkedTopic.getTitle() != null) {
+                    final LinearLayout row = (LinearLayout) layoutInflater.inflate(
+                            R.layout.activity_bookmark_topic_row, bookmarksLinearView, false);
+                    row.setOnClickListener(new View.OnClickListener() {
+                        @Override
+                        public void onClick(View view) {
+                            Activity activity = getActivity();
+                            if (activity instanceof BookmarkActivity) {
+                                ((BookmarkActivity) activity).onTopicInteractionListener(INTERACTION_CLICK_TOPIC_BOOKMARK, bookmarkedTopic);
+                            }
+                        }
+                    });
+                    ((TextView) row.findViewById(R.id.bookmark_title)).setText(bookmarkedTopic.getTitle());
+
+                    final ImageButton notificationsEnabledButton = row.findViewById(R.id.toggle_notification);
+                    if (!bookmarkedTopic.isNotificationsEnabled()) {
+                        notificationsEnabledButton.setImageDrawable(notificationsDisabledButtonImage);
+                    }
+
+                    notificationsEnabledButton.setOnClickListener(new View.OnClickListener() {
+                        @Override
+                        public void onClick(View view) {
+                            Activity activity = getActivity();
+                            if (activity instanceof BookmarkActivity) {
+                                if (((BookmarkActivity) activity).onTopicInteractionListener(INTERACTION_TOGGLE_TOPIC_NOTIFICATION, bookmarkedTopic)) {
+                                    notificationsEnabledButton.setImageDrawable(notificationsEnabledButtonImage);
+                                } else {
+                                    notificationsEnabledButton.setImageDrawable(notificationsDisabledButtonImage);
+                                }
+                            }
+                        }
+                    });
+                    (row.findViewById(R.id.remove_bookmark)).setOnClickListener(new View.OnClickListener() {
+                        @Override
+                        public void onClick(View view) {
+                            Activity activity = getActivity();
+                            if (activity instanceof BookmarkActivity) {
+                                ((BookmarkActivity) activity).onTopicInteractionListener(INTERACTION_REMOVE_TOPIC_BOOKMARK, bookmarkedTopic);
+                                topicBookmarks.remove(bookmarkedTopic);
+                            }
+                            row.setVisibility(View.GONE);
+
+                            if (topicBookmarks.isEmpty()){
+                                bookmarksLinearView.addView(bookmarksListEmptyMessage());
+                            }
+                        }
+                    });
+                    bookmarksLinearView.addView(row);
+                }
+            }
+        } else {
+            bookmarksLinearView.addView(bookmarksListEmptyMessage());
+        }
+
+
+        return rootView;
+    }
+
+    private TextView bookmarksListEmptyMessage() {
+        TextView emptyBookmarksCategory = new TextView(this.getContext());
+        LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(
+                LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.WRAP_CONTENT);
+        params.setMargins(0, 12, 0, 0);
+        emptyBookmarksCategory.setLayoutParams(params);
+        emptyBookmarksCategory.setText(getString(R.string.empty_topic_bookmarks));
+        emptyBookmarksCategory.setTypeface(emptyBookmarksCategory.getTypeface(), Typeface.BOLD);
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+            emptyBookmarksCategory.setTextColor(this.getContext().getColor(R.color.primary_text));
+        } else {
+            //noinspection deprecation
+            emptyBookmarksCategory.setTextColor(this.getContext().getResources().getColor(R.color.primary_text));
+        }
+        emptyBookmarksCategory.setTextAlignment(View.TEXT_ALIGNMENT_CENTER);
+        return emptyBookmarksCategory;
+    }
+}
diff --git a/app/src/main/java/gr/thmmy/mthmmy/base/BaseActivity.java b/app/src/main/java/gr/thmmy/mthmmy/base/BaseActivity.java
index 5a98d618..9150065d 100644
--- a/app/src/main/java/gr/thmmy/mthmmy/base/BaseActivity.java
+++ b/app/src/main/java/gr/thmmy/mthmmy/base/BaseActivity.java
@@ -42,7 +42,7 @@ import java.util.ArrayList;
 
 import gr.thmmy.mthmmy.R;
 import gr.thmmy.mthmmy.activities.AboutActivity;
-import gr.thmmy.mthmmy.activities.BookmarkActivity;
+import gr.thmmy.mthmmy.activities.bookmarks.BookmarkActivity;
 import gr.thmmy.mthmmy.activities.LoginActivity;
 import gr.thmmy.mthmmy.activities.downloads.DownloadsActivity;
 import gr.thmmy.mthmmy.activities.main.MainActivity;
diff --git a/app/src/main/res/layout/activity_bookmark.xml b/app/src/main/res/layout/activity_bookmark.xml
index a12e5e68..03bee885 100644
--- a/app/src/main/res/layout/activity_bookmark.xml
+++ b/app/src/main/res/layout/activity_bookmark.xml
@@ -21,25 +21,26 @@
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"
             android:background="?attr/colorPrimary"
+            android:gravity="center"
             app:popupTheme="@style/ToolbarTheme">
         </android.support.v7.widget.Toolbar>
+
+        <android.support.design.widget.TabLayout
+            android:id="@+id/bookmark_tabs"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center"
+            app:tabGravity="fill"
+            app:tabMode="fixed"
+            app:tabSelectedTextColor="@color/accent"
+            app:tabTextColor="@color/white"/>
     </android.support.design.widget.AppBarLayout>
 
-    <android.support.v4.widget.NestedScrollView
-        android:id="@+id/bookmarks_nested_scroll"
+    <android.support.v4.view.ViewPager
+        android:id="@+id/bookmarks_container"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_gravity="top|start"
-        android:background="@color/background"
-        android:scrollbars="none"
-        app:layout_behavior="@string/appbar_scrolling_view_behavior">
-
-        <LinearLayout
-            android:id="@+id/bookmarks_container"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical"/>
-    </android.support.v4.widget.NestedScrollView>
+        app:layout_behavior="@string/appbar_scrolling_view_behavior"/>
 
     <me.zhanghai.android.materialprogressbar.MaterialProgressBar
         android:id="@+id/progressBar"
diff --git a/app/src/main/res/layout/fragment_bookmarks.xml b/app/src/main/res/layout/fragment_bookmarks.xml
new file mode 100644
index 00000000..43f171d7
--- /dev/null
+++ b/app/src/main/res/layout/fragment_bookmarks.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent" android:layout_height="match_parent">
+
+    <android.support.v4.widget.NestedScrollView
+        android:id="@+id/bookmarks_nested_scroll"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_gravity="top|start"
+        android:background="@color/background"
+        android:scrollbars="none"
+        app:layout_behavior="@string/appbar_scrolling_view_behavior">
+
+        <LinearLayout
+            android:id="@+id/bookmarks_container"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:orientation="vertical"/>
+    </android.support.v4.widget.NestedScrollView>
+</RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index a4543e86..f95c254d 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -72,8 +72,8 @@
 
     <!--Bookmarks-->
     <string name="remove_bookmark">Remove</string>
-    <string name="board_bookmarks_title">Boards</string>
-    <string name="topic_bookmarks_title">Topics</string>
+    <string name="empty_board_bookmarks">You have no bookmarked boards</string>
+    <string name="empty_topic_bookmarks">You have no bookmarked topics</string>
 
     <!--FontAwesome-->
     <string name="fa_icon_star">&#xf005;</string>
@@ -100,4 +100,7 @@
     <string name="cancel">Cancel</string>
     <string name="open">Open</string>
     <string name="download">Download</string>
+
+    <!-- TODO: Remove or change this placeholder text -->
+    <string name="hello_blank_fragment">Hello blank fragment</string>
 </resources>

From 2abace56325e50d02ceb3ce9299d34f085705b51 Mon Sep 17 00:00:00 2001
From: Apostolof <apotwohd@gmail.com>
Date: Wed, 4 Jul 2018 13:41:30 +0300
Subject: [PATCH 28/29] Minor bookmarks activity UI enhancements

---
 .../bookmarks/BoardBookmarksFragment.java     |   2 +-
 .../bookmarks/TopicBookmarksFragment.java     |   2 +-
 app/src/main/res/drawable-hdpi/ic_delete.png  | Bin 0 -> 198 bytes
 .../res/drawable-hdpi/ic_remove_circle.png    | Bin 392 -> 0 bytes
 app/src/main/res/drawable-mdpi/ic_delete.png  | Bin 0 -> 132 bytes
 .../res/drawable-mdpi/ic_remove_circle.png    | Bin 270 -> 0 bytes
 app/src/main/res/drawable-xhdpi/ic_delete.png | Bin 0 -> 196 bytes
 .../res/drawable-xhdpi/ic_remove_circle.png   | Bin 509 -> 0 bytes
 .../main/res/drawable-xxhdpi/ic_delete.png    | Bin 0 -> 279 bytes
 .../res/drawable-xxhdpi/ic_remove_circle.png  | Bin 746 -> 0 bytes
 .../main/res/drawable-xxxhdpi/ic_delete.png   | Bin 0 -> 357 bytes
 .../res/drawable-xxxhdpi/ic_remove_circle.png | Bin 1060 -> 0 bytes
 .../main/res/layout/fragment_bookmarks.xml    |   5 +++-
 ...w.xml => fragment_bookmarks_board_row.xml} |  20 ++++++++-----
 ...w.xml => fragment_bookmarks_topic_row.xml} |  28 +++++++++++-------
 app/src/main/res/values/strings.xml           |   3 --
 16 files changed, 36 insertions(+), 24 deletions(-)
 create mode 100644 app/src/main/res/drawable-hdpi/ic_delete.png
 delete mode 100644 app/src/main/res/drawable-hdpi/ic_remove_circle.png
 create mode 100644 app/src/main/res/drawable-mdpi/ic_delete.png
 delete mode 100644 app/src/main/res/drawable-mdpi/ic_remove_circle.png
 create mode 100644 app/src/main/res/drawable-xhdpi/ic_delete.png
 delete mode 100644 app/src/main/res/drawable-xhdpi/ic_remove_circle.png
 create mode 100644 app/src/main/res/drawable-xxhdpi/ic_delete.png
 delete mode 100644 app/src/main/res/drawable-xxhdpi/ic_remove_circle.png
 create mode 100644 app/src/main/res/drawable-xxxhdpi/ic_delete.png
 delete mode 100644 app/src/main/res/drawable-xxxhdpi/ic_remove_circle.png
 rename app/src/main/res/layout/{activity_bookmark_board_row.xml => fragment_bookmarks_board_row.xml} (65%)
 rename app/src/main/res/layout/{activity_bookmark_topic_row.xml => fragment_bookmarks_topic_row.xml} (66%)

diff --git a/app/src/main/java/gr/thmmy/mthmmy/activities/bookmarks/BoardBookmarksFragment.java b/app/src/main/java/gr/thmmy/mthmmy/activities/bookmarks/BoardBookmarksFragment.java
index 3f93ddc4..6b7dee26 100644
--- a/app/src/main/java/gr/thmmy/mthmmy/activities/bookmarks/BoardBookmarksFragment.java
+++ b/app/src/main/java/gr/thmmy/mthmmy/activities/bookmarks/BoardBookmarksFragment.java
@@ -73,7 +73,7 @@ public class BoardBookmarksFragment extends Fragment {
             for (final Bookmark bookmarkedBoard : boardBookmarks) {
                 if (bookmarkedBoard != null && bookmarkedBoard.getTitle() != null) {
                     final LinearLayout row = (LinearLayout) layoutInflater.inflate(
-                            R.layout.activity_bookmark_board_row, bookmarksLinearView, false);
+                            R.layout.fragment_bookmarks_board_row, bookmarksLinearView, false);
                     row.setOnClickListener(new View.OnClickListener() {
                         @Override
                         public void onClick(View view) {
diff --git a/app/src/main/java/gr/thmmy/mthmmy/activities/bookmarks/TopicBookmarksFragment.java b/app/src/main/java/gr/thmmy/mthmmy/activities/bookmarks/TopicBookmarksFragment.java
index d2b982f0..7679ad2f 100644
--- a/app/src/main/java/gr/thmmy/mthmmy/activities/bookmarks/TopicBookmarksFragment.java
+++ b/app/src/main/java/gr/thmmy/mthmmy/activities/bookmarks/TopicBookmarksFragment.java
@@ -87,7 +87,7 @@ public class TopicBookmarksFragment extends Fragment {
             for (final Bookmark bookmarkedTopic : topicBookmarks) {
                 if (bookmarkedTopic != null && bookmarkedTopic.getTitle() != null) {
                     final LinearLayout row = (LinearLayout) layoutInflater.inflate(
-                            R.layout.activity_bookmark_topic_row, bookmarksLinearView, false);
+                            R.layout.fragment_bookmarks_topic_row, bookmarksLinearView, false);
                     row.setOnClickListener(new View.OnClickListener() {
                         @Override
                         public void onClick(View view) {
diff --git a/app/src/main/res/drawable-hdpi/ic_delete.png b/app/src/main/res/drawable-hdpi/ic_delete.png
new file mode 100644
index 0000000000000000000000000000000000000000..83e1bb27c0edd5cc33661b523be0a98f6ac7b958
GIT binary patch
literal 198
zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k1|%Oc%$NbBdOcknLn>~)y|J6OK|!Q7(X0Hz
zEyW(|n?d(1We!M69J1)y__fe8hque!>5=9?zC+UmgbrMB&M!J8@I^deVWh9#rsp$M
z6!uTJ{LMj+O;k$3T&!-Ez!z1G+rerJ5)`hK3AzY4vOowHrd)<IT`ax~7dlwB-ulF3
soXz{|X;fzHk)!v{YySN07_f@(i^|pAE2UOO03F8Q>FVdQ&MBb@0J7LfI{*Lx

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-hdpi/ic_remove_circle.png b/app/src/main/res/drawable-hdpi/ic_remove_circle.png
deleted file mode 100644
index e4cc857927bebe83c3fec9039d5d1b68d161cd6e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 392
zcmV;30eAk1P)<h;3K|Lk000e1NJLTq001Na001Ni1^@s6;Q*MJ0003`Nkl<Zc-rll
zPYQxS6o;j<T}YScForE!2;C(@JVBB|bbyGUJGhB%5|v$`Hui)!8>#1v^GAyoABZr+
zr@oor8?DiHW3>tEFQh@J4@`g<H~}}{iQMqs3h)41r_c}xfjf|Mk^uqWs1};x)8{q0
z0KN*LF0hsmDHG$IwS<a+2Zb_>Jtaj6tu@Fn5>cU<Mj3|BD>RfWV39(1c!WX&GK@u)
zP+xGLktHi{o@JqlK^exF5{erTiYTE|142hih+17K=29I}V%{qy^dtrb5^Y65%=`E%
zq1Jt}))n=t0ih)&<TW7VRz*i<P^PHaURAgT28HH4Y42cbpj+k)40szf-+<6mw1tgL
z1*%Aszt<qM13EItphWST>8Lm;`jUly{!}wEM`;Ip;7o9znZH|2Dt|WE*mg#kLsv}f
m2VNgB4&3sl_y0filR_`p6Q>$Fohupu0000<MNUMnLSTY~)t@i`

diff --git a/app/src/main/res/drawable-mdpi/ic_delete.png b/app/src/main/res/drawable-mdpi/ic_delete.png
new file mode 100644
index 0000000000000000000000000000000000000000..5ac9ef3051a0ece7dea48d79b1747aa6571d2d23
GIT binary patch
literal 132
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`Gj-kvUwAr-fh1ES5k8>h`kbctBN
zaD>0%hrLuC!&K$dP5)CK9ZY77ebkV2y+6tz>);C3#bN;mo5EEj{x!*P|7rZ8I<f6{
f-y5r$N<0i-cfQrm|EbUjG?u~B)z4*}Q$iB}jNmV7

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-mdpi/ic_remove_circle.png b/app/src/main/res/drawable-mdpi/ic_remove_circle.png
deleted file mode 100644
index a8470e6144a654c2fe61aff0f9f751d38957bf7f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 270
zcmV+p0rCEcP)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv0002hNkl<Zc-qaC
zK?;K~5Jf{5dXpYVP?U;iYC$M?fG#R}Bul70gl^g?Oh9DPOp_^g@xVp$A0*C?+Fu&=
zOVrka7^r|A(7=qmzdNABHC}=ocmPiaBanR~*a2ro@R}O;It4!AOUXw;9uRIwZGxD2
z<}U6)L<uT^aKnKT^n!wx5@<oejS|enLhi(__f4A!B#&sI1f8JZN(o9qL17!TQ6OB~
z22Eirh6)l_+0_BzCvIK)NRHgPHl$cwoHI{+pUeo0tHtr3kO6<iVtJu|`RE7p0@wIT
UVgiU{MgRZ+07*qoM6N<$g6xQEWB>pF

diff --git a/app/src/main/res/drawable-xhdpi/ic_delete.png b/app/src/main/res/drawable-xhdpi/ic_delete.png
new file mode 100644
index 0000000000000000000000000000000000000000..36f26ac71cb59737675d270921fd6a0a14f5a30f
GIT binary patch
literal 196
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1|-9oezpUtZci7-kcwMxZy0hl81Oh;oVTpv
z%)G<QJH%{faO}D+QnLNh5svyF(d{--8Y)LJdFu6mdKeDGPC9jXlDWg_53z!}?cIe8
z3>C~D_$wH9R9Jze(ZCtT_D3IfvnB+xq;MZl$mKe`K4{CW-moJzv6cPllkfAKFOvf5
axL?kc@omeM&GL*KApM@MelF{r5}E+t4L=+J

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xhdpi/ic_remove_circle.png b/app/src/main/res/drawable-xhdpi/ic_remove_circle.png
deleted file mode 100644
index c8ef34d2f941ce63f83a9d23b7e0e0b512cf8f65..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 509
zcmV<Z0RsMsP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm0005RNkl<Zc-rlm
zzfJ-{5Qh&u3hfNULWR;dkidhGcm>aa@BpB+5JN;;8xk5r;&TvQK!S~U+IloNo6IGI
zL^Hd$f9B#9UqZM5zwd6@-I?_+p6<Og<7EPw01tsYPzO4|6j%Tuut7q6Ph4vQHT;Zo
zfeO$E-hiznE8qqwyAU`5#&~zP35kFaP_iY^1U@wc-$x9yz@$I{cr*}vAMrGN-2z9z
zi-qtpGyF|00tL(AcO`rs0uK(t?+&L#0!@eEW3E&M#8mmkK;Q!?stAl3gpawC6{u)h
zq;w$`yE7SqKBMq4J*q%nac^UqC6J>C)ES14sZs<wj0LVK0#n8U6N<osvA~=n5E8#k
zcX>$p%{4_}!&o5t7XqmtLaF}~r+yl3GZtu31Zs>0E~%Tj6~pka)XkjWmZ3mbrXDCW
zD`>ufQ`wSo#7JPEQWKXX7B!Q+1IMaum4JajBWYvH<xm>x=*;=p=Cd9C8930{+?`nt
zf2g~??pqp8L&}{`a=;N_yU)aI)39~KRK#{)q-l{F{54gYJmfpaj@eRiZ`1v4g>`Yv
zTE)K21PhNfKA{L-&+%Fdca^#9pgR-D1d{Uur7kI&zW)r!00000NkvXXu0mjfe1X>o

diff --git a/app/src/main/res/drawable-xxhdpi/ic_delete.png b/app/src/main/res/drawable-xxhdpi/ic_delete.png
new file mode 100644
index 0000000000000000000000000000000000000000..4d806633b09e2c3535f2460afaab269f6089f818
GIT binary patch
literal 279
zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY1|&n@ZgvM!_dH!3Ln>~)y=};K$Uvmwq2E`&
zT^5zr7e7}p@CUapQh%X&WUbqY72Q*xY^^!GpY7K~J0q2|?`pEX*m5*5Ffy@l2q-wD
z-dfgn<wvq}T=GPR;KEf3XL*-fT)M(~Y$jN?fx*&~JHU0p(KE6Ra4iHG0U8U^73R3R
zEXY<^pr>@fP~d`{(gm$j{)WrTZ><nNX}&T#bx!G*+27vJE%Au`v_Z#k!tOuOTmS!)
hJI@PqR>PN#;<L|$Jy~$M;Xlx)44$rjF6*2UngBm|VxIs2

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xxhdpi/ic_remove_circle.png b/app/src/main/res/drawable-xxhdpi/ic_remove_circle.png
deleted file mode 100644
index 505d8b3a308b217b162210b4cfbcffe1ceac761b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 746
zcmV<G0u}v<P)<h;3K|Lk000e1NJLTq002k;002k`1^@s6RqeA!00089Nkl<Zc-rmU
z%Su8)7{Kv1*~N5aDLp_Bkz&zx8RVj;D5y>1Lljg{wCF+?YFE@ED6o=3B6<XIABSj{
z8r3I!6BU>^b7sz5zQrG+gpNP*=$ZLWZ3Bm!ZB*k3fq)2zfCz|yeieo$p&Yae6`?ZZ
zK~>Dd?-lVe^~X*?-L?Y7p#`Xb0H2&ypj&7j>azi87&?dE1yCAQgU+C|i9jRJodlFd
z)&DYwOaSVKjupcE?Ep&X3N!<~28hFYfigM)bwC>$!2E3$3Iz=mh4LEWur8sVpn!Uz
zCyjAfk9e#~fue@s{6vbV0_xEGW!0!Fo^uip(7J&*tQFZnGX~?Zrey*3Yw|hAkIzYQ
z89+xC;IQ`m1{$#lhn4md=*~i*8^3^tEyQ7^`~W()80b_KC@yKSOP6ZRE<>6DEm(}h
zniBykH~@6b3ltVyU^k^VsEY?^(g7USI1f<HA)qV|(5^#3+dM!;hk)*RfXV{DFsQwB
z-s3It0C^4pJ@Wun9RjKlkOUxliP1?~>?BQZ^YlUSyDhrZ_`gLSpb3Y7#(03bX}P2M
zg4wMDKzWfB#d!ySW<?k6YZl|wPa!eUZJ#rXflmC`7fV|VH0amXbHTNfbE`l@mf?Ir
zNx#Qm4lDxNkue{Xz~Lj)alBThURzyG$XEb0C3}c-&0w5m6;rMuoM1N%=K^Y1HAo)8
z;cQcI9&pw``K<_#hTz14x|t<{6YM&_til5U-wqYRTaR?ZS>ie8$h@I0qsiwauhqA5
zmA7Qpmq+#kynNUZx%ElqO}%NHLsog=nUe8bWN+l9aMV`DqFWW$bCNQjgQ^|RUYsVq
z#(i*+1@=5Hlg3mWdl1{hT{sh%#mTOF-1>b+yb69@!k=y7zSStysrq>7AD9pj0TB=Z
c5s<lk0VF(}X*CBV?f?J)07*qoM6N<$g2*FH7XSbN

diff --git a/app/src/main/res/drawable-xxxhdpi/ic_delete.png b/app/src/main/res/drawable-xxxhdpi/ic_delete.png
new file mode 100644
index 0000000000000000000000000000000000000000..3ececbea3be6052363cc8fc630488d016a3b3ba0
GIT binary patch
literal 357
zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD1|%QND7Ro>VASz+aSW-r_4dv|-X;Tvw!l1#
zPV+}yZx*;6V(3ep!}M6KiqX4CIwSM6bxnBEKX;wwVZXEEGxzo|Ff=eQ2rw`(F*q<V
za5&s=TPA;<DI)(*ir_Yrx=9?-()N}u^)@A1HbAT3fCFeDL%_R*Ja7@JFmf0l%>DRd
zy%57ZNoF2Zh8QC@i)jo69KDi#_Wz$PV`<o_=iCt7lbgi&#_4;{vHh*DCNb>eh<#M=
z{`k|g>l@1=AFn&})5oG+?sR$_*Zf(BiyoM5{9aJGYIZRr*ue@63@kw3<}BxrD7%~?
SkhI+&<Z4e>KbLh*2~7YLZeOVY

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xxxhdpi/ic_remove_circle.png b/app/src/main/res/drawable-xxxhdpi/ic_remove_circle.png
deleted file mode 100644
index 5bfad8b3106e5992d774be3dc407d663a529e55c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1060
zcmV+<1l#+GP)<h;3K|Lk000e1NJLTq003YB003YJ1^@s6;+S_h000B)Nkl<Zc-rlq
zT}xC!7{|AQ$d|gRUAu|aVoCZOWg;Sobg^LI7YLEHl=>WD>l+0Xh}T|}FL#pAt+0jo
zLM4e=`4)Sj)H65-bZv9aoadaGGv|NtyIEP(|8IBBoM)bylghm=rhqvR0t7$+fB*;p
z5C8!H0#49Cv=aTq7%@wfhz+7l97xLYHSx0<VpP6Iyf*^@>eLgR#4xc${9$5|7$Q1|
zItVz<S@}twAbvB3UX49soM@51JFx;T5d~s3g3zn6Li7?BlO#Y40Z)ma27|9;lNcas
zT^G<re6=X}N<I^L7X>sD(-sF`$y?&OD+0QSofw7hu_eE;u@z85yo_P+m53?vg}4b2
zH&7oO2;bv9k&cUioZ+cuScn_L8@3C$O?-1Oe2+Dv$yNb5$HPA=;ihc@t~xsG{BJl)
z+ajRGu?wy$^Bl7y4goI`7{14dX#w2{4&UQ}DFKZ!y~E{Zo5-3FFpcn!)s7++(1p-X
zkdI10o#iEElcnt1C<Ht~*j0HHwg9n=_ya*#<-2Sw2u(l%A)iW5SOU%^tlXf>vY&1X
zKLT12t}@MG2$(>y%DmwgP#;m#lq>A2PDxb-bRtyWv~vm=MxeeK<P@-kKz;L(OF#p{
z)aD9@08BsixyK=(A3<u<$01-0L25I^Az&6kYBR+lpv3$~*}gB0^M7675U>FO+N^U3
zC__M?{b+#&96*3J`w-xO01QEfhag;p4PS&Y4K+Lsoxu&2Ht#qDj3P*FiYUgJrGRp@
z<=qh~0x}5F?1GG75n-BJl1$0EHbV8sGfn{=2-G)ioC50PZ8d^bV@K{DWo=CyN3hDg
z3Zpl)1;HwFHw*!y<$49-D(#{_6V?WeUIct955wFcBTg6GM95Xy$oV{%RHs}!fS~nj
zKO6#T<(5nYew<a+sVB!q?K}cM!Tl(A%BSS^d<1{Uq;8Hu1c-Arw-A2u7jeym0Gt^S
z;EV_^0fLbPhyOfiejEbCv0d{C41bO|Z-W3qI$`_B!~)f2j_f%5X~a>EYY7Nn9MzNM
z%8k3JsmXB(Ux-_rnT63=CcX*Fjt)Cn?!3Zk@5?xLVV>g}^P>{r&5m5?svG2(?U)eY
zA<os@j_Dn4=#Mjrs^d5tv)a*Qkn)0!0*+QuZ7yZ6=vFo3BEVZuc$_;t;LfI%tb$HG
zKaK*99s<>4c*?pY*KmzJ-q4mu8Hz4qam?3lL`_qoZ|9Dm?gf_xR1Qz=a_aYqG4zt`
z)oe2{%*08+zlwa~$d^9ZAUq}aU9HPj$$iP5d~HE)3o6Pny;-G290Kq_X8-{Z03ZMY
e00ck)h?2jD)2xd`kd!F^0000<MNUMnLSTa4hS1Ug

diff --git a/app/src/main/res/layout/fragment_bookmarks.xml b/app/src/main/res/layout/fragment_bookmarks.xml
index 43f171d7..cd5ec7af 100644
--- a/app/src/main/res/layout/fragment_bookmarks.xml
+++ b/app/src/main/res/layout/fragment_bookmarks.xml
@@ -17,6 +17,9 @@
             android:id="@+id/bookmarks_container"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:orientation="vertical"/>
+            android:orientation="vertical"
+            android:showDividers="middle"
+            android:divider="?android:listDivider"
+            android:dividerPadding="16dp"/>
     </android.support.v4.widget.NestedScrollView>
 </RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_bookmark_board_row.xml b/app/src/main/res/layout/fragment_bookmarks_board_row.xml
similarity index 65%
rename from app/src/main/res/layout/activity_bookmark_board_row.xml
rename to app/src/main/res/layout/fragment_bookmarks_board_row.xml
index 7d2632a2..a29222b0 100644
--- a/app/src/main/res/layout/activity_bookmark_board_row.xml
+++ b/app/src/main/res/layout/fragment_bookmarks_board_row.xml
@@ -8,26 +8,30 @@
     android:clickable="true"
     android:focusable="true"
     android:gravity="center_vertical"
-    android:orientation="horizontal"
-    android:paddingBottom="6dp"
-    android:paddingEnd="16dp"
-    android:paddingStart="16dp"
-    android:paddingTop="6dp">
+    android:orientation="horizontal">
 
     <TextView
         android:id="@+id/bookmark_title"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_weight="1"
-        android:paddingBottom="2dp"
+        android:paddingBottom="8dp"
+        android:paddingTop="6dp"
+        android:paddingStart="16dp"
+        android:paddingEnd="0dp"
         android:textColor="@color/primary_text"
         android:textSize="18sp"/>
 
     <ImageButton
         android:id="@+id/remove_bookmark"
         android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+        android:layout_height="match_parent"
+        android:paddingBottom="3dp"
+        android:paddingTop="3dp"
+        android:paddingStart="6dp"
+        android:paddingEnd="6dp"
+        android:layout_marginEnd="12dp"
         android:background="?android:attr/selectableItemBackground"
         android:contentDescription="@string/remove_bookmark"
-        android:src="@drawable/ic_remove_circle"/>
+        android:src="@drawable/ic_delete"/>
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_bookmark_topic_row.xml b/app/src/main/res/layout/fragment_bookmarks_topic_row.xml
similarity index 66%
rename from app/src/main/res/layout/activity_bookmark_topic_row.xml
rename to app/src/main/res/layout/fragment_bookmarks_topic_row.xml
index 09158cb6..60b23b81 100644
--- a/app/src/main/res/layout/activity_bookmark_topic_row.xml
+++ b/app/src/main/res/layout/fragment_bookmarks_topic_row.xml
@@ -9,26 +9,29 @@
     android:clickable="true"
     android:focusable="true"
     android:gravity="center_vertical"
-    android:orientation="horizontal"
-    android:paddingBottom="6dp"
-    android:paddingEnd="16dp"
-    android:paddingStart="16dp"
-    android:paddingTop="6dp">
+    android:orientation="horizontal">
 
     <TextView
         android:id="@+id/bookmark_title"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_weight="1"
-        android:paddingBottom="2dp"
+        android:paddingBottom="8dp"
+        android:paddingTop="6dp"
+        android:paddingStart="16dp"
+        android:paddingEnd="0dp"
         android:textColor="@color/primary_text"
         android:textSize="18sp"/>
 
     <ImageButton
         android:id="@+id/toggle_notification"
         android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginEnd="12dp"
+        android:layout_height="match_parent"
+        android:paddingBottom="3dp"
+        android:paddingTop="3dp"
+        android:paddingStart="6dp"
+        android:paddingEnd="6dp"
+        android:layout_marginEnd="9dp"
         android:background="?android:attr/selectableItemBackground"
         android:contentDescription="@string/toggle_notification"
         app:srcCompat="@drawable/ic_notification_on"/>
@@ -36,8 +39,13 @@
     <ImageButton
         android:id="@+id/remove_bookmark"
         android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+        android:layout_height="match_parent"
+        android:paddingBottom="3dp"
+        android:paddingTop="3dp"
+        android:paddingStart="6dp"
+        android:paddingEnd="6dp"
+        android:layout_marginEnd="12dp"
         android:background="?android:attr/selectableItemBackground"
         android:contentDescription="@string/remove_bookmark"
-        android:src="@drawable/ic_remove_circle"/>
+        android:src="@drawable/ic_delete"/>
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index f95c254d..df0d3cd4 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -100,7 +100,4 @@
     <string name="cancel">Cancel</string>
     <string name="open">Open</string>
     <string name="download">Download</string>
-
-    <!-- TODO: Remove or change this placeholder text -->
-    <string name="hello_blank_fragment">Hello blank fragment</string>
 </resources>

From 61809bef242653a67f2c105f75361c965577f271 Mon Sep 17 00:00:00 2001
From: Ezerous <ezerous@gmail.com>
Date: Wed, 4 Jul 2018 17:41:52 +0300
Subject: [PATCH 29/29] Up version, tiny bookmarks UI changes

---
 app/build.gradle                                         | 7 +++----
 app/src/main/res/layout/fragment_bookmarks.xml           | 2 +-
 app/src/main/res/layout/fragment_bookmarks_board_row.xml | 2 +-
 app/src/main/res/layout/fragment_bookmarks_topic_row.xml | 5 ++---
 4 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 4d8ca81d..aafe1fe9 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -10,8 +10,8 @@ android {
         applicationId "gr.thmmy.mthmmy"
         minSdkVersion 19
         targetSdkVersion 27
-        versionCode 11
-        versionName "1.3.3"
+        versionCode 12
+        versionName "1.4.0"
         archivesBaseName = "mTHMMY-v$versionName"
     }
 
@@ -49,8 +49,7 @@ dependencies {
     implementation 'com.mikepenz:fontawesome-typeface:4.7.0.0@aar'
     implementation 'com.mikepenz:google-material-typeface:3.0.1.2.original@aar'
     implementation 'pl.droidsonroids.gif:android-gif-drawable:1.2.12'
-    implementation 'com.bignerdranch.android:expandablerecyclerview:3.0.0-RC1'
-    //TODO: needs replacement
+    implementation 'com.bignerdranch.android:expandablerecyclerview:3.0.0-RC1'//TODO: deprecated!
     implementation 'me.zhanghai.android.materialprogressbar:library:1.4.2'
     implementation 'com.jakewharton.timber:timber:4.7.0'
 }
diff --git a/app/src/main/res/layout/fragment_bookmarks.xml b/app/src/main/res/layout/fragment_bookmarks.xml
index cd5ec7af..ca311cd4 100644
--- a/app/src/main/res/layout/fragment_bookmarks.xml
+++ b/app/src/main/res/layout/fragment_bookmarks.xml
@@ -9,7 +9,7 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_gravity="top|start"
-        android:background="@color/background"
+        android:background="@color/primary_light"
         android:scrollbars="none"
         app:layout_behavior="@string/appbar_scrolling_view_behavior">
 
diff --git a/app/src/main/res/layout/fragment_bookmarks_board_row.xml b/app/src/main/res/layout/fragment_bookmarks_board_row.xml
index a29222b0..621f218e 100644
--- a/app/src/main/res/layout/fragment_bookmarks_board_row.xml
+++ b/app/src/main/res/layout/fragment_bookmarks_board_row.xml
@@ -31,7 +31,7 @@
         android:paddingStart="6dp"
         android:paddingEnd="6dp"
         android:layout_marginEnd="12dp"
-        android:background="?android:attr/selectableItemBackground"
+        android:background="@android:color/transparent"
         android:contentDescription="@string/remove_bookmark"
         android:src="@drawable/ic_delete"/>
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_bookmarks_topic_row.xml b/app/src/main/res/layout/fragment_bookmarks_topic_row.xml
index 60b23b81..2708318e 100644
--- a/app/src/main/res/layout/fragment_bookmarks_topic_row.xml
+++ b/app/src/main/res/layout/fragment_bookmarks_topic_row.xml
@@ -31,8 +31,7 @@
         android:paddingTop="3dp"
         android:paddingStart="6dp"
         android:paddingEnd="6dp"
-        android:layout_marginEnd="9dp"
-        android:background="?android:attr/selectableItemBackground"
+        android:background="@android:color/transparent"
         android:contentDescription="@string/toggle_notification"
         app:srcCompat="@drawable/ic_notification_on"/>
 
@@ -45,7 +44,7 @@
         android:paddingStart="6dp"
         android:paddingEnd="6dp"
         android:layout_marginEnd="12dp"
-        android:background="?android:attr/selectableItemBackground"
+        android:background="@android:color/transparent"
         android:contentDescription="@string/remove_bookmark"
         android:src="@drawable/ic_delete"/>
 </LinearLayout>
\ No newline at end of file