summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--app/build.gradle1
-rw-r--r--app/src/main/java/se/leap/bitmaskclient/eip/EipCommand.java8
-rw-r--r--app/src/main/java/se/leap/bitmaskclient/providersetup/ProviderAPICommand.java20
-rw-r--r--app/src/main/java/se/leap/bitmaskclient/providersetup/activities/ProviderSetupBaseActivity.java4
-rw-r--r--app/src/main/java/se/leap/bitmaskclient/providersetup/connectivity/DnsResolver.java4
-rw-r--r--bitmask-core/bitmask-core.aarbin9015389 -> 9015381 bytes
-rw-r--r--bitmask-web-core/bitmask-web-core-sources.jarbin8721 -> 8696 bytes
-rw-r--r--bitmask-web-core/bitmask-web-core.aarbin10634042 -> 10633994 bytes
-rwxr-xr-xbuild_deps.sh2
-rwxr-xr-xcleanProject.sh4
-rw-r--r--go/lib/README0
11 files changed, 20 insertions, 23 deletions
diff --git a/app/build.gradle b/app/build.gradle
index bef08228..423e29b4 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -447,7 +447,6 @@ configurations.all { config ->
}
}
}
- //resolutionStrategy.force "org.jetbrains:annotations:13.0"
}
subprojects {
diff --git a/app/src/main/java/se/leap/bitmaskclient/eip/EipCommand.java b/app/src/main/java/se/leap/bitmaskclient/eip/EipCommand.java
index 39d4e33e..0650e8cd 100644
--- a/app/src/main/java/se/leap/bitmaskclient/eip/EipCommand.java
+++ b/app/src/main/java/se/leap/bitmaskclient/eip/EipCommand.java
@@ -6,11 +6,9 @@ import android.content.Intent;
import android.os.ResultReceiver;
import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
import androidx.annotation.VisibleForTesting;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
import static se.leap.bitmaskclient.base.models.Constants.EIP_ACTION_CHECK_CERT_VALIDITY;
import static se.leap.bitmaskclient.base.models.Constants.EIP_ACTION_CONFIGURE_TETHERING;
import static se.leap.bitmaskclient.base.models.Constants.EIP_ACTION_START;
@@ -26,7 +24,7 @@ import static se.leap.bitmaskclient.base.models.Constants.EIP_RECEIVER;
public class EipCommand {
- private static void execute(@NotNull Context context, @NotNull String action) {
+ private static void execute(@NonNull Context context, @NonNull String action) {
execute(context.getApplicationContext(), action, null, null);
}
@@ -37,7 +35,7 @@ public class EipCommand {
* filter for the EIP class
* @param resultReceiver The resultreceiver to reply to
*/
- private static void execute(@NotNull Context context, @NotNull String action, @Nullable ResultReceiver resultReceiver, @Nullable Intent vpnIntent) {
+ private static void execute(@NonNull Context context, @NonNull String action, @Nullable ResultReceiver resultReceiver, @Nullable Intent vpnIntent) {
if (vpnIntent == null) {
vpnIntent = new Intent();
}
diff --git a/app/src/main/java/se/leap/bitmaskclient/providersetup/ProviderAPICommand.java b/app/src/main/java/se/leap/bitmaskclient/providersetup/ProviderAPICommand.java
index 79a107d1..1408dce8 100644
--- a/app/src/main/java/se/leap/bitmaskclient/providersetup/ProviderAPICommand.java
+++ b/app/src/main/java/se/leap/bitmaskclient/providersetup/ProviderAPICommand.java
@@ -5,8 +5,8 @@ import android.content.Intent;
import android.os.Bundle;
import android.os.ResultReceiver;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
import se.leap.bitmaskclient.base.models.Constants;
import se.leap.bitmaskclient.base.models.Provider;
@@ -20,18 +20,18 @@ public class ProviderAPICommand {
private ResultReceiver resultReceiver;
private Provider provider;
- private ProviderAPICommand(@NotNull Context context, @NotNull String action, @NotNull Provider provider, ResultReceiver resultReceiver) {
+ private ProviderAPICommand(@NonNull Context context, @NonNull String action, @NonNull Provider provider, ResultReceiver resultReceiver) {
this(context.getApplicationContext(), action, Bundle.EMPTY, provider, resultReceiver);
}
- private ProviderAPICommand(@NotNull Context context, @NotNull String action, @NotNull Provider provider) {
+ private ProviderAPICommand(@NonNull Context context, @NonNull String action, @NonNull Provider provider) {
this(context.getApplicationContext(), action, Bundle.EMPTY, provider);
}
- private ProviderAPICommand(@NotNull Context context, @NotNull String action, @NotNull Bundle parameters, @NotNull Provider provider) {
+ private ProviderAPICommand(@NonNull Context context, @NonNull String action, @NonNull Bundle parameters, @NonNull Provider provider) {
this(context.getApplicationContext(), action, parameters, provider, null);
}
- private ProviderAPICommand(@NotNull Context context, @NotNull String action, @NotNull Bundle parameters, @NotNull Provider provider, @Nullable ResultReceiver resultReceiver) {
+ private ProviderAPICommand(@NonNull Context context, @NonNull String action, @NonNull Bundle parameters, @NonNull Provider provider, @Nullable ResultReceiver resultReceiver) {
super();
this.context = context;
this.action = action;
@@ -64,22 +64,22 @@ public class ProviderAPICommand {
return command;
}
- public static void execute(Context context, String action, @NotNull Provider provider) {
+ public static void execute(Context context, String action, @NonNull Provider provider) {
ProviderAPICommand command = new ProviderAPICommand(context, action, provider);
command.execute();
}
- public static void execute(Context context, String action, Bundle parameters, @NotNull Provider provider) {
+ public static void execute(Context context, String action, Bundle parameters, @NonNull Provider provider) {
ProviderAPICommand command = new ProviderAPICommand(context, action, parameters, provider);
command.execute();
}
- public static void execute(Context context, String action, Bundle parameters, @NotNull Provider provider, ResultReceiver resultReceiver) {
+ public static void execute(Context context, String action, Bundle parameters, @NonNull Provider provider, ResultReceiver resultReceiver) {
ProviderAPICommand command = new ProviderAPICommand(context, action, parameters, provider, resultReceiver);
command.execute();
}
- public static void execute(Context context, String action, @NotNull Provider provider, ResultReceiver resultReceiver) {
+ public static void execute(Context context, String action, @NonNull Provider provider, ResultReceiver resultReceiver) {
ProviderAPICommand command = new ProviderAPICommand(context, action, provider, resultReceiver);
command.execute();
}
diff --git a/app/src/main/java/se/leap/bitmaskclient/providersetup/activities/ProviderSetupBaseActivity.java b/app/src/main/java/se/leap/bitmaskclient/providersetup/activities/ProviderSetupBaseActivity.java
index e54fb048..40efd811 100644
--- a/app/src/main/java/se/leap/bitmaskclient/providersetup/activities/ProviderSetupBaseActivity.java
+++ b/app/src/main/java/se/leap/bitmaskclient/providersetup/activities/ProviderSetupBaseActivity.java
@@ -21,12 +21,12 @@ import android.content.IntentFilter;
import android.os.Bundle;
import android.util.Log;
+import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.fragment.app.DialogFragment;
import androidx.fragment.app.FragmentTransaction;
import androidx.localbroadcastmanager.content.LocalBroadcastManager;
-import org.jetbrains.annotations.NotNull;
import org.json.JSONException;
import org.json.JSONObject;
@@ -107,7 +107,7 @@ public abstract class ProviderSetupBaseActivity extends ConfigWizardBaseActivity
@Override
- public void onSaveInstanceState(@NotNull Bundle outState) {
+ public void onSaveInstanceState(@NonNull Bundle outState) {
outState.putString(ACTIVITY_STATE, providerConfigState.toString());
outState.putString(REASON_TO_FAIL, reasonToFail);
diff --git a/app/src/main/java/se/leap/bitmaskclient/providersetup/connectivity/DnsResolver.java b/app/src/main/java/se/leap/bitmaskclient/providersetup/connectivity/DnsResolver.java
index 44de1e6d..c5100a67 100644
--- a/app/src/main/java/se/leap/bitmaskclient/providersetup/connectivity/DnsResolver.java
+++ b/app/src/main/java/se/leap/bitmaskclient/providersetup/connectivity/DnsResolver.java
@@ -1,6 +1,6 @@
package se.leap.bitmaskclient.providersetup.connectivity;
-import org.jetbrains.annotations.NotNull;
+import androidx.annotation.NonNull;
import java.net.InetAddress;
import java.net.UnknownHostException;
@@ -15,7 +15,7 @@ import se.leap.bitmaskclient.base.utils.IPAddress;
class DnsResolver implements Dns {
@Override
- public List<InetAddress> lookup(@NotNull String hostname) throws UnknownHostException {
+ public List<InetAddress> lookup(@NonNull String hostname) throws UnknownHostException {
try {
return Dns.SYSTEM.lookup(hostname);
} catch (UnknownHostException e) {
diff --git a/bitmask-core/bitmask-core.aar b/bitmask-core/bitmask-core.aar
index 37e25808..bceec02d 100644
--- a/bitmask-core/bitmask-core.aar
+++ b/bitmask-core/bitmask-core.aar
Binary files differ
diff --git a/bitmask-web-core/bitmask-web-core-sources.jar b/bitmask-web-core/bitmask-web-core-sources.jar
index 6788dc00..64edeb9b 100644
--- a/bitmask-web-core/bitmask-web-core-sources.jar
+++ b/bitmask-web-core/bitmask-web-core-sources.jar
Binary files differ
diff --git a/bitmask-web-core/bitmask-web-core.aar b/bitmask-web-core/bitmask-web-core.aar
index 6f580439..0e5108c0 100644
--- a/bitmask-web-core/bitmask-web-core.aar
+++ b/bitmask-web-core/bitmask-web-core.aar
Binary files differ
diff --git a/build_deps.sh b/build_deps.sh
index beb5e13e..5df3a3e1 100755
--- a/build_deps.sh
+++ b/build_deps.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+./#!/bin/bash
function quit {
echo "Task failed. $1."
diff --git a/cleanProject.sh b/cleanProject.sh
index 703788cc..e89cd2a3 100755
--- a/cleanProject.sh
+++ b/cleanProject.sh
@@ -1,7 +1,7 @@
#!/bin/bash
-git checkout -- \*
-git checkout -- \.\*
+#git checkout -- \*
+#git checkout -- \.\*
rm -r ./ics-openvpn
rm -r ./build
diff --git a/go/lib/README b/go/lib/README
deleted file mode 100644
index e69de29b..00000000
--- a/go/lib/README
+++ /dev/null