diff --git a/AndroidManifest.xml b/AndroidManifest.xml index f77008d..143abcb 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -2,8 +2,8 @@ + android:versionCode="25" + android:versionName="2.1.7" > (); @@ -251,7 +256,11 @@ public List getSections( String sName ) { return null; } - + + /** + Load sections checksum from file + @param ctx application context + **/ private void loadSectionsFP(Context ctx ) { lastFP=new Hashtable(); diff --git a/src/org/ocsinventoryng/android/actions/OCSSettings.java b/src/org/ocsinventoryng/android/actions/OCSSettings.java index 03726aa..74a3bdf 100644 --- 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 index e9f7420..4b5fa22 100644 --- 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 index 66ffc5a..fafb7b4 100644 --- a/src/org/ocsinventoryng/android/sections/OCSSection.java +++ b/src/org/ocsinventoryng/android/sections/OCSSection.java @@ -1,4 +1,6 @@ package org.ocsinventoryng.android.sections; +import org.ocsinventoryng.android.actions.OCSLog; + import java.util.HashMap; import java.util.Map; @@ -6,6 +8,7 @@ public class OCSSection { String name; // Section name ie BIOS String titre; // Section title for display Map attrs; + private OCSLog ocslog = OCSLog.getInstance(); public OCSSection(String pName) { name = pName; attrs = new HashMap(); @@ -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(); }