From b583aa3e157910cd68639538bb2836a05aa84fa0 Mon Sep 17 00:00:00 2001
From: mhutti1 <mhutti1@gmail.com>
Date: Sat, 13 Aug 2016 22:17:10 +0100
Subject: [PATCH] Android Downloading ZIM list require confirmation on network

---
 res/layout/activity_library.xml               | 17 +++-
 res/values/strings.xml                        |  2 +
 .../kiwix/kiwixmobile/LibraryFragment.java    | 82 +++++++++++++------
 3 files changed, 75 insertions(+), 26 deletions(-)

diff --git a/res/layout/activity_library.xml b/res/layout/activity_library.xml
index 95e1092dc..674ef60a8 100644
--- a/res/layout/activity_library.xml
+++ b/res/layout/activity_library.xml
@@ -14,7 +14,22 @@
       android:layout_width="match_parent"
       android:layout_height="match_parent"
       android:id="@+id/library_list" />
-
+  <TextView
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:visibility="gone"
+    android:layout_marginTop="200dp"
+    android:text="@string/get_library_over_network"
+    android:layout_centerHorizontal="true"
+    android:id="@+id/network_permission_text"/>
+  <Button
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:layout_marginTop="230dp"
+    android:id="@+id/network_permission_button"
+    android:text="@string/proceed"
+    android:layout_centerHorizontal="true"
+    android:visibility="gone"/>
 
     <RelativeLayout
         android:layout_width="wrap_content"
diff --git a/res/values/strings.xml b/res/values/strings.xml
index d75e2b3b8..281107006 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -114,4 +114,6 @@
   <string name="zim_nopic">No Pictures</string>
   <string name="open_partial_zim">This file could be incomplete. Do you wish to attempt to open it?</string>
   <string name="no_network_connection">No network connection</string>
+  <string name="get_library_over_network">Use network to download ZIM list. (Approximately 6MB)</string>
+  <string name="proceed">Proceed</string>
 </resources>
diff --git a/src/org/kiwix/kiwixmobile/LibraryFragment.java b/src/org/kiwix/kiwixmobile/LibraryFragment.java
index 97e75fad7..0fd5f1600 100644
--- a/src/org/kiwix/kiwixmobile/LibraryFragment.java
+++ b/src/org/kiwix/kiwixmobile/LibraryFragment.java
@@ -28,6 +28,7 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.AdapterView;
+import android.widget.Button;
 import android.widget.LinearLayout;
 import android.widget.ListView;
 import android.widget.ProgressBar;
@@ -67,6 +68,8 @@ public class LibraryFragment extends Fragment implements AdapterView.OnItemClick
   @BindView(R.id.progressBar) ProgressBar progressBar;
   @BindView(R.id.progressbar_message) TextView progressBarMessage;
   @BindView(R.id.progressbar_layout) RelativeLayout progressBarLayout;
+  @BindView(R.id.network_permission_text) TextView permissionText;
+  @BindView(R.id.network_permission_button) Button permissionButton;
 
 
   private KiwixService kiwixService;
@@ -102,32 +105,16 @@ public class LibraryFragment extends Fragment implements AdapterView.OnItemClick
         // setContentView(R.layout.activity_layout);
       ButterKnife.bind(this, llLayout);
 
-      progressBar.setVisibility(View.VISIBLE);
-      progressBarMessage.setVisibility(View.VISIBLE);
-      progressBarLayout.setVisibility(View.VISIBLE);
-
       kiwixService = ((KiwixApplication) super.getActivity().getApplication()).getKiwixService();
       conMan = (ConnectivityManager) super.getActivity().getSystemService(Context.CONNECTIVITY_SERVICE);
       NetworkInfo network = conMan.getActiveNetworkInfo();
       bookDao = new BookDao(new KiwixDatabase(super.getActivity()));
       if (network != null && network.isConnected()) {
-        kiwixService.getLibrary()
-            .observeOn(AndroidSchedulers.mainThread())
-            .subscribe(library -> {
-              books = library.getBooks();
-              if (active) {
-                libraryAdapter = new LibraryAdapter(super.getActivity(), new ArrayList<LibraryNetworkEntity.Book>(books));
-                libraryList.setAdapter(libraryAdapter);
-                progressBarLayout.setVisibility(View.GONE);
-              }
-            },error -> {
-              noNetworkConnection();
-            });
-
-
-        libraryList.setOnItemClickListener(this);
-
-        active = true;
+        if (isWiFi()) {
+          getLibraryData();
+        } else {
+          displayNetworkConfirmation();
+        }
       } else {
         noNetworkConnection();
       }
@@ -138,6 +125,42 @@ public class LibraryFragment extends Fragment implements AdapterView.OnItemClick
         return llLayout; // We must return the loaded Layout
     }
 
+  public void getLibraryData(){
+    progressBar.setVisibility(View.VISIBLE);
+    progressBarMessage.setVisibility(View.VISIBLE);
+    progressBarLayout.setVisibility(View.VISIBLE);
+    kiwixService.getLibrary()
+        .observeOn(AndroidSchedulers.mainThread())
+        .subscribe(library -> {
+          books = library.getBooks();
+          if (active) {
+            libraryAdapter = new LibraryAdapter(super.getActivity(), new ArrayList<LibraryNetworkEntity.Book>(books));
+            libraryList.setAdapter(libraryAdapter);
+            progressBarLayout.setVisibility(View.GONE);
+          }
+        },error -> {
+          noNetworkConnection();
+        });
+
+
+    libraryList.setOnItemClickListener(this);
+
+    active = true;
+  }
+
+  public void displayNetworkConfirmation(){
+    permissionText.setVisibility(View.VISIBLE);
+    permissionButton.setVisibility(View.VISIBLE);
+    permissionButton.setOnClickListener(new View.OnClickListener() {
+      @Override
+      public void onClick(View view) {
+        getLibraryData();
+        permissionButton.setVisibility(View.GONE);
+        permissionText.setVisibility(View.GONE);
+      }
+    });
+  }
+
   public void noNetworkConnection() {
     progressBar.setVisibility(View.INVISIBLE);
     progressBarLayout.setVisibility(View.VISIBLE);
@@ -167,19 +190,28 @@ public class LibraryFragment extends Fragment implements AdapterView.OnItemClick
       return;
     }
     bookDao.saveBook(books.get(position));
+    if (isWiFi()){
+      mobileDownloadDialog(position);
+    } else {
+      downloadFile(position, books.get(position));
+    }
+
+  }
+
+  public boolean isWiFi(){
     if (Build.VERSION.SDK_INT >= 23) {
       NetworkInfo network = conMan.getActiveNetworkInfo();
       if (network.getType() != ConnectivityManager.TYPE_WIFI){
-        mobileDownloadDialog(position);
+        return false;
       } else {
-        downloadFile(position, books.get(position));
+        return true;
       }
     } else {
       NetworkInfo wifi = conMan.getNetworkInfo(ConnectivityManager.TYPE_WIFI);
       if (!wifi.isConnected()){
-        mobileDownloadDialog(position);
+        return false;
       } else {
-        downloadFile(position, books.get(position));
+        return true;
       }
     }
   }