Merged AddMessageActivity into MessageListActivity, use alarm for UDP…

… broadcast
blanu · Nov 4, 2011 · a12e0da · a12e0da
1 parent 0014d82
commit a12e0da
Show file tree

Hide file tree

Showing 17 changed files with 250 additions and 201 deletions.
diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml
@@ -18,12 +18,12 @@
         <activity android:name=".MessageListActivity"
                   android:label="@string/message_list">
         </activity>
-        <activity android:name=".AddMessageActivity"
-                  android:label="@string/add_message">
-        </activity>
         <activity android:name=".AddPhotoActivity"
                   android:label="@string/addphoto">
         </activity>
+        <activity android:name=".EnterPasswordActivity"
+                  android:label="@string/enter_password_text">
+        </activity>
         <service android:name=".LANProbeService" />
     </application>
 </manifest>
diff --git a/android/res/layout/add_message.xml b/android/res/layout/add_message.xml
diff --git a/android/res/layout/list_item.xml b/android/res/layout/list_item.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <TextView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:padding="10dp"
-    android:textSize="16sp" >
-</TextView>
+     android:layout_width="fill_parent"
+     android:layout_height="fill_parent"
+     android:padding="10dp"
+     android:textSize="16sp"/>
+     
diff --git a/android/res/layout/list_messages.xml b/android/res/layout/list_messages.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    >
+    <EditText 
+    	android:id="@+id/msgtext"
+    	android:layout_width="fill_parent" 
+    	android:layout_height="wrap_content" 
+	/>
+	<Button
+    	android:id="@+id/submit"
+    	android:layout_width="fill_parent" 
+    	android:layout_height="wrap_content" 
+    	android:text="@string/submit"
+	/>
+    <ListView android:id="@android:id/list"
+    	android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_weight="1"
+        android:drawSelectorOnTop="false"/>
+     <TextView android:id="@android:id/empty"
+               android:layout_width="match_parent"
+               android:layout_height="match_parent"
+               android:text="No data"/>
+</LinearLayout>     
diff --git a/android/res/menu/menu.xml b/android/res/menu/menu.xml
@@ -4,8 +4,6 @@
           android:title="@string/log" />
     <item android:id="@+id/list"
           android:title="@string/list" />  
-    <item android:id="@+id/add"
-          android:title="@string/add" />            
     <item android:id="@+id/addphoto"
           android:title="@string/addphoto" />            
     <item android:id="@+id/destroy"

diff --git a/android/res/values/strings.xml b/android/res/values/strings.xml
@@ -7,7 +7,6 @@
     <string name="message_list">Messages</string>
     <string name="add_message">Post a message</string>
     <string name="submit">Submit</string>
-    <string name="add">Add</string>
     <string name="addphoto">Photo</string>
     <string name="destroy">Destroy</string>
     <string name="takephoto">Take Photo</string>

diff --git a/android/src/net/blanu/sneakermesh/AddMessageActivity.java b/android/src/net/blanu/sneakermesh/AddMessageActivity.java
diff --git a/android/src/net/blanu/sneakermesh/AndroidSneakermesh.java b/android/src/net/blanu/sneakermesh/AndroidSneakermesh.java
@@ -18,10 +18,7 @@ public AndroidSneakermesh(Context p)
 			Log.e(TAG, "null extdir: "+p.getExternalFilesDir(null));
 		}
 
-		probe=p;
-
-		Message.setLogger(this);
-		Util.setLogger(this);
+		probe=p;		
 	}
 
 	public void log(String s)

diff --git a/android/src/net/blanu/sneakermesh/LANProbeService.java b/android/src/net/blanu/sneakermesh/LANProbeService.java
@@ -1,6 +1,8 @@
 package net.blanu.sneakermesh;
 
 import java.io.IOException;
+import java.net.DatagramPacket;
+import java.net.DatagramSocket;
 import java.net.InetAddress;
 import java.net.NetworkInterface;
 import java.net.Socket;
@@ -9,6 +11,8 @@
 import java.util.Enumeration;
 import java.util.List;
 import java.util.Collections;
+import java.util.Timer;
+import java.util.TimerTask;
 
 import android.app.Service;
 import android.content.Context;
@@ -30,11 +34,16 @@ public class LANProbeService extends Service implements Logger
 	static Intent intent;
     private final IBinder mBinder = new LocalBinder();
 
+    List<String> lines=new ArrayList<String>();
+
 	@Override
 	public void onCreate() {
 		super.onCreate();
 		BROADCAST_ACTION=this.getPackageName()+".log";
     	intent = new Intent(BROADCAST_ACTION);	
+
+		Message.setLogger(this);
+		Util.setLogger(this);    	
 	}
 
     @Override
@@ -45,6 +54,9 @@ public int onStartCommand(Intent intent, int flags, int startId) {
     		{
     			mesh=new AndroidSneakermesh(this);
 
+    			Timer timer = new Timer();
+    			timer.scheduleAtFixedRate(new UDPBroadcast(), 1, 30*1000);
+
     			try
     			{
     				SyncServer server=new SyncServer(mesh);
@@ -56,7 +68,7 @@ public int onStartCommand(Intent intent, int flags, int startId) {
     			}
 
     			try {
-					probe=new UDPLANProbe(mesh, getBroadcastAddress());
+					probe=new UDPLANProbe(mesh, getBroadcastAddress(), false);
 	    			probe.start();
 				} catch (IOException e) {
 					e.printStackTrace();
@@ -67,6 +79,32 @@ public int onStartCommand(Intent intent, int flags, int startId) {
     	return START_STICKY;
     }
 
+    private class UDPBroadcast extends TimerTask
+    {
+		@Override
+		public void run()
+		{
+			InetAddress ip;
+			try {
+				ip = getBroadcastAddress();
+			} catch (IOException e1) {
+				e1.printStackTrace();
+				return;
+			}
+	    	log("broadcasting to: "+ip);
+	        DatagramSocket socket;
+			try {
+				socket = new DatagramSocket();
+		        socket.setBroadcast(true);
+		        String data="\0x00";
+		        DatagramPacket packet = new DatagramPacket(data.getBytes(), data.length(), ip, 11917);
+		        socket.send(packet);
+			} catch (Exception e) {
+				e.printStackTrace();
+			}			
+		}
+    }
+
     public Sneakermesh getMesh()
     {
     	return mesh;
@@ -98,7 +136,13 @@ public void log(String s)
     {
     	Log.e(TAG, s);
 
-    	intent.putExtra("logline", s);
+    	lines.add(s);
+    	if(lines.size()>30)
+    	{
+    		lines.remove(0);
+    	}
+
+    	intent.putExtra("logline", Util.join((String[])lines.toArray(new String[0]), "\n"));
     	sendBroadcast(intent);    	    	
     }
 

diff --git a/android/src/net/blanu/sneakermesh/LogViewerActivity.java b/android/src/net/blanu/sneakermesh/LogViewerActivity.java
@@ -59,8 +59,7 @@ public void log(String logline)
        	TextView text=(TextView)findViewById(R.id.textview);
     	if(text!=null && logline!=null)
     	{
-    		text.append(logline);
-    		text.append("\n");
+    		text.setText(logline);
     	}
     	else
     	{

diff --git a/android/src/net/blanu/sneakermesh/MessageListActivity.java b/android/src/net/blanu/sneakermesh/MessageListActivity.java
@@ -1,5 +1,6 @@
 package net.blanu.sneakermesh;
 
+import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
@@ -16,13 +17,17 @@
 import android.os.Bundle;
 import android.os.IBinder;
 import android.util.Log;
+import android.view.KeyEvent;
 import android.view.View;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
+import android.view.inputmethod.InputMethodManager;
 import android.widget.AdapterView;
 import android.widget.AdapterView.OnItemClickListener;
 import android.widget.ArrayAdapter;
+import android.widget.Button;
+import android.widget.EditText;
 import android.widget.ListAdapter;
 import android.widget.ListView;
 import android.widget.TextView;
@@ -32,6 +37,39 @@ public class MessageListActivity extends SneakermeshListActivity implements Logg
 {
 	private static final String TAG="MessageListActivity";
 
+    /** Called when the activity is first created. */
+    @Override
+    public void onCreate(Bundle savedInstanceState)
+    {
+        super.onCreate(savedInstanceState);
+
+        setContentView(R.layout.list_messages);        
+
+        final Button button = (Button) findViewById(R.id.submit);
+        button.setOnClickListener(new View.OnClickListener()
+        {
+            public void onClick(View v)
+            {
+                final TextView tv = (TextView) findViewById(R.id.msgtext);
+                String s=tv.getText().toString();
+                tv.setText("");
+                tv.clearComposingText();
+
+            	try
+            	{
+					probe.getMesh().addMessage(new TextMessage(s));
+
+					refreshUI();					
+				} catch (IOException e) {
+					e.printStackTrace();
+				}     
+
+                InputMethodManager in = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
+                in.hideSoftInputFromWindow(tv.getApplicationWindowToken(), InputMethodManager.HIDE_NOT_ALWAYS);            	
+            }
+        });        
+    }
+
     @Override
     protected void onResume() {
         super.onResume();
@@ -49,19 +87,22 @@ protected void refreshUI()
 
     	List<Message> msgs=probe.getMesh().getMessages();
     	Collections.sort(msgs);
+    	Collections.reverse(msgs);
 
     	for(Message msg : msgs)
     	{
     		TextMessage tm=(TextMessage)msg;
     		adapter.add(tm.getText());
     	}
-    	adapter.notifyDataSetChanged();
+    	adapter.notifyDataSetChanged();    	
     }
 
     protected void createView()
     {
         List<Message>msgs=probe.getMesh().getMessages();
     	Collections.sort(msgs);
+    	Collections.reverse(msgs);
+
         adapter=new ArrayAdapter<String>(this, R.layout.list_item, new ArrayList<String>());
     	for(Message msg : msgs)
     	{
@@ -71,7 +112,7 @@ protected void createView()
         setListAdapter(adapter);
 
         ListView lv = getListView();
-        lv.setTranscriptMode(ListView.TRANSCRIPT_MODE_ALWAYS_SCROLL);
+        lv.setTranscriptMode(ListView.TRANSCRIPT_MODE_DISABLED);
 
         lv.setOnItemClickListener(new OnItemClickListener() {
           public void onItemClick(AdapterView<?> parent, View view,
@@ -80,6 +121,6 @@ public void onItemClick(AdapterView<?> parent, View view,
             Toast.makeText(getApplicationContext(), ((TextView) view).getText(),
                 Toast.LENGTH_SHORT).show();
           }
-        });            	
+        });         
     }
 }