From 531d5512bc1e1a005744afa50e4f7dcaa279e355 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 4 Dec 2023 09:56:53 -0500
Subject: [PATCH 1/8] actions: bump `com.google.dagger:hilt-android` to 2.49
 (fixes #2783) (#2768)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: dogi <dogi@users.noreply.github.com>
---
 app/build.gradle | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 516ccca5d1..98dee52407 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -9,8 +9,8 @@ android {
         applicationId "org.ole.planet.myplanet"
         minSdkVersion 21
         targetSdkVersion 34
-        versionCode 1175
-        versionName "0.11.75"
+        versionCode 1176
+        versionName "0.11.76"
         ndkVersion '21.3.6528147'
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary = true
@@ -102,8 +102,8 @@ dependencies {
 
     implementation 'com.github.jeancsanchez:jcplayer:2.7.2'
 
-    implementation "com.google.dagger:hilt-android:2.48.1"
-    kapt "com.google.dagger:hilt-android-compiler:2.48.1"
+    implementation "com.google.dagger:hilt-android:2.49"
+    kapt "com.google.dagger:hilt-android-compiler:2.49"
 
     implementation 'com.mikepenz:crossfader:1.6.0@aar'
     implementation 'com.mikepenz:crossfadedrawerlayout:1.1.0@aar'

From 3e6df1d2f4020bdaea5bff55efd3a987db2bd71b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 4 Dec 2023 10:09:49 -0500
Subject: [PATCH 2/8] actions: bump
 `com.google.dagger:hilt-android-gradle-plugin` to 2.49 (fixes #2785) (#2770)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: dogi <dogi@users.noreply.github.com>
---
 app/build.gradle | 4 ++--
 build.gradle     | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 98dee52407..5474c7682a 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -9,8 +9,8 @@ android {
         applicationId "org.ole.planet.myplanet"
         minSdkVersion 21
         targetSdkVersion 34
-        versionCode 1176
-        versionName "0.11.76"
+        versionCode 1177
+        versionName "0.11.77"
         ndkVersion '21.3.6528147'
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary = true
diff --git a/build.gradle b/build.gradle
index 2e67f33cd6..3182fad1c7 100644
--- a/build.gradle
+++ b/build.gradle
@@ -20,7 +20,7 @@ buildscript {
     dependencies {
         classpath 'com.android.tools.build:gradle:8.1.4'
         classpath "io.realm:realm-gradle-plugin:10.17.0"
-        classpath "com.google.dagger:hilt-android-gradle-plugin:2.48.1"
+        classpath "com.google.dagger:hilt-android-gradle-plugin:2.49"
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

From e7cdac870e644383161364b8aadcbcc5948cd754 Mon Sep 17 00:00:00 2001
From: Gideon Okuro <gideonollonde@gmail.com>
Date: Mon, 4 Dec 2023 20:24:26 +0300
Subject: [PATCH 3/8] courses: improve stability (fixes #2788) (#2789)

Co-authored-by: dogi <dogi@users.noreply.github.com>
---
 app/build.gradle                                              | 4 ++--
 .../java/org/ole/planet/myplanet/model/RealmCourseActivity.kt | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 5474c7682a..82ba6e6cce 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -9,8 +9,8 @@ android {
         applicationId "org.ole.planet.myplanet"
         minSdkVersion 21
         targetSdkVersion 34
-        versionCode 1177
-        versionName "0.11.77"
+        versionCode 1178
+        versionName "0.11.78"
         ndkVersion '21.3.6528147'
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary = true
diff --git a/app/src/main/java/org/ole/planet/myplanet/model/RealmCourseActivity.kt b/app/src/main/java/org/ole/planet/myplanet/model/RealmCourseActivity.kt
index 52f25d026c..baef96b0fc 100644
--- a/app/src/main/java/org/ole/planet/myplanet/model/RealmCourseActivity.kt
+++ b/app/src/main/java/org/ole/planet/myplanet/model/RealmCourseActivity.kt
@@ -10,6 +10,7 @@ import java.util.UUID
 
 open class RealmCourseActivity : RealmObject() {
     @PrimaryKey
+    private var id: String? = null
     private var _id: String? = null
     @JvmField
     var createdOn: String? = null

From 7318f53a9e2516a2ca633debae0b4102606738ae Mon Sep 17 00:00:00 2001
From: Gideon Okuro <gideonollonde@gmail.com>
Date: Mon, 4 Dec 2023 20:36:28 +0300
Subject: [PATCH 4/8] courses: better course step display (fixes #2771) (#2782)

Co-authored-by: dogi <dogi@users.noreply.github.com>
---
 app/build.gradle                                             | 4 ++--
 .../ole/planet/myplanet/ui/course/CourseStepFragment.java    | 4 ++--
 app/src/main/res/layout/fragment_course_step.xml             | 5 ++++-
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 82ba6e6cce..1aeba4388f 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -9,8 +9,8 @@ android {
         applicationId "org.ole.planet.myplanet"
         minSdkVersion 21
         targetSdkVersion 34
-        versionCode 1178
-        versionName "0.11.78"
+        versionCode 1179
+        versionName "0.11.79"
         ndkVersion '21.3.6528147'
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary = true
diff --git a/app/src/main/java/org/ole/planet/myplanet/ui/course/CourseStepFragment.java b/app/src/main/java/org/ole/planet/myplanet/ui/course/CourseStepFragment.java
index a8444ef703..da9d94242c 100644
--- a/app/src/main/java/org/ole/planet/myplanet/ui/course/CourseStepFragment.java
+++ b/app/src/main/java/org/ole/planet/myplanet/ui/course/CourseStepFragment.java
@@ -142,7 +142,7 @@ public void onActivityCreated(@Nullable Bundle savedInstanceState) {
         fragmentCourseStepBinding.description.setMovementMethod(LinkMovementMethod.getInstance());
       
         if (!RealmMyCourse.isMyCourse(user.getId(), step.getCourseId(), mRealm)) {
-            fragmentCourseStepBinding.btnTakeTest.setVisibility(View.INVISIBLE);
+            fragmentCourseStepBinding.btnTakeTest.setVisibility(View.GONE);
         }
         setListeners();
 
@@ -164,7 +164,7 @@ public void onActivityCreated(@Nullable Bundle savedInstanceState) {
     }
 
     private void hideTestIfNoQuestion() {
-        fragmentCourseStepBinding.btnTakeTest.setVisibility(View.INVISIBLE);
+        fragmentCourseStepBinding.btnTakeTest.setVisibility(View.GONE);
         if (stepExams != null && stepExams.size() > 0) {
             String first_step_id = stepExams.get(0).getId();
             RealmResults<RealmExamQuestion> questions = mRealm.where(RealmExamQuestion.class).equalTo("examId", first_step_id).findAll();
diff --git a/app/src/main/res/layout/fragment_course_step.xml b/app/src/main/res/layout/fragment_course_step.xml
index aa52cb3ee9..d93988ee11 100644
--- a/app/src/main/res/layout/fragment_course_step.xml
+++ b/app/src/main/res/layout/fragment_course_step.xml
@@ -13,6 +13,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_gravity="right"
+            android:layout_marginEnd="@dimen/_10dp"
             android:gravity="right">
 
             <Button
@@ -58,7 +59,9 @@
             <TextView
                 android:id="@+id/description"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content" />
+                android:layout_height="wrap_content"
+                android:layout_marginStart="@dimen/_10dp"
+                android:layout_marginEnd="@dimen/_10dp" />
         </LinearLayout>
     </LinearLayout>
 

From 186a7504c128f263fe7558d5270f5789097757c5 Mon Sep 17 00:00:00 2001
From: Gideon Okuro <gideonollonde@gmail.com>
Date: Mon, 4 Dec 2023 20:45:42 +0300
Subject: [PATCH 5/8] courses: better empty data handling (fixes #2786) (#2787)

Co-authored-by: dogi <dogi@users.noreply.github.com>
---
 app/build.gradle                                |  4 ++--
 .../myplanet/ui/course/AdapterCourses.java      | 13 ++++++++++---
 .../ui/course/CourseDetailFragment.java         | 17 +++++++++++++----
 .../main/res/layout/fragment_course_detail.xml  |  5 +++++
 4 files changed, 30 insertions(+), 9 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 1aeba4388f..d850904641 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -9,8 +9,8 @@ android {
         applicationId "org.ole.planet.myplanet"
         minSdkVersion 21
         targetSdkVersion 34
-        versionCode 1179
-        versionName "0.11.79"
+        versionCode 1180
+        versionName "0.11.80"
         ndkVersion '21.3.6528147'
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary = true
diff --git a/app/src/main/java/org/ole/planet/myplanet/ui/course/AdapterCourses.java b/app/src/main/java/org/ole/planet/myplanet/ui/course/AdapterCourses.java
index 9b8438efca..0d322a33db 100644
--- a/app/src/main/java/org/ole/planet/myplanet/ui/course/AdapterCourses.java
+++ b/app/src/main/java/org/ole/planet/myplanet/ui/course/AdapterCourses.java
@@ -157,9 +157,8 @@ public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, final int
             viewHolder.rowCourseBinding.title.setText(courseList.get(position).getCourseTitle());
             viewHolder.rowCourseBinding.description.setText(courseList.get(position).getDescription());
             markwon.setMarkdown(viewHolder.rowCourseBinding.description, courseList.get(position).getDescription());
-
-            viewHolder.rowCourseBinding.gradLevel.setText(context.getString(R.string.grade_level_colon) + courseList.get(position).getGradeLevel());
-            viewHolder.rowCourseBinding.subjectLevel.setText(context.getString(R.string.subject_level_colon) + courseList.get(position).getSubjectLevel());
+            setTextViewContent(viewHolder.rowCourseBinding.gradLevel, courseList.get(position).getGradeLevel(), viewHolder.rowCourseBinding.gradLevel, context.getString(R.string.grade_level_colon));
+            setTextViewContent(viewHolder.rowCourseBinding.subjectLevel, courseList.get(position).getSubjectLevel(), viewHolder.rowCourseBinding.subjectLevel, context.getString(R.string.subject_level_colon));
             viewHolder.rowCourseBinding.checkbox.setChecked(selectedItems.contains(courseList.get(position)));
             viewHolder.rowCourseBinding.courseProgress.setMax(courseList.get(position).getnumberOfSteps());
             displayTagCloud(viewHolder.rowCourseBinding.flexboxDrawable, position);
@@ -182,6 +181,14 @@ public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, final int
         }
     }
 
+    private void setTextViewContent(TextView textView, String content, View layout, String prefix) {
+        if (content.isEmpty()) {
+            layout.setVisibility(View.GONE);
+        } else {
+            textView.setText(prefix + content);
+        }
+    }
+
     public boolean areAllSelected(){
         if (selectedItems.size() != courseList.size()) {
             areAllSelected = false;
diff --git a/app/src/main/java/org/ole/planet/myplanet/ui/course/CourseDetailFragment.java b/app/src/main/java/org/ole/planet/myplanet/ui/course/CourseDetailFragment.java
index bbd0aa45ee..5ae4633a12 100644
--- a/app/src/main/java/org/ole/planet/myplanet/ui/course/CourseDetailFragment.java
+++ b/app/src/main/java/org/ole/planet/myplanet/ui/course/CourseDetailFragment.java
@@ -7,6 +7,7 @@
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.TextView;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -93,10 +94,10 @@ public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceStat
     }
 
     private void setCourseData() {
-        fragmentCourseDetailBinding.subjectLevel.setText(courses.getSubjectLevel());
-        fragmentCourseDetailBinding.method.setText(courses.getMethod());
-        fragmentCourseDetailBinding.gradeLevel.setText(courses.getGradeLevel());
-        fragmentCourseDetailBinding.language.setText(courses.getLanguageOfInstruction());
+        setTextViewVisibility(fragmentCourseDetailBinding.subjectLevel, courses.getSubjectLevel(), fragmentCourseDetailBinding.ltSubjectLevel);
+        setTextViewVisibility(fragmentCourseDetailBinding.method, courses.getMethod(), fragmentCourseDetailBinding.ltMethod);
+        setTextViewVisibility(fragmentCourseDetailBinding.gradeLevel, courses.getGradeLevel(), fragmentCourseDetailBinding.ltGradeLevel);
+        setTextViewVisibility(fragmentCourseDetailBinding.language, courses.getLanguageOfInstruction(), fragmentCourseDetailBinding.ltLanguage);
         String markdownContentWithLocalPaths = CourseStepFragment.prependBaseUrlToImages(courses.getDescription(), "file://" + MainApplication.context.getExternalFilesDir(null) + "/ole/");
         markwon.setMarkdown(fragmentCourseDetailBinding.description, markdownContentWithLocalPaths);
         fragmentCourseDetailBinding.noOfExams.setText(RealmStepExam.getNoOfExam(mRealm, id) + "");
@@ -108,6 +109,14 @@ private void setCourseData() {
         setStepsList();
     }
 
+    private void setTextViewVisibility(TextView textView, String content, View layout) {
+        if (content.isEmpty()) {
+            layout.setVisibility(View.GONE);
+        } else {
+            textView.setText(content);
+        }
+    }
+
     private void setStepsList() {
         List<RealmCourseStep> steps = RealmCourseStep.getSteps(mRealm, courses.getCourseId());
         fragmentCourseDetailBinding.stepsList.setLayoutManager(new LinearLayoutManager(getActivity()));
diff --git a/app/src/main/res/layout/fragment_course_detail.xml b/app/src/main/res/layout/fragment_course_detail.xml
index 103c37a36b..d9f3d0b1c5 100644
--- a/app/src/main/res/layout/fragment_course_detail.xml
+++ b/app/src/main/res/layout/fragment_course_detail.xml
@@ -112,6 +112,7 @@
                     </LinearLayout>
 
                     <LinearLayout
+                        android:id="@+id/ltSubjectLevel"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content">
 
@@ -130,6 +131,7 @@
                     </LinearLayout>
 
                     <LinearLayout
+                        android:id="@+id/ltGradeLevel"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content">
 
@@ -148,6 +150,7 @@
                     </LinearLayout>
 
                     <LinearLayout
+                        android:id="@+id/ltLanguage"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content">
 
@@ -166,6 +169,7 @@
                     </LinearLayout>
 
                     <LinearLayout
+                        android:id="@+id/ltMethod"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content">
 
@@ -202,6 +206,7 @@
                     </LinearLayout>
 
                     <LinearLayout
+                        android:id="@+id/ltDescription"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:orientation="horizontal">

From 69c83db9fd3eb88d1b4d97944a7b9cd33056c414 Mon Sep 17 00:00:00 2001
From: Gideon Okuro <gideonollonde@gmail.com>
Date: Mon, 4 Dec 2023 20:59:47 +0300
Subject: [PATCH 6/8] actions: reactivate `REQUEST_INSTALL_PACKAGES` permission
 (fixes #2790) (#2791)

Co-authored-by: dogi <dogi@users.noreply.github.com>
---
 app/build.gradle                              |  4 +-
 app/src/main/AndroidManifest.xml              |  2 +-
 .../myplanet/base/BaseContainerFragment.kt    | 77 ++++++++++---------
 .../myplanet/base/PermissionActivity.java     | 12 +--
 .../ui/dashboard/DashboardActivity.java       | 13 ++--
 5 files changed, 55 insertions(+), 53 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index d850904641..ea45a70b81 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -9,8 +9,8 @@ android {
         applicationId "org.ole.planet.myplanet"
         minSdkVersion 21
         targetSdkVersion 34
-        versionCode 1180
-        versionName "0.11.80"
+        versionCode 1181
+        versionName "0.11.81"
         ndkVersion '21.3.6528147'
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary = true
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 4cc8754640..08d97efe91 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -30,7 +30,7 @@
     <uses-permission android:name="android.permission.READ_MEDIA_IMAGES" />
     <uses-permission android:name="android.permission.READ_MEDIA_VIDEO" />
     <uses-permission android:name="android.permission.READ_MEDIA_AUDIO" />
-<!--    <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES"/>-->
+    <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES"/>
 
     <application
         android:name=".MainApplication"
diff --git a/app/src/main/java/org/ole/planet/myplanet/base/BaseContainerFragment.kt b/app/src/main/java/org/ole/planet/myplanet/base/BaseContainerFragment.kt
index 05aadd06ba..f7f6b077bf 100644
--- a/app/src/main/java/org/ole/planet/myplanet/base/BaseContainerFragment.kt
+++ b/app/src/main/java/org/ole/planet/myplanet/base/BaseContainerFragment.kt
@@ -1,11 +1,14 @@
 package org.ole.planet.myplanet.base
 
+import android.app.Activity
 import android.content.Context
 import android.content.DialogInterface
 import android.content.Intent
 import android.content.SharedPreferences
 import android.net.Uri
+import android.os.Build
 import android.os.Bundle
+import android.provider.Settings
 import android.text.TextUtils
 import android.util.Log
 import android.view.LayoutInflater
@@ -16,6 +19,7 @@ import android.widget.ArrayAdapter
 import android.widget.Button
 import android.widget.TextView
 import android.widget.Toast
+import androidx.annotation.RequiresApi
 import androidx.appcompat.app.AlertDialog
 import androidx.appcompat.widget.AppCompatRatingBar
 import androidx.core.content.FileProvider
@@ -23,6 +27,7 @@ import com.google.gson.JsonObject
 import io.realm.RealmResults
 import org.ole.planet.myplanet.MainApplication
 import org.ole.planet.myplanet.R
+import org.ole.planet.myplanet.base.PermissionActivity.hasInstallPermission
 import org.ole.planet.myplanet.callback.OnHomeItemClickListener
 import org.ole.planet.myplanet.callback.OnRatingChangeListener
 import org.ole.planet.myplanet.model.RealmMyLibrary
@@ -30,13 +35,7 @@ import org.ole.planet.myplanet.service.UserProfileDbHandler
 import org.ole.planet.myplanet.service.UserProfileDbHandler.KEY_RESOURCE_DOWNLOAD
 import org.ole.planet.myplanet.service.UserProfileDbHandler.KEY_RESOURCE_OPEN
 import org.ole.planet.myplanet.ui.course.AdapterCourses
-import org.ole.planet.myplanet.ui.viewer.AudioPlayerActivity
-import org.ole.planet.myplanet.ui.viewer.CSVViewerActivity
-import org.ole.planet.myplanet.ui.viewer.ImageViewerActivity
-import org.ole.planet.myplanet.ui.viewer.MarkdownViewerActivity
-import org.ole.planet.myplanet.ui.viewer.PDFReaderActivity
-import org.ole.planet.myplanet.ui.viewer.TextFileViewerActivity
-import org.ole.planet.myplanet.ui.viewer.VideoPlayerActivity
+import org.ole.planet.myplanet.ui.viewer.*
 import org.ole.planet.myplanet.utilities.FileUtils
 import org.ole.planet.myplanet.utilities.Utilities
 import java.io.File
@@ -46,9 +45,9 @@ abstract class BaseContainerFragment : BaseResourceFragment() {
     var rating: TextView? = null
     var ratingBar: AppCompatRatingBar? = null
     lateinit var profileDbHandler: UserProfileDbHandler
-//    private val INSTALL_UNKNOWN_SOURCES_REQUEST_CODE = 112
-//    var hasInstallPermission = hasInstallPermission(MainApplication.context)
-//    private var currentLibrary: RealmMyLibrary? = null
+    private val INSTALL_UNKNOWN_SOURCES_REQUEST_CODE = 112
+    var hasInstallPermission = hasInstallPermission(MainApplication.context)
+    private var currentLibrary: RealmMyLibrary? = null
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -146,6 +145,7 @@ abstract class BaseContainerFragment : BaseResourceFragment() {
         }
     }
 
+    @RequiresApi(Build.VERSION_CODES.O)
     fun checkMoreFileExtensions(extension: String?, items: RealmMyLibrary) {
         when (extension) {
             "txt" -> openIntent(items, TextFileViewerActivity::class.java)
@@ -158,8 +158,9 @@ abstract class BaseContainerFragment : BaseResourceFragment() {
         }
     }
 
+    @RequiresApi(Build.VERSION_CODES.O)
     private fun installApk(items: RealmMyLibrary) {
-//        currentLibrary = items
+        currentLibrary = items
         val directory = File(MainApplication.context.getExternalFilesDir(null).toString() + "/ole" + "/" + items.id)
         if (!directory.exists()) {
             if (!directory.mkdirs()) {
@@ -183,22 +184,22 @@ abstract class BaseContainerFragment : BaseResourceFragment() {
         intent.flags = Intent.FLAG_GRANT_READ_URI_PERMISSION or Intent.FLAG_ACTIVITY_NEW_TASK
 
         if (intent.resolveActivity(requireActivity().packageManager) != null) {
-//            if (hasInstallPermission(MainApplication.context)) {
+            if (hasInstallPermission(MainApplication.context)) {
                 startActivity(intent)
-//            } else {
-//                requestInstallPermission()
-//            }
+            } else {
+                requestInstallPermission()
+            }
         } else {
             Utilities.toast(activity,"No app to handle the installation")
         }
     }
 
-//    @RequiresApi(Build.VERSION_CODES.O)
-//    private fun requestInstallPermission() {
-//        val intent = Intent(Settings.ACTION_MANAGE_UNKNOWN_APP_SOURCES)
-//        intent.data = Uri.parse("package:" + MainApplication.context.packageName)
-//        startActivityForResult(intent, INSTALL_UNKNOWN_SOURCES_REQUEST_CODE)
-//    }
+    @RequiresApi(Build.VERSION_CODES.O)
+    private fun requestInstallPermission() {
+        val intent = Intent(Settings.ACTION_MANAGE_UNKNOWN_APP_SOURCES)
+        intent.data = Uri.parse("package:" + MainApplication.context.packageName)
+        startActivityForResult(intent, INSTALL_UNKNOWN_SOURCES_REQUEST_CODE)
+    }
 
     fun openFileType(items: RealmMyLibrary, videotype: String) {
         val mimetype = Utilities.getMimeType(items.resourceLocalAddress)
@@ -298,22 +299,22 @@ abstract class BaseContainerFragment : BaseResourceFragment() {
         }
     }
 
-//    @RequiresApi(Build.VERSION_CODES.O)
-//    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
-//        super.onActivityResult(requestCode, resultCode, data)
-//        if (requestCode == INSTALL_UNKNOWN_SOURCES_REQUEST_CODE) {
-//            if (resultCode == Activity.RESULT_OK) {
-//                if (currentLibrary != null) {
-//                    installApk(currentLibrary!!)
-//                    currentLibrary = null
-//                }
-//            } else {
-//                Utilities.toast(requireActivity(), getString(R.string.permissions_denied))
-//            }
-//        }
-//    }
+    @RequiresApi(Build.VERSION_CODES.O)
+    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
+        super.onActivityResult(requestCode, resultCode, data)
+        if (requestCode == INSTALL_UNKNOWN_SOURCES_REQUEST_CODE) {
+            if (resultCode == Activity.RESULT_OK) {
+                if (currentLibrary != null) {
+                    installApk(currentLibrary!!)
+                    currentLibrary = null
+                }
+            } else {
+                Utilities.toast(requireActivity(), getString(R.string.permissions_denied))
+            }
+        }
+    }
 
-//    open fun handleBackPressed() {
-//        requireActivity().onBackPressed()
-//    }
+    open fun handleBackPressed() {
+        requireActivity().onBackPressed()
+    }
 }
diff --git a/app/src/main/java/org/ole/planet/myplanet/base/PermissionActivity.java b/app/src/main/java/org/ole/planet/myplanet/base/PermissionActivity.java
index d66d72b49e..2d85f3fcfa 100644
--- a/app/src/main/java/org/ole/planet/myplanet/base/PermissionActivity.java
+++ b/app/src/main/java/org/ole/planet/myplanet/base/PermissionActivity.java
@@ -28,12 +28,12 @@ public boolean checkPermission(String strPermission) {
         return result == PackageManager.PERMISSION_GRANTED;
     }
 
-//    public static boolean hasInstallPermission(android.content.Context context) {
-//        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-//            return context.getPackageManager().canRequestPackageInstalls();
-//        }
-//        return true;
-//    }
+    public static boolean hasInstallPermission(android.content.Context context) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            return context.getPackageManager().canRequestPackageInstalls();
+        }
+        return true;
+    }
 
     public void checkUsagesPermission() {
         if (!getUsagesPermission(this)) {
diff --git a/app/src/main/java/org/ole/planet/myplanet/ui/dashboard/DashboardActivity.java b/app/src/main/java/org/ole/planet/myplanet/ui/dashboard/DashboardActivity.java
index 5b47bf5530..5c550230ae 100644
--- a/app/src/main/java/org/ole/planet/myplanet/ui/dashboard/DashboardActivity.java
+++ b/app/src/main/java/org/ole/planet/myplanet/ui/dashboard/DashboardActivity.java
@@ -35,6 +35,7 @@
 import com.mikepenz.materialdrawer.model.interfaces.Nameable;
 
 import org.ole.planet.myplanet.R;
+import org.ole.planet.myplanet.base.BaseContainerFragment;
 import org.ole.planet.myplanet.callback.OnHomeItemClickListener;
 import org.ole.planet.myplanet.databinding.ActivityDashboardBinding;
 import org.ole.planet.myplanet.databinding.CustomTabBinding;
@@ -428,12 +429,12 @@ public void onBackPressed() {
             super.onBackPressed();
         }
 
-//        Fragment fragment = getSupportFragmentManager().findFragmentById(R.id.fragment_container);
-//        if (fragment instanceof BaseContainerFragment) {
-//            ((BaseContainerFragment) fragment).handleBackPressed();
-//        } else {
-//            super.onBackPressed();
-//        }
+        Fragment fragment = getSupportFragmentManager().findFragmentById(R.id.fragment_container);
+        if (fragment instanceof BaseContainerFragment) {
+            ((BaseContainerFragment) fragment).handleBackPressed();
+        } else {
+            super.onBackPressed();
+        }
     }
 
     @Override

From 65ae47bb0ae1f174ed5fdb979c1d7c97b1736eca Mon Sep 17 00:00:00 2001
From: Gideon Okuro <gideonollonde@gmail.com>
Date: Tue, 5 Dec 2023 20:38:28 +0300
Subject: [PATCH 7/8] courses: auto image size (fixes #2793) (#2794)

Co-authored-by: dogi <dogi@users.noreply.github.com>
---
 app/build.gradle                                    |  6 ++++--
 .../myplanet/ui/course/CourseDetailFragment.java    | 11 +++++++++--
 .../myplanet/ui/course/CourseStepFragment.java      | 13 ++++++++++---
 3 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index ea45a70b81..b577d31069 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -9,8 +9,8 @@ android {
         applicationId "org.ole.planet.myplanet"
         minSdkVersion 21
         targetSdkVersion 34
-        versionCode 1181
-        versionName "0.11.81"
+        versionCode 1182
+        versionName "0.11.82"
         ndkVersion '21.3.6528147'
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary = true
@@ -132,6 +132,8 @@ dependencies {
     implementation 'com.github.kizitonwose:CalendarView:1.1.0'
     implementation "io.noties.markwon:editor:4.6.2"
     implementation "io.noties.markwon:image:4.6.2"
+    implementation "io.noties.markwon:html:4.6.2"
+    implementation 'com.caverock:androidsvg-aar:1.4'
     implementation "androidx.core:core-ktx:1.12.0"
     implementation "com.github.VaibhavLakhera:Circular-Progress-View:0.1.2"
     implementation 'com.github.PhilJay:MPAndroidChart:v3.1.0'
diff --git a/app/src/main/java/org/ole/planet/myplanet/ui/course/CourseDetailFragment.java b/app/src/main/java/org/ole/planet/myplanet/ui/course/CourseDetailFragment.java
index 5ae4633a12..747626fb9b 100644
--- a/app/src/main/java/org/ole/planet/myplanet/ui/course/CourseDetailFragment.java
+++ b/app/src/main/java/org/ole/planet/myplanet/ui/course/CourseDetailFragment.java
@@ -33,8 +33,11 @@
 import io.noties.markwon.AbstractMarkwonPlugin;
 import io.noties.markwon.Markwon;
 import io.noties.markwon.MarkwonPlugin;
+import io.noties.markwon.html.HtmlPlugin;
 import io.noties.markwon.image.ImagesPlugin;
 import io.noties.markwon.image.file.FileSchemeHandler;
+import io.noties.markwon.image.network.NetworkSchemeHandler;
+import io.noties.markwon.image.network.OkHttpNetworkSchemeHandler;
 import io.noties.markwon.movement.MovementMethodPlugin;
 import io.realm.Realm;
 import io.realm.RealmResults;
@@ -58,13 +61,17 @@ public void onCreate(@Nullable Bundle savedInstanceState) {
             id = getArguments().getString("courseId");
         }
         markwon = Markwon.builder(context)
+                .usePlugin(HtmlPlugin.create())
                 .usePlugin(ImagesPlugin.create())
                 .usePlugin(MovementMethodPlugin.none())
                 .usePlugin(new AbstractMarkwonPlugin() {
                     @Override
                     public void configure(@NonNull MarkwonPlugin.Registry registry) {
-                        registry.require(ImagesPlugin.class, imagesPlugin ->
-                                imagesPlugin.addSchemeHandler(FileSchemeHandler.create())
+                        registry.require(ImagesPlugin.class, imagesPlugin -> {
+                                    imagesPlugin.addSchemeHandler(FileSchemeHandler.create());
+                                    imagesPlugin.addSchemeHandler(NetworkSchemeHandler.create());
+                                    imagesPlugin.addSchemeHandler(OkHttpNetworkSchemeHandler.create());
+                                }
                         );
                     }
                 })
diff --git a/app/src/main/java/org/ole/planet/myplanet/ui/course/CourseStepFragment.java b/app/src/main/java/org/ole/planet/myplanet/ui/course/CourseStepFragment.java
index da9d94242c..d2c113b440 100644
--- a/app/src/main/java/org/ole/planet/myplanet/ui/course/CourseStepFragment.java
+++ b/app/src/main/java/org/ole/planet/myplanet/ui/course/CourseStepFragment.java
@@ -42,8 +42,11 @@
 import io.noties.markwon.AbstractMarkwonPlugin;
 import io.noties.markwon.Markwon;
 import io.noties.markwon.MarkwonPlugin;
+import io.noties.markwon.html.HtmlPlugin;
 import io.noties.markwon.image.ImagesPlugin;
 import io.noties.markwon.image.file.FileSchemeHandler;
+import io.noties.markwon.image.network.NetworkSchemeHandler;
+import io.noties.markwon.image.network.OkHttpNetworkSchemeHandler;
 import io.noties.markwon.movement.MovementMethodPlugin;
 import io.realm.Case;
 import io.realm.Realm;
@@ -73,13 +76,17 @@ public void onCreate(@Nullable Bundle savedInstanceState) {
         }
         setUserVisibleHint(false);
         markwon = Markwon.builder(context)
+                .usePlugin(HtmlPlugin.create())
                 .usePlugin(ImagesPlugin.create())
                 .usePlugin(MovementMethodPlugin.none())
                 .usePlugin(new AbstractMarkwonPlugin() {
                     @Override
                     public void configure(@NonNull MarkwonPlugin.Registry registry) {
-                        registry.require(ImagesPlugin.class, imagesPlugin ->
-                                imagesPlugin.addSchemeHandler(FileSchemeHandler.create())
+                        registry.require(ImagesPlugin.class, imagesPlugin -> {
+                                    imagesPlugin.addSchemeHandler(FileSchemeHandler.create());
+                                    imagesPlugin.addSchemeHandler(NetworkSchemeHandler.create());
+                                    imagesPlugin.addSchemeHandler(OkHttpNetworkSchemeHandler.create());
+                                }
                         );
                     }
                 })
@@ -230,7 +237,7 @@ public static String prependBaseUrlToImages(String markdownContent, String baseU
             String relativePath = matcher.group(1);
             String modifiedPath = relativePath.replaceFirst("resources/", "");
             String fullUrl = baseUrl + modifiedPath;
-            matcher.appendReplacement(result, "![](" + fullUrl + ")");
+            matcher.appendReplacement(result, "<img src=" + fullUrl + " width=600 height=350/>");
         }
         matcher.appendTail(result);
 

From 954abfbc917405cd76c12e1b3f7d9ba8c2f6bd60 Mon Sep 17 00:00:00 2001
From: Gideon Okuro <gideonollonde@gmail.com>
Date: Tue, 5 Dec 2023 20:52:11 +0300
Subject: [PATCH 8/8] resources: more stability (fixes #2805) (#2806)

Co-authored-by: dogi <dogi@users.noreply.github.com>
---
 app/build.gradle                              |  4 ++--
 .../myplanet/base/BaseResourceFragment.java   | 20 ++++++++++---------
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index b577d31069..9d4bf6203c 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -9,8 +9,8 @@ android {
         applicationId "org.ole.planet.myplanet"
         minSdkVersion 21
         targetSdkVersion 34
-        versionCode 1182
-        versionName "0.11.82"
+        versionCode 1183
+        versionName "0.11.83"
         ndkVersion '21.3.6528147'
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary = true
diff --git a/app/src/main/java/org/ole/planet/myplanet/base/BaseResourceFragment.java b/app/src/main/java/org/ole/planet/myplanet/base/BaseResourceFragment.java
index ea3f7169ff..52d8076963 100644
--- a/app/src/main/java/org/ole/planet/myplanet/base/BaseResourceFragment.java
+++ b/app/src/main/java/org/ole/planet/myplanet/base/BaseResourceFragment.java
@@ -102,15 +102,17 @@ protected void showDownloadDialog(final List<RealmMyLibrary> db_myLibrary) {
             @Override
             public void isAvailable() {
                 if (!db_myLibrary.isEmpty()) {
-                    LayoutInflater inflater = getLayoutInflater();
-                    convertView = inflater.inflate(R.layout.my_library_alertdialog, null);
-                    AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder(getActivity());
-                    alertDialogBuilder.setView(convertView).setTitle(R.string.download_suggestion);
-                    alertDialogBuilder.setPositiveButton(R.string.download_selected, (dialogInterface, i) -> startDownload(DownloadUtils.downloadFiles(db_myLibrary, lv.getSelectedItemsList(), settings))).setNeutralButton(R.string.download_all, (dialogInterface, i) -> startDownload(DownloadUtils.downloadAllFiles(db_myLibrary, settings))).setNegativeButton(R.string.txt_cancel, null);
-                    AlertDialog alertDialog = alertDialogBuilder.create();
-                    createListView(db_myLibrary, alertDialog);
-                    alertDialog.show();
-                    (alertDialog).getButton(AlertDialog.BUTTON_POSITIVE).setEnabled(lv.getSelectedItemsList().size() > 0);
+                    if (isAdded() && getActivity() != null) {
+                        LayoutInflater inflater = getActivity().getLayoutInflater();
+                        convertView = inflater.inflate(R.layout.my_library_alertdialog, null);
+                        AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder(getActivity());
+                        alertDialogBuilder.setView(convertView).setTitle(R.string.download_suggestion);
+                        alertDialogBuilder.setPositiveButton(R.string.download_selected, (dialogInterface, i) -> startDownload(DownloadUtils.downloadFiles(db_myLibrary, lv.getSelectedItemsList(), settings))).setNeutralButton(R.string.download_all, (dialogInterface, i) -> startDownload(DownloadUtils.downloadAllFiles(db_myLibrary, settings))).setNegativeButton(R.string.txt_cancel, null);
+                        AlertDialog alertDialog = alertDialogBuilder.create();
+                        createListView(db_myLibrary, alertDialog);
+                        alertDialog.show();
+                        (alertDialog).getButton(AlertDialog.BUTTON_POSITIVE).setEnabled(lv.getSelectedItemsList().size() > 0);
+                    }
                 } else {
                     Utilities.toast(requireContext(), getString(R.string.no_resources_to_download));
                 }