From 9b67de0f0b7a5ff533323fcdd3dd932e0048bf35 Mon Sep 17 00:00:00 2001
From: mhutti1 <mhutti1@gmail.com>
Date: Fri, 24 Aug 2018 17:13:02 +0530
Subject: [PATCH] Use page title as toc header if h1 is not used

(cherry picked from commit 4c6bff34cb2ea23a18d6ab0c32ed513046f9c021)
---
 .../org/kiwix/kiwixmobile/tests/BasicTest.java    |  2 +-
 .../org/kiwix/kiwixmobile/main/MainActivity.java  |  2 +-
 .../kiwixmobile/main/TableDrawerAdapter.java      | 15 ++++++++++-----
 3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/app/src/androidTestKiwix/java/org/kiwix/kiwixmobile/tests/BasicTest.java b/app/src/androidTestKiwix/java/org/kiwix/kiwixmobile/tests/BasicTest.java
index 1dd04566b..aa55f8074 100644
--- a/app/src/androidTestKiwix/java/org/kiwix/kiwixmobile/tests/BasicTest.java
+++ b/app/src/androidTestKiwix/java/org/kiwix/kiwixmobile/tests/BasicTest.java
@@ -76,7 +76,7 @@ public class BasicTest {
     openDrawerWithGravity(R.id.drawer_layout, Gravity.RIGHT);
     assertDrawerIsOpenWithGravity(R.id.drawer_layout, Gravity.RIGHT);
 
-    assertDisplayed(R.string.no_section_info);
+    assertDisplayed(R.string.menu_help);
 
     closeDrawerWithGravity(R.id.drawer_layout, Gravity.RIGHT);
     assertDrawerIsClosedWithGravity(R.id.drawer_layout, Gravity.RIGHT);*/
diff --git a/app/src/main/java/org/kiwix/kiwixmobile/main/MainActivity.java b/app/src/main/java/org/kiwix/kiwixmobile/main/MainActivity.java
index 646f9be5d..dfba75003 100644
--- a/app/src/main/java/org/kiwix/kiwixmobile/main/MainActivity.java
+++ b/app/src/main/java/org/kiwix/kiwixmobile/main/MainActivity.java
@@ -751,7 +751,7 @@ public class MainActivity extends BaseActivity implements WebViewCallback,
     }
   }
 
-  private KiwixWebView getCurrentWebView() {
+  KiwixWebView getCurrentWebView() {
     if (webViewList.size() == 0) return newTab();
     if (currentWebViewIndex < webViewList.size()) {
       return webViewList.get(currentWebViewIndex);
diff --git a/app/src/main/java/org/kiwix/kiwixmobile/main/TableDrawerAdapter.java b/app/src/main/java/org/kiwix/kiwixmobile/main/TableDrawerAdapter.java
index 4e3718185..cf1b820a1 100644
--- a/app/src/main/java/org/kiwix/kiwixmobile/main/TableDrawerAdapter.java
+++ b/app/src/main/java/org/kiwix/kiwixmobile/main/TableDrawerAdapter.java
@@ -20,6 +20,7 @@ package org.kiwix.kiwixmobile.main;
 import android.content.Context;
 import android.content.res.Resources;
 import android.graphics.Typeface;
+import android.support.annotation.NonNull;
 import android.support.v7.widget.RecyclerView;
 import android.util.TypedValue;
 import android.view.LayoutInflater;
@@ -45,7 +46,7 @@ public class TableDrawerAdapter extends RecyclerView.Adapter<RecyclerView.ViewHo
 
   private int selectedPosition = 0;
 
-  public TableDrawerAdapter() {
+  TableDrawerAdapter() {
     sections = new ArrayList<>();
   }
 
@@ -54,8 +55,9 @@ public class TableDrawerAdapter extends RecyclerView.Adapter<RecyclerView.ViewHo
     return 1;
   }
 
+  @NonNull
   @Override
-  public RecyclerView.ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
+  public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
     int resource = R.layout.section_list;
     Context context = parent.getContext();
     View v = LayoutInflater.from(context).inflate(resource, parent, false);
@@ -72,7 +74,7 @@ public class TableDrawerAdapter extends RecyclerView.Adapter<RecyclerView.ViewHo
   }
 
   @Override
-  public void onBindViewHolder(RecyclerView.ViewHolder holder, int position) {
+  public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int position) {
     ViewHolder vh = (ViewHolder) holder;
 
     Context context = holder.itemView.getContext();
@@ -85,6 +87,9 @@ public class TableDrawerAdapter extends RecyclerView.Adapter<RecyclerView.ViewHo
         vh.title.setText(title);
       } else {
         String empty = context.getString(R.string.no_section_info);
+        if (context instanceof MainActivity) {
+          empty = ((MainActivity) context).getCurrentWebView().getTitle();
+        }
         vh.title.setText(empty);
       }
       vh.itemView.setOnClickListener(v -> {
@@ -152,14 +157,14 @@ public class TableDrawerAdapter extends RecyclerView.Adapter<RecyclerView.ViewHo
 
   public static class HeaderViewHolder extends ViewHolder {
 
-    public HeaderViewHolder(View v) {
+    HeaderViewHolder(View v) {
       super(v);
     }
   }
 
   public static class SectionViewHolder extends ViewHolder {
 
-    public SectionViewHolder(View v) {
+    SectionViewHolder(View v) {
       super(v);
     }
   }