Merge branch 'master' of github.com:guardianproject/orbot

app-mini/build.gradle

@@ -25,7 +25,7 @@ android {
     }
 
     compileSdkVersion 29
-    buildToolsVersion '29.0.0 rc2'
+    buildToolsVersion '29.0.0'
     defaultConfig {
         applicationId "org.torproject.android.mini"
         minSdkVersion 16

app-mini/src/main/java/org/torproject/android/mini/MiniMainActivity.java

@@ -3,7 +3,6 @@
 
 package org.torproject.android.mini;
 
-import android.Manifest;
 import android.app.ActivityManager;
 import android.app.ActivityManager.RunningServiceInfo;
 import android.app.AlertDialog;
@@ -14,13 +13,10 @@
 import android.content.SharedPreferences;
 import android.content.SharedPreferences.Editor;
 import android.content.pm.ApplicationInfo;
-import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
 import android.content.pm.PackageManager.NameNotFoundException;
 import android.graphics.Bitmap;
-import android.graphics.BitmapFactory;
 import android.graphics.Canvas;
-import android.graphics.drawable.AdaptiveIconDrawable;
 import android.graphics.drawable.BitmapDrawable;
 import android.graphics.drawable.Drawable;
 import android.net.Uri;
@@ -47,15 +43,11 @@
 import android.view.View.OnLongClickListener;
 import android.view.ViewGroup;
 import android.view.animation.AccelerateInterpolator;
-import android.widget.Button;
 import android.widget.CompoundButton;
 import android.widget.ImageView;
-import android.widget.LinearLayout;
 import android.widget.TextView;
-
 import com.google.zxing.integration.android.IntentIntegrator;
 import com.google.zxing.integration.android.IntentResult;
-
 import org.json.JSONArray;
 import org.torproject.android.mini.settings.Languages;
 import org.torproject.android.mini.settings.LocaleHelper;
@@ -77,19 +69,13 @@
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStreamReader;
-import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
-import java.net.URLEncoder;
 import java.text.NumberFormat;
 import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.Comparator;
 import java.util.Locale;
 import java.util.StringTokenizer;
 
 import static org.torproject.android.mini.MainConstants.RESULT_CLOSE_ALL;
-import static org.torproject.android.mini.MainConstants.URL_TOR_CHECK;
 import static org.torproject.android.service.vpn.VpnPrefs.PREFS_KEY_TORIFIED;
 import static org.torproject.android.service.vpn.VpnUtils.getSharedPrefs;
 

app-mini/src/main/java/org/torproject/android/mini/OnBootReceiver.java

@@ -5,11 +5,10 @@
 import android.content.Context;
 import android.content.Intent;
 import android.os.Build;
-
-import org.torproject.android.service.util.Prefs;
+import org.torproject.android.mini.vpn.VPNEnableActivity;
 import org.torproject.android.service.TorService;
 import org.torproject.android.service.TorServiceConstants;
-import org.torproject.android.mini.vpn.VPNEnableActivity;
+import org.torproject.android.service.util.Prefs;
 
 public class OnBootReceiver extends BroadcastReceiver {
 

app-mini/src/main/java/org/torproject/android/mini/OrbotMiniApp.java

@@ -12,16 +12,13 @@
 import android.content.pm.PackageManager;
 import android.content.res.Configuration;
 import android.support.v4.app.NotificationCompat;
-
 import com.github.javiersantos.appupdater.AppUpdater;
 import com.github.javiersantos.appupdater.enums.Display;
 import com.github.javiersantos.appupdater.enums.UpdateFrom;
-
-import org.torproject.android.service.OrbotConstants;
-import org.torproject.android.service.util.Prefs;
-
 import org.torproject.android.mini.settings.Languages;
 import org.torproject.android.mini.settings.LocaleHelper;
+import org.torproject.android.service.OrbotConstants;
+import org.torproject.android.service.util.Prefs;
 
 import java.util.Locale;
 

app-mini/src/main/java/org/torproject/android/mini/settings/LocaleHelper.java

@@ -5,7 +5,6 @@
 import android.content.res.Configuration;
 import android.content.res.Resources;
 import android.os.Build;
-
 import org.torproject.android.service.util.Prefs;
 
 import java.util.Locale;

app-mini/src/main/java/org/torproject/android/mini/settings/SettingsPreferences.java

@@ -15,7 +15,6 @@
 import android.preference.PreferenceScreen;
 import android.view.inputmethod.EditorInfo;
 import android.widget.EditText;
-
 import org.torproject.android.mini.R;
 
 public class SettingsPreferences extends PreferenceActivity {

app-mini/src/main/java/org/torproject/android/mini/ui/AppConfigActivity.java

@@ -4,19 +4,13 @@
 import android.content.SharedPreferences;
 import android.content.pm.ApplicationInfo;
 import android.os.Bundle;
-import android.support.design.widget.FloatingActionButton;
-import android.support.design.widget.Snackbar;
 import android.support.v7.app.AppCompatActivity;
 import android.support.v7.widget.Toolbar;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
-import android.view.View;
 import android.widget.CompoundButton;
 import android.widget.Switch;
-
-import org.torproject.android.mini.MainConstants;
-import org.torproject.android.mini.MiniMainActivity;
 import org.torproject.android.mini.R;
 import org.torproject.android.service.OrbotConstants;
 import org.torproject.android.service.util.TorServiceUtils;

app-mini/src/main/java/org/torproject/android/mini/ui/AppManagerActivity.java

@@ -3,19 +3,6 @@
 
 package org.torproject.android.mini.ui;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.Iterator;
-import java.util.List;
-import java.util.StringTokenizer;
-
-import org.torproject.android.mini.R;
-import org.torproject.android.service.OrbotConstants;
-import org.torproject.android.service.util.TorServiceUtils;
-import org.torproject.android.service.vpn.TorifiedApp;
-
 import android.Manifest;
 import android.content.Intent;
 import android.content.SharedPreferences;
@@ -34,12 +21,22 @@
 import android.view.View.OnClickListener;
 import android.view.ViewGroup;
 import android.widget.ArrayAdapter;
-import android.widget.CheckBox;
 import android.widget.GridView;
 import android.widget.ImageView;
 import android.widget.ListAdapter;
 import android.widget.ProgressBar;
 import android.widget.TextView;
+import org.torproject.android.mini.R;
+import org.torproject.android.service.OrbotConstants;
+import org.torproject.android.service.util.TorServiceUtils;
+import org.torproject.android.service.vpn.TorifiedApp;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
+import java.util.StringTokenizer;
 
 import static org.torproject.android.service.vpn.VpnPrefs.PREFS_KEY_TORIFIED;
 

app-mini/src/main/java/org/torproject/android/mini/ui/onboarding/CustomSlideBigText.java

@@ -9,7 +9,6 @@
 import android.view.ViewGroup;
 import android.widget.Button;
 import android.widget.TextView;
-
 import org.torproject.android.mini.R;
 
 

app-mini/src/main/java/org/torproject/android/mini/ui/onboarding/OnboardingActivity.java

@@ -4,9 +4,7 @@
 import android.os.Bundle;
 import android.support.annotation.Nullable;
 import android.support.v4.app.Fragment;
-
 import com.github.paolorotolo.appintro.AppIntro;
-
 import org.torproject.android.mini.R;
 import org.torproject.android.mini.settings.LocaleHelper;
 

app-mini/src/main/java/org/torproject/android/mini/vpn/VPNEnableActivity.java

@@ -1,9 +1,5 @@
 package org.torproject.android.mini.vpn;
 
-import org.torproject.android.service.util.Prefs;
-import org.torproject.android.service.TorService;
-import org.torproject.android.service.TorServiceConstants;
-
 import android.content.Intent;
 import android.net.VpnService;
 import android.os.Build;
@@ -12,6 +8,9 @@
 import android.support.v7.app.AppCompatActivity;
 import android.util.Log;
 import android.view.Window;
+import org.torproject.android.service.TorService;
+import org.torproject.android.service.TorServiceConstants;
+import org.torproject.android.service.util.Prefs;
 
 /**
  * To combat background service being stopped/swiped

app-mini/src/main/res/values/strings.xml

@@ -233,6 +233,10 @@
     <string name="pref_connection_padding_summary">Always enables connection padding to defend against some forms of traffic analysis. Default: auto</string>
     <string name="pref_reduced_connection_padding">Reduced connection padding</string>
     <string name="pref_reduced_connection_padding_summary">Closes relay connections sooner and sends less padding packets to reduce data and battery usage</string>
+    <string name="pref_circuit_padding">Circuit padding</string>
+    <string name="pref_circuit_padding_summary">Enable circuit padding to defend against some forms of traffic analysis</string>
+    <string name="pref_reduced_circuit_padding">Reduced circuit padding</string>
+    <string name="pref_reduced_circuit_padding_summary">Use lower overhead padding algorithms to reduce data and battery usage</string>
     <string name="pref_prefer_ipv6">Prefer IPv6 connections</string>
     <string name="pref_prefer_ipv6_summary">Tells exits that IPv6 addresses are preferred</string>
     <string name="pref_disable_ipv4">Disable IPv4 connections</string>

app-mini/src/main/res/xml/preferences.xml

@@ -198,7 +198,7 @@
             android:title="@string/pref_disable_ipv4" />
     </PreferenceCategory>
 
-    <PreferenceCategory android:title="ConnectionPadding">
+    <PreferenceCategory android:title="Padding">
         <CheckBoxPreference
             android:defaultValue="false"
             android:enabled="true"
@@ -211,6 +211,18 @@
             android:key="pref_reduced_connection_padding"
             android:summary="@string/pref_reduced_connection_padding_summary"
             android:title="@string/pref_reduced_connection_padding" />
+        <CheckBoxPreference
+            android:defaultValue="true"
+            android:enabled="true"
+            android:key="pref_circuit_padding"
+            android:summary="@string/pref_circuit_padding_summary"
+            android:title="@string/pref_circuit_padding" />
+        <CheckBoxPreference
+            android:defaultValue="true"
+            android:enabled="true"
+            android:key="pref_reduced_circuit_padding"
+            android:summary="@string/pref_reduced_circuit_padding_summary"
+            android:title="@string/pref_reduced_circuit_padding" />
     </PreferenceCategory>
 
     <PreferenceCategory android:title="@string/pref_proxy_title">

app/build.gradle

@@ -1,5 +1,6 @@
 apply plugin: 'com.android.application'
 
+
 // Create a variable called keystorePropertiesFile, and initialize it to your
 // keystore.properties file, in the rootProject folder.
 def keystorePropertiesFile = rootProject.file("keystore.properties")
@@ -12,6 +13,16 @@ if (keystorePropertiesFile.canRead()) {
     keystoreProperties.load(new FileInputStream(keystorePropertiesFile))
 }
 
+/* gets the version name from the latest Git tag, stripping the leading v off */
+def getVersionName = { ->
+    def stdout = new ByteArrayOutputStream()
+    exec {
+        commandLine 'git', 'describe', '--tags', '--always'
+        standardOutput = stdout
+    }
+    return stdout.toString().trim()
+}
+
 android {
    signingConfigs {
         release {
@@ -25,12 +36,16 @@ android {
     }
 
     compileSdkVersion 29
-    buildToolsVersion '29.0.0 rc2'
+    buildToolsVersion '29.0.0'
     defaultConfig {
         applicationId "org.torproject.android"
+        versionName getVersionName()
         minSdkVersion 16
         targetSdkVersion 29
     }
+    aaptOptions {
+        cruncherEnabled = false
+    }
     lintOptions {
         checkReleaseBuilds false
         // Or, if you prefer, you can continue to check for errors in release builds,
@@ -59,7 +74,7 @@ android {
             applicationId 'org.torproject.android'
             targetSdkVersion 28
             versionCode 16123000
-            versionName '16.1.2-RC-2-tor-0.4.1.5-rc'
+            versionName getVersionName()
             archivesBaseName = "Orbot-$versionName"
         }
         appmax {

app/src/main/java/org/torproject/android/OnBootReceiver.java

@@ -5,10 +5,9 @@
 import android.content.Context;
 import android.content.Intent;
 import android.os.Build;
-
-import org.torproject.android.service.util.Prefs;
 import org.torproject.android.service.TorService;
 import org.torproject.android.service.TorServiceConstants;
+import org.torproject.android.service.util.Prefs;
 import org.torproject.android.ui.VPNEnableActivity;
 
 public class OnBootReceiver extends BroadcastReceiver {

app/src/main/java/org/torproject/android/OrbotApp.java

@@ -12,14 +12,11 @@
 import android.content.pm.PackageManager;
 import android.content.res.Configuration;
 import android.support.v4.app.NotificationCompat;
-
 import com.github.javiersantos.appupdater.AppUpdater;
 import com.github.javiersantos.appupdater.enums.Display;
 import com.github.javiersantos.appupdater.enums.UpdateFrom;
-
 import org.torproject.android.service.OrbotConstants;
 import org.torproject.android.service.util.Prefs;
-
 import org.torproject.android.settings.Languages;
 import org.torproject.android.settings.LocaleHelper;