mirror
/
NetGuard
mirror of https://github.com/M66B/NetGuard.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Better logic, better layout

This commit is contained in:
M66B 2016-01-27 13:09:08 +01:00
parent 94ec8a5266
commit c80fe4d2ea
5 changed files with 31 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/src/main/java/eu/faircode/netguard/AccessAdapter.java
View File

@ -43,15 +43,17 @@ public class AccessAdapter extends CursorAdapter {
// Get views // Get views
TextView tvTime = (TextView) view.findViewById(R.id.tvTime); TextView tvTime = (TextView) view.findViewById(R.id.tvTime);
CheckBox cbIp = (CheckBox) view.findViewById(R.id.cbIp); CheckBox cbIp = (CheckBox) view.findViewById(R.id.cbIp);
TextView tvDest = (TextView) view.findViewById(R.id.tvDest); final TextView tvDest = (TextView) view.findViewById(R.id.tvDest);
TextView tvPort = (TextView) view.findViewById(R.id.tvPort);
// Set values // Set values
tvTime.setText(new SimpleDateFormat("HH:mm:ss").format(time)); tvTime.setText(new SimpleDateFormat("HH:mm:ss").format(time));
cbIp.setChecked(allowed != 0); cbIp.setChecked(allowed != 0);
tvDest.setText(dest);
tvPort.setText(dport > 0 ? Integer.toString(dport) : "");
Util.resolveName(dest, tvDest); Util.resolveName(dest, new Util.resolveListener() {
@Override
public void onResolved(String name, boolean resolved) {
tvDest.setText(name + (dport > 0 ? ":" + dport : ""));
}
});
} }
} }

2
app/src/main/java/eu/faircode/netguard/ExpandedListView.java
View File

@ -4,6 +4,8 @@ import android.content.Context;
import android.util.AttributeSet; import android.util.AttributeSet;
import android.widget.ListView; import android.widget.ListView;
// This requires list view items with equal heights
public class ExpandedListView extends ListView { public class ExpandedListView extends ListView {
public ExpandedListView(Context context) { public ExpandedListView(Context context) {
super(context); super(context);

7
app/src/main/java/eu/faircode/netguard/LogAdapter.java
View File

@ -171,7 +171,12 @@ public class LogAdapter extends CursorAdapter {
tvSAddr.setText(getKnownAddress(saddr)); tvSAddr.setText(getKnownAddress(saddr));
if (resolve && !isKnownAddress(daddr)) if (resolve && !isKnownAddress(daddr))
Util.resolveName(daddr, tvDaddr); Util.resolveName(daddr, new Util.resolveListener() {
@Override
public void onResolved(String name, boolean resolved) {
tvDaddr.setText(name);
}
});
else else
tvDaddr.setText(getKnownAddress(daddr)); tvDaddr.setText(getKnownAddress(daddr));

12
app/src/main/java/eu/faircode/netguard/Util.java
View File

@ -355,12 +355,16 @@ public class Util {
private static Map<String, String> mapIPHost = new HashMap<String, String>(); private static Map<String, String> mapIPHost = new HashMap<String, String>();
public static void resolveName(String name, final TextView tv) { public interface resolveListener {
void onResolved(String name, boolean resolved);
}
public static void resolveName(String name, final resolveListener listener) {
synchronized (mapIPHost) { synchronized (mapIPHost) {
if (mapIPHost.containsKey(name)) if (mapIPHost.containsKey(name))
tv.setText(mapIPHost.get(name)); listener.onResolved(mapIPHost.get(name), true);
else { else {
tv.setText(name); listener.onResolved(name, false);
new AsyncTask<String, Object, String>() { new AsyncTask<String, Object, String>() {
@Override @Override
@ -379,7 +383,7 @@ public class Util {
if (!mapIPHost.containsKey(host)) if (!mapIPHost.containsKey(host))
mapIPHost.put(host, host); mapIPHost.put(host, host);
} }
tv.setText(host); listener.onResolved(host, true);
} }
}.execute(name); }.execute(name);
} }

26
app/src/main/res/layout/access.xml
View File

@ -23,31 +23,15 @@
android:scaleX="0.8" android:scaleX="0.8"
android:scaleY="0.8" /> android:scaleY="0.8" />
<LinearLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_weight="1">
<TextView <TextView
android:id="@+id/tvDest" android:id="@+id/tvDest"
android:layout_width="wrap_content" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_weight="1"
android:ellipsize="end"
android:singleLine="true"
android:textAppearance="@android:style/TextAppearance.Material.Small" android:textAppearance="@android:style/TextAppearance.Material.Small"
android:textSize="12sp" /> android:textSize="12sp" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text=":"
android:textAppearance="@android:style/TextAppearance.Material.Small"
android:textSize="12sp" />
<TextView
android:id="@+id/tvPort"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="@android:style/TextAppearance.Material.Small"
android:textSize="12sp" />
</LinearLayout>
</LinearLayout> </LinearLayout>