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

refactor out some hardcoded string (more to follow), increment version

Browse source
This commit is contained in:
Bruno Bierbaumer 2015-12-21 20:57:19 +01:00
parent 861b31f1b3
commit 260f234d61
3 changed files with 24 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/build.gradle
View file

@ -8,8 +8,8 @@ android {
applicationId "net.bierbaumer.otp_authenticator" applicationId "net.bierbaumer.otp_authenticator"
minSdkVersion 15 minSdkVersion 15
targetSdkVersion 23 targetSdkVersion 23
versionCode 2 versionCode 3
versionName "0.1.1" versionName "0.1.2"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
} }

26
app/src/main/java/net/bierbaumer/otp_authenticator/MainActivity.java
View file

@ -11,7 +11,6 @@ import android.support.design.widget.FloatingActionButton;
import android.support.design.widget.Snackbar; import android.support.design.widget.Snackbar;
import android.support.v7.app.AppCompatActivity; import android.support.v7.app.AppCompatActivity;
import android.support.v7.widget.Toolbar; import android.support.v7.widget.Toolbar;
import android.util.Log;
import android.view.ActionMode; import android.view.ActionMode;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.Menu; import android.view.Menu;
@ -32,7 +31,6 @@ import com.google.zxing.integration.android.IntentIntegrator;
import java.util.ArrayList; import java.util.ArrayList;
public class MainActivity extends AppCompatActivity implements ActionMode.Callback { public class MainActivity extends AppCompatActivity implements ActionMode.Callback {
private ArrayList<Entry> entries; private ArrayList<Entry> entries;
private EntriesAdapter adapter; private EntriesAdapter adapter;
private FloatingActionButton fab; private FloatingActionButton fab;
@ -43,7 +41,7 @@ public class MainActivity extends AppCompatActivity implements ActionMode.Callb
private Entry nextSelection = null; private Entry nextSelection = null;
private void showNoAccount(){ private void showNoAccount(){
Snackbar noAccountSnackbar = Snackbar.make(fab, R.string.no_accounts, Snackbar.LENGTH_INDEFINITE) Snackbar noAccountSnackbar = Snackbar.make(fab, R.string.no_accounts, Snackbar.LENGTH_INDEFINITE)
.setAction("Add", new View.OnClickListener() { .setAction(R.string.button_add, new View.OnClickListener() {
@Override @Override
public void onClick(View view) { public void onClick(View view) {
scanQRCode(); scanQRCode();
@ -113,7 +111,7 @@ public class MainActivity extends AppCompatActivity implements ActionMode.Callb
animation.setInterpolator(new LinearInterpolator()); animation.setInterpolator(new LinearInterpolator());
animation.start(); animation.start();
for(int i =0;i< adapter.getCount();i++){ for(int i =0;i < adapter.getCount(); i++){
adapter.getItem(i).setCurrentOTP(TOTPHelper.generate(adapter.getItem(i).getSecret())); adapter.getItem(i).setCurrentOTP(TOTPHelper.generate(adapter.getItem(i).getSecret()));
} }
adapter.notifyDataSetChanged(); adapter.notifyDataSetChanged();
@ -150,9 +148,9 @@ public class MainActivity extends AppCompatActivity implements ActionMode.Callb
adapter.notifyDataSetChanged(); adapter.notifyDataSetChanged();
Snackbar.make(fab, "Account added", Snackbar.LENGTH_LONG).show(); Snackbar.make(fab, R.string.msg_account_added, Snackbar.LENGTH_LONG).show();
} catch (Exception e) { } catch (Exception e) {
Snackbar.make(fab, "Invalid QR Code", Snackbar.LENGTH_LONG).setCallback(new Snackbar.Callback() { Snackbar.make(fab, R.string.msg_invalid_qr_code, Snackbar.LENGTH_LONG).setCallback(new Snackbar.Callback() {
@Override @Override
public void onDismissed(Snackbar snackbar, int event) { public void onDismissed(Snackbar snackbar, int event) {
super.onDismissed(snackbar, event); super.onDismissed(snackbar, event);
@ -216,14 +214,14 @@ public class MainActivity extends AppCompatActivity implements ActionMode.Callb
if (id == R.id.action_delete) { if (id == R.id.action_delete) {
AlertDialog.Builder alert = new AlertDialog.Builder(this); AlertDialog.Builder alert = new AlertDialog.Builder(this);
alert.setTitle("Remove " + adapter.getCurrentSelection().getLabel() + "?"); alert.setTitle(getString(R.string.alert_remove) + adapter.getCurrentSelection().getLabel() + "?");
alert.setMessage("Are you sure you want do remove this account?"); alert.setMessage(R.string.msg_confirm_delete);
alert.setPositiveButton("Remove", new DialogInterface.OnClickListener() { alert.setPositiveButton(R.string.button_remove, new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int whichButton) { public void onClick(DialogInterface dialog, int whichButton) {
entries.remove(adapter.getCurrentSelection()); entries.remove(adapter.getCurrentSelection());
Snackbar.make(fab, "Account removed", Snackbar.LENGTH_LONG).setCallback(new Snackbar.Callback() { Snackbar.make(fab, R.string.msg_account_removed, Snackbar.LENGTH_LONG).setCallback(new Snackbar.Callback() {
@Override @Override
public void onDismissed(Snackbar snackbar, int event) { public void onDismissed(Snackbar snackbar, int event) {
super.onDismissed(snackbar, event); super.onDismissed(snackbar, event);
@ -238,7 +236,7 @@ public class MainActivity extends AppCompatActivity implements ActionMode.Callb
} }
}); });
alert.setNegativeButton("Cancel", new DialogInterface.OnClickListener() { alert.setNegativeButton(R.string.button_cancel, new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int whichButton) { public void onClick(DialogInterface dialog, int whichButton) {
dialog.cancel(); dialog.cancel();
actionMode.finish(); actionMode.finish();
@ -251,20 +249,20 @@ public class MainActivity extends AppCompatActivity implements ActionMode.Callb
} }
else if (id == R.id.action_edit) { else if (id == R.id.action_edit) {
AlertDialog.Builder alert = new AlertDialog.Builder(this); AlertDialog.Builder alert = new AlertDialog.Builder(this);
alert.setTitle("Rename"); alert.setTitle(R.string.alert_rename);
final EditText input = new EditText(this); final EditText input = new EditText(this);
input.setText(adapter.getCurrentSelection().getLabel()); input.setText(adapter.getCurrentSelection().getLabel());
alert.setView(input); alert.setView(input);
alert.setPositiveButton("Save", new DialogInterface.OnClickListener() { alert.setPositiveButton(R.string.button_save, new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int whichButton) { public void onClick(DialogInterface dialog, int whichButton) {
adapter.getCurrentSelection().setLabel(input.getEditableText().toString()); adapter.getCurrentSelection().setLabel(input.getEditableText().toString());
actionMode.finish(); actionMode.finish();
} }
}); });
alert.setNegativeButton("Cancel", new DialogInterface.OnClickListener() { alert.setNegativeButton(R.string.button_cancel, new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int whichButton) { public void onClick(DialogInterface dialog, int whichButton) {
dialog.cancel(); dialog.cancel();
actionMode.finish(); actionMode.finish();

10
app/src/main/res/values/strings.xml
View file

@ -6,4 +6,14 @@
<string name="menu_edit">Edit</string> <string name="menu_edit">Edit</string>
<string name="menu_scan">Scan QR Code</string> <string name="menu_scan">Scan QR Code</string>
<string name="menu_about">About</string> <string name="menu_about">About</string>
<string name="msg_invalid_qr_code">Invalid QR Code</string>
<string name="msg_account_added">Account added</string>
<string name="button_cancel">Cancel</string>
<string name="button_save">Save</string>
<string name="msg_confirm_delete">Are you sure you want do remove this account?</string>
<string name="msg_account_removed">Account removed</string>
<string name="button_add">Add</string>
<string name="button_remove">Remove</string>
<string name="alert_rename">Rename</string>
<string name="alert_remove">"Remove "</string>
</resources> </resources>