diff --git a/.gitignore b/.gitignore
index ff4a396..18c743c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+.DS_Store
# built application files
*.apk
*.ap_
@@ -19,3 +20,12 @@ local.properties
.classpath
.project
*.~
+ant.properties
+cinequest.keystore
+abc.txt
+
+build/
+.gradle
+.idea
+gradle/
+gradlew*
diff --git a/Android/Android.iml b/Android/Android.iml
new file mode 100644
index 0000000..1dafa6e
--- /dev/null
+++ b/Android/Android.iml
@@ -0,0 +1,106 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ generateDebugSources
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Android/AndroidManifest.xml b/Android/AndroidManifest.xml
index f26cc50..9a3eab0 100644
--- a/Android/AndroidManifest.xml
+++ b/Android/AndroidManifest.xml
@@ -1,61 +1,69 @@
-
+ package="edu.sjsu.cinequest" android:versionCode="1602081517"
+ android:versionName="16.0208.1517">
-
-
+
-
-
+
-
-
-
+
+
+ android:label="@string/app_name"
+ android:screenOrientation="portrait" >
-
-
-
+
+
+ android:label="@string/app_name"
+ android:screenOrientation="portrait" >
-
+
+
+
-
\ No newline at end of file
+
diff --git a/Android/ant.properties b/Android/ant.properties
deleted file mode 100644
index 77d40b1..0000000
--- a/Android/ant.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-key.store=/home/cay/projects/cinequest/keys/cinequest.keystore
-key.alias=cinequestkeystore
diff --git a/Android/build.gradle b/Android/build.gradle
new file mode 100644
index 0000000..2c6f4c0
--- /dev/null
+++ b/Android/build.gradle
@@ -0,0 +1,37 @@
+apply plugin: 'com.android.application'
+
+dependencies {
+ compile fileTree(dir: 'libs', include: '*.jar')
+ compile project(':JavaCommon')
+}
+
+android {
+ compileSdkVersion 15
+ buildToolsVersion '25.0.0'
+
+ sourceSets {
+ main {
+ manifest.srcFile 'AndroidManifest.xml'
+ java.srcDirs = ['src']
+ resources.srcDirs = ['src']
+ aidl.srcDirs = ['src']
+ renderscript.srcDirs = ['src']
+ res.srcDirs = ['res']
+ assets.srcDirs = ['assets']
+ }
+
+ // Move the tests to tests/java, tests/res, etc...
+ instrumentTest.setRoot('tests')
+
+ // Move the build types to build-types/
+ // For instance, build-types/debug/java, build-types/debug/AndroidManifest.xml, ...
+ // This moves them out of them default location under src//... which would
+ // conflict with src/ being used by the main source set.
+ // Adding new build types or product flavors should be accompanied
+ // by a similar customization.
+ debug.setRoot('build-types/debug')
+ release.setRoot('build-types/release')
+ }
+
+ android.enforceUniquePackageName = false
+}
diff --git a/Android/project.properties b/Android/project.properties
index d6e65f7..4bf2be7 100644
--- a/Android/project.properties
+++ b/Android/project.properties
@@ -9,6 +9,6 @@
android.library=false
# Project target.
-target=android-18
+target=android-15
android.library.reference.1=../JavaCommon
android.library.reference.2=../facebook
diff --git a/Android/res/drawable-hdpi/events_icon_grey.png b/Android/res/drawable-hdpi/events_icon_grey.png
new file mode 100644
index 0000000..958bab5
Binary files /dev/null and b/Android/res/drawable-hdpi/events_icon_grey.png differ
diff --git a/Android/res/drawable-hdpi/events_icon_white_retina.png b/Android/res/drawable-hdpi/events_icon_white_retina.png
new file mode 100644
index 0000000..f695a83
Binary files /dev/null and b/Android/res/drawable-hdpi/events_icon_white_retina.png differ
diff --git a/Android/res/drawable-hdpi/film_icon2_grey.png b/Android/res/drawable-hdpi/film_icon2_grey.png
new file mode 100644
index 0000000..afea34c
Binary files /dev/null and b/Android/res/drawable-hdpi/film_icon2_grey.png differ
diff --git a/Android/res/drawable-hdpi/film_icon2_white_retina.png b/Android/res/drawable-hdpi/film_icon2_white_retina.png
new file mode 100644
index 0000000..bc5e0fe
Binary files /dev/null and b/Android/res/drawable-hdpi/film_icon2_white_retina.png differ
diff --git a/Android/res/drawable-hdpi/ic_action_remove.png b/Android/res/drawable-hdpi/ic_action_remove.png
new file mode 100644
index 0000000..f889617
Binary files /dev/null and b/Android/res/drawable-hdpi/ic_action_remove.png differ
diff --git a/Android/res/drawable-hdpi/news_2x_grey.png b/Android/res/drawable-hdpi/news_2x_grey.png
new file mode 100644
index 0000000..9346739
Binary files /dev/null and b/Android/res/drawable-hdpi/news_2x_grey.png differ
diff --git a/Android/res/drawable-hdpi/news_2x_white.png b/Android/res/drawable-hdpi/news_2x_white.png
new file mode 100644
index 0000000..12dcf59
Binary files /dev/null and b/Android/res/drawable-hdpi/news_2x_white.png differ
diff --git a/Android/res/drawable-hdpi/schedule_grey.png b/Android/res/drawable-hdpi/schedule_grey.png
new file mode 100644
index 0000000..d71ea51
Binary files /dev/null and b/Android/res/drawable-hdpi/schedule_grey.png differ
diff --git a/Android/res/drawable-hdpi/schedule_white_retina.png b/Android/res/drawable-hdpi/schedule_white_retina.png
new file mode 100644
index 0000000..076417c
Binary files /dev/null and b/Android/res/drawable-hdpi/schedule_white_retina.png differ
diff --git a/Android/res/drawable-hdpi/twitter.png b/Android/res/drawable-hdpi/twitter.png
new file mode 100644
index 0000000..732d233
Binary files /dev/null and b/Android/res/drawable-hdpi/twitter.png differ
diff --git a/Android/res/drawable-hdpi/youtube.png b/Android/res/drawable-hdpi/youtube.png
deleted file mode 100644
index ec44243..0000000
Binary files a/Android/res/drawable-hdpi/youtube.png and /dev/null differ
diff --git a/Android/res/drawable-mdpi/forums_icon.png b/Android/res/drawable-mdpi/forums_icon.png
deleted file mode 100644
index d58c77f..0000000
Binary files a/Android/res/drawable-mdpi/forums_icon.png and /dev/null differ
diff --git a/Android/res/drawable/androidsplash.png b/Android/res/drawable/androidsplash.png
new file mode 100644
index 0000000..58de079
Binary files /dev/null and b/Android/res/drawable/androidsplash.png differ
diff --git a/Android/res/drawable/disabledeventsbutton.xml b/Android/res/drawable/disabledeventsbutton.xml
new file mode 100644
index 0000000..a57da3a
--- /dev/null
+++ b/Android/res/drawable/disabledeventsbutton.xml
@@ -0,0 +1,11 @@
+
+
+
+
+
+
diff --git a/Android/res/drawable/disabledfilmsbutton.xml b/Android/res/drawable/disabledfilmsbutton.xml
new file mode 100644
index 0000000..cda2d36
--- /dev/null
+++ b/Android/res/drawable/disabledfilmsbutton.xml
@@ -0,0 +1,11 @@
+
+
+
+
+
+
diff --git a/Android/res/drawable/enabledeventsbutton.xml b/Android/res/drawable/enabledeventsbutton.xml
new file mode 100644
index 0000000..769cec6
--- /dev/null
+++ b/Android/res/drawable/enabledeventsbutton.xml
@@ -0,0 +1,11 @@
+
+
+
+
+
+
diff --git a/Android/res/drawable/enabledfilmsbutton.xml b/Android/res/drawable/enabledfilmsbutton.xml
new file mode 100644
index 0000000..8bd3f00
--- /dev/null
+++ b/Android/res/drawable/enabledfilmsbutton.xml
@@ -0,0 +1,11 @@
+
+
+
+
+
+
diff --git a/Android/res/drawable/filmreel.png b/Android/res/drawable/filmreel.png
index 05bec5a..9a21c08 100644
Binary files a/Android/res/drawable/filmreel.png and b/Android/res/drawable/filmreel.png differ
diff --git a/Android/res/drawable/ic_tab_event.xml b/Android/res/drawable/ic_tab_event.xml
new file mode 100644
index 0000000..87e9b9e
--- /dev/null
+++ b/Android/res/drawable/ic_tab_event.xml
@@ -0,0 +1,8 @@
+
+
+
+
"
+ + "Please re-open the app, or contact us for help.";
+
+ public static QueryManager getQueryManager() {
+ return queryManager;
+ }
+ public static ImageManager getImageManager() {
+ return imageManager;
+ }
+
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
- requestWindowFeature(Window.FEATURE_NO_TITLE);
+
+ Platform.setInstance(new AndroidPlatform(getApplicationContext()));
+ queryManager = new QueryManager();
+ imageManager = new ImageManager();
+
+ // TODO: Remove this to turn on test mode
+ // DateUtils.setMode(DateUtils.FESTIVAL_TEST_MODE);
+ Context context = getApplicationContext();
+ try {
+ PackageInfo pi = context.getPackageManager().getPackageInfo(getPackageName(), 0);
+ String version = pi.versionName;
+ setTitle("Cinequest" + (version == null ? "" : " " + version));
+ } catch (PackageManager.NameNotFoundException ex) {
+ // We tried...
+ }
+
+ requestWindowFeature(Window.FEATURE_NO_TITLE);
setContentView(R.layout.activity_splash_screen);
- mLoginStatusView = findViewById(R.id.login_status);
- Platform.setInstance(new AndroidPlatform(getApplicationContext()));
- loadData = new LoadData();
+ mLoginStatusView = findViewById(R.id.login_status);
+ progressBar = (ProgressBar) findViewById(R.id.progressBar1);
+ loginStatusMessage = (TextView) findViewById(R.id.login_status_message);
+ loadData = new LoadData(); //There might be a problem in three lines
loadData.execute((Void) null);
- showProgress(true);
+ showProgress(true); //progress bar shows but nothing is shown
+ }
+ protected void onStop(){ // TODO: Is this really called when the app stops?
+ imageManager.close();
+ Platform.getInstance().close();
+ super.onStop();
}
+
@TargetApi(Build.VERSION_CODES.HONEYCOMB_MR2)
private void showProgress(final boolean show) {
// On Honeycomb MR2 we have the ViewPropertyAnimator APIs, which allow
@@ -122,19 +172,17 @@ protected Boolean doInBackground(Void... params) {
try{
Uri uri = getContentResolver().insert(builder.build(), l_event);
if (uri == null)
- Log.i("SplashScreenActivity:LoadData","IllegalArgumentException");
+ Log.i("SplScrActivity:LoadData","IllegalArgumentException");
}
catch (Exception e){
- Log.i("SplashScreenActivity:LoadData","Error while creating Cinequest Calendar in Device Calendar");
+ Log.i("SplScrActivity:LoadData","Error while creating Cinequest Calendar in Device Calendar");
}
}
l_managedCursor.close();
l_managedCursor=null;
- //Create QueryManager Object and assign it to HomeActivity class queryManager variable.
- HomeActivity.setQueryManager(new QueryManager());
//Load News Feed, Festival & Venue Feed
- HomeActivity.getQueryManager().loadFestival(new Callback(){
+ SplashScreenActivity.getQueryManager().loadFestival(new Callback(){
@Override
public void invoke(Object result) {
showProgress(false);
@@ -145,7 +193,13 @@ public void invoke(Object result) {
}
@Override public void starting() {}
@Override public void failure(Throwable t) {
- Platform.getInstance().log(t);
+ Platform.getInstance().log(t);
+
+ // display server down instead
+ progressBar.setVisibility(View.GONE);
+ loginStatusMessage.setGravity(Gravity.CENTER);
+ loginStatusMessage.setTextSize(TypedValue.COMPLEX_UNIT_SP, 22);
+ loginStatusMessage.setText(Html.fromHtml(downServerMessage));
}
});
// TODO: register the new account here.
diff --git a/Android/src/edu/sjsu/cinequest/android/AndroidPlatform.java b/Android/src/edu/sjsu/cinequest/android/AndroidPlatform.java
index 932b3d7..b96c91b 100644
--- a/Android/src/edu/sjsu/cinequest/android/AndroidPlatform.java
+++ b/Android/src/edu/sjsu/cinequest/android/AndroidPlatform.java
@@ -1,5 +1,16 @@
package edu.sjsu.cinequest.android;
+import android.content.Context;
+import android.graphics.BitmapFactory;
+import android.net.ConnectivityManager;
+import android.net.NetworkInfo;
+import android.os.Handler;
+import android.util.Log;
+
+import org.xml.sax.InputSource;
+import org.xml.sax.SAXException;
+import org.xml.sax.helpers.DefaultHandler;
+
import java.io.ByteArrayInputStream;
import java.io.File;
import java.io.FileInputStream;
@@ -12,24 +23,12 @@
import java.io.OutputStream;
import java.io.PrintWriter;
import java.io.StringWriter;
-import java.util.Collections;
import java.util.Hashtable;
-import java.util.Vector;
import javax.xml.parsers.ParserConfigurationException;
import javax.xml.parsers.SAXParser;
import javax.xml.parsers.SAXParserFactory;
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
-import org.xml.sax.helpers.DefaultHandler;
-
-import android.content.Context;
-import android.graphics.BitmapFactory;
-import android.net.ConnectivityManager;
-import android.net.NetworkInfo;
-import android.os.Handler;
-import android.util.Log;
import edu.sjsu.cinequest.comm.Cache;
import edu.sjsu.cinequest.comm.Callback;
import edu.sjsu.cinequest.comm.CallbackException;
@@ -101,6 +100,9 @@ public void parse(String url, DefaultHandler handler, Callback callback)
* http://www.google.com/search?q=android+XML+parser+8859-1 The parser
* can't infer the character encoding from the xml encoding attribute,
* so we have to hardwire 8859-1 here.
+ * Instead of 8859-1, I hardcoded the encoding to UTF-8, since it was
+ * previously hardcoded to ISO-8895-I for the reasons stated above
+ * - Michael Singh
*/
if (getFromCache(url, sp, handler, MAX_CACHE_AGE))
return;
@@ -115,7 +117,7 @@ public void parse(String url, DefaultHandler handler, Callback callback)
// Store the xml source
xmlRawBytesCache.put(url, xmlSource);
InputSource in = new InputSource(new InputStreamReader(
- new ByteArrayInputStream(xmlSource), "ISO-8859-1"));
+ new ByteArrayInputStream(xmlSource), "UTF-8"));
sp.parse(in, handler);
} catch (IOException e) {
Platform.getInstance().log(e);
@@ -125,7 +127,9 @@ public void parse(String url, DefaultHandler handler, Callback callback)
CallbackException.ERROR);
}
}
-
+ /*
+ * Changed encoding from ISO-8895-I to UTF-8
+ */
private boolean getFromCache(String url, SAXParser sp,
DefaultHandler handler, long maxage) throws SAXException,
IOException {
@@ -133,7 +137,7 @@ private boolean getFromCache(String url, SAXParser sp,
// XML exists in cache and isn't too old
if (bytes != null) {
InputSource in = new InputSource(new InputStreamReader(
- new ByteArrayInputStream(bytes), "ISO-8859-1"));
+ new ByteArrayInputStream(bytes), "UTF-8"));
sp.parse(in, handler);
Platform.getInstance().log(
"AndroidPlatform.getFromCache: Returned cached response for "
@@ -194,6 +198,9 @@ public void run() {
+ t.getClass().toString();
if (t.getMessage() != null)
error += ", Message=" + t.getMessage();
+ StringWriter out = new StringWriter();
+ t.printStackTrace(new PrintWriter(out));
+ error += ", Stack trace=" + out.toString();
log("AndroidPlatform.invoke: " + error);
}
@@ -246,7 +253,6 @@ public Object loadPersistentObject(long key) {
@Override
public MessageDigest getMessageDigestInstance(String name) {
- // TODO Auto-generated method stub
return null;
}
diff --git a/Android/src/edu/sjsu/cinequest/android/AndroidWebConnection.java b/Android/src/edu/sjsu/cinequest/android/AndroidWebConnection.java
index 3a473e7..97c4615 100644
--- a/Android/src/edu/sjsu/cinequest/android/AndroidWebConnection.java
+++ b/Android/src/edu/sjsu/cinequest/android/AndroidWebConnection.java
@@ -35,7 +35,9 @@
import edu.sjsu.cinequest.comm.WebConnection;
// http://android-developers.blogspot.com/2011/09/androids-http-clients.html
-
+/**
+ * AndroidWebConnection connects to internet by trying different key,value to get a response.
+ */
public class AndroidWebConnection extends WebConnection {
private String url;
private Hashtable postData;
@@ -70,7 +72,10 @@ public AndroidWebConnection(String url) throws IOException
public void setPostParameters(Hashtable postData) throws IOException {
this.postData = postData;
}
-
+ /**
+ * If there was a response, do not look for a response, continue.
+ * If there was no response, hit some hosts see who will respond.
+ */
private void execute() throws IOException
{
Platform.getInstance().log("AndroidWebConnection.execute: Opening connection to " + url);
diff --git a/Android/src/edu/sjsu/cinequest/imageutils/FileCache.java b/Android/src/edu/sjsu/cinequest/imageutils/FileCache.java
index 38f7333..3b66756 100644
--- a/Android/src/edu/sjsu/cinequest/imageutils/FileCache.java
+++ b/Android/src/edu/sjsu/cinequest/imageutils/FileCache.java
@@ -3,10 +3,17 @@
import java.io.File;
import android.content.Context;
+/*
+ Implements a simple file cache
+*/
public class FileCache {
private File cacheDir;
+ /**
+ * Constructs a new cache object and directory
+ * @param context The android context we are running the application on.
+ */
public FileCache(Context context){
//Find the dir to save cached images
if (android.os.Environment.getExternalStorageState().equals(android.os.Environment.MEDIA_MOUNTED))
@@ -17,6 +24,12 @@ public FileCache(Context context){
cacheDir.mkdirs();
}
+ /**
+ * Creates a File object from the cache directory
+ * and identifies it with a hashcode
+ * @param url A path to a file
+ * @return a new File from the cache
+ */
public File getFile(String url){
//I identify images by hashcode. Not a perfect solution, good for the demo.
String filename=String.valueOf(url.hashCode());
@@ -27,6 +40,9 @@ public File getFile(String url){
}
+ /**
+ * Removes all files in the cache if there is any
+ */
public void clear(){
File[] files=cacheDir.listFiles();
if(files==null)
diff --git a/Android/src/edu/sjsu/cinequest/imageutils/ImageLoader.java b/Android/src/edu/sjsu/cinequest/imageutils/ImageLoader.java
index 02abff8..d1ac6e8 100644
--- a/Android/src/edu/sjsu/cinequest/imageutils/ImageLoader.java
+++ b/Android/src/edu/sjsu/cinequest/imageutils/ImageLoader.java
@@ -37,7 +37,7 @@ public ImageLoader(Context context){
}
final int stub_id=R.drawable.ic_launcher;
- public void DisplayImage(String url, ImageView imageView)
+ public void displayImage(String url, ImageView imageView)
{
imageViews.put(imageView, url);
Bitmap bitmap=memoryCache.get(url);
diff --git a/Cinequest-Android.iml b/Cinequest-Android.iml
new file mode 100644
index 0000000..7dc5c9f
--- /dev/null
+++ b/Cinequest-Android.iml
@@ -0,0 +1,19 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/JavaCommon/AndroidManifest.xml b/JavaCommon/AndroidManifest.xml
index dfbbb09..40098d5 100644
--- a/JavaCommon/AndroidManifest.xml
+++ b/JavaCommon/AndroidManifest.xml
@@ -1,8 +1,12 @@
+ package="edu.sjsu.cinequest.comm">
-
+
+
diff --git a/JavaCommon/JavaCommon.iml b/JavaCommon/JavaCommon.iml
new file mode 100644
index 0000000..33593c2
--- /dev/null
+++ b/JavaCommon/JavaCommon.iml
@@ -0,0 +1,95 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ generateDebugSources
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/JavaCommon/build.gradle b/JavaCommon/build.gradle
new file mode 100644
index 0000000..c5ac1c3
--- /dev/null
+++ b/JavaCommon/build.gradle
@@ -0,0 +1,34 @@
+apply plugin: 'com.android.library'
+
+dependencies {
+ compile fileTree(dir: 'libs', include: '*.jar')
+}
+
+android {
+ compileSdkVersion 15
+ buildToolsVersion '25.0.0'
+
+ sourceSets {
+ main {
+ manifest.srcFile 'AndroidManifest.xml'
+ java.srcDirs = ['src']
+ resources.srcDirs = ['src']
+ aidl.srcDirs = ['src']
+ renderscript.srcDirs = ['src']
+ res.srcDirs = ['res']
+ assets.srcDirs = ['assets']
+ }
+
+ // Move the tests to tests/java, tests/res, etc...
+ instrumentTest.setRoot('tests')
+
+ // Move the build types to build-types/
+ // For instance, build-types/debug/java, build-types/debug/AndroidManifest.xml, ...
+ // This moves them out of them default location under src//... which would
+ // conflict with src/ being used by the main source set.
+ // Adding new build types or product flavors should be accompanied
+ // by a similar customization.
+ debug.setRoot('build-types/debug')
+ release.setRoot('build-types/release')
+ }
+}
diff --git a/JavaCommon/project.properties b/JavaCommon/project.properties
index 6905bdf..f28bc83 100644
--- a/JavaCommon/project.properties
+++ b/JavaCommon/project.properties
@@ -9,4 +9,4 @@
android.library=true
# Project target.
-target=android-18
+target=android-15
diff --git a/JavaCommon/src/edu/sjsu/cinequest/comm/HParser.java b/JavaCommon/src/edu/sjsu/cinequest/comm/HParser.java
index 2b91078..72af111 100644
--- a/JavaCommon/src/edu/sjsu/cinequest/comm/HParser.java
+++ b/JavaCommon/src/edu/sjsu/cinequest/comm/HParser.java
@@ -18,7 +18,8 @@
*/
package edu.sjsu.cinequest.comm;
-import java.util.Vector;
+import java.util.ArrayList;
+import java.util.List;
/**
* HParser converts plain strings into RichText. This follows the BlackBerry API but is also usable
@@ -40,7 +41,7 @@ public class HParser
private int[] offsets = null;
// Tracks the font by the reference byte
- private Vector images;
+ private List images;
public static final int RED = 8;
public static final int LARGE = 4;
@@ -54,17 +55,17 @@ public class HParser
*/
public void parse(String input)
{
- Vector offs = new Vector();
- Vector attrs = new Vector();
-
- images = new Vector();
+ if (input == null) input = "";
+ List offs = new ArrayList();
+ List attrs = new ArrayList();
+ images = new ArrayList();
byte font = (byte) 0;
boolean inTag = false;
int start = 0; // The start of the last tag
int end = -1; // The end of the last tag
- StringBuffer result = new StringBuffer();
- offs.addElement(new Integer(0));
+ StringBuilder result = new StringBuilder();
+ offs.add(0);
for (int i = 0; i < input.length(); i++)
{
char ch = input.charAt(i);
@@ -94,8 +95,8 @@ else if (!checkForImage(images, tag))
{
if (result.length() > 0)
{
- offs.addElement(new Integer(result.length()));
- attrs.addElement(new Byte(font));
+ offs.add(result.length());
+ attrs.add(font);
}
font = newFont;
}
@@ -105,20 +106,20 @@ else if (!checkForImage(images, tag))
if (end < input.length() - 1)
{
result.append(input.substring(end + 1, input.length()));
- offs.addElement(new Integer(result.length()));
- attrs.addElement(new Byte(font));
+ offs.add(result.length());
+ attrs.add(font);
}
attributes = new byte[attrs.size()];
for (int i = 0; i < attrs.size(); i++)
{
- attributes[i] = ((Byte) attrs.elementAt(i)).byteValue();
+ attributes[i] = attrs.get(i);
}
offsets = new int[offs.size()];
for (int i = 0; i < offs.size(); i++)
{
- offsets[i] = ((Integer) offs.elementAt(i)).intValue();
+ offsets[i] = offs.get(i);
}
resultString = result.toString();
@@ -153,9 +154,9 @@ public String getResultString()
/**
* Returns the image URLs found in the input
- * @return a vector of image URL strings
+ * @return a list of image URL strings
*/
- public Vector getImageURLs()
+ public List getImageURLs()
{
return images;
}
@@ -224,12 +225,12 @@ private byte setFont(byte font, int fontElement, boolean on)
/**
- * Scans a string for img tags and deposits the src attributes in a vector
+ * Scans a string for img tags and deposits the src attributes in a list
* @param images the vector to which the src attributes are added
* @param tagString the string to be scanned
* @return true if an image has been found
*/
- private static boolean checkForImage(Vector images, String tagString)
+ private static boolean checkForImage(List images, String tagString)
{
if (!tagString.startsWith("img"))
return false;
@@ -242,7 +243,7 @@ private static boolean checkForImage(Vector images, String tagString)
int j = tagString.indexOf("\"", i + 1);
if (j == -1)
return false;
- images.addElement(tagString.substring(i + 1, j));
+ images.add(tagString.substring(i + 1, j));
return true;
}
diff --git a/JavaCommon/src/edu/sjsu/cinequest/comm/ImageManager.java b/JavaCommon/src/edu/sjsu/cinequest/comm/ImageManager.java
index 57f5fe6..bf1601a 100644
--- a/JavaCommon/src/edu/sjsu/cinequest/comm/ImageManager.java
+++ b/JavaCommon/src/edu/sjsu/cinequest/comm/ImageManager.java
@@ -21,8 +21,9 @@
import java.io.IOException;
import java.net.HttpURLConnection;
+import java.util.ArrayList;
import java.util.Hashtable;
-import java.util.Vector;
+import java.util.List;
/**
* Set's up a HTTP connection, retrives the image from the specified URL,and
@@ -59,6 +60,13 @@ public ImageManager()
private Object fetchImage(String imageUrl, boolean usePersistentCache) throws IOException
{
Object image = null;
+ // the problem of image not loading is right here because of url encoding
+ // check if there are spaces in image url
+ if ((imageUrl.contains("image") || imageUrl.contains(".jpg")) && imageUrl.contains(" ")) {
+ // replace " " with "%20"
+ imageUrl = imageUrl.replace(" ", "%20");
+ }
+
HttpURLConnection connection = ConnectionHelper.open(imageUrl);
if (!connection.getHeaderField("content-type").startsWith("image"))
{
@@ -132,23 +140,23 @@ public void run()
* Fetches multiple images in one thread. Called from UI thread.
* @param imageUrls the image URLs
* @param callback the callback for reporting progress. Each progress call delivers one image.
- * Final callback delivers vector of all images
+ * Final callback delivers list of all images
*/
- public void getImages(final Vector imageUrls, final Callback callback)
+ public void getImages(final List imageUrls, final Callback callback)
{
callback.starting();
Thread t = new Thread(new Runnable()
{
public void run()
{
- Vector images = new Vector();
+ List