July 2019 - tor-commits - lists.torproject.org

[orbot/master] Merge branch 'master' of github.com:n8fr8/orbot
by n8fr8＠torproject.org 05 Jul '19

05 Jul '19

commit 510118ebce0ebf3aa07a3c83027780791302f422 Merge: f58ef4c0 53940073 Author: n8fr8 <nathan(a)guardianproject.info> Date: Fri Jun 7 15:20:45 2019 -0400 Merge branch 'master' of github.com:n8fr8/orbot app/src/main/res/values/strings.xml | 8 +- app/src/main/res/xml-fa/preferences.xml | 230 --------------------------- orbotservice/src/main/res/values/pdnsd.xml | 2 +- orbotservice/src/main/res/values/strings.xml | 2 +- 4 files changed, 6 insertions(+), 236 deletions(-)

1 0

[orbot/master] Merge pull request #225 from bitmold/missing_hidden_service_str
by n8fr8＠torproject.org 05 Jul '19

05 Jul '19

commit 0361fb9a0f0aa5c676ef981b9bb7785726735bae Merge: 53940073 768bbf94 Author: Nathan Freitas <nathan(a)guardianproject.info> Date: Fri Jun 14 23:03:53 2019 -0400 Merge pull request #225 from bitmold/missing_hidden_service_str String resource missed from #222 app/src/main/res/values/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[orbot/master] Merge pull request #226 from bitmold/removed_unused_eclipes_prefs_folder
by n8fr8＠torproject.org 05 Jul '19

05 Jul '19

commit 811c09aaf20f592bc7e512d0013a165d502e7f67 Merge: 0361fb9a f0103bf4 Author: Nathan Freitas <nathan(a)guardianproject.info> Date: Fri Jun 14 23:04:09 2019 -0400 Merge pull request #226 from bitmold/removed_unused_eclipes_prefs_folder Removed unused Eclipse IDE ./settings/ directory .settings/.jsdtscope | 11 ----------- .settings/org.eclipse.wst.jsdt.ui.superType.container | 1 - .settings/org.eclipse.wst.jsdt.ui.superType.name | 1 - 3 files changed, 13 deletions(-)

1 0

[orbot/master] update to 16.1.0-BETA-5-tor-0.4.0.4-rc
by n8fr8＠torproject.org 05 Jul '19

05 Jul '19

commit 656d39b7072bb0fa4a5d11f553e58a895b2cb7d8 Author: n8fr8 <nathan(a)guardianproject.info> Date: Tue Jun 18 14:50:19 2019 -0400 update to 16.1.0-BETA-5-tor-0.4.0.4-rc --- app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index bd03c4f6..fb1e4572 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -34,8 +34,8 @@ android { minSdkVersion 16 applicationId 'org.torproject.android' targetSdkVersion 28 - versionCode 16104000 - versionName '16.1.0-BETA-4-tor-0.4.0.4-rc' + versionCode 16105000 + versionName '16.1.0-BETA-5-tor-0.4.0.4-rc' archivesBaseName = "Orbot-$versionName" } }

1 0

[orbot/master] small change to attempt to address localization glitches
by n8fr8＠torproject.org 05 Jul '19

05 Jul '19

commit 144a4ed5eb30e2772a06932c5582fb48eb42a02d Author: n8fr8 <nathan(a)guardianproject.info> Date: Tue Jun 18 14:48:07 2019 -0400 small change to attempt to address localization glitches --- app/src/main/java/org/torproject/android/OrbotApp.java | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/app/src/main/java/org/torproject/android/OrbotApp.java b/app/src/main/java/org/torproject/android/OrbotApp.java index 0aeb59ed..e92083d3 100644 --- a/app/src/main/java/org/torproject/android/OrbotApp.java +++ b/app/src/main/java/org/torproject/android/OrbotApp.java @@ -33,12 +33,11 @@ public class OrbotApp extends Application implements OrbotConstants { @Override public void onCreate() { super.onCreate(); - - Languages.setup(OrbotMainActivity.class, R.string.menu_settings); - Languages.setLanguage(this, Prefs.getDefaultLocale(), true); - //Language.setFromPreference(this, "pref_default_locale"); + if (!Prefs.getDefaultLocale().equals(Locale.getDefault().getLanguage())) { + Languages.setLanguage(this, Prefs.getDefaultLocale(), true); + } //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) @@ -50,16 +49,15 @@ public class OrbotApp extends Application implements OrbotConstants { @Override protected void attachBaseContext(Context base) { Prefs.setContext(base); - super.attachBaseContext(LocaleHelper.onAttach(base, "en")); + super.attachBaseContext(LocaleHelper.onAttach(base, Prefs.getDefaultLocale())); } @Override public void onConfigurationChanged(Configuration newConfig) { super.onConfigurationChanged(newConfig); - // Language.setFromPreference(this, "pref_default_locale"); - //Log.i(TAG, "onConfigurationChanged " + newConfig.locale.getLanguage()); - Languages.setLanguage(this, Prefs.getDefaultLocale(), true); + if (!Prefs.getDefaultLocale().equals(Locale.getDefault().getLanguage())) + Languages.setLanguage(this, Prefs.getDefaultLocale(), true); } /** public static void forceChangeLanguage(Activity activity) {

1 0

[orbot/master] Merge branch 'master' of github.com:n8fr8/orbot
by n8fr8＠torproject.org 05 Jul '19

05 Jul '19

commit c4062678c3bcd2f5835a087405a52c83beafcd00 Merge: ecdff5ce 811c09aa Author: n8fr8 <nathan(a)guardianproject.info> Date: Fri Jun 14 23:07:50 2019 -0400 Merge branch 'master' of github.com:n8fr8/orbot .settings/.jsdtscope | 11 ----------- .settings/org.eclipse.wst.jsdt.ui.superType.container | 1 - .settings/org.eclipse.wst.jsdt.ui.superType.name | 1 - app/src/main/res/values/strings.xml | 2 +- 4 files changed, 1 insertion(+), 14 deletions(-)

1 0

[orbot/master] ensure we are putting the right value in
by n8fr8＠torproject.org 05 Jul '19

05 Jul '19

commit 827b905ee66436662790d1137210856eba4833f5 Author: n8fr8 <nathan(a)guardianproject.info> Date: Tue Jun 18 14:48:45 2019 -0400 ensure we are putting the right value in --- app/src/main/java/org/torproject/android/settings/Languages.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) 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 58566f12..05ae96ce 100644 --- a/app/src/main/java/org/torproject/android/settings/Languages.java +++ b/app/src/main/java/org/torproject/android/settings/Languages.java @@ -80,16 +80,17 @@ public class Languages { || locale.equals(Locale.ENGLISH)) localeSet.add(locale); } + for (Locale locale : localeSet) { if (locale.equals(TIBETAN)) { // include English name for devices without Tibetan font support - tmpMap.put(TIBETAN.getLanguage(), "Tibetan བོད་སྐད།"); // Tibetan + tmpMap.put(TIBETAN.toString(), "Tibetan བོད་སྐད།"); // Tibetan } else if (locale.equals(Locale.SIMPLIFIED_CHINESE)) { tmpMap.put(Locale.SIMPLIFIED_CHINESE.toString(), "中文 (中国)"); // Chinese (China) } else if (locale.equals(Locale.TRADITIONAL_CHINESE)) { tmpMap.put(Locale.TRADITIONAL_CHINESE.toString(), "中文 (台灣)"); // Chinese (Taiwan) } else { - tmpMap.put(locale.getLanguage(), locale.getDisplayLanguage(locale)); + tmpMap.put(locale.toString(), locale.getDisplayLanguage(locale)); } }

1 0

[orbot/master] Merge pull request #233 from bitmold/no_vpn_refresh_btn
by n8fr8＠torproject.org 05 Jul '19

05 Jul '19

commit b0cf7424133dc9f0e35a1376f52bc1586fa3ccf6 Merge: e448c18b cde49d1a Author: Nathan Freitas <nathan(a)guardianproject.info> Date: Fri Jul 5 07:24:50 2019 -0400 Merge pull request #233 from bitmold/no_vpn_refresh_btn Removes the refresh button on the VPN Selection screen .../torproject/android/ui/AppManagerActivity.java | 87 +++------------------ .../main/res/drawable/ic_autorenew_black_36dp.png | Bin 546 -> 0 bytes app/src/main/res/menu/orbot_apps.xml | 30 ------- 3 files changed, 13 insertions(+), 104 deletions(-)

1 0

[orbot/master] Merge branch 'sisbell_237' of https://github.com/sisbell/orbot into sisbell-sisbell_237
by n8fr8＠torproject.org 05 Jul '19

05 Jul '19

commit 45369a2adba0e0b2d15b5a8ee73a8e99a6cf575e Merge: 4a79476e 8c232f73 Author: n8fr8 <nathan(a)guardianproject.info> Date: Fri Jul 5 07:26:35 2019 -0400 Merge branch 'sisbell_237' of https://github.com/sisbell/orbot into sisbell-sisbell_237 build.gradle | 2 +- gradle.properties | 3 +-- gradle/wrapper/gradle-wrapper.properties | 2 +- orbotservice/build.gradle | 5 +++++ 4 files changed, 8 insertions(+), 4 deletions(-)

1 0

[orbot/master] Removes the refresh button on the VPN Selection screen
by n8fr8＠torproject.org 05 Jul '19

05 Jul '19

commit cde49d1a715f6afca07d234eaea3637e0aacd0af Author: bim <dsnake(a)protonmail.com> Date: Wed Jun 26 22:30:51 2019 -0400 Removes the refresh button on the VPN Selection screen Since this operaiton happens onResume() in the activity, there's not really any need for the user to invoke it and from a user's perspective it isnt entirely clear what it does. Additionally, this commit removes unused code and addresses IDE warnings in AppManagerActivity --- .../torproject/android/ui/AppManagerActivity.java | 87 +++------------------ .../main/res/drawable/ic_autorenew_black_36dp.png | Bin 546 -> 0 bytes app/src/main/res/menu/orbot_apps.xml | 30 ------- 3 files changed, 13 insertions(+), 104 deletions(-) diff --git a/app/src/main/java/org/torproject/android/ui/AppManagerActivity.java b/app/src/main/java/org/torproject/android/ui/AppManagerActivity.java index 2f60a40c..071788fc 100644 --- a/app/src/main/java/org/torproject/android/ui/AppManagerActivity.java +++ b/app/src/main/java/org/torproject/android/ui/AppManagerActivity.java @@ -16,20 +16,16 @@ import org.torproject.android.R; import org.torproject.android.service.util.TorServiceUtils; import org.torproject.android.service.vpn.TorifiedApp; -import android.content.Context; import android.content.Intent; import android.content.SharedPreferences; import android.content.SharedPreferences.Editor; import android.content.pm.ApplicationInfo; import android.content.pm.PackageInfo; import android.content.pm.PackageManager; -import android.graphics.Color; import android.os.AsyncTask; import android.os.Bundle; import android.support.v7.app.AppCompatActivity; import android.view.LayoutInflater; -import android.view.Menu; -import android.view.MenuInflater; import android.view.MenuItem; import android.view.View; import android.view.View.OnClickListener; @@ -47,7 +43,6 @@ public class AppManagerActivity extends AppCompatActivity implements OnClickList private GridView listApps; private ListAdapter adapterApps; private ProgressBar progressBar; - private final static String TAG = "Orbot"; PackageManager pMgr = null; protected void onCreate(Bundle savedInstanceState) { @@ -62,34 +57,12 @@ public class AppManagerActivity extends AppCompatActivity implements OnClickList progressBar = findViewById(R.id.progressBar); } - /* - * Create the UI Options Menu (non-Javadoc) - * @see android.app.Activity#onCreateOptionsMenu(android.view.Menu) - */ - @Override - public boolean onCreateOptionsMenu(Menu menu) { - super.onCreateOptionsMenu(menu); - MenuInflater inflater = getMenuInflater(); - inflater.inflate(R.menu.orbot_apps, menu); - - return true; - } - - @Override public boolean onOptionsItemSelected(MenuItem item) { - if (item.getItemId() == android.R.id.home) - { + if (item.getItemId() == android.R.id.home) { finish(); return true; } - else if (item.getItemId() == R.id.menu_apps_refresh) - { - mApps = null; - reloadApps(); - return true; - } - return super.onOptionsItemSelected(item); } @@ -122,11 +95,9 @@ public class AppManagerActivity extends AppCompatActivity implements OnClickList SharedPreferences mPrefs = null; ArrayList<TorifiedApp> mApps = null; - private void loadApps (SharedPreferences prefs) - { - + private void loadApps (SharedPreferences prefs) { if (mApps == null) - mApps = getApps(getApplicationContext(), prefs); + mApps = getApps(prefs); Collections.sort(mApps,new Comparator<TorifiedApp>() { public int compare(TorifiedApp o1, TorifiedApp o2) { @@ -145,6 +116,7 @@ public class AppManagerActivity extends AppCompatActivity implements OnClickList adapterApps = new ArrayAdapter<TorifiedApp>(this, R.layout.layout_apps_item, R.id.itemtext,mApps) { + @Override public View getView(int position, View convertView, ViewGroup parent) { ListEntry entry = null; @@ -157,9 +129,9 @@ public class AppManagerActivity extends AppCompatActivity implements OnClickList if (entry == null) { // Inflate a new view entry = new ListEntry(); - entry.icon = (ImageView) convertView.findViewById(R.id.itemicon); - entry.box = (CheckBox) convertView.findViewById(R.id.itemcheck); - entry.text = (TextView) convertView.findViewById(R.id.itemtext); + entry.icon = convertView.findViewById(R.id.itemicon); + entry.box = convertView.findViewById(R.id.itemcheck); + entry.text = convertView.findViewById(R.id.itemtext); convertView.setTag(entry); } @@ -203,18 +175,7 @@ public class AppManagerActivity extends AppCompatActivity implements OnClickList private ImageView icon; } - /* (non-Javadoc) - * @see android.app.Activity#onStop() - */ - @Override - protected void onStop() { - super.onStop(); - - } - - - public ArrayList<TorifiedApp> getApps (Context context, SharedPreferences prefs) - { + public ArrayList<TorifiedApp> getApps(SharedPreferences prefs) { String tordAppString = prefs.getString(PREFS_KEY_TORIFIED, ""); String[] tordApps; @@ -232,11 +193,11 @@ public class AppManagerActivity extends AppCompatActivity implements OnClickList Iterator<ApplicationInfo> itAppInfo = lAppInfo.iterator(); - ArrayList<TorifiedApp> apps = new ArrayList<TorifiedApp>(); + ArrayList<TorifiedApp> apps = new ArrayList<>(); - ApplicationInfo aInfo = null; + ApplicationInfo aInfo; - TorifiedApp app = null; + TorifiedApp app; while (itAppInfo.hasNext()) { @@ -316,8 +277,7 @@ public class AppManagerActivity extends AppCompatActivity implements OnClickList } - public void saveAppSettings (Context context) - { + public void saveAppSettings() { StringBuilder tordApps = new StringBuilder(); Intent response = new Intent(); @@ -340,23 +300,6 @@ public class AppManagerActivity extends AppCompatActivity implements OnClickList } - /** - * Called an application is check/unchecked - */ - /** - public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) { - final TorifiedApp app = (TorifiedApp) buttonView.getTag(); - if (app != null) { - app.setTorified(isChecked); - } - - saveAppSettings(this); - - }**/ - - - - public void onClick(View v) { CheckBox cbox = null; @@ -373,11 +316,7 @@ public class AppManagerActivity extends AppCompatActivity implements OnClickList cbox.setChecked(app.isTorified()); } - saveAppSettings(this); + saveAppSettings(); } } - - - - } diff --git a/app/src/main/res/drawable/ic_autorenew_black_36dp.png b/app/src/main/res/drawable/ic_autorenew_black_36dp.png deleted file mode 100644 index 6ae7ac8a..00000000 Binary files a/app/src/main/res/drawable/ic_autorenew_black_36dp.png and /dev/null differ diff --git a/app/src/main/res/menu/orbot_apps.xml b/app/src/main/res/menu/orbot_apps.xml deleted file mode 100644 index 12bcbc3c..00000000 --- a/app/src/main/res/menu/orbot_apps.xml +++ /dev/null @@ -1,30 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> - -<menu xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:yourapp="http://schemas.android.com/apk/res-auto" - > - - <item android:id="@+id/menu_apps_refresh" - android:title="" - android:icon="@drawable/ic_autorenew_black_36dp" - yourapp:showAsAction="always" - /> - -</menu>

1 0