1.2 first commit.
106
app/app.iml
|
@ -1,106 +0,0 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<module external.linked.project.id=":app" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="Emaily" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
|
||||
<component name="FacetManager">
|
||||
<facet type="android-gradle" name="Android-Gradle">
|
||||
<configuration>
|
||||
<option name="GRADLE_PROJECT_PATH" value=":app" />
|
||||
</configuration>
|
||||
</facet>
|
||||
<facet type="android" name="Android">
|
||||
<configuration>
|
||||
<option name="SELECTED_BUILD_VARIANT" value="debug" />
|
||||
<option name="SELECTED_TEST_ARTIFACT" value="_android_test_" />
|
||||
<option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
|
||||
<option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
|
||||
<option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugAndroidTest" />
|
||||
<option name="COMPILE_JAVA_TEST_TASK_NAME" value="compileDebugAndroidTestSources" />
|
||||
<afterSyncTasks>
|
||||
<task>generateDebugAndroidTestSources</task>
|
||||
<task>generateDebugSources</task>
|
||||
</afterSyncTasks>
|
||||
<option name="ALLOW_USER_CONFIGURATION" value="false" />
|
||||
<option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
|
||||
<option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
|
||||
<option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/src/main/res" />
|
||||
<option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />
|
||||
</configuration>
|
||||
</facet>
|
||||
</component>
|
||||
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
|
||||
<output url="file://$MODULE_DIR$/build/intermediates/classes/debug" />
|
||||
<output-test url="file://$MODULE_DIR$/build/intermediates/classes/androidTest/debug" />
|
||||
<exclude-output />
|
||||
<content url="file://$MODULE_DIR$">
|
||||
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/debug" isTestSource="false" generated="true" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/debug" isTestSource="false" generated="true" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/debug" type="java-resource" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/debug" isTestSource="true" generated="true" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/debug" isTestSource="true" generated="true" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/debug" isTestSource="true" generated="true" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/androidTest/debug" type="java-test-resource" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/debug/aidl" isTestSource="false" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/debug/jni" isTestSource="false" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/main/aidl" isTestSource="false" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/coverage-instrumented-classes" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex-cache" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jacoco" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaResources" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/libs" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/ndk" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/proguard" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
|
||||
</content>
|
||||
<orderEntry type="jdk" jdkName="Android API 23 Platform" jdkType="Android SDK" />
|
||||
<orderEntry type="sourceFolder" forTests="false" />
|
||||
<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="google-http-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="google-http-client-android2-1.7.0-beta" level="project" />
|
||||
<orderEntry type="library" exported="" name="google-oauth-client-1.7.0-beta" level="project" />
|
||||
<orderEntry type="library" exported="" name="jsr305-1.3.9" level="project" />
|
||||
<orderEntry type="library" exported="" name="google-api-client-android2-1.7.0-beta" level="project" />
|
||||
<orderEntry type="library" exported="" name="jackson-core-asl-1.9.4" level="project" />
|
||||
<orderEntry type="library" exported="" name="google-api-urlshortener-v1-rev2-java-1.4.0-beta" level="project" />
|
||||
<orderEntry type="library" exported="" name="guava-11.0.1" level="project" />
|
||||
<orderEntry type="library" exported="" name="google-http-client-android3-1.7.0-beta" level="project" />
|
||||
<orderEntry type="library" exported="" name="support-annotations-23.1.0" level="project" />
|
||||
</component>
|
||||
</module>
|
|
@ -1,41 +1,36 @@
|
|||
apply plugin: 'com.android.application'
|
||||
apply plugin: 'versionPlugin'
|
||||
|
||||
android {
|
||||
compileSdkVersion 23
|
||||
buildToolsVersion "23.0.1"
|
||||
compileSdkVersion 29
|
||||
buildToolsVersion "29.0.3"
|
||||
|
||||
defaultConfig {
|
||||
applicationId "net.thauvin.erik.android.emaily"
|
||||
minSdkVersion 14
|
||||
targetSdkVersion 23
|
||||
minSdkVersion 16
|
||||
targetSdkVersion 29
|
||||
versionCode 2
|
||||
versionName "1.1b10"
|
||||
versionName "1.2.0-beta1"
|
||||
|
||||
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
|
||||
}
|
||||
|
||||
buildTypes {
|
||||
release {
|
||||
minifyEnabled true
|
||||
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
|
||||
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
|
||||
}
|
||||
}
|
||||
|
||||
packagingOptions {
|
||||
exclude 'META-INF/LICENSE'
|
||||
exclude 'META-INF/NOTICE'
|
||||
exclude 'META-INF/ASL2.0'
|
||||
}
|
||||
|
||||
versionPlugin {
|
||||
buildTypesMatcher = 'release'
|
||||
supportBuildNumber = false
|
||||
|
||||
fileNameFormat = '$projectName'
|
||||
}
|
||||
}
|
||||
|
||||
dependencies {
|
||||
compile fileTree(dir: 'libs', include: ['*.jar'])
|
||||
//compile 'com.android.support:appcompat-v7:22.0.0'
|
||||
compile 'com.android.support:support-annotations:23.1.0'
|
||||
implementation fileTree(dir: "libs", include: ["*.jar"])
|
||||
//implementation 'androidx.appcompat:appcompat:1.1.0'
|
||||
//implementation 'androidx.preference:preference:1.1.1'
|
||||
|
||||
implementation 'net.thauvin.erik:bitly-shorten:0.9.2'
|
||||
implementation 'net.thauvin.erik:isgd-shorten:0.9.1'
|
||||
|
||||
testImplementation 'junit:junit:4.13'
|
||||
androidTestImplementation 'androidx.test.ext:junit:1.1.1'
|
||||
androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
|
||||
}
|
||||
|
|
77
app/proguard-rules.pro
vendored
|
@ -1,82 +1,21 @@
|
|||
# Add project specific ProGuard rules here.
|
||||
# By default, the flags in this file are appended to flags specified
|
||||
# in C:\Users\erik\AppData\Local\Android\android-sdk/tools/proguard/proguard-android.txt
|
||||
# You can edit the include path and order by changing the proguardFiles
|
||||
# directive in build.gradle.
|
||||
# You can control the set of applied configuration files using the
|
||||
# proguardFiles setting in build.gradle.
|
||||
#
|
||||
# For more details, see
|
||||
# http://developer.android.com/guide/developing/tools/proguard.html
|
||||
|
||||
# Add any project specific keep options here:
|
||||
|
||||
# If your project uses WebView with JS, uncomment the following
|
||||
# and specify the fully qualified class name to the JavaScript interface
|
||||
# class:
|
||||
#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
|
||||
# public *;
|
||||
#}
|
||||
-optimizationpasses 5
|
||||
-dontusemixedcaseclassnames
|
||||
-dontskipnonpubliclibraryclasses
|
||||
-dontpreverify
|
||||
-verbose
|
||||
-optimizations !code/simplification/arithmetic,!field/*,!class/merging/*
|
||||
|
||||
-keep public class * extends android.app.Activity
|
||||
-keep public class * extends android.app.Application
|
||||
-keep public class * extends android.app.Service
|
||||
-keep public class * extends android.content.BroadcastReceiver
|
||||
-keep public class * extends android.content.ContentProvider
|
||||
-keep public class * extends android.app.backup.BackupAgentHelper
|
||||
-keep public class * extends android.preference.Preference
|
||||
-keep public class com.android.vending.licensing.ILicensingService
|
||||
# Uncomment this to preserve the line number information for
|
||||
# debugging stack traces.
|
||||
#-keepattributes SourceFile,LineNumberTable
|
||||
|
||||
-keepclasseswithmembernames class * {
|
||||
native <methods>;
|
||||
}
|
||||
|
||||
-keepclasseswithmembers class * {
|
||||
public <init>(android.content.Context, android.util.AttributeSet);
|
||||
}
|
||||
|
||||
-keepclasseswithmembers class * {
|
||||
public <init>(android.content.Context, android.util.AttributeSet, int);
|
||||
}
|
||||
|
||||
-keepclassmembers class * extends android.app.Activity {
|
||||
public void *(android.view.View);
|
||||
}
|
||||
|
||||
-keepclassmembers enum * {
|
||||
public static **[] values();
|
||||
public static ** valueOf(java.lang.String);
|
||||
}
|
||||
|
||||
-keep class * implements android.os.Parcelable {
|
||||
public static final android.os.Parcelable$Creator *;
|
||||
}
|
||||
|
||||
# Needed by google-http-client to keep generic types and @Key annotations accessed via reflection
|
||||
|
||||
-keepclassmembers class * {
|
||||
@com.google.api.client.util.Key <fields>;
|
||||
}
|
||||
|
||||
# Needed just to be safe in terms of keeping Google API service model classes
|
||||
|
||||
-keep class com.google.api.services.*.model.*
|
||||
|
||||
-keepattributes Signature,RuntimeVisibleAnnotations,AnnotationDefault
|
||||
|
||||
# Needed by Guava
|
||||
|
||||
-dontwarn sun.misc.Unsafe
|
||||
|
||||
# See https://groups.google.com/forum/#!topic/guava-discuss/YCZzeCiIVoI
|
||||
-dontwarn com.google.common.collect.MinMaxPriorityQueue
|
||||
|
||||
# Emaily
|
||||
-keep class com.google.api.client.googleapis.json.*
|
||||
-dontwarn org.apache.commons.codec.binary.StringUtils
|
||||
-dontwarn org.apache.commons.codec.binary.Base64
|
||||
-dontwarn com.google.api.client.http.apache.*
|
||||
# If you keep the line number information, uncomment this to
|
||||
# hide the original source file name.
|
||||
#-renamesourcefileattribute SourceFile
|
||||
|
|
|
@ -0,0 +1,26 @@
|
|||
package net.thauvin.erik.android.emaily;
|
||||
|
||||
import android.content.Context;
|
||||
|
||||
import androidx.test.platform.app.InstrumentationRegistry;
|
||||
import androidx.test.ext.junit.runners.AndroidJUnit4;
|
||||
|
||||
import org.junit.Test;
|
||||
import org.junit.runner.RunWith;
|
||||
|
||||
import static org.junit.Assert.*;
|
||||
|
||||
/**
|
||||
* Instrumented test, which will execute on an Android device.
|
||||
*
|
||||
* @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
|
||||
*/
|
||||
@RunWith(AndroidJUnit4.class)
|
||||
public class ExampleInstrumentedTest {
|
||||
@Test
|
||||
public void useAppContext() {
|
||||
// Context of the app under test.
|
||||
Context appContext = InstrumentationRegistry.getInstrumentation().getTargetContext();
|
||||
assertEquals("net.thauvin.erik.android.emaily", appContext.getPackageName());
|
||||
}
|
||||
}
|
|
@ -1,37 +1,39 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
package="net.thauvin.erik.android.emaily">
|
||||
package="net.thauvin.erik.android.emaily">
|
||||
|
||||
<uses-permission android:name="android.permission.INTERNET"/>
|
||||
<uses-permission android:name="android.permission.GET_ACCOUNTS"/>
|
||||
<uses-permission android:name="android.permission.USE_CREDENTIALS"/>
|
||||
<uses-permission android:name="android.permission.INTERNET" />
|
||||
<uses-permission android:name="android.permission.GET_ACCOUNTS" />
|
||||
<uses-permission android:name="android.permission.USE_CREDENTIALS" />
|
||||
|
||||
<application
|
||||
android:allowBackup="true"
|
||||
android:icon="@mipmap/icon"
|
||||
android:label="@string/app_name"
|
||||
android:theme="@style/Emaily">
|
||||
<activity
|
||||
android:name="net.thauvin.erik.android.emaily.Emaily"
|
||||
android:allowBackup="true"
|
||||
android:fullBackupContent="@xml/mybackupscheme"
|
||||
android:icon="@mipmap/ic_launcher"
|
||||
android:label="@string/app_name"
|
||||
android:theme="@android:style/Theme.Translucent.NoTitleBar.Fullscreen">
|
||||
android:roundIcon="@mipmap/ic_launcher_round"
|
||||
android:supportsRtl="true"
|
||||
android:theme="@style/Emaily">
|
||||
<activity
|
||||
android:name="net.thauvin.erik.android.emaily.Emaily"
|
||||
android:label="@string/app_name"
|
||||
android:theme="@android:style/Theme.Translucent.NoTitleBar.Fullscreen">
|
||||
<intent-filter>
|
||||
<action android:name="android.intent.action.SEND"/>
|
||||
<action android:name="android.intent.action.SEND" />
|
||||
|
||||
<category android:name="android.intent.category.DEFAULT"/>
|
||||
<category android:name="android.intent.category.DEFAULT" />
|
||||
|
||||
<data android:mimeType="text/plain"/>
|
||||
<data android:mimeType="text/plain" />
|
||||
</intent-filter>
|
||||
</activity>
|
||||
<activity
|
||||
android:name=".EmailyPrefs"
|
||||
android:label="@string/app_name">
|
||||
android:name=".EmailyPrefs"
|
||||
android:label="@string/app_name">
|
||||
<intent-filter>
|
||||
<action android:name="android.intent.action.MAIN"/>
|
||||
<action android:name="android.intent.action.MAIN" />
|
||||
|
||||
<category android:name="android.intent.category.LAUNCHER"/>
|
||||
<category android:name="android.intent.category.LAUNCHER" />
|
||||
</intent-filter>
|
||||
</activity>
|
||||
</application>
|
||||
|
||||
</manifest>
|
||||
</manifest>
|
||||
|
|
|
@ -1,35 +1,33 @@
|
|||
/*
|
||||
* @(#)BitlyCredsDialog.java
|
||||
* BitlyCredsDialog.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;
|
||||
|
||||
|
@ -44,19 +42,16 @@ import android.util.AttributeSet;
|
|||
import android.view.View;
|
||||
import android.widget.EditText;
|
||||
import android.widget.TextView;
|
||||
import android.support.annotation.NonNull;
|
||||
|
||||
/**
|
||||
* The <code>BitlyCredsDialog</code> class implements a bit.ly credential dialog.
|
||||
*
|
||||
* @author <a href="mailto:erik@thauvin.net">Erik C. Thauvin</a>
|
||||
* @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,16 +62,14 @@ 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_apikey_edit);
|
||||
final TextView textFld = view.findViewById(R.id.bitly_text_fld);
|
||||
|
||||
username.setText(sharedPrefs.getString(context.getString(R.string.prefs_key_bitly_username), ""));
|
||||
apikey.setText(sharedPrefs.getString(context.getString(R.string.prefs_key_bitly_apikey), ""));
|
||||
|
||||
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.apply();
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
@ -1,95 +1,65 @@
|
|||
/*
|
||||
* @(#)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.Bitly;
|
||||
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 <code>Emaily</code> class implements a URL shortener intent.
|
||||
*
|
||||
* @author <a href="mailto:erik@thauvin.net">Erik C. Thauvin</a>
|
||||
* @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 +67,34 @@ public class Emaily extends Activity
|
|||
* Validates a string.
|
||||
*
|
||||
* @param s The string to validate.
|
||||
* @return returns <code>true</code> if the string is not empty or null, <code>false</code> otherwise.
|
||||
* @return returns <code>true</code> if the string is not empty or null, <code>false</code>
|
||||
* 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 AccountManagerCallback<Bundle>()
|
||||
{
|
||||
@SuppressLint("CommitPrefEdits")
|
||||
@Override
|
||||
public void run(AccountManagerFuture<Bundle> future)
|
||||
{
|
||||
try
|
||||
{
|
||||
final String token = future.getResult().getString(AccountManager.KEY_AUTHTOKEN);
|
||||
final Editor editor = sharedPrefs.edit();
|
||||
final long now = System.currentTimeMillis();
|
||||
|
||||
final long expires;
|
||||
if (expiry < now)
|
||||
{
|
||||
expires = now + maxLife;
|
||||
}
|
||||
else
|
||||
{
|
||||
expires = expiry;
|
||||
}
|
||||
|
||||
editor.putLong(getString(R.string.prefs_key_googl_token_expiry), expires);
|
||||
editor.putString(getString(R.string.prefs_key_googl_token), token);
|
||||
editor.commit();
|
||||
|
||||
Log.d(appName, account.toString());
|
||||
Log.d(appName, "Token: " + token);
|
||||
Log.d(appName, "Expires: " + new Date(expires));
|
||||
|
||||
startEmailyTask(intent, true, isRetry);
|
||||
|
||||
}
|
||||
catch (OperationCanceledException e)
|
||||
{
|
||||
Log.e(appName, "Auth token request has been canceled.", e);
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
Log.e(appName, "Exception while requesting the auth token.", e);
|
||||
}
|
||||
}
|
||||
}, null);
|
||||
}
|
||||
|
||||
/**
|
||||
* Retries the task.
|
||||
*
|
||||
* @param intent The original intent.
|
||||
*/
|
||||
@SuppressLint("CommitPrefEdits")
|
||||
private void retry(final Intent intent)
|
||||
{
|
||||
sharedPrefs.edit().putLong(getString(R.string.prefs_key_googl_token_expiry), 0L).commit();
|
||||
|
||||
startEmailyTask(intent, new Account(getPref(R.string.prefs_key_googl_account), ACCOUNT_TYPE), true);
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns the value of the specified shared reference based on the specified string id. The default value is an empty string.
|
||||
* Returns the value of the specified shared reference based on the specified string id. The
|
||||
* default value is an empty string.
|
||||
*
|
||||
* @param id The string id.
|
||||
* @return The preference value.
|
||||
*/
|
||||
private String getPref(int id)
|
||||
{
|
||||
@SuppressWarnings("SameParameterValue")
|
||||
private String getPref(int id) {
|
||||
return getPref(id, "");
|
||||
}
|
||||
|
||||
|
@ -319,276 +105,216 @@ public class Emaily extends Activity
|
|||
* @param defaultValue The default value, used if the preference is empty.
|
||||
* @return The preference value.
|
||||
*/
|
||||
private String getPref(int id, String defaultValue)
|
||||
{
|
||||
@SuppressWarnings("SameParameterValue")
|
||||
private String getPref(int id, String defaultValue) {
|
||||
return sharedPrefs.getString(getString(id), defaultValue);
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns the value of the specified shared reference based on the specified string id. The default value is <code>false</code>.
|
||||
*
|
||||
* @param id The string id.
|
||||
* @return The preference value.
|
||||
*/
|
||||
private boolean getBoolPref(int id)
|
||||
{
|
||||
return getBoolPref(id, false);
|
||||
@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 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_apikey), isGd);
|
||||
}
|
||||
|
||||
task.execute(intent);
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* The <code>EmailyResult</code> 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 <code>EmailyTask</code> class.
|
||||
*/
|
||||
private class EmailyTask extends AsyncTask<Intent, Void, EmailyResult>
|
||||
{
|
||||
private final ProgressDialog dialog = new ProgressDialog(Emaily.this, AlertDialog.THEME_DEVICE_DEFAULT_DARK);
|
||||
private final String username;
|
||||
@SuppressLint("StaticFieldLeak")
|
||||
private class EmailyTask extends AsyncTask<Intent, Void, EmailyResult> {
|
||||
private final ProgressDialog dialog =
|
||||
new ProgressDialog(Emaily.this, AlertDialog.THEME_DEVICE_DEFAULT_DARK);
|
||||
private final boolean isGd;
|
||||
private final String keytoken;
|
||||
private final boolean isGoogl;
|
||||
private final boolean isHtml;
|
||||
private final boolean isRetry;
|
||||
|
||||
public EmailyTask(String username, String keytoken, boolean isGoogl, boolean isHtml, boolean isRetry)
|
||||
{
|
||||
this.username = username;
|
||||
public EmailyTask(String keytoken, boolean isGd) {
|
||||
this.keytoken = keytoken;
|
||||
this.isGoogl = isGoogl;
|
||||
this.isHtml = isHtml;
|
||||
this.isRetry = isRetry;
|
||||
this.isGd = isGd;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected EmailyResult doInBackground(Intent... intent)
|
||||
{
|
||||
protected EmailyResult doInBackground(Intent... intent) {
|
||||
final EmailyResult result = new EmailyResult(intent[0]);
|
||||
|
||||
final Intent emailIntent = new Intent(Intent.ACTION_SEND);
|
||||
|
||||
if (isHtml)
|
||||
{
|
||||
emailIntent.setType("text/html");
|
||||
}
|
||||
else
|
||||
{
|
||||
emailIntent.setType("text/plain");
|
||||
}
|
||||
|
||||
|
||||
final Bundle extras = intent[0].getExtras();
|
||||
final String pageUrl;
|
||||
final String pageTitle;
|
||||
|
||||
emailIntent.setType("text/plain");
|
||||
|
||||
if (extras != null) {
|
||||
pageUrl = extras.getString(Intent.EXTRA_TEXT);
|
||||
pageTitle = extras.getString(Intent.EXTRA_SUBJECT);
|
||||
} else {
|
||||
pageTitle = null;
|
||||
pageUrl = null;
|
||||
}
|
||||
|
||||
final String pageUrl = extras.getString(Intent.EXTRA_TEXT);
|
||||
final String pageTitle = extras.getString(Intent.EXTRA_SUBJECT);
|
||||
final StringBuilder textBefore = new StringBuilder();
|
||||
|
||||
if (isValid(pageTitle))
|
||||
{
|
||||
if (isValid(pageTitle)) {
|
||||
emailIntent.putExtra(Intent.EXTRA_SUBJECT, pageTitle);
|
||||
}
|
||||
|
||||
final boolean hasCredentials = isValid(username) && isValid(keytoken);
|
||||
final StringBuilder shortUrl = new StringBuilder();
|
||||
|
||||
if (isValid(pageUrl))
|
||||
{
|
||||
final HttpTransport transport = new NetHttpTransport();
|
||||
final JsonFactory jsonFactory = new JacksonFactory();
|
||||
|
||||
String version = "";
|
||||
|
||||
try
|
||||
{
|
||||
version = '/' + getPackageManager().getPackageInfo(getPackageName(), 0).versionName;
|
||||
}
|
||||
catch (NameNotFoundException ignore)
|
||||
{
|
||||
// Do nothing;
|
||||
}
|
||||
|
||||
final Url toInsert = new Url();
|
||||
|
||||
if (isValid(pageUrl)) {
|
||||
final String[] splits = pageUrl.split("\\s");
|
||||
|
||||
for (String item : splits)
|
||||
{
|
||||
try
|
||||
{
|
||||
for (String item : splits) {
|
||||
try {
|
||||
new URL(item.trim());
|
||||
|
||||
if (isGoogl || !hasCredentials)
|
||||
{
|
||||
Log.d(appName, "goo.gl -> " + item);
|
||||
|
||||
final Urlshortener shortener = Urlshortener.builder(transport, jsonFactory).setApplicationName(appName + version)
|
||||
.setJsonHttpRequestInitializer(new JsonHttpRequestInitializer()
|
||||
{
|
||||
@Override
|
||||
public void initialize(JsonHttpRequest request) throws IOException
|
||||
{
|
||||
UrlshortenerRequest shortnerRequest = (UrlshortenerRequest) request;
|
||||
|
||||
shortnerRequest.setKey(getString(R.string.secret_apikey));
|
||||
|
||||
if (isValid(keytoken))
|
||||
{
|
||||
shortnerRequest.setOauthToken(keytoken);
|
||||
|
||||
}
|
||||
shortnerRequest.put("client_id", getString(R.string.secret_client_id));
|
||||
shortnerRequest.put("client_secret", getString(R.string.secret_client_secret));
|
||||
}
|
||||
}).build();
|
||||
|
||||
toInsert.setLongUrl(item.trim());
|
||||
|
||||
try
|
||||
{
|
||||
final Url shortened = shortener.url().insert(toInsert).execute();
|
||||
|
||||
shortUrl.append(shortened.getId());
|
||||
}
|
||||
catch (GoogleJsonResponseException e)
|
||||
{
|
||||
result.setCode(R.string.alert_error);
|
||||
|
||||
final GoogleJsonError err = e.getDetails();
|
||||
|
||||
result.setMessage(err.message);
|
||||
|
||||
if (err.code == 401)
|
||||
{
|
||||
if (!isRetry)
|
||||
{
|
||||
result.setRetry(true);
|
||||
}
|
||||
}
|
||||
|
||||
Log.e(appName, "Exception while shortening '" + item + "' via goo.gl.", e);
|
||||
}
|
||||
catch (UnknownHostException e)
|
||||
{
|
||||
result.setCode(R.string.alert_nohost);
|
||||
result.setMessage(e.getMessage());
|
||||
|
||||
Log.e(appName, "UnknownHostException while shortening '" + item + "' via goo.gl.", e);
|
||||
}
|
||||
catch (IOException e)
|
||||
{
|
||||
result.setCode(R.string.alert_error);
|
||||
result.setMessage(e.getMessage());
|
||||
|
||||
Log.e(appName, "IOException while shortening '" + item + "' via goo.gl.", e);
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
Log.d(appName, "bit.ly -> " + item);
|
||||
|
||||
try
|
||||
{
|
||||
shortUrl.append(as(username, keytoken).call(shorten(item.trim())).getShortUrl());
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
final Throwable cause = e.getCause();
|
||||
|
||||
if (cause != null && cause instanceof UnknownHostException)
|
||||
{
|
||||
result.setCode(R.string.alert_nohost);
|
||||
result.setMessage(cause.getMessage());
|
||||
}
|
||||
else
|
||||
{
|
||||
try {
|
||||
if (isGd) {
|
||||
Log.d(appName, "is.gd -> " + item);
|
||||
shortUrl.append(Isgd.shorten(item));
|
||||
} else {
|
||||
final Bitly bitly = new Bitly(keytoken);
|
||||
shortUrl.append(bitly.bitlinks().shorten(item));
|
||||
if (shortUrl.toString().equals(item)) {
|
||||
result.setCode(R.string.alert_error);
|
||||
result.setMessage(e.getMessage());
|
||||
//@TODO fixme
|
||||
result.setMessage("TBD");
|
||||
}
|
||||
|
||||
Log.e(appName, "Exception while shortening '" + item + "' via bit.ly.", e);
|
||||
}
|
||||
} catch (Exception e) {
|
||||
final Throwable cause = e.getCause();
|
||||
|
||||
break;
|
||||
if (cause instanceof UnknownHostException) {
|
||||
result.setCode(R.string.alert_nohost);
|
||||
result.setMessage(cause.getMessage());
|
||||
} else {
|
||||
result.setCode(R.string.alert_error);
|
||||
result.setMessage(e.getMessage());
|
||||
}
|
||||
}
|
||||
|
||||
break;
|
||||
}
|
||||
catch (MalformedURLException mue)
|
||||
{
|
||||
} catch (MalformedURLException mue) {
|
||||
Log.d(appName, "Attempted to process an invalid URL: " + item, mue);
|
||||
|
||||
if (textBefore.length() > 0)
|
||||
{
|
||||
if (textBefore.length() > 0) {
|
||||
textBefore.append(" ");
|
||||
}
|
||||
|
||||
textBefore.append(item);
|
||||
}
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
} else {
|
||||
result.setCode(R.string.alert_nocreds);
|
||||
}
|
||||
|
||||
if (!result.isRetry())
|
||||
{
|
||||
if (shortUrl.length() > 0)
|
||||
{
|
||||
if (isHtml)
|
||||
{
|
||||
emailIntent.putExtra(Intent.EXTRA_TEXT, Html.fromHtml("<a href=\"" + shortUrl + "\">" + shortUrl + "</a>"));
|
||||
}
|
||||
else
|
||||
{
|
||||
emailIntent.putExtra(Intent.EXTRA_TEXT, shortUrl.toString());
|
||||
}
|
||||
if (shortUrl.length() > 0) {
|
||||
emailIntent.putExtra(Intent.EXTRA_TEXT, shortUrl.toString());
|
||||
Log.d(appName, "URL: " + emailIntent.getStringExtra(Intent.EXTRA_TEXT));
|
||||
|
||||
if (!isValid(pageTitle) && textBefore.length() > 0)
|
||||
{
|
||||
emailIntent.putExtra(Intent.EXTRA_SUBJECT, textBefore.toString());
|
||||
}
|
||||
if (!isValid(pageTitle) && textBefore.length() > 0) {
|
||||
emailIntent.putExtra(Intent.EXTRA_SUBJECT, textBefore.toString());
|
||||
}
|
||||
else
|
||||
{
|
||||
} else {
|
||||
if (extras != null) {
|
||||
final CharSequence chars = extras.getCharSequence(Intent.EXTRA_TEXT);
|
||||
|
||||
if (chars.length() > 0)
|
||||
{
|
||||
if (chars != null && chars.length() > 0) {
|
||||
emailIntent.putExtra(Intent.EXTRA_TEXT, chars);
|
||||
}
|
||||
else if (isValid(pageUrl))
|
||||
{
|
||||
} else if (isValid(pageUrl)) {
|
||||
emailIntent.putExtra(Intent.EXTRA_TEXT, pageUrl);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
try
|
||||
{
|
||||
startActivity(emailIntent);
|
||||
}
|
||||
catch (android.content.ActivityNotFoundException ignore)
|
||||
{
|
||||
if (!result.hasError() && shortUrl.length() > 0)
|
||||
{
|
||||
@SuppressWarnings("deprecation")
|
||||
final ClipboardManager clip = (ClipboardManager) getSystemService(Context.CLIPBOARD_SERVICE);
|
||||
try {
|
||||
startActivity(emailIntent);
|
||||
} catch (android.content.ActivityNotFoundException ignore) {
|
||||
if (!result.hasError() && shortUrl.length() > 0) {
|
||||
@SuppressWarnings("deprecation")
|
||||
final ClipboardManager clip =
|
||||
(ClipboardManager) getSystemService(Context.CLIPBOARD_SERVICE);
|
||||
if (clip != null) {
|
||||
//noinspection deprecation
|
||||
clip.setText(shortUrl);
|
||||
}
|
||||
|
||||
result.setCode(R.string.alert_notfound_clip);
|
||||
}
|
||||
else
|
||||
{
|
||||
result.setCode(R.string.alert_notfound);
|
||||
}
|
||||
result.setCode(R.string.alert_notfound_clip);
|
||||
} else {
|
||||
result.setCode(R.string.alert_notfound);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -596,108 +322,29 @@ public class Emaily extends Activity
|
|||
}
|
||||
|
||||
@Override
|
||||
protected void onPostExecute(EmailyResult result)
|
||||
{
|
||||
if (this.dialog.isShowing())
|
||||
{
|
||||
this.dialog.dismiss();
|
||||
}
|
||||
|
||||
if (result.isRetry())
|
||||
{
|
||||
Emaily.this.retry(result.getIntent());
|
||||
}
|
||||
else
|
||||
{
|
||||
if (result.hasError())
|
||||
{
|
||||
Toast.makeText(
|
||||
getApplicationContext(),
|
||||
getString(result.getCode(), result.getMessage(), isGoogl ? getString(R.string.prefs_googl_title)
|
||||
: getString(R.string.prefs_bitly_title)), Toast.LENGTH_LONG).show();
|
||||
|
||||
}
|
||||
|
||||
Emaily.this.finish();
|
||||
}
|
||||
protected void onPreExecute() {
|
||||
this.dialog.setMessage(getString(R.string.progress_msg));
|
||||
this.dialog.show();
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void onPreExecute()
|
||||
{
|
||||
if (isRetry)
|
||||
{
|
||||
this.dialog.setMessage(getString(R.string.progress_msg_retry));
|
||||
}
|
||||
else
|
||||
{
|
||||
this.dialog.setMessage(getString(R.string.progress_msg));
|
||||
protected void onPostExecute(EmailyResult result) {
|
||||
if (this.dialog.isShowing()) {
|
||||
this.dialog.dismiss();
|
||||
}
|
||||
|
||||
this.dialog.show();
|
||||
if (result.hasError()) {
|
||||
Toast.makeText(
|
||||
getApplicationContext(),
|
||||
getString(result.getCode(),
|
||||
result.getMessage(),
|
||||
isGd ? getString(R.string.prefs_isgd_title)
|
||||
: getString(R.string.prefs_bitly_title)), Toast.LENGTH_LONG)
|
||||
.show();
|
||||
|
||||
}
|
||||
|
||||
Emaily.this.finish();
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* The <code>EmailyResult</code> 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;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -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;
|
||||
|
@ -48,123 +44,99 @@ import android.preference.Preference;
|
|||
import android.preference.PreferenceActivity;
|
||||
import android.preference.PreferenceScreen;
|
||||
|
||||
import java.util.Locale;
|
||||
|
||||
/**
|
||||
* The <code>EmailyPrefs</code> class implements a preferences screen.
|
||||
*
|
||||
*
|
||||
* @author <a href="mailto:erik@thauvin.net">Erik C. Thauvin</a>
|
||||
* @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 CheckBoxPreference 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 = (CheckBoxPreference) 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_apikey))) {
|
||||
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_apikey), ""))) {
|
||||
bitlyCreds.setSummary(getString(R.string.prefs_bitly_creds_summary_edit));
|
||||
} else {
|
||||
bitlyCreds.setSummary(getString(R.string.prefs_bitly_creds_summary_default));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -1,66 +1,43 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="vertical"
|
||||
android:paddingTop="20dip">
|
||||
|
||||
<TextView
|
||||
android:id="@+id/bit_username_view"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginLeft="20dip"
|
||||
android:layout_marginRight="20dip"
|
||||
android:gravity="start"
|
||||
android:text="@string/prefs_bitly_creds_username"
|
||||
android:textAppearance="?android:attr/textAppearanceSmall"/>
|
||||
|
||||
<EditText
|
||||
android:id="@+id/bitly_username_edit"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginLeft="20dip"
|
||||
android:layout_marginRight="20dip"
|
||||
android:gravity="fill_horizontal"
|
||||
android:inputType="text"
|
||||
android:key="@string/prefs_key_bitly_username"
|
||||
android:scrollHorizontally="true"
|
||||
android:textAppearance="?android:attr/textAppearanceMedium"/>
|
||||
android:orientation="vertical"
|
||||
android:paddingTop="20dip">
|
||||
|
||||
<TextView
|
||||
android:id="@+id/bitly_apikey_view"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginLeft="20dip"
|
||||
android:layout_marginRight="20dip"
|
||||
android:gravity="start"
|
||||
android:text="@string/prefs_bitly_creds_apikey"
|
||||
android:textAppearance="?android:attr/textAppearanceSmall"
|
||||
/>
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginLeft="20dip"
|
||||
android:layout_marginRight="20dip"
|
||||
android:gravity="start"
|
||||
android:text="@string/prefs_bitly_creds_apikey"
|
||||
android:textAppearance="?android:attr/textAppearanceSmall" />
|
||||
|
||||
<EditText
|
||||
android:id="@+id/bitly_apikey_edit"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginLeft="20dip"
|
||||
android:layout_marginRight="20dip"
|
||||
android:gravity="fill_horizontal"
|
||||
android:inputType="text"
|
||||
android:key="@string/prefs_key_bitly_apikey"
|
||||
android:scrollHorizontally="true"
|
||||
android:textAppearance="?android:attr/textAppearanceMedium"/>
|
||||
android:id="@+id/bitly_apikey_edit"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginLeft="20dip"
|
||||
android:layout_marginRight="20dip"
|
||||
android:autofillHints=""
|
||||
android:gravity="fill_horizontal"
|
||||
android:hint="@string/prefs_bitly_creds_apikey_hint"
|
||||
android:inputType="textPassword"
|
||||
android:key="@string/prefs_key_bitly_apikey"
|
||||
android:scrollHorizontally="true"
|
||||
android:textAppearance="?android:attr/textAppearanceMedium" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/bitly_text_fld"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="fill_parent"
|
||||
android:layout_marginBottom="20dip"
|
||||
android:layout_marginTop="20dip"
|
||||
android:gravity="center"
|
||||
android:text="@string/prefs_bitly_creds_noapi"
|
||||
android:textColor="#eda712"
|
||||
android:clickable="true"
|
||||
android:textAppearance="?android:attr/textAppearanceMedium">
|
||||
</TextView>
|
||||
|
||||
</LinearLayout>
|
||||
android:id="@+id/bitly_text_fld"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="fill_parent"
|
||||
android:layout_marginTop="20dip"
|
||||
android:layout_marginBottom="20dip"
|
||||
android:clickable="true"
|
||||
android:focusable="true"
|
||||
android:gravity="center"
|
||||
android:text="@string/prefs_bitly_creds_noapi"
|
||||
android:textAppearance="?android:attr/textAppearanceMedium"
|
||||
android:textColor="#eda712" />
|
||||
</LinearLayout>
|
||||
|
|
5
app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
Normal file
|
@ -0,0 +1,5 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<background android:drawable="@color/ic_launcher_background"/>
|
||||
<foreground android:drawable="@mipmap/ic_launcher_foreground"/>
|
||||
</adaptive-icon>
|
5
app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
Normal file
|
@ -0,0 +1,5 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<background android:drawable="@color/ic_launcher_background"/>
|
||||
<foreground android:drawable="@mipmap/ic_launcher_foreground"/>
|
||||
</adaptive-icon>
|
BIN
app/src/main/res/mipmap-hdpi/ic_launcher.png
Normal file
After Width: | Height: | Size: 2.3 KiB |
BIN
app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png
Normal file
After Width: | Height: | Size: 4.3 KiB |
BIN
app/src/main/res/mipmap-hdpi/ic_launcher_round.png
Normal file
After Width: | Height: | Size: 4.4 KiB |
Before Width: | Height: | Size: 3.9 KiB |
Before Width: | Height: | Size: 1.6 KiB |
BIN
app/src/main/res/mipmap-mdpi/ic_launcher.png
Normal file
After Width: | Height: | Size: 1.5 KiB |
BIN
app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png
Normal file
After Width: | Height: | Size: 2.5 KiB |
BIN
app/src/main/res/mipmap-mdpi/ic_launcher_round.png
Normal file
After Width: | Height: | Size: 2.7 KiB |
Before Width: | Height: | Size: 2.2 KiB |
BIN
app/src/main/res/mipmap-xhdpi/ic_launcher.png
Normal file
After Width: | Height: | Size: 3.4 KiB |
BIN
app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png
Normal file
After Width: | Height: | Size: 6.6 KiB |
BIN
app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
Normal file
After Width: | Height: | Size: 6.7 KiB |
Before Width: | Height: | Size: 5.6 KiB |
BIN
app/src/main/res/mipmap-xxhdpi/ic_launcher.png
Normal file
After Width: | Height: | Size: 5.9 KiB |
BIN
app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png
Normal file
After Width: | Height: | Size: 12 KiB |
BIN
app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
Normal file
After Width: | Height: | Size: 11 KiB |
BIN
app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
Normal file
After Width: | Height: | Size: 8.7 KiB |
BIN
app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png
Normal file
After Width: | Height: | Size: 20 KiB |
BIN
app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
Normal file
After Width: | Height: | Size: 16 KiB |
|
@ -1,6 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<resources>
|
||||
|
||||
<style name="Emaily" parent="@android:style/Theme.Holo" />
|
||||
|
||||
</resources>
|
|
@ -1,6 +1,4 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<resources>
|
||||
|
||||
<style name="Emaily" parent="@android:style/Theme.Material" />
|
||||
|
||||
</resources>
|
||||
</resources>
|
||||
|
|
4
app/src/main/res/values/ic_launcher_background.xml
Normal file
|
@ -0,0 +1,4 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<resources>
|
||||
<color name="ic_launcher_background">#DC0000</color>
|
||||
</resources>
|
|
@ -1,49 +1,43 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<resources>
|
||||
|
||||
<string name="alert_error">Sorry. An error was returned by %2$s while shortening the url: %1$s</string>
|
||||
<string name="alert_nocreds">Please provide your credentials to shorten urls.</string>
|
||||
<string name="alert_nohost">Sorry. Could not connect to %1$s.</string>
|
||||
<string name="alert_notfound">Sorry. No applications can perform this action.</string>
|
||||
<string name="alert_notfound_clip">Sorry. No applications can perform this action. The shortened url has been copied to the clipboard.</string>
|
||||
<string name="app_name">Emaily</string>
|
||||
<string name="dialog_accounts_title">Select a Google account to shorten with</string>
|
||||
<string name="prefs_about_title">About</string>
|
||||
<string name="prefs_bitly_creds_apikey">API Key</string>
|
||||
<string name="prefs_author_url">https://m.thauvin.net/android/</string>
|
||||
<string name="prefs_bitly_creds_apikey">API Token</string>
|
||||
<string name="prefs_bitly_creds_apikey_hint">bit.ly API Token</string>
|
||||
<string name="prefs_bitly_creds_cancel">Cancel</string>
|
||||
<string name="prefs_bitly_creds_dialog_title">Bit.ly API Credentials</string>
|
||||
<string name="prefs_bitly_creds_noapi"><u>Need an API key?</u></string>
|
||||
<string name="prefs_bitly_creds_noapi"><u>Need an API Token?</u></string>
|
||||
<string name="prefs_bitly_creds_ok">OK</string>
|
||||
<string name="prefs_bitly_creds_summary">Enter your credentials…</string>
|
||||
<string name="prefs_bitly_creds_summary_default">Enter your credentials…</string>
|
||||
<string name="prefs_bitly_creds_summary_edit">Click to edit…</string>
|
||||
<string name="prefs_bitly_creds_title">API Credentials</string>
|
||||
<string name="prefs_bitly_creds_url">http://bitly.com/a/your_api_key/</string>
|
||||
<string name="prefs_bitly_creds_username">Username</string>
|
||||
<string name="prefs_bitly_creds_url">https://bitly.is/accesstoken</string>
|
||||
<string name="prefs_bitly_title">bit.ly</string>
|
||||
<string name="prefs_copyright">© 2012–15 Erik C. Thauvin</string>
|
||||
<string name="prefs_copyright">© 2012–20 Erik C. Thauvin</string>
|
||||
<string name="prefs_feedback_subject">%1$s %2$s %3$s (%4$s %5$s, %6$s)</string>
|
||||
<string name="prefs_feedback_summary">Send email, please check Help first…</string>
|
||||
<string name="prefs_feedback_title">Feedback</string>
|
||||
<string name="prefs_feedback_url">mailto:erik@thauvin.net</string>
|
||||
<string name="prefs_googl_chkbox_title">Use as shorterner?</string>
|
||||
<string name="prefs_googl_title">goo.gl</string>
|
||||
<string name="prefs_help_summary">Learn how to use…</string>
|
||||
<string name="prefs_help_title">Help</string>
|
||||
<string name="prefs_help_url">http://m.thauvin.net/android/Emaily/help/</string>
|
||||
<string name="prefs_html_title">HTML</string>
|
||||
<string name="prefs_html_chkbox_title">Send email as HTML?</string>
|
||||
<string name="prefs_isgd_chkbox_title">Use as shorterner?</string>
|
||||
<string name="prefs_isgd_title">is.gd</string>
|
||||
<string name="prefs_key_bitly_apikey">prefs_bitly_apikey</string>
|
||||
<string name="prefs_key_bitly_creds">prefs_bitly_creds</string>
|
||||
<string name="prefs_key_bitly_username">prefs_bitly_username</string>
|
||||
<string name="prefs_key_feedback">prefs_feedback</string>
|
||||
<string name="prefs_key_googl_account">prefs_googl_account</string>
|
||||
<string name="prefs_key_googl_chkbox">prefs_googl_chkbox</string>
|
||||
<string name="prefs_key_googl_enabled">prefs_google_enabled</string>
|
||||
<string name="prefs_key_googl_token">prefs_googl_token</string>
|
||||
<string name="prefs_key_googl_token_expiry">prefs_gool_token_expiry</string>
|
||||
<string name="prefs_key_html_chkbox">prefs_html_chkbox</string>
|
||||
<string name="prefs_key_isgd_chkbox">prefs_isgd_chkbox</string>
|
||||
<string name="prefs_key_isgd_enabled">prefs_isgd_enabled</string>
|
||||
<string name="prefs_key_privacy">prefs_privacy</string>
|
||||
<string name="prefs_key_version">prefs_version</string>
|
||||
<string name="prefs_privacy_title">Privacy Policy</string>
|
||||
<string name="prefs_privacy_url">https://mobile.thauvin.net/apps-privacy.shtml</string>
|
||||
<string name="prefs_version_title">Version</string>
|
||||
<string name="progress_msg">Shortening url…</string>
|
||||
<string name="progress_msg_retry">Retrying…</string>
|
||||
|
||||
</resources>
|
||||
</resources>
|
||||
|
|
6
app/src/main/res/xml/mybackupscheme.xml
Normal file
|
@ -0,0 +1,6 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<full-backup-content>
|
||||
<include
|
||||
domain="sharedpref"
|
||||
path="." />
|
||||
</full-backup-content>
|
|
@ -1,51 +1,53 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
|
||||
<PreferenceCategory android:title="@string/prefs_googl_title">
|
||||
<PreferenceCategory android:title="@string/prefs_isgd_title">
|
||||
<CheckBoxPreference
|
||||
android:defaultValue="true"
|
||||
android:key="@string/prefs_key_googl_chkbox"
|
||||
android:title="@string/prefs_googl_chkbox_title"/>
|
||||
android:defaultValue="true"
|
||||
android:key="@string/prefs_key_isgd_chkbox"
|
||||
android:title="@string/prefs_isgd_chkbox_title" />
|
||||
</PreferenceCategory>
|
||||
<PreferenceCategory android:title="@string/prefs_bitly_title">
|
||||
<net.thauvin.erik.android.emaily.BitlyCredsDialog
|
||||
android:dialogLayout="@layout/bitlycreds"
|
||||
android:dialogTitle="@string/prefs_bitly_creds_dialog_title"
|
||||
android:key="@string/prefs_key_bitly_creds"
|
||||
android:negativeButtonText="@string/prefs_bitly_creds_cancel"
|
||||
android:positiveButtonText="@string/prefs_bitly_creds_ok"
|
||||
android:summary="@string/prefs_bitly_creds_summary"
|
||||
android:title="@string/prefs_bitly_creds_title">
|
||||
</net.thauvin.erik.android.emaily.BitlyCredsDialog>
|
||||
</PreferenceCategory>
|
||||
<PreferenceCategory android:title="@string/prefs_html_title">
|
||||
<CheckBoxPreference
|
||||
android:defaultValue="false"
|
||||
android:key="@string/prefs_key_html_chkbox"
|
||||
android:title="@string/prefs_html_chkbox_title"/>
|
||||
android:dialogLayout="@layout/bitlycreds"
|
||||
android:dialogTitle="@string/prefs_bitly_creds_dialog_title"
|
||||
android:key="@string/prefs_key_bitly_creds"
|
||||
android:negativeButtonText="@string/prefs_bitly_creds_cancel"
|
||||
android:positiveButtonText="@string/prefs_bitly_creds_ok"
|
||||
android:summary="@string/prefs_bitly_creds_summary_default"
|
||||
android:title="@string/prefs_bitly_creds_title"/>
|
||||
</PreferenceCategory>
|
||||
<PreferenceCategory android:title="@string/prefs_about_title">
|
||||
<PreferenceScreen
|
||||
android:summary="@string/prefs_help_summary"
|
||||
android:title="@string/prefs_help_title">
|
||||
android:summary="@string/prefs_help_summary"
|
||||
android:title="@string/prefs_help_title">
|
||||
<intent
|
||||
android:action="android.intent.action.VIEW"
|
||||
android:data="@string/prefs_help_url"/>
|
||||
android:action="android.intent.action.VIEW"
|
||||
android:data="@string/prefs_help_url" />
|
||||
</PreferenceScreen>
|
||||
<PreferenceScreen
|
||||
android:key="@string/prefs_key_feedback"
|
||||
android:summary="@string/prefs_feedback_summary"
|
||||
android:title="@string/prefs_feedback_title">
|
||||
android:key="@string/prefs_key_feedback"
|
||||
android:summary="@string/prefs_feedback_summary"
|
||||
android:title="@string/prefs_feedback_title">
|
||||
<intent
|
||||
android:action="android.intent.action.VIEW"
|
||||
android:data="@string/prefs_feedback_url"/>
|
||||
android:action="android.intent.action.VIEW"
|
||||
android:data="@string/prefs_feedback_url" />
|
||||
</PreferenceScreen>
|
||||
<PreferenceScreen
|
||||
android:key="@string/prefs_key_privacy"
|
||||
android:title="@string/prefs_privacy_title">
|
||||
<intent
|
||||
android:action="android.intent.action.VIEW"
|
||||
android:data="@string/prefs_privacy_url" />
|
||||
</PreferenceScreen>
|
||||
<PreferenceScreen
|
||||
android:key="@string/prefs_key_version"
|
||||
android:summary="@string/prefs_copyright"
|
||||
android:title="@string/prefs_version_title">
|
||||
<intent
|
||||
android:action="android.intent.action.VIEW"
|
||||
android:data="@string/prefs_author_url" />
|
||||
</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>
|
||||
|
||||
</PreferenceScreen>
|
||||
</PreferenceScreen>
|
||||
|
|
|
@ -0,0 +1,17 @@
|
|||
package net.thauvin.erik.android.emaily;
|
||||
|
||||
import org.junit.Test;
|
||||
|
||||
import static org.junit.Assert.*;
|
||||
|
||||
/**
|
||||
* Example local unit test, which will execute on the development machine (host).
|
||||
*
|
||||
* @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
|
||||
*/
|
||||
public class ExampleUnitTest {
|
||||
@Test
|
||||
public void addition_isCorrect() {
|
||||
assertEquals(4, 2 + 2);
|
||||
}
|
||||
}
|