kumi/andOTP
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Rebrand hidden features to special features (again)

Browse source
This commit is contained in:
Jakob Nixdorf 2017-10-18 14:13:53 +02:00
parent acaa25a391
commit c7da79d012
No known key found for this signature in database
GPG key ID: BE99BF86574A7DBC
6 changed files with 24 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
CHANGELOG.md
View file

@ -5,8 +5,8 @@
* New feature: store authentication credentials hashed (Issue #49) * New feature: store authentication credentials hashed (Issue #49)
* New feature: store backup password encrypted (Issue #49) * New feature: store backup password encrypted (Issue #49)
* New feature: set a static backup dir to disable the file selector (Issue #52) * New feature: set a static backup dir to disable the file selector (Issue #52)
* New feature: hidden features (see wiki) * New feature: special features (see wiki)
* New hidden feature: SteamGuard tokens (Issue #38) * New special feature: SteamGuard tokens (Issue #38)
* Style/UI: black theme (Issue #47) * Style/UI: black theme (Issue #47)
* Bug fix: keep authentication settings when receiving a Panic Trigger (Issue #50) * Bug fix: keep authentication settings when receiving a Panic Trigger (Issue #50)
* Bug fix: progress bar animation with default duration scale * Bug fix: progress bar animation with default duration scale

16
app/src/main/java/org/shadowice/flocke/andotp/Activities/AboutActivity.java
View file

@ -115,10 +115,10 @@ public class AboutActivity extends BaseActivity {
currentToast = Toast.makeText(getBaseContext(), String.valueOf(taps), Toast.LENGTH_SHORT); currentToast = Toast.makeText(getBaseContext(), String.valueOf(taps), Toast.LENGTH_SHORT);
if (taps == 7) { if (taps == 7) {
if (settings.getHiddenFeatures()) if (settings.getSpecialFeatures())
currentToast = Toast.makeText(getBaseContext(), R.string.about_toast_hidden_features_enabled, Toast.LENGTH_LONG); currentToast = Toast.makeText(getBaseContext(), R.string.about_toast_special_features_enabled, Toast.LENGTH_LONG);
else else
enableHiddenFeatures(); enableSpecialFeatures();
} }
if (currentToast != null) if (currentToast != null)
@ -224,15 +224,15 @@ public class AboutActivity extends BaseActivity {
}); });
} }
private void enableHiddenFeatures() { private void enableSpecialFeatures() {
AlertDialog.Builder builder = new AlertDialog.Builder(this); AlertDialog.Builder builder = new AlertDialog.Builder(this);
builder.setTitle(R.string.about_title_hidden_features) builder.setTitle(R.string.about_title_special_features)
.setMessage(R.string.about_dialog_hidden_features) .setMessage(R.string.about_dialog_special_features)
.setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() { .setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
@Override @Override
public void onClick(DialogInterface dialogInterface, int i) { public void onClick(DialogInterface dialogInterface, int i) {
settings.setHiddenFeatures(true); settings.setSpecialFeatures(true);
Toast.makeText(getBaseContext(), R.string.about_toast_hidden_features, Toast.LENGTH_LONG).show(); Toast.makeText(getBaseContext(), R.string.about_toast_special_features, Toast.LENGTH_LONG).show();
} }
}) })
.setNegativeButton(android.R.string.cancel, new DialogInterface.OnClickListener() { .setNegativeButton(android.R.string.cancel, new DialogInterface.OnClickListener() {

2
app/src/main/java/org/shadowice/flocke/andotp/Activities/MainActivity.java
View file

@ -107,7 +107,7 @@ public class MainActivity extends BaseActivity
final ArrayAdapter<Entry.OTPType> typeAdapter = new ArrayAdapter<>(this, android.R.layout.simple_expandable_list_item_1, Entry.PublicTypes.toArray(new Entry.OTPType[Entry.PublicTypes.size()])); final ArrayAdapter<Entry.OTPType> typeAdapter = new ArrayAdapter<>(this, android.R.layout.simple_expandable_list_item_1, Entry.PublicTypes.toArray(new Entry.OTPType[Entry.PublicTypes.size()]));
final ArrayAdapter<Entry.OTPType> fullTypeAdapter = new ArrayAdapter<>(this, android.R.layout.simple_expandable_list_item_1, Entry.OTPType.values()); final ArrayAdapter<Entry.OTPType> fullTypeAdapter = new ArrayAdapter<>(this, android.R.layout.simple_expandable_list_item_1, Entry.OTPType.values());
if (settings.getHiddenFeatures()) if (settings.getSpecialFeatures())
typeInput.setAdapter(fullTypeAdapter); typeInput.setAdapter(fullTypeAdapter);
else else
typeInput.setAdapter(typeAdapter); typeInput.setAdapter(typeAdapter);

8
app/src/main/java/org/shadowice/flocke/andotp/Utilities/Settings.java
View file

@ -214,12 +214,12 @@ public class Settings {
setBoolean(R.string.settings_key_security_backup_warning, value); setBoolean(R.string.settings_key_security_backup_warning, value);
} }
public boolean getHiddenFeatures() { public boolean getSpecialFeatures() {
return getBoolean(R.string.settings_key_hidden_features, false); return getBoolean(R.string.settings_key_special_features, false);
} }
public void setHiddenFeatures(boolean value) { public void setSpecialFeatures(boolean value) {
setBoolean(R.string.settings_key_hidden_features, value); setBoolean(R.string.settings_key_special_features, value);
} }
public SortMode getSortMode() { public SortMode getSortMode() {

2
app/src/main/res/values/settings.xml
View file

@ -25,7 +25,7 @@
<string name="settings_key_security_backup_warning" translatable="false">pref_security_backup_warning_shown</string> <string name="settings_key_security_backup_warning" translatable="false">pref_security_backup_warning_shown</string>
<string name="settings_key_sort_mode" translatable="false">pref_sort_mode</string> <string name="settings_key_sort_mode" translatable="false">pref_sort_mode</string>
<string name="settings_key_hidden_features" translatable="false">pref_hidden_features</string> <string name="settings_key_special_features" translatable="false">pref_special_features</string>
<!-- Default values --> <!-- Default values -->
<string name="settings_default_auth" translatable="false">none</string> <string name="settings_default_auth" translatable="false">none</string>

16
app/src/main/res/values/strings_about.xml
View file

@ -38,12 +38,12 @@
<string name="about_desc_report_bugs">Report bugs or request new features</string> <string name="about_desc_report_bugs">Report bugs or request new features</string>
<string name="about_desc_translate">Help to translate andOTP to your language</string> <string name="about_desc_translate">Help to translate andOTP to your language</string>
<string name="about_title_hidden_features">Hidden features</string> <string name="about_title_special_features">Special features</string>
<string name="about_dialog_hidden_features">Are you sure you want to enable the hidden features? <string name="about_dialog_special_features">Are you sure you want to enable the special
Most of them are non-standard OTP algorithms which were implemented on special request. features? Most of them are non-standard OTP algorithms which were implemented on special
They are <b>not officially supported</b> and can come with <b>certain limitations</b>, request. They are <b>not officially supported</b> and can come with <b>certain
please read (and understand) the page about "Hidden features" in the Github wiki to learn limitations</b>, please read (and understand) the page \"Special features\" in the Github
more before using them.</string> wiki to learn more before using them.</string>
<string name="about_toast_hidden_features">Hidden features enabled</string> <string name="about_toast_special_features">Special features enabled</string>
<string name="about_toast_hidden_features_enabled">Hidden features already enabled</string> <string name="about_toast_special_features_enabled">Special features already enabled</string>
</resources> </resources>