From 14326ae3d097777e0ab198c3acd67c40a9437e34 Mon Sep 17 00:00:00 2001
From: Deskana <dgarry@wikimedia.org>
Date: Fri, 26 May 2017 13:52:01 +0100
Subject: [PATCH 1/2] Fix usage of deprecated function String.fromHtml(String)

String.fromHtml(String) is now deprecated. This patch fixes that by adding a method to Utils that selects the appropriate function based on the user's platform.
---
 app/src/main/java/fr/free/nrw/commons/Utils.java | 16 ++++++++++++++++
 .../free/nrw/commons/ui/widget/HtmlTextView.java |  5 +++--
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/fr/free/nrw/commons/Utils.java b/app/src/main/java/fr/free/nrw/commons/Utils.java
index 9d38cd92a..13becde0f 100644
--- a/app/src/main/java/fr/free/nrw/commons/Utils.java
+++ b/app/src/main/java/fr/free/nrw/commons/Utils.java
@@ -2,7 +2,10 @@ package fr.free.nrw.commons;
 
 import android.content.Context;
 import android.net.Uri;
+import android.os.Build;
 import android.preference.PreferenceManager;
+import android.text.Html;
+import android.text.Spanned;
 
 import fr.free.nrw.commons.settings.Prefs;
 import timber.log.Timber;
@@ -78,6 +81,19 @@ public class Utils {
         }
     }
 
+    /** Fix Html.fromHtml is deprecated problem
+     * @param source provided Html string
+     * @return returned Spanned of appropriate method according to version check
+     * */
+    public static Spanned fromHtml(String source) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+            return Html.fromHtml(source, Html.FROM_HTML_MODE_LEGACY);
+        } else {
+            //noinspection deprecation
+            return Html.fromHtml(source);
+        }
+    }
+
     /**
      * Strips localization symbols from a string.
      * Removes the suffix after "@" and quotes.
diff --git a/app/src/main/java/fr/free/nrw/commons/ui/widget/HtmlTextView.java b/app/src/main/java/fr/free/nrw/commons/ui/widget/HtmlTextView.java
index bc5fd71cd..e0924505c 100644
--- a/app/src/main/java/fr/free/nrw/commons/ui/widget/HtmlTextView.java
+++ b/app/src/main/java/fr/free/nrw/commons/ui/widget/HtmlTextView.java
@@ -2,10 +2,11 @@ package fr.free.nrw.commons.ui.widget;
 
 import android.content.Context;
 import android.support.v7.widget.AppCompatTextView;
-import android.text.Html;
 import android.text.method.LinkMovementMethod;
 import android.util.AttributeSet;
 
+import fr.free.nrw.commons.Utils;
+
 /**
  * An {@link AppCompatTextView} which formats the text to HTML displayable text and makes any
  * links clickable.
@@ -16,6 +17,6 @@ public class HtmlTextView extends AppCompatTextView {
         super(context, attrs);
 
         setMovementMethod(LinkMovementMethod.getInstance());
-        setText(Html.fromHtml(getText().toString()));
+        setText(Utils.fromHtml(getText().toString()));
     }
 }

From e1a7007f6073dcb47cb2b45148ee2d6d64ff46c7 Mon Sep 17 00:00:00 2001
From: Deskana <dgarry@wikimedia.org>
Date: Sun, 28 May 2017 09:55:08 +0100
Subject: [PATCH 2/2] Update CREDITS to credit the Android Wikipedia app

We reused a code sample from the Android Wikipedia app, and will likely use more. It seems fitting to credit them.
---
 CREDITS | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CREDITS b/CREDITS
index 20a64ad9f..9e6f63bc1 100644
--- a/CREDITS
+++ b/CREDITS
@@ -25,3 +25,6 @@ their contribution to the product.
 * GSON
 * Timber
 * MapBox
+
+3rd party open source apps from which significant code has been reused:
+* Android Wikipedia app https://github.com/wikimedia/apps-android-wikipedia