Hi Cedric,

Thanks again.

After first look at your contribution il think that much and probably allare
very helpful

I will merge all that quitely this WE :-)

Regards...

JCE




2013/4/24 Cédric Cabessa <email address hidden>

> Cédric Cabessa has proposed merging
> lp:~ccabessa/ocsinventory-android-agent/ocsinventory into
> lp:ocsinventory-android-agent.
>
> Requested reviews:
>   OCS Inventory Dev Team (ocsinventory-dev)
>
> For more details, see:
>
> https://code.launchpad.net/~ccabessa/ocsinventory-android-agent/ocsinventory/+merge/160645
>
> Hi
>
> Here are more changes!
> Feel free to select what you find useful, as always if you think that
> something can be rewrote in a better way, let me know.
>
> FYI: I'll be unable to answer from the 28 to may 20th
>
> Thank you for your review
> --
>
> https://code.launchpad.net/~ccabessa/ocsinventory-android-agent/ocsinventory/+merge/160645
> Your team OCS Inventory Dev Team is requested to review the proposed merge
> of lp:~ccabessa/ocsinventory-android-agent/ocsinventory into
> lp:ocsinventory-android-agent.
>
> === modified file 'AndroidManifest.xml'
> --- AndroidManifest.xml 2013-04-17 19:35:07 +0000
> +++ AndroidManifest.xml 2013-04-24 13:42:26 +0000
> @@ -64,7 +64,8 @@
>
>          <receiver
>              android:name=".OCSEventReceiver"
> -            android:process=":ocs_process" >
> +            android:process=":ocs_process"
> +            android:exported="true" >
>          </receiver>
>          <receiver
>              android:name=".OCSBootReceiver"
>
> === modified file 'src/org/ocsinventory/android/actions/Inventory.java'
> --- src/org/ocsinventory/android/actions/Inventory.java 2013-04-08
> 19:17:12 +0000
> +++ src/org/ocsinventory/android/actions/Inventory.java 2013-04-24
> 13:42:26 +0000
> @@ -150,8 +150,8 @@
>                         instance = new Inventory(ctx);
>                 else {
>                         Date now = new Date();
> -                       long d = (now.getTime() -
> lastDate.getTime())/60000L;
> -                       android.util.Log.d("OCS","Age du cache (mn) = "+d
> );
> +                       long d = (now.getTime() - lastDate.getTime());
> +                       android.util.Log.d("OCS","Age du cache (mn) = "+d
> / 60000L);
>                         if (  d  > dureeCache ) {
>                                 android.util.Log.d("OCS","REFRESH" );
>                                 instance = new Inventory(ctx);
>
> === modified file 'src/org/ocsinventory/android/actions/OCSFiles.java'
> --- src/org/ocsinventory/android/actions/OCSFiles.java  2013-03-19
> 20:49:53 +0000
> +++ src/org/ocsinventory/android/actions/OCSFiles.java  2013-04-24
> 13:42:26 +0000
> @@ -6,8 +6,9 @@
>  import java.io.FileNotFoundException;
>  import java.io.FileOutputStream;
>  import java.io.IOException;
> -import java.io.InputStream;
> -import java.io.OutputStream;
> +import java.util.Date;
> +import java.util.Locale;
> +import java.text.SimpleDateFormat;
>  import java.util.zip.GZIPOutputStream;
>
>  import android.content.Context;
> @@ -15,25 +16,27 @@
>  import android.provider.OpenableColumns;
>
>  public class OCSFiles {
> -       private static OCSFiles instance = null;
>         // public String BASE_FILE_NAME = "termadmin";
>         // public String XML_DIR = "/XML/";
> -       private static Context appCtx;
> +       private Context appCtx;
>
> -       private String inventoryFileName        = "inventory.xml";
> +       private String inventoryFileName;
>         private String gzipedFileName           = "tmp.gz";
>         private String prologFileName           = "prolog.xml";
>
> -       public static OCSFiles getInstance() {
> -               if (instance == null)
> -                       instance = new OCSFiles();
> -               return instance;
> -       }
> -       public static void initInstance(Context ctx) {
> -               if (instance == null) {
> -                       appCtx = ctx;
> -                       instance = new OCSFiles();
> -               }
> +       public OCSFiles(Context ctx) {
> +               appCtx = ctx;
> +               StringBuilder filename = new StringBuilder();
> +
> +               filename.append(Utils.getHostname());
> +               filename.append("-");
> +
> +               SimpleDateFormat dt = new
> SimpleDateFormat("yyyy-MM-dd-HH-mm-ss", Locale.US);
> +               filename.append(dt.format(new Date()));
> +
> +               filename.append(".ocs");
> +
> +               inventoryFileName = filename.toString();
>         }
>
>         public File getGzipedFile(File inFile) {
>
> === modified file 'src/org/ocsinventory/android/actions/OCSProtocol.java'
> --- src/org/ocsinventory/android/actions/OCSProtocol.java       2013-03-19
> 20:49:53 +0000
> +++ src/org/ocsinventory/android/actions/OCSProtocol.java       2013-04-24
> 13:42:26 +0000
> @@ -32,15 +32,21 @@
>  import org.apache.http.protocol.HTTP;
>  import org.apache.http.util.EntityUtils;
>
> +import android.content.Context;
> +
>  public class OCSProtocol {
>         private OCSLog ocslog = OCSLog.getInstance();
> +       private OCSFiles ocsfile;
>
> +       public OCSProtocol(Context context) {
> +               ocsfile = new OCSFiles(context);
> +       }
>
>         public String sendPrologueMessage(Inventory inv) throws
> OCSProtocolException {
>                 ocslog.append("Start Sending Prolog...");
>                 String repMsg;
>                 String reponse;
> -               File localFile = OCSFiles.getInstance().getPrologFileXML();
> +               File localFile = ocsfile.getPrologFileXML();
>                 String sURL = OCSSettings.getInstance().getServerUrl();
>                 // boolean gz = OCSSettings.getInstance().getGzip();
>
> @@ -59,7 +65,7 @@
>                 String retour = null;
>                 // boolean gz = OCSSettings.getInstance().getGzip();
>
> -               File invFile =
> OCSFiles.getInstance().getInventoryFileXML(inventory);
> +               File invFile = ocsfile.getInventoryFileXML(inventory);
>                 String sURL = OCSSettings.getInstance().getServerUrl();
>
>                 String repMsg  = sendmethod(invFile, sURL, true);
> @@ -125,7 +131,7 @@
>                 File fileToPost;
>                 if ( gziped ) {
>                         ocslog.append("Start compression");
> -
> fileToPost=OCSFiles.getInstance().getGzipedFile(pFile);
> +                       fileToPost=ocsfile.getGzipedFile(pFile);
>                         if ( fileToPost == null )
>                                 throw new OCSProtocolException("Error
> during temp file creation");
>                         ocslog.append("Compression done");
>
> === modified file 'src/org/ocsinventory/android/actions/Utils.java'
> --- src/org/ocsinventory/android/actions/Utils.java     2013-03-19
> 20:49:53 +0000
> +++ src/org/ocsinventory/android/actions/Utils.java     2013-04-24
> 13:42:26 +0000
> @@ -116,4 +116,11 @@
>             }
>             return "";
>         }
> +
> +       public static String getHostname() {
> +               String hostname = readSysCommand("/system/bin/getprop",
> "net.hostname").trim();
> +               if(hostname.length() == 0)
> +                       hostname = "android";
> +               return hostname;
> +       }
>  }
>
> === modified file 'src/org/ocsinventory/android/agent/AboutDialog.java'
> --- src/org/ocsinventory/android/agent/AboutDialog.java 2013-02-28
> 20:44:50 +0000
> +++ src/org/ocsinventory/android/agent/AboutDialog.java 2013-04-24
> 13:42:26 +0000
> @@ -7,9 +7,10 @@
>  import java.text.SimpleDateFormat;
>  import java.util.Date;
>
> +import org.ocsinventory.android.actions.OCSSettings;
> +
>  import android.app.Dialog;
>  import android.content.Context;
> -import android.content.SharedPreferences;
>  import android.content.pm.PackageManager.NameNotFoundException;
>  import android.graphics.Color;
>  import android.os.Bundle;
> @@ -37,11 +38,10 @@
>         @Override
>         public void onCreate(Bundle savedInstanceState) {
>                 setContentView(R.layout.about);
> -
> -               SharedPreferences sp =
> PreferenceManager.getDefaultSharedPreferences(mContext);
>
> +               OCSSettings ocssettings =
> OCSSettings.getInstance(mContext);
>
> -               long lastUpdt = sp.getLong("k_lastupdt" , 0L);
> +               long lastUpdt = ocssettings.getLastUpdt();
>
>                 StringBuffer sb = new StringBuffer("OCS Inventory NG
> android Agent \n");
>                 sb.append("Version :");
> @@ -55,8 +55,8 @@
>                         sb.append("Last upload : ");
>                         sb.append(sdf.format(new Date(lastUpdt)));
>                         sb.append("\n");
> -                       if ( sp.getBoolean("k_automode", false)) {
> -                               int  freq =
> Integer.parseInt(sp.getString("k_freqmaj" , ""));
> +                       if ( ocssettings.isAutoMode() ) {
> +                               int  freq = ocssettings.getFreqMaj();
>                                 long nextUpdt= lastUpdt+freq*3600000L;
>                                 sb.append("Next upload : ");
>                                 sb.append(sdf.format(new Date(nextUpdt)));
>
> === modified file 'src/org/ocsinventory/android/agent/AsyncOperations.java'
> --- src/org/ocsinventory/android/agent/AsyncOperations.java     2013-03-19
> 20:49:53 +0000
> +++ src/org/ocsinventory/android/agent/AsyncOperations.java     2013-04-24
> 13:42:26 +0000
> @@ -49,10 +49,10 @@
>
>                 Inventory inventory  = Inventory.getInstance(activity);
>
> -               OCSProtocol ocsproto = new OCSProtocol();
> +               OCSProtocol ocsproto = new OCSProtocol(ctx);
>
>                 if ( ! send ) {
> -                       String status =
> OCSFiles.getInstance().copyToExternal(inventory);
> +                       String status = new
> OCSFiles(ctx).copyToExternal(inventory);
>                         if ( status.equals("OK"))
>                                 status=ctx.getString(R.string.state_saved);
>                         return status;
>
> === modified file
> 'src/org/ocsinventory/android/agent/OCSAgentActivity.java'
> --- src/org/ocsinventory/android/agent/OCSAgentActivity.java    2013-03-19
> 20:49:53 +0000
> +++ src/org/ocsinventory/android/agent/OCSAgentActivity.java    2013-04-24
> 13:42:26 +0000
> @@ -51,7 +51,6 @@
>                 // Initialisation de la configuration
>                 settings=OCSSettings.getInstance(this);
>                 settings.logSettings();
> -               OCSFiles.initInstance(this.getApplicationContext());
>                 // logText.append("Init inventaire\n");
>                 // new AsyncJob(this).execute();
>
>
> === modified file 'src/org/ocsinventory/android/agent/OCSAgentService.java'
> --- src/org/ocsinventory/android/agent/OCSAgentService.java     2013-03-19
> 20:49:53 +0000
> +++ src/org/ocsinventory/android/agent/OCSAgentService.java     2013-04-24
> 13:42:26 +0000
> @@ -15,8 +15,6 @@
>  import android.app.Service;
>  import android.content.Context;
>  import android.content.Intent;
> -import android.content.SharedPreferences;
> -import android.content.SharedPreferences.Editor;
>  import android.net.ConnectivityManager;
>  import android.net.NetworkInfo;
>  import android.os.AsyncTask;
> @@ -29,7 +27,13 @@
>  @TargetApi(Build.VERSION_CODES.JELLY_BEAN)
>  public class OCSAgentService extends Service {
>
> +       public final static String FORCE_UPDATE = "force_update";
> +       public final static String SAVE_INVENTORY = "save_inventory";
>         private NotificationManager mNM;
> +       private OCSSettings mOcssetting;
> +       boolean mIsForced = false;
> +       boolean mSaveInventory = false;
> +
>
>         /*
>          * Binder juste pour verifier que le service tourne
> @@ -50,34 +54,31 @@
>         @Override
>         public int onStartCommand(final Intent intent, final int flags,
>                         final int startId) {
> -
> -               SharedPreferences sp =
> PreferenceManager.getDefaultSharedPreferences(this);
> -
> -               OCSSettings ocssetting =
> OCSSettings.getInstance(getApplicationContext());
> +               mOcssetting =
> OCSSettings.getInstance(getApplicationContext());
>                 OCSLog ocslog = OCSLog.getInstance();
> -               ocslog.append("ocsservice wake : " + new
> Date().toString());
> -
> +               ocslog.append("ocsservice wake : " + new
> Date().toString());
> +               if( intent.getExtras() != null ) {
> +                       mIsForced =
> intent.getExtras().getBoolean(FORCE_UPDATE);
> +                       mSaveInventory =
> intent.getExtras().getBoolean(SAVE_INVENTORY);
> +               }
>                 // Au cas ou l'option a changé depuis le lancement du
> service
> -               if ( ! sp.getBoolean("k_automode", false) )
> +               if ( ! mOcssetting.isAutoMode() && ! mIsForced )
>                         return Service.START_NOT_STICKY;
>
>                 // notify(R.string.not_start_service);
>
> -               int  freq = Integer.parseInt(sp.getString("k_freqmaj" ,
> ""));
> -               long lastUpdt = sp.getLong("k_lastupdt" , 0L);
> +               int  freq = mOcssetting.getFreqMaj();
> +               long lastUpdt = mOcssetting.getLastUpdt();
>                 long delta = System.currentTimeMillis()- lastUpdt;
>
>                 ocslog.append("now         : "+System.currentTimeMillis());
>                 ocslog.append("last update : "+lastUpdt);
>                 ocslog.append("delta laps  : "+delta);
>                 ocslog.append("freqmaj     : "+freq * 3600000L);
> -
> -               if ( delta > freq * 3600000L) {
> -                       if ( isOnline() ) {
> -
> -                                       AsyncCall task = new
> AsyncCall(this.getApplicationContext());
> -                                       task.execute();
> -                       }
> +
> +               if ( (delta > freq * 3600000L && isOnline()) || mIsForced
> ) {
> +                       AsyncCall task = new
> AsyncCall(this.getApplicationContext());
> +                       task.execute();
>                 }
>
>                 return Service.START_NOT_STICKY;
> @@ -87,8 +88,7 @@
>
>                 Inventory inventory  =
> Inventory.getInstance(getApplicationContext());
>                 // OCSFiles.getInstance().getInventoryFileXML(inventory);
> -               OCSFiles.initInstance(getApplicationContext());
> -               OCSProtocol ocsproto = new OCSProtocol();
> +               OCSProtocol ocsproto = new
> OCSProtocol(getApplicationContext());
>                 try {
>                         ocsproto.sendPrologueMessage(inventory);
>                         ocsproto.sendInventoryMessage(inventory);
> @@ -99,19 +99,26 @@
>                 return 0;
>         }
>
> +       private int saveInventory() {
> +               Inventory inventory  =
> Inventory.getInstance(getApplicationContext());
> +               new
> OCSFiles(getApplicationContext()).copyToExternal(inventory);
> +               return 0;
> +       }
> +
>            private class AsyncCall extends AsyncTask<Void, Void, Void> {
>                    int status;
>                    Context mContext;
> -                  SharedPreferences mSP ;
>
>                    AsyncCall(Context ctx) {
>                            mContext = ctx;
> -                          mSP=
> PreferenceManager.getDefaultSharedPreferences(ctx);
>                    }
>
>                 @Override
>                 protected Void doInBackground(Void... params) {
>                         status = sendInventory();
> +                       if(mSaveInventory) {
> +                               saveInventory();
> +                       }
>
>                     return null;
>                 }
> @@ -119,12 +126,10 @@
>                 @Override
>                 protected void onPostExecute(Void result) {
>                     if ( status == 0)
> -                   {
> -
> notify(R.string.nty_inventory_sent);
> -                                               Editor edt = mSP.edit();
> -                                               edt.putLong("k_lastupdt",
> System.currentTimeMillis());
> -                                               edt.commit();
> -                               }
> +                   {
> +                       notify(R.string.nty_inventory_sent);
> +
> mOcssetting.setLastUpdt(System.currentTimeMillis());
> +                   }
>                 }
>
>                 @Override
>
> === modified file
> 'src/org/ocsinventory/android/agent/OCSEventReceiver.java'
> --- src/org/ocsinventory/android/agent/OCSEventReceiver.java    2013-02-13
> 19:25:00 +0000
> +++ src/org/ocsinventory/android/agent/OCSEventReceiver.java    2013-04-24
> 13:42:26 +0000
> @@ -12,6 +12,9 @@
>         public void onReceive(final Context ctx, final Intent intent) {
>                 Log.d(LOGTAG, "Called");
>                 Intent eventService = new Intent(ctx,
> OCSAgentService.class);
> +               eventService.putExtra(OCSAgentService.FORCE_UPDATE, true);
> +               boolean saveInventory =
> intent.getBooleanExtra(OCSAgentService.SAVE_INVENTORY, false);
> +               eventService.putExtra(OCSAgentService.SAVE_INVENTORY,
> saveInventory);
>                 ctx.startService(eventService);
>                 Log.d(LOGTAG, "After start service");
>
>
> === modified file 'src/org/ocsinventory/android/sections/OCSNetworks.java'
> --- src/org/ocsinventory/android/sections/OCSNetworks.java      2013-03-19
> 20:49:53 +0000
> +++ src/org/ocsinventory/android/sections/OCSNetworks.java      2013-04-24
> 13:42:26 +0000
> @@ -31,14 +31,9 @@
>                 this.networks= new ArrayList<OCSNetwork>();
>
>                 WifiManager wifii= (WifiManager)
> ctx.getSystemService(Context.WIFI_SERVICE);
> -               boolean prevWifiState=false;
>                 if ( wifii != null ) {
> -                       if ( wifii.getWifiState() == 4 )
> +                       if ( wifii.getWifiState() ==
> WifiManager.WIFI_STATE_UNKNOWN )
>                                 return;
> -                       prevWifiState = wifii.isWifiEnabled();
> -                       if ( ! wifii.isWifiEnabled() ) {
> -                               wifii.setWifiEnabled(true);
> -                       }
>                         if ( wifii.isWifiEnabled() ) {
>                                 DhcpInfo d=wifii.getDhcpInfo();
>
> @@ -69,7 +64,8 @@
>                         }
>                 }
>
> -               // Parcours des intefaces reseau
> +               // Check non wifi address, this method will return less
> informations, but at least we
> +               // have all the ip
>                 Enumeration<NetworkInterface> listeNI;
>                 try {
>                         listeNI = NetworkInterface.getNetworkInterfaces();
> @@ -87,8 +83,7 @@
>                         // android.util.Log.d("OCSNET HAdr",
> ni.getHardwareAddress());
>                         while (listeIPAdr.hasMoreElements()) {
>                                 InetAddress ipAdr = (InetAddress)
> listeIPAdr.nextElement();
> -
> -                               if ( ! ipAdr.isLoopbackAddress() ) {
> +                               if ( ! ipAdr.isLoopbackAddress() && !
> ipAdr.isLinkLocalAddress() ) {
>                                         OCSNetwork netw = new
> OCSNetwork(name);
>                                         String ipadr =
> ipAdr.getHostAddress();
>                                         netw.setIpAdress(ipadr);
> @@ -97,13 +92,20 @@
>
> netw.setMacaddr(Utils.bytesToHex(ni.getHardwareAddress()));
>                                                 } catch (SocketException
> se) {}
>                                         }
> -                                       networks.add(netw);
> +                                       // this ip may be already presents
> as a wifi address
> +                                       boolean isWifi = false;
> +                                       for(OCSNetwork tmp : networks) {
> +                                               if (
> tmp.ipAdress.equals(netw.ipAdress) ) {
> +                                                       isWifi = true;
> +                                                       break;
> +                                               }
> +                                       }
> +                                       if (isWifi == false) {
> +                                               networks.add(netw);
> +                                       }
>                                 }
>                         }
>                 }
> -               if ( wifii.isWifiEnabled() && ! prevWifiState)
> -                               wifii.setWifiEnabled(false);
> -
>         }
>
>  /*
> @@ -153,4 +155,4 @@
>         public String  getSectionTag() {
>                 return sectionTag;
>         }
> -}
> \ No newline at end of file
> +}
>
>
>