Release 0.3.2, When selecting custom interface dont check if 3g disco…

…very is allowed
rorist · Jul 27, 2010 · 953fd1d · 953fd1d
1 parent 197393b
commit 953fd1d
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
@@ -6,8 +6,8 @@
 <manifest
     xmlns:android="http://schemas.android.com/apk/res/android"
     package="info.lamatricexiste.network"
-    android:versionCode="38"
-    android:versionName="0.3.1"
+    android:versionCode="40"
+    android:versionName="0.3.2"
     android:installLocation="preferExternal">
 
     <application

diff --git a/src/info/lamatricexiste/network/ActivityNet.java b/src/info/lamatricexiste/network/ActivityNet.java
@@ -126,7 +126,8 @@ public void onReceive(Context ctxt, Intent intent) {
                             setButtons(false);
                         }
                     } else if (type == ConnectivityManager.TYPE_MOBILE) { // 3G
-                        if (prefs.getBoolean(Prefs.KEY_MOBILE, Prefs.DEFAULT_MOBILE)) {
+                        if (prefs.getBoolean(Prefs.KEY_MOBILE, Prefs.DEFAULT_MOBILE)
+                                || prefs.getString(Prefs.KEY_INTF, Prefs.DEFAULT_INTF) != null) {
                             net.getMobileInfo();
                             if (net.carrier != null) {
                                 net.getIp();

diff --git a/src/info/lamatricexiste/network/Network/DownloadFile.java b/src/info/lamatricexiste/network/Network/DownloadFile.java
@@ -31,7 +31,7 @@ public class DownloadFile {
     private static String TAG = "DownloadFile";
     // FIXME: Get the real application version without context ?
     private final String USERAGENT = "Android/" + android.os.Build.VERSION.RELEASE + " ("
-            + android.os.Build.MODEL + ") NetworkDiscovery/0.3.1";
+            + android.os.Build.MODEL + ") NetworkDiscovery/0.3.2";
     private HttpClient httpclient;
 
     public DownloadFile(String url, FileOutputStream out) throws IOException {