Issue 5193 - Apply Samsung Internet UI changes to the frist run slide

adblockplussbrowser/src/org/adblockplus/sbrowser/contentblocker/MainPreferences.java

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-2016 Eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
  * published by the Free Software Foundation.
  *
  * Adblock Plus is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with Adblock Plus.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 package org.adblockplus.sbrowser.contentblocker;
 
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStreamReader;
-
 import org.adblockplus.sbrowser.contentblocker.engine.Engine;
 import org.adblockplus.sbrowser.contentblocker.engine.EngineService;
 import org.adblockplus.adblockplussbrowser.R;
 
 import android.app.AlertDialog;
 import android.app.Dialog;
 import android.app.ProgressDialog;
 import android.content.DialogInterface;
 import android.content.DialogInterface.OnClickListener;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.net.Uri;
 import android.os.Bundle;
 import android.preference.PreferenceActivity;
 import android.preference.PreferenceManager;
 import android.text.Html;
 import android.util.Log;
 
 public class MainPreferences extends PreferenceActivity implements
     EngineService.OnEngineCreatedCallback, SharedPreferences.OnSharedPreferenceChangeListener
 {
   private static final String TAG = MainPreferences.class.getSimpleName();
-  private static final String SBROWSER_APP_ID = "com.sec.android.app.sbrowser";
+  public static final String SBROWSER_APP_ID = "com.sec.android.app.sbrowser";

[diegocarloslima, 2017/05/05 17:44:11]

I think it will be better to move this field to Engine class, once it is being
used there. The common purpose field are usually there.

[jens, 2017/05/09 09:44:45]

Acknowledged.

   private Engine engine = null;
   private Dialog dialog;
   private int dialogTitleResId;
 
   private SharedPreferences getSharedPreferences()
   {
     return PreferenceManager.getDefaultSharedPreferences(this.getApplicationContext());
   }
 
   @Override
@@ skipping 126 matching lines @@
     final boolean applicationActivated = this.getSharedPreferences()
         .getBoolean(this.getString(R.string.key_application_activated), false);
 
     if (!applicationActivated)
     {
       Log.d(TAG, "Showing setup dialog");
       this.dialogTitleResId = R.string.setup_dialog_title;
       this.dialog = new AlertDialog.Builder(this)
           .setCancelable(false)
           .setTitle(this.dialogTitleResId)
-          .setMessage(Html.fromHtml(getString(R.string.setup_dialog_message)))
+          .setMessage(Html.fromHtml(getString(Engine.hasSamsungInternetVersion5OrNewer(MainPreferences.this) ?
+                  R.string.setup_dialog_message_sbrowser_5 : R.string.setup_dialog_message_sbrowser_4)))
           .setNeutralButton(R.string.setup_dialog_button, new OnClickListener()
           {
             @Override
             public void onClick(DialogInterface dialog, int which)
             {
               Engine.openSBrowserSettings(MainPreferences.this);
             }
           })
           .create();
       this.dialog.show();
@@ skipping 28 matching lines @@
       this.engine.changeSubscriptionState(id, enabled);
     }
     else if (this.getString(R.string.key_application_activated).equals(key))
     {
       if (this.dialogTitleResId == R.string.setup_dialog_title)
       {
         this.dismissDialog();
       }
     }
   }
-}
+}