NDT-DEV email list created

Revision: 518
Author:   

Date:     Tue Aug 23 14:09:58 2011
Log:      Fill in advanced results.
http://code.google.com/p/ndt/source/detail?r=518

Modified:
 /branches/android/Android/res/layout/results.xml
 /branches/android/Android/src/net/measurementlab/ndt/NdtService.java
 /branches/android/Android/src/net/measurementlab/ndt/ResultsActivity.java
 /branches/android/Android/src/net/measurementlab/ndt/TestsActivity.java

=======================================
--- /branches/android/Android/res/layout/results.xml	Tue Aug 23 13:36:59  
2011
+++ /branches/android/Android/res/layout/results.xml	Tue Aug 23 14:09:58  
2011
@@ -111,7 +111,7 @@
                </HorizontalScrollView>
                <RelativeLayout android:orientation="horizontal"
                        android:layout_width="fill_parent" 
android:layout_height="wrap_content"
-                       android:padding="5sp" 
android:layout_alignParentBottom="true">
+                       android:padding="10sp" 
android:layout_alignParentBottom="true">
                        <LinearLayout android:orientation="vertical"
 				android:layout_alignParentLeft="true"  
android:layout_width="wrap_content"
                                android:layout_height="wrap_content">
@@ -121,7 +121,7 @@
                                <TextView android:layout_width="fill_parent"
                                        android:layout_height="wrap_content" 
android:id="@+id/MoreInfo"
 					android:text="@string/results_more_about"  
style="@style/NdtResultsMoreInfo"
-                                       android:padding="0sp" />
+                                       android:paddingTop="5sp" 
android:padding="0sp" />
                        </LinearLayout>
                        <LinearLayout android:orientation="vertical"
 				android:layout_alignParentRight="true"  
android:layout_width="wrap_content"
=======================================
--- /branches/android/Android/src/net/measurementlab/ndt/NdtService.java	 
Tue Aug 23 13:36:59 2011
+++ /branches/android/Android/src/net/measurementlab/ndt/NdtService.java	 
Tue Aug 23 14:09:58 2011
@@ -195,7 +195,10 @@
                                        message.trim()));

                        if (statusBuffers.containsKey(viewId)) {
-                               
statusBuffers.get(viewId).append(message).append('\n');
+                               statusBuffers.get(viewId).append(message);
+                               if (!message.endsWith("\n")) {
+                                       
statusBuffers.get(viewId).append('\n');
+                               }
                        }

                        if (message.contains(C2S_MSG_FRAGMENT)
=======================================
---  
/branches/android/Android/src/net/measurementlab/ndt/ResultsActivity.java	 
Tue Aug 23 13:36:59 2011
+++  
/branches/android/Android/src/net/measurementlab/ndt/ResultsActivity.java	 
Tue Aug 23 14:09:58 2011
@@ -9,7 +9,6 @@
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
-import android.util.Log;
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.widget.Button;
@@ -80,12 +79,14 @@
        @Override
        protected void onResume() {
                super.onResume();
-               Map<String, Object> variables = (Map<String, Object>) 
getIntent()
+               Intent intent = getIntent();
+               Map<String, Object> variables = (Map<String, Object>) intent
                                .getSerializableExtra(NdtService.EXTRA_VARS);
                formatSummaryResults(variables);
                formatDetailedResults(variables);
-               formatAdvancedResults(getIntent().getStringExtra(
-                               NdtService.EXTRA_DIAG_STATUS));
+               String diagnosticStatus = intent.getStringExtra(
+                               NdtService.EXTRA_DIAG_STATUS);
+               formatAdvancedResults(diagnosticStatus);

 		Toast resultsHint = Toast.makeText(getApplicationContext(),  
getString(R.string.results_swipe_hint), 10);
                resultsHint.show();
@@ -143,6 +144,46 @@
                                variables, "pub_WaitSec", "pub_CurRTO"));
                
results.append(formatDetailedLine(R.string.results_detailed_ack,
                                variables, "pub_SACKsRcvd"));
+
+               results.append('\n');
+               // TODO finish filling in the rest
+
+//               if (a.get_mismatch() == "yes") {
+//                 d += "A duplex mismatch condition was detected.<br>";
+//               }
+//               else {
+//                 d += "No duplex mismatch condition was detected.<br>";
+//               }
+//
+//               if (a.get_Bad_cable() == "yes") {
+//                 d += "The test detected a cable fault.<br>";
+//               }
+//               else {
+//                 d += "The test did not detect a cable fault.<br>";
+//               }
+//
+//               if (a.get_congestion() == "yes") {
+//                 d += "Network congestion may be limiting the 
connection.<br>";
+//               }
+//               else {
+//                 d += "No network congestion was detected.<br>";
+//               }
+//
+//               if (a.get_natStatus() == "yes") {
+//                 d += "A network addess translation appliance was 
detected.<br>";
+//               }
+//               else {
+//                 d += "No network addess translation appliance was 
detected.<br>";
+//               }
+//
+//               d += "<br>";
+//
+//		  d += a.get_cwndtime() + "% of the time was not spent in a receiver  
limited or sender limited state.<br>";
+//		  d += a.get_rcvrLimiting() + "% of the time the connection is limited  
by the client machine's receive buffer.<br>";
+//		  d += "Optimal receive buffer: " + a.get_optimalRcvrBuffer() + "  
bytes<br>";
+//               d += "Bottleneck link: " + a.get_AccessTech() + "<br>";
+//               d += a.get_DupAcksOut() + " duplicate ACKs set<br>";
+

                TextView textView = (TextView) 
findViewById(R.id.DetailedResultsInfo);
                textView.setText(results);
@@ -151,7 +192,6 @@
        private void formatAdvancedResults(String diagnosticStatus) {
                String advanced = getString(R.string.results_advanced_web100,
                                diagnosticStatus);
-               Log.i(Constants.LOG_TAG, diagnosticStatus);
                TextView textView = (TextView) 
findViewById(R.id.AdvancedResultsInfo);
                textView.setText(advanced);
        }
=======================================
--- /branches/android/Android/src/net/measurementlab/ndt/TestsActivity.java	 
Tue Aug 23 13:36:59 2011
+++ /branches/android/Android/src/net/measurementlab/ndt/TestsActivity.java	 
Tue Aug 23 14:09:58 2011
@@ -133,6 +133,7 @@
                imageView.setImageDrawable(null);
 		Intent intent = new Intent(getApplicationContext(),  
ResultsActivity.class);
 		intent.putExtra(NdtService.EXTRA_VARS,  
status.getSerializableExtra(NdtService.EXTRA_VARS));
+		intent.putExtra(NdtService.EXTRA_DIAG_STATUS,  
status.getStringExtra(NdtService.EXTRA_DIAG_STATUS));
                startActivity(intent);
        }