but on proxy option corrected

OCSInventory-NG · Oct 15, 2015 · a7835c3 · a7835c3
1 parent 3dceddc
commit a7835c3
Show file tree

Hide file tree

Showing 6 changed files with 35 additions and 12 deletions.
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
@@ -2,8 +2,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="org.ocsinventoryng.android.agent"
     android:installLocation="auto"
-    android:versionCode="24"
-    android:versionName="2.1.6c" >
+    android:versionCode="25"
+    android:versionName="2.1.7" >
 
     <uses-sdk
         android:minSdkVersion="9"

diff --git a/Changes b/Changes
@@ -83,3 +83,6 @@ Revision history for Ocsinventory NG Android Agent
 2.1.6
 	* Bugs correction on package installation managment notifications
 	* Add InstallReceiver class
+2.1.7
+	* Bug on proxy option corrected. The option was not applied.
+
diff --git a/src/org/ocsinventoryng/android/actions/Inventory.java b/src/org/ocsinventoryng/android/actions/Inventory.java
@@ -90,8 +90,9 @@ public void BuildInventory(Context ctx) {
 			hardware.setIpAddress(pn.getIpAdress());
 		}
 
-		ocslog.debug("drives...");
+		ocslog.debug("OCSdrives...");
 		this.drives=new OCSDrives();
+		ocslog.debug("OCSStorages...");
 		this.storages=new OCSStorages();
 
 		if ( settings.getDeviceUid() == null ) {
@@ -108,12 +109,16 @@ public void BuildInventory(Context ctx) {
 		this.videos = new OCSVideos(ctx);
 		ocslog.debug("OCSSoftwares...");
 		this.softwares = new OCSSoftwares(ctx);
+		ocslog.debug("OCSInputs...");
 		this.inputs=new OCSInputs(ctx.getApplicationContext());
+		ocslog.debug("OCSJavaInfos...");
 		this.javainfos= new OCSJavaInfos();
+		ocslog.debug("OCSSims...");
 		this.sims= new OCSSims(ctx);
 
 	/* Mise a jour du checksum */
 		mCtx=ctx;
+		ocslog.debug("CHECKSUM update");
 		loadSectionsFP(ctx);
 		currentFP=new Hashtable<String, String>();
 
@@ -251,7 +256,11 @@ public List<OCSSection> getSections( String sName ) {
 
 		return null;
 	}
-
+
+	/**
+	Load sections checksum from file
+	 @param ctx application context
+	 **/
 	private void loadSectionsFP(Context ctx ) {
 		lastFP=new Hashtable<String, String>();
 

diff --git a/src/org/ocsinventoryng/android/actions/OCSSettings.java b/src/org/ocsinventoryng/android/actions/OCSSettings.java
@@ -28,7 +28,7 @@ public class OCSSettings
 	final String KDEBUG = "k_debug";
 	final String KGZIP = "k_gzip";
 	final String KSTRICTSSL = "k_strictssl";	
-	final String KPROXY = "k_proxyl";
+	final String KPROXY = "k_proxy";
 	final String KPROXYADR = "k_proxyadr";
 	final String KPROXYPORT = "k_proxyport";
 	final String KCACHE = "k_cache";

diff --git a/src/org/ocsinventoryng/android/sections/OCSInputs.java b/src/org/ocsinventoryng/android/sections/OCSInputs.java
@@ -30,8 +30,8 @@ public OCSInputs(Context ctx) {
 		if (Build.VERSION.SDK_INT < Build.VERSION_CODES.JELLY_BEAN) {
 			ocslog.debug("OCSInputs BUILD Build.VERSION.SDK_INT ");
 			Configuration config = ctx.getResources().getConfiguration();
-			ocslog.debug("config.keyboard"+ config.keyboard);
-			ocslog.debug("config.touchscreen"+ config.keyboard);
+			ocslog.debug("config.keyboard "+ config.keyboard);
+			ocslog.debug("config.touchscreen "+ config.touchscreen);
 
 			OCSInput inkb = new   OCSInput ();
 			inkb.setType("keybord");
@@ -66,8 +66,10 @@ public OCSInputs(Context ctx) {
 			}
 			inputs.add(ocsin);
 		}
-
-		// Infos sur les apareils photo
+/*
+		// About cameras
+		ocslog.debug("Search camera infos on build : "+Build.VERSION.SDK_INT );
+		// Test if build < GINGERBREAD November 2010: Android 2.3
 		if (Build.VERSION.SDK_INT < Build.VERSION_CODES.GINGERBREAD) {
 	    	OCSInput ocsci = new  OCSInput ();
 	    	ocsci.setType("Camera");
@@ -77,8 +79,8 @@ public OCSInputs(Context ctx) {
 	    	inputs.add(ocsci);
 		} else {
 		    int numberOfCameras = Camera.getNumberOfCameras();
+			ocslog.debug("Number of cameras : "+numberOfCameras);
 		    CameraInfo cameraInfo = new CameraInfo();
-
 		    for (int i = 0; i < numberOfCameras; i++) {
 		    	OCSInput ocsci = new  OCSInput ();
 		    	String sSz = getCameraMaxImgSize(openCamera(i));
@@ -91,10 +93,13 @@ public OCSInputs(Context ctx) {
 			    ocsci.setDescription("Image size "+sSz);
 		    	inputs.add(ocsci);
 		    }
-	    }
+		}
+*/
+		ocslog.debug("OCSInputs done");
 	}
 
 	// Build.VERSION.SDK_INT < Build.VERSION_CODES.GINGERBREAD
+	@TargetApi(Build.VERSION_CODES.GINGERBREAD)
 	private Camera openCamera() {
 	    try {
 	    	return Camera.open();

diff --git a/src/org/ocsinventoryng/android/sections/OCSSection.java b/src/org/ocsinventoryng/android/sections/OCSSection.java
@@ -1,11 +1,14 @@
 package org.ocsinventoryng.android.sections;
+import org.ocsinventoryng.android.actions.OCSLog;
+
 import java.util.HashMap;
 import java.util.Map;
 
 public class OCSSection  {
 	String name;  // Section name ie BIOS
 	String titre; // Section title for display
 	Map<String, String> attrs;
+	private OCSLog ocslog = OCSLog.getInstance();
 	public OCSSection(String pName) {
 		name = pName;
 		attrs = new  HashMap<String, String>();
@@ -30,8 +33,11 @@ public String toXML() {
 	public String toString() {
 		StringBuffer strOut = new StringBuffer("");
 		for ( String k : attrs.keySet() ) {
+			ocslog.debug("Key : "+k);
 			String v = attrs.get(k);
-			strOut.append(k).append(": ").append(v).append("\n");			
+			ocslog.debug("Val : "+v);
+			if ( v != null )
+				strOut.append(k).append(": ").append(v).append("\n");
 		}
 		return strOut.toString();
 	}