+
+
BitlyCredsDialog class implements a bit.ly credential dialog.
*
* @author Erik C. Thauvin
- * @created March 28, 2012
* @since 1.0
*/
public class BitlyCredsDialog extends DialogPreference
{
private final Context context;
- private EditText username;
private EditText apikey;
public BitlyCredsDialog(Context context, AttributeSet attrs)
@@ -67,17 +62,15 @@ public class BitlyCredsDialog extends DialogPreference
}
@Override
- protected void onBindDialogView(@NonNull View view)
+ protected void onBindDialogView(View view)
{
super.onBindDialogView(view);
final SharedPreferences sharedPrefs = getSharedPreferences();
- username = (EditText) view.findViewById(R.id.bitly_username_edit);
- apikey = (EditText) view.findViewById(R.id.bitly_apikey_edit);
- final TextView textFld = (TextView) view.findViewById(R.id.bitly_text_fld);
+ apikey = view.findViewById(R.id.bitly_accesstoken_edittext);
+ final TextView textFld = view.findViewById(R.id.bitly_needtoken_textview);
- username.setText(sharedPrefs.getString(context.getString(R.string.prefs_key_bitly_username), ""));
- 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()
{
@@ -99,9 +92,9 @@ public class BitlyCredsDialog extends DialogPreference
{
final SharedPreferences sharedPrefs = getSharedPreferences();
final Editor editor = sharedPrefs.edit();
- editor.putString(context.getString(R.string.prefs_key_bitly_username), username.getText().toString());
- editor.putString(context.getString(R.string.prefs_key_bitly_apikey), apikey.getText().toString());
- editor.commit();
+
+ editor.putString(context.getString(R.string.prefs_key_bitly_apitoken), apikey.getText().toString());
+ editor.apply();
}
}
diff --git a/app/src/main/java/net/thauvin/erik/android/emaily/Emaily.java b/app/src/main/java/net/thauvin/erik/android/emaily/Emaily.java
index 727a865..877c755 100644
--- a/app/src/main/java/net/thauvin/erik/android/emaily/Emaily.java
+++ b/app/src/main/java/net/thauvin/erik/android/emaily/Emaily.java
@@ -1,95 +1,64 @@
/*
- * @(#)Emaily.java
+ * Emaily.java
*
- * Copyright (c) 2011-2015 Erik C. Thauvin (http://erik.thauvin.net/)
+ * Copyright (c) 2011-2020, Erik C. Thauvin (erik@thauvin.net)
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
+ * modification, are permitted provided that the following conditions are met:
*
- * Redistributions of source code must retain the above copyright notice,
- * this list of conditions and the following disclaimer.
+ * Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
*
- * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following disclaimer in the documentation
- * and/or other materials provided with the distribution.
+ * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
*
- * Neither the name of the authors nor the names of its contributors may be
- * used to endorse or promote products derived from this software without
- * specific prior written permission.
+ * Neither the name of this project nor the names of its contributors may be
+ * used to endorse or promote products derived from this software without
+ * specific prior written permission.
*
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
- * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
package net.thauvin.erik.android.emaily;
-import android.accounts.Account;
-import android.accounts.AccountManager;
-import android.accounts.AccountManagerCallback;
-import android.accounts.AccountManagerFuture;
-import android.accounts.OperationCanceledException;
import android.annotation.SuppressLint;
import android.app.Activity;
import android.app.AlertDialog;
import android.app.ProgressDialog;
import android.content.Context;
-import android.content.DialogInterface;
import android.content.Intent;
import android.content.SharedPreferences;
-import android.content.SharedPreferences.Editor;
-import android.content.pm.PackageManager.NameNotFoundException;
import android.os.AsyncTask;
import android.os.Bundle;
import android.preference.PreferenceManager;
import android.text.ClipboardManager;
-import android.text.Html;
import android.util.Log;
import android.widget.Toast;
-import com.google.api.client.googleapis.extensions.android2.auth.GoogleAccountManager;
-import com.google.api.client.googleapis.json.GoogleJsonError;
-import com.google.api.client.googleapis.json.GoogleJsonResponseException;
-import com.google.api.client.http.HttpTransport;
-import com.google.api.client.http.javanet.NetHttpTransport;
-import com.google.api.client.http.json.JsonHttpRequest;
-import com.google.api.client.http.json.JsonHttpRequestInitializer;
-import com.google.api.client.json.JsonFactory;
-import com.google.api.client.json.jackson.JacksonFactory;
-import com.google.api.services.urlshortener.Urlshortener;
-import com.google.api.services.urlshortener.UrlshortenerRequest;
-import com.google.api.services.urlshortener.model.Url;
+import net.thauvin.erik.bitly.Bitlinks;
+import net.thauvin.erik.isgd.Isgd;
-import java.io.IOException;
import java.net.MalformedURLException;
import java.net.URL;
import java.net.UnknownHostException;
-import java.util.Date;
-
-import static com.rosaloves.bitlyj.Bitly.as;
-import static com.rosaloves.bitlyj.Bitly.shorten;
/**
* The Emaily class implements a URL shortener intent.
*
* @author Erik C. Thauvin
- * @created Oct 11, 2011
* @since 1.0
*/
-public class Emaily extends Activity
-{
- private static final String ACCOUNT_TYPE = "com.google";
- private static final String OAUTH_URL = "oauth2:https://www.googleapis.com/auth/urlshortener";
-
+public class Emaily extends Activity {
private String appName;
private SharedPreferences sharedPrefs;
@@ -97,218 +66,34 @@ public class Emaily extends Activity
* Validates a string.
*
* @param s The string to validate.
- * @return returns true if the string is not empty or null, false otherwise.
+ * @return returns true if the string is not empty or null, false
+ * otherwise.
*/
- public static boolean isValid(String s)
- {
+ public static boolean isValid(String s) {
return (s != null) && (!s.trim().isEmpty());
}
- @SuppressLint("CommitPrefEdits")
- @Override
- public void onCreate(Bundle savedInstanceState)
- {
- super.onCreate(savedInstanceState);
-
- final Intent intent = getIntent();
-
- appName = getString(R.string.app_name);
- sharedPrefs = PreferenceManager.getDefaultSharedPreferences(this);
-
- if (Intent.ACTION_SEND.equals(intent.getAction()))
- {
- final boolean isGoogl = getBoolPref(R.string.prefs_key_googl_enabled, true);
-
- if (isGoogl)
- {
- final String account = getPref(R.string.prefs_key_googl_account);
-
- if (isValid(account))
- {
- startEmailyTask(intent, new Account(account, ACCOUNT_TYPE), false);
- }
- else
- {
- final AlertDialog.Builder builder = new AlertDialog.Builder(this, AlertDialog.THEME_DEVICE_DEFAULT_LIGHT);
- builder.setTitle(R.string.dialog_accounts_title);
-
- final Account[] accounts = AccountManager.get(this).getAccountsByType(ACCOUNT_TYPE);
- final int size = accounts.length;
- if (size > 0)
- {
- if (size == 1)
- {
- startEmailyTask(intent, accounts[0], false);
- }
- else
- {
- final CharSequence[] names = new CharSequence[size];
- for (int i = 0; i < size; i++)
- {
- names[i] = accounts[i].name;
- }
-
- builder.setSingleChoiceItems(names, 0, new DialogInterface.OnClickListener()
- {
- @Override
- public void onClick(DialogInterface dialog, int which)
- {
- dialog.dismiss();
-
- final Editor editor = sharedPrefs.edit();
- editor.putString(getString(R.string.prefs_key_googl_account), names[which].toString());
- editor.putLong(getString(R.string.prefs_key_googl_token_expiry), 0L);
- editor.commit();
-
- startEmailyTask(intent, accounts[which], false);
- }
-
- });
-
- builder.create().show();
- }
- }
- else
- {
- //noinspection ConstantConditions
- startEmailyTask(intent, isGoogl, false);
- }
- }
- }
- else
- {
- //noinspection ConstantConditions
- startEmailyTask(intent, isGoogl, false);
- }
- }
- else
- {
- Emaily.this.finish();
- }
-
- }
-
/**
- * Starts the task.
+ * Returns the value of the specified shared reference based on the specified string id.
*
- * @param intent The original intent.
- * @param isGoogl The goo.gl flag.
- * @param isRetry The retry flag.
+ * @param id The string id.
+ * @param defaultValue The default value, used if the preference is empty.
+ * @return The preference value.
*/
- private void startEmailyTask(final Intent intent, final boolean isGoogl, final boolean isRetry)
- {
- final EmailyTask task;
-
- if (isGoogl)
- {
- //noinspection ConstantConditions
- 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);
- }
- else
- {
- //noinspection ConstantConditions
- 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);
- }
-
- task.execute(intent);
+ @SuppressWarnings("SameParameterValue")
+ private boolean getBoolPref(int id, boolean defaultValue) {
+ return sharedPrefs.getBoolean(getString(id), defaultValue);
}
/**
- * Starts the task.
- *
- * @param intent The original intent.
- * @param account The account.
- * @param isRetry The retry flag.
- */
- private void startEmailyTask(final Intent intent, final Account account, final boolean isRetry)
- {
- final GoogleAccountManager googleAccountManager = new GoogleAccountManager(Emaily.this);
-
- final long expiry = sharedPrefs.getLong(getString(R.string.prefs_key_googl_token_expiry), 0L);
- final long now = System.currentTimeMillis();
- final long maxLife = (60L * 55L) * 1000L; // 55 minutes
-
- Log.d(appName, "Token Expires: " + new Date(expiry));
-
- if (expiry >= (now + maxLife) || expiry <= now)
- {
- final String token = getPref(R.string.prefs_key_googl_token);
- if (isValid(token))
- {
- googleAccountManager.manager.invalidateAuthToken(ACCOUNT_TYPE, token);
-
- Log.d(appName, "Token Invalidated: " + token);
- }
- }
-
- googleAccountManager.manager.getAuthToken(account, OAUTH_URL, null, Emaily.this, new AccountManagerCallbackfalse.
- *
- * @param id The string id.
- * @return The preference value.
- */
- private boolean getBoolPref(int id)
- {
- return getBoolPref(id, false);
+ @Override
+ public void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+
+ final Intent intent = getIntent();
+
+ appName = getString(R.string.app_name);
+ sharedPrefs = PreferenceManager.getDefaultSharedPreferences(this);
+
+ if (Intent.ACTION_SEND.equals(intent.getAction())) {
+ final boolean isGd = getBoolPref(R.string.prefs_key_isgd_enabled, true);
+ startEmailyTask(intent, isGd);
+ } else {
+ Emaily.this.finish();
+ }
+
}
/**
- * Returns the value of the specified shared reference based on the specified string id.
+ * Starts the task.
*
- * @param id The string id.
- * @param defaultValue The default value, used if the preference is empty.
- * @return The preference value.
+ * @param intent The original intent.
+ * @param isGd The is.gd flag.
*/
- private boolean getBoolPref(int id, boolean defaultValue)
- {
- return sharedPrefs.getBoolean(getString(id), defaultValue);
+ private void startEmailyTask(final Intent intent, final boolean isGd) {
+ final EmailyTask task;
+
+ if (isGd) {
+ //noinspection ConstantConditions
+ task = new EmailyTask("", isGd);
+ } else {
+ //noinspection ConstantConditions
+ task = new EmailyTask(getPref(R.string.prefs_key_bitly_apitoken), isGd);
+ }
+
+ task.execute(intent);
+ }
+
+
+ /**
+ * The EmailyResult class.
+ */
+ private static class EmailyResult {
+ private final Intent intent;
+ private int code = 0;
+ private String message;
+
+ public EmailyResult(Intent intent) {
+ this.intent = intent;
+ }
+
+ public int getCode() {
+ return code;
+ }
+
+ @SuppressWarnings("unused")
+ public Intent getIntent() {
+ return intent;
+ }
+
+ public String getMessage() {
+ if (isValid(message)) {
+ return message;
+ } else {
+ return "";
+ }
+ }
+
+ public boolean hasError() {
+ return code != 0;
+ }
+
+ public void setCode(int code) {
+ this.code = code;
+ }
+
+ public void setMessage(String message) {
+ this.message = message;
+ }
}
/**
* The EmailyTask class.
*/
- private class EmailyTask extends AsyncTaskEmailyResult class.
- */
- private class EmailyResult
- {
- private final Intent intent;
- private int code = 0;
- private String message;
- private boolean retry = false;
-
- public EmailyResult(Intent intent)
- {
- this.intent = intent;
- }
-
- public int getCode()
- {
- return code;
- }
-
- public void setCode(int code)
- {
- this.code = code;
- }
-
- public String getMessage()
- {
- if (isValid(message))
- {
- return message;
- }
- else
- {
- return "";
- }
- }
-
- public void setMessage(String message)
- {
- this.message = message;
- }
-
- public Intent getIntent()
- {
- return intent;
- }
-
- public boolean hasError()
- {
- return code != 0;
- }
-
- public boolean isRetry()
- {
- return retry;
- }
-
- public void setRetry(boolean retry)
- {
- this.retry = retry;
- }
- }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/net/thauvin/erik/android/emaily/EmailyPrefs.java b/app/src/main/java/net/thauvin/erik/android/emaily/EmailyPrefs.java
index 54b6a93..9a5b94e 100644
--- a/app/src/main/java/net/thauvin/erik/android/emaily/EmailyPrefs.java
+++ b/app/src/main/java/net/thauvin/erik/android/emaily/EmailyPrefs.java
@@ -1,40 +1,36 @@
/*
- * @(#)EmailyPrefs.java
+ * EmailyPrefs.java
*
- * Copyright (c) 2011-2015 Erik C. Thauvin (http://erik.thauvin.net/)
+ * Copyright (c) 2011-2020, Erik C. Thauvin (erik@thauvin.net)
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
+ * modification, are permitted provided that the following conditions are met:
*
- * Redistributions of source code must retain the above copyright notice,
- * this list of conditions and the following disclaimer.
+ * Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
*
- * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following disclaimer in the documentation
- * and/or other materials provided with the distribution.
+ * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
*
- * Neither the name of the authors nor the names of its contributors may be
- * used to endorse or promote products derived from this software without
- * specific prior written permission.
+ * Neither the name of this project nor the names of its contributors may be
+ * used to endorse or promote products derived from this software without
+ * specific prior written permission.
*
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
- * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
package net.thauvin.erik.android.emaily;
-import java.util.Locale;
-
import android.annotation.SuppressLint;
import android.content.SharedPreferences;
import android.content.SharedPreferences.Editor;
@@ -43,128 +39,104 @@ import android.content.pm.PackageManager.NameNotFoundException;
import android.net.Uri;
import android.os.Build;
import android.os.Bundle;
-import android.preference.CheckBoxPreference;
import android.preference.Preference;
import android.preference.PreferenceActivity;
import android.preference.PreferenceScreen;
+import android.preference.SwitchPreference;
+
+import java.util.Locale;
/**
* The EmailyPrefs class implements a preferences screen.
- *
+ *
* @author Erik C. Thauvin
- * @created Oct 11, 2011
* @since 1.0
*/
+@SuppressLint("ExportedPreferenceActivity")
@SuppressWarnings("deprecation")
-public class EmailyPrefs extends PreferenceActivity implements OnSharedPreferenceChangeListener
-{
- private SharedPreferences sharedPrefs;
+public class EmailyPrefs extends PreferenceActivity implements OnSharedPreferenceChangeListener {
+ private BitlyCredsDialog bitlyCreds;
+ private SwitchPreference isgdBox;
+ private SharedPreferences sharedPrefs;
- private CheckBoxPreference googlBox;
- private BitlyCredsDialog bitlyCreds;
+ @Override
+ public void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
- @Override
- public void onCreate(Bundle savedInstanceState)
- {
- super.onCreate(savedInstanceState);
+ addPreferencesFromResource(R.xml.prefs);
- addPreferencesFromResource(R.xml.prefs);
+ sharedPrefs = getPreferenceScreen().getSharedPreferences();
- sharedPrefs = getPreferenceScreen().getSharedPreferences();
+ isgdBox = (SwitchPreference) findPreference(getString(R.string.prefs_key_isgd_chkbox));
+ bitlyCreds = (BitlyCredsDialog) findPreference(getString(R.string.prefs_key_bitly_creds));
- googlBox = (CheckBoxPreference) findPreference(getString(R.string.prefs_key_googl_chkbox));
- bitlyCreds = (BitlyCredsDialog) findPreference(getString(R.string.prefs_key_bitly_creds));
+ setBitlyCredsSummary();
- setSummary(bitlyCreds, getString(R.string.prefs_key_bitly_username), getString(R.string.prefs_bitly_creds_summary));
- setSummary(googlBox, getString(R.string.prefs_key_googl_account), "");
+ if (isgdBox.isChecked()) {
+ bitlyCreds.setEnabled(false);
+ }
- if (googlBox.isChecked())
- {
- bitlyCreds.setEnabled(false);
- }
+ final Preference version = findPreference(getString(R.string.prefs_key_version));
+ final PreferenceScreen feedback =
+ (PreferenceScreen) findPreference(getString(R.string.prefs_key_feedback));
+ try {
+ final String vNumber =
+ getPackageManager().getPackageInfo(getPackageName(), 0).versionName;
- final Preference version = findPreference(getString(R.string.prefs_key_version));
- final PreferenceScreen feedback = (PreferenceScreen) findPreference(getString(R.string.prefs_key_feedback));
- try
- {
- final String vNumber = getPackageManager().getPackageInfo(getPackageName(), 0).versionName;
+ version.setTitle(getString(R.string.prefs_version_title) + ' ' + vNumber);
- version.setTitle(getString(R.string.prefs_version_title) + ' ' + vNumber);
+ feedback.getIntent().setData(
+ Uri.parse(getString(R.string.prefs_feedback_url)
+ + "?subject="
+ + getString(R.string.prefs_feedback_subject,
+ getString(R.string.app_name),
+ vNumber,
+ getString(R.string.prefs_feedback_title)
+ .toLowerCase(Locale.getDefault()),
+ Build.MANUFACTURER,
+ Build.PRODUCT,
+ Build.VERSION.RELEASE)));
- feedback.getIntent().setData(
- Uri.parse(getString(R.string.prefs_feedback_url)
- + "?subject="
- + getString(R.string.prefs_feedback_subject, getString(R.string.app_name), vNumber,
- getString(R.string.prefs_feedback_title).toLowerCase(Locale.getDefault()), Build.MANUFACTURER,
- Build.PRODUCT, Build.VERSION.RELEASE)));
+ } catch (NameNotFoundException ignore) {
+ // Do nothing.
+ }
+ }
- }
- catch (NameNotFoundException ignore)
- {
- // Do nothing.
- }
- }
+ @Override
+ protected void onResume() {
+ super.onResume();
+ sharedPrefs.registerOnSharedPreferenceChangeListener(this);
+ }
- @Override
- protected void onResume()
- {
- super.onResume();
- sharedPrefs.registerOnSharedPreferenceChangeListener(this);
- }
+ @Override
+ protected void onPause() {
+ super.onPause();
+ sharedPrefs.unregisterOnSharedPreferenceChangeListener(this);
+ }
- @Override
- protected void onPause()
- {
- super.onPause();
- sharedPrefs.unregisterOnSharedPreferenceChangeListener(this);
- }
+ @Override
+ public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) {
+ if (key.equals(getString(R.string.prefs_key_bitly_apitoken))) {
+ setBitlyCredsSummary();
+ } else if (key.equals(getString(R.string.prefs_key_isgd_chkbox))) {
+ final boolean checked = isgdBox.isChecked();
- @SuppressLint("CommitPrefEdits")
- @Override
- public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key)
- {
- if (key.equals(getString(R.string.prefs_key_bitly_username)))
- {
- setSummary(bitlyCreds, key, getString(R.string.prefs_bitly_creds_summary));
- }
- else if (key.equals(getString(R.string.prefs_key_googl_chkbox)))
- {
- final boolean checked = googlBox.isChecked();
+ bitlyCreds.setEnabled(!checked);
- bitlyCreds.setEnabled(!checked);
+ final Editor editor = sharedPrefs.edit();
+ editor.putBoolean(getString(R.string.prefs_key_isgd_enabled), checked);
+ editor.apply();
+ }
+ }
- final Editor editor = sharedPrefs.edit();
- editor.putBoolean(getString(R.string.prefs_key_googl_enabled), checked);
-
- if (!checked)
- {
- editor.putString(getString(R.string.prefs_key_googl_account), "");
- editor.putLong(getString(R.string.prefs_key_googl_token_expiry), 0L);
- googlBox.setSummary("");
- }
-
- editor.commit();
- }
- }
-
- /**
- * Sets a preference's summary.
- *
- * @param editPref The preference.
- * @param key The preference key.
- * @param defValue The default value.
- */
- private void setSummary(Preference editPref, String key, String defValue)
- {
- final String value = sharedPrefs.getString(key, defValue);
-
- if (Emaily.isValid(value))
- {
- editPref.setSummary(value);
- }
- else
- {
- editPref.setSummary(defValue);
- }
- }
+ /**
+ * Sets the bit.ly credentials summary.
+ */
+ private void setBitlyCredsSummary() {
+ if (Emaily.isValid(sharedPrefs.getString(getString(R.string.prefs_key_bitly_apitoken), ""))) {
+ bitlyCreds.setSummary(getString(R.string.prefs_bitly_creds_summary_edit));
+ } else {
+ bitlyCreds.setSummary(getString(R.string.prefs_bitly_creds_summary_default));
+ }
+ }
}
diff --git a/app/src/main/res/layout/bitlycreds.xml b/app/src/main/res/layout/bitlycreds.xml
index b0bf4e5..859d613 100644
--- a/app/src/main/res/layout/bitlycreds.xml
+++ b/app/src/main/res/layout/bitlycreds.xml
@@ -1,66 +1,34 @@
+
+ Emaily for Android
+++A simple app that makes things easier, and helps us to save some time.
+ +
+ 
+
Emaily makes it easy to share shortened links from your phone.
+No copy/paste required. Long URLs are squeezed into fewer characters using is.gd or bit.ly.
+
+
+ How to use…
+
+
+ When you find a web page you want to share, simply follow these steps:
++
-
+
- Select the Options menu: +
- Select the Share… menu option: +
- Select Emaily from the Share sheet: +
- Select Gmail (or whichever + application you want to share with): +
- The shortened link is automatically inserted in a new email: +
+ 
+ 
+ 
+ 
+
+
+
+
+
+
diff --git a/screenshots/.gitignore b/screenshots/1.0/.gitignore
similarity index 93%
rename from screenshots/.gitignore
rename to screenshots/1.0/.gitignore
index 5eacdb9..d758e81 100644
--- a/screenshots/.gitignore
+++ b/screenshots/1.0/.gitignore
@@ -1,2 +1,2 @@
-/emaily.orig.avi
-/emaily.wmv
+/emaily.orig.avi
+/emaily.wmv
diff --git a/screenshots/1.0/2.png b/screenshots/1.0/2.png
new file mode 100644
index 0000000..21f7544
Binary files /dev/null and b/screenshots/1.0/2.png differ
diff --git a/screenshots/1.0/3.png b/screenshots/1.0/3.png
new file mode 100644
index 0000000..be36e2e
Binary files /dev/null and b/screenshots/1.0/3.png differ
diff --git a/screenshots/1.0/4.png b/screenshots/1.0/4.png
new file mode 100644
index 0000000..d4d9419
Binary files /dev/null and b/screenshots/1.0/4.png differ
diff --git a/screenshots/1.0/5.png b/screenshots/1.0/5.png
new file mode 100644
index 0000000..73d6753
Binary files /dev/null and b/screenshots/1.0/5.png differ
diff --git a/screenshots/1.0/6.png b/screenshots/1.0/6.png
new file mode 100644
index 0000000..b149ae8
Binary files /dev/null and b/screenshots/1.0/6.png differ
diff --git a/screenshots/1.0/7.png b/screenshots/1.0/7.png
new file mode 100644
index 0000000..c3fabf6
Binary files /dev/null and b/screenshots/1.0/7.png differ
diff --git a/screenshots/api_branding.png b/screenshots/1.0/api_branding.png
similarity index 100%
rename from screenshots/api_branding.png
rename to screenshots/1.0/api_branding.png
diff --git a/screenshots/emaily.gif b/screenshots/1.0/emaily.gif
similarity index 100%
rename from screenshots/emaily.gif
rename to screenshots/1.0/emaily.gif
diff --git a/screenshots/icon-512x512.png b/screenshots/1.0/icon-512x512.png
similarity index 100%
rename from screenshots/icon-512x512.png
rename to screenshots/1.0/icon-512x512.png
diff --git a/screenshots/icon.png b/screenshots/1.0/icon.png
similarity index 100%
rename from screenshots/icon.png
rename to screenshots/1.0/icon.png
diff --git a/screenshots/icon114x114.png b/screenshots/1.0/icon114x114.png
similarity index 100%
rename from screenshots/icon114x114.png
rename to screenshots/1.0/icon114x114.png
diff --git a/screenshots/1.png b/screenshots/1.0/old/1.png
similarity index 100%
rename from screenshots/1.png
rename to screenshots/1.0/old/1.png
diff --git a/screenshots/2.png b/screenshots/1.0/old/2.png
similarity index 100%
rename from screenshots/2.png
rename to screenshots/1.0/old/2.png
diff --git a/screenshots/3.png b/screenshots/1.0/old/3.png
similarity index 100%
rename from screenshots/3.png
rename to screenshots/1.0/old/3.png
diff --git a/screenshots/4.png b/screenshots/1.0/old/4.png
similarity index 100%
rename from screenshots/4.png
rename to screenshots/1.0/old/4.png
diff --git a/screenshots/5.png b/screenshots/1.0/old/5.png
similarity index 100%
rename from screenshots/5.png
rename to screenshots/1.0/old/5.png
diff --git a/screenshots/promo-1024x500.png b/screenshots/1.0/promo-1024x500.png
similarity index 100%
rename from screenshots/promo-1024x500.png
rename to screenshots/1.0/promo-1024x500.png
diff --git a/screenshots/promo-180x120.png b/screenshots/1.0/promo-180x120.png
similarity index 100%
rename from screenshots/promo-180x120.png
rename to screenshots/1.0/promo-180x120.png
diff --git a/screenshots/google-play-badge.png b/screenshots/google-play-badge.png
new file mode 100644
index 0000000..c77b746
Binary files /dev/null and b/screenshots/google-play-badge.png differ
diff --git a/screenshots/ic_launcher-playstore.png b/screenshots/ic_launcher-playstore.png
new file mode 100644
index 0000000..3aa705b
Binary files /dev/null and b/screenshots/ic_launcher-playstore.png differ
diff --git a/screenshots/icon-noedge.png b/screenshots/icon-noedge.png
new file mode 100644
index 0000000..6b252dd
Binary files /dev/null and b/screenshots/icon-noedge.png differ
diff --git a/screenshots/main.png b/screenshots/main.png
new file mode 100644
index 0000000..a8b0934
Binary files /dev/null and b/screenshots/main.png differ
diff --git a/screenshots/main_framed.png b/screenshots/main_framed.png
new file mode 100644
index 0000000..4cd4439
Binary files /dev/null and b/screenshots/main_framed.png differ
diff --git a/screenshots/steps/1.png b/screenshots/steps/1.png
new file mode 100644
index 0000000..a1773b5
Binary files /dev/null and b/screenshots/steps/1.png differ
diff --git a/screenshots/steps/2.png b/screenshots/steps/2.png
new file mode 100644
index 0000000..b8bea53
Binary files /dev/null and b/screenshots/steps/2.png differ
diff --git a/screenshots/steps/3.png b/screenshots/steps/3.png
new file mode 100644
index 0000000..b62bebe
Binary files /dev/null and b/screenshots/steps/3.png differ
diff --git a/screenshots/steps/4.png b/screenshots/steps/4.png
new file mode 100644
index 0000000..41288df
Binary files /dev/null and b/screenshots/steps/4.png differ
diff --git a/screenshots/steps/4a.png b/screenshots/steps/4a.png
new file mode 100644
index 0000000..4151759
Binary files /dev/null and b/screenshots/steps/4a.png differ
diff --git a/screenshots/steps/4b.png b/screenshots/steps/4b.png
new file mode 100644
index 0000000..18f6466
Binary files /dev/null and b/screenshots/steps/4b.png differ
diff --git a/screenshots/steps/5.png b/screenshots/steps/5.png
new file mode 100644
index 0000000..1659264
Binary files /dev/null and b/screenshots/steps/5.png differ
diff --git a/screenshots/steps/6.png b/screenshots/steps/6.png
new file mode 100644
index 0000000..d2e1515
Binary files /dev/null and b/screenshots/steps/6.png differ
diff --git a/screenshots/steps/bitly_creds.png b/screenshots/steps/bitly_creds.png
new file mode 100644
index 0000000..98c26a2
Binary files /dev/null and b/screenshots/steps/bitly_creds.png differ
diff --git a/screenshots/steps/bitly_selected.png b/screenshots/steps/bitly_selected.png
new file mode 100644
index 0000000..bffec06
Binary files /dev/null and b/screenshots/steps/bitly_selected.png differ
diff --git a/screenshots/steps/isgd_disabled.png b/screenshots/steps/isgd_disabled.png
new file mode 100644
index 0000000..e29c1c1
Binary files /dev/null and b/screenshots/steps/isgd_disabled.png differ
diff --git a/screenshots/steps/isgd_selected.png b/screenshots/steps/isgd_selected.png
new file mode 100644
index 0000000..c79d3c3
Binary files /dev/null and b/screenshots/steps/isgd_selected.png differ
diff --git a/screenshots/web_hi_res_512.png b/screenshots/web_hi_res_512.png
new file mode 100644
index 0000000..4d3d616
Binary files /dev/null and b/screenshots/web_hi_res_512.png differ
diff --git a/settings.gradle b/settings.gradle
index e7b4def..3c080bb 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1 +1,2 @@
include ':app'
+rootProject.name = "Emaily"
Using Bitly…
+
+
+ In order to use Bitly as for shortening links, you will need an API Access Token.
++
To enable Bitly follow these steps:
+-
+
- Disable is.gd by turning its switch off: +
- Click on the Bitly API Access Token preference option: +
- Enter your Bitly Access Token and click OK: +
+ 
+ 
+