In app alert button changed from "Close" to "Ok".

* Also onesignal_in_app_alert_ok_button_text string key option to change text.

Author: jkasten2

OneSignalSDK/onesignal/src/main/java/com/onesignal/GenerateNotification.java

@@ -65,6 +65,8 @@
 
 import com.onesignal.OneSignalDbContract.NotificationTable;
 
+import static com.onesignal.OSUtils.getResourceString;
+
 class GenerateNotification {
    private static Context currentContext = null;
    private static String packageName = null;
@@ -110,7 +112,7 @@ public void run() {
             List<String> buttonsLabels = new ArrayList<String>();
             List<String> buttonIds = new ArrayList<String>();
 
-            addAlertButtons(gcmJson, buttonsLabels, buttonIds);
+            addAlertButtons(activity, gcmJson, buttonsLabels, buttonIds);
 
             final List<String> finalButtonIds = buttonIds;
 
@@ -735,7 +737,7 @@ else if (gcmBundle.has("grp"))
       }
    }
 
-   private static void addAlertButtons(JSONObject gcmBundle, List<String> buttonsLabels, List<String> buttonsIds) {
+   private static void addAlertButtons(Context context, JSONObject gcmBundle, List<String> buttonsLabels, List<String> buttonsIds) {
       try {
          JSONObject customJson = new JSONObject(gcmBundle.optString("custom"));
 
@@ -755,7 +757,7 @@ private static void addAlertButtons(JSONObject gcmBundle, List<String> buttonsLa
          }
 
          if (buttonsLabels.size() < 3) {
-            buttonsLabels.add("Close");
+            buttonsLabels.add(getResourceString(context, "onesignal_in_app_alert_ok_button_text", "Ok"));
             buttonsIds.add(NotificationBundleProcessor.DEFAULT_ACTION);
          }
       } catch (Throwable t) {

OneSignalSDK/onesignal/src/main/java/com/onesignal/OSUtils.java

@@ -30,6 +30,7 @@
 import android.content.Context;
 import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageManager;
+import android.content.res.Resources;
 import android.net.ConnectivityManager;
 import android.net.NetworkInfo;
 import android.os.Bundle;
@@ -81,6 +82,14 @@ static String getManifestMeta(Context context, String metaName) {
       return null;
    }
 
+   static String getResourceString(Context context, String key, String defaultStr) {
+      Resources resources = context.getResources();
+      int bodyResId = resources.getIdentifier(key, "string", context.getPackageName());
+      if (bodyResId != 0)
+         return resources.getString(bodyResId);
+      return defaultStr;
+   }
+
    static String getCorrectedLanguage() {
       String lang = Locale.getDefault().getLanguage();
 

OneSignalSDK/onesignal/src/main/java/com/onesignal/PushRegistratorGPS.java

@@ -44,6 +44,8 @@
 
 import java.io.IOException;
 
+import static com.onesignal.OSUtils.getResourceString;
+
 public class PushRegistratorGPS implements PushRegistrator {
 
    private Context appContext;
@@ -107,13 +109,7 @@ private boolean checkPlayServices() {
       return true;
    }
 
-   private String getResourceString(Context context, String key, String defaultStr) {
-      Resources resources = context.getResources();
-      int bodyResId = resources.getIdentifier(key, "string", context.getPackageName());
-      if (bodyResId != 0)
-         return resources.getString(bodyResId);
-      return defaultStr;
-   }
+
 
    private void ShowUpdateGPSDialog(final int resultCode) {
       OneSignal.runOnUiThread(new Runnable() {