diff options
7 files changed, 15 insertions, 15 deletions
diff --git a/build.gradle b/build.gradle index 090719bb..d9e63484 100644 --- a/build.gradle +++ b/build.gradle @@ -3,7 +3,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:1.0.0' + classpath 'com.android.tools.build:gradle:1.2.3' } } diff --git a/main/build.gradle b/main/build.gradle index f7daecce..2df31211 100644 --- a/main/build.gradle +++ b/main/build.gradle @@ -5,7 +5,7 @@ repositories { } dependencies { - compile 'com.intellij:annotations:12.0' + compile 'com.android.support:support-annotations:22.2.0' compile 'com.android.support:cardview-v7:22.2.0' compile 'com.android.support:recyclerview-v7:22.2.0' // compile 'ch.acra:acra:4.5.0' diff --git a/main/src/main/java/android/support/v4n/app/FragmentStatePagerAdapter.java b/main/src/main/java/android/support/v4n/app/FragmentStatePagerAdapter.java index e3b51cfa..4ffec519 100644 --- a/main/src/main/java/android/support/v4n/app/FragmentStatePagerAdapter.java +++ b/main/src/main/java/android/support/v4n/app/FragmentStatePagerAdapter.java @@ -67,7 +67,7 @@ import android.view.ViewGroup; * complete} */ public abstract class FragmentStatePagerAdapter extends PagerAdapter { - private static final String TAG = "FragmentStatePagerAdapter"; + private static final String TAG = "FragmentStatePagerAdptr"; private static final boolean DEBUG = false; private final FragmentManager mFragmentManager; diff --git a/main/src/main/java/de/blinkt/openvpn/activities/ConfigConverter.java b/main/src/main/java/de/blinkt/openvpn/activities/ConfigConverter.java index cace20ff..a1012f32 100644 --- a/main/src/main/java/de/blinkt/openvpn/activities/ConfigConverter.java +++ b/main/src/main/java/de/blinkt/openvpn/activities/ConfigConverter.java @@ -17,6 +17,7 @@ import android.os.Environment; import android.provider.OpenableColumns; import android.security.KeyChain; import android.security.KeyChainAliasCallback; +import android.support.annotation.NonNull; import android.text.TextUtils; import android.util.Base64; import android.view.Menu; @@ -32,8 +33,6 @@ import android.widget.Toast; import junit.framework.Assert; -import org.jetbrains.annotations.NotNull; - import java.io.File; import java.io.FileInputStream; import java.io.FileNotFoundException; @@ -112,7 +111,7 @@ public class ConfigConverter extends Activity implements FileSelectCallback, Vie } @Override - protected void onSaveInstanceState(@NotNull Bundle outState) { + protected void onSaveInstanceState(@NonNull Bundle outState) { super.onSaveInstanceState(outState); if (mResult != null) outState.putSerializable(VPNPROFILE, mResult); diff --git a/main/src/main/java/de/blinkt/openvpn/core/NetworkSpace.java b/main/src/main/java/de/blinkt/openvpn/core/NetworkSpace.java index d3c69ef1..a12ef76b 100644 --- a/main/src/main/java/de/blinkt/openvpn/core/NetworkSpace.java +++ b/main/src/main/java/de/blinkt/openvpn/core/NetworkSpace.java @@ -6,15 +6,18 @@ package de.blinkt.openvpn.core; import android.os.Build; +import android.support.annotation.NonNull; import android.text.TextUtils; import junit.framework.Assert; -import org.jetbrains.annotations.NotNull; - import java.math.BigInteger; import java.net.Inet6Address; -import java.util.*; +import java.util.Collection; +import java.util.Locale; +import java.util.PriorityQueue; +import java.util.TreeSet; +import java.util.Vector; import de.blinkt.openvpn.BuildConfig; @@ -38,7 +41,7 @@ public class NetworkSpace { * 2. smaller networks are returned as smaller */ @Override - public int compareTo(@NotNull ipAddress another) { + public int compareTo(@NonNull ipAddress another) { int comp = getFirstAddress().compareTo(another.getFirstAddress()); if (comp != 0) return comp; diff --git a/main/src/main/java/de/blinkt/openvpn/core/OpenVpnManagementThread.java b/main/src/main/java/de/blinkt/openvpn/core/OpenVpnManagementThread.java index 0588044c..da249cc4 100644 --- a/main/src/main/java/de/blinkt/openvpn/core/OpenVpnManagementThread.java +++ b/main/src/main/java/de/blinkt/openvpn/core/OpenVpnManagementThread.java @@ -12,12 +12,11 @@ import android.net.LocalSocket; import android.net.LocalSocketAddress;
import android.os.ParcelFileDescriptor;
import android.preference.PreferenceManager;
+import android.support.annotation.NonNull; import android.util.Log;
import junit.framework.Assert;
-import org.jetbrains.annotations.NotNull;
-
import java.io.FileDescriptor;
import java.io.IOException;
import java.io.InputStream;
@@ -65,7 +64,7 @@ public class OpenVpnManagementThread implements Runnable, OpenVPNManagement { }
- public boolean openManagementInterface(@NotNull Context c) {
+ public boolean openManagementInterface(@NonNull Context c) { // Could take a while to open connection
int tries = 8;
diff --git a/main/src/main/java/de/blinkt/openvpn/fragments/LogFragment.java b/main/src/main/java/de/blinkt/openvpn/fragments/LogFragment.java index 3465cd4b..f6b6c993 100644 --- a/main/src/main/java/de/blinkt/openvpn/fragments/LogFragment.java +++ b/main/src/main/java/de/blinkt/openvpn/fragments/LogFragment.java @@ -22,6 +22,7 @@ import android.os.Bundle; import android.os.Handler; import android.os.Handler.Callback; import android.os.Message; +import android.support.annotation.Nullable; import android.text.SpannableString; import android.text.format.DateFormat; import android.text.style.ImageSpan; @@ -41,8 +42,6 @@ import android.widget.SeekBar; import android.widget.TextView; import android.widget.Toast; -import org.jetbrains.annotations.Nullable; - import java.text.SimpleDateFormat; import java.util.Collections; import java.util.Date; |