Author: kmorin Date: 2014-04-04 10:08:31 +0200 (Fri, 04 Apr 2014) New Revision: 104 Url: http://forge.codelutin.com/projects/wlo/repository/revisions/104 Log: fixes #4897 [ICHTYOMETRE] Erreur ?\195?\160 la connexion Modified: trunk/AndroidManifest.xml trunk/pom.xml trunk/src/fr/ifremer/wlo/BigFinCommunicationService.java Modified: trunk/AndroidManifest.xml =================================================================== --- trunk/AndroidManifest.xml 2014-04-03 08:57:26 UTC (rev 103) +++ trunk/AndroidManifest.xml 2014-04-04 08:08:31 UTC (rev 104) @@ -15,8 +15,8 @@ --> <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="fr.ifremer.wlo" - android:versionCode="5" - android:versionName="0.5.1"> + android:versionCode="6" + android:versionName="0.5.2"> <uses-sdk android:minSdkVersion="15" android:targetSdkVersion="15"/> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-04-03 08:57:26 UTC (rev 103) +++ trunk/pom.xml 2014-04-04 08:08:31 UTC (rev 104) @@ -28,7 +28,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>5.0.1</version> + <version>5.0.4</version> </parent> <groupId>fr.ifremer</groupId> @@ -114,6 +114,9 @@ <license.organizationName>Ifremer</license.organizationName> <license.licenseName>gpl_v3</license.licenseName> + <!-- Release configuration --> + <releaseEmailDomain>forge.codelutin.com</releaseEmailDomain> + <!-- Post Release configuration --> <skipPostRelease>false</skipPostRelease> Modified: trunk/src/fr/ifremer/wlo/BigFinCommunicationService.java =================================================================== --- trunk/src/fr/ifremer/wlo/BigFinCommunicationService.java 2014-04-03 08:57:26 UTC (rev 103) +++ trunk/src/fr/ifremer/wlo/BigFinCommunicationService.java 2014-04-04 08:08:31 UTC (rev 104) @@ -140,7 +140,7 @@ @Override public int onStartCommand(Intent intent, int flags, int startId) { - if (intent.getBooleanExtra(EXTRA_DISCONNECT, false)) { + if (intent != null && intent.getBooleanExtra(EXTRA_DISCONNECT, false)) { if (mClients.isEmpty()) { stopSelf(); } else { @@ -254,7 +254,7 @@ * @param state An integer defining the current connection state */ protected synchronized void setState(int state) { - updateNotification(state== STATE_CONNECTED); + updateNotification(state == STATE_CONNECTED); mState = state; sendMessage(MESSAGE_STATE_CHANGE, state); @@ -316,7 +316,6 @@ mConnectThread = new ConnectThread(device); mConnectThread.start(); setState(STATE_CONNECTING); - setState(STATE_CONNECTED); } /**