diff options
| author | Arne Schwabe <arne@rfc2549.org> | 2012-05-03 22:51:47 +0200 |
|---|---|---|
| committer | Arne Schwabe <arne@rfc2549.org> | 2012-05-03 22:51:47 +0200 |
| commit | 815eb143e98b57b6cd1f43c7c3007416ed4b1a91 (patch) | |
| tree | 2359f4fca5e51d2b7eb253728f62b74db7da0e69 /src | |
| parent | b7b4e00536107c951a2642a2a1a3fe21a65510a0 (diff) | |
| parent | 69f36a1ffafafc233291f44af0b7146428b764a3 (diff) | |
Merge Merge try number 2
Diffstat (limited to 'src')
| -rw-r--r-- | src/de/blinkt/openvpn/ShowConfigFragment.java | 1 | ||||
| -rw-r--r-- | src/de/blinkt/openvpn/VPNProfileList.java | 2 | ||||
| -rw-r--r-- | src/de/blinkt/openvpn/VpnProfile.java | 2 |
3 files changed, 2 insertions, 3 deletions
diff --git a/src/de/blinkt/openvpn/ShowConfigFragment.java b/src/de/blinkt/openvpn/ShowConfigFragment.java index 68898e07..13c65df8 100644 --- a/src/de/blinkt/openvpn/ShowConfigFragment.java +++ b/src/de/blinkt/openvpn/ShowConfigFragment.java @@ -22,7 +22,6 @@ public class ShowConfigFragment extends Fragment { } else { String cfg=vp.getConfigFile(getActivity().getCacheDir()); - cv.setText(cfg); } return v; diff --git a/src/de/blinkt/openvpn/VPNProfileList.java b/src/de/blinkt/openvpn/VPNProfileList.java index 8565f460..c9ff9805 100644 --- a/src/de/blinkt/openvpn/VPNProfileList.java +++ b/src/de/blinkt/openvpn/VPNProfileList.java @@ -39,7 +39,7 @@ public class VPNProfileList extends ListFragment { super.onCreate(savedInstanceState); setHasOptionsMenu(true); // Debug load JNI - OpenVPN.foo(); + //OpenVPN.foo(); } @Override diff --git a/src/de/blinkt/openvpn/VpnProfile.java b/src/de/blinkt/openvpn/VpnProfile.java index ba3d4535..18fe59d5 100644 --- a/src/de/blinkt/openvpn/VpnProfile.java +++ b/src/de/blinkt/openvpn/VpnProfile.java @@ -376,7 +376,7 @@ public class VpnProfile implements Serializable{ long nm = 0xffffffffl; - nm = (nm << len) & 0xffffffffl; + nm = (nm << (32-len)) & 0xffffffffl; String netmask =String.format("%d.%d.%d.%d", (nm & 0xff000000) >> 24,(nm & 0xff0000) >> 16, (nm & 0xff00) >> 8 ,nm & 0xff ); return parts[0] + " " + netmask; |