Merge pull request #266 from eighthave/clean-up-imports

Clean up imports
guardianproject · Oct 7, 2019 · 4150ef6 · 4150ef6
2 parents 4d4020a + 667f37e
commit 4150ef6
Show file tree

Hide file tree

Showing 55 changed files with 89 additions and 202 deletions.
diff --git a/app-mini/build.gradle b/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

diff --git a/app-mini/src/main/java/org/torproject/android/mini/MiniMainActivity.java b/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;
 

diff --git a/app-mini/src/main/java/org/torproject/android/mini/OnBootReceiver.java b/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 {
 

diff --git a/app-mini/src/main/java/org/torproject/android/mini/OrbotMiniApp.java b/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;
 

diff --git a/app-mini/src/main/java/org/torproject/android/mini/settings/LocaleHelper.java b/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;

diff --git a/app-mini/src/main/java/org/torproject/android/mini/settings/SettingsPreferences.java b/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 {

diff --git a/app-mini/src/main/java/org/torproject/android/mini/ui/AppConfigActivity.java b/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;

diff --git a/app-mini/src/main/java/org/torproject/android/mini/ui/AppManagerActivity.java b/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;
 

diff --git a/app-mini/src/main/java/org/torproject/android/mini/ui/onboarding/CustomSlideBigText.java b/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;
 
 

diff --git a/app-mini/src/main/java/org/torproject/android/mini/ui/onboarding/OnboardingActivity.java b/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;
 

diff --git a/app-mini/src/main/java/org/torproject/android/mini/vpn/VPNEnableActivity.java b/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

diff --git a/app/build.gradle b/app/build.gradle
@@ -25,7 +25,7 @@ android {
     }
 
     compileSdkVersion 29
-    buildToolsVersion '29.0.0 rc2'
+    buildToolsVersion '29.0.0'
     defaultConfig {
         applicationId "org.torproject.android"
         minSdkVersion 16

diff --git a/app/src/main/java/org/torproject/android/OnBootReceiver.java b/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 {

diff --git a/app/src/main/java/org/torproject/android/OrbotApp.java b/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;
 

diff --git a/app/src/main/java/org/torproject/android/OrbotMainActivity.java b/app/src/main/java/org/torproject/android/OrbotMainActivity.java
@@ -3,40 +3,6 @@
 
 package org.torproject.android;
 
-import java.io.BufferedReader;
-import java.io.File;
-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.Locale;
-import java.util.StringTokenizer;
-
-import org.json.JSONArray;
-import org.torproject.android.service.OrbotConstants;
-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.TorServiceUtils;
-import org.torproject.android.service.vpn.VpnConstants;
-import org.torproject.android.service.vpn.VpnPrefs;
-import org.torproject.android.settings.Languages;
-import org.torproject.android.settings.LocaleHelper;
-import org.torproject.android.settings.SettingsPreferences;
-import org.torproject.android.ui.AppManagerActivity;
-import org.torproject.android.ui.Rotate3dAnimation;
-import org.torproject.android.ui.onboarding.BridgeWizardActivity;
-import org.torproject.android.ui.onboarding.OnboardingActivity;
-import org.torproject.android.ui.hiddenservices.ClientCookiesActivity;
-import org.torproject.android.ui.hiddenservices.HiddenServicesActivity;
-import org.torproject.android.ui.hiddenservices.backup.BackupUtils;
-import org.torproject.android.ui.hiddenservices.permissions.PermissionManager;
-import org.torproject.android.ui.hiddenservices.providers.HSContentProvider;
-import org.torproject.android.ui.VPNEnableActivity;
-
 import android.app.ActivityManager;
 import android.app.ActivityManager.RunningServiceInfo;
 import android.app.AlertDialog;
@@ -84,12 +50,43 @@
 import android.widget.Spinner;
 import android.widget.TextView;
 import android.widget.Toast;
-
 import com.google.zxing.integration.android.IntentIntegrator;
 import com.google.zxing.integration.android.IntentResult;
-
+import org.json.JSONArray;
+import org.torproject.android.service.OrbotConstants;
+import org.torproject.android.service.TorService;
+import org.torproject.android.service.TorServiceConstants;
+import org.torproject.android.service.util.Prefs;
+import org.torproject.android.service.util.TorServiceUtils;
+import org.torproject.android.service.vpn.VpnConstants;
+import org.torproject.android.service.vpn.VpnPrefs;
+import org.torproject.android.settings.Languages;
+import org.torproject.android.settings.LocaleHelper;
+import org.torproject.android.settings.SettingsPreferences;
+import org.torproject.android.ui.AppManagerActivity;
+import org.torproject.android.ui.Rotate3dAnimation;
+import org.torproject.android.ui.VPNEnableActivity;
+import org.torproject.android.ui.hiddenservices.ClientCookiesActivity;
+import org.torproject.android.ui.hiddenservices.HiddenServicesActivity;
+import org.torproject.android.ui.hiddenservices.backup.BackupUtils;
+import org.torproject.android.ui.hiddenservices.permissions.PermissionManager;
+import org.torproject.android.ui.hiddenservices.providers.HSContentProvider;
+import org.torproject.android.ui.onboarding.BridgeWizardActivity;
+import org.torproject.android.ui.onboarding.OnboardingActivity;
 import pl.bclogic.pulsator4droid.library.PulsatorLayout;
 
+import java.io.BufferedReader;
+import java.io.File;
+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.Locale;
+import java.util.StringTokenizer;
+
 import static android.support.v4.content.FileProvider.getUriForFile;
 import static org.torproject.android.MainConstants.COUNTRY_CODES;
 import static org.torproject.android.MainConstants.RESULT_CLOSE_ALL;

diff --git a/app/src/main/java/org/torproject/android/settings/LocaleHelper.java b/app/src/main/java/org/torproject/android/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;

diff --git a/app/src/main/java/org/torproject/android/settings/SettingsPreferences.java b/app/src/main/java/org/torproject/android/settings/SettingsPreferences.java
@@ -15,7 +15,6 @@
 import android.preference.PreferenceScreen;
 import android.view.inputmethod.EditorInfo;
 import android.widget.EditText;
-
 import org.torproject.android.R;
 
 public class SettingsPreferences extends PreferenceActivity {

diff --git a/app/src/main/java/org/torproject/android/ui/AppManagerActivity.java b/app/src/main/java/org/torproject/android/ui/AppManagerActivity.java
@@ -3,19 +3,6 @@
 
 package org.torproject.android.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.service.OrbotConstants;
-import org.torproject.android.R;
-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;
@@ -40,6 +27,18 @@
 import android.widget.ListAdapter;
 import android.widget.ProgressBar;
 import android.widget.TextView;
+import org.torproject.android.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.Comparator;
+import java.util.Iterator;
+import java.util.List;
+import java.util.StringTokenizer;
 
 import static org.torproject.android.service.vpn.VpnPrefs.PREFS_KEY_TORIFIED;