Fix previous commit

[unical.git] / src / ro / ieval / unical / mainActivity.java

diff --git a/src/ro/ieval/unical/mainActivity.java b/src/ro/ieval/unical/mainActivity.java
index 5edc18ba6c3ab4a619d6207d6733f76655dfffbc..8faac6623bf56904f70b673b3c3760dce2f8e8b3 100644 (file)
--- a/src/ro/ieval/unical/mainActivity.java
+++ b/src/ro/ieval/unical/mainActivity.java
@@ -14,6 +14,7 @@ import javax.net.ssl.HttpsURLConnection;
 import ro.ieval.unical.R;
 import com.google.gson.Gson;
 
+import android.content.Intent;
 import android.graphics.Color;
 import android.os.Bundle;
 import android.os.Handler;
@@ -21,6 +22,9 @@ import android.util.Base64;
 import android.widget.EditText;
 import android.widget.TextView;
 
+import com.facebook.*;
+
+import com.facebook.model.*;
 
 public class mainActivity extends android.app.Activity {
        Event[] getEventList() {
@@ -32,7 +36,7 @@ public class mainActivity extends android.app.Activity {
                        HttpsURLConnection calConnection = (HttpsURLConnection) hostUrlJson.openConnection();
                        calConnection.setDoOutput(true);
                        calConnection.setUseCaches(false);
-                       //calConnection.setRequestProperty("Authorization", "Basic "+Base64.encodeToString( (Constants.user+':'+Constants.password).getBytes(), Base64.NO_WRAP));
+                       calConnection.setRequestProperty("Authorization", "Basic "+Base64.encodeToString( (Constants.user+':'+Constants.password).getBytes(), Base64.NO_WRAP));
                        //calConnection.setRequestMethod("POST");
                        //calConnection.setDoInput(true);
                        //calConnection.connect();
@@ -63,11 +67,13 @@ public class mainActivity extends android.app.Activity {
        protected void onCreate(Bundle savedInstanceState) {
                // All Begins here :)
                // And here it began the olympic app that does olympic thing
-               setContentView(R.layout.eventview);
+               super.onCreate(savedInstanceState);
+               setContentView(R.layout.login);
+               
+               /*setContentView(R.layout.eventview);
                final TextView eventTitle= (TextView) findViewById(R.id.eventTitle);
                final TextView date=(TextView) findViewById(R.id.date);
                final TextView description=(TextView) findViewById(R.id.description);
-               super.onCreate(savedInstanceState);
 
                final Handler h=new Handler();
                new Thread(new Runnable() {
@@ -76,14 +82,14 @@ public class mainActivity extends android.app.Activity {
                                h.post(new Runnable() {
                                        public void run() {
                                                // aici incepe
+                                               
                                                eventTitle.setText(events[0].title);
                                                date.setText((new Date(events[0].date)).toString());
                                                description.setText(events[0].description);
-                                               //DatabaseInteract db=new DatabaseInteract(null);
-                                               //db.insertEvent(events[0]);
+                                               DatabaseInteract db=new DatabaseInteract(mainActivity.this);
                                        }
                                });
                        }
-               }).start();
+               }).start();*/
        }
 }