erik/Emaily
erik/Emaily
1
0
Fork 0
Code Issues Pull requests Releases Activity

Change references to API key to access token.

Browse source
This commit is contained in:
Erik C. Thauvin 2020-08-02 18:10:05 -07:00
parent 0098c4dbbc
commit 2b5f1e793e
5 changed files with 15 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

8
app/src/main/java/net/thauvin/erik/android/emaily/BitlyCredsDialog.java
View file

@ -67,10 +67,10 @@ public class BitlyCredsDialog extends DialogPreference
super.onBindDialogView(view); super.onBindDialogView(view);
final SharedPreferences sharedPrefs = getSharedPreferences(); final SharedPreferences sharedPrefs = getSharedPreferences();
apikey = view.findViewById(R.id.bitly_apikey_edit); apikey = view.findViewById(R.id.bitly_accesstoken_edittext);
final TextView textFld = view.findViewById(R.id.bitly_text_fld); final TextView textFld = view.findViewById(R.id.bitly_needtoken_textview);
apikey.setText(sharedPrefs.getString(context.getString(R.string.prefs_key_bitly_apikey), "")); apikey.setText(sharedPrefs.getString(context.getString(R.string.prefs_key_bitly_apitoken), ""));
textFld.setOnClickListener(new View.OnClickListener() textFld.setOnClickListener(new View.OnClickListener()
{ {
@ -93,7 +93,7 @@ public class BitlyCredsDialog extends DialogPreference
final SharedPreferences sharedPrefs = getSharedPreferences(); final SharedPreferences sharedPrefs = getSharedPreferences();
final Editor editor = sharedPrefs.edit(); final Editor editor = sharedPrefs.edit();
editor.putString(context.getString(R.string.prefs_key_bitly_apikey), apikey.getText().toString()); editor.putString(context.getString(R.string.prefs_key_bitly_apitoken), apikey.getText().toString());
editor.apply(); editor.apply();
} }

2
app/src/main/java/net/thauvin/erik/android/emaily/Emaily.java
View file

@ -141,7 +141,7 @@ public class Emaily extends Activity {
task = new EmailyTask("", isGd); task = new EmailyTask("", isGd);
} else { } else {
//noinspection ConstantConditions //noinspection ConstantConditions
task = new EmailyTask(getPref(R.string.prefs_key_bitly_apikey), isGd); task = new EmailyTask(getPref(R.string.prefs_key_bitly_apitoken), isGd);
} }
task.execute(intent); task.execute(intent);

4
app/src/main/java/net/thauvin/erik/android/emaily/EmailyPrefs.java
View file

@ -116,7 +116,7 @@ public class EmailyPrefs extends PreferenceActivity implements OnSharedPreferenc
@Override @Override
public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) { public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) {
if (key.equals(getString(R.string.prefs_key_bitly_apikey))) { if (key.equals(getString(R.string.prefs_key_bitly_apitoken))) {
setBitlyCredsSummary(); setBitlyCredsSummary();
} else if (key.equals(getString(R.string.prefs_key_isgd_chkbox))) { } else if (key.equals(getString(R.string.prefs_key_isgd_chkbox))) {
final boolean checked = isgdBox.isChecked(); final boolean checked = isgdBox.isChecked();
@ -133,7 +133,7 @@ public class EmailyPrefs extends PreferenceActivity implements OnSharedPreferenc
* Sets the bit.ly credentials summary. * Sets the bit.ly credentials summary.
*/ */
private void setBitlyCredsSummary() { private void setBitlyCredsSummary() {
if (Emaily.isValid(sharedPrefs.getString(getString(R.string.prefs_key_bitly_apikey), ""))) { if (Emaily.isValid(sharedPrefs.getString(getString(R.string.prefs_key_bitly_apitoken), ""))) {
bitlyCreds.setSummary(getString(R.string.prefs_bitly_creds_summary_edit)); bitlyCreds.setSummary(getString(R.string.prefs_bitly_creds_summary_edit));
} else { } else {
bitlyCreds.setSummary(getString(R.string.prefs_bitly_creds_summary_default)); bitlyCreds.setSummary(getString(R.string.prefs_bitly_creds_summary_default));

10
app/src/main/res/layout/bitlycreds.xml
View file

@ -6,21 +6,21 @@
android:paddingTop="20dip"> android:paddingTop="20dip">
<EditText <EditText
android:id="@+id/bitly_apikey_edit" android:id="@+id/bitly_accesstoken_edittext"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="20dip" android:layout_marginLeft="20dip"
android:layout_marginRight="20dip" android:layout_marginRight="20dip"
android:autofillHints="" android:autofillHints=""
android:gravity="fill_horizontal" android:gravity="fill_horizontal"
android:hint="@string/prefs_bitly_creds_apikey_hint" android:hint="@string/prefs_bitly_creds_apitoken_hint"
android:inputType="textPassword" android:inputType="textPassword"
android:key="@string/prefs_key_bitly_apikey" android:key="@string/prefs_key_bitly_apitoken"
android:scrollHorizontally="true" android:scrollHorizontally="true"
android:textAppearance="?android:attr/textAppearanceMedium" /> android:textAppearance="?android:attr/textAppearanceMedium" />
<TextView <TextView
android:id="@+id/bitly_text_fld" android:id="@+id/bitly_needtoken_textview"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="fill_parent" android:layout_height="fill_parent"
android:layout_marginTop="20dip" android:layout_marginTop="20dip"
@ -28,7 +28,7 @@
android:clickable="true" android:clickable="true"
android:focusable="true" android:focusable="true"
android:gravity="center" android:gravity="center"
android:text="@string/prefs_bitly_creds_noapi" android:text="@string/prefs_bitly_creds_needtoken"
android:textAppearance="?android:attr/textAppearanceMedium" android:textAppearance="?android:attr/textAppearanceMedium"
android:textColor="#eda712" /> android:textColor="#eda712" />
</LinearLayout> </LinearLayout>

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

@ -10,10 +10,10 @@
<string name="app_name">Emaily</string> <string name="app_name">Emaily</string>
<string name="prefs_about_title">About</string> <string name="prefs_about_title">About</string>
<string name="prefs_author_url">https://m.thauvin.net/android/</string> <string name="prefs_author_url">https://m.thauvin.net/android/</string>
<string name="prefs_bitly_creds_apikey_hint">Enter access token…</string> <string name="prefs_bitly_creds_apitoken_hint">Enter access token…</string>
<string name="prefs_bitly_creds_cancel">Cancel</string> <string name="prefs_bitly_creds_cancel">Cancel</string>
<string name="prefs_bitly_creds_dialog_title">Bitly API Access Token</string> <string name="prefs_bitly_creds_dialog_title">Bitly API Access Token</string>
<string name="prefs_bitly_creds_noapi"><u>Need an Access Token?</u></string> <string name="prefs_bitly_creds_needtoken"><u>Need an Access Token?</u></string>
<string name="prefs_bitly_creds_ok">OK</string> <string name="prefs_bitly_creds_ok">OK</string>
<string name="prefs_bitly_creds_summary_default">Enter your access token…</string> <string name="prefs_bitly_creds_summary_default">Enter your access token…</string>
<string name="prefs_bitly_creds_summary_edit">Click to edit or change…</string> <string name="prefs_bitly_creds_summary_edit">Click to edit or change…</string>
@ -30,7 +30,7 @@
<string name="prefs_help_url">http://m.thauvin.net/android/Emaily/help/</string> <string name="prefs_help_url">http://m.thauvin.net/android/Emaily/help/</string>
<string name="prefs_isgd_chkbox_title">Use as shorterner?</string> <string name="prefs_isgd_chkbox_title">Use as shorterner?</string>
<string name="prefs_isgd_title">is.gd</string> <string name="prefs_isgd_title">is.gd</string>
<string name="prefs_key_bitly_apikey">prefs_bitly_apikey</string> <string name="prefs_key_bitly_apitoken">prefs_bitly_apitoken</string>
<string name="prefs_key_bitly_creds">prefs_bitly_creds</string> <string name="prefs_key_bitly_creds">prefs_bitly_creds</string>
<string name="prefs_key_feedback">prefs_feedback</string> <string name="prefs_key_feedback">prefs_feedback</string>
<string name="prefs_key_isgd_chkbox">prefs_isgd_chkbox</string> <string name="prefs_key_isgd_chkbox">prefs_isgd_chkbox</string>