Revision: 6996
http://pandora.svn.sourceforge.net/pandora/?rev=6996&view=rev
Author: markholland
Date: 2012-09-24 16:43:51 +0000 (Mon, 24 Sep 2012)
Log Message:
-----------
2012-09-24 Mark Holland <mark@...>
* src/pandroid/agent/PandroidAgentListener.java:
Removed asynctask when making contact in attempt
to fix configuration loss after x time
Modified Paths:
--------------
trunk/pandora_agents/android/src/pandroid/agent/PandroidAgentListener.java
Modified: trunk/pandora_agents/android/src/pandroid/agent/PandroidAgentListener.java
===================================================================
--- trunk/pandora_agents/android/src/pandroid/agent/PandroidAgentListener.java 2012-09-24 11:59:05 UTC (rev 6995)
+++ trunk/pandora_agents/android/src/pandroid/agent/PandroidAgentListener.java 2012-09-24 16:43:51 UTC (rev 6996)
@@ -112,7 +112,54 @@
return null;
}
+
+
private void contact(){
+ Date date = new Date();
+
+ putSharedData("PANDROID_DATA", "contactError", "0", "integer");
+ putSharedData("PANDROID_DATA", "lastContact", Long.toString(date.getTime() / 1000), "long");
+
+ // Keep lastXML sended if is not empty (empty means error sending it)
+ String lastXML = buildXML();
+
+ String agentName = getSharedData("PANDROID_DATA", "agentName", Core.defaultAgentName, "string");
+
+ String destFileName = agentName + "." + System.currentTimeMillis() + ".data";
+
+ writeFile(destFileName, lastXML);
+
+ String[] tentacleData = {
+ "-a",
+ getSharedData("PANDROID_DATA", "serverAddr", "", "string"),
+ "-p",
+ Core.defaultServerPort,
+ "-v",
+ "/data/data/pandroid.agent/files/" + destFileName
+ };
+
+ int tentacleRet = new tentacle_client().tentacle_client(tentacleData);
+
+ // Deleting the file after send it
+ File file = new File("/data/data/pandroid.agent/files/" + destFileName);
+ file.delete();
+
+ if(tentacleRet == 0) {
+ putSharedData("PANDROID_DATA", "lastXML", lastXML, "string");
+ if (Core.helloSignal >= 1)
+ Core.helloSignal = 0;
+ Core.updateConf(getApplicationContext());
+ }
+ else {
+ putSharedData("PANDROID_DATA", "contactError", "1", "integer");
+ }
+
+ updateValues();
+ }
+
+
+ /*
+ private void contact(){
/*
Toast toast = Toast.makeText(getApplicationContext(),
@@ -121,8 +168,8 @@
Toast.LENGTH_SHORT);
toast.setGravity(Gravity.BOTTOM,0,0);
toast.show();
- */
+
Date date = new Date();
@@ -176,7 +223,7 @@
}//end doInBackground
}
-
+ */
////////////////////////////////////////////////////////////////////////////////////////
// From unfinished task of buffering unsent xml files when no connection available //
////////////////////////////////////////////////////////////////////////////////////////
@@ -904,6 +951,7 @@
SharedPreferences agentPreferences = getSharedPreferences(preferenceName, mode);
SharedPreferences.Editor editor = agentPreferences.edit();
+
if(type == "boolean") {
editor.putBoolean(tokenName, Boolean.parseBoolean(data));
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|