Merge branch 'UI_tweaks' into 'master'

Ui tweaks

See merge request leap/bitmask_android!90

1 files changed, 8 insertions, 0 deletions

diff --git a/app/src/main/java/se/leap/bitmaskclient/utils/ConfigHelper.java b/app/src/main/java/se/leap/bitmaskclient/utils/ConfigHelper.java
index d1ac0eb3..da74c7c4 100644
--- a/app/src/main/java/se/leap/bitmaskclient/utils/ConfigHelper.java
+++ b/app/src/main/java/se/leap/bitmaskclient/utils/ConfigHelper.java
@@ -17,8 +17,10 @@
 package se.leap.bitmaskclient.utils;
 
 import android.content.Context;
+import android.content.res.Resources;
 import android.os.Looper;
 import android.support.annotation.NonNull;
+import android.support.annotation.StringRes;
 
 import org.json.JSONException;
 import org.json.JSONObject;
@@ -43,6 +45,7 @@ import java.util.Calendar;
 
 import se.leap.bitmaskclient.BuildConfig;
 import se.leap.bitmaskclient.ProviderAPI;
+import se.leap.bitmaskclient.R;
 
 import static se.leap.bitmaskclient.Constants.DEFAULT_BITMASK;
 
@@ -182,4 +185,9 @@ public class ConfigHelper {
     public static int getCurrentTimezone() {
         return Calendar.getInstance().get(Calendar.ZONE_OFFSET) / 3600000;
     }
+
+    public static String getProviderFormattedString(Resources resources, @StringRes int resourceId) {
+        String appName = resources.getString(R.string.app_name);
+        return resources.getString(resourceId, appName);
+    }
 }