mirror
/
NetGuard
mirror of https://github.com/M66B/NetGuard.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Remove external links

This commit is contained in:
M66B 2018-09-29 08:03:27 +00:00
parent 7edb91bd1e
commit 8f864cfb45
4 changed files with 6 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/build.gradle
View File

@ -6,10 +6,10 @@ android {
defaultConfig {
applicationId = "eu.faircode.netguard"
versionName = "2.207"
versionName = "2.208"
minSdkVersion 22
targetSdkVersion 27
versionCode = 2018091101
versionCode = 2018092901
archivesBaseName = "NetGuard-v$versionName"
externalNativeBuild {

12
app/src/main/java/eu/faircode/netguard/ActivityMain.java
View File

@ -33,15 +33,15 @@ import android.net.Uri;
import android.net.VpnService;
import android.os.AsyncTask;
import android.os.Build;
import android.os.Bundle;
import android.preference.PreferenceManager;
import android.provider.Settings;
import android.support.annotation.NonNull;
import android.support.v4.content.LocalBroadcastManager;
import android.support.v4.graphics.drawable.DrawableCompat;
import android.support.v4.widget.SwipeRefreshLayout;
import android.support.v7.app.AppCompatActivity;
import android.support.v7.app.AlertDialog;
import android.os.Bundle;
import android.support.v7.app.AppCompatActivity;
import android.support.v7.widget.LinearLayoutManager;
import android.support.v7.widget.RecyclerView;
import android.support.v7.widget.SearchView;
@ -1211,13 +1211,7 @@ public class ActivityMain extends AppCompatActivity implements SharedPreferences
}
private static Intent getIntentPro(Context context) {
if (Util.isPlayStoreInstall(context))
return new Intent(context, ActivityPro.class);
else {
Intent intent = new Intent(Intent.ACTION_VIEW);
intent.setData(Uri.parse("https://contact.faircode.eu/?product=netguardstandalone"));
return intent;
}
return new Intent(context, ActivityPro.class);
}
private static Intent getIntentInvite(Context context) {

59
app/src/main/java/eu/faircode/netguard/ServiceSinkhole.java
View File

@ -73,15 +73,10 @@ import android.util.Log;
import android.util.TypedValue;
import android.widget.RemoteViews;
import org.json.JSONArray;
import org.json.JSONException;
import org.json.JSONObject;
import java.io.BufferedReader;
import java.io.File;
import java.io.FileReader;
import java.io.IOException;
import java.io.InputStreamReader;
import java.math.BigInteger;
import java.net.Inet4Address;
import java.net.Inet6Address;
@ -91,7 +86,6 @@ import java.net.InterfaceAddress;
import java.net.NetworkInterface;
import java.net.Socket;
import java.net.SocketException;
import java.net.URL;
import java.net.UnknownHostException;
import java.text.DateFormat;
import java.text.SimpleDateFormat;
@ -110,8 +104,6 @@ import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.locks.ReentrantReadWriteLock;
import javax.net.ssl.HttpsURLConnection;
public class ServiceSinkhole extends VpnService implements SharedPreferences.OnSharedPreferenceChangeListener {
private static final String TAG = "NetGuard.Service";
@ -635,11 +627,6 @@ public class ServiceSinkhole extends VpnService implements SharedPreferences.OnS
// Clear expired DNS records
DatabaseHelper.getInstance(ServiceSinkhole.this).cleanupDns();
// Check for update
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(ServiceSinkhole.this);
if (!Util.isPlayStoreInstall(ServiceSinkhole.this) && prefs.getBoolean("update_check", true))
checkUpdate();
}
private void watchdog(Intent intent) {
@ -652,52 +639,6 @@ public class ServiceSinkhole extends VpnService implements SharedPreferences.OnS
}
}
private void checkUpdate() {
StringBuilder json = new StringBuilder();
HttpsURLConnection urlConnection = null;
try {
URL url = new URL("https://api.github.com/repos/M66B/NetGuard/releases/latest");
urlConnection = (HttpsURLConnection) url.openConnection();
BufferedReader br = new BufferedReader(new InputStreamReader(urlConnection.getInputStream()));
String line;
while ((line = br.readLine()) != null)
json.append(line);
} catch (Throwable ex) {
Log.e(TAG, ex.toString() + "\n" + Log.getStackTraceString(ex));
} finally {
if (urlConnection != null)
urlConnection.disconnect();
}
try {
JSONObject jroot = new JSONObject(json.toString());
if (jroot.has("tag_name") && jroot.has("html_url") && jroot.has("assets")) {
String url = jroot.getString("html_url");
JSONArray jassets = jroot.getJSONArray("assets");
if (jassets.length() > 0) {
JSONObject jasset = jassets.getJSONObject(0);
if (jasset.has("name")) {
String version = jroot.getString("tag_name");
String name = jasset.getString("name");
Log.i(TAG, "Tag " + version + " name " + name + " url " + url);
Version current = new Version(Util.getSelfVersionName(ServiceSinkhole.this));
Version available = new Version(version);
if (current.compareTo(available) < 0) {
Log.i(TAG, "Update available from " + current + " to " + available);
showUpdateNotification(name, url);
} else
Log.i(TAG, "Up-to-date current version " + current);
}
}
}
} catch (JSONException ex) {
Log.e(TAG, ex.toString() + "\n" + Log.getStackTraceString(ex));
}
}
private class StartFailedException extends IllegalStateException {
public StartFailedException(String msg) {
super(msg);

7
app/src/main/java/eu/faircode/netguard/Util.java
View File

@ -417,12 +417,7 @@ public class Util {
}
public static boolean isPlayStoreInstall(Context context) {
try {
return "com.android.vending".equals(context.getPackageManager().getInstallerPackageName(context.getPackageName()));
} catch (Throwable ex) {
Log.e(TAG, ex.toString() + "\n" + Log.getStackTraceString(ex));
return false;
}
return true;
}
public static boolean hasXposed(Context context) {