From a7bbe10c007dc15912a122414d2d85e1f4807730 Mon Sep 17 00:00:00 2001
From: Isaac <mhutti1@gmail.com>
Date: Sun, 11 Sep 2016 22:46:33 +0100
Subject: [PATCH] Android New download URL and extra file attributes #309

---
 build.gradle                                              | 8 ++++----
 src/org/kiwix/kiwixmobile/KiwixApplication.java           | 6 ++++--
 .../kiwixmobile/library/entity/LibraryNetworkEntity.java  | 6 ++++++
 src/org/kiwix/kiwixmobile/network/KiwixService.java       | 2 +-
 4 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/build.gradle b/build.gradle
index 3b6399d21..3cc6ab6e9 100644
--- a/build.gradle
+++ b/build.gradle
@@ -37,10 +37,10 @@ dependencies {
   compile 'com.yahoo.squidb:squidb-annotations:2.0.0'
   apt 'com.yahoo.squidb:squidb-processor:2.0.0'
 
-  compile 'com.squareup.okhttp3:okhttp:3.2.0'
-  compile 'com.squareup.retrofit2:retrofit:2.0.2'
-  compile 'com.squareup.retrofit2:adapter-rxjava:2.0.2'
-  compile('com.squareup.retrofit2:converter-simplexml:2.0.2') {
+  compile 'com.squareup.okhttp3:okhttp:3.4.1'
+  compile 'com.squareup.retrofit2:retrofit:2.1.0'
+  compile 'com.squareup.retrofit2:adapter-rxjava:2.1.0'
+  compile('com.squareup.retrofit2:converter-simplexml:2.1.0') {
     exclude group: 'xpp3', module: 'xpp3'
     exclude group: 'stax', module: 'stax-api'
     exclude group: 'stax', module: 'stax'
diff --git a/src/org/kiwix/kiwixmobile/KiwixApplication.java b/src/org/kiwix/kiwixmobile/KiwixApplication.java
index c8382ad0b..e3cf803f6 100644
--- a/src/org/kiwix/kiwixmobile/KiwixApplication.java
+++ b/src/org/kiwix/kiwixmobile/KiwixApplication.java
@@ -11,16 +11,18 @@ import rx.schedulers.Schedulers;
 public class KiwixApplication extends Application {
 
   private static KiwixService service;
-  private static OkHttpClient client = new OkHttpClient();
+  private static OkHttpClient client = new OkHttpClient().newBuilder().followRedirects(true).followSslRedirects(true).build();
 
   @Override public void onCreate() {
     super.onCreate();
     createRetrofitService();
+
   }
 
   private void createRetrofitService() {
     Retrofit retrofit = new Retrofit.Builder()
-        .baseUrl("http://kiwix.org/")
+        .baseUrl("http://download.kiwix.org/")
+        .client(client)
         .addConverterFactory(SimpleXmlConverterFactory.create())
         .addCallAdapterFactory(RxJavaCallAdapterFactory.createWithScheduler(Schedulers.io()))
         .build();
diff --git a/src/org/kiwix/kiwixmobile/library/entity/LibraryNetworkEntity.java b/src/org/kiwix/kiwixmobile/library/entity/LibraryNetworkEntity.java
index 48debb51a..f47305270 100644
--- a/src/org/kiwix/kiwixmobile/library/entity/LibraryNetworkEntity.java
+++ b/src/org/kiwix/kiwixmobile/library/entity/LibraryNetworkEntity.java
@@ -84,6 +84,12 @@ public class LibraryNetworkEntity {
     @Attribute(name = "size", required = false)
     public String size;
 
+    @Attribute(name = "name", required = false)
+    public String bookName;
+
+    @Attribute(name = "tags", required = false)
+    public String tags;
+
     public boolean downloaded =  false;
 
     public int searchMatches = 0;
diff --git a/src/org/kiwix/kiwixmobile/network/KiwixService.java b/src/org/kiwix/kiwixmobile/network/KiwixService.java
index 6bc493a36..7cf8258a8 100644
--- a/src/org/kiwix/kiwixmobile/network/KiwixService.java
+++ b/src/org/kiwix/kiwixmobile/network/KiwixService.java
@@ -7,7 +7,7 @@ import retrofit2.http.Url;
 import rx.Observable;
 
 public interface KiwixService {
-  @GET("/library.xml") Observable<LibraryNetworkEntity> getLibrary();
+  @GET("/library/library.xml") Observable<LibraryNetworkEntity> getLibrary();
 
   @GET Observable<MetaLinkNetworkEntity> getMetaLinks(@Url String url);
 }