[tor-commits] [orbot/master] putting classes back into main app package, and not "mini"

n8fr8 at torproject.org n8fr8 at torproject.org
Tue Apr 28 21:05:01 UTC 2020


commit cefac58870c91015aa2c567b6ece2f6b48f63b01
Author: n8fr8 <nathan at guardianproject.info>
Date:   Fri Sep 6 15:18:30 2019 -0400

    putting classes back into main app package, and not "mini"
---
 app/src/main/AndroidManifest.xml                   | 24 +++++++++----------
 .../org/torproject/android/OnBootReceiver.java     |  2 +-
 .../main/java/org/torproject/android/OrbotApp.java |  4 ++--
 .../org/torproject/android/OrbotMainActivity.java  | 28 +++++++++++-----------
 .../android/{mini => }/settings/Languages.java     |  2 +-
 .../android/{mini => }/settings/LocaleHelper.java  |  2 +-
 .../{mini => }/settings/SettingsPreferences.java   |  2 +-
 .../android/{mini => }/ui/AppManagerActivity.java  |  2 +-
 .../ui/NoPersonalizedLearningEditText.java         |  2 +-
 .../android/{mini => }/ui/Rotate3dAnimation.java   |  2 +-
 .../{mini/vpn => ui}/VPNEnableActivity.java        |  2 +-
 .../ui/hiddenservices/ClientCookiesActivity.java   | 16 ++++++-------
 .../ui/hiddenservices/HiddenServicesActivity.java  | 16 ++++++-------
 .../ui/hiddenservices/adapters/BackupAdapter.java  |  2 +-
 .../adapters/ClientCookiesAdapter.java             |  4 ++--
 .../hiddenservices/adapters/OnionListAdapter.java  |  4 ++--
 .../ui/hiddenservices/backup/BackupUtils.java      |  8 +++----
 .../{mini => }/ui/hiddenservices/backup/ZipIt.java |  2 +-
 .../ui/hiddenservices/database/HSDatabase.java     |  2 +-
 .../ui/hiddenservices/dialogs/AddCookieDialog.java |  4 ++--
 .../dialogs/CookieActionsDialog.java               |  6 ++---
 .../hiddenservices/dialogs/CookieDeleteDialog.java |  4 ++--
 .../ui/hiddenservices/dialogs/HSActionsDialog.java |  6 ++---
 .../ui/hiddenservices/dialogs/HSCookieDialog.java  |  4 ++--
 .../ui/hiddenservices/dialogs/HSDataDialog.java    |  4 ++--
 .../ui/hiddenservices/dialogs/HSDeleteDialog.java  |  4 ++--
 .../dialogs/SelectCookieBackupDialog.java          |  8 +++----
 .../dialogs/SelectHSBackupDialog.java              |  8 +++----
 .../permissions/PermissionManager.java             |  2 +-
 .../providers/CookieContentProvider.java           |  6 ++---
 .../providers/HSContentProvider.java               |  6 ++---
 .../ui/hiddenservices/storage/ExternalStorage.java |  2 +-
 .../ui/onboarding/BridgeWizardActivity.java        |  4 ++--
 .../ui/onboarding/CustomSlideBigText.java          |  2 +-
 .../ui/onboarding/OnboardingActivity.java          | 10 ++++----
 app/src/main/res/layout/activity_bridge_wizard.xml |  2 +-
 app/src/main/res/layout/content_bridge_wizard.xml  |  2 +-
 .../res/layout/layout_activity_client_cookies.xml  |  2 +-
 .../res/layout/layout_add_client_cookie_dialog.xml |  4 ++--
 .../res/layout/layout_content_client_cookies.xml   |  2 +-
 app/src/main/res/layout/layout_hs_data_dialog.xml  |  6 ++---
 app/src/main/res/layout/layout_hs_list_view.xml    |  2 +-
 .../main/res/layout/layout_hs_list_view_main.xml   |  2 +-
 .../org/torproject/android/service/TorService.java |  4 ++--
 44 files changed, 116 insertions(+), 116 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index c4a78d65..f118253e 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -70,14 +70,14 @@
             android:stateNotNeeded="true"
             android:theme="@android:style/Theme.Translucent" />
         <activity
-            android:name=".mini.vpn.VPNEnableActivity"
+            android:name=".ui.VPNEnableActivity"
             android:exported="false"
             android:label="@string/app_name" />
         <activity
-            android:name=".mini.settings.SettingsPreferences"
+            android:name=".settings.SettingsPreferences"
             android:label="@string/app_name" />
         <activity
-            android:name=".mini.ui.AppManagerActivity"
+            android:name=".ui.AppManagerActivity"
             android:label="@string/app_name"
             android:theme="@style/Theme.AppCompat" />
 
@@ -124,7 +124,7 @@
         </receiver>
 
         <activity
-            android:name=".mini.ui.hiddenservices.HiddenServicesActivity"
+            android:name=".ui.hiddenservices.HiddenServicesActivity"
             android:label="@string/title_activity_hidden_services"
             android:theme="@style/DefaultTheme">
             <meta-data
@@ -133,12 +133,12 @@
         </activity>
 
         <provider
-            android:name=".mini.ui.hiddenservices.providers.HSContentProvider"
-            android:authorities="org.torproject.android.mini.ui.hiddenservices.providers"
+            android:name=".ui.hiddenservices.providers.HSContentProvider"
+            android:authorities="org.torproject.android.ui.hiddenservices.providers"
             android:exported="false" />
         <provider
             android:name="android.support.v4.content.FileProvider"
-            android:authorities="org.torproject.android.mini.ui.hiddenservices.storage"
+            android:authorities="org.torproject.android.ui.hiddenservices.storage"
             android:exported="false"
             android:grantUriPermissions="true">
             <meta-data
@@ -147,7 +147,7 @@
         </provider>
 
         <activity
-            android:name=".mini.ui.hiddenservices.ClientCookiesActivity"
+            android:name=".ui.hiddenservices.ClientCookiesActivity"
             android:label="@string/client_cookies"
             android:theme="@style/DefaultTheme">
             <meta-data
@@ -155,12 +155,12 @@
                 android:value=".OrbotMainActivity" />
         </activity>
 
-        <activity android:name=".mini.ui.onboarding.OnboardingActivity"/>
-        <activity android:name=".mini.ui.onboarding.BridgeWizardActivity"/>
+        <activity android:name=".ui.onboarding.OnboardingActivity"/>
+        <activity android:name=".ui.onboarding.BridgeWizardActivity"/>
 
         <provider
-            android:name=".mini.ui.hiddenservices.providers.CookieContentProvider"
-            android:authorities="org.torproject.android.mini.ui.hiddenservices.providers.cookie"
+            android:name=".ui.hiddenservices.providers.CookieContentProvider"
+            android:authorities="org.torproject.android.ui.hiddenservices.providers.cookie"
             android:exported="false" />
     </application>
 
diff --git a/app/src/main/java/org/torproject/android/OnBootReceiver.java b/app/src/main/java/org/torproject/android/OnBootReceiver.java
index 64a2ac76..b18aff78 100644
--- a/app/src/main/java/org/torproject/android/OnBootReceiver.java
+++ b/app/src/main/java/org/torproject/android/OnBootReceiver.java
@@ -9,7 +9,7 @@ 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.mini.vpn.VPNEnableActivity;
+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
index a4f9cd3e..e92083d3 100644
--- a/app/src/main/java/org/torproject/android/OrbotApp.java
+++ b/app/src/main/java/org/torproject/android/OrbotApp.java
@@ -20,8 +20,8 @@ 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.settings.Languages;
+import org.torproject.android.settings.LocaleHelper;
 
 import java.util.Locale;
 
diff --git a/app/src/main/java/org/torproject/android/OrbotMainActivity.java b/app/src/main/java/org/torproject/android/OrbotMainActivity.java
index 3404e380..91683ea9 100644
--- a/app/src/main/java/org/torproject/android/OrbotMainActivity.java
+++ b/app/src/main/java/org/torproject/android/OrbotMainActivity.java
@@ -23,19 +23,19 @@ 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.mini.settings.Languages;
-import org.torproject.android.mini.settings.LocaleHelper;
-import org.torproject.android.mini.settings.SettingsPreferences;
-import org.torproject.android.mini.ui.AppManagerActivity;
-import org.torproject.android.mini.ui.Rotate3dAnimation;
-import org.torproject.android.mini.ui.onboarding.BridgeWizardActivity;
-import org.torproject.android.mini.ui.onboarding.OnboardingActivity;
-import org.torproject.android.mini.ui.hiddenservices.ClientCookiesActivity;
-import org.torproject.android.mini.ui.hiddenservices.HiddenServicesActivity;
-import org.torproject.android.mini.ui.hiddenservices.backup.BackupUtils;
-import org.torproject.android.mini.ui.hiddenservices.permissions.PermissionManager;
-import org.torproject.android.mini.ui.hiddenservices.providers.HSContentProvider;
-import org.torproject.android.mini.vpn.VPNEnableActivity;
+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;
@@ -718,7 +718,7 @@ public class OrbotMainActivity extends AppCompatActivity
 
                                 Uri contentUri = getUriForFile(
                                         context,
-                                        "org.torproject.android.mini.ui.hiddenservices.storage",
+                                        "org.torproject.android.ui.hiddenservices.storage",
                                         hidden_service_key
                                 );
 
diff --git a/app/src/main/java/org/torproject/android/mini/settings/Languages.java b/app/src/main/java/org/torproject/android/settings/Languages.java
similarity index 99%
rename from app/src/main/java/org/torproject/android/mini/settings/Languages.java
rename to app/src/main/java/org/torproject/android/settings/Languages.java
index 5fe04a62..05ae96ce 100644
--- a/app/src/main/java/org/torproject/android/mini/settings/Languages.java
+++ b/app/src/main/java/org/torproject/android/settings/Languages.java
@@ -1,4 +1,4 @@
-package org.torproject.android.mini.settings;
+package org.torproject.android.settings;
 
 import android.annotation.SuppressLint;
 import android.app.Activity;
diff --git a/app/src/main/java/org/torproject/android/mini/settings/LocaleHelper.java b/app/src/main/java/org/torproject/android/settings/LocaleHelper.java
similarity index 98%
rename from app/src/main/java/org/torproject/android/mini/settings/LocaleHelper.java
rename to app/src/main/java/org/torproject/android/settings/LocaleHelper.java
index 2d84e988..e1f496e4 100644
--- a/app/src/main/java/org/torproject/android/mini/settings/LocaleHelper.java
+++ b/app/src/main/java/org/torproject/android/settings/LocaleHelper.java
@@ -1,4 +1,4 @@
-package org.torproject.android.mini.settings;
+package org.torproject.android.settings;
 
 import android.annotation.TargetApi;
 import android.content.Context;
diff --git a/app/src/main/java/org/torproject/android/mini/settings/SettingsPreferences.java b/app/src/main/java/org/torproject/android/settings/SettingsPreferences.java
similarity index 98%
rename from app/src/main/java/org/torproject/android/mini/settings/SettingsPreferences.java
rename to app/src/main/java/org/torproject/android/settings/SettingsPreferences.java
index e613b5a7..040b7b57 100644
--- a/app/src/main/java/org/torproject/android/mini/settings/SettingsPreferences.java
+++ b/app/src/main/java/org/torproject/android/settings/SettingsPreferences.java
@@ -1,7 +1,7 @@
 /* Copyright (c) 2009, Nathan Freitas, Orbot / The Guardian Project - http://openideals.com/guardian */
 /* See LICENSE for licensing information */
 
-package org.torproject.android.mini.settings;
+package org.torproject.android.settings;
 
 import android.content.Context;
 import android.content.Intent;
diff --git a/app/src/main/java/org/torproject/android/mini/ui/AppManagerActivity.java b/app/src/main/java/org/torproject/android/ui/AppManagerActivity.java
similarity index 99%
rename from app/src/main/java/org/torproject/android/mini/ui/AppManagerActivity.java
rename to app/src/main/java/org/torproject/android/ui/AppManagerActivity.java
index 5311897e..56b83430 100644
--- a/app/src/main/java/org/torproject/android/mini/ui/AppManagerActivity.java
+++ b/app/src/main/java/org/torproject/android/ui/AppManagerActivity.java
@@ -1,7 +1,7 @@
 /* Copyright (c) 2009, Nathan Freitas, Orbot / The Guardian Project - http://openideals.com/guardian */
 /* See LICENSE for licensing information */
 
-package org.torproject.android.mini.ui;
+package org.torproject.android.ui;
 
 import java.util.ArrayList;
 import java.util.Arrays;
diff --git a/app/src/main/java/org/torproject/android/mini/ui/NoPersonalizedLearningEditText.java b/app/src/main/java/org/torproject/android/ui/NoPersonalizedLearningEditText.java
similarity index 91%
rename from app/src/main/java/org/torproject/android/mini/ui/NoPersonalizedLearningEditText.java
rename to app/src/main/java/org/torproject/android/ui/NoPersonalizedLearningEditText.java
index a5d67d79..15d8d023 100644
--- a/app/src/main/java/org/torproject/android/mini/ui/NoPersonalizedLearningEditText.java
+++ b/app/src/main/java/org/torproject/android/ui/NoPersonalizedLearningEditText.java
@@ -1,4 +1,4 @@
-package org.torproject.android.mini.ui;
+package org.torproject.android.ui;
 
 import android.content.Context;
 import android.support.v7.widget.AppCompatEditText;
diff --git a/app/src/main/java/org/torproject/android/mini/ui/Rotate3dAnimation.java b/app/src/main/java/org/torproject/android/ui/Rotate3dAnimation.java
similarity index 98%
rename from app/src/main/java/org/torproject/android/mini/ui/Rotate3dAnimation.java
rename to app/src/main/java/org/torproject/android/ui/Rotate3dAnimation.java
index ac8de549..7829d2db 100644
--- a/app/src/main/java/org/torproject/android/mini/ui/Rotate3dAnimation.java
+++ b/app/src/main/java/org/torproject/android/ui/Rotate3dAnimation.java
@@ -1,4 +1,4 @@
-package org.torproject.android.mini.ui;
+package org.torproject.android.ui;
 
 import android.graphics.Camera;
 import android.graphics.Matrix;
diff --git a/app/src/main/java/org/torproject/android/mini/vpn/VPNEnableActivity.java b/app/src/main/java/org/torproject/android/ui/VPNEnableActivity.java
similarity index 98%
rename from app/src/main/java/org/torproject/android/mini/vpn/VPNEnableActivity.java
rename to app/src/main/java/org/torproject/android/ui/VPNEnableActivity.java
index 29492d3e..fd8df38c 100644
--- a/app/src/main/java/org/torproject/android/mini/vpn/VPNEnableActivity.java
+++ b/app/src/main/java/org/torproject/android/ui/VPNEnableActivity.java
@@ -1,4 +1,4 @@
-package org.torproject.android.mini.vpn;
+package org.torproject.android.ui;
 
 import org.torproject.android.service.util.Prefs;
 import org.torproject.android.service.TorService;
diff --git a/app/src/main/java/org/torproject/android/mini/ui/hiddenservices/ClientCookiesActivity.java b/app/src/main/java/org/torproject/android/ui/hiddenservices/ClientCookiesActivity.java
similarity index 92%
rename from app/src/main/java/org/torproject/android/mini/ui/hiddenservices/ClientCookiesActivity.java
rename to app/src/main/java/org/torproject/android/ui/hiddenservices/ClientCookiesActivity.java
index 42608a8d..e6939800 100644
--- a/app/src/main/java/org/torproject/android/mini/ui/hiddenservices/ClientCookiesActivity.java
+++ b/app/src/main/java/org/torproject/android/ui/hiddenservices/ClientCookiesActivity.java
@@ -1,4 +1,4 @@
-package org.torproject.android.mini.ui.hiddenservices;
+package org.torproject.android.ui.hiddenservices;
 
 import android.content.ContentResolver;
 import android.content.ContentValues;
@@ -25,13 +25,13 @@ import com.google.zxing.integration.android.IntentResult;
 import org.json.JSONException;
 import org.json.JSONObject;
 import org.torproject.android.R;
-import org.torproject.android.mini.settings.LocaleHelper;
-import org.torproject.android.mini.ui.hiddenservices.adapters.ClientCookiesAdapter;
-import org.torproject.android.mini.ui.hiddenservices.dialogs.AddCookieDialog;
-import org.torproject.android.mini.ui.hiddenservices.dialogs.CookieActionsDialog;
-import org.torproject.android.mini.ui.hiddenservices.dialogs.SelectCookieBackupDialog;
-import org.torproject.android.mini.ui.hiddenservices.permissions.PermissionManager;
-import org.torproject.android.mini.ui.hiddenservices.providers.CookieContentProvider;
+import org.torproject.android.settings.LocaleHelper;
+import org.torproject.android.ui.hiddenservices.adapters.ClientCookiesAdapter;
+import org.torproject.android.ui.hiddenservices.dialogs.AddCookieDialog;
+import org.torproject.android.ui.hiddenservices.dialogs.CookieActionsDialog;
+import org.torproject.android.ui.hiddenservices.dialogs.SelectCookieBackupDialog;
+import org.torproject.android.ui.hiddenservices.permissions.PermissionManager;
+import org.torproject.android.ui.hiddenservices.providers.CookieContentProvider;
 
 public class ClientCookiesActivity extends AppCompatActivity {
     public final int WRITE_EXTERNAL_STORAGE_FROM_COOKIE_ACTIONBAR = 3;
diff --git a/app/src/main/java/org/torproject/android/mini/ui/hiddenservices/HiddenServicesActivity.java b/app/src/main/java/org/torproject/android/ui/hiddenservices/HiddenServicesActivity.java
similarity index 92%
rename from app/src/main/java/org/torproject/android/mini/ui/hiddenservices/HiddenServicesActivity.java
rename to app/src/main/java/org/torproject/android/ui/hiddenservices/HiddenServicesActivity.java
index 22beee07..d7c1f313 100644
--- a/app/src/main/java/org/torproject/android/mini/ui/hiddenservices/HiddenServicesActivity.java
+++ b/app/src/main/java/org/torproject/android/ui/hiddenservices/HiddenServicesActivity.java
@@ -1,4 +1,4 @@
-package org.torproject.android.mini.ui.hiddenservices;
+package org.torproject.android.ui.hiddenservices;
 
 
 import android.content.ContentResolver;
@@ -22,13 +22,13 @@ import android.widget.Spinner;
 import android.widget.Toast;
 
 import org.torproject.android.R;
-import org.torproject.android.mini.settings.LocaleHelper;
-import org.torproject.android.mini.ui.hiddenservices.adapters.OnionListAdapter;
-import org.torproject.android.mini.ui.hiddenservices.dialogs.HSActionsDialog;
-import org.torproject.android.mini.ui.hiddenservices.dialogs.HSDataDialog;
-import org.torproject.android.mini.ui.hiddenservices.dialogs.SelectHSBackupDialog;
-import org.torproject.android.mini.ui.hiddenservices.permissions.PermissionManager;
-import org.torproject.android.mini.ui.hiddenservices.providers.HSContentProvider;
+import org.torproject.android.settings.LocaleHelper;
+import org.torproject.android.ui.hiddenservices.adapters.OnionListAdapter;
+import org.torproject.android.ui.hiddenservices.dialogs.HSActionsDialog;
+import org.torproject.android.ui.hiddenservices.dialogs.HSDataDialog;
+import org.torproject.android.ui.hiddenservices.dialogs.SelectHSBackupDialog;
+import org.torproject.android.ui.hiddenservices.permissions.PermissionManager;
+import org.torproject.android.ui.hiddenservices.providers.HSContentProvider;
 
 public class HiddenServicesActivity extends AppCompatActivity {
     public final int WRITE_EXTERNAL_STORAGE_FROM_ACTIONBAR = 1;
diff --git a/app/src/main/java/org/torproject/android/mini/ui/hiddenservices/adapters/BackupAdapter.java b/app/src/main/java/org/torproject/android/ui/hiddenservices/adapters/BackupAdapter.java
similarity index 94%
rename from app/src/main/java/org/torproject/android/mini/ui/hiddenservices/adapters/BackupAdapter.java
rename to app/src/main/java/org/torproject/android/ui/hiddenservices/adapters/BackupAdapter.java
index d7537118..196023b3 100644
--- a/app/src/main/java/org/torproject/android/mini/ui/hiddenservices/adapters/BackupAdapter.java
+++ b/app/src/main/java/org/torproject/android/ui/hiddenservices/adapters/BackupAdapter.java
@@ -1,4 +1,4 @@
-package org.torproject.android.mini.ui.hiddenservices.adapters;
+package org.torproject.android.ui.hiddenservices.adapters;
 
 import android.content.Context;
 import android.view.LayoutInflater;
diff --git a/app/src/main/java/org/torproject/android/mini/ui/hiddenservices/adapters/ClientCookiesAdapter.java b/app/src/main/java/org/torproject/android/ui/hiddenservices/adapters/ClientCookiesAdapter.java
similarity index 94%
rename from app/src/main/java/org/torproject/android/mini/ui/hiddenservices/adapters/ClientCookiesAdapter.java
rename to app/src/main/java/org/torproject/android/ui/hiddenservices/adapters/ClientCookiesAdapter.java
index a27f293b..bbc317a6 100644
--- a/app/src/main/java/org/torproject/android/mini/ui/hiddenservices/adapters/ClientCookiesAdapter.java
+++ b/app/src/main/java/org/torproject/android/ui/hiddenservices/adapters/ClientCookiesAdapter.java
@@ -1,4 +1,4 @@
-package org.torproject.android.mini.ui.hiddenservices.adapters;
+package org.torproject.android.ui.hiddenservices.adapters;
 
 import android.content.ContentResolver;
 import android.content.ContentValues;
@@ -14,7 +14,7 @@ import android.widget.TextView;
 import android.widget.Toast;
 
 import org.torproject.android.R;
-import org.torproject.android.mini.ui.hiddenservices.providers.CookieContentProvider;
+import org.torproject.android.ui.hiddenservices.providers.CookieContentProvider;
 
 public class ClientCookiesAdapter extends CursorAdapter {
     private LayoutInflater cursorInflater;
diff --git a/app/src/main/java/org/torproject/android/mini/ui/hiddenservices/adapters/OnionListAdapter.java b/app/src/main/java/org/torproject/android/ui/hiddenservices/adapters/OnionListAdapter.java
similarity index 94%
rename from app/src/main/java/org/torproject/android/mini/ui/hiddenservices/adapters/OnionListAdapter.java
rename to app/src/main/java/org/torproject/android/ui/hiddenservices/adapters/OnionListAdapter.java
index 493589db..9824c773 100644
--- a/app/src/main/java/org/torproject/android/mini/ui/hiddenservices/adapters/OnionListAdapter.java
+++ b/app/src/main/java/org/torproject/android/ui/hiddenservices/adapters/OnionListAdapter.java
@@ -1,4 +1,4 @@
-package org.torproject.android.mini.ui.hiddenservices.adapters;
+package org.torproject.android.ui.hiddenservices.adapters;
 
 import android.content.ContentResolver;
 import android.content.ContentValues;
@@ -14,7 +14,7 @@ import android.widget.TextView;
 import android.widget.Toast;
 
 import org.torproject.android.R;
-import org.torproject.android.mini.ui.hiddenservices.providers.HSContentProvider;
+import org.torproject.android.ui.hiddenservices.providers.HSContentProvider;
 
 public class OnionListAdapter extends CursorAdapter {
     private LayoutInflater cursorInflater;
diff --git a/app/src/main/java/org/torproject/android/mini/ui/hiddenservices/backup/BackupUtils.java b/app/src/main/java/org/torproject/android/ui/hiddenservices/backup/BackupUtils.java
similarity index 97%
rename from app/src/main/java/org/torproject/android/mini/ui/hiddenservices/backup/BackupUtils.java
rename to app/src/main/java/org/torproject/android/ui/hiddenservices/backup/BackupUtils.java
index f6b3eae1..a4790dd8 100644
--- a/app/src/main/java/org/torproject/android/mini/ui/hiddenservices/backup/BackupUtils.java
+++ b/app/src/main/java/org/torproject/android/ui/hiddenservices/backup/BackupUtils.java
@@ -1,4 +1,4 @@
-package org.torproject.android.mini.ui.hiddenservices.backup;
+package org.torproject.android.ui.hiddenservices.backup;
 
 import android.content.ContentResolver;
 import android.content.ContentValues;
@@ -12,9 +12,9 @@ import org.json.JSONException;
 import org.json.JSONObject;
 import org.torproject.android.R;
 import org.torproject.android.service.TorServiceConstants;
-import org.torproject.android.mini.ui.hiddenservices.providers.CookieContentProvider;
-import org.torproject.android.mini.ui.hiddenservices.providers.HSContentProvider;
-import org.torproject.android.mini.ui.hiddenservices.storage.ExternalStorage;
+import org.torproject.android.ui.hiddenservices.providers.CookieContentProvider;
+import org.torproject.android.ui.hiddenservices.providers.HSContentProvider;
+import org.torproject.android.ui.hiddenservices.storage.ExternalStorage;
 
 import java.io.File;
 import java.io.FileInputStream;
diff --git a/app/src/main/java/org/torproject/android/mini/ui/hiddenservices/backup/ZipIt.java b/app/src/main/java/org/torproject/android/ui/hiddenservices/backup/ZipIt.java
similarity index 97%
rename from app/src/main/java/org/torproject/android/mini/ui/hiddenservices/backup/ZipIt.java
rename to app/src/main/java/org/torproject/android/ui/hiddenservices/backup/ZipIt.java
index 6b26845e..130b56bb 100644
--- a/app/src/main/java/org/torproject/android/mini/ui/hiddenservices/backup/ZipIt.java
+++ b/app/src/main/java/org/torproject/android/ui/hiddenservices/backup/ZipIt.java
@@ -1,4 +1,4 @@
-package org.torproject.android.mini.ui.hiddenservices.backup;
+package org.torproject.android.ui.hiddenservices.backup;
 
 
 import android.support.annotation.NonNull;
diff --git a/app/src/main/java/org/torproject/android/mini/ui/hiddenservices/database/HSDatabase.java b/app/src/main/java/org/torproject/android/ui/hiddenservices/database/HSDatabase.java
similarity index 96%
rename from app/src/main/java/org/torproject/android/mini/ui/hiddenservices/database/HSDatabase.java
rename to app/src/main/java/org/torproject/android/ui/hiddenservices/database/HSDatabase.java
index 4c0b28a3..18bc7aa0 100644
--- a/app/src/main/java/org/torproject/android/mini/ui/hiddenservices/database/HSDatabase.java
+++ b/app/src/main/java/org/torproject/android/ui/hiddenservices/database/HSDatabase.java
@@ -1,4 +1,4 @@
-package org.torproject.android.mini.ui.hiddenservices.database;
+package org.torproject.android.ui.hiddenservices.database;
 
 
 import android.content.Context;
diff --git a/app/src/main/java/org/torproject/android/mini/ui/hiddenservices/dialogs/AddCookieDialog.java b/app/src/main/java/org/torproject/android/ui/hiddenservices/dialogs/AddCookieDialog.java
similarity index 95%
rename from app/src/main/java/org/torproject/android/mini/ui/hiddenservices/dialogs/AddCookieDialog.java
rename to app/src/main/java/org/torproject/android/ui/hiddenservices/dialogs/AddCookieDialog.java
index d0af6aa4..8441d53f 100644
--- a/app/src/main/java/org/torproject/android/mini/ui/hiddenservices/dialogs/AddCookieDialog.java
+++ b/app/src/main/java/org/torproject/android/ui/hiddenservices/dialogs/AddCookieDialog.java
@@ -1,4 +1,4 @@
-package org.torproject.android.mini.ui.hiddenservices.dialogs;
+package org.torproject.android.ui.hiddenservices.dialogs;
 
 
 import android.app.Dialog;
@@ -14,7 +14,7 @@ import android.widget.EditText;
 import android.widget.Toast;
 
 import org.torproject.android.R;
-import org.torproject.android.mini.ui.hiddenservices.providers.CookieContentProvider;
+import org.torproject.android.ui.hiddenservices.providers.CookieContentProvider;
 
 public class AddCookieDialog extends DialogFragment {
 
diff --git a/app/src/main/java/org/torproject/android/mini/ui/hiddenservices/dialogs/CookieActionsDialog.java b/app/src/main/java/org/torproject/android/ui/hiddenservices/dialogs/CookieActionsDialog.java
similarity index 94%
rename from app/src/main/java/org/torproject/android/mini/ui/hiddenservices/dialogs/CookieActionsDialog.java
rename to app/src/main/java/org/torproject/android/ui/hiddenservices/dialogs/CookieActionsDialog.java
index 0d66bd5b..7b5a2cfe 100644
--- a/app/src/main/java/org/torproject/android/mini/ui/hiddenservices/dialogs/CookieActionsDialog.java
+++ b/app/src/main/java/org/torproject/android/ui/hiddenservices/dialogs/CookieActionsDialog.java
@@ -1,4 +1,4 @@
-package org.torproject.android.mini.ui.hiddenservices.dialogs;
+package org.torproject.android.ui.hiddenservices.dialogs;
 
 
 import android.app.Dialog;
@@ -14,8 +14,8 @@ import android.widget.Button;
 import android.widget.Toast;
 
 import org.torproject.android.R;
-import org.torproject.android.mini.ui.hiddenservices.backup.BackupUtils;
-import org.torproject.android.mini.ui.hiddenservices.permissions.PermissionManager;
+import org.torproject.android.ui.hiddenservices.backup.BackupUtils;
+import org.torproject.android.ui.hiddenservices.permissions.PermissionManager;
 
 public class CookieActionsDialog extends DialogFragment {
     public static final int WRITE_EXTERNAL_STORAGE_FROM_COOKIE_ACTION_DIALOG = 4;
diff --git a/app/src/main/java/org/torproject/android/mini/ui/hiddenservices/dialogs/CookieDeleteDialog.java b/app/src/main/java/org/torproject/android/ui/hiddenservices/dialogs/CookieDeleteDialog.java
similarity index 91%
rename from app/src/main/java/org/torproject/android/mini/ui/hiddenservices/dialogs/CookieDeleteDialog.java
rename to app/src/main/java/org/torproject/android/ui/hiddenservices/dialogs/CookieDeleteDialog.java
index eab21aa4..60c4d8e3 100644
--- a/app/src/main/java/org/torproject/android/mini/ui/hiddenservices/dialogs/CookieDeleteDialog.java
+++ b/app/src/main/java/org/torproject/android/ui/hiddenservices/dialogs/CookieDeleteDialog.java
@@ -1,4 +1,4 @@
-package org.torproject.android.mini.ui.hiddenservices.dialogs;
+package org.torproject.android.ui.hiddenservices.dialogs;
 
 
 import android.app.Dialog;
@@ -10,7 +10,7 @@ import android.support.v4.app.DialogFragment;
 import android.support.v7.app.AlertDialog;
 
 import org.torproject.android.R;
-import org.torproject.android.mini.ui.hiddenservices.providers.CookieContentProvider;
+import org.torproject.android.ui.hiddenservices.providers.CookieContentProvider;
 
 public class CookieDeleteDialog extends DialogFragment {
 
diff --git a/app/src/main/java/org/torproject/android/mini/ui/hiddenservices/dialogs/HSActionsDialog.java b/app/src/main/java/org/torproject/android/ui/hiddenservices/dialogs/HSActionsDialog.java
similarity index 95%
rename from app/src/main/java/org/torproject/android/mini/ui/hiddenservices/dialogs/HSActionsDialog.java
rename to app/src/main/java/org/torproject/android/ui/hiddenservices/dialogs/HSActionsDialog.java
index 2aa41968..5be76917 100644
--- a/app/src/main/java/org/torproject/android/mini/ui/hiddenservices/dialogs/HSActionsDialog.java
+++ b/app/src/main/java/org/torproject/android/ui/hiddenservices/dialogs/HSActionsDialog.java
@@ -1,4 +1,4 @@
-package org.torproject.android.mini.ui.hiddenservices.dialogs;
+package org.torproject.android.ui.hiddenservices.dialogs;
 
 
 import android.app.Dialog;
@@ -16,8 +16,8 @@ import android.widget.Button;
 import android.widget.Toast;
 
 import org.torproject.android.R;
-import org.torproject.android.mini.ui.hiddenservices.backup.BackupUtils;
-import org.torproject.android.mini.ui.hiddenservices.permissions.PermissionManager;
+import org.torproject.android.ui.hiddenservices.backup.BackupUtils;
+import org.torproject.android.ui.hiddenservices.permissions.PermissionManager;
 
 public class HSActionsDialog extends DialogFragment {
     public static final int WRITE_EXTERNAL_STORAGE_FROM_ACTION_DIALOG = 2;
diff --git a/app/src/main/java/org/torproject/android/mini/ui/hiddenservices/dialogs/HSCookieDialog.java b/app/src/main/java/org/torproject/android/ui/hiddenservices/dialogs/HSCookieDialog.java
similarity index 95%
rename from app/src/main/java/org/torproject/android/mini/ui/hiddenservices/dialogs/HSCookieDialog.java
rename to app/src/main/java/org/torproject/android/ui/hiddenservices/dialogs/HSCookieDialog.java
index 8a7df0bd..39c1b510 100644
--- a/app/src/main/java/org/torproject/android/mini/ui/hiddenservices/dialogs/HSCookieDialog.java
+++ b/app/src/main/java/org/torproject/android/ui/hiddenservices/dialogs/HSCookieDialog.java
@@ -1,4 +1,4 @@
-package org.torproject.android.mini.ui.hiddenservices.dialogs;
+package org.torproject.android.ui.hiddenservices.dialogs;
 
 import android.app.Dialog;
 import android.content.ClipData;
@@ -18,7 +18,7 @@ import com.google.zxing.integration.android.IntentIntegrator;
 import org.json.JSONException;
 import org.json.JSONObject;
 import org.torproject.android.R;
-import org.torproject.android.mini.ui.hiddenservices.providers.CookieContentProvider;
+import org.torproject.android.ui.hiddenservices.providers.CookieContentProvider;
 
 public class HSCookieDialog extends DialogFragment {
 
diff --git a/app/src/main/java/org/torproject/android/mini/ui/hiddenservices/dialogs/HSDataDialog.java b/app/src/main/java/org/torproject/android/ui/hiddenservices/dialogs/HSDataDialog.java
similarity index 96%
rename from app/src/main/java/org/torproject/android/mini/ui/hiddenservices/dialogs/HSDataDialog.java
rename to app/src/main/java/org/torproject/android/ui/hiddenservices/dialogs/HSDataDialog.java
index dac8f13b..01e09dff 100644
--- a/app/src/main/java/org/torproject/android/mini/ui/hiddenservices/dialogs/HSDataDialog.java
+++ b/app/src/main/java/org/torproject/android/ui/hiddenservices/dialogs/HSDataDialog.java
@@ -1,4 +1,4 @@
-package org.torproject.android.mini.ui.hiddenservices.dialogs;
+package org.torproject.android.ui.hiddenservices.dialogs;
 
 
 import android.app.Dialog;
@@ -15,7 +15,7 @@ import android.widget.EditText;
 import android.widget.Toast;
 
 import org.torproject.android.R;
-import org.torproject.android.mini.ui.hiddenservices.providers.HSContentProvider;
+import org.torproject.android.ui.hiddenservices.providers.HSContentProvider;
 
 public class HSDataDialog extends DialogFragment {
 
diff --git a/app/src/main/java/org/torproject/android/mini/ui/hiddenservices/dialogs/HSDeleteDialog.java b/app/src/main/java/org/torproject/android/ui/hiddenservices/dialogs/HSDeleteDialog.java
similarity index 94%
rename from app/src/main/java/org/torproject/android/mini/ui/hiddenservices/dialogs/HSDeleteDialog.java
rename to app/src/main/java/org/torproject/android/ui/hiddenservices/dialogs/HSDeleteDialog.java
index 11036950..ac5df743 100644
--- a/app/src/main/java/org/torproject/android/mini/ui/hiddenservices/dialogs/HSDeleteDialog.java
+++ b/app/src/main/java/org/torproject/android/ui/hiddenservices/dialogs/HSDeleteDialog.java
@@ -1,4 +1,4 @@
-package org.torproject.android.mini.ui.hiddenservices.dialogs;
+package org.torproject.android.ui.hiddenservices.dialogs;
 
 
 import android.app.Dialog;
@@ -11,7 +11,7 @@ import android.support.v7.app.AlertDialog;
 
 import org.torproject.android.R;
 import org.torproject.android.service.TorServiceConstants;
-import org.torproject.android.mini.ui.hiddenservices.providers.HSContentProvider;
+import org.torproject.android.ui.hiddenservices.providers.HSContentProvider;
 
 import java.io.File;
 
diff --git a/app/src/main/java/org/torproject/android/mini/ui/hiddenservices/dialogs/SelectCookieBackupDialog.java b/app/src/main/java/org/torproject/android/ui/hiddenservices/dialogs/SelectCookieBackupDialog.java
similarity index 90%
rename from app/src/main/java/org/torproject/android/mini/ui/hiddenservices/dialogs/SelectCookieBackupDialog.java
rename to app/src/main/java/org/torproject/android/ui/hiddenservices/dialogs/SelectCookieBackupDialog.java
index c36e0308..de5b7848 100644
--- a/app/src/main/java/org/torproject/android/mini/ui/hiddenservices/dialogs/SelectCookieBackupDialog.java
+++ b/app/src/main/java/org/torproject/android/ui/hiddenservices/dialogs/SelectCookieBackupDialog.java
@@ -1,4 +1,4 @@
-package org.torproject.android.mini.ui.hiddenservices.dialogs;
+package org.torproject.android.ui.hiddenservices.dialogs;
 
 import android.app.Dialog;
 import android.content.DialogInterface;
@@ -11,9 +11,9 @@ import android.widget.AdapterView;
 import android.widget.ListView;
 
 import org.torproject.android.R;
-import org.torproject.android.mini.ui.hiddenservices.adapters.BackupAdapter;
-import org.torproject.android.mini.ui.hiddenservices.backup.BackupUtils;
-import org.torproject.android.mini.ui.hiddenservices.storage.ExternalStorage;
+import org.torproject.android.ui.hiddenservices.adapters.BackupAdapter;
+import org.torproject.android.ui.hiddenservices.backup.BackupUtils;
+import org.torproject.android.ui.hiddenservices.storage.ExternalStorage;
 
 import java.io.File;
 import java.io.FilenameFilter;
diff --git a/app/src/main/java/org/torproject/android/mini/ui/hiddenservices/dialogs/SelectHSBackupDialog.java b/app/src/main/java/org/torproject/android/ui/hiddenservices/dialogs/SelectHSBackupDialog.java
similarity index 90%
rename from app/src/main/java/org/torproject/android/mini/ui/hiddenservices/dialogs/SelectHSBackupDialog.java
rename to app/src/main/java/org/torproject/android/ui/hiddenservices/dialogs/SelectHSBackupDialog.java
index a8d17d97..a6e3bac9 100644
--- a/app/src/main/java/org/torproject/android/mini/ui/hiddenservices/dialogs/SelectHSBackupDialog.java
+++ b/app/src/main/java/org/torproject/android/ui/hiddenservices/dialogs/SelectHSBackupDialog.java
@@ -1,4 +1,4 @@
-package org.torproject.android.mini.ui.hiddenservices.dialogs;
+package org.torproject.android.ui.hiddenservices.dialogs;
 
 import android.app.Dialog;
 import android.content.DialogInterface;
@@ -11,9 +11,9 @@ import android.widget.AdapterView;
 import android.widget.ListView;
 
 import org.torproject.android.R;
-import org.torproject.android.mini.ui.hiddenservices.adapters.BackupAdapter;
-import org.torproject.android.mini.ui.hiddenservices.backup.BackupUtils;
-import org.torproject.android.mini.ui.hiddenservices.storage.ExternalStorage;
+import org.torproject.android.ui.hiddenservices.adapters.BackupAdapter;
+import org.torproject.android.ui.hiddenservices.backup.BackupUtils;
+import org.torproject.android.ui.hiddenservices.storage.ExternalStorage;
 
 import java.io.File;
 import java.io.FilenameFilter;
diff --git a/app/src/main/java/org/torproject/android/mini/ui/hiddenservices/permissions/PermissionManager.java b/app/src/main/java/org/torproject/android/ui/hiddenservices/permissions/PermissionManager.java
similarity index 98%
rename from app/src/main/java/org/torproject/android/mini/ui/hiddenservices/permissions/PermissionManager.java
rename to app/src/main/java/org/torproject/android/ui/hiddenservices/permissions/PermissionManager.java
index 910c06e3..a9df5a95 100644
--- a/app/src/main/java/org/torproject/android/mini/ui/hiddenservices/permissions/PermissionManager.java
+++ b/app/src/main/java/org/torproject/android/ui/hiddenservices/permissions/PermissionManager.java
@@ -1,4 +1,4 @@
-package org.torproject.android.mini.ui.hiddenservices.permissions;
+package org.torproject.android.ui.hiddenservices.permissions;
 
 
 import android.Manifest;
diff --git a/app/src/main/java/org/torproject/android/mini/ui/hiddenservices/providers/CookieContentProvider.java b/app/src/main/java/org/torproject/android/ui/hiddenservices/providers/CookieContentProvider.java
similarity index 94%
rename from app/src/main/java/org/torproject/android/mini/ui/hiddenservices/providers/CookieContentProvider.java
rename to app/src/main/java/org/torproject/android/ui/hiddenservices/providers/CookieContentProvider.java
index 29d34a08..f420a6d8 100644
--- a/app/src/main/java/org/torproject/android/mini/ui/hiddenservices/providers/CookieContentProvider.java
+++ b/app/src/main/java/org/torproject/android/ui/hiddenservices/providers/CookieContentProvider.java
@@ -1,4 +1,4 @@
-package org.torproject.android.mini.ui.hiddenservices.providers;
+package org.torproject.android.ui.hiddenservices.providers;
 
 import android.content.ContentProvider;
 import android.content.ContentUris;
@@ -12,7 +12,7 @@ import android.provider.BaseColumns;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 
-import org.torproject.android.mini.ui.hiddenservices.database.HSDatabase;
+import org.torproject.android.ui.hiddenservices.database.HSDatabase;
 
 
 public class CookieContentProvider extends ContentProvider {
@@ -22,7 +22,7 @@ public class CookieContentProvider extends ContentProvider {
             ClientCookie.AUTH_COOKIE_VALUE,
             ClientCookie.ENABLED
     };
-    private static final String AUTH = "org.torproject.android.mini.ui.hiddenservices.providers.cookie";
+    private static final String AUTH = "org.torproject.android.ui.hiddenservices.providers.cookie";
     public static final Uri CONTENT_URI =
             Uri.parse("content://" + AUTH + "/cookie");
     //UriMatcher
diff --git a/app/src/main/java/org/torproject/android/mini/ui/hiddenservices/providers/HSContentProvider.java b/app/src/main/java/org/torproject/android/ui/hiddenservices/providers/HSContentProvider.java
similarity index 94%
rename from app/src/main/java/org/torproject/android/mini/ui/hiddenservices/providers/HSContentProvider.java
rename to app/src/main/java/org/torproject/android/ui/hiddenservices/providers/HSContentProvider.java
index f6394d99..d7b558fd 100644
--- a/app/src/main/java/org/torproject/android/mini/ui/hiddenservices/providers/HSContentProvider.java
+++ b/app/src/main/java/org/torproject/android/ui/hiddenservices/providers/HSContentProvider.java
@@ -1,4 +1,4 @@
-package org.torproject.android.mini.ui.hiddenservices.providers;
+package org.torproject.android.ui.hiddenservices.providers;
 
 import android.content.ContentProvider;
 import android.content.ContentUris;
@@ -12,7 +12,7 @@ import android.provider.BaseColumns;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 
-import org.torproject.android.mini.ui.hiddenservices.database.HSDatabase;
+import org.torproject.android.ui.hiddenservices.database.HSDatabase;
 
 
 public class HSContentProvider extends ContentProvider {
@@ -27,7 +27,7 @@ public class HSContentProvider extends ContentProvider {
             HiddenService.CREATED_BY_USER,
             HiddenService.ENABLED
     };
-    private static final String AUTH = "org.torproject.android.mini.ui.hiddenservices.providers";
+    private static final String AUTH = "org.torproject.android.ui.hiddenservices.providers";
     public static final Uri CONTENT_URI =
             Uri.parse("content://" + AUTH + "/hs");
     //UriMatcher
diff --git a/app/src/main/java/org/torproject/android/mini/ui/hiddenservices/storage/ExternalStorage.java b/app/src/main/java/org/torproject/android/ui/hiddenservices/storage/ExternalStorage.java
similarity index 94%
rename from app/src/main/java/org/torproject/android/mini/ui/hiddenservices/storage/ExternalStorage.java
rename to app/src/main/java/org/torproject/android/ui/hiddenservices/storage/ExternalStorage.java
index bc72353f..c50108b7 100644
--- a/app/src/main/java/org/torproject/android/mini/ui/hiddenservices/storage/ExternalStorage.java
+++ b/app/src/main/java/org/torproject/android/ui/hiddenservices/storage/ExternalStorage.java
@@ -1,4 +1,4 @@
-package org.torproject.android.mini.ui.hiddenservices.storage;
+package org.torproject.android.ui.hiddenservices.storage;
 
 import android.os.Environment;
 
diff --git a/app/src/main/java/org/torproject/android/mini/ui/onboarding/BridgeWizardActivity.java b/app/src/main/java/org/torproject/android/ui/onboarding/BridgeWizardActivity.java
similarity index 98%
rename from app/src/main/java/org/torproject/android/mini/ui/onboarding/BridgeWizardActivity.java
rename to app/src/main/java/org/torproject/android/ui/onboarding/BridgeWizardActivity.java
index 2efc387e..cd43ea0c 100644
--- a/app/src/main/java/org/torproject/android/mini/ui/onboarding/BridgeWizardActivity.java
+++ b/app/src/main/java/org/torproject/android/ui/onboarding/BridgeWizardActivity.java
@@ -1,4 +1,4 @@
-package org.torproject.android.mini.ui.onboarding;
+package org.torproject.android.ui.onboarding;
 
 import android.app.AlertDialog;
 import android.app.Dialog;
@@ -18,7 +18,7 @@ import android.widget.TextView;
 
 import org.torproject.android.R;
 import org.torproject.android.service.util.Prefs;
-import org.torproject.android.mini.settings.LocaleHelper;
+import org.torproject.android.settings.LocaleHelper;
 
 import java.io.IOException;
 import java.net.InetSocketAddress;
diff --git a/app/src/main/java/org/torproject/android/mini/ui/onboarding/CustomSlideBigText.java b/app/src/main/java/org/torproject/android/ui/onboarding/CustomSlideBigText.java
similarity index 97%
rename from app/src/main/java/org/torproject/android/mini/ui/onboarding/CustomSlideBigText.java
rename to app/src/main/java/org/torproject/android/ui/onboarding/CustomSlideBigText.java
index 954a1221..35f5a55a 100644
--- a/app/src/main/java/org/torproject/android/mini/ui/onboarding/CustomSlideBigText.java
+++ b/app/src/main/java/org/torproject/android/ui/onboarding/CustomSlideBigText.java
@@ -1,4 +1,4 @@
-package org.torproject.android.mini.ui.onboarding;
+package org.torproject.android.ui.onboarding;
 
 import android.os.Bundle;
 import android.support.annotation.Nullable;
diff --git a/app/src/main/java/org/torproject/android/mini/ui/onboarding/OnboardingActivity.java b/app/src/main/java/org/torproject/android/ui/onboarding/OnboardingActivity.java
similarity index 90%
rename from app/src/main/java/org/torproject/android/mini/ui/onboarding/OnboardingActivity.java
rename to app/src/main/java/org/torproject/android/ui/onboarding/OnboardingActivity.java
index 2b19d841..da473ef1 100644
--- a/app/src/main/java/org/torproject/android/mini/ui/onboarding/OnboardingActivity.java
+++ b/app/src/main/java/org/torproject/android/ui/onboarding/OnboardingActivity.java
@@ -1,4 +1,4 @@
-package org.torproject.android.mini.ui.onboarding;
+package org.torproject.android.ui.onboarding;
 
 import android.content.Context;
 import android.content.Intent;
@@ -10,10 +10,10 @@ import android.view.View;
 import com.github.paolorotolo.appintro.AppIntro;
 
 import org.torproject.android.R;
-import org.torproject.android.mini.settings.LocaleHelper;
-import org.torproject.android.mini.ui.AppManagerActivity;
-import org.torproject.android.mini.ui.hiddenservices.permissions.PermissionManager;
-import org.torproject.android.mini.vpn.VPNEnableActivity;
+import org.torproject.android.settings.LocaleHelper;
+import org.torproject.android.ui.AppManagerActivity;
+import org.torproject.android.ui.hiddenservices.permissions.PermissionManager;
+import org.torproject.android.ui.VPNEnableActivity;
 
 public class OnboardingActivity extends AppIntro {
 
diff --git a/app/src/main/res/layout/activity_bridge_wizard.xml b/app/src/main/res/layout/activity_bridge_wizard.xml
index cc23654c..7ff470c9 100644
--- a/app/src/main/res/layout/activity_bridge_wizard.xml
+++ b/app/src/main/res/layout/activity_bridge_wizard.xml
@@ -6,7 +6,7 @@
     android:layout_height="match_parent"
     android:background="@color/dark_purple"
 
-    tools:context="org.torproject.android.mini.ui.onboarding.BridgeWizardActivity">
+    tools:context="org.torproject.android.ui.onboarding.BridgeWizardActivity">
 
     <android.support.design.widget.AppBarLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/content_bridge_wizard.xml b/app/src/main/res/layout/content_bridge_wizard.xml
index 15387fff..a5b7995b 100644
--- a/app/src/main/res/layout/content_bridge_wizard.xml
+++ b/app/src/main/res/layout/content_bridge_wizard.xml
@@ -6,7 +6,7 @@
     android:layout_height="match_parent"
     android:orientation="vertical"
     app:layout_behavior="@string/appbar_scrolling_view_behavior"
-    tools:context="org.torproject.android.mini.ui.onboarding.BridgeWizardActivity"
+    tools:context="org.torproject.android.ui.onboarding.BridgeWizardActivity"
     tools:showIn="@layout/activity_bridge_wizard">
 
     <TextView
diff --git a/app/src/main/res/layout/layout_activity_client_cookies.xml b/app/src/main/res/layout/layout_activity_client_cookies.xml
index 5c5bf936..b8f0626e 100644
--- a/app/src/main/res/layout/layout_activity_client_cookies.xml
+++ b/app/src/main/res/layout/layout_activity_client_cookies.xml
@@ -5,7 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:fitsSystemWindows="true"
-    tools:context="org.torproject.android.mini.ui.hiddenservices.ClientCookiesActivity">
+    tools:context="org.torproject.android.ui.hiddenservices.ClientCookiesActivity">
 
     <android.support.design.widget.AppBarLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/layout_add_client_cookie_dialog.xml b/app/src/main/res/layout/layout_add_client_cookie_dialog.xml
index f28a8282..2f4b9885 100644
--- a/app/src/main/res/layout/layout_add_client_cookie_dialog.xml
+++ b/app/src/main/res/layout/layout_add_client_cookie_dialog.xml
@@ -15,7 +15,7 @@
         android:textAppearance="@style/TextAppearance.AppCompat.Widget.PopupMenu.Small"
         android:paddingLeft="5dp" />
 
-    <org.torproject.android.mini.ui.NoPersonalizedLearningEditText
+    <org.torproject.android.ui.NoPersonalizedLearningEditText
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:inputType="text"
@@ -29,7 +29,7 @@
         android:textAppearance="@style/TextAppearance.AppCompat.Widget.PopupMenu.Small"
         android:paddingLeft="5dp" />
 
-    <org.torproject.android.mini.ui.NoPersonalizedLearningEditText
+    <org.torproject.android.ui.NoPersonalizedLearningEditText
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:ems="10"
diff --git a/app/src/main/res/layout/layout_content_client_cookies.xml b/app/src/main/res/layout/layout_content_client_cookies.xml
index 5295641c..2517d8e1 100644
--- a/app/src/main/res/layout/layout_content_client_cookies.xml
+++ b/app/src/main/res/layout/layout_content_client_cookies.xml
@@ -9,7 +9,7 @@
     android:paddingRight="@dimen/activity_horizontal_margin"
     android:paddingTop="@dimen/activity_vertical_margin"
     app:layout_behavior="@string/appbar_scrolling_view_behavior"
-    tools:context="org.torproject.android.mini.ui.hiddenservices.ClientCookiesActivity"
+    tools:context="org.torproject.android.ui.hiddenservices.ClientCookiesActivity"
     tools:showIn="@layout/layout_activity_client_cookies">
 
     <ListView
diff --git a/app/src/main/res/layout/layout_hs_data_dialog.xml b/app/src/main/res/layout/layout_hs_data_dialog.xml
index 20a1e2b2..a4ac590e 100644
--- a/app/src/main/res/layout/layout_hs_data_dialog.xml
+++ b/app/src/main/res/layout/layout_hs_data_dialog.xml
@@ -15,7 +15,7 @@
         android:textAppearance="@style/TextAppearance.AppCompat.Widget.PopupMenu.Small"
         android:paddingLeft="5dp" />
 
-    <org.torproject.android.mini.ui.NoPersonalizedLearningEditText
+    <org.torproject.android.ui.NoPersonalizedLearningEditText
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:inputType="text"
@@ -29,7 +29,7 @@
         android:textAppearance="@style/TextAppearance.AppCompat.Widget.PopupMenu.Small"
         android:paddingLeft="5dp" />
 
-    <org.torproject.android.mini.ui.NoPersonalizedLearningEditText
+    <org.torproject.android.ui.NoPersonalizedLearningEditText
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:ems="10"
@@ -43,7 +43,7 @@
         android:textAppearance="@style/TextAppearance.AppCompat.Widget.PopupMenu.Small"
         android:paddingLeft="5dp" />
 
-    <org.torproject.android.mini.ui.NoPersonalizedLearningEditText
+    <org.torproject.android.ui.NoPersonalizedLearningEditText
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:ems="10"
diff --git a/app/src/main/res/layout/layout_hs_list_view.xml b/app/src/main/res/layout/layout_hs_list_view.xml
index 9c3f5599..4981877d 100644
--- a/app/src/main/res/layout/layout_hs_list_view.xml
+++ b/app/src/main/res/layout/layout_hs_list_view.xml
@@ -5,7 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:fitsSystemWindows="true"
-    tools:context="org.torproject.android.mini.ui.hiddenservices.HiddenServicesActivity">
+    tools:context="org.torproject.android.ui.hiddenservices.HiddenServicesActivity">
 
     <android.support.design.widget.AppBarLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/layout_hs_list_view_main.xml b/app/src/main/res/layout/layout_hs_list_view_main.xml
index ba907e6e..183ea28a 100644
--- a/app/src/main/res/layout/layout_hs_list_view_main.xml
+++ b/app/src/main/res/layout/layout_hs_list_view_main.xml
@@ -9,7 +9,7 @@
     android:paddingRight="@dimen/activity_horizontal_margin"
     android:paddingTop="@dimen/activity_vertical_margin"
     app:layout_behavior="@string/appbar_scrolling_view_behavior"
-    tools:context="org.torproject.android.mini.ui.hiddenservices.HiddenServicesActivity"
+    tools:context="org.torproject.android.ui.hiddenservices.HiddenServicesActivity"
     tools:showIn="@layout/layout_hs_list_view">
 
     <ListView
diff --git a/orbotservice/src/main/java/org/torproject/android/service/TorService.java b/orbotservice/src/main/java/org/torproject/android/service/TorService.java
index 5d70fad3..5b047143 100644
--- a/orbotservice/src/main/java/org/torproject/android/service/TorService.java
+++ b/orbotservice/src/main/java/org/torproject/android/service/TorService.java
@@ -136,8 +136,8 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon
 
     private ArrayList<Bridge> alBridges = null;
 
-    private static final Uri HS_CONTENT_URI = Uri.parse("content://org.torproject.android.mini.ui.hiddenservices.providers/hs");
-    private static final Uri COOKIE_CONTENT_URI = Uri.parse("content://org.torproject.android.mini.ui.hiddenservices.providers.cookie/cookie");
+    private static final Uri HS_CONTENT_URI = Uri.parse("content://org.torproject.android.ui.hiddenservices.providers/hs");
+    private static final Uri COOKIE_CONTENT_URI = Uri.parse("content://org.torproject.android.ui.hiddenservices.providers.cookie/cookie");
 
     private Handler mHandler;
 





More information about the tor-commits mailing list