April 2020 - tor-commits - lists.torproject.org

[orbot/master] update version to 16201001
by n8fr8＠torproject.org 28 Apr '20

28 Apr '20

commit 4f4300a40cae3f49c94d785986df9f4ac850979d Author: n8fr8 <nathan(a)guardianproject.info> Date: Tue Apr 28 17:03:53 2020 -0400 update version to 16201001 --- app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index 19fad531..7faf01e2 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -73,7 +73,7 @@ android { minSdkVersion 16 applicationId 'org.torproject.android' targetSdkVersion 29 - versionCode 16150001 + versionCode 16201001 versionName getVersionName() archivesBaseName = "Orbot-$versionName" }

1 0

[orbot/master] update paths for app-mini code
by n8fr8＠torproject.org 28 Apr '20

28 Apr '20

commit 08b670fabc73ae1d4686cc8b401cb9b3ca53bfdb Author: n8fr8 <nathan(a)guardianproject.info> Date: Fri Sep 6 15:19:06 2019 -0400 update paths for app-mini code --- app-mini/src/debug/AndroidManifest.xml | 2 +- app-mini/src/main/res/layout/activity_bridge_wizard.xml | 2 +- app-mini/src/main/res/layout/content_bridge_wizard.xml | 2 +- app-mini/src/main/res/layout/layout_activity_client_cookies.xml | 2 +- app-mini/src/main/res/layout/layout_add_client_cookie_dialog.xml | 4 ++-- app-mini/src/main/res/layout/layout_content_client_cookies.xml | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/app-mini/src/debug/AndroidManifest.xml b/app-mini/src/debug/AndroidManifest.xml index b3444211..b07d6957 100644 --- a/app-mini/src/debug/AndroidManifest.xml +++ b/app-mini/src/debug/AndroidManifest.xml @@ -128,7 +128,7 @@ <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 diff --git a/app-mini/src/main/res/layout/activity_bridge_wizard.xml b/app-mini/src/main/res/layout/activity_bridge_wizard.xml index cc23654c..7ff470c9 100644 --- a/app-mini/src/main/res/layout/activity_bridge_wizard.xml +++ b/app-mini/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-mini/src/main/res/layout/content_bridge_wizard.xml b/app-mini/src/main/res/layout/content_bridge_wizard.xml index 15387fff..a5b7995b 100644 --- a/app-mini/src/main/res/layout/content_bridge_wizard.xml +++ b/app-mini/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-mini/src/main/res/layout/layout_activity_client_cookies.xml b/app-mini/src/main/res/layout/layout_activity_client_cookies.xml index 5c5bf936..b8f0626e 100644 --- a/app-mini/src/main/res/layout/layout_activity_client_cookies.xml +++ b/app-mini/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-mini/src/main/res/layout/layout_add_client_cookie_dialog.xml b/app-mini/src/main/res/layout/layout_add_client_cookie_dialog.xml index f28a8282..2f4b9885 100644 --- a/app-mini/src/main/res/layout/layout_add_client_cookie_dialog.xml +++ b/app-mini/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-mini/src/main/res/layout/layout_content_client_cookies.xml b/app-mini/src/main/res/layout/layout_content_client_cookies.xml index 5295641c..2517d8e1 100644 --- a/app-mini/src/main/res/layout/layout_content_client_cookies.xml +++ b/app-mini/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

1 0

[orbot/master] improvements for bridge handling for #242
by n8fr8＠torproject.org 28 Apr '20

28 Apr '20

commit 97d2aac57c044213ddc6920f9ad97690ef3923b7 Author: n8fr8 <nathan(a)guardianproject.info> Date: Fri Sep 6 15:09:06 2019 -0400 improvements for bridge handling for #242 --- .../org/torproject/android/service/TorService.java | 24 ++++++++++++---------- 1 file changed, 13 insertions(+), 11 deletions(-) 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 3a1068e5..5d70fad3 100644 --- a/orbotservice/src/main/java/org/torproject/android/service/TorService.java +++ b/orbotservice/src/main/java/org/torproject/android/service/TorService.java @@ -741,8 +741,8 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon if (extraLines == null) return null; - String torrcCustom = new String(prefs.getString("pref_custom_torrc", "").getBytes("US-ASCII")); - extraLines.append(torrcCustom).append('\n'); + extraLines.append('\n'); + extraLines.append(prefs.getString("pref_custom_torrc", "")).append('\n'); logNotice("updating torrc custom configuration..."); @@ -1617,35 +1617,37 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon extraLines.append("UseBridges 1").append('\n'); // extraLines.append("UpdateBridgesFromAuthority 1").append('\n'); - - String bridgeList = new String(Prefs.getBridgesList().getBytes("ISO-8859-1")); - boolean obfsBridges = bridgeList.contains("obfs3") || bridgeList.contains("obfs4"); + String bridgeList = Prefs.getBridgesList(); + boolean obfs3Bridges = bridgeList.contains("obfs3"); + boolean obfs4Bridges = bridgeList.contains("obfs4"); boolean meekBridges = bridgeList.contains("meek"); //check if any PT bridges are needed - if (obfsBridges) { + if (obfs3Bridges) extraLines.append("ClientTransportPlugin obfs3 exec ") .append(fileObfsclient.getCanonicalPath()).append('\n'); + + if (obfs4Bridges) extraLines.append("ClientTransportPlugin obfs4 exec ") .append(fileObfsclient.getCanonicalPath()).append('\n'); - } - if (meekBridges) { + if (meekBridges) extraLines.append("ClientTransportPlugin meek_lite exec " + fileObfsclient.getCanonicalPath()).append('\n'); - } if (bridgeList != null && bridgeList.length() > 5) //longer then 1 = some real values here { - String[] bridgeListLines = bridgeList.split("\\r?\\n"); + String[] bridgeListLines = bridgeList.split("\\n"); for (String bridgeConfigLine : bridgeListLines) { if (!TextUtils.isEmpty(bridgeConfigLine)) { extraLines.append("Bridge "); + extraLines.append(bridgeConfigLine); + /** StringTokenizer st = new StringTokenizer(bridgeConfigLine, " "); while (st.hasMoreTokens()) extraLines.append(st.nextToken()).append(' '); - + **/ extraLines.append("\n"); }

1 0

[orbot/master] update badvpn tun2socks library
by n8fr8＠torproject.org 28 Apr '20

28 Apr '20

commit 0e40c074e14fda3e559e643f687ce9168082d91f Author: n8fr8 <nathan(a)guardianproject.info> Date: Fri Sep 6 14:25:37 2019 -0400 update badvpn tun2socks library --- external/badvpn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/external/badvpn b/external/badvpn index fbc279c3..6f80cc1b 160000 --- a/external/badvpn +++ b/external/badvpn @@ -1 +1 @@ -Subproject commit fbc279c3c6999f8357666f4b85969dfd29764465 +Subproject commit 6f80cc1beb9f93987159f669eae9c19c627b2794

1 0

[orbot/master] yet another attempt at fixing the phantom zulu locale bug!
by n8fr8＠torproject.org 28 Apr '20

28 Apr '20

commit 237b388d5ece2d1a85bd42e0423ecd929a236ff0 Author: n8fr8 <nathan(a)guardianproject.info> Date: Fri Sep 6 15:33:51 2019 -0400 yet another attempt at fixing the phantom zulu locale bug! --- app/src/main/java/org/torproject/android/OrbotApp.java | 14 ++------------ .../java/org/torproject/android/settings/Languages.java | 9 +++++---- 2 files changed, 7 insertions(+), 16 deletions(-) diff --git a/app/src/main/java/org/torproject/android/OrbotApp.java b/app/src/main/java/org/torproject/android/OrbotApp.java index e92083d3..dbd9d469 100644 --- a/app/src/main/java/org/torproject/android/OrbotApp.java +++ b/app/src/main/java/org/torproject/android/OrbotApp.java @@ -42,7 +42,7 @@ public class OrbotApp extends Application implements OrbotConstants { //check for updates via github, since it is unlikely to be blocked; notify the user of places where upgrades can be found new AppUpdater(this) .setUpdateFrom(UpdateFrom.JSON) - .setUpdateJSON("https://raw.githubusercontent.com/n8fr8/orbot/master/update.json") + .setUpdateJSON("https://raw.githubusercontent.com/guardianproject/orbot/master/update.json") .setDisplay(Display.NOTIFICATION).start(); } @@ -59,17 +59,7 @@ public class OrbotApp extends Application implements OrbotConstants { if (!Prefs.getDefaultLocale().equals(Locale.getDefault().getLanguage())) Languages.setLanguage(this, Prefs.getDefaultLocale(), true); } - /** - public static void forceChangeLanguage(Activity activity) { - Intent intent = activity.getIntent(); - if (intent == null) // when launched as LAUNCHER - intent = new Intent(activity, OrbotMainActivity.class); - intent.addFlags(Intent.FLAG_ACTIVITY_NO_ANIMATION); - activity.finish(); - activity.overridePendingTransition(0, 0); - activity.startActivity(intent); - activity.overridePendingTransition(0, 0); - }**/ + public static Languages getLanguages(Activity activity) { return Languages.get(activity); diff --git a/app/src/main/java/org/torproject/android/settings/Languages.java b/app/src/main/java/org/torproject/android/settings/Languages.java index 05ae96ce..1032d499 100644 --- a/app/src/main/java/org/torproject/android/settings/Languages.java +++ b/app/src/main/java/org/torproject/android/settings/Languages.java @@ -21,7 +21,7 @@ import java.util.TreeMap; public class Languages { public static final String TAG = "Languages"; - public static final Locale defaultLocale; + public static Locale defaultLocale; public static final Locale TIBETAN = new Locale("bo"); static final Locale localesToTest[] = { Locale.ENGLISH, Locale.FRENCH, Locale.GERMAN, @@ -61,11 +61,10 @@ public class Languages { private static Map<String, String> tmpMap = new TreeMap<String, String>(); private static Map<String, String> nameMap; - static { - defaultLocale = Locale.getDefault(); - } private Languages(Activity activity) { + + AssetManager assets = activity.getAssets(); Configuration config = activity.getResources().getConfiguration(); // Resources() requires DisplayMetrics, but they are only needed for drawables @@ -119,6 +118,8 @@ public class Languages { * @return */ public static void setup(Class<?> clazz, int resId) { + defaultLocale = Locale.getDefault(); + if (Languages.clazz == null) { Languages.clazz = clazz; Languages.resId = resId;

1 0

[orbot/master] remove unused layouts for app-mini
by n8fr8＠torproject.org 28 Apr '20

28 Apr '20

commit 918bcca9eecc05690b567c0ec4f6687f184932be Author: n8fr8 <nathan(a)guardianproject.info> Date: Fri Sep 6 15:19:46 2019 -0400 remove unused layouts for app-mini --- .../src/main/res/layout/activity_bridge_wizard.xml | 27 --------- .../src/main/res/layout/content_bridge_wizard.xml | 66 ---------------------- .../res/layout/layout_activity_client_cookies.xml | 35 ------------ .../res/layout/layout_add_client_cookie_dialog.xml | 62 -------------------- .../res/layout/layout_client_cookie_list_item.xml | 24 -------- .../res/layout/layout_content_client_cookies.xml | 20 ------- .../src/main/res/layout/layout_cookie_actions.xml | 24 -------- 7 files changed, 258 deletions(-) diff --git a/app-mini/src/main/res/layout/activity_bridge_wizard.xml b/app-mini/src/main/res/layout/activity_bridge_wizard.xml deleted file mode 100644 index 7ff470c9..00000000 --- a/app-mini/src/main/res/layout/activity_bridge_wizard.xml +++ /dev/null @@ -1,27 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:app="http://schemas.android.com/apk/res-auto" - xmlns:tools="http://schemas.android.com/tools" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:background="@color/dark_purple" - - tools:context="org.torproject.android.ui.onboarding.BridgeWizardActivity"> - - <android.support.design.widget.AppBarLayout - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:theme="@style/DefaultTheme.AppBarOverlay"> - - <android.support.v7.widget.Toolbar - android:id="@+id/toolbar" - android:layout_width="match_parent" - android:layout_height="?attr/actionBarSize" - android:background="?attr/colorPrimary" - app:popupTheme="@style/DefaultTheme.PopupOverlay" /> - - </android.support.design.widget.AppBarLayout> - - <include layout="@layout/content_bridge_wizard" /> - -</android.support.design.widget.CoordinatorLayout> diff --git a/app-mini/src/main/res/layout/content_bridge_wizard.xml b/app-mini/src/main/res/layout/content_bridge_wizard.xml deleted file mode 100644 index a5b7995b..00000000 --- a/app-mini/src/main/res/layout/content_bridge_wizard.xml +++ /dev/null @@ -1,66 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:app="http://schemas.android.com/apk/res-auto" - xmlns:tools="http://schemas.android.com/tools" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:orientation="vertical" - app:layout_behavior="@string/appbar_scrolling_view_behavior" - tools:context="org.torproject.android.ui.onboarding.BridgeWizardActivity" - tools:showIn="@layout/activity_bridge_wizard"> - - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_margin="12dp" - - android:text="@string/if_your_mobile_network_actively_blocks_tor_you_can_use_a_tor_bridge_to_access_the_network_another_way_to_get_bridges_is_to_send_an_email_to_bridges_torproject_org_please_note_that_you_must_send_the_email_using_an_address_from_one_of_the_following_email_providers_riseup_gmail_or_yahoo_" - android:textColor="@color/panel_background_main" - android:textSize="16sp" - android:textStyle="bold" /> - - <RadioGroup xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:orientation="vertical"> - - <RadioButton - android:id="@+id/btnBridgesDirect" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_margin="12dp" - android:text="@string/bridge_direct_connect" /> - - <RadioButton - android:id="@+id/btnBridgesObfs4" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_margin="12dp" - android:text="@string/bridge_community" /> - - <RadioButton - android:id="@+id/btnBridgesMeek" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_margin="12dp" - android:text="@string/bridge_cloud" /> - - <RadioButton - android:id="@+id/btnBridgesNew" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_margin="12dp" - android:text="@string/bridges_get_new" /> - - </RadioGroup> - - <TextView - android:id="@+id/lbl_bridge_test_status" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_margin="12dp" - android:gravity="center" - android:textColor="@color/bright_green" - android:textSize="16sp" - android:textStyle="bold" /> -</LinearLayout> diff --git a/app-mini/src/main/res/layout/layout_activity_client_cookies.xml b/app-mini/src/main/res/layout/layout_activity_client_cookies.xml deleted file mode 100644 index b8f0626e..00000000 --- a/app-mini/src/main/res/layout/layout_activity_client_cookies.xml +++ /dev/null @@ -1,35 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:app="http://schemas.android.com/apk/res-auto" - xmlns:tools="http://schemas.android.com/tools" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:fitsSystemWindows="true" - tools:context="org.torproject.android.ui.hiddenservices.ClientCookiesActivity"> - - <android.support.design.widget.AppBarLayout - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:theme="@style/DefaultTheme.AppBarOverlay"> - - <android.support.v7.widget.Toolbar - android:id="@+id/toolbar" - android:layout_width="match_parent" - android:layout_height="?attr/actionBarSize" - android:background="?attr/colorPrimary" - app:popupTheme="@style/DefaultTheme.PopupOverlay" /> - - </android.support.design.widget.AppBarLayout> - - <include layout="@layout/layout_content_client_cookies" /> - - <android.support.design.widget.FloatingActionButton - android:id="@+id/fab" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="bottom|end" - android:layout_margin="@dimen/fab_margin" - app:srcCompat="@android:drawable/stat_notify_more" - app:backgroundTint="@android:color/darker_gray" /> - -</android.support.design.widget.CoordinatorLayout> diff --git a/app-mini/src/main/res/layout/layout_add_client_cookie_dialog.xml b/app-mini/src/main/res/layout/layout_add_client_cookie_dialog.xml deleted file mode 100644 index 2f4b9885..00000000 --- a/app-mini/src/main/res/layout/layout_add_client_cookie_dialog.xml +++ /dev/null @@ -1,62 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:orientation="vertical" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:paddingLeft="5dp" - android:paddingRight="5dp" - android:paddingTop="5dp" - android:paddingBottom="5dp"> - - <TextView - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:text="@string/onion" - android:textAppearance="@style/TextAppearance.AppCompat.Widget.PopupMenu.Small" - android:paddingLeft="5dp" /> - - <org.torproject.android.ui.NoPersonalizedLearningEditText - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:inputType="text" - android:ems="10" - android:id="@+id/cookie_onion" /> - - <TextView - android:text="@string/auth_cookie" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:textAppearance="@style/TextAppearance.AppCompat.Widget.PopupMenu.Small" - android:paddingLeft="5dp" /> - - <org.torproject.android.ui.NoPersonalizedLearningEditText - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:ems="10" - android:id="@+id/cookie_value" - android:inputType="text" /> - - <LinearLayout - android:orientation="horizontal" - android:layout_width="match_parent" - android:layout_height="match_parent"> - - <Button - android:text="@string/btn_cancel" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:id="@+id/cookie_dialog_cancel" - android:layout_weight="1" - style="@style/Widget.AppCompat.Button.Borderless.Colored" /> - - <Button - android:text="@string/save" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:id="@+id/cookie_dialog_save" - android:layout_weight="1" - style="@style/Widget.AppCompat.Button.Borderless.Colored" /> - - </LinearLayout> - -</LinearLayout> \ No newline at end of file diff --git a/app-mini/src/main/res/layout/layout_client_cookie_list_item.xml b/app-mini/src/main/res/layout/layout_client_cookie_list_item.xml deleted file mode 100644 index 80eefb94..00000000 --- a/app-mini/src/main/res/layout/layout_client_cookie_list_item.xml +++ /dev/null @@ -1,24 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:tools="http://schemas.android.com/tools" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:orientation="horizontal" - android:padding="15dp"> - - <TextView - android:id="@+id/cookie_onion" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:textSize="18sp" - android:layout_weight="1" /> - - <Switch - android:id="@+id/cookie_switch" - android:layout_width="wrap_content" - android:layout_height="match_parent" - android:focusable="false" - android:focusableInTouchMode="false" - android:switchPadding="30dp" /> - -</LinearLayout> \ No newline at end of file diff --git a/app-mini/src/main/res/layout/layout_content_client_cookies.xml b/app-mini/src/main/res/layout/layout_content_client_cookies.xml deleted file mode 100644 index 2517d8e1..00000000 --- a/app-mini/src/main/res/layout/layout_content_client_cookies.xml +++ /dev/null @@ -1,20 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:app="http://schemas.android.com/apk/res-auto" - xmlns:tools="http://schemas.android.com/tools" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:paddingBottom="@dimen/activity_vertical_margin" - android:paddingLeft="@dimen/activity_horizontal_margin" - 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.ui.hiddenservices.ClientCookiesActivity" - tools:showIn="@layout/layout_activity_client_cookies"> - - <ListView - android:id="@+id/clien_cookies_list" - android:layout_width="match_parent" - android:layout_height="match_parent" /> - -</RelativeLayout> diff --git a/app-mini/src/main/res/layout/layout_cookie_actions.xml b/app-mini/src/main/res/layout/layout_cookie_actions.xml deleted file mode 100644 index 64d8c1c6..00000000 --- a/app-mini/src/main/res/layout/layout_cookie_actions.xml +++ /dev/null @@ -1,24 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:orientation="vertical" android:layout_width="match_parent" - android:layout_height="match_parent"> - - <Button - android:text="@string/backup_cookie" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:id="@+id/btn_cookie_backup" /> - - <Button - android:text="@string/delete_cookie" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:id="@+id/btn_cookie_delete" /> - - <Button - android:text="@string/btn_cancel" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:id="@+id/btn_cookie_cancel" /> - -</LinearLayout> \ No newline at end of file

1 0

[orbot/master] putting classes back into main app package, and not "mini"
by n8fr8＠torproject.org 28 Apr '20

28 Apr '20

commit cefac58870c91015aa2c567b6ece2f6b48f63b01 Author: n8fr8 <nathan(a)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;

1 0

[orbot/master] remove fileprovider from app-mini since it is used just for HS
by n8fr8＠torproject.org 28 Apr '20

28 Apr '20

commit 034844a4c2ba10bf85aebba8d6054ddcaa176dcb Author: n8fr8 <nathan(a)guardianproject.info> Date: Fri Sep 6 14:15:45 2019 -0400 remove fileprovider from app-mini since it is used just for HS --- app-mini/src/main/AndroidManifest.xml | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/app-mini/src/main/AndroidManifest.xml b/app-mini/src/main/AndroidManifest.xml index 23db19d7..aa31bff4 100644 --- a/app-mini/src/main/AndroidManifest.xml +++ b/app-mini/src/main/AndroidManifest.xml @@ -65,22 +65,6 @@ <activity android:name=".ui.onboarding.OnboardingActivity" /> <activity android:name=".ui.onboarding.BridgeWizardActivity" /> - <provider - android:name="android.support.v4.content.FileProvider" - android:authorities="org.torproject.android.mini.ui.hiddenservices.storage" - android:exported="false" - android:grantUriPermissions="true"> - <meta-data - android:name="android.support.FILE_PROVIDER_PATHS" - android:resource="@xml/hidden_services_paths" /> - </provider> - <receiver - android:name="org.torproject.android.service.StartTorReceiver" - android:exported="true"> - <intent-filter> - <action android:name="org.torproject.android.intent.action.START" /> - </intent-filter> - </receiver> <receiver android:name=".OnBootReceiver"

1 0

[orbot/master] remove output from repo
by n8fr8＠torproject.org 28 Apr '20

28 Apr '20

commit d0640c67c5fde6631682831a29d725e3ddc77340 Author: n8fr8 <nathan(a)guardianproject.info> Date: Thu Sep 5 12:03:35 2019 -0400 remove output from repo --- app-mini/mini/release/output.json | 1 - 1 file changed, 1 deletion(-) diff --git a/app-mini/mini/release/output.json b/app-mini/mini/release/output.json deleted file mode 100644 index 50073a2c..00000000 --- a/app-mini/mini/release/output.json +++ /dev/null @@ -1 +0,0 @@ -[{"outputType":{"type":"APK"},"apkData":{"type":"FULL_SPLIT","splits":[{"filterType":"ABI","value":"arm64-v8a"}],"versionCode":210010000,"versionName":"1.0.0-BETA-1-tor-0.4.0.4-rc","enabled":true,"filterName":"arm64-v8a","outputFile":"Orbot-mini-1.0.0-BETA-1-tor-0.4.0.4-rc-mini-arm64-v8a-release.apk","fullName":"miniArm64-v8aRelease","baseName":"mini-arm64-v8a-release"},"path":"Orbot-mini-1.0.0-BETA-1-tor-0.4.0.4-rc-mini-arm64-v8a-release.apk","properties":{}},{"outputType":{"type":"APK"},"apkData":{"type":"FULL_SPLIT","splits":[{"filterType":"ABI","value":"x86"}],"versionCode":410010000,"versionName":"1.0.0-BETA-1-tor-0.4.0.4-rc","enabled":true,"filterName":"x86","outputFile":"Orbot-mini-1.0.0-BETA-1-tor-0.4.0.4-rc-mini-x86-release.apk","fullName":"miniX86Release","baseName":"mini-x86-release"},"path":"Orbot-mini-1.0.0-BETA-1-tor-0.4.0.4-rc-mini-x86-release.apk","properties":{}},{"outputType":{"type":"APK"},"apkData":{"type":"FULL_SPLIT","splits":[{"filterType":"ABI","value":"armea bi-v7a"}],"versionCode":110010000,"versionName":"1.0.0-BETA-1-tor-0.4.0.4-rc","enabled":true,"filterName":"armeabi-v7a","outputFile":"Orbot-mini-1.0.0-BETA-1-tor-0.4.0.4-rc-mini-armeabi-v7a-release.apk","fullName":"miniArmeabi-v7aRelease","baseName":"mini-armeabi-v7a-release"},"path":"Orbot-mini-1.0.0-BETA-1-tor-0.4.0.4-rc-mini-armeabi-v7a-release.apk","properties":{}},{"outputType":{"type":"APK"},"apkData":{"type":"FULL_SPLIT","splits":[{"filterType":"ABI","value":"x86_64"}],"versionCode":510010000,"versionName":"1.0.0-BETA-1-tor-0.4.0.4-rc","enabled":true,"filterName":"x86_64","outputFile":"Orbot-mini-1.0.0-BETA-1-tor-0.4.0.4-rc-mini-x86_64-release.apk","fullName":"miniX86_64Release","baseName":"mini-x86_64-release"},"path":"Orbot-mini-1.0.0-BETA-1-tor-0.4.0.4-rc-mini-x86_64-release.apk","properties":{}}] \ No newline at end of file

1 0

[orbot/master] only build Orbot/app not app-mini
by n8fr8＠torproject.org 28 Apr '20

28 Apr '20

commit 10e6a421664f68d7d63e9e6c6b94b5fd47b04a46 Author: n8fr8 <nathan(a)guardianproject.info> Date: Tue Sep 10 09:20:25 2019 -0400 only build Orbot/app not app-mini --- fastlane/Fastfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fastlane/Fastfile b/fastlane/Fastfile index 13e8450f..58efe274 100644 --- a/fastlane/Fastfile +++ b/fastlane/Fastfile @@ -38,12 +38,12 @@ platform :android do end desc "Build a release APK" lane :release do - gradle(task: "clean assemble") + gradle(task: "clean assembleFullperm") end lane :beta do # Adjust the `build_type` and `flavor` params as needed to build the right APK for your setup gradle( - task: 'clean assemble', + task: 'clean assembleFullperm', build_type: 'Release' ) upload_to_play_store(track: 'beta')

1 0