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

Moved version to last item of preferences.

Browse source 
Cleaned code in various places.
This commit is contained in:
Erik C. Thauvin 2015-04-14 20:15:55 -07:00
parent bacb75d41e
commit e77ccb2105
8 changed files with 115 additions and 74 deletions
Download patch file Download diff file Expand all files Collapse all files

4
.idea/inspectionProfiles/Project_Default.xml generated
View file

@ -33,5 +33,9 @@
<option name="IGNORE_POINT_TO_ITSELF" value="false" /> <option name="IGNORE_POINT_TO_ITSELF" value="false" />
<option name="myAdditionalJavadocTags" value="created" /> <option name="myAdditionalJavadocTags" value="created" />
</inspection_tool> </inspection_tool>
<inspection_tool class="LoggerInitializedWithForeignClass" enabled="false" level="WARNING" enabled_by_default="false">
<option name="loggerClassName" value="org.apache.log4j.Logger,org.slf4j.LoggerFactory,org.apache.commons.logging.LogFactory,java.util.logging.Logger" />
<option name="loggerFactoryMethodName" value="getLogger,getLogger,getLog,getLogger" />
</inspection_tool>
</profile> </profile>
</component> </component>

24
.idea/misc.xml generated
View file

@ -3,6 +3,30 @@
<component name="EntryPointsManager"> <component name="EntryPointsManager">
<entry_points version="2.0" /> <entry_points version="2.0" />
</component> </component>
<component name="NullableNotNullManager">
<option name="myDefaultNullable" value="org.jetbrains.annotations.Nullable" />
<option name="myDefaultNotNull" value="android.support.annotation.NonNull" />
<option name="myNullables">
<value>
<list size="4">
<item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.Nullable" />
<item index="1" class="java.lang.String" itemvalue="javax.annotation.Nullable" />
<item index="2" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.Nullable" />
<item index="3" class="java.lang.String" itemvalue="android.support.annotation.Nullable" />
</list>
</value>
</option>
<option name="myNotNulls">
<value>
<list size="4">
<item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.NotNull" />
<item index="1" class="java.lang.String" itemvalue="javax.annotation.Nonnull" />
<item index="2" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.NonNull" />
<item index="3" class="java.lang.String" itemvalue="android.support.annotation.NonNull" />
</list>
</value>
</option>
</component>
<component name="ProjectLevelVcsManager" settingsEditedManually="false"> <component name="ProjectLevelVcsManager" settingsEditedManually="false">
<OptionsSetting value="true" id="Add" /> <OptionsSetting value="true" id="Add" />
<OptionsSetting value="true" id="Remove" /> <OptionsSetting value="true" id="Remove" />

1
app/app.iml
View file

@ -89,6 +89,7 @@
<orderEntry type="library" exported="" name="gson-2.1" level="project" /> <orderEntry type="library" exported="" name="gson-2.1" level="project" />
<orderEntry type="library" exported="" name="protobuf-java-2.2.0" level="project" /> <orderEntry type="library" exported="" name="protobuf-java-2.2.0" level="project" />
<orderEntry type="library" exported="" name="google-http-client-1.7.0-beta" level="project" /> <orderEntry type="library" exported="" name="google-http-client-1.7.0-beta" level="project" />
<orderEntry type="library" exported="" name="support-annotations-20.0.0" level="project" />
<orderEntry type="library" exported="" name="google-api-client-1.7.0-beta" level="project" /> <orderEntry type="library" exported="" name="google-api-client-1.7.0-beta" level="project" />
<orderEntry type="library" exported="" name="bitlyj-2.0.0" level="project" /> <orderEntry type="library" exported="" name="bitlyj-2.0.0" level="project" />
<orderEntry type="library" exported="" name="google-http-client-android2-1.7.0-beta" level="project" /> <orderEntry type="library" exported="" name="google-http-client-android2-1.7.0-beta" level="project" />

3
app/build.gradle
View file

@ -9,7 +9,7 @@ android {
minSdkVersion 14 minSdkVersion 14
targetSdkVersion 22 targetSdkVersion 22
versionCode 2 versionCode 2
versionName "1.1b9" versionName "1.1b10"
} }
buildTypes { buildTypes {
release { release {
@ -28,4 +28,5 @@ android {
dependencies { dependencies {
compile fileTree(dir: 'libs', include: ['*.jar']) compile fileTree(dir: 'libs', include: ['*.jar'])
//compile 'com.android.support:appcompat-v7:22.0.0' //compile 'com.android.support:appcompat-v7:22.0.0'
compile 'com.android.support:support-annotations:20.0.0'
} }

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

@ -33,6 +33,7 @@
*/ */
package net.thauvin.erik.android.emaily; package net.thauvin.erik.android.emaily;
import android.annotation.SuppressLint;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.content.SharedPreferences; import android.content.SharedPreferences;
@ -43,6 +44,7 @@ import android.util.AttributeSet;
import android.view.View; import android.view.View;
import android.widget.EditText; import android.widget.EditText;
import android.widget.TextView; import android.widget.TextView;
import android.support.annotation.NonNull;
/** /**
* The <code>BitlyCredsDialog</code> class implements a bit.ly credential dialog. * The <code>BitlyCredsDialog</code> class implements a bit.ly credential dialog.
@ -53,53 +55,54 @@ import android.widget.TextView;
*/ */
public class BitlyCredsDialog extends DialogPreference public class BitlyCredsDialog extends DialogPreference
{ {
private final Context mContext; private final Context context;
private EditText username; private EditText username;
private EditText apikey; private EditText apikey;
public BitlyCredsDialog(Context context, AttributeSet attrs) public BitlyCredsDialog(Context context, AttributeSet attrs)
{ {
super(context, attrs); super(context, attrs);
mContext = context; this.context = context;
setPersistent(false); setPersistent(false);
} }
@Override @Override
protected void onBindDialogView(View view) protected void onBindDialogView(@NonNull View view)
{ {
super.onBindDialogView(view); super.onBindDialogView(view);
final SharedPreferences sharedPrefs = getSharedPreferences(); final SharedPreferences sharedPrefs = getSharedPreferences();
username = (EditText) view.findViewById(R.id.bitly_username_edit); username = (EditText) view.findViewById(R.id.bitly_username_edit);
apikey = (EditText) view.findViewById(R.id.bitly_apikey_edit); apikey = (EditText) view.findViewById(R.id.bitly_apikey_edit);
final TextView textFld = (TextView) view.findViewById(R.id.bitly_text_fld); final TextView textFld = (TextView) view.findViewById(R.id.bitly_text_fld);
username.setText(sharedPrefs.getString(mContext.getString(R.string.prefs_key_bitly_username), "")); username.setText(sharedPrefs.getString(context.getString(R.string.prefs_key_bitly_username), ""));
apikey.setText(sharedPrefs.getString(mContext.getString(R.string.prefs_key_bitly_apikey), "")); apikey.setText(sharedPrefs.getString(context.getString(R.string.prefs_key_bitly_apikey), ""));
textFld.setOnClickListener(new View.OnClickListener() textFld.setOnClickListener(new View.OnClickListener()
{ {
public void onClick(View v) public void onClick(View v)
{ {
final Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(mContext.getString(R.string.prefs_bitly_creds_url))); final Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(context.getString(R.string.prefs_bitly_creds_url)));
mContext.startActivity(intent); context.startActivity(intent);
} }
}); });
} }
@Override @SuppressLint("CommitPrefEdits")
protected void onDialogClosed(boolean positiveResult) @Override
{ protected void onDialogClosed(boolean positiveResult)
super.onDialogClosed(positiveResult); {
super.onDialogClosed(positiveResult);
if (positiveResult) if (positiveResult)
{ {
final SharedPreferences sharedPrefs = getSharedPreferences(); final SharedPreferences sharedPrefs = getSharedPreferences();
final Editor editor = sharedPrefs.edit(); final Editor editor = sharedPrefs.edit();
editor.putString(mContext.getString(R.string.prefs_key_bitly_username), username.getText().toString()); editor.putString(context.getString(R.string.prefs_key_bitly_username), username.getText().toString());
editor.putString(mContext.getString(R.string.prefs_key_bitly_apikey), apikey.getText().toString()); editor.putString(context.getString(R.string.prefs_key_bitly_apikey), apikey.getText().toString());
editor.commit(); editor.commit();
} }
} }
} }

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

@ -47,6 +47,7 @@ import android.accounts.AccountManager;
import android.accounts.AccountManagerCallback; import android.accounts.AccountManagerCallback;
import android.accounts.AccountManagerFuture; import android.accounts.AccountManagerFuture;
import android.accounts.OperationCanceledException; import android.accounts.OperationCanceledException;
import android.annotation.SuppressLint;
import android.app.Activity; import android.app.Activity;
import android.app.AlertDialog; import android.app.AlertDialog;
import android.app.ProgressDialog; import android.app.ProgressDialog;
@ -84,7 +85,6 @@ import com.google.api.services.urlshortener.model.Url;
* @created Oct 11, 2011 * @created Oct 11, 2011
* @since 1.0 * @since 1.0
*/ */
@SuppressWarnings("deprecation")
public class Emaily extends Activity public class Emaily extends Activity
{ {
private static final String ACCOUNT_TYPE = "com.google"; private static final String ACCOUNT_TYPE = "com.google";
@ -93,6 +93,7 @@ public class Emaily extends Activity
private String appName; private String appName;
private SharedPreferences sharedPrefs; private SharedPreferences sharedPrefs;
@SuppressLint("CommitPrefEdits")
@Override @Override
public void onCreate(Bundle savedInstanceState) public void onCreate(Bundle savedInstanceState)
{ {
@ -158,12 +159,14 @@ public class Emaily extends Activity
} }
else else
{ {
//noinspection ConstantConditions
startEmailyTask(intent, isGoogl, false); startEmailyTask(intent, isGoogl, false);
} }
} }
} }
else else
{ {
//noinspection ConstantConditions
startEmailyTask(intent, isGoogl, false); startEmailyTask(intent, isGoogl, false);
} }
} }
@ -187,11 +190,13 @@ public class Emaily extends Activity
if (isGoogl) if (isGoogl)
{ {
//noinspection ConstantConditions
task = new EmailyTask(getPref(R.string.prefs_key_googl_account), getPref(R.string.prefs_key_googl_token), isGoogl, task = new EmailyTask(getPref(R.string.prefs_key_googl_account), getPref(R.string.prefs_key_googl_token), isGoogl,
getBoolPref(R.string.prefs_key_html_chkbox), isRetry); getBoolPref(R.string.prefs_key_html_chkbox), isRetry);
} }
else else
{ {
//noinspection ConstantConditions
task = new EmailyTask(getPref(R.string.prefs_key_bitly_username), getPref(R.string.prefs_key_bitly_apikey), isGoogl, task = new EmailyTask(getPref(R.string.prefs_key_bitly_username), getPref(R.string.prefs_key_bitly_apikey), isGoogl,
getBoolPref(R.string.prefs_key_html_chkbox), isRetry); getBoolPref(R.string.prefs_key_html_chkbox), isRetry);
} }
@ -229,6 +234,7 @@ public class Emaily extends Activity
googleAccountManager.manager.getAuthToken(account, OAUTH_URL, null, Emaily.this, new AccountManagerCallback<Bundle>() googleAccountManager.manager.getAuthToken(account, OAUTH_URL, null, Emaily.this, new AccountManagerCallback<Bundle>()
{ {
@SuppressLint("CommitPrefEdits")
@Override @Override
public void run(AccountManagerFuture<Bundle> future) public void run(AccountManagerFuture<Bundle> future)
{ {
@ -276,7 +282,8 @@ public class Emaily extends Activity
* *
* @param intent The original intent. * @param intent The original intent.
*/ */
public void retry(final Intent intent) @SuppressLint("CommitPrefEdits")
private void retry(final Intent intent)
{ {
sharedPrefs.edit().putLong(getString(R.string.prefs_key_googl_token_expiry), 0L).commit(); sharedPrefs.edit().putLong(getString(R.string.prefs_key_googl_token_expiry), 0L).commit();
@ -300,7 +307,7 @@ public class Emaily extends Activity
* @param id The string id. * @param id The string id.
* @return The preference value. * @return The preference value.
*/ */
public String getPref(int id) private String getPref(int id)
{ {
return getPref(id, ""); return getPref(id, "");
} }
@ -312,7 +319,7 @@ public class Emaily extends Activity
* @param defaultValue The default value, used if the preference is empty. * @param defaultValue The default value, used if the preference is empty.
* @return The preference value. * @return The preference value.
*/ */
public String getPref(int id, String defaultValue) private String getPref(int id, String defaultValue)
{ {
return sharedPrefs.getString(getString(id), defaultValue); return sharedPrefs.getString(getString(id), defaultValue);
} }
@ -323,7 +330,7 @@ public class Emaily extends Activity
* @param id The string id. * @param id The string id.
* @return The preference value. * @return The preference value.
*/ */
public boolean getBoolPref(int id) private boolean getBoolPref(int id)
{ {
return getBoolPref(id, false); return getBoolPref(id, false);
} }
@ -335,7 +342,7 @@ public class Emaily extends Activity
* @param defaultValue The default value, used if the preference is empty. * @param defaultValue The default value, used if the preference is empty.
* @return The preference value. * @return The preference value.
*/ */
public boolean getBoolPref(int id, boolean defaultValue) private boolean getBoolPref(int id, boolean defaultValue)
{ {
return sharedPrefs.getBoolean(getString(id), defaultValue); return sharedPrefs.getBoolean(getString(id), defaultValue);
} }
@ -572,6 +579,7 @@ public class Emaily extends Activity
{ {
if (!result.hasError() && shortUrl.length() > 0) if (!result.hasError() && shortUrl.length() > 0)
{ {
@SuppressWarnings("deprecation")
final ClipboardManager clip = (ClipboardManager) getSystemService(Context.CLIPBOARD_SERVICE); final ClipboardManager clip = (ClipboardManager) getSystemService(Context.CLIPBOARD_SERVICE);
clip.setText(shortUrl); clip.setText(shortUrl);

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

@ -35,6 +35,7 @@ package net.thauvin.erik.android.emaily;
import java.util.Locale; import java.util.Locale;
import android.annotation.SuppressLint;
import android.content.SharedPreferences; import android.content.SharedPreferences;
import android.content.SharedPreferences.Editor; import android.content.SharedPreferences.Editor;
import android.content.SharedPreferences.OnSharedPreferenceChangeListener; import android.content.SharedPreferences.OnSharedPreferenceChangeListener;
@ -58,10 +59,9 @@ import android.preference.PreferenceScreen;
public class EmailyPrefs extends PreferenceActivity implements OnSharedPreferenceChangeListener public class EmailyPrefs extends PreferenceActivity implements OnSharedPreferenceChangeListener
{ {
private SharedPreferences sharedPrefs; private SharedPreferences sharedPrefs;
private Editor prefsEditor;
private CheckBoxPreference mGooglBox; private CheckBoxPreference googlBox;
private BitlyCredsDialog mBitlyCreds; private BitlyCredsDialog bitlyCreds;
@Override @Override
public void onCreate(Bundle savedInstanceState) public void onCreate(Bundle savedInstanceState)
@ -71,17 +71,16 @@ public class EmailyPrefs extends PreferenceActivity implements OnSharedPreferenc
addPreferencesFromResource(R.xml.prefs); addPreferencesFromResource(R.xml.prefs);
sharedPrefs = getPreferenceScreen().getSharedPreferences(); sharedPrefs = getPreferenceScreen().getSharedPreferences();
prefsEditor = sharedPrefs.edit();
mGooglBox = (CheckBoxPreference) findPreference(getString(R.string.prefs_key_googl_chkbox)); googlBox = (CheckBoxPreference) findPreference(getString(R.string.prefs_key_googl_chkbox));
mBitlyCreds = (BitlyCredsDialog) findPreference(getString(R.string.prefs_key_bitly_creds)); bitlyCreds = (BitlyCredsDialog) findPreference(getString(R.string.prefs_key_bitly_creds));
setSummary(mBitlyCreds, getString(R.string.prefs_key_bitly_username), getString(R.string.prefs_bitly_creds_summary)); setSummary(bitlyCreds, getString(R.string.prefs_key_bitly_username), getString(R.string.prefs_bitly_creds_summary));
setSummary(mGooglBox, getString(R.string.prefs_key_googl_account), ""); setSummary(googlBox, getString(R.string.prefs_key_googl_account), "");
if (mGooglBox.isChecked()) if (googlBox.isChecked())
{ {
mBitlyCreds.setEnabled(false); bitlyCreds.setEnabled(false);
} }
final Preference version = findPreference(getString(R.string.prefs_key_version)); final Preference version = findPreference(getString(R.string.prefs_key_version));
@ -120,29 +119,31 @@ public class EmailyPrefs extends PreferenceActivity implements OnSharedPreferenc
sharedPrefs.unregisterOnSharedPreferenceChangeListener(this); sharedPrefs.unregisterOnSharedPreferenceChangeListener(this);
} }
@SuppressLint("CommitPrefEdits")
@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_username))) if (key.equals(getString(R.string.prefs_key_bitly_username)))
{ {
setSummary(mBitlyCreds, key, getString(R.string.prefs_bitly_creds_summary)); setSummary(bitlyCreds, key, getString(R.string.prefs_bitly_creds_summary));
} }
else if (key.equals(getString(R.string.prefs_key_googl_chkbox))) else if (key.equals(getString(R.string.prefs_key_googl_chkbox)))
{ {
final boolean checked = mGooglBox.isChecked(); final boolean checked = googlBox.isChecked();
mBitlyCreds.setEnabled(!checked); bitlyCreds.setEnabled(!checked);
prefsEditor.putBoolean(getString(R.string.prefs_key_googl_enabled), checked); final Editor editor = sharedPrefs.edit();
editor.putBoolean(getString(R.string.prefs_key_googl_enabled), checked);
if (!checked) if (!checked)
{ {
prefsEditor.putString(getString(R.string.prefs_key_googl_account), ""); editor.putString(getString(R.string.prefs_key_googl_account), "");
prefsEditor.putLong(getString(R.string.prefs_key_googl_token_expiry), 0L); editor.putLong(getString(R.string.prefs_key_googl_token_expiry), 0L);
mGooglBox.setSummary(""); googlBox.setSummary("");
} }
prefsEditor.commit(); editor.commit();
} }
} }

13
app/src/main/res/xml/prefs.xml
View file

@ -25,13 +25,6 @@
android:title="@string/prefs_html_chkbox_title"/> android:title="@string/prefs_html_chkbox_title"/>
</PreferenceCategory> </PreferenceCategory>
<PreferenceCategory android:title="@string/prefs_about_title"> <PreferenceCategory android:title="@string/prefs_about_title">
<Preference
android:enabled="false"
android:key="@string/prefs_key_version"
android:singleLine="true"
android:summary="@string/prefs_copyright"
android:title="@string/prefs_version_title"/>
<PreferenceScreen <PreferenceScreen
android:summary="@string/prefs_help_summary" android:summary="@string/prefs_help_summary"
android:title="@string/prefs_help_title"> android:title="@string/prefs_help_title">
@ -47,6 +40,12 @@
android:action="android.intent.action.VIEW" android:action="android.intent.action.VIEW"
android:data="@string/prefs_feedback_url"/> android:data="@string/prefs_feedback_url"/>
</PreferenceScreen> </PreferenceScreen>
<Preference
android:enabled="false"
android:key="@string/prefs_key_version"
android:singleLine="true"
android:summary="@string/prefs_copyright"
android:title="@string/prefs_version_title"/>
</PreferenceCategory> </PreferenceCategory>
</PreferenceScreen> </PreferenceScreen>