Preparing for release to world

benjaminug · Dec 30, 2010 · f98a2ef · f98a2ef
1 parent d0c3306
commit f98a2ef
Show file tree

Hide file tree

Showing 43 changed files with 1,193 additions and 476 deletions.
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-	package="com.eightbitcloud.internode" android:versionName="2.02"
-	android:versionCode="6">
+	package="com.eightbitcloud.internode" android:versionName="2.13"
+	android:versionCode="19">
 	<application android:icon="@drawable/nodedroid"	android:label="@string/app_name" >
 		<activity android:name=".NodeUsage" android:label="@string/app_name" android:theme="@android:style/Theme.Light">
 			<intent-filter>
@@ -24,9 +24,31 @@
 				<action android:name="android.intent.action.VIEW" />
 			</intent-filter>
 		</activity>
+<!-- 
+		<activity android:name=".BrowserScraperActivity" android:label="@string/browserscraper"
+     		android:theme="@android:style/Theme.NoTitleBar">
+			<intent-filter>
+				<category android:name="android.intent.category.PREFERENCE" />
+				<action android:name="android.intent.action.VIEW" />
+			</intent-filter>
+     	</activity>
+     	
+     	<activity android:name=".NodeDroidWidgetConfigure" android:label="Configure Widget">
+			<intent-filter>
+				<action android:name="android.appwidget.action.APPWIDGET_CONFIGURE" />
+			</intent-filter>
+     	</activity>
+     
 
 
-
+		<receiver android:name=".NodeDroidWidgetProvider">
+			<intent-filter>
+				<action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
+			</intent-filter>
+			<meta-data android:name="android.appwidget.provider"
+				android:resource="@xml/usage_appwidget_info" />
+		</receiver>
+-->
 		<meta-data android:value="a14c806b710009e" android:name="ADMOB_PUBLISHER_ID" />
 	</application>
 

diff --git a/Entrust_net.cer b/Entrust_net.cer
diff --git a/Notes.txt b/Notes.txt
@@ -0,0 +1,87 @@
+         /web/oscportal.portal?_nfpb=true&portlet_viewmyusage_2_actionOverride=%2Fportlets%2Fosc%2FViewMyUsage%2FgoToEBPPUrl&_windowLabel=portlet_viewmyusage_2&portlet_viewmyusage_2accNum=obYJVkQwXEmXbLFkddgTuw%3D%3D&portlet_viewmyusage_2pageName=unbilledUsage&portlet_viewmyusage_2virAcctNum=Dqwz4w3Slk3i%2BrzFSOOB%2FA%3D%3D&_pageLabel=myusage_postpaid
+<a href="/web/oscportal.portal?_nfpb=true&portlet_viewmyusage_3_actionOverride=%2Fportlets%2Fosc%2FViewMyUsage%2FgoToEBPPUrl&_windowLabel=portlet_viewmyusage_3&portlet_viewmyusage_3accNum=Rn0jmGfmd9t9O1hNBFB%2BSw%3D%3D&portlet_viewmyusage_3pageName=unbilledUsage&portlet_viewmyusage_3virAcctNum=5KAXoR0c6uptKjGw%2BeRx7w%3D%3D&_pageLabel=osc_wl_myusage_pg">0418129969</a>
+
+A guy has send me a link to optus wireless broadband stuff
+
+<a href="/web/oscportal.portal?_nfpb=true&portlet_viewmyusage_3_actionOverride=%2Fportlets%2Fosc%2FViewMyUsage%2FgoToSnapShot&_windowLabel=portlet_viewmyusage_3&_pageLabel=osc_wl_myusage_pg">Broadband Usage</a>
+<a href="/web/oscportal.portal?_nfpb=true&portlet_viewmyusage_3_actionOverride=%2Fportlets%2Fosc%2FViewMyUsage%2FgoToEBPPUrl&_windowLabel=portlet_viewmyusage_3&portlet_viewmyusage_3accNum=Rn0jmGfmd9t9O1hNBFB%2BSw%3D%3D&portlet_viewmyusage_3pageName=unbilledUsage&portlet_viewmyusage_3svcType=OWB&portlet_viewmyusage_3virAcctNum=koywLc9v6x6XzX8iDlJ1Nw%3D%3D&_pageLabel=osc_wl_myusage_pg">SMS Usage</a>
+
+It comes from a text blob that looks like:
+<td valign="top" class="blue2" width ="25%">
+11-09 16:30:58.076 28123 28158 D NodeDroid:                                             
+11-09 16:30:58.076 28123 28158 D NodeDroid:                                             
+11-09 16:30:58.076 28123 28158 D NodeDroid: 											
+11-09 16:30:58.076 28123 28158 D NodeDroid: 												
+11-09 16:30:58.076 28123 28158 D NodeDroid: 													
+11-09 16:30:58.076 28123 28158 D NodeDroid: 													
+11-09 16:30:58.076 28123 28158 D NodeDroid: 													
+11-09 16:30:58.076 28123 28158 D NodeDroid: 													
+11-09 16:30:58.076 28123 28158 D NodeDroid: 													
+11-09 16:30:58.076 28123 28158 D NodeDroid:                                                     
+11-09 16:30:58.076 28123 28158 D NodeDroid:                                                     
+11-09 16:30:58.076 28123 28158 D NodeDroid:                                                     
+11-09 16:30:58.076 28123 28158 D NodeDroid:                                                     
+11-09 16:30:58.076 28123 28158 D NodeDroid:                                                     
+11-09 16:30:58.076 28123 28158 D NodeDroid:                                                     
+11-09 16:30:58.076 28123 28158 D NodeDroid:                                                     
+11-09 16:30:58.076 28123 28158 D NodeDroid:                                                     
+11-09 16:30:58.076 28123 28158 D NodeDroid:                                                     
+11-09 16:30:58.076 28123 28158 D NodeDroid:                                                     
+11-09 16:30:58.076 28123 28158 D NodeDroid:                                                     
+11-09 16:30:58.076 28123 28158 D NodeDroid:                                                     
+11-09 16:30:58.076 28123 28158 D NodeDroid:                                        
+11-09 16:30:58.076 28123 28158 D NodeDroid: HTTP15:              
+11-09 16:30:58.076 28123 28158 D NodeDroid:                                                     
+11-09 16:30:58.076 28123 28158 D NodeDroid:                                                     
+11-09 16:30:58.076 28123 28158 D NodeDroid:                                                     
+11-09 16:30:58.076 28123 28158 D NodeDroid:                                                     
+11-09 16:30:58.076 28123 28158 D NodeDroid:                                                     <a id="id_owb_lnk_0422119653" style="display:block; cursor:pointer; text-decoration:underline" onClick="showLoading('owb', '0422119653')">
+11-09 16:30:58.076 28123 28158 D NodeDroid:                                                     
+11-09 16:30:58.076 28123 28158 D NodeDroid:                                                                 0422119653
+11-09 16:30:58.076 28123 28158 D NodeDroid:                                                     </a>
+11-09 16:30:58.076 28123 28158 D NodeDroid:                                                     
+11-09 16:30:58.076 28123 28158 D NodeDroid:                                                         
+11-09 16:30:58.076 28123 28158 D NodeDroid:                                                         
+11-09 16:30:58.076 28123 28158 D NodeDroid:                                                         <div id="id_owb_txt_0422119653" style="display:none">
+11-09 16:30:58.076 28123 28158 D NodeDroid:                                                         
+11-09 16:30:58.076 28123 28158 D NodeDroid:                                                             0422119653
+11-09 16:30:58.076 28123 28158 D NodeDroid:                                                         </div>
+11-09 16:30:58.076 28123 28158 D NodeDroid:                                                         
+11-09 16:30:58.076 28123 28158 D NodeDroid:                                                         
+11-09 16:30:58.076 28123 28158 D NodeDroid:                                                         
+11-09 16:30:58.076 28123 28158 D NodeDroid:                                                         
+11-09 16:30:58.076 28123 28158 D NodeDroid:                                                         <div id="msg_console_owb_0422119653" style="padding: 0pt 0pt 0px 5px; display: none; float: left;">
+11-09 16:30:58.076 28123 28158 D NodeDroid:                                                         
+11-09 16:30:58.076 28123 28158 D NodeDroid:                                                                 <div style="float: left; margin-right: 10px;">
+11-09 16:30:58.076 28123 28158 D NodeDroid:                                                                     <img src="/web/ShowBinary/SCSRepository/assets/images/fragments/servicecentre/waiting_icon.gif">
+11-09 16:30:58.076 28123 28158 D NodeDroid:                                                                 </div>
+11-09 16:30:58.076 28123 28158 D NodeDroid:                                                                 <span style="padding: 0pt; color: rgb(0, 151, 172); font-size: 10px;">
+11-09 16:30:58.076 28123 28158 D NodeDroid:                                                                     Loading...
+11-09 16:30:58.076 28123 28158 D NodeDroid:                                                                 </span>
+11-09 16:30:58.076 28123 28158 D NodeDroid:                                                         </div>
+11-09 16:30:58.076 28123 28158 D NodeDroid:                                                         
+11-09 16:30:58.076 28123 28158 D NodeDroid:                                                         
+11-09 16:30:58.076 28123 28158 D NodeDroid:                                                         <li class="blue2" id="bb_usage_owb_0422119653" style="display:none"> 
+11-09 16:30:58.076 28123 28158 D NodeDroid:                                                         
+11-09 16:30:58.076 28123 28158 D NodeDroid:                                                             <a href="/web/oscportal.portal?_nfpb=true&portlet_viewmyusage_3_actionOverride=%2Fportlets%2Fosc%2FViewMyUsage%2FgoToSnapShot&_windowLabel=portlet_viewmyusage_3&_pageLabel=osc_wl_myusage_pg">Broadband Usage</a>
+11-09 16:30:58.076 28123 28158 D NodeDroid:                                                         </li>
+11-09 16:30:58.076 28123 28158 D NodeDroid:                                                         
+11-09 16:30:58.076 28123 28158 D NodeDroid:                                                         
+11-09 16:30:58.076 28123 28158 D NodeDroid:                                                         <li class="blue2" id="sms_usage_owb_0422119653" style="display:none"> 
+11-09 16:30:58.076 28123 28158 D NodeDroid:                                                         
+11-09 16:30:58.076 28123 28158 D NodeDroid:                                                             <a href="/web/oscportal.portal?_nfpb=true&portlet_viewmyusage_3_actionOverride=%2Fportlets%2Fosc%2FViewMyUsage%2FgoToEBPPUrl&_windowLabel=portlet_viewmyusage_3&portlet_viewmyusage_3accNum=Rn0jmGfmd9t9O1hNBFB%2BSw%3D%3D&portlet_viewmyusage_3pageName=unbilledUsage&portlet_viewmyusage_3svcType=OWB&portlet_viewmyusage_3virAcctNum=koywLc9v6x6XzX8iDlJ1Nw%3D%3D&_pageLabel=osc_wl_myusage_pg">SMS Usage</a>
+11-09 16:30:58.076 28123 28158 D NodeDroid:                                                         </li>
+11-09 16:30:58.076 28123 28158 D NodeDroid:                                              
+11-09 16:30:58.076 28123 28158 D NodeDroid: 													
+11-09 16:30:58.076 28123 28158 D NodeDroid:                                                     
+11-09 16:30:58.076 28123 28158 D NodeDroid:                                                     
+11-09 16:30:58.076 28123 28158 D NodeDroid:                                                     
+11-09 16:30:58.076 28123 28158 D NodeDroid:                                                     
+11-09 16:30:58.076 28123 28158 D NodeDroid:                        
+
+16:30:58.076 28123 28158 D NodeDroid: HTTP15:                              
+11-09 16:30:58.076 28123 28158 D NodeDroid:                                                     
+11-09 16:30:58.076 28123 28158 D NodeDroid:                                                     
+11-09 16:30:58.076 28123 28158 D NodeDroid: 												
+ 											</td>
+
diff --git a/createKeystore.sh b/createKeystore.sh
@@ -1,2 +1,3 @@
-#!/binsh
+#!/bin/sh
 keytool -keystore assets/my.bks -storetype BKS -provider org.bouncycastle.jce.provider.BouncyCastleProvider -storepass changeit -importcert -trustcacerts -alias GeoTrust -file GeoTrust_Global_CA.cer
+keytool -keystore assets/my.bks -storetype BKS -provider org.bouncycastle.jce.provider.BouncyCastleProvider -storepass changeit -importcert -trustcacerts -alias GeoTrust -file Entrust_net.cer
diff --git a/lib/dom4j-1.6.1.jar b/lib/dom4j-1.6.1.jar
diff --git a/lib/jtidy-r938.jar b/lib/jtidy-r938.jar
diff --git a/res/drawable/ic_menu_directions.png b/res/drawable/ic_menu_directions.png
diff --git a/res/drawable/padded_background.xml b/res/drawable/padded_background.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<layer-list
+    xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item
+        android:top="6px"
+        android:left="6px"
+        android:right="6px"
+        android:bottom="6px"
+        android:drawable="@drawable/widget_background" />
+
+</layer-list>
diff --git a/res/drawable/pending.png b/res/drawable/pending.png
diff --git a/res/drawable/widget_background.xml b/res/drawable/widget_background.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
+	<corners android:radius="8px" />
+	<gradient xmlns:android="http://schemas.android.com/apk/res/android"
+		android:startColor="#d2d2d2" android:endColor="#f1f1f1" android:angle="90"
+		android:type="linear">
+	</gradient>
+</shape>
diff --git a/res/layout/browserscraper.xml b/res/layout/browserscraper.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+  xmlns:android="http://schemas.android.com/apk/res/android"
+  android:layout_width="fill_parent"
+  android:layout_height="wrap_content"
+  android:orientation="vertical"
+  android:background="@drawable/background">
+
+<LinearLayout android:layout_width="fill_parent"  android:layout_height="wrap_content" android:gravity="center" android:padding="8px">
+	<TextView android:text="URL:" android:layout_width="wrap_content" android:layout_height="wrap_content"/>
+	<EditText android:id="@+id/urlEntry" android:text="http://www.google.com/" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_weight="1.0" android:imeActionId="@+id/goButton" android:imeOptions="actionGo"/>
+	<Button android:id="@+id/goButton" android:text="Go" android:layout_width="wrap_content" android:layout_height="wrap_content"/>
+</LinearLayout>
+
+<WebView 
+    android:id="@+id/webview"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:layout_weight="1.0"
+/>
+<LinearLayout android:layout_width="fill_parent"  android:layout_height="wrap_content" android:gravity="center" android:padding="8px">
+	<Button android:id="@+id/snapshotButton" android:text="Snapshot" android:layout_width="wrap_content" android:layout_height="wrap_content"/>
+	<Button android:id="@+id/sendLogsButton" android:text="Send Logs" android:layout_width="wrap_content" android:layout_height="wrap_content"/>
+</LinearLayout>
+</LinearLayout>
diff --git a/res/layout/quota.xml b/res/layout/quota.xml
@@ -14,13 +14,20 @@
 			android:paddingTop="24px" android:paddingRight="0px"
 			android:paddingBottom="4px" android:textStyle="bold">
 		</TextView>
+
+
 
 		<LinearLayout android:layout_width="fill_parent"
-			android:layout_height="fill_parent" android:gravity="right">
-			<ProgressBar style="?android:attr/progressBarStyleSmall"
-				android:layout_width="65px" android:layout_height="65px"
-				android:indeterminate="true" android:visibility="invisible"
-				android:padding="6px" android:id="@+id/progress" />
+			android:layout_height="fill_parent" android:gravity="right" android:orientation="vertical" android:padding="4px">
+
+			<FrameLayout android:layout_width="43px" android:layout_height="43px">
+				<ProgressBar style="?android:attr/progressBarStyleSmall"
+					android:layout_width="fill_parent" android:layout_height="fill_parent"
+					android:indeterminate="true" android:visibility="invisible"
+					 android:id="@+id/progress" />
+				<ImageView android:layout_width="fill_parent" android:layout_height="fill_parent" android:id="@+id/pendingImage" android:background="@drawable/pending" android:visibility="invisible"/>
+			</FrameLayout>
+			<TextView android:layout_width="wrap_content" android:textColor="#7000" android:layout_height="wrap_content" android:id="@+id/lastUpdated"  android:textSize="4pt"/>
 		</LinearLayout>
 
 

diff --git a/res/layout/usagewidget.xml b/res/layout/usagewidget.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+  android:layout_width="fill_parent"
+  android:layout_height="fill_parent"
+  android:orientation="vertical"
+  android:background="@drawable/padded_background"  android:paddingLeft="8px" android:paddingRight="8px" android:paddingTop="6px" android:paddingBottom="6px">
+
+  <TextView android:text="Hello" android:textColor="#777777" android:layout_width="fill_parent" android:layout_height="wrap_content"/>
+
+  <ImageView android:id="@+id/widgetImage" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_weight="1" android:scaleType="fitXY"></ImageView>
+</LinearLayout>
diff --git a/res/layout/widgetconfig.xml b/res/layout/widgetconfig.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+  xmlns:android="http://schemas.android.com/apk/res/android"
+  android:layout_width="wrap_content"
+  android:layout_height="wrap_content">
+
+  <Button android:id="@+id/configSave" android:text="Add Widget" android:layout_width="wrap_content" android:layout_height="wrap_content"></Button>
+</LinearLayout>
diff --git a/res/menu/mainmenu.xml b/res/menu/mainmenu.xml
@@ -4,4 +4,5 @@
 <item android:title="@string/accountsmenuitem" android:icon="@drawable/ic_menu_add" android:id="@+id/accountsMenuItem"></item>
 <item android:id="@+id/refreshMenuItem" android:icon="@drawable/redo" android:title="@string/refreshmenuitem"></item>
 <item android:id="@+id/settingsMenuItem" android:icon="@drawable/ic_menu_preferences" android:title="@string/settingsmenuitem"></item>
+
 </menu>
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
diff --git a/res/values/strings.xml b/res/values/strings.xml
@@ -49,6 +49,8 @@
 <string name="home_page_summary">View NodeDroid support homepage</string>
 <string name="send_logs">Send logs to 8-bit cloud</string>
 <string name="send_logs_summary">Email logs of network traffic and errors to 8-bit cloud for diagnosis</string>
+<string name="browserscraper">Browser Scraper</string>
+<string name="browserscraper_summary">Use an embedded browser to teach NodeDroid what your usage looks like</string>
 
 
 

diff --git a/res/xml/usage_appwidget_info.xml b/res/xml/usage_appwidget_info.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<appwidget-provider
+  xmlns:android="http://schemas.android.com/apk/res/android"     
+    android:minWidth="294dp"
+    android:minHeight="72dp"
+    android:updatePeriodMillis="60000"
+    android:initialLayout="@layout/usagewidget"
+    android:configure="com.eightbitcloud.internode.NodeDroidWidgetConfigure" >
+
+</appwidget-provider>