Get rid or mesgedittext entirely - its causing bugs.

Author: ldornin

FinchFramework/src/com/finchframework/finch/views/MesgEditText.java

@@ -1,8 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
+
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           package="com.oreilly.demo.android.pa.finchvideo"
           android:versionCode="1"
           android:versionName="1.0">
+
+    <uses-permission android:name="android.permission.INTERNET"/>
+
     <application android:icon="@drawable/icon"
                  android:label="@string/app_name"
                  android:debuggable="true">
@@ -13,20 +17,18 @@
                   android:authorities="com.oreilly.demo.android.pa.finchvideo.SimpleFinchVideo"
                 />
         <activity android:name=".FinchVideoActivity"
-                  android:label="@string/finch_video_app_name" >
+                  android:label="@string/finch_video_app_name">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.LAUNCHER" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
         </activity>
         <activity android:name=".SimpleFinchVideoActivity"
                   android:label="Simple Video Activity">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.LAUNCHER" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
         </activity>
     </application>
-    <uses-permission android:name="android.permission.INTERNET" />
-    <uses-sdk android:minSdkVersion="7" />
 </manifest>

FinchVideo/AndroidManifest.xml

@@ -8,5 +8,5 @@
 # project structure.
 
 # Project target.
-target=android-14
-android.library.reference.1=../FinchFramework
+target=android-17
+

FinchVideo/project.properties

@@ -20,14 +20,13 @@
                 android:layout_gravity="center_horizontal"
                 android:background="@color/medium_gray"
                 >
-            <com.finchframework.finch.views.MesgEditText
+            <EditText
                     android:id="@+id/video_search_box"
                     android:width="0px"
                     android:height="40px"
                     android:layout_weight="1"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="@string/finch_video_search"
                     android:lines="1"
                     android:singleLine="true"
                     />

FinchVideo/res/layout/video_query_activity.xml

@@ -3,7 +3,7 @@
     <string name="finch_video_app_name">Finch Video</string>
     <string name="finch_video_update_content">Update Content</string>
     <string name="finch_video_search">Search Videos</string>
-    <string name="app_name">YouTube Video Example</string>
+    <string name="app_name">FinchVideo</string>
 
     <string name="simple_insert_text">Insert</string>
     <string name="title">Title</string>

FinchVideo/res/values/strings.xml

@@ -8,6 +8,7 @@
 import android.graphics.BitmapFactory;
 import android.net.Uri;
 import android.os.Bundle;
+import android.text.Editable;
 import android.util.Log;
 import android.view.KeyEvent;
 import android.view.View;
@@ -18,7 +19,6 @@
 import android.widget.SimpleCursorAdapter;
 import android.widget.TextView;
 import com.finchframework.finch.Finch;
-import com.finchframework.finch.views.MesgEditText;
 import com.oreilly.demo.android.pa.finchvideo.provider.FinchVideo;
 
 import java.io.FileNotFoundException;
@@ -33,7 +33,7 @@
 public class FinchVideoActivity extends Activity {
     SimpleCursorAdapter mAdapter;
 
-    private MesgEditText mSearchText;
+    private EditText mSearchText;
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
@@ -83,8 +83,7 @@ public boolean setViewValue(View view, Cursor cursor, int i) {
 
         searchList.setAdapter(mAdapter);
 
-        mSearchText = (MesgEditText) findViewById(R.id.video_search_box);
-        mSearchText.setMesgText(r.getString(R.string.finch_video_search));
+        mSearchText = (EditText) findViewById(R.id.video_search_box);
         mSearchText.setOnEditorActionListener(
             new EditText.OnEditorActionListener() {
                 @Override
@@ -137,15 +136,28 @@ void setThumbResource(View view, Cursor cursor) {
 
     // sends the query to the finch video content provider
     void query() {
-        if (!mSearchText.searchEmpty()) {
+        String searchText = getText();
+        if (!searchEmpty(searchText)) {
             String queryString =
                 FinchVideo.Videos.QUERY_PARAM_NAME + "=" +
-                Uri.encode(mSearchText.getText().toString());
+                Uri.encode(searchText.toString());
             Uri queryUri =
                 Uri.parse(FinchVideo.Videos.CONTENT_URI + "?" +
                     queryString);
             Cursor c = managedQuery(queryUri, null, null, null, null);
             mAdapter.changeCursor(c);
         }
     }
+
+    private String getText() {
+        Editable editable = mSearchText.getText();
+        if (editable != null) {
+            return editable.toString();
+        }
+        return null;
+    }
+
+    private boolean searchEmpty(String text) {
+        return (text != null) && ("".equals(text));
+    }
 }