From a9aa527c3a37cf5da28b8152f5583bbb979b5806 Mon Sep 17 00:00:00 2001 From: erik Date: Fri, 10 Apr 2015 08:57:28 -0700 Subject: [PATCH] Added parsing of text before URL if not title included. --- .idea/.name | 1 - .idea/compiler.xml | 23 --------- .idea/copyright/profiles_settings.xml | 5 -- .idea/encodings.xml | 5 -- .idea/misc.xml | 23 --------- .idea/modules.xml | 9 ---- .idea/scopes/scope_settings.xml | 5 -- .idea/vcs.xml | 7 --- AndroidManifest.xml | 2 +- Emaily.iml | 19 ------- build.gradle | 49 ------------------- .../thauvin/erik/android/emaily/Emaily.java | 23 +++++++-- 12 files changed, 20 insertions(+), 151 deletions(-) delete mode 100644 .idea/.name delete mode 100644 .idea/compiler.xml delete mode 100644 .idea/copyright/profiles_settings.xml delete mode 100644 .idea/encodings.xml delete mode 100644 .idea/misc.xml delete mode 100644 .idea/modules.xml delete mode 100644 .idea/scopes/scope_settings.xml delete mode 100644 .idea/vcs.xml delete mode 100644 Emaily.iml delete mode 100644 build.gradle diff --git a/.idea/.name b/.idea/.name deleted file mode 100644 index 249f321..0000000 --- a/.idea/.name +++ /dev/null @@ -1 +0,0 @@ -Emaily \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml deleted file mode 100644 index 217af47..0000000 --- a/.idea/compiler.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml deleted file mode 100644 index 3572571..0000000 --- a/.idea/copyright/profiles_settings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml deleted file mode 100644 index e206d70..0000000 --- a/.idea/encodings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/.idea/misc.xml b/.idea/misc.xml deleted file mode 100644 index 9848dec..0000000 --- a/.idea/misc.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - - 1.7 - - - - - - - - - diff --git a/.idea/modules.xml b/.idea/modules.xml deleted file mode 100644 index a2b7869..0000000 --- a/.idea/modules.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/.idea/scopes/scope_settings.xml b/.idea/scopes/scope_settings.xml deleted file mode 100644 index 922003b..0000000 --- a/.idea/scopes/scope_settings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml deleted file mode 100644 index 275077f..0000000 --- a/.idea/vcs.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 62decbf..420cd31 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -2,7 +2,7 @@ + android:versionName="1.1b8" > - - - - - - - - - - - - - - - - - - diff --git a/build.gradle b/build.gradle deleted file mode 100644 index 54833db..0000000 --- a/build.gradle +++ /dev/null @@ -1,49 +0,0 @@ -buildscript { - repositories { - mavenCentral() - } - dependencies { - classpath 'com.android.tools.build:gradle:0.4' - } -} -apply plugin: 'android' - -dependencies { - compile files('lib/bitlyj-2.0.0.jar') - compile files('../../Emaily/lib/commons-codec-1.6.jar') - compile files('../../Emaily/lib/google-api-client-1.7.0-beta.jar') - compile files('../../Emaily/lib/google-api-client-android2-1.7.0-beta.jar') - compile files('../../Emaily/lib/google-api-urlshortener-v1-rev2-java-1.4.0-beta.jar') - compile files('../../Emaily/lib/google-http-client-1.7.0-beta.jar') - compile files('../../Emaily/lib/google-http-client-android2-1.7.0-beta.jar') - compile files('../../Emaily/lib/google-http-client-android3-1.7.0-beta.jar') - compile files('../../Emaily/lib/google-oauth-client-1.7.0-beta.jar') - compile files('../../Emaily/lib/gson-2.1.jar') - compile files('../../Emaily/lib/guava-11.0.1.jar') - compile files('../../Emaily/lib/jackson-core-asl-1.9.4.jar') - compile files('../../Emaily/lib/jsr305-1.3.9.jar') - compile files('../../Emaily/lib/protobuf-java-2.2.0.jar') -} - -android { - compileSdkVersion 17 - buildToolsVersion "17" - - defaultConfig { - minSdkVersion 10 - targetSdkVersion 11 - } - sourceSets { - main { - manifest.srcFile 'AndroidManifest.xml' - java.srcDirs = ['src'] - resources.srcDirs = ['src'] - aidl.srcDirs = ['src'] - renderscript.srcDirs = ['src'] - res.srcDirs = ['res'] - assets.srcDirs = ['assets'] - } - - instrumentTest.setRoot('tests') - } -} diff --git a/src/net/thauvin/erik/android/emaily/Emaily.java b/src/net/thauvin/erik/android/emaily/Emaily.java index 6697e42..a360a47 100644 --- a/src/net/thauvin/erik/android/emaily/Emaily.java +++ b/src/net/thauvin/erik/android/emaily/Emaily.java @@ -386,10 +386,12 @@ public class Emaily extends Activity emailIntent.setType("text/plain"); } + final Bundle extras = intent[0].getExtras(); final String pageUrl = extras.getString(Intent.EXTRA_TEXT); final String pageTitle = extras.getString(Intent.EXTRA_SUBJECT); + final StringBuilder textBefore = new StringBuilder(); if (isValid(pageTitle)) { @@ -417,7 +419,9 @@ public class Emaily extends Activity final Url toInsert = new Url(); - for (String item : pageUrl.split("\\s")) + final String[] splits = pageUrl.split("\\s"); + + for (String item : splits) { try { @@ -524,6 +528,12 @@ public class Emaily extends Activity { Log.d(appName, "Attempted to process an invalid URL: " + item, mue); + if (textBefore.length() > 0) + { + textBefore.append(" "); + } + + textBefore.append(item); } } } @@ -544,14 +554,19 @@ public class Emaily extends Activity { emailIntent.putExtra(Intent.EXTRA_TEXT, shortUrl.toString()); } + + if (!isValid(pageTitle) && textBefore.length() > 0) + { + emailIntent.putExtra(Intent.EXTRA_SUBJECT, textBefore.toString()); + } } else { - final CharSequence text = extras.getCharSequence(Intent.EXTRA_TEXT); + final CharSequence chars = extras.getCharSequence(Intent.EXTRA_TEXT); - if (text.length() > 0) + if (chars.length() > 0) { - emailIntent.putExtra(Intent.EXTRA_TEXT, text); + emailIntent.putExtra(Intent.EXTRA_TEXT, chars); } else if (isValid(pageUrl)) {