Add phone number to peer list and dial by number results

servalproject · Jan 21, 2013 · 391f0d8 · 391f0d8
1 parent 2b26394
commit 391f0d8
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 5 deletions.
diff --git a/res/layout/peer.xml b/res/layout/peer.xml
@@ -4,13 +4,12 @@
     android:layout_height="fill_parent">
 
     <TextView
-        android:id="@+id/Number"
+        android:id="@+id/Name"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignParentLeft="true"
         android:layout_toLeftOf="@+id/call"
         android:padding="4dp"
-        android:text="very very very long Example text"
         android:textAppearance="?android:attr/textAppearanceLarge" />
 
 
@@ -38,14 +37,21 @@
         android:padding="4dp"
         android:src="@drawable/sym_action_add" />
 
+    <TextView
+        android:id="@+id/Number"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentLeft="true"
+        android:layout_below="@+id/Name"
+        android:padding="4dp"
+        android:textAppearance="?android:attr/textAppearanceSmall" />
     <TextView
         android:id="@+id/sid"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignParentRight="true"
-        android:layout_below="@+id/Number"
+        android:layout_below="@+id/Name"
         android:padding="4dp"
-        android:text="lots of hex digits"
         android:textAppearance="?android:attr/textAppearanceSmall" />
 
 </RelativeLayout>
diff --git a/src/org/servalproject/PeerListAdapter.java b/src/org/servalproject/PeerListAdapter.java
@@ -44,7 +44,7 @@
 
 public class PeerListAdapter extends ArrayAdapter<IPeer> {
 	public PeerListAdapter(Context context, List<IPeer> peers) {
-		super(context, R.layout.peer, R.id.Number, peers);
+		super(context, R.layout.peer, R.id.Name, peers);
 	}
 
 	@Override
@@ -55,6 +55,9 @@ public View getView(final int position, View convertView, ViewGroup parent) {
 		TextView displaySid = (TextView) ret.findViewById(R.id.sid);
 		displaySid.setText(p.getSubscriberId().abbreviation());
 
+		TextView displayNumber = (TextView) ret.findViewById(R.id.Number);
+		displayNumber.setText(p.getDid());
+
 		View chat = ret.findViewById(R.id.chat);
 		chat.setOnClickListener(new OnClickListener() {
 			@Override

diff --git a/src/org/servalproject/servald/DnaResult.java b/src/org/servalproject/servald/DnaResult.java
@@ -101,4 +101,9 @@ public String getSortString() {
 				did +
 				peer.sid;
 	}
+
+	@Override
+	public String getDid() {
+		return did;
+	}
 }
diff --git a/src/org/servalproject/servald/IPeer.java b/src/org/servalproject/servald/IPeer.java
@@ -14,4 +14,6 @@ public interface IPeer {
 	public boolean hasName();
 
 	public String getSortString();
+
+	public String getDid();
 }
diff --git a/src/org/servalproject/servald/Peer.java b/src/org/servalproject/servald/Peer.java
@@ -104,6 +104,10 @@ public boolean hasDid() {
 		return did != null && !did.equals("");
 	}
 
+	public String getDid() {
+		return did;
+	}
+
 	public boolean stillAlive() {
 		return reachable;
 	}