| OLD | NEW |
| 1 /* | 1 /* |
| 2 * This file is part of Adblock Plus <https://adblockplus.org/>, | 2 * This file is part of Adblock Plus <https://adblockplus.org/>, |
| 3 * Copyright (C) 2006-2016 Eyeo GmbH | 3 * Copyright (C) 2006-2016 Eyeo GmbH |
| 4 * | 4 * |
| 5 * Adblock Plus is free software: you can redistribute it and/or modify | 5 * Adblock Plus is free software: you can redistribute it and/or modify |
| 6 * it under the terms of the GNU General Public License version 3 as | 6 * it under the terms of the GNU General Public License version 3 as |
| 7 * published by the Free Software Foundation. | 7 * published by the Free Software Foundation. |
| 8 * | 8 * |
| 9 * Adblock Plus is distributed in the hope that it will be useful, | 9 * Adblock Plus is distributed in the hope that it will be useful, |
| 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of | 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of |
| (...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 100 this.getSharedPreferences().unregisterOnSharedPreferenceChangeListener(this)
; | 100 this.getSharedPreferences().unregisterOnSharedPreferenceChangeListener(this)
; |
| 101 } | 101 } |
| 102 | 102 |
| 103 private void checkForCompatibleSBrowserAndProceed() | 103 private void checkForCompatibleSBrowserAndProceed() |
| 104 { | 104 { |
| 105 if (!Engine.hasCompatibleSBrowserInstalled(this.getApplicationContext())) | 105 if (!Engine.hasCompatibleSBrowserInstalled(this.getApplicationContext())) |
| 106 { | 106 { |
| 107 final AlertDialog d = new AlertDialog.Builder(this) | 107 final AlertDialog d = new AlertDialog.Builder(this) |
| 108 .setCancelable(false) | 108 .setCancelable(false) |
| 109 .setTitle(R.string.sbrowser_dialog_title) | 109 .setTitle(R.string.sbrowser_dialog_title) |
| 110 .setMessage(Html.fromHtml(this.readTextFile(R.raw.sbrowser_dialog))) | 110 .setMessage(Html.fromHtml(getString(R.string.sbrowser_dialog_message))
) |
| 111 .setNeutralButton(R.string.sbrowser_dialog_button, new OnClickListener
() | 111 .setNeutralButton(R.string.sbrowser_dialog_button, new OnClickListener
() |
| 112 { | 112 { |
| 113 @Override | 113 @Override |
| 114 public void onClick(DialogInterface dialog, int which) | 114 public void onClick(DialogInterface dialog, int which) |
| 115 { | 115 { |
| 116 try | 116 try |
| 117 { | 117 { |
| 118 startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse("market:/
/details?id=" | 118 startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse("market:/
/details?id=" |
| 119 + SBROWSER_APP_ID))); | 119 + SBROWSER_APP_ID))); |
| 120 } | 120 } |
| (...skipping 15 matching lines...) Expand all Loading... |
| 136 private void checkAAStatusAndProceed() | 136 private void checkAAStatusAndProceed() |
| 137 { | 137 { |
| 138 final SharedPreferences prefs = this.getSharedPreferences(); | 138 final SharedPreferences prefs = this.getSharedPreferences(); |
| 139 final String keyAaInfoShown = this.getString(R.string.key_aa_info_shown); | 139 final String keyAaInfoShown = this.getString(R.string.key_aa_info_shown); |
| 140 final boolean aaInfoShown = prefs.getBoolean(keyAaInfoShown, false); | 140 final boolean aaInfoShown = prefs.getBoolean(keyAaInfoShown, false); |
| 141 if (!aaInfoShown) | 141 if (!aaInfoShown) |
| 142 { | 142 { |
| 143 final AlertDialog d = new AlertDialog.Builder(this) | 143 final AlertDialog d = new AlertDialog.Builder(this) |
| 144 .setCancelable(false) | 144 .setCancelable(false) |
| 145 .setTitle(R.string.aa_dialog_title) | 145 .setTitle(R.string.aa_dialog_title) |
| 146 .setMessage(Html.fromHtml(this.readTextFile(R.raw.aa_dialog))) | 146 .setMessage(Html.fromHtml(getString(R.string.aa_dialog_message))) |
| 147 .setNeutralButton(R.string.aa_dialog_button, new OnClickListener() | 147 .setNeutralButton(R.string.aa_dialog_button, new OnClickListener() |
| 148 { | 148 { |
| 149 @Override | 149 @Override |
| 150 public void onClick(DialogInterface dialog, int which) | 150 public void onClick(DialogInterface dialog, int which) |
| 151 { | 151 { |
| 152 prefs.edit() | 152 prefs.edit() |
| 153 .putBoolean(keyAaInfoShown, true) | 153 .putBoolean(keyAaInfoShown, true) |
| 154 .commit(); | 154 .commit(); |
| 155 MainPreferences.this.checkSetupStatus(); | 155 MainPreferences.this.checkSetupStatus(); |
| 156 } | 156 } |
| (...skipping 10 matching lines...) Expand all Loading... |
| 167 { | 167 { |
| 168 final boolean applicationActivated = this.getSharedPreferences() | 168 final boolean applicationActivated = this.getSharedPreferences() |
| 169 .getBoolean(this.getString(R.string.key_application_activated), false); | 169 .getBoolean(this.getString(R.string.key_application_activated), false); |
| 170 | 170 |
| 171 if (!applicationActivated) | 171 if (!applicationActivated) |
| 172 { | 172 { |
| 173 Log.d(TAG, "Showing setup dialog"); | 173 Log.d(TAG, "Showing setup dialog"); |
| 174 this.setupDialog = new AlertDialog.Builder(this) | 174 this.setupDialog = new AlertDialog.Builder(this) |
| 175 .setCancelable(false) | 175 .setCancelable(false) |
| 176 .setTitle(R.string.setup_dialog_title) | 176 .setTitle(R.string.setup_dialog_title) |
| 177 .setMessage(Html.fromHtml(this.readTextFile(R.raw.setup_dialog))) | 177 .setMessage(Html.fromHtml(getString(R.string.setup_dialog_message))) |
| 178 .setNeutralButton(R.string.setup_dialog_button, new OnClickListener() | 178 .setNeutralButton(R.string.setup_dialog_button, new OnClickListener() |
| 179 { | 179 { |
| 180 @Override | 180 @Override |
| 181 public void onClick(DialogInterface dialog, int which) | 181 public void onClick(DialogInterface dialog, int which) |
| 182 { | 182 { |
| 183 Engine.openSBrowserSettings(MainPreferences.this); | 183 Engine.openSBrowserSettings(MainPreferences.this); |
| 184 } | 184 } |
| 185 }) | 185 }) |
| 186 .create(); | 186 .create(); |
| 187 this.setupDialog.show(); | 187 this.setupDialog.show(); |
| (...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 247 r.close(); | 247 r.close(); |
| 248 } | 248 } |
| 249 } | 249 } |
| 250 catch (IOException e) | 250 catch (IOException e) |
| 251 { | 251 { |
| 252 Log.e(TAG, "Resource reading failed for: " + id, e); | 252 Log.e(TAG, "Resource reading failed for: " + id, e); |
| 253 return "..."; | 253 return "..."; |
| 254 } | 254 } |
| 255 } | 255 } |
| 256 } | 256 } |
| OLD | NEW |