update ics-openvpn: update classes, manifest, resources and build script

1 files changed, 5 insertions, 4 deletions

diff --git a/app/src/main/java/de/blinkt/openvpn/core/X509Utils.java b/app/src/main/java/de/blinkt/openvpn/core/X509Utils.java
index 4048f0e0..9e2060fd 100644
--- a/app/src/main/java/de/blinkt/openvpn/core/X509Utils.java
+++ b/app/src/main/java/de/blinkt/openvpn/core/X509Utils.java
@@ -5,6 +5,7 @@
 
 package de.blinkt.openvpn.core;
 
+import android.annotation.SuppressLint;
 import android.content.Context;
 import android.content.res.Resources;
 import android.text.TextUtils;
@@ -106,14 +107,14 @@ public class X509Utils {
         // More than 3 months display months
         if (timeLeft > 90l* 24 * 3600 * 1000) {
             long months = getMonthsDifference(now, certNotAfter);
-            return res.getString(R.string.months_left, months);
+            return res.getQuantityString(R.plurals.months_left, (int) months, months);
         } else if (timeLeft > 72 * 3600 * 1000) {
             long days = timeLeft / (24 * 3600 * 1000);
-            return res.getString(R.string.days_left, days);
+            return res.getQuantityString(R.plurals.days_left, (int) days, days);
         } else {
             long hours = timeLeft / (3600 * 1000);
 
-            return res.getString(R.string.hours_left, hours);
+            return res.getQuantityString(R.plurals.hours_left, (int)hours, hours);
         }
     }
 
@@ -131,7 +132,7 @@ public class X509Utils {
         /* Hack so we do not have to ship a whole Spongy/bouncycastle */
         Exception exp=null;
         try {
-            Class X509NameClass = Class.forName("com.android.org.bouncycastle.asn1.x509.X509Name");
+            @SuppressLint("PrivateApi") Class X509NameClass = Class.forName("com.android.org.bouncycastle.asn1.x509.X509Name");
             Method getInstance = X509NameClass.getMethod("getInstance",Object.class);
 
             Hashtable defaultSymbols = (Hashtable) X509NameClass.getField("DefaultSymbols").get(X509NameClass);