From 65dbe0d69f5d8d01414eb57335abc4139a580a8d Mon Sep 17 00:00:00 2001
From: kdeng00 <kundeng94@gmail.com>
Date: Tue, 7 Jan 2020 22:27:51 -0500
Subject: [PATCH] Downloading songs needs some work

---
 app/app.iml                                   |  8 +++----
 app/build.gradle                              |  2 +-
 app/src/main/AndroidManifest.xml              | 18 ++++++---------
 app/src/main/cpp/Demo.hpp                     | 11 ++++------
 app/src/main/cpp/repository/BaseRepository.h  |  5 +++--
 app/src/main/cpp/repository/SongRepository.h  |  3 +--
 app/src/main/cpp/repository/UserRepository.h  |  7 ++----
 .../example/mear/activities/MainActivity.kt   | 19 +++++++++++-----
 .../com/example/mear/adapters/SongAdapter.kt  |  1 -
 .../mear/playback/service/MusicService.kt     | 22 ++++++++++++++++++-
 .../res/menu/popup_menu_song_downloaded.xml   | 16 ++++++++++++++
 app/src/main/res/values/strings.xml           |  1 +
 12 files changed, 74 insertions(+), 39 deletions(-)
 create mode 100644 app/src/main/res/menu/popup_menu_song_downloaded.xml

diff --git a/app/app.iml b/app/app.iml
index a44adb5..7fbd7e2 100644
--- a/app/app.iml
+++ b/app/app.iml
@@ -34,7 +34,7 @@
         <compilerSettings />
         <compilerArguments>
           <option name="destination" value="$MODULE_DIR$/build/tmp/kotlin-classes/debug" />
-          <option name="classpath" value="$USER_HOME$/.gradle/caches/transforms-2/files-2.1/0aa8665d8aa6de5841a341999f5163d3/ealvalog-android-0.5.0-api.jar:/home/brahmix/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-jdk7/1.3.50/50ad05ea1c2595fb31b800e76db464d08d599af3/kotlin-stdlib-jdk7-1.3.50.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/f5134c0772918548affcaf065deae0fd/anko-0.10.8-api.jar:/home/brahmix/.gradle/caches/modules-2/files-2.1/com.ealva/ealvatag/0.4.3/3c93057202a128c3dfde894b9050d043eb49d908/ealvatag-0.4.3.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/a249dc60465ba5c7f474c0004b91bf02/picasso-2.71828-api.jar:/home/brahmix/.gradle/caches/modules-2/files-2.1/com.squareup.okhttp3/okhttp/3.10.0/7ef0f1d95bf4c0b3ba30bbae25e0e562b05cf75e/okhttp-3.10.0.jar:/home/brahmix/.gradle/caches/modules-2/files-2.1/com.squareup.okio/okio/2.4.0/7e006aaf475d67f9521f04dcbe8865361300f4f1/okio-jvm-2.4.0.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/ee596472d1cc236d15750b22fbce466b/anko-sqlite-0.10.8-api.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/08e57d108e1974cd4ee13e1c1dd90363/anko-sdk27-0.10.8-api.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/d1c6298046675ad2ad2ee13fa618d303/anko-sdk27-coroutines-0.10.8-api.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/b5c6650c82b87c62b345ef10a3df3457/anko-appcompat-v7-0.10.8-api.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/a84173da99d4e63fc7b8faa4dffa4c45/anko-support-v4-0.10.8-api.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/40207ece73a52d6ecf6307c1ce6543fe/anko-appcompat-v7-coroutines-0.10.8-api.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/9f8bae9905534499f4161555cc4501d7/anko-appcompat-v7-commons-0.10.8-api.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/0675d1d1d9234a4aae569de44d639614/anko-support-v4-commons-0.10.8-api.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/346fd8d1f60ada1920dd392895de76e5/anko-commons-0.10.8-api.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/1856aaafc3c6344e55e431d201d01cda/anko-coroutines-0.10.8-api.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/4a22322ee37165904ce4f29fbe6eb534/sqlite-base-0.10.8-api.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/c98516fec0d6dd36ae190f2f361ae2c2/platform-base-0.10.8-api.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/db6ceff77f22f08d5b9c1eba63b90b53/appcompatV7-base-0.10.8-api.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/9a8e1977feabcb7569b70b8072b7c422/supportV4-base-0.10.8-api.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/8db4cebb001f9102d4174f46ca745a74/commons-base-0.10.8-api.jar:/home/brahmix/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlinx/kotlinx-coroutines-android/1.0.0/2102040565a29061ab7aaea6ea548ad51eafb11d/kotlinx-coroutines-android-1.0.0.jar:/home/brahmix/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlinx/kotlinx-coroutines-core/1.0.0/a33c4bf7581f71f01d4ed660b09ca199abbb44da/kotlinx-coroutines-core-1.0.0.jar:/home/brahmix/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib/1.3.50/b529d1738c7e98bbfa36a4134039528f2ce78ebf/kotlin-stdlib-1.3.50.jar:/home/brahmix/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlinx/kotlinx-coroutines-core-common/1.0.0/5f7551ec1edc068deaa0397100a1f14f32270274/kotlinx-coroutines-core-common-1.0.0.jar:/home/brahmix/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-common/1.3.50/3d9cd3e1bc7b92e95f43d45be3bfbcf38e36ab87/kotlin-stdlib-common-1.3.50.jar:/home/brahmix/.gradle/caches/modules-2/files-2.1/org.jetbrains/annotations/16.0.2/dab5655eb9abe23f2245c34e66c9813c7daf4563/annotations-16.0.2.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/673d07dab8daa3f747cd494ed96abff2/design-28.0.0-api.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/15c83ac359cebedb0e5d1c5072ce271e/appcompat-v7-28.0.0-api.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/f6815d532e131b720ae3dafcde6bcc84/cardview-v7-28.0.0-api.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/68e3837d5c7a91b97f12bd0c5728a6ca/support-v4-28.0.0-api.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/7ab04cbddf45b21558d639a3a81a0db3/support-fragment-28.0.0-api.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/200405178ccdc6ed1e369ff234d6aaed/animated-vector-drawable-28.0.0-api.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/5852be170e76a4d410d0c0a2c58cbc95/recyclerview-v7-28.0.0-api.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/edb692d396802b49a63fb3caf91e229b/support-core-ui-28.0.0-api.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/68cd55a085b397735614fe283aa8ecf6/support-core-utils-28.0.0-api.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/e0dba30937a80c0b7a6024ef6b1d0e53/support-vector-drawable-28.0.0-api.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/e09ec085c4c76535c11f42d7112be2a7/support-media-compat-28.0.0-api.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/f46db001c9ac0f5d279b89831d90fe00/transition-28.0.0-api.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/a61644e6c96342f90bffe439f957fbe6/loader-28.0.0-api.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/d306809a19251a40d918010de5b8688b/viewpager-28.0.0-api.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/69f3739925400a5765f980c4c6d6b5ba/coordinatorlayout-28.0.0-api.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/eb8200b39289f44f8cdc8707f5dcd70a/drawerlayout-28.0.0-api.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/0df22f57ce62d438167cd4bd72463436/slidingpanelayout-28.0.0-api.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/5a45c7466e931501f857337599a9c0ca/customview-28.0.0-api.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/bc0e7166eb6bf6ff2412fb3b9edaa2ed/swiperefreshlayout-28.0.0-api.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/68239d0e8764b85b90879f3c504e5e91/asynclayoutinflater-28.0.0-api.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/7b37ad611628ceeba357896420b6c32f/support-compat-28.0.0-api.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/99c3927db3b39b26a0a79536efff89fe/versionedparcelable-28.0.0-api.jar:/home/brahmix/.gradle/caches/modules-2/files-2.1/com.android.support/collections/28.0.0/c1bcdade4d3cc2836130424a3f3e4182c666a745/collections-28.0.0.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/74a575ab2d05088a814c9b13bb9f3c62/cursoradapter-28.0.0-api.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/8b15463d0c1bd0bfe7475c591b3704a4/exifinterface-27.1.0-api.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/1dbc96f7ceb96b172b91926f4b4bbe54/runtime-1.1.1-api.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/4804e6111f24f9fc2b3f9c812caef05c/documentfile-28.0.0-api.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/0d29cefc377a881b026547e331a45f48/localbroadcastmanager-28.0.0-api.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/328959aee04a4be1a20b789a44a93d11/print-28.0.0-api.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/f9acd20f99543c3fc193ec28ca86f7dd/viewmodel-1.1.1-api.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/5fcc5eb04da012eb7d49d621acc8839d/interpolator-28.0.0-api.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/24bef9872573af4ee64241248edc8a35/livedata-1.1.1-api.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/4a4479d31d2f6054d6e07187dc079ff6/livedata-core-1.1.1-api.jar:/home/brahmix/.gradle/caches/modules-2/files-2.1/android.arch.lifecycle/common/1.1.1/207a6efae6a3555e326de41f76bdadd9a239cbce/common-1.1.1.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/35889073e589d83d6c3dd5ba1048e31e/runtime-1.1.1-api.jar:/home/brahmix/.gradle/caches/modules-2/files-2.1/android.arch.core/common/1.1.1/e55b70d1f5620db124b3e85a7f4bdc7bd48d9f95/common-1.1.1.jar:/home/brahmix/.gradle/caches/modules-2/files-2.1/com.android.support/support-annotations/28.0.0/ed73f5337a002d1fd24339d5fb08c2c9d9ca60d8/support-annotations-28.0.0.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/b9f7a64c5f6b009aeacf9d9cf068b45f/constraint-layout-1.1.3-api.jar:/home/brahmix/.gradle/caches/modules-2/files-2.1/com.android.support.constraint/constraint-layout-solver/1.1.3/bde0667d7414c16ed62d3cfe993cff7f9d732373/constraint-layout-solver-1.1.3.jar:/home/brahmix/.gradle/caches/modules-2/files-2.1/com.google.guava/guava/23.0/c947004bb13d18182be60077ade044099e4f26f1/guava-23.0.jar:/home/brahmix/.gradle/caches/modules-2/files-2.1/com.google.code.findbugs/jsr305/1.3.9/40719ea6961c0cb6afaeb6a921eaa1f6afd4cfdf/jsr305-1.3.9.jar:/home/brahmix/.gradle/caches/modules-2/files-2.1/com.google.errorprone/error_prone_annotations/2.0.18/5f65affce1684999e2f4024983835efc3504012e/error_prone_annotations-2.0.18.jar:/home/brahmix/.gradle/caches/modules-2/files-2.1/com.google.j2objc/j2objc-annotations/1.1/ed28ded51a8b1c6b112568def5f4b455e6809019/j2objc-annotations-1.1.jar:/home/brahmix/.gradle/caches/modules-2/files-2.1/org.codehaus.mojo/animal-sniffer-annotations/1.14/775b7e22fb10026eed3f86e8dc556dfafe35f2d5/animal-sniffer-annotations-1.14.jar:/home/brahmix/.gradle/caches/modules-2/files-2.1/com.ealva/ealvalog/0.5.0/9ac5b435edc23482abd2815884805352820e4038/ealvalog-0.5.0.jar:/home/brahmix/.gradle/caches/modules-2/files-2.1/com.ealva/ealvalog-core/0.5.0/b218daf48ae873b529c4e865562e6ba1d319be2f/ealvalog-core-0.5.0.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/cf353b7e9eb8cfb3ab7d32b7a89422cc/XPopupWindow-1.0.1-api.jar:/home/brahmix/Android/Sdk/platforms/android-29/android.jar:/home/brahmix/Android/Sdk/build-tools/28.0.3/core-lambda-stubs.jar" />
+          <option name="classpath" value="$USER_HOME$/.gradle/caches/transforms-2/files-2.1/0aa8665d8aa6de5841a341999f5163d3/ealvalog-android-0.5.0-api.jar:/home/brahmix/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-jdk7/1.3.61/70dffc5f8ac5ea7c34f30deac5b9d8b1d48af066/kotlin-stdlib-jdk7-1.3.61.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/f5134c0772918548affcaf065deae0fd/anko-0.10.8-api.jar:/home/brahmix/.gradle/caches/modules-2/files-2.1/com.ealva/ealvatag/0.4.3/3c93057202a128c3dfde894b9050d043eb49d908/ealvatag-0.4.3.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/a249dc60465ba5c7f474c0004b91bf02/picasso-2.71828-api.jar:/home/brahmix/.gradle/caches/modules-2/files-2.1/com.squareup.okhttp3/okhttp/3.10.0/7ef0f1d95bf4c0b3ba30bbae25e0e562b05cf75e/okhttp-3.10.0.jar:/home/brahmix/.gradle/caches/modules-2/files-2.1/com.squareup.okio/okio/2.4.0/7e006aaf475d67f9521f04dcbe8865361300f4f1/okio-jvm-2.4.0.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/ee596472d1cc236d15750b22fbce466b/anko-sqlite-0.10.8-api.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/08e57d108e1974cd4ee13e1c1dd90363/anko-sdk27-0.10.8-api.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/d1c6298046675ad2ad2ee13fa618d303/anko-sdk27-coroutines-0.10.8-api.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/b5c6650c82b87c62b345ef10a3df3457/anko-appcompat-v7-0.10.8-api.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/a84173da99d4e63fc7b8faa4dffa4c45/anko-support-v4-0.10.8-api.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/40207ece73a52d6ecf6307c1ce6543fe/anko-appcompat-v7-coroutines-0.10.8-api.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/9f8bae9905534499f4161555cc4501d7/anko-appcompat-v7-commons-0.10.8-api.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/0675d1d1d9234a4aae569de44d639614/anko-support-v4-commons-0.10.8-api.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/346fd8d1f60ada1920dd392895de76e5/anko-commons-0.10.8-api.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/1856aaafc3c6344e55e431d201d01cda/anko-coroutines-0.10.8-api.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/4a22322ee37165904ce4f29fbe6eb534/sqlite-base-0.10.8-api.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/c98516fec0d6dd36ae190f2f361ae2c2/platform-base-0.10.8-api.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/db6ceff77f22f08d5b9c1eba63b90b53/appcompatV7-base-0.10.8-api.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/9a8e1977feabcb7569b70b8072b7c422/supportV4-base-0.10.8-api.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/8db4cebb001f9102d4174f46ca745a74/commons-base-0.10.8-api.jar:/home/brahmix/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlinx/kotlinx-coroutines-android/1.0.0/2102040565a29061ab7aaea6ea548ad51eafb11d/kotlinx-coroutines-android-1.0.0.jar:/home/brahmix/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlinx/kotlinx-coroutines-core/1.0.0/a33c4bf7581f71f01d4ed660b09ca199abbb44da/kotlinx-coroutines-core-1.0.0.jar:/home/brahmix/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib/1.3.61/4702105e97f7396ae41b113fdbdc180ec1eb1e36/kotlin-stdlib-1.3.61.jar:/home/brahmix/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlinx/kotlinx-coroutines-core-common/1.0.0/5f7551ec1edc068deaa0397100a1f14f32270274/kotlinx-coroutines-core-common-1.0.0.jar:/home/brahmix/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-common/1.3.61/65abb71d5afb850b68be03987b08e2c864ca3110/kotlin-stdlib-common-1.3.61.jar:/home/brahmix/.gradle/caches/modules-2/files-2.1/org.jetbrains/annotations/16.0.2/dab5655eb9abe23f2245c34e66c9813c7daf4563/annotations-16.0.2.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/673d07dab8daa3f747cd494ed96abff2/design-28.0.0-api.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/15c83ac359cebedb0e5d1c5072ce271e/appcompat-v7-28.0.0-api.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/f6815d532e131b720ae3dafcde6bcc84/cardview-v7-28.0.0-api.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/68e3837d5c7a91b97f12bd0c5728a6ca/support-v4-28.0.0-api.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/7ab04cbddf45b21558d639a3a81a0db3/support-fragment-28.0.0-api.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/200405178ccdc6ed1e369ff234d6aaed/animated-vector-drawable-28.0.0-api.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/5852be170e76a4d410d0c0a2c58cbc95/recyclerview-v7-28.0.0-api.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/edb692d396802b49a63fb3caf91e229b/support-core-ui-28.0.0-api.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/68cd55a085b397735614fe283aa8ecf6/support-core-utils-28.0.0-api.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/e0dba30937a80c0b7a6024ef6b1d0e53/support-vector-drawable-28.0.0-api.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/e09ec085c4c76535c11f42d7112be2a7/support-media-compat-28.0.0-api.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/f46db001c9ac0f5d279b89831d90fe00/transition-28.0.0-api.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/a61644e6c96342f90bffe439f957fbe6/loader-28.0.0-api.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/d306809a19251a40d918010de5b8688b/viewpager-28.0.0-api.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/69f3739925400a5765f980c4c6d6b5ba/coordinatorlayout-28.0.0-api.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/eb8200b39289f44f8cdc8707f5dcd70a/drawerlayout-28.0.0-api.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/0df22f57ce62d438167cd4bd72463436/slidingpanelayout-28.0.0-api.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/5a45c7466e931501f857337599a9c0ca/customview-28.0.0-api.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/bc0e7166eb6bf6ff2412fb3b9edaa2ed/swiperefreshlayout-28.0.0-api.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/68239d0e8764b85b90879f3c504e5e91/asynclayoutinflater-28.0.0-api.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/7b37ad611628ceeba357896420b6c32f/support-compat-28.0.0-api.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/99c3927db3b39b26a0a79536efff89fe/versionedparcelable-28.0.0-api.jar:/home/brahmix/.gradle/caches/modules-2/files-2.1/com.android.support/collections/28.0.0/c1bcdade4d3cc2836130424a3f3e4182c666a745/collections-28.0.0.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/74a575ab2d05088a814c9b13bb9f3c62/cursoradapter-28.0.0-api.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/8b15463d0c1bd0bfe7475c591b3704a4/exifinterface-27.1.0-api.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/1dbc96f7ceb96b172b91926f4b4bbe54/runtime-1.1.1-api.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/4804e6111f24f9fc2b3f9c812caef05c/documentfile-28.0.0-api.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/0d29cefc377a881b026547e331a45f48/localbroadcastmanager-28.0.0-api.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/328959aee04a4be1a20b789a44a93d11/print-28.0.0-api.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/f9acd20f99543c3fc193ec28ca86f7dd/viewmodel-1.1.1-api.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/5fcc5eb04da012eb7d49d621acc8839d/interpolator-28.0.0-api.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/24bef9872573af4ee64241248edc8a35/livedata-1.1.1-api.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/4a4479d31d2f6054d6e07187dc079ff6/livedata-core-1.1.1-api.jar:/home/brahmix/.gradle/caches/modules-2/files-2.1/android.arch.lifecycle/common/1.1.1/207a6efae6a3555e326de41f76bdadd9a239cbce/common-1.1.1.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/35889073e589d83d6c3dd5ba1048e31e/runtime-1.1.1-api.jar:/home/brahmix/.gradle/caches/modules-2/files-2.1/android.arch.core/common/1.1.1/e55b70d1f5620db124b3e85a7f4bdc7bd48d9f95/common-1.1.1.jar:/home/brahmix/.gradle/caches/modules-2/files-2.1/com.android.support/support-annotations/28.0.0/ed73f5337a002d1fd24339d5fb08c2c9d9ca60d8/support-annotations-28.0.0.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/b9f7a64c5f6b009aeacf9d9cf068b45f/constraint-layout-1.1.3-api.jar:/home/brahmix/.gradle/caches/modules-2/files-2.1/com.android.support.constraint/constraint-layout-solver/1.1.3/bde0667d7414c16ed62d3cfe993cff7f9d732373/constraint-layout-solver-1.1.3.jar:/home/brahmix/.gradle/caches/modules-2/files-2.1/com.google.guava/guava/23.0/c947004bb13d18182be60077ade044099e4f26f1/guava-23.0.jar:/home/brahmix/.gradle/caches/modules-2/files-2.1/com.google.code.findbugs/jsr305/1.3.9/40719ea6961c0cb6afaeb6a921eaa1f6afd4cfdf/jsr305-1.3.9.jar:/home/brahmix/.gradle/caches/modules-2/files-2.1/com.google.errorprone/error_prone_annotations/2.0.18/5f65affce1684999e2f4024983835efc3504012e/error_prone_annotations-2.0.18.jar:/home/brahmix/.gradle/caches/modules-2/files-2.1/com.google.j2objc/j2objc-annotations/1.1/ed28ded51a8b1c6b112568def5f4b455e6809019/j2objc-annotations-1.1.jar:/home/brahmix/.gradle/caches/modules-2/files-2.1/org.codehaus.mojo/animal-sniffer-annotations/1.14/775b7e22fb10026eed3f86e8dc556dfafe35f2d5/animal-sniffer-annotations-1.14.jar:/home/brahmix/.gradle/caches/modules-2/files-2.1/com.ealva/ealvalog/0.5.0/9ac5b435edc23482abd2815884805352820e4038/ealvalog-0.5.0.jar:/home/brahmix/.gradle/caches/modules-2/files-2.1/com.ealva/ealvalog-core/0.5.0/b218daf48ae873b529c4e865562e6ba1d319be2f/ealvalog-core-0.5.0.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/cf353b7e9eb8cfb3ab7d32b7a89422cc/XPopupWindow-1.0.1-api.jar:/home/brahmix/Android/Sdk/platforms/android-29/android.jar:/home/brahmix/Android/Sdk/build-tools/28.0.3/core-lambda-stubs.jar" />
           <option name="noStdlib" value="true" />
           <option name="noReflect" value="true" />
           <option name="moduleName" value="app_debug" />
@@ -147,15 +147,15 @@
     <orderEntry type="library" scope="TEST" name="Gradle: com.android.support.test:runner:1.0.2@aar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: com.android.support.test:monitor:1.0.2@aar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: com.android.support.test.espresso:espresso-idling-resource:3.0.2@aar" level="project" />
-    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.50@jar" level="project" />
+    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.61@jar" level="project" />
     <orderEntry type="library" name="Gradle: com.ealva:ealvatag:0.4.3@jar" level="project" />
     <orderEntry type="library" name="Gradle: com.squareup.okhttp3:okhttp:3.10.0@jar" level="project" />
     <orderEntry type="library" name="Gradle: com.squareup.okio:okio:2.4.0@jar" level="project" />
     <orderEntry type="library" name="Gradle: org.jetbrains.kotlinx:kotlinx-coroutines-android:1.0.0@jar" level="project" />
     <orderEntry type="library" name="Gradle: org.jetbrains.kotlinx:kotlinx-coroutines-core:1.0.0@jar" level="project" />
-    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib:1.3.50@jar" level="project" />
+    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib:1.3.61@jar" level="project" />
     <orderEntry type="library" name="Gradle: org.jetbrains.kotlinx:kotlinx-coroutines-core-common:1.0.0@jar" level="project" />
-    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:1.3.50@jar" level="project" />
+    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:1.3.61@jar" level="project" />
     <orderEntry type="library" name="Gradle: org.jetbrains:annotations:16.0.2@jar" level="project" />
     <orderEntry type="library" name="Gradle: com.android.support:collections:28.0.0@jar" level="project" />
     <orderEntry type="library" name="Gradle: android.arch.lifecycle:common:1.1.1@jar" level="project" />
diff --git a/app/build.gradle b/app/build.gradle
index 15c5a0e..2b0ce57 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -48,7 +48,7 @@ android {
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.50"
+    implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.61'
     implementation 'com.android.support:appcompat-v7:28.0.0'
     implementation 'com.android.support:support-v4:28.0.0'
     implementation 'com.android.support:design:28.0.0'
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 1c7e68a..6b4add1 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -15,7 +15,7 @@
         <activity android:name=".activities.IcarusSongActivity"></activity>
         <activity
             android:name=".activities.LoginActivity"
-            android:label="@string/title_activity_demo_stream"
+            android:label="@string/title_activity_main"
             android:theme="@style/AppTheme.NoActionBar">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -23,15 +23,6 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-        <activity
-            android:name=".activities.SongViewActivity"
-            android:label="@string/title_activity_song_view"
-            android:parentActivityName=".activities.MainActivity"
-            android:theme="@style/AppTheme.NoActionBar">
-            <meta-data
-                android:name="android.support.PARENT_ACTIVITY"
-                android:value="com.example.mear.activities.MainActivity" />
-        </activity>
         <activity
             android:name=".activities.SettingsActivity"
             android:label="@string/title_activity_settings"
@@ -45,13 +36,18 @@
         <activity
             android:name=".activities.MainActivity"
             android:label="@string/title_activity_main"
+            android:parentActivityName=".activities.LoginActivity"
             android:screenOrientation="portrait"
             android:theme="@style/AppTheme.NoActionBar">
+            <meta-data
+                android:name="android.support.PARENT_ACTIVITY"
+                android:value="com.example.mear.activities.LoginActivity" />
+            <!--
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
-
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
+            -->
         </activity>
 
         <service android:name=".playback.service.MusicService" />
diff --git a/app/src/main/cpp/Demo.hpp b/app/src/main/cpp/Demo.hpp
index 1b4657f..21227d3 100644
--- a/app/src/main/cpp/Demo.hpp
+++ b/app/src/main/cpp/Demo.hpp
@@ -271,24 +271,21 @@ void downloadSong(Song& song, const Token& token, const Str& path) {
     repository::local::APIRepository apiRepo;
     auto apiInfo = apiRepo.retrieveAPIInfo(path);
     repository::SongRepository songRepo;
-    auto downloadedSong = songRepo.downloadSong(token, song, apiInfo);
     manager::DirectoryManager dirMgr;
     if (dirMgr.doesSongExist(song, path)) {
         std::cout << "song already exists\n";
         return;
     }
 
+    auto downloadedSong = songRepo.downloadSong(token, song, apiInfo);
+
     dirMgr.createSongDirectory(song, path);
     downloadedSong.path = dirMgr.fullSongPath(song, path);
     std::fstream saveSong(downloadedSong.path, std::ios::out | std::ios::binary);
     saveSong.write((char*)&downloadedSong.data[0], downloadedSong.data.size());
     saveSong.close();
 
-    repository::local::SongRepository localSongRepo;
-    if (!localSongRepo.databaseExist(path)) {
-        localSongRepo.initializedDatabase(path);
-    }
-
+    repository::local::SongRepository localSongRepo(path);
     if (!localSongRepo.doesTableExist(path)) {
         localSongRepo.createSongTable(path);
     }
@@ -405,7 +402,7 @@ Java_com_example_mear_repositories_TrackRepository_retrieveSongsIncludingDownloa
     auto i = 0;
 
     repository::local::SongRepository localSongRepo(appPath);
-    auto localSongs = (localSongRepo.isTableEmpty(appPath)) ?
+    auto localSongs = (!localSongRepo.isTableEmpty(appPath)) ?
             localSongRepo.retrieveAllSongs(appPath) : std::vector<model::Song>();
 
     for (auto& sng: allSongs) {
diff --git a/app/src/main/cpp/repository/BaseRepository.h b/app/src/main/cpp/repository/BaseRepository.h
index e395070..9f55a34 100644
--- a/app/src/main/cpp/repository/BaseRepository.h
+++ b/app/src/main/cpp/repository/BaseRepository.h
@@ -52,11 +52,12 @@ namespace repository { namespace local {
                 queryStr.append(m_tableName);
 
                 SQLite::Statement query(db, queryStr);
-                auto r = query.exec();
+
+                auto r = query.executeStep();
 
                 const auto result = query.hasRow();
 
-                return result;
+                return !result;
             } catch (std::exception& ex) {
                 auto msg = ex.what();
             }
diff --git a/app/src/main/cpp/repository/SongRepository.h b/app/src/main/cpp/repository/SongRepository.h
index 02967bc..9716489 100644
--- a/app/src/main/cpp/repository/SongRepository.h
+++ b/app/src/main/cpp/repository/SongRepository.h
@@ -298,7 +298,6 @@ namespace repository {
                     std::string queryString("DELETE FROM ");
                     queryString.append(m_tableName);
                     queryString.append(" WHERE Id = ?");
-                    // queryString.append("Duration, Track, Disc, Filename, Path, CoverArtId)");
                     SQLite::Statement query(db, queryString);
                     query.bind(1, song.id);
 
@@ -334,7 +333,7 @@ namespace repository {
                     query.bind(12, song.path);
                     query.bind(13, song.coverArtId);
 
-                    query.exec();
+                    auto result = query.exec();
                 } catch (std::exception& ex) {
                     auto msg = ex.what();
                 }
diff --git a/app/src/main/cpp/repository/UserRepository.h b/app/src/main/cpp/repository/UserRepository.h
index 2f16444..df46041 100644
--- a/app/src/main/cpp/repository/UserRepository.h
+++ b/app/src/main/cpp/repository/UserRepository.h
@@ -34,11 +34,8 @@ namespace repository { namespace local {
 
                 auto result = query.executeStep();
 
-                auto valZero = query.getColumn(1);
-                auto valOne = query.getColumn(2);
-
-                user.username = valZero.getString();
-                user.password = valOne.getString();
+                user.username = std::move(query.getColumn(1).getString());
+                user.password = std::move(query.getColumn(2).getString());
 
                 return user;
 
diff --git a/app/src/main/java/com/example/mear/activities/MainActivity.kt b/app/src/main/java/com/example/mear/activities/MainActivity.kt
index 307f6b9..4996056 100644
--- a/app/src/main/java/com/example/mear/activities/MainActivity.kt
+++ b/app/src/main/java/com/example/mear/activities/MainActivity.kt
@@ -27,7 +27,6 @@ import android.widget.Toast
 import org.jetbrains.anko.imageBitmap
 
 import com.example.mear.listeners.TrackElaspingChange
-import com.example.mear.models.Song
 import com.example.mear.R
 import com.example.mear.repositories.*
 import com.example.mear.repositories.RepeatRepository.RepeatTypes
@@ -55,8 +54,6 @@ class MainActivity : BaseServiceActivity() {
             setContentView(R.layout.activity_main)
             setSupportActionBar(toolbar)
 
-            //permissionPrompt()
-
             initialize()
         }
         catch (ex: Exception) {
@@ -358,7 +355,12 @@ class MainActivity : BaseServiceActivity() {
     private fun showPopup(view: View) {
         try {
             var popup = PopupMenu(this, view)
-            popup.inflate(R.menu.popup_menu)
+            if (musicService!!.getCurrentSong().downloaded) {
+                popup.inflate(R.menu.popup_menu_song_downloaded)
+            }
+            else {
+                popup.inflate(R.menu.popup_menu)
+            }
 
             popup.setOnMenuItemClickListener{ item: MenuItem? ->
                 when (item!!.itemId) {
@@ -368,8 +370,11 @@ class MainActivity : BaseServiceActivity() {
                     R.id.action_song_view -> {
                         startActivity(Intent(this, IcarusSongActivity::class.java))
                     }
+                    R.id.action_song_delete -> {
+                        // TODO: handle song deletion
+                        val ss = true
+                    }
                     R.id.action_song_download -> {
-                        // TODO: implement download functionality
                         val appPath = appDirectory()
                         val apiRepo = APIRepository()
                         val tokenRepo = TokenRepository()
@@ -379,6 +384,10 @@ class MainActivity : BaseServiceActivity() {
                         val token = tokenRepo.retrieveToken(appPath)
                         val apiInfo = apiRepo.retrieveRecord(appPath)
                         trackRepo.download(token, song, appPath)
+                        musicService!!.changeSongDownloadStatus()
+                        // TODO: implement something to include the downloaded song into the songQueue
+                        // essentially replacing the song that already exists, that way one can
+                        // actually access the file without having to restart the app
                     }
                     R.id.action_song_play_count-> {
                         val trk = musicService!!.getCurrentSong()
diff --git a/app/src/main/java/com/example/mear/adapters/SongAdapter.kt b/app/src/main/java/com/example/mear/adapters/SongAdapter.kt
index 8fd16d0..4438e6c 100644
--- a/app/src/main/java/com/example/mear/adapters/SongAdapter.kt
+++ b/app/src/main/java/com/example/mear/adapters/SongAdapter.kt
@@ -86,7 +86,6 @@ class SongAdapter(val mOnClickListener: (Song) -> Unit,
 
                 v.setOnClickListener { clickList(songItem!!)}
                 if (songItems.downloaded) {
-                    var rs = v.resources
                     v.setBackgroundColor(v.resources.getColor(R.color.track_seek))
                 }
             }
diff --git a/app/src/main/java/com/example/mear/playback/service/MusicService.kt b/app/src/main/java/com/example/mear/playback/service/MusicService.kt
index cc6c4c2..43e5435 100644
--- a/app/src/main/java/com/example/mear/playback/service/MusicService.kt
+++ b/app/src/main/java/com/example/mear/playback/service/MusicService.kt
@@ -89,6 +89,17 @@ class MusicService(var appPath: String = ""): Service() {
         }
     }
 
+    fun changeSongDownloadStatus() {
+        currentSong.downloaded = true
+        songQueue.forEach {
+            s ->
+            if (s.id == currentSong.id) {
+                s.downloaded = true
+            }
+        }
+        // songQueue[currentSongIndex!!].downloaded = true
+    }
+
     fun goToPosition(progress: Int) { trackPlayer!!.seekTo(progress) }
 
     fun playSongTrack() {
@@ -225,7 +236,8 @@ class MusicService(var appPath: String = ""): Service() {
 
             val token = tokenRepo.retrieveToken(appPath)
             val apiInfo = apiRepo.retrieveRecord(appPath)
-            val songs = trackRepo.fetchSongs(token, apiInfo.uri)
+            // val songs = trackRepo.fetchSongs(token, apiInfo.uri)
+            val songs = trackRepo.fetchSongsIncludingDownloaded(token, apiInfo.uri, appPath)
             songQueue = songs.toMutableList()
 
             if (retrieveShuffleMode()!!) {
@@ -280,6 +292,14 @@ class MusicService(var appPath: String = ""): Service() {
 
     private fun offlinePlaySong(song: Song) {
         try {
+            currentSong = song
+            songQueue.forEach{ s ->
+                if (s.id == currentSong.id) {
+                    s.downloaded = currentSong.downloaded
+                    s.filename = currentSong.filename
+                    s.path = currentSong.path
+                }
+            }
             trackPlayer!!.reset()
             trackPlayer!!.setDataSource(song.path)
             trackPlayer!!.prepare()
diff --git a/app/src/main/res/menu/popup_menu_song_downloaded.xml b/app/src/main/res/menu/popup_menu_song_downloaded.xml
new file mode 100644
index 0000000..c2a653c
--- /dev/null
+++ b/app/src/main/res/menu/popup_menu_song_downloaded.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+    <menu xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:app="http://schemas.android.com/apk/res-auto">
+        <item android:id="@+id/action_settings"
+            android:title="@string/settings"
+            app:showAsAction="never"/>
+        <item android:id="@+id/action_song_view"
+            android:title="@string/song_view"
+            app:showAsAction="never" />
+        <item android:id="@+id/action_song_delete"
+            android:title="@string/song_delete"
+            app:showAsAction="never" />
+        <item android:id="@+id/action_song_play_count"
+            android:title="@string/song_play_count"
+            app:showAsAction="never" />
+</menu>
\ 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 e7f7bee..435b107 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -38,6 +38,7 @@
     <string name="song_view">Songs</string>
     <string name="song_play_count">Play Count</string>
     <string name="song_download">Download</string>
+    <string name="song_delete">Delete</string>
 
     <!-- Popups -->
     <string name="popup_about_header">About</string>