- tor-commits - lists.torproject.org

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

28 Apr '20

commit d5bc3740447b11a4a50863e783be5f0c2c7495a7 Author: n8fr8 <nathan(a)guardianproject.info> Date: Mon Apr 27 17:45:12 2020 -0400 update to SDK 29 --- app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index f104d651..5b08fd0c 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -72,7 +72,7 @@ android { dimension "free" minSdkVersion 16 applicationId 'org.torproject.android' - targetSdkVersion 28 + targetSdkVersion 29 versionCode 16142100 versionName getVersionName() archivesBaseName = "Orbot-$versionName"

1 0

[orbot/master] improve pdnsd pid checking
by n8fr8＠torproject.org 28 Apr '20

28 Apr '20

commit 919c21115099b53803b867d040b6d755a8209a37 Author: n8fr8 <nathan(a)guardianproject.info> Date: Mon Apr 27 17:35:32 2020 -0400 improve pdnsd pid checking --- .../android/service/vpn/OrbotVpnManager.java | 42 ++++------------------ 1 file changed, 7 insertions(+), 35 deletions(-) diff --git a/orbotservice/src/main/java/org/torproject/android/service/vpn/OrbotVpnManager.java b/orbotservice/src/main/java/org/torproject/android/service/vpn/OrbotVpnManager.java index 14ecc20d..49fb5f33 100644 --- a/orbotservice/src/main/java/org/torproject/android/service/vpn/OrbotVpnManager.java +++ b/orbotservice/src/main/java/org/torproject/android/service/vpn/OrbotVpnManager.java @@ -448,44 +448,16 @@ public class OrbotVpnManager implements Handler.Callback { { File filePdnsPid = new File(mService.getFilesDir(),"pdnsd.pid"); - List<String> lines = null; - try { - lines = IOUtils.readLines(new FileReader(filePdnsPid)); - String dnsPid = lines.get(0); - killProcess(dnsPid,""); - } catch (Exception e) { - Log.e("OrbotVPN","error killing dns process",e); - } - - - /** - // if that fails, try again using native utils - try { - killProcess(filePdnsd, "-1"); // this is -HUP - } catch (Exception e) { - e.printStackTrace(); - } - - File filePid = new File(mService.getFilesDir(),"pdnsd.pid"); - String pid = null; - - if (filePid.exists()) - { - + if (filePdnsPid.exists()) { + List<String> lines = null; try { - BufferedReader reader = new BufferedReader(new FileReader(filePid)); - String line = reader.readLine(); - if (line != null) { - pid = line.trim(); - VpnUtils.killProcess(pid, "-9"); - filePid.delete(); - return true; - } + lines = IOUtils.readLines(new FileReader(filePdnsPid)); + String dnsPid = lines.get(0); + killProcess(dnsPid, ""); } catch (Exception e) { - Log.e(TAG,"error killing DNS Process: " + pid,e); + Log.e("OrbotVPN", "error killing dns process", e); } - }**/ - + } return false;

1 0

[orbot/master] Fixes #321 IlleglaStateException on about dialog
by n8fr8＠torproject.org 28 Apr '20

28 Apr '20

commit b24750e786a510b0ccb954f581704220a5202a69 Author: bim <dsnake(a)protonmail.com> Date: Sat Apr 25 17:35:55 2020 -0400 Fixes #321 IlleglaStateException on about dialog --- .../org/torproject/android/OrbotMainActivity.java | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/app/src/main/java/org/torproject/android/OrbotMainActivity.java b/app/src/main/java/org/torproject/android/OrbotMainActivity.java index d21e1d05..ede16bad 100644 --- a/app/src/main/java/org/torproject/android/OrbotMainActivity.java +++ b/app/src/main/java/org/torproject/android/OrbotMainActivity.java @@ -26,13 +26,11 @@ import android.os.Message; import android.text.Html; import android.text.TextUtils; import android.util.Log; -import android.view.LayoutInflater; import android.view.Menu; import android.view.MenuInflater; import android.view.MenuItem; import android.view.View; import android.view.View.OnLongClickListener; -import android.view.ViewGroup; import android.view.animation.AccelerateInterpolator; import android.widget.AdapterView; import android.widget.AdapterView.OnItemSelectedListener; @@ -456,7 +454,6 @@ public class OrbotMainActivity extends AppCompatActivity @Override public boolean onOptionsItemSelected(MenuItem item) { - if (item.getItemId() == R.id.menu_newnym) { requestNewTorIdentity(); } else if (item.getItemId() == R.id.menu_settings) { @@ -469,7 +466,6 @@ public class OrbotMainActivity extends AppCompatActivity } else if (item.getItemId() == R.id.menu_about) { showAbout(); - } else if (item.getItemId() == R.id.menu_scan) { IntentIntegrator integrator = new IntentIntegrator(OrbotMainActivity.this); integrator.initiateScan(); @@ -499,10 +495,7 @@ public class OrbotMainActivity extends AppCompatActivity } private void showAbout() { - - LayoutInflater li = LayoutInflater.from(this); - View view = li.inflate(R.layout.layout_about, (ViewGroup) lblStatus.getRootView()); - + View view = getLayoutInflater().inflate(R.layout.layout_about, null); String version; try { @@ -520,10 +513,10 @@ public class OrbotMainActivity extends AppCompatActivity String aboutText = readFromAssets(this, "LICENSE"); aboutText = aboutText.replace("\n", "<br/>"); aboutOther.setText(Html.fromHtml(aboutText)); - } catch (Exception e) { - // This should not happen. Ignore. + } catch (IOException e) { } + new AlertDialog.Builder(this) .setTitle(getString(R.string.button_about)) .setView(view) @@ -1025,8 +1018,7 @@ public class OrbotMainActivity extends AppCompatActivity if (torStatus == null || (newTorStatus != null && newTorStatus.equals(torStatus))) { torStatus = newTorStatus; return; - } - else { + } else { torStatus = newTorStatus; } @@ -1071,8 +1063,7 @@ public class OrbotMainActivity extends AppCompatActivity if (torServiceMsg != null) { if (torServiceMsg.contains(TorServiceConstants.LOG_NOTICE_BOOTSTRAPPED)) lblStatus.setText(torServiceMsg); - } - else { + } else { lblStatus.setText(getString(R.string.status_starting_up)); }

1 0

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

28 Apr '20

commit d64b4d037bdef28da0415f95510c661318861b55 Author: n8fr8 <nathan(a)guardianproject.info> Date: Mon Apr 27 17:45:30 2020 -0400 update version code to 16150001 --- app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index 5b08fd0c..2bae9bf6 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -73,7 +73,7 @@ android { minSdkVersion 16 applicationId 'org.torproject.android' targetSdkVersion 29 - versionCode 16142100 + versionCode 16150001 versionName getVersionName() archivesBaseName = "Orbot-$versionName" }

1 0

[orbot/master] Merge branch 'master' of github.com:guardianproject/orbot
by n8fr8＠torproject.org 28 Apr '20

28 Apr '20

commit 785fa8ffdb6a9c52add4a7fd6419f7bb5316f58b Merge: 2e6c9b1f 93a07860 Author: n8fr8 <nathan(a)guardianproject.info> Date: Sun Apr 26 08:49:21 2020 -0400 Merge branch 'master' of github.com:guardianproject/orbot .../org/torproject/android/OrbotMainActivity.java | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-)

1 0

[orbot/master] remove app updater code to address concerns in #323
by n8fr8＠torproject.org 28 Apr '20

28 Apr '20

commit 7d7b2e98705dcb8d28c9ead6a637471737273adb Author: n8fr8 <nathan(a)guardianproject.info> Date: Tue Apr 28 16:58:45 2020 -0400 remove app updater code to address concerns in #323 --- app/build.gradle | 1 - app/src/main/java/org/torproject/android/OrbotApp.java | 5 ----- 2 files changed, 6 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 2bae9bf6..19fad531 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -121,7 +121,6 @@ dependencies { implementation 'com.google.android.material:material:1.1.0' implementation 'pl.bclogic:pulsator4droid:1.0.3' implementation 'com.github.apl-devs:appintro:v4.2.2' - implementation 'com.github.javiersantos:AppUpdater:2.7' androidTestImplementation "tools.fastlane:screengrab:1.2.0" implementation 'androidx.localbroadcastmanager:localbroadcastmanager:1.0.0' implementation 'com.android.volley:volley:1.1.1' diff --git a/app/src/main/java/org/torproject/android/OrbotApp.java b/app/src/main/java/org/torproject/android/OrbotApp.java index e265bef8..166e5efc 100644 --- a/app/src/main/java/org/torproject/android/OrbotApp.java +++ b/app/src/main/java/org/torproject/android/OrbotApp.java @@ -36,11 +36,6 @@ public class OrbotApp extends Application implements OrbotConstants { 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) - .setUpdateFrom(UpdateFrom.JSON) - .setUpdateJSON("https://raw.githubusercontent.com/guardianproject/orbot/master/update.json") - .setDisplay(Display.NOTIFICATION).start(); } @Override

1 0

[orbot/master] Merge branch 'compile_erorr+refactor' of https://github.com/bitmold/orbot into bitmold-compile_erorr+refactor
by n8fr8＠torproject.org 28 Apr '20

28 Apr '20

commit 08de553e38ef88eb632431b4303870a542711b25 Merge: df847ff1 155980fc Author: n8fr8 <nathan(a)guardianproject.info> Date: Fri Apr 24 23:16:35 2020 -0400 Merge branch 'compile_erorr+refactor' of https://github.com/bitmold/orbot into bitmold-compile_erorr+refactor .../android/ui/onboarding/CustomSlideBigText.java | 31 +++++++++++----------- .../android/ui/onboarding/OnboardingActivity.java | 30 ++++++++++++--------- 2 files changed, 33 insertions(+), 28 deletions(-)

1 0

[orbot/master] fix string variable values
by n8fr8＠torproject.org 28 Apr '20

28 Apr '20

commit feedb3b20d224d8149a950fa936337f42b684c7f Author: n8fr8 <nathan(a)guardianproject.info> Date: Fri Apr 24 23:13:20 2020 -0400 fix string variable values --- .../org/torproject/android/ui/onboarding/CustomSlideBigText.java | 6 ++++-- orbotservice/src/main/res/values/strings.xml | 8 ++++++++ 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/org/torproject/android/ui/onboarding/CustomSlideBigText.java b/app/src/main/java/org/torproject/android/ui/onboarding/CustomSlideBigText.java index ad4810b5..4e887a17 100644 --- a/app/src/main/java/org/torproject/android/ui/onboarding/CustomSlideBigText.java +++ b/app/src/main/java/org/torproject/android/ui/onboarding/CustomSlideBigText.java @@ -85,11 +85,12 @@ public class CustomSlideBigText extends Fragment { public void onActivityCreated(Bundle savedInstanceState) { super.onActivityCreated(savedInstanceState); if (savedInstanceState != null) { + /** title.setText(savedInstanceState.getString(getResources().getString(R.string.Pref_title))); bigTextSub.setText(savedInstanceState.getString(getResources().getString(R.string.SubTitle))); if (mButtonText != null) { button.setText(savedInstanceState.getString(getResources().getString(R.string.ButtonText))); - } + }**/ } } @@ -98,11 +99,12 @@ public class CustomSlideBigText extends Fragment { @Override public void onSaveInstanceState(Bundle outState) { super.onSaveInstanceState(outState); + /** outState.putString(getResources().getString(R.string.Pref_title), mTitle); outState.putString(getResources().getString(R.string.SubTitle), mSubTitle); if (mButtonText != null) { outState.putString(getResources().getString(R.string.ButtonText), mButtonText); - } + }**/ } } diff --git a/orbotservice/src/main/res/values/strings.xml b/orbotservice/src/main/res/values/strings.xml index d0b41f99..603207fa 100644 --- a/orbotservice/src/main/res/values/strings.xml +++ b/orbotservice/src/main/res/values/strings.xml @@ -35,4 +35,12 @@ <string name="menu_new_identity">New Identity</string> + + <string name="Title">Title</string> + <string name="SubTitle">SubTitle</string> + <string name="ButtonText">ButtonText</string> + <string name="WelcomeFragment">welcome</string> + <string name="Intro2Fragment">intro2</string> + <string name="CS2Fragment">cs2</string> + <string name="CS3Fragment">cs3</string> </resources>

1 0

[orbot/master] small tweaks to request bridge strings
by n8fr8＠torproject.org 28 Apr '20

28 Apr '20

commit 2e6c9b1f237d871dd0ee5e46b63920c5435980e7 Author: n8fr8 <nathan(a)guardianproject.info> Date: Fri Apr 24 23:22:12 2020 -0400 small tweaks to request bridge strings --- app/src/main/res/layout/content_bridge_wizard.xml | 2 +- app/src/main/res/values/strings.xml | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/app/src/main/res/layout/content_bridge_wizard.xml b/app/src/main/res/layout/content_bridge_wizard.xml index 1a1e98e0..ce8b6e6c 100644 --- a/app/src/main/res/layout/content_bridge_wizard.xml +++ b/app/src/main/res/layout/content_bridge_wizard.xml @@ -57,7 +57,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_margin="12dp" - android:text="@string/bridges_get_new"/> + android:text="@string/bridges_get_new_moat"/> </RadioGroup> diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index cc60ddfd..072de5b5 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -248,7 +248,9 @@ <string name="bridge_direct_connect">Connect directly to Tor (Best)</string> <string name="bridge_community">Connect through community servers</string> <string name="bridge_cloud">Connect through cloud servers</string> - <string name="bridges_get_new">Request New Bridges... (If all else fails)</string> + <string name="bridges_get_new">Request New Bridges via Email...</string> + <string name="bridges_get_new_moat">Request New Bridges Directly...</string> + <string name="trouble_connecting">Trouble connecting?</string> <string name="full_device_vpn">Full Device VPN</string> <string name="vpn_disabled">VPN Disabled</string>

1 0

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

28 Apr '20

commit 5cd6cc88eab5d129aed91fbbc523a23d240edd22 Author: n8fr8 <nathan(a)guardianproject.info> Date: Mon Apr 27 16:54:01 2020 -0400 update tor to 0.4.2.7 --- orbotservice/build.gradle | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/orbotservice/build.gradle b/orbotservice/build.gradle index 5468d426..a011b9df 100644 --- a/orbotservice/build.gradle +++ b/orbotservice/build.gradle @@ -43,7 +43,8 @@ dependencies { implementation 'androidx.legacy:legacy-support-v4:1.0.0' - implementation 'org.torproject:tor-android-binary:0.4.2.5' + implementation 'org.torproject:tor-android-binary:0.4.2.7' + implementation 'info.pluggabletransports.aptds:apt-dispatch-library:1.0.7' implementation 'info.pluggabletransports.aptds:apt-meek-obfs4-legacy:1.0.8' implementation 'info.pluggabletransports.aptds:jsocksAndroid:1.0.4'

1 0