Merge pull request #27 from Connexions/bug-fixes

Fixed user reported bug and centered book titles
Connexions · Jul 26, 2017 · a73a599 · a73a599
2 parents 4c392e4 + 45da113
commit a73a599
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 21 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -3,22 +3,22 @@ apply plugin: 'com.android.application'
 
 android {
     compileSdkVersion 25
-    buildToolsVersion '25.0.0'
+    buildToolsVersion '25.0.3'
     project.archivesBaseName = "CNXAndroid";
 
     defaultConfig {
         applicationId "org.cnx.android"
         minSdkVersion 19
         targetSdkVersion 25
-        versionCode 38
-        versionName "6.3"
+        versionCode 39
+        versionName "6.4"
     }
     dependencies{
-        compile 'com.android.support:appcompat-v7:25.1.1'
-        compile 'com.android.support:design:25.1.1'
-        compile 'com.android.support:support-v4:25.1.1'
-        compile 'com.android.support:recyclerview-v7:25.1.1'
-        compile 'com.android.support:cardview-v7:25.1.1'
+        compile 'com.android.support:appcompat-v7:25.3.1'
+        compile 'com.android.support:design:25.3.1'
+        compile 'com.android.support:support-v4:25.3.1'
+        compile 'com.android.support:recyclerview-v7:25.3.1'
+        compile 'com.android.support:cardview-v7:25.3.1'
         compile 'com.google.code.gson:gson:2.7'
     }
 

diff --git a/app/src/main/java/org/cnx/android/activity/WebViewActivity.java b/app/src/main/java/org/cnx/android/activity/WebViewActivity.java
@@ -341,9 +341,12 @@ protected void onSaveInstanceState(Bundle outState)
             WebviewLogic wl = new WebviewLogic();
             String bookURL = wl.getBookURL(content.getUrl());
             //Log.d("SIS", "BookURL - " + bookURL);
-            String url = webView.getUrl().replace("?bookmark=1", "");
-            ed.putString(bookURL, url);
-            ed.apply();
+            if(webView != null && webView.getUrl() != null)
+            {
+                String url = webView.getUrl().replace("?bookmark=1", "");
+                ed.putString(bookURL, url);
+                ed.apply();
+            }
         }
 
     }

diff --git a/app/src/main/res/layout/fragment_book.xml b/app/src/main/res/layout/fragment_book.xml
@@ -29,20 +29,12 @@
             style="@style/TextAppearance.Title"
             android:layout_below="@+id/logoView"
             android:layout_centerHorizontal="true"
+            android:gravity="center_horizontal"
+            android:layout_gravity="center_horizontal"
             android:padding="10dp"
             android:textSize="24sp"
             android:layout_marginLeft="5dip"/>
 
-        <!--<TextView
-            android:id="@+id/details"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:autoLink="web"
-            android:layout_below="@+id/title"
-            android:layout_centerHorizontal="true"
-            android:padding="15dp"
-            android:textSize="20sp"/>-->
-
     </RelativeLayout>
 
 </android.support.v7.widget.CardView>