diff --git a/bin/classes.dex b/bin/classes.dex index 349fc2f..4d0d6d7 100644 Binary files a/bin/classes.dex and b/bin/classes.dex differ diff --git a/bin/com/architects/findme/Conversation$1.class b/bin/com/architects/findme/Conversation$1.class new file mode 100644 index 0000000..ea94509 Binary files /dev/null and b/bin/com/architects/findme/Conversation$1.class differ diff --git a/bin/com/architects/findme/Conversation$2.class b/bin/com/architects/findme/Conversation$2.class new file mode 100644 index 0000000..3bc4619 Binary files /dev/null and b/bin/com/architects/findme/Conversation$2.class differ diff --git a/bin/com/architects/findme/Conversation.class b/bin/com/architects/findme/Conversation.class index d1b5f72..73c1cf7 100644 Binary files a/bin/com/architects/findme/Conversation.class and b/bin/com/architects/findme/Conversation.class differ diff --git a/bin/com/architects/findme/FindMe.class b/bin/com/architects/findme/FindMe.class index 8c4dc7e..cf7eb34 100644 Binary files a/bin/com/architects/findme/FindMe.class and b/bin/com/architects/findme/FindMe.class differ diff --git a/bin/com/architects/findme/FindMeMenu$1.class b/bin/com/architects/findme/FindMeMenu$1.class index 956194c..e6083dc 100644 Binary files a/bin/com/architects/findme/FindMeMenu$1.class and b/bin/com/architects/findme/FindMeMenu$1.class differ diff --git a/bin/com/architects/findme/FindMeMenu.class b/bin/com/architects/findme/FindMeMenu.class index 4a85f59..5dca722 100644 Binary files a/bin/com/architects/findme/FindMeMenu.class and b/bin/com/architects/findme/FindMeMenu.class differ diff --git a/bin/com/architects/findme/Friends$1$1$1.class b/bin/com/architects/findme/Friends$1$1$1.class new file mode 100644 index 0000000..bd54901 Binary files /dev/null and b/bin/com/architects/findme/Friends$1$1$1.class differ diff --git a/bin/com/architects/findme/Friends$1$1$2.class b/bin/com/architects/findme/Friends$1$1$2.class new file mode 100644 index 0000000..b9b0eb7 Binary files /dev/null and b/bin/com/architects/findme/Friends$1$1$2.class differ diff --git a/bin/com/architects/findme/Friends$1$1.class b/bin/com/architects/findme/Friends$1$1.class index d20cab8..be08766 100644 Binary files a/bin/com/architects/findme/Friends$1$1.class and b/bin/com/architects/findme/Friends$1$1.class differ diff --git a/bin/com/architects/findme/Friends$1.class b/bin/com/architects/findme/Friends$1.class index 147ef7e..16fe530 100644 Binary files a/bin/com/architects/findme/Friends$1.class and b/bin/com/architects/findme/Friends$1.class differ diff --git a/bin/com/architects/findme/Friends$2.class b/bin/com/architects/findme/Friends$2.class index e4e9383..f7b9d1e 100644 Binary files a/bin/com/architects/findme/Friends$2.class and b/bin/com/architects/findme/Friends$2.class differ diff --git a/bin/com/architects/findme/Friends$3.class b/bin/com/architects/findme/Friends$3.class new file mode 100644 index 0000000..ebbf347 Binary files /dev/null and b/bin/com/architects/findme/Friends$3.class differ diff --git a/bin/com/architects/findme/Friends.class b/bin/com/architects/findme/Friends.class index c66ea7f..3675405 100644 Binary files a/bin/com/architects/findme/Friends.class and b/bin/com/architects/findme/Friends.class differ diff --git a/bin/com/architects/findme/Login$1.class b/bin/com/architects/findme/Login$1.class new file mode 100644 index 0000000..68a37b3 Binary files /dev/null and b/bin/com/architects/findme/Login$1.class differ diff --git a/bin/com/architects/findme/Login$2.class b/bin/com/architects/findme/Login$2.class new file mode 100644 index 0000000..4c9e0fd Binary files /dev/null and b/bin/com/architects/findme/Login$2.class differ diff --git a/bin/com/architects/findme/Login.class b/bin/com/architects/findme/Login.class index 31fa23a..559c1f3 100644 Binary files a/bin/com/architects/findme/Login.class and b/bin/com/architects/findme/Login.class differ diff --git a/bin/com/architects/findme/Main.class b/bin/com/architects/findme/Main.class index 7060842..456f02f 100644 Binary files a/bin/com/architects/findme/Main.class and b/bin/com/architects/findme/Main.class differ diff --git a/bin/com/architects/findme/MapNearby.class b/bin/com/architects/findme/MapNearby.class index c49a364..952f6ae 100644 Binary files a/bin/com/architects/findme/MapNearby.class and b/bin/com/architects/findme/MapNearby.class differ diff --git a/bin/com/architects/findme/Messages$1$1.class b/bin/com/architects/findme/Messages$1$1.class new file mode 100644 index 0000000..04d742e Binary files /dev/null and b/bin/com/architects/findme/Messages$1$1.class differ diff --git a/bin/com/architects/findme/Messages$1.class b/bin/com/architects/findme/Messages$1.class index cf46240..0f34e79 100644 Binary files a/bin/com/architects/findme/Messages$1.class and b/bin/com/architects/findme/Messages$1.class differ diff --git a/bin/com/architects/findme/Messages$2.class b/bin/com/architects/findme/Messages$2.class new file mode 100644 index 0000000..fc3541b Binary files /dev/null and b/bin/com/architects/findme/Messages$2.class differ diff --git a/bin/com/architects/findme/Messages.class b/bin/com/architects/findme/Messages.class index 6e92210..5091e6c 100644 Binary files a/bin/com/architects/findme/Messages.class and b/bin/com/architects/findme/Messages.class differ diff --git a/bin/com/architects/findme/Nearby$1.class b/bin/com/architects/findme/Nearby$1.class index 4b24d92..f7188b1 100644 Binary files a/bin/com/architects/findme/Nearby$1.class and b/bin/com/architects/findme/Nearby$1.class differ diff --git a/bin/com/architects/findme/Nearby$MyLocationListener.class b/bin/com/architects/findme/Nearby$MyLocationListener.class index 823ee18..5a3a1d4 100644 Binary files a/bin/com/architects/findme/Nearby$MyLocationListener.class and b/bin/com/architects/findme/Nearby$MyLocationListener.class differ diff --git a/bin/com/architects/findme/Nearby.class b/bin/com/architects/findme/Nearby.class index 355d03e..20c4d02 100644 Binary files a/bin/com/architects/findme/Nearby.class and b/bin/com/architects/findme/Nearby.class differ diff --git a/bin/com/architects/findme/PeopleItemizedOverlay.class b/bin/com/architects/findme/PeopleItemizedOverlay.class index 416525b..30599fb 100644 Binary files a/bin/com/architects/findme/PeopleItemizedOverlay.class and b/bin/com/architects/findme/PeopleItemizedOverlay.class differ diff --git a/bin/com/architects/findme/Profile.class b/bin/com/architects/findme/Profile.class index 2440170..b36daab 100644 Binary files a/bin/com/architects/findme/Profile.class and b/bin/com/architects/findme/Profile.class differ diff --git a/bin/com/architects/findme/R$drawable.class b/bin/com/architects/findme/R$drawable.class index 32934b3..095687a 100644 Binary files a/bin/com/architects/findme/R$drawable.class and b/bin/com/architects/findme/R$drawable.class differ diff --git a/bin/com/architects/findme/R$id.class b/bin/com/architects/findme/R$id.class index 98bdeac..d916852 100644 Binary files a/bin/com/architects/findme/R$id.class and b/bin/com/architects/findme/R$id.class differ diff --git a/bin/com/architects/findme/R$layout.class b/bin/com/architects/findme/R$layout.class index bf0686e..753493d 100644 Binary files a/bin/com/architects/findme/R$layout.class and b/bin/com/architects/findme/R$layout.class differ diff --git a/bin/com/architects/findme/R$menu.class b/bin/com/architects/findme/R$menu.class index 2cb9651..2c12278 100644 Binary files a/bin/com/architects/findme/R$menu.class and b/bin/com/architects/findme/R$menu.class differ diff --git a/bin/com/architects/findme/R$string.class b/bin/com/architects/findme/R$string.class index bb37eb0..7764d08 100644 Binary files a/bin/com/architects/findme/R$string.class and b/bin/com/architects/findme/R$string.class differ diff --git a/bin/com/architects/findme/Registration$1.class b/bin/com/architects/findme/Registration$1.class new file mode 100644 index 0000000..37904c5 Binary files /dev/null and b/bin/com/architects/findme/Registration$1.class differ diff --git a/bin/com/architects/findme/Registration$2.class b/bin/com/architects/findme/Registration$2.class new file mode 100644 index 0000000..8fdc598 Binary files /dev/null and b/bin/com/architects/findme/Registration$2.class differ diff --git a/bin/com/architects/findme/Registration.class b/bin/com/architects/findme/Registration.class index 9c36963..1031403 100644 Binary files a/bin/com/architects/findme/Registration.class and b/bin/com/architects/findme/Registration.class differ diff --git a/bin/com/architects/findme/Search$1$1.class b/bin/com/architects/findme/Search$1$1.class new file mode 100644 index 0000000..6131e9b Binary files /dev/null and b/bin/com/architects/findme/Search$1$1.class differ diff --git a/bin/com/architects/findme/Search$1.class b/bin/com/architects/findme/Search$1.class index a3d8cad..1ffbeae 100644 Binary files a/bin/com/architects/findme/Search$1.class and b/bin/com/architects/findme/Search$1.class differ diff --git a/bin/com/architects/findme/Search$2.class b/bin/com/architects/findme/Search$2.class new file mode 100644 index 0000000..3b286a2 Binary files /dev/null and b/bin/com/architects/findme/Search$2.class differ diff --git a/bin/com/architects/findme/Search.class b/bin/com/architects/findme/Search.class index f35baf0..c13c36b 100644 Binary files a/bin/com/architects/findme/Search.class and b/bin/com/architects/findme/Search.class differ diff --git a/bin/com/architects/helper/AccountHelper.class b/bin/com/architects/helper/AccountHelper.class index 107d9e3..1477523 100644 Binary files a/bin/com/architects/helper/AccountHelper.class and b/bin/com/architects/helper/AccountHelper.class differ diff --git a/bin/com/architects/helper/FriendsHelper.class b/bin/com/architects/helper/FriendsHelper.class index ade8acb..535722f 100644 Binary files a/bin/com/architects/helper/FriendsHelper.class and b/bin/com/architects/helper/FriendsHelper.class differ diff --git a/bin/com/architects/helper/LocationHelper$MyLocationListener.class b/bin/com/architects/helper/LocationHelper$MyLocationListener.class index 9e12261..966e008 100644 Binary files a/bin/com/architects/helper/LocationHelper$MyLocationListener.class and b/bin/com/architects/helper/LocationHelper$MyLocationListener.class differ diff --git a/bin/com/architects/helper/LocationHelper.class b/bin/com/architects/helper/LocationHelper.class index aee1591..8929cbe 100644 Binary files a/bin/com/architects/helper/LocationHelper.class and b/bin/com/architects/helper/LocationHelper.class differ diff --git a/bin/com/architects/helper/MessagesHelper.class b/bin/com/architects/helper/MessagesHelper.class index d58cb40..b57dd71 100644 Binary files a/bin/com/architects/helper/MessagesHelper.class and b/bin/com/architects/helper/MessagesHelper.class differ diff --git a/bin/com/architects/helper/RequestHelper.class b/bin/com/architects/helper/RequestHelper.class new file mode 100644 index 0000000..5f77941 Binary files /dev/null and b/bin/com/architects/helper/RequestHelper.class differ diff --git a/bin/com/architects/helper/SearchHelper.class b/bin/com/architects/helper/SearchHelper.class index d2f605f..f5f680c 100644 Binary files a/bin/com/architects/helper/SearchHelper.class and b/bin/com/architects/helper/SearchHelper.class differ diff --git a/bin/com/architects/helper/StandardHelper.class b/bin/com/architects/helper/StandardHelper.class new file mode 100644 index 0000000..a5b862e Binary files /dev/null and b/bin/com/architects/helper/StandardHelper.class differ diff --git a/bin/findMe.apk b/bin/findMe.apk index 7e78c32..43a644f 100644 Binary files a/bin/findMe.apk and b/bin/findMe.apk differ diff --git a/bin/resources.ap_ b/bin/resources.ap_ index 4cd7aaa..3737c65 100644 Binary files a/bin/resources.ap_ and b/bin/resources.ap_ differ diff --git a/gen/com/architects/findme/R.java b/gen/com/architects/findme/R.java index 132d37d..6aa1d5b 100644 --- a/gen/com/architects/findme/R.java +++ b/gen/com/architects/findme/R.java @@ -42,73 +42,76 @@ public final class R { public static final int me=0x7f020011; public static final int messages=0x7f020012; public static final int nearby=0x7f020013; - public static final int search=0x7f020014; - public static final int tab_bg_selected=0x7f020015; - public static final int tab_bg_selector=0x7f020016; - public static final int tab_bg_unselected=0x7f020017; - public static final int tab_divider=0x7f020018; - public static final int tab_text_selector=0x7f020019; - public static final int top_bg=0x7f02001a; - public static final int user=0x7f02001b; - public static final int user_big=0x7f02001c; + public static final int reload_button=0x7f020014; + public static final int search=0x7f020015; + public static final int tab_bg_selected=0x7f020016; + public static final int tab_bg_selector=0x7f020017; + public static final int tab_bg_unselected=0x7f020018; + public static final int tab_divider=0x7f020019; + public static final int tab_text_selector=0x7f02001a; + public static final int top_bg=0x7f02001b; + public static final int user=0x7f02001c; + public static final int user_big=0x7f02001d; } public static final class id { - public static final int ButtonLoginUser=0x7f080015; - public static final int ButtonRegisterUser=0x7f08002c; + public static final int ButtonLoginUser=0x7f080014; + public static final int ButtonRegisterUser=0x7f08002d; public static final int ButtonUserRegistration=0x7f080017; - public static final int EditTextLoginMail=0x7f080011; - public static final int EditTextLoginPassword=0x7f080012; - public static final int EditTextRegistrationMail=0x7f08002a; - public static final int EditTextRegistrationName=0x7f080029; - public static final int EditTextRegistrationPassword=0x7f08002b; - public static final int SearchInput=0x7f080030; - public static final int SpinnerLoginUserStatus=0x7f080014; - public static final int TextViewTitle=0x7f080013; - public static final int add=0x7f080036; + public static final int EditTextLoginMail=0x7f080010; + public static final int EditTextLoginPassword=0x7f080011; + public static final int EditTextRegistrationMail=0x7f08002b; + public static final int EditTextRegistrationName=0x7f08002a; + public static final int EditTextRegistrationPassword=0x7f08002c; + public static final int SearchInput=0x7f080031; + public static final int SpinnerLoginUserStatus=0x7f080013; + public static final int TextViewTitle=0x7f080012; + public static final int add=0x7f080038; public static final int circlecc=0x7f080000; public static final int circlecc_image=0x7f080001; public static final int conversation=0x7f080002; - public static final int findmemenu=0x7f080005; - public static final int findmemenuItems=0x7f080006; - public static final int friends=0x7f080008; - public static final int friendslist=0x7f08000f; - public static final int homebutton=0x7f080035; - public static final int logout=0x7f08000c; - public static final int mapView=0x7f080025; - public static final int me=0x7f08000b; - public static final int message=0x7f080037; - public static final int messageOverview=0x7f08001a; + public static final int findmemenu=0x7f080004; + public static final int findmemenuItems=0x7f080005; + public static final int friends=0x7f080007; + public static final int friendslist=0x7f08000e; + public static final int homebutton=0x7f080036; + public static final int logo=0x7f080015; + public static final int logout=0x7f08000b; + public static final int mapView=0x7f080026; + public static final int me=0x7f08000a; + public static final int message=0x7f080039; + public static final int messageInputLayout=0x7f080018; + public static final int messageOverview=0x7f08001b; public static final int messageOverviewList=0x7f080003; - public static final int message_item=0x7f080020; - public static final int message_overview_item=0x7f08001d; - public static final int message_overview_text=0x7f08001f; - public static final int message_text=0x7f080021; - public static final int messageinput=0x7f080018; - public static final int messageinputview=0x7f080004; - public static final int messages=0x7f080009; - public static final int messagesubmit=0x7f080019; - public static final int nearby=0x7f080007; - public static final int nearby_list_text=0x7f080024; - public static final int nearbylist=0x7f080023; - public static final int profile=0x7f080026; - public static final int profilemail=0x7f080028; - public static final int profilename=0x7f080027; - public static final int request_dialog=0x7f08002d; - public static final int requests=0x7f080010; - public static final int search=0x7f08000a; - public static final int searchList=0x7f08002e; - public static final int search_dialog=0x7f08002f; - public static final int tabhost=0x7f08000e; - public static final int tabsLayout=0x7f080031; - public static final int tabsText=0x7f080032; + public static final int message_item=0x7f080021; + public static final int message_overview_item=0x7f08001e; + public static final int message_overview_text=0x7f080020; + public static final int message_text=0x7f080022; + public static final int messageinput=0x7f080019; + public static final int messages=0x7f080008; + public static final int messagesubmit=0x7f08001a; + public static final int nearby=0x7f080006; + public static final int nearby_list_text=0x7f080025; + public static final int nearbylist=0x7f080024; + public static final int profile=0x7f080027; + public static final int profilemail=0x7f080029; + public static final int profilename=0x7f080028; + public static final int reloadbutton=0x7f080037; + public static final int request_dialog=0x7f08002e; + public static final int requests=0x7f08000f; + public static final int search=0x7f080009; + public static final int searchList=0x7f08002f; + public static final int search_dialog=0x7f080030; + public static final int tabhost=0x7f08000d; + public static final int tabsLayout=0x7f080032; + public static final int tabsText=0x7f080033; public static final int test_image=0x7f080016; - public static final int title=0x7f080033; - public static final int title2138=0x7f08001c; - public static final int titleText=0x7f080034; - public static final int topbb=0x7f080022; - public static final int topbb2=0x7f08000d; - public static final int topbb9864=0x7f08001b; - public static final int user_image=0x7f08001e; + public static final int title=0x7f080034; + public static final int title2138=0x7f08001d; + public static final int titleText=0x7f080035; + public static final int topbb=0x7f080023; + public static final int topbb2=0x7f08000c; + public static final int topbb9864=0x7f08001c; + public static final int user_image=0x7f08001f; } public static final class layout { public static final int circle_counter=0x7f030000; @@ -133,6 +136,7 @@ public final class R { public static final int tabs_bg=0x7f030013; public static final int title=0x7f030014; public static final int topbar=0x7f030015; + public static final int topbar_noreload=0x7f030016; } public static final class menu { public static final int map=0x7f070000; diff --git a/res/drawable-hdpi/reload_button.png b/res/drawable-hdpi/reload_button.png new file mode 100644 index 0000000..ea99083 Binary files /dev/null and b/res/drawable-hdpi/reload_button.png differ diff --git a/res/layout/conversation.xml b/res/layout/conversation.xml index a585c57..63ac14d 100644 --- a/res/layout/conversation.xml +++ b/res/layout/conversation.xml @@ -11,16 +11,15 @@ - + \ No newline at end of file diff --git a/res/layout/findmemenu.xml b/res/layout/findmemenu.xml index f777154..9827362 100644 --- a/res/layout/findmemenu.xml +++ b/res/layout/findmemenu.xml @@ -4,14 +4,13 @@ android:layout_width="fill_parent" android:orientation="vertical" android:id="@+id/findmemenu" - android:background="@drawable/dark" + android:background="@drawable/background" android:layout_height="fill_parent" android:padding="20dip"> - + - - + - + - - - diff --git a/res/layout/login.xml b/res/layout/login.xml index b00b1bf..157d3f1 100644 --- a/res/layout/login.xml +++ b/res/layout/login.xml @@ -5,7 +5,7 @@ android:orientation="vertical" android:background="@drawable/dark" android:layout_height="fill_parent" - android:padding="20dip"> + android:padding="20dip"> diff --git a/res/layout/logo.xml b/res/layout/logo.xml index 7c61fb2..dc0c4b1 100644 --- a/res/layout/logo.xml +++ b/res/layout/logo.xml @@ -1,15 +1,12 @@ - + - \ No newline at end of file + android:paddingTop="20dip" + android:paddingBottom="35dip" + android:id="@+id/logo" + /> \ No newline at end of file diff --git a/res/layout/message_input.xml b/res/layout/message_input.xml index 97f4ab1..30d2f71 100644 --- a/res/layout/message_input.xml +++ b/res/layout/message_input.xml @@ -3,8 +3,10 @@ xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="fill_parent" android:background="@color/white" + android:id="@+id/messageInputLayout" android:layout_height="wrap_content" android:paddingTop="10dip" + android:layout_gravity="bottom" android:orientation="horizontal" android:paddingBottom="10dip" android:paddingLeft="20dip" diff --git a/res/layout/message_overview.xml b/res/layout/message_overview.xml index bf60408..cf2eec5 100644 --- a/res/layout/message_overview.xml +++ b/res/layout/message_overview.xml @@ -11,7 +11,6 @@ - - diff --git a/res/layout/messsage_item.xml b/res/layout/messsage_item.xml index 8898a3b..8dcdc67 100644 --- a/res/layout/messsage_item.xml +++ b/res/layout/messsage_item.xml @@ -10,17 +10,18 @@ android:paddingRight="20dp" android:textColor="@color/contentdark" android:id="@+id/message_item"> - - diff --git a/res/layout/nearby.xml b/res/layout/nearby.xml index 909545a..d90281e 100644 --- a/res/layout/nearby.xml +++ b/res/layout/nearby.xml @@ -10,7 +10,6 @@ - - + - + - + + + + diff --git a/res/layout/topbar_noreload.xml b/res/layout/topbar_noreload.xml new file mode 100644 index 0000000..438174c --- /dev/null +++ b/res/layout/topbar_noreload.xml @@ -0,0 +1,30 @@ + + + + + + + diff --git a/src/com/architects/findme/Conversation.java b/src/com/architects/findme/Conversation.java index 00cbf95..9817d27 100644 --- a/src/com/architects/findme/Conversation.java +++ b/src/com/architects/findme/Conversation.java @@ -1,50 +1,39 @@ package com.architects.findme; import java.util.ArrayList; -import java.util.List; - import org.json.JSONObject; import com.architects.helper.*; import android.app.Activity; -import android.app.AlertDialog; -import android.app.Dialog; +import android.app.ProgressDialog; import android.content.Context; import android.content.Intent; import android.content.SharedPreferences; import android.os.Bundle; +import android.os.Handler; +import android.os.Looper; +import android.os.Message; import android.text.Html; import android.text.Spanned; -import android.util.Log; -import android.view.LayoutInflater; import android.view.View; -import android.view.ViewGroup; import android.view.Window; import android.view.inputmethod.InputMethodManager; -import android.widget.AdapterView; import android.widget.ArrayAdapter; import android.widget.EditText; -import android.widget.ImageView; -import android.widget.LinearLayout; import android.widget.ListView; -import android.widget.SimpleCursorAdapter; -import android.widget.TabHost; import android.widget.TextView; import android.widget.Toast; -import android.widget.AdapterView.OnItemClickListener; public class Conversation extends Activity { public static final String PREFS_NAME = "LoginCredentials"; - private static final String TAG = "findme"; - private String sender; private String receiver; - private ListView messageOverview; + private ProgressDialog loadingDialog = null; private ArrayAdapter adapter; - ArrayList list=new ArrayList(); + ArrayList list= null; public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); @@ -53,56 +42,81 @@ public class Conversation extends Activity { // get conversation partner Bundle bundle = this.getIntent().getExtras(); - String partnerMail = bundle.getString("mail"); - receiver = partnerMail; - String partnerName = bundle.getString("name"); + receiver = bundle.getString("mail"); // set title bar TextView title = (TextView) findViewById(R.id.titleText); - title.setText(Html.fromHtml("Conversation with " + partnerName + "")); - + title.setText(Html.fromHtml("Conversation with " + bundle.getString("name") + "")); + // get mail SharedPreferences preferences = this.getSharedPreferences(PREFS_NAME, MODE_WORLD_READABLE); - String mail = preferences.getString("mail", ""); - sender = mail; + sender = preferences.getString("mail", ""); - // search results to string - JSONObject j = MessagesHelper.getConversation(mail, partnerMail); - - try { - JSONObject json_data = null; - String x; - - - for(int i=0;iIch:
" - + json_data.getString("message"))); - else - list.add(Html.fromHtml(""+json_data.getString("name") - +":
" + - "" + json_data.getString("message") + "")); - } - - } - catch(Exception e) {} - - messageOverview = (ListView) findViewById(R.id.messageOverviewList); - - adapter = new ArrayAdapter - (this, R.layout.messsage_item, R.id.message_text, list); - messageOverview.setAdapter(adapter); + load(); } + public void reloadHandler(View v) + { + load(); + } + + private void load() + { + loadingDialog = ProgressDialog.show(this, null, " Loading ...", true); + + new Thread(new Runnable(){ + public void run(){ + + list = new ArrayList(); + + // search results to string + JSONObject j = MessagesHelper.getConversation(sender, receiver, Conversation.this); + + try { + JSONObject json_data = null; + String x; + + for(int i=0;iIch:
" + + json_data.getString("message"))); + else + list.add(Html.fromHtml(""+json_data.getString("name") + +":
" + + "" + json_data.getString("message") + "")); + } + + } + catch(Exception e) {} + + Looper.prepare(); + uiCallback.sendEmptyMessage(0); + } + }).start(); + } + + private Handler uiCallback = new Handler() { + @Override + public void handleMessage(Message msg) { + messageOverview = (ListView) findViewById(R.id.messageOverviewList); + + adapter = new ArrayAdapter + (Conversation.this, R.layout.messsage_item, R.id.message_text, list); + messageOverview.setAdapter(adapter); + + + loadingDialog.dismiss(); + } + }; public void messageSubmitHandler(View v) { View form = (View) v.getParent(); - + //v.getId(); // get the input value EditText mText = (EditText) form.findViewById(R.id.messageinput); String text = mText.getText().toString(); @@ -111,7 +125,7 @@ public class Conversation extends Activity { InputMethodManager imm = (InputMethodManager)getSystemService(Context.INPUT_METHOD_SERVICE); imm.hideSoftInputFromWindow(mText.getWindowToken(), 0); - String response = MessagesHelper.insertMessage(this.sender, this.receiver, text); + String response = MessagesHelper.insertMessage(this.sender, this.receiver, text, this); // handle response if(response.trim().compareTo("01") != 0) diff --git a/src/com/architects/findme/FindMe.java b/src/com/architects/findme/FindMe.java index 3531076..b2d39a5 100644 --- a/src/com/architects/findme/FindMe.java +++ b/src/com/architects/findme/FindMe.java @@ -1,28 +1,16 @@ package com.architects.findme; import com.architects.findme.R; -import com.architects.helper.StateHelper; import com.architects.findme.Login; -import com.architects.findme.FindMeMenu; - import android.app.Activity; import android.content.Intent; -import android.content.SharedPreferences; import android.os.Bundle; -import android.util.Log; -import android.view.Menu; -import android.view.MenuInflater; -import android.view.MenuItem; import android.view.View; import android.view.Window; -import android.widget.Toast; public class FindMe extends Activity { public static final String PREFS_NAME = "LoginCredentials"; - public StateHelper phoneState = new StateHelper(); - private static final String TAG = "test"; - private boolean showEntry = false; @Override public void onCreate(Bundle savedInstanceState) @@ -30,7 +18,7 @@ public class FindMe extends Activity super.onCreate(savedInstanceState); requestWindowFeature(Window.FEATURE_NO_TITLE); - setContentView(R.layout.main); + this.setContentView(R.layout.main); } // VIEWS diff --git a/src/com/architects/findme/FindMeMenu.java b/src/com/architects/findme/FindMeMenu.java index 96404c7..f7ca275 100644 --- a/src/com/architects/findme/FindMeMenu.java +++ b/src/com/architects/findme/FindMeMenu.java @@ -26,7 +26,7 @@ public class FindMeMenu extends Activity super.onCreate(savedInstanceState); requestWindowFeature(Window.FEATURE_NO_TITLE); - setContentView(R.layout.findmemenu); + this.setContentView(R.layout.findmemenu); } // Handler @@ -99,16 +99,16 @@ public class FindMeMenu extends Activity logoutData[0] = preferences.getString("mail", ""); logoutData[1] = preferences.getString("password", ""); - String response = Login.logout(logoutData).trim(); + String response = AccountHelper.logout(logoutData, this).trim(); Log.v(TAG, response); if(response.compareTo("06") == 0) { if(AccountHelper.clearLoginPreferences(this)) { Toast.makeText(button.getContext(), "Logout successful", Toast.LENGTH_LONG).show(); - Intent myIntent = new Intent(button.getContext(), Main.class); + finish(); + Intent myIntent = new Intent(button.getContext(), Main.class); startActivity(myIntent); - finish(); } } else Toast.makeText(this, "Logout failed. Try again!", Toast.LENGTH_LONG).show(); diff --git a/src/com/architects/findme/Friends.java b/src/com/architects/findme/Friends.java index 0c6f475..5369e07 100644 --- a/src/com/architects/findme/Friends.java +++ b/src/com/architects/findme/Friends.java @@ -1,21 +1,31 @@ package com.architects.findme; +import java.util.ArrayList; + +import org.json.JSONException; +import org.json.JSONObject; + import com.architects.findme.R; import com.architects.helper.*; 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.os.Bundle; +import android.os.Handler; +import android.os.Looper; +import android.os.Message; +import android.text.Html; +import android.text.Spanned; import android.view.LayoutInflater; import android.view.View; import android.view.Window; import android.widget.AdapterView; import android.widget.ArrayAdapter; -import android.widget.EditText; import android.widget.ListView; import android.widget.TabHost; import android.widget.TextView; @@ -26,14 +36,16 @@ import android.widget.Toast; public class Friends extends Activity { private TabHost mTabHost; - // The two views in our tabbed example private ListView friends; private ListView requests; public static final String PREFS_NAME = "LoginCredentials"; + private String mail = null; + public ProgressDialog loadingDialog; + private ArrayAdapter friendsAdapter; + private ArrayAdapter requestsAdapter; + private ArrayList friendslist = null; + private ArrayList requestslist = null; - public String mymail; - //private static final String TAG = "findme"; - private void setupTabHost() { mTabHost = (TabHost) findViewById(R.id.tabhost); mTabHost.setup(); @@ -45,62 +57,108 @@ public class Friends extends Activity { requestWindowFeature(Window.FEATURE_NO_TITLE); setContentView(R.layout.friends); - setupTabHost(); - - // setup list views - friends = (ListView) findViewById(R.id.friendslist); - requests = (ListView) findViewById(R.id.requests); - - // get mail + // get mail SharedPreferences preferences = this.getSharedPreferences(PREFS_NAME, MODE_WORLD_READABLE); - String mail = preferences.getString("mail", ""); - mymail = mail; - - String[] friendslist = FriendsHelper.getFriendsList(mail); - String[] requestslist = FriendsHelper.getRequestsList(mail); - friends.setAdapter(new ArrayAdapter - (this, R.layout.nearby_list_item, R.id.nearby_list_text, friendslist)); - requests.setAdapter(new ArrayAdapter - (this, R.layout.nearby_list_item,R.id.nearby_list_text, requestslist)); - - - setupTab(friends, "Friends"); - setupTab(requests, "Requests"); + mail = preferences.getString("mail", ""); + load(); + } + + private void load() + { + loadingDialog = ProgressDialog.show(this, null, " Loading ...", true); - requests.setOnItemClickListener(new OnItemClickListener() { - public void onItemClick(AdapterView parent, View view, int position, long id) { - TextView me = (TextView) view.findViewById(R.id.nearby_list_text); - final String mail = (String) me.getText(); - - final AlertDialog.Builder alertbox = new AlertDialog.Builder(Friends.this); - LayoutInflater factory = LayoutInflater.from(Friends.this); - final View input = factory.inflate(R.layout.request_dialog, null); - - alertbox.setTitle("Friend Request"); - alertbox.setView(input); + new Thread(new Runnable(){ + public void run(){ + setupTabHost(); + + // setup list views + friends = (ListView) findViewById(R.id.friendslist); + requests = (ListView) findViewById(R.id.requests); + + friendslist = FriendsHelper.getFriendsList(mail, Friends.this); + requestslist = FriendsHelper.getRequestsList(mail, Friends.this); + + Looper.prepare(); + uiCallback.sendEmptyMessage(0); + } + }).start(); + } - alertbox.setPositiveButton("Accept", new DialogInterface.OnClickListener() { - public void onClick(DialogInterface dialog, int whichButton) { - FriendsHelper.request("add", mail, mymail); - FriendsHelper.request("decline", mail, mymail); - - Toast.makeText(Friends.this, "Friend successfully added!", Toast.LENGTH_LONG).show(); - } - }); - - alertbox.setNegativeButton("Decline", + private Handler uiCallback = new Handler() { + @Override + public void handleMessage(Message msg) { + + friendsAdapter = new ArrayAdapter + (Friends.this, R.layout.nearby_list_item, R.id.nearby_list_text, friendslist); + friends.setAdapter(friendsAdapter); + + requestsAdapter = new ArrayAdapter + (Friends.this, R.layout.nearby_list_item, R.id.nearby_list_text, requestslist); + requests.setAdapter(requestsAdapter); + + setupTab(friends, "Friends"); + setupTab(requests, "Requests"); + + requests.setOnItemClickListener(new OnItemClickListener() { + public void onItemClick(AdapterView parent, View view, final int position, long id) { + final String mymail = FriendsHelper.mails[position]; + + final AlertDialog.Builder alertbox = new AlertDialog.Builder(Friends.this); + LayoutInflater factory = LayoutInflater.from(Friends.this); + final View input = factory.inflate(R.layout.request_dialog, null); + + alertbox.setTitle("Friend Request"); + alertbox.setView(input); + + alertbox.setPositiveButton("Accept", + new DialogInterface.OnClickListener() { + public void onClick(DialogInterface dialog, int whichButton) { + String response = FriendsHelper.request("add", mymail, mail, Friends.this).trim(); + + if(response.compareTo("01") == 0) + { + requestslist.remove(position); + requestsAdapter.notifyDataSetChanged(); + + JSONObject userInfo = FriendsHelper.getUserInfo(mymail, Friends.this); + + try { + friendslist.add(Html.fromHtml + (userInfo.getString("name") + "
" + userInfo.getString("uid"))); + } catch (JSONException e) {} + friendsAdapter.notifyDataSetChanged(); + + Toast.makeText(Friends.this, "Friend successfully added!", Toast.LENGTH_LONG).show(); + } + else + Toast.makeText(Friends.this, "Error", Toast.LENGTH_LONG).show(); + } + }); + + alertbox.setNegativeButton("Decline", new DialogInterface.OnClickListener() { public void onClick(DialogInterface dialog, int whichButton) { - FriendsHelper.request("decline", mail, mymail); + String response = FriendsHelper.request("decline", mymail, mail, Friends.this).trim(); - Toast.makeText(Friends.this, "Friend request declined!", Toast.LENGTH_LONG).show(); + if(response.compareTo("01") == 0) + { + requestslist.remove(position); + requestsAdapter.notifyDataSetChanged(); + + Toast.makeText(Friends.this, "Friend request declined!", Toast.LENGTH_LONG).show(); + } + else + Toast.makeText(Friends.this, "Error", Toast.LENGTH_LONG).show(); } }); - alertbox.show(); - } - }); - } + alertbox.show(); + } + }); + + loadingDialog.dismiss(); + } + }; private void setupTab(final View view, final String tag) { View tabview = createTabView(mTabHost.getContext(), tag); diff --git a/src/com/architects/findme/Login.java b/src/com/architects/findme/Login.java index babdf77..d2b9c54 100644 --- a/src/com/architects/findme/Login.java +++ b/src/com/architects/findme/Login.java @@ -1,16 +1,16 @@ package com.architects.findme; -import org.json.JSONException; -import org.json.JSONObject; - import com.architects.findme.R; -import com.architects.helper.AccountHelper; +import com.architects.helper.*; import android.app.Activity; -import android.content.Context; +import android.app.ProgressDialog; import android.content.Intent; import android.content.SharedPreferences; import android.os.Bundle; +import android.os.Handler; +import android.os.Looper; +import android.os.Message; import android.util.Log; import android.view.View; import android.view.Window; @@ -22,60 +22,22 @@ public class Login extends Activity { public static final String PREFS_NAME = "LoginCredentials"; private static final String TAG = "test"; + private String[] loginData; + public ProgressDialog loadingDialog; + private String response; @Override public void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); + super.onCreate(null); requestWindowFeature(Window.FEATURE_NO_TITLE); - Login.this.setContentView(R.layout.login); + setContentView(R.layout.login); } - public static String login(String[] str) - { - JSONObject j = new JSONObject(); - try - { - j.put("mail", str[0]); - j.put("password", AccountHelper.createHashMd5(str[1])); - j.put("status", str[2]); - - j.put("longitude", -122.084095); - j.put("latitude", 37.422006); - - return AccountHelper.doHttpPost("login_user.php", j); - } - catch (JSONException e) - { - e.printStackTrace(); - return ""; - } - } - - public static String logout(String[] str) - { - JSONObject j = new JSONObject(); - - try - { - j.put("mail", str[0]); - j.put("password", AccountHelper.createHashMd5(str[1])); - j.put("logout", "01"); - - return AccountHelper.doHttpPost("login_user.php", j); - } - catch (JSONException e) - { - e.printStackTrace(); - return ""; - } - } - - public void loginUserHandler(View button) { - String loginData[] = new String[3]; + loginData = new String[3]; final EditText mailField = (EditText) findViewById(R.id.EditTextLoginMail); loginData[0] = mailField.getText().toString(); @@ -86,26 +48,45 @@ public class Login extends Activity final Spinner statusSpinner = (Spinner) findViewById(R.id.SpinnerLoginUserStatus); loginData[2] = statusSpinner.getSelectedItem().toString(); - String response = login(loginData).trim(); - Log.v(TAG, response); - - - // check if login was successful - if(response.compareTo("01") == 0) - { - // save login credentials to storage - SharedPreferences preferences = this.getSharedPreferences(PREFS_NAME, MODE_WORLD_READABLE); - SharedPreferences.Editor prefsEditor = preferences.edit(); - prefsEditor.putString("mail", loginData[0]); - prefsEditor.putString("password", loginData[1]); - prefsEditor.putString("status", loginData[2]); - prefsEditor.commit(); - - Intent myIntent = new Intent(button.getContext(), FindMeMenu.class); - startActivity(myIntent); - finish(); - } - else Toast.makeText(this, response, Toast.LENGTH_LONG).show(); - } - + loadingDialog = ProgressDialog.show(this, null, " Loading ...", true); + + new Thread(new Runnable(){ + public void run(){ + response = AccountHelper.login(loginData, Login.this).trim(); + Log.v(TAG, response); + + + // check if login was successful + if(response.compareTo("01") == 0) + { + // save login credentials to storage + SharedPreferences preferences = Login.this.getSharedPreferences(PREFS_NAME, MODE_WORLD_READABLE); + SharedPreferences.Editor prefsEditor = preferences.edit(); + prefsEditor.putString("mail", loginData[0]); + prefsEditor.putString("password", loginData[1]); + prefsEditor.putString("status", loginData[2]); + prefsEditor.commit(); + } + + Looper.prepare(); + uiCallback.sendEmptyMessage(0); + } + }).start(); + } + + private Handler uiCallback = new Handler() { + @Override + public void handleMessage(Message msg) { + if(response.compareTo("01") == 0) + { + Intent myIntent = new Intent(Login.this.getApplicationContext(), FindMeMenu.class); + startActivity(myIntent); + finish(); + } + else + Toast.makeText(Login.this, response, Toast.LENGTH_LONG).show(); + + loadingDialog.dismiss(); + } + }; } diff --git a/src/com/architects/findme/Main.java b/src/com/architects/findme/Main.java index 250d1e8..821f24f 100644 --- a/src/com/architects/findme/Main.java +++ b/src/com/architects/findme/Main.java @@ -1,29 +1,17 @@ package com.architects.findme; import com.architects.helper.*; -import com.architects.findme.R; -import com.architects.helper.StateHelper; -import com.architects.findme.Login; import com.architects.findme.FindMeMenu; import android.app.Activity; import android.content.Intent; -import android.content.SharedPreferences; import android.os.Bundle; import android.util.Log; -import android.view.Menu; -import android.view.MenuInflater; -import android.view.MenuItem; -import android.view.View; -import android.view.Window; -import android.widget.Toast; public class Main extends Activity { public static final String PREFS_NAME = "LoginCredentials"; - public StateHelper phoneState = new StateHelper(); - private static final String TAG = "test"; - private boolean showEntry = false; + private static final String TAG = "findme"; @Override public void onCreate(Bundle savedInstanceState) @@ -31,42 +19,17 @@ public class Main extends Activity super.onCreate(savedInstanceState); boolean isLogged = AccountHelper.isLogged(this); + Log.i(TAG, "isLogged: " + isLogged); if(isLogged) { - String[] loginCredentials = AccountHelper.getLoginPreferences(this); - /* - String response = Login.login(loginCredentials).trim(); - // check if login was successful - Log.v(TAG, response); - if(response.compareTo("01") == 0) - { - Intent myIntent = new Intent(this, FindMeMenu.class); - startActivity(myIntent); - }*/ Intent myIntent = new Intent(this, FindMeMenu.class); startActivity(myIntent); - } - else + } else { Intent myIntent = new Intent(this, FindMe.class); startActivity(myIntent); } finish(); } - - // VIEWS - public void drawRegistrationHandler(View button) - { - Intent myIntent = new Intent(button.getContext(), Registration.class); - startActivity(myIntent); - } - - public void drawLoginHandler(View button) - { - Intent myIntent = new Intent(button.getContext(), Login.class); - startActivity(myIntent); - } - - } \ No newline at end of file diff --git a/src/com/architects/findme/MapNearby.java b/src/com/architects/findme/MapNearby.java index 3ee59ec..69dff09 100644 --- a/src/com/architects/findme/MapNearby.java +++ b/src/com/architects/findme/MapNearby.java @@ -83,7 +83,7 @@ public class MapNearby extends MapActivity // show people marker itemizedoverlay = new PeopleItemizedOverlay(marker, MapNearby.this); - JSONObject json = AccountHelper.doHttpGet("get_online_user.php"); + JSONObject json = RequestHelper.doHttpGet("get_online_user.php", this); //String[] onlineUser = new String[json.length()]; diff --git a/src/com/architects/findme/Messages.java b/src/com/architects/findme/Messages.java index ce63338..431cff9 100644 --- a/src/com/architects/findme/Messages.java +++ b/src/com/architects/findme/Messages.java @@ -1,107 +1,127 @@ package com.architects.findme; -import java.util.List; - import org.json.JSONObject; import com.architects.helper.*; import android.app.Activity; -import android.app.AlertDialog; -import android.app.Dialog; -import android.content.Context; +import android.app.ProgressDialog; import android.content.Intent; -import android.content.SharedPreferences; -import android.content.pm.PackageManager; import android.os.Bundle; +import android.os.Handler; +import android.os.Looper; +import android.os.Message; import android.text.Html; import android.text.Spanned; import android.util.Log; -import android.view.LayoutInflater; import android.view.View; -import android.view.ViewGroup; import android.view.Window; import android.widget.AdapterView; import android.widget.ArrayAdapter; -import android.widget.ImageView; import android.widget.ListView; -import android.widget.SimpleCursorAdapter; -import android.widget.TabHost; import android.widget.TextView; -import android.widget.Toast; import android.widget.AdapterView.OnItemClickListener; public class Messages extends Activity { public static final String PREFS_NAME = "LoginCredentials"; private static final String TAG = "findme"; + public ProgressDialog loadingDialog; + private String mail = null; + private ListView messageOverview = null; + private Spanned[] list = null; + private String[] mails; + private String[] names; + public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); requestWindowFeature(Window.FEATURE_NO_TITLE); setContentView(R.layout.message_overview); - + // set title bar TextView title = (TextView) findViewById(R.id.titleText); title.setText("Conversations"); - // get mail - SharedPreferences preferences = this.getSharedPreferences(PREFS_NAME, MODE_WORLD_READABLE); - String mail = preferences.getString("mail", ""); - - // search results to string - JSONObject j = MessagesHelper.getConversationOverview(mail); - - Spanned[] list = new Spanned[j.length()]; - final String[] mails = new String[j.length()]; - final String[] names = new String[j.length()]; - - try { - JSONObject json_data = null; - String x; - - String text; - for(int i=0;i" + names[i] + "" + "
" + - "@ " + json_data.getString("date") + ""); - } - - } - catch(Exception e) {} - - ListView messageOverview = (ListView) findViewById(R.id.messageOverviewList); - - messageOverview.setAdapter(new ArrayAdapter - (this, R.layout.message_overview_item, R.id.message_overview_text, list)); - - - messageOverview.setTextFilterEnabled(true); - - messageOverview.setOnItemClickListener(new OnItemClickListener() { - public void onItemClick(AdapterView parent, View view, int position, long id) { - Bundle bundle = new Bundle(); - bundle.putString("mail", mails[position]); - bundle.putString("name", names[position]); - - Intent newIntent = new Intent(getApplicationContext(), Conversation.class); - newIntent.putExtras(bundle); - startActivityForResult(newIntent, 0); - } - }); + load(); } - public void enterMenuHandler(View button) + public void enterMenuHandler(View v) { - Intent myIntent = new Intent(button.getContext(), FindMeMenu.class); + Intent myIntent = new Intent(v.getContext(), FindMeMenu.class); startActivity(myIntent); } + public void reloadHandler(View v) + { + load(); + } + private void load() + { + loadingDialog = ProgressDialog.show(this, null, " Loading ...", true); + + new Thread(new Runnable(){ + public void run(){ + // get mail + String[] logPref = AccountHelper.getLoginPreferences(Messages.this); + mail = logPref[0]; + + messageOverview = (ListView) findViewById(R.id.messageOverviewList); + + // search results to string + Log.v(TAG, "XXX 00"); + JSONObject j = MessagesHelper.getConversationOverview(mail, Messages.this); + + list = new Spanned[j.length()]; + mails = new String[j.length()]; + names = new String[j.length()]; + + try { + JSONObject json_data = null; + String x; + + for(int i=0;i" + names[i] + "" + "
" + + "" + json_data.getString("date") + ""); + } + + } + catch(Exception e) {} + + Looper.prepare(); + uiCallback.sendEmptyMessage(0); + } + }).start(); + } + + private Handler uiCallback = new Handler() { + @Override + public void handleMessage(Message msg) { + messageOverview.setAdapter(new ArrayAdapter + (Messages.this, R.layout.message_overview_item, R.id.message_overview_text, list)); + + messageOverview.setTextFilterEnabled(true); + + messageOverview.setOnItemClickListener(new OnItemClickListener() { + public void onItemClick(AdapterView parent, View view, int position, long id) { + Bundle bundle = new Bundle(); + bundle.putString("mail", mails[position]); + bundle.putString("name", names[position]); + + Intent newIntent = new Intent(getApplicationContext(), Conversation.class); + newIntent.putExtras(bundle); + startActivityForResult(newIntent, 0); + } + }); + + loadingDialog.dismiss(); + } + }; } \ No newline at end of file diff --git a/src/com/architects/findme/Nearby.java b/src/com/architects/findme/Nearby.java index 0f1a208..67eca28 100644 --- a/src/com/architects/findme/Nearby.java +++ b/src/com/architects/findme/Nearby.java @@ -5,6 +5,7 @@ import org.json.JSONObject; import com.architects.findme.R; import com.architects.helper.*; + import android.app.Activity; import android.content.Context; import android.content.Intent; @@ -46,7 +47,19 @@ public class Nearby extends Activity { new MyLocationListener() ); - JSONObject json = AccountHelper.doHttpGet("get_online_user.php"); + load(); + } + + public void reloadHandler(View v) + { + load(); + } + + private void load() + { + String[] logPref = AccountHelper.getLoginPreferences(this); + String params = "?mail=" + logPref[0]; + JSONObject json = RequestHelper.doHttpGet("get_online_user.php", this, params); String[] onlineUser = new String[json.length()]; final String[] mails = new String[json.length()]; @@ -68,8 +81,7 @@ public class Nearby extends Activity { Location location2 = new Location(""); location2.setLatitude(json_data.getDouble("latitude")); - location2.setLongitude(json_data.getDouble("longitude")); - Log.v(TAG, "X: "+json_data.getDouble("latitude")); + location2.setLongitude(json_data.getDouble("longitude"));; float distance = location.distanceTo(location2); String me = null; @@ -81,7 +93,6 @@ public class Nearby extends Activity { me = dis + " km"; } else me = distance + " m"; - Log.v(TAG, me); mails[i] = json_data.getString("mail"); names[i] = json_data.getString("name"); diff --git a/src/com/architects/findme/PeopleItemizedOverlay.java b/src/com/architects/findme/PeopleItemizedOverlay.java index 797baec..18a8660 100644 --- a/src/com/architects/findme/PeopleItemizedOverlay.java +++ b/src/com/architects/findme/PeopleItemizedOverlay.java @@ -2,17 +2,10 @@ package com.architects.findme; import java.util.ArrayList; -import android.app.AlertDialog; import android.content.Context; -import android.content.DialogInterface; import android.content.Intent; import android.graphics.drawable.Drawable; import android.os.Bundle; -import android.util.Log; -import android.view.LayoutInflater; -import android.view.View; -import android.widget.EditText; - import com.google.android.maps.ItemizedOverlay; import com.google.android.maps.OverlayItem; @@ -21,7 +14,6 @@ public class PeopleItemizedOverlay extends ItemizedOverlay { private ArrayList mOverlays = new ArrayList(); private Context mContext; - private static final String TAG = "findMe"; public PeopleItemizedOverlay(Drawable defaultMarker, Context context) { super(boundCenterBottom(defaultMarker)); @@ -41,7 +33,7 @@ public class PeopleItemizedOverlay extends ItemizedOverlay @Override protected boolean onTap(int index) { - OverlayItem item = mOverlays.get(index); + //OverlayItem item = mOverlays.get(index); Bundle bundle = new Bundle(); bundle.putString("mail", "klika@live.at"); diff --git a/src/com/architects/findme/Profile.java b/src/com/architects/findme/Profile.java index 82a1b9f..55b1977 100644 --- a/src/com/architects/findme/Profile.java +++ b/src/com/architects/findme/Profile.java @@ -1,10 +1,7 @@ package com.architects.findme; -import org.json.JSONObject; - import com.architects.helper.*; import android.app.Activity; -import android.content.Context; import android.content.Intent; import android.os.Bundle; import android.text.Html; @@ -31,17 +28,13 @@ public class Profile extends Activity setContentView(R.layout.profile); - - // get conversation partner + Bundle bundle = this.getIntent().getExtras(); userMail = bundle.getString("mail"); userName = bundle.getString("name"); Log.v(TAG, userMail+" ---"+userName); - - // JSONObject j = FriendsHelper.getUserInfo(mail); - - + // set title bar TextView title = (TextView) findViewById(R.id.titleText); title.setText("Profile"); @@ -82,7 +75,7 @@ public class Profile extends Activity public void addHandler(String title) { String[] logPref = AccountHelper.getLoginPreferences(this); - String response = FriendsHelper.request("request", logPref[0], userMail).trim(); + String response = FriendsHelper.request("request", logPref[0], userMail, this).trim(); if(response.compareTo("01") == 0) response = "Request sent!"; diff --git a/src/com/architects/findme/Registration.java b/src/com/architects/findme/Registration.java index a13c27b..caefe60 100644 --- a/src/com/architects/findme/Registration.java +++ b/src/com/architects/findme/Registration.java @@ -1,18 +1,16 @@ package com.architects.findme; -import org.json.JSONException; -import org.json.JSONObject; - import com.architects.findme.R; -import com.architects.findme.R.id; -import com.architects.findme.R.layout; -import com.architects.helper.AccountHelper; +import com.architects.helper.*; import android.app.Activity; +import android.app.ProgressDialog; import android.content.Intent; import android.content.SharedPreferences; import android.os.Bundle; -import android.util.Log; +import android.os.Handler; +import android.os.Looper; +import android.os.Message; import android.view.View; import android.view.Window; import android.widget.EditText; @@ -21,6 +19,10 @@ import android.widget.Toast; public class Registration extends Activity { public static final String PREFS_NAME = "LoginCredentials"; + private String[] registrationData; + public ProgressDialog loadingDialog; + private String response; + private String response0; @Override public void onCreate(Bundle savedInstanceState) @@ -30,30 +32,10 @@ public class Registration extends Activity Registration.this.setContentView(R.layout.registration); } - - - public String register(String[] str) - { - JSONObject j = new JSONObject(); - try - { - j.put("name", str[0]); - j.put("mail", str[1]); - j.put("password", AccountHelper.createHashMd5(str[2])); - - return AccountHelper.doHttpPost("register_user.php", j); - } - catch (JSONException e) - { - e.printStackTrace(); - return ""; - } - } - public void registerUserHandler(View button) { - String registrationData[] = new String[3]; + registrationData = new String[3]; final EditText nameField = (EditText) findViewById(R.id.EditTextRegistrationName); registrationData[0] = nameField.getText().toString(); @@ -64,39 +46,55 @@ public class Registration extends Activity final EditText passwordField = (EditText) findViewById(R.id.EditTextRegistrationPassword); registrationData[2] = passwordField.getText().toString(); - String loginData[] = new String[3]; - - loginData[0] = registrationData[1]; - loginData[1] = registrationData[2]; - loginData[2] = "online"; - - String response = register(registrationData).trim(); - - if(response.compareTo("01") == 0) - { - response = Login.login(loginData).trim(); + loadingDialog = ProgressDialog.show(this, null, " Loading ...", true); + + new Thread(new Runnable(){ + public void run(){ + String loginData[] = new String[3]; + + loginData[0] = registrationData[1]; + loginData[1] = registrationData[2]; + loginData[2] = "online"; + + response = AccountHelper.register(registrationData, Registration.this).trim(); + response0 = AccountHelper.login(loginData, Registration.this).trim(); + + if(response.compareTo("01") == 0 && response0.compareTo("01") == 0) + { + // save login credentials to storage + SharedPreferences preferences = Registration.this.getSharedPreferences(PREFS_NAME, MODE_WORLD_READABLE); + SharedPreferences.Editor prefsEditor = preferences.edit(); + prefsEditor.putString("mail", loginData[0]); + prefsEditor.putString("password", loginData[1]); + prefsEditor.putString("status", loginData[2]); + prefsEditor.commit(); + } + + Looper.prepare(); + uiCallback.sendEmptyMessage(0); + } + }).start(); + } + + private Handler uiCallback = new Handler() { + @Override + public void handleMessage(Message msg) { + loadingDialog.dismiss(); - - // check if login was successful - if(response.compareTo("01") == 0) + if(response.compareTo("01") != 0) { - // save login credentials to storage - SharedPreferences preferences = this.getSharedPreferences(PREFS_NAME, MODE_WORLD_READABLE); - SharedPreferences.Editor prefsEditor = preferences.edit(); - prefsEditor.putString("mail", loginData[0]); - prefsEditor.putString("password", loginData[1]); - prefsEditor.putString("status", loginData[2]); - prefsEditor.commit(); - - Intent myIntent = new Intent(button.getContext(), FindMeMenu.class); - startActivity(myIntent); - finish(); + Toast.makeText(Registration.this, response, Toast.LENGTH_LONG).show(); + return; } - else - Toast.makeText(this, response, Toast.LENGTH_LONG).show(); - } - else - Toast.makeText(this, response, Toast.LENGTH_LONG).show(); - } - + if(response0.compareTo("01") != 0) + { + Toast.makeText(Registration.this, response0, Toast.LENGTH_LONG).show(); + return; + } + + Intent myIntent = new Intent(Registration.this.getApplicationContext(), FindMeMenu.class); + startActivity(myIntent); + finish(); + } + }; } diff --git a/src/com/architects/findme/Search.java b/src/com/architects/findme/Search.java index 3ae4fe9..6a7ad0f 100644 --- a/src/com/architects/findme/Search.java +++ b/src/com/architects/findme/Search.java @@ -1,35 +1,30 @@ package com.architects.findme; -import org.json.JSONObject; - import com.architects.helper.*; import android.app.Activity; -import android.app.AlertDialog; -import android.app.Dialog; -import android.content.Context; +import android.app.ProgressDialog; import android.content.Intent; -import android.content.SharedPreferences; import android.os.Bundle; +import android.os.Handler; +import android.os.Looper; +import android.os.Message; import android.text.Html; -import android.util.Log; -import android.view.LayoutInflater; import android.view.View; -import android.view.ViewGroup; import android.view.Window; import android.widget.AdapterView; import android.widget.ArrayAdapter; -import android.widget.ImageView; import android.widget.ListView; -import android.widget.TabHost; import android.widget.TextView; -import android.widget.Toast; import android.widget.AdapterView.OnItemClickListener; public class Search extends Activity { private ListView resultsList; public static final String PREFS_NAME = "LoginCredentials"; - private static final String TAG = "findme"; + private String query = null; + private ProgressDialog loadingDialog = null; + private String[] results = null; + public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); @@ -38,61 +33,54 @@ public class Search extends Activity { // get search query Bundle bundle = this.getIntent().getExtras(); - String query = bundle.getString("query"); + query = bundle.getString("query"); // set title bar TextView title = (TextView) findViewById(R.id.titleText); title.setText(Html.fromHtml("Results for "+query+"")); - // get results list view - resultsList = (ListView) findViewById(R.id.searchList); + loadingDialog = ProgressDialog.show(this, null, " Loading ...", true); - // search results to string - JSONObject j = new JSONObject(); - String params = "?query="+query; - j = AccountHelper.doHttpGet("search.php", params); - Log.v(TAG, j.toString()); - - final String[] mails = new String[j.length()]; - final String[] names = new String[j.length()]; - - String[] results = new String[j.length()]; - - try { - JSONObject json_data = null; - String x; - - for(int i=0;i(this, R.layout.nearby_list_item, R.id.nearby_list_text, results)); - - resultsList.setTextFilterEnabled(true); - - resultsList.setOnItemClickListener(new OnItemClickListener() { - public void onItemClick(AdapterView parent, View view, int position, long id) { - Bundle bundle = new Bundle(); - bundle.putString("mail", mails[position]); - bundle.putString("name", names[position]); - - Intent newIntent = new Intent(getApplicationContext(), Profile.class); - newIntent.putExtras(bundle); - startActivity(newIntent); - } - }); + new Thread(new Runnable(){ + public void run(){ + String[] logPref = AccountHelper.getLoginPreferences(Search.this); + results = SearchHelper.getResults(query, logPref[0], Search.this); + + Looper.prepare(); + uiCallback.sendEmptyMessage(0); + } + }).start(); } + private Handler uiCallback = new Handler() { + @Override + public void handleMessage(Message msg) { + + // get results list view + resultsList = (ListView) findViewById(R.id.searchList); + + resultsList.setAdapter(new ArrayAdapter + (Search.this, R.layout.nearby_list_item, R.id.nearby_list_text, results)); + + resultsList.setTextFilterEnabled(true); + + // view Profile if list item clicked + resultsList.setOnItemClickListener(new OnItemClickListener() { + public void onItemClick(AdapterView parent, View view, int position, long id) { + Bundle bundle = new Bundle(); + bundle.putString("mail", SearchHelper.mails[position]); + bundle.putString("name", SearchHelper.names[position]); + + Intent newIntent = new Intent(getApplicationContext(), Profile.class); + newIntent.putExtras(bundle); + startActivity(newIntent); + } + }); + + loadingDialog.dismiss(); + } + }; + public void enterMenuHandler(View button) { Intent myIntent = new Intent(button.getContext(), FindMeMenu.class); diff --git a/src/com/architects/helper/AccountHelper.java b/src/com/architects/helper/AccountHelper.java index d880e25..bd3a3f7 100644 --- a/src/com/architects/helper/AccountHelper.java +++ b/src/com/architects/helper/AccountHelper.java @@ -1,100 +1,15 @@ package com.architects.helper; -import java.io.BufferedReader; -import java.io.IOException; -import java.io.InputStream; -import java.io.InputStreamReader; -import java.security.MessageDigest; -import java.security.NoSuchAlgorithmException; - -import org.apache.http.HttpResponse; -import org.apache.http.client.HttpClient; -import org.apache.http.client.methods.HttpGet; -import org.apache.http.client.methods.HttpPost; -import org.apache.http.entity.StringEntity; -import org.apache.http.impl.client.DefaultHttpClient; -import org.apache.http.message.BasicHeader; -import org.apache.http.params.HttpConnectionParams; -import org.apache.http.protocol.HTTP; +import org.json.JSONException; import org.json.JSONObject; import android.content.Context; import android.content.SharedPreferences; -import android.util.Log; public class AccountHelper { - private static final String TAG = "findme"; public static final String PREFS_NAME = "LoginCredentials"; - public static String doHttpPost(String url_end, JSONObject j) - { - String url = "http://www.artistandarchitects.at/findme/" + url_end; - - HttpClient client = new DefaultHttpClient(); - HttpConnectionParams.setConnectionTimeout(client.getParams(), 10000); - HttpResponse response; - - try - { - HttpPost post = new HttpPost(url); - - post.setHeader("json", j.toString()); - - StringEntity se = new StringEntity(j.toString()); - se.setContentEncoding(new BasicHeader(HTTP.CONTENT_TYPE, "application/json")); - post.setEntity(se); - - response = client.execute(post); - if (response != null) - { - InputStream in = response.getEntity().getContent(); - return convertStreamToString(in); - } - } - catch (Exception e) - { - e.printStackTrace(); - } - return ""; - } - - public static JSONObject doHttpGet(String url_end) - { - return doHttpGet(url_end, ""); - } - - public static JSONObject doHttpGet(String url_end, String params) - { - String url = "http://www.artistandarchitects.at/findme/" + url_end; - - if(params != "") url += params; - - HttpClient client = new DefaultHttpClient(); - HttpConnectionParams.setConnectionTimeout(client.getParams(), 10000); - HttpResponse response; - - try - { - HttpGet httpGet = new HttpGet(url); - - response = client.execute(httpGet); - if (response != null) - { - InputStream in = response.getEntity().getContent(); - JSONObject json=new JSONObject(convertStreamToString(in)); - Log.i("HttpGet Response: ",convertStreamToString(in)); - return json; - } - } - catch (Exception e) - { - e.printStackTrace(); - } - return new JSONObject(); - } - - public static Boolean isLogged(Context c) { SharedPreferences preferences = c.getSharedPreferences(PREFS_NAME, 0); @@ -128,62 +43,62 @@ public class AccountHelper return (isLogged(c)) ? false : true; } + public static String login(String[] str, Context context) + { + JSONObject j = new JSONObject(); + try + { + j.put("mail", str[0]); + j.put("password", StandardHelper.createHashMd5(str[1])); + j.put("status", str[2]); + + j.put("longitude", -122.084095); + j.put("latitude", 37.422006); + + return RequestHelper.doHttpPost("login_user.php", context, j); + } + catch (JSONException e) + { + e.printStackTrace(); + return ""; + } + } + + public static String logout(String[] str, Context context) + { + JSONObject j = new JSONObject(); + + try + { + j.put("mail", str[0]); + j.put("password", StandardHelper.createHashMd5(str[1])); + j.put("logout", "01"); + + return RequestHelper.doHttpPost("login_user.php", context, j); + } + catch (JSONException e) + { + e.printStackTrace(); + return ""; + } + } - public static String createHashMd5(String str) - { - try + public static String register(String[] str, Context context) + { + JSONObject j = new JSONObject(); + try { - // Create MD5 Hash - MessageDigest digest = java.security.MessageDigest.getInstance("MD5"); - digest.update(str.getBytes()); - byte messageDigest[] = digest.digest(); - - // Create Hex String - StringBuffer hexString = new StringBuffer(); - for (int i=0; i getFriendsList(String user, Context context) { JSONObject j = new JSONObject(); String params = "?user="+user+"&type=friends"; - j = AccountHelper.doHttpGet("get_friends.php", params); + j = RequestHelper.doHttpGet("get_friends.php", context, params); - String[] friends = new String[j.length()]; + ArrayList friends = new ArrayList(); + mails = new String[j.length()]; try { JSONObject json_data = null; @@ -30,21 +33,21 @@ public class FriendsHelper x = (new Integer(i)).toString(); json_data = j.getJSONObject(x); - friends[i] = json_data.getString("name") + "\n" + json_data.getString("id"); + friends.add(Html.fromHtml(json_data.getString("name") + "
" + json_data.getString("id"))); } return friends; } - catch(Exception e) { return new String[0];} + catch(Exception e) { return new ArrayList();} } - public static String[] getRequestsList(String user) + public static ArrayList getRequestsList(String user, Context context) { JSONObject j = new JSONObject(); String params = "?user="+user+"&type=requests"; - j = AccountHelper.doHttpGet("get_friends.php", params); + j = RequestHelper.doHttpGet("get_friends.php", context, params); Log.v(TAG, j.toString()); - String[] friends = new String[j.length()]; + ArrayList friends = new ArrayList(); Log.v(TAG, "Länge:"+j.length()); try { @@ -55,15 +58,20 @@ public class FriendsHelper { x = (new Integer(i)).toString(); json_data = j.getJSONObject(x); + + mails[i] = json_data.getString("mail"); - friends[i] = json_data.getString("mail"); + friends.add(Html.fromHtml(json_data.getString("mail"))); } return friends; } - catch(Exception e) { return new String[0];} + catch(Exception e) { + e.printStackTrace(); + return new ArrayList(); + } } - public static String request(String type, String sender, String receiver) + public static String request(String type, String sender, String receiver, Context context) { JSONObject j = new JSONObject(); try @@ -72,7 +80,7 @@ public class FriendsHelper j.put("receiver", receiver); j.put("type", type); - return AccountHelper.doHttpPost("friend.php", j); + return RequestHelper.doHttpPost("friend.php", context, j); } catch (JSONException e) { @@ -81,9 +89,12 @@ public class FriendsHelper } } - public static JSONObject getUserInfo(String user) + public static JSONObject getUserInfo(String user, Context context) { String params = "?user="+user; - return AccountHelper.doHttpGet("get_user_info.php", params); + JSONObject j = RequestHelper.doHttpGet("get_user_info.php", context, params); + Log.v(TAG, j.toString()); + return j; + //return j.g; } } diff --git a/src/com/architects/helper/LocationHelper.java b/src/com/architects/helper/LocationHelper.java index 460b835..869edd3 100644 --- a/src/com/architects/helper/LocationHelper.java +++ b/src/com/architects/helper/LocationHelper.java @@ -1,18 +1,13 @@ package com.architects.helper; -import com.architects.findme.R; import com.google.android.maps.GeoPoint; -import android.app.Activity; import android.content.Context; -import android.content.Intent; import android.location.Location; import android.location.LocationListener; import android.location.LocationManager; import android.os.Bundle; import android.view.View; -import android.view.View.OnClickListener; -import android.widget.Button; import android.widget.Toast; public class LocationHelper @@ -21,7 +16,6 @@ public class LocationHelper private static final long MINIMUM_DISTANCE_CHANGE_FOR_UPDATES = 1; // in Meters private static final long MINIMUM_TIME_BETWEEN_UPDATES = 100; // in Milliseconds - private static final String TAG = "test"; protected LocationManager locationManager; protected Context myContext; diff --git a/src/com/architects/helper/MessagesHelper.java b/src/com/architects/helper/MessagesHelper.java index 7eda63c..bc7312a 100644 --- a/src/com/architects/helper/MessagesHelper.java +++ b/src/com/architects/helper/MessagesHelper.java @@ -3,35 +3,33 @@ package com.architects.helper; import org.json.JSONException; import org.json.JSONObject; -import com.architects.findme.R; - -import android.content.SharedPreferences; +import android.content.Context; import android.util.Log; -import android.widget.ArrayAdapter; public class MessagesHelper { private static final String TAG = "test"; - public static JSONObject getConversationOverview(String user) + public static JSONObject getConversationOverview(String user, Context context) { JSONObject j = new JSONObject(); String params = "?type=overview&sender="+user; - j = AccountHelper.doHttpGet("get_message.php", params); + Log.v(TAG, "XXX 0.5"); + j = RequestHelper.doHttpGet("get_message.php", context, params); return j; } - public static JSONObject getConversation(String user, String partner) + public static JSONObject getConversation(String user, String partner, Context context) { JSONObject j = new JSONObject(); String params = "?type=conversation&sender="+user+"&receiver="+partner; - j = AccountHelper.doHttpGet("get_message.php", params); + j = RequestHelper.doHttpGet("get_message.php", context, params); return j; } - public static String insertMessage(String sender, String receiver, String message) + public static String insertMessage(String sender, String receiver, String message, Context context) { JSONObject j = new JSONObject(); try @@ -40,7 +38,7 @@ public class MessagesHelper j.put("receiver", receiver); j.put("message", message); - return AccountHelper.doHttpPost("message.php", j); + return RequestHelper.doHttpPost("message.php", context, j); } catch (JSONException e) { diff --git a/src/com/architects/helper/RequestHelper.java b/src/com/architects/helper/RequestHelper.java new file mode 100644 index 0000000..b92bb74 --- /dev/null +++ b/src/com/architects/helper/RequestHelper.java @@ -0,0 +1,96 @@ +package com.architects.helper; + +import java.io.InputStream; + +import org.apache.http.HttpResponse; +import org.apache.http.client.HttpClient; +import org.apache.http.client.methods.HttpGet; +import org.apache.http.client.methods.HttpPost; +import org.apache.http.entity.StringEntity; +import org.apache.http.impl.client.DefaultHttpClient; +import org.apache.http.message.BasicHeader; +import org.apache.http.params.HttpConnectionParams; +import org.apache.http.protocol.HTTP; +import org.json.JSONObject; + +import android.content.Context; +import android.net.ConnectivityManager; +import android.util.Log; + +public class RequestHelper +{ + public static final String PREFS_NAME = "LoginCredentials"; + + public static String doHttpPost(String url_end, Context context, JSONObject j) + { + String url = "http://www.artistandarchitects.at/findme/" + url_end; + + HttpClient client = new DefaultHttpClient(); + HttpConnectionParams.setConnectionTimeout(client.getParams(), 10000); + HttpResponse response; + + try + { + HttpPost post = new HttpPost(url); + + post.setHeader("json", j.toString()); + + StringEntity se = new StringEntity(j.toString()); + se.setContentEncoding(new BasicHeader(HTTP.CONTENT_TYPE, "application/json")); + post.setEntity(se); + + response = client.execute(post); + + if (response != null) + { + InputStream in = response.getEntity().getContent(); + return StandardHelper.convertStreamToString(in); + } + } + catch (Exception e) + { + e.printStackTrace(); + } + return ""; + } + + public static JSONObject doHttpGet(String url_end, Context context) + { + return doHttpGet(url_end, context, ""); + } + + public static JSONObject doHttpGet(String url_end, Context context, String params) + { + String url = "http://www.artistandarchitects.at/findme/" + url_end; + + if(params != "") url += params; + + HttpClient client = new DefaultHttpClient(); + HttpConnectionParams.setConnectionTimeout(client.getParams(), 10000); + HttpResponse response; + + try + { + HttpGet httpGet = new HttpGet(url); + + response = client.execute(httpGet); + if (response != null) + { + InputStream in = response.getEntity().getContent(); + JSONObject json=new JSONObject(StandardHelper.convertStreamToString(in)); + Log.i("HttpGet Response: ", StandardHelper.convertStreamToString(in)); + return json; + } + } + catch (Exception e) + { + e.printStackTrace(); + } + return new JSONObject(); + } + + public boolean isOnline(Context c) { + ConnectivityManager cm = (ConnectivityManager) c.getSystemService(Context.CONNECTIVITY_SERVICE); + return cm.getActiveNetworkInfo().isConnectedOrConnecting(); + } +} diff --git a/src/com/architects/helper/SearchHelper.java b/src/com/architects/helper/SearchHelper.java index 41687ae..83ae793 100644 --- a/src/com/architects/helper/SearchHelper.java +++ b/src/com/architects/helper/SearchHelper.java @@ -2,20 +2,25 @@ package com.architects.helper; import org.json.JSONObject; +import android.content.Context; import android.util.Log; public class SearchHelper { - private static final String TAG = "test"; + private static final String TAG = "findme"; + public static String[] mails = null; + public static String[] names = null; - public static String[] getResults(String query) + public static String[] getResults(String query, String mail, Context context) { JSONObject j = new JSONObject(); - String params = "?query="+query; - j = AccountHelper.doHttpGet("search.php", params); + String params = "?query="+query+"&mail="+mail; + j = RequestHelper.doHttpGet("search.php", context, params); Log.v(TAG, j.toString()); String[] results = new String[j.length()]; + mails = new String[j.length()]; + names = new String[j.length()]; try { JSONObject json_data = null; @@ -26,10 +31,16 @@ public class SearchHelper x = (new Integer(i)).toString(); json_data = j.getJSONObject(x); + mails[i] = json_data.getString("mail"); + names[i] = json_data.getString("name"); + results[i] = json_data.getString("name") + "\n" + json_data.getString("mail"); } return results; } - catch(Exception e) { return new String[0];} + catch(Exception e) { + e.printStackTrace(); + return new String[0]; + } } } diff --git a/src/com/architects/helper/StandardHelper.java b/src/com/architects/helper/StandardHelper.java new file mode 100644 index 0000000..445fbac --- /dev/null +++ b/src/com/architects/helper/StandardHelper.java @@ -0,0 +1,64 @@ +package com.architects.helper; + +import java.io.BufferedReader; +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.security.MessageDigest; +import java.security.NoSuchAlgorithmException; + +public class StandardHelper +{ + public static String createHashMd5(String str) + { + try + { + // Create MD5 Hash + MessageDigest digest = java.security.MessageDigest.getInstance("MD5"); + digest.update(str.getBytes()); + byte messageDigest[] = digest.digest(); + + // Create Hex String + StringBuffer hexString = new StringBuffer(); + for (int i=0; i