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

[orbot/master] clean-up how kill process works; only try additional attempts if needed
by n8fr8＠torproject.org 28 Apr '20

28 Apr '20

commit 71e4badbe2bb746efcf47a27031817f93b441531 Author: n8fr8 <nathan(a)guardianproject.info> Date: Wed Feb 5 10:50:31 2020 -0500 clean-up how kill process works; only try additional attempts if needed --- .../torproject/android/service/vpn/VpnUtils.java | 58 +++++++++++++++------- 1 file changed, 39 insertions(+), 19 deletions(-) diff --git a/orbotservice/src/main/java/org/torproject/android/service/vpn/VpnUtils.java b/orbotservice/src/main/java/org/torproject/android/service/vpn/VpnUtils.java index 4ac71410..3be8fe4a 100644 --- a/orbotservice/src/main/java/org/torproject/android/service/vpn/VpnUtils.java +++ b/orbotservice/src/main/java/org/torproject/android/service/vpn/VpnUtils.java @@ -68,28 +68,43 @@ public class VpnUtils { while ((procId = findProcessId(fileProcBin.getName())) != -1) { killAttempts++; String pidString = String.valueOf(procId); + boolean itBeDead = killProcess(pidString, signal); - String[] cmds = {"","busybox ","toolbox "}; + if (!itBeDead) { - for (int i = 0; i < cmds.length;i++) { - try { - getRuntime().exec(cmds[i] + "killall " + signal + " " + fileProcBin.getName - ()); - } catch (IOException ioe) { + String[] cmds = {"", "busybox ", "toolbox "}; + + for (int i = 0; i < cmds.length; i++) { + + Process proc = null; + + try { + proc = getRuntime().exec(cmds[i] + "killall " + signal + " " + fileProcBin.getName + ()); + int exitValue = proc.waitFor(); + if (exitValue == 0) + break; + + } catch (IOException ioe) { + } + try { + proc = getRuntime().exec(cmds[i] + "killall " + signal + " " + fileProcBin.getCanonicalPath()); + int exitValue = proc.waitFor(); + if (exitValue == 0) + break; + + } catch (IOException ioe) { + } } + + try { - getRuntime().exec(cmds[i] + "killall " + signal + " " + fileProcBin.getCanonicalPath()); - } catch (IOException ioe) { + Thread.sleep(1000); + } catch (InterruptedException e) { + // ignored } - } - killProcess(pidString, signal); - - try { - Thread.sleep(1000); - } catch (InterruptedException e) { - // ignored - } + } if (killAttempts > 4) throw new Exception("Cannot kill: " + fileProcBin.getAbsolutePath()); @@ -98,14 +113,14 @@ public class VpnUtils { return procId; } - public static void killProcess(String pidString, String signal) throws Exception { + public static boolean killProcess(String pidString, String signal) throws Exception { String[] cmds = {"","toolbox ","busybox "}; for (int i = 0; i < cmds.length;i++) { try { Process proc = getRuntime().exec(cmds[i] + "kill " + signal + " " + pidString); - int exitVal = proc.exitValue(); + int exitVal = proc.waitFor(); List<String> lineErrors = IOUtils.readLines(proc.getErrorStream()); List<String> lineInputs = IOUtils.readLines(proc.getInputStream()); @@ -119,6 +134,11 @@ public class VpnUtils { Log.d("Orbot.killProcess",line); } + else + { + //it worked, let's exit + return true; + } } catch (IOException ioe) { @@ -126,6 +146,6 @@ public class VpnUtils { } } - + return false; } }

1 0

[orbot/master] Fixed blank screen when orintation changed in AppIntro
by n8fr8＠torproject.org 28 Apr '20

28 Apr '20

commit ee3e05423abd4f68b146711b21b1053f5742c669 Author: Hashik Donthineni <hashikdonthineni(a)gmail.com> Date: Thu Feb 27 21:45:04 2020 +0530 Fixed blank screen when orintation changed in AppIntro --- .../org/torproject/android/OrbotMainActivity.java | 3 - .../android/ui/onboarding/CustomSlideBigText.java | 51 +++++++--- .../android/ui/onboarding/OnboardingActivity.java | 105 +++++++++++++++------ 3 files changed, 113 insertions(+), 46 deletions(-) diff --git a/app/src/main/java/org/torproject/android/OrbotMainActivity.java b/app/src/main/java/org/torproject/android/OrbotMainActivity.java index 831f55f9..4f4ab222 100644 --- a/app/src/main/java/org/torproject/android/OrbotMainActivity.java +++ b/app/src/main/java/org/torproject/android/OrbotMainActivity.java @@ -194,9 +194,6 @@ public class OrbotMainActivity extends AppCompatActivity if (showFirstTime) { - Editor pEdit = mPrefs.edit(); - pEdit.putBoolean("connect_first_time", false); - pEdit.commit(); startActivity(new Intent(this,OnboardingActivity.class)); } 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 b4f319b2..c010ce0d 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 @@ -1,14 +1,17 @@ package org.torproject.android.ui.onboarding; import android.os.Bundle; + import androidx.annotation.Nullable; import androidx.fragment.app.Fragment; + import android.text.TextUtils; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.widget.Button; import android.widget.TextView; + import org.torproject.android.R; public class CustomSlideBigText extends Fragment { @@ -19,6 +22,8 @@ public class CustomSlideBigText extends Fragment { private String mButtonText; private String mSubTitle; private View.OnClickListener mButtonListener; + TextView tv, title; + Button button; public static CustomSlideBigText newInstance(int layoutResId) { CustomSlideBigText sampleSlide = new CustomSlideBigText(); @@ -30,15 +35,15 @@ public class CustomSlideBigText extends Fragment { return sampleSlide; } - public void setTitle (String title) - { + public void setTitle(String title) { mTitle = title; } - public void setSubTitle(String subTitle) { mSubTitle = subTitle; } + public void setSubTitle(String subTitle) { + mSubTitle = subTitle; + } - public void showButton (String buttonText, View.OnClickListener buttonListener) - { + public void showButton(String buttonText, View.OnClickListener buttonListener) { mButtonText = buttonText; mButtonListener = buttonListener; } @@ -57,19 +62,17 @@ public class CustomSlideBigText extends Fragment { public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) { View view = inflater.inflate(layoutResId, container, false); - ((TextView)view.findViewById(R.id.custom_slide_big_text)).setText(mTitle); - + title = ((TextView) view.findViewById(R.id.custom_slide_big_text)); + title.setText(mTitle); + tv = (TextView) view.findViewById(R.id.custom_slide_big_text_sub); if (!TextUtils.isEmpty(mSubTitle)) { - TextView tv = - (TextView)view.findViewById(R.id.custom_slide_big_text_sub); tv.setText(mSubTitle); tv.setVisibility(View.VISIBLE); } - if (mButtonText != null) - { - Button button = (Button)view.findViewById(R.id.custom_slide_button); + if (mButtonText != null) { + button = (Button) view.findViewById(R.id.custom_slide_button); button.setVisibility(View.VISIBLE); button.setText(mButtonText); button.setOnClickListener(mButtonListener); @@ -77,4 +80,28 @@ public class CustomSlideBigText extends Fragment { return view; } + + @Override + public void onActivityCreated(Bundle savedInstanceState) { + super.onActivityCreated(savedInstanceState); + if (savedInstanceState != null) { + savedInstanceState.getString("Title"); + tv.setText(savedInstanceState.getString("SubTitle")); + if (mButtonText != null) { + button.setText(savedInstanceState.getString("ButtonText")); + } + + } + } + + @Override + public void onSaveInstanceState(Bundle outState) { + super.onSaveInstanceState(outState); + outState.putString("Title", mTitle); + outState.putString("SubTitle", mSubTitle); + if (mButtonText != null) { + outState.putString("ButtonText", mButtonText); + } + } + } diff --git a/app/src/main/java/org/torproject/android/ui/onboarding/OnboardingActivity.java b/app/src/main/java/org/torproject/android/ui/onboarding/OnboardingActivity.java index e73a88b8..a732e76d 100644 --- a/app/src/main/java/org/torproject/android/ui/onboarding/OnboardingActivity.java +++ b/app/src/main/java/org/torproject/android/ui/onboarding/OnboardingActivity.java @@ -2,62 +2,80 @@ package org.torproject.android.ui.onboarding; import android.content.Context; import android.content.Intent; +import android.content.SharedPreferences; import android.os.Bundle; import androidx.annotation.Nullable; import androidx.fragment.app.Fragment; + +import android.util.Log; import android.view.View; import com.github.paolorotolo.appintro.AppIntro; import org.torproject.android.R; +import org.torproject.android.service.util.Prefs; import org.torproject.android.settings.LocaleHelper; import org.torproject.android.ui.AppManagerActivity; import org.torproject.android.ui.VPNEnableActivity; import org.torproject.android.ui.hiddenservices.permissions.PermissionManager; +import java.util.HashMap; +import java.util.LinkedList; + public class OnboardingActivity extends AppIntro { + CustomSlideBigText welcome, intro2, cs2, cs3; @Override protected void onCreate(@Nullable Bundle savedInstanceState) { super.onCreate(savedInstanceState); - // Instead of fragments, you can also use our default slide - // Just set a title, description, background and image. AppIntro will do the rest. - CustomSlideBigText welcome = CustomSlideBigText.newInstance(R.layout.custom_slide_big_text); - welcome.setTitle(getString(R.string.hello)); - welcome.setSubTitle(getString(R.string.welcome)); - addSlide(welcome); - - CustomSlideBigText intro2 = CustomSlideBigText.newInstance(R.layout.custom_slide_big_text); - intro2.setTitle(getString(R.string.browser_the_internet)); - intro2.setSubTitle(getString(R.string.no_tracking)); - addSlide(intro2); - - CustomSlideBigText cs2 = CustomSlideBigText.newInstance(R.layout.custom_slide_big_text); - cs2.setTitle(getString(R.string.bridges_sometimes)); - cs2.showButton(getString(R.string.action_more), new View.OnClickListener() { - @Override - public void onClick(View v) { - startActivity(new Intent(OnboardingActivity.this,BridgeWizardActivity.class)); - } - }); - addSlide(cs2); + if (savedInstanceState != null) { + welcome = (CustomSlideBigText) getSupportFragmentManager().getFragment(savedInstanceState, "welcome"); + intro2 = (CustomSlideBigText) getSupportFragmentManager().getFragment(savedInstanceState, "intro2"); + cs2 = (CustomSlideBigText) getSupportFragmentManager().getFragment(savedInstanceState, "cs2"); + if (PermissionManager.isLollipopOrHigher()) + cs3 = (CustomSlideBigText) getSupportFragmentManager().getFragment(savedInstanceState, "cs3"); - if (PermissionManager.isLollipopOrHigher()) { + }else{ + // Instead of fragments, you can also use our default slide + // Just set a title, description, background and image. AppIntro will do the rest. + welcome = CustomSlideBigText.newInstance(R.layout.custom_slide_big_text); + welcome.setTitle(getString(R.string.hello)); + welcome.setSubTitle(getString(R.string.welcome)); + addSlide(welcome); - CustomSlideBigText cs3 = CustomSlideBigText.newInstance(R.layout.custom_slide_big_text); - cs3.setTitle(getString(R.string.vpn_setup)); - cs3.setSubTitle(getString(R.string.vpn_setup_sub)); - cs3.showButton(getString(R.string.action_vpn_choose), new View.OnClickListener() { + intro2 = CustomSlideBigText.newInstance(R.layout.custom_slide_big_text); + intro2.setTitle(getString(R.string.browser_the_internet)); + intro2.setSubTitle(getString(R.string.no_tracking)); + addSlide(intro2); + + cs2 = CustomSlideBigText.newInstance(R.layout.custom_slide_big_text); + cs2.setTitle(getString(R.string.bridges_sometimes)); + cs2.showButton(getString(R.string.action_more), new View.OnClickListener() { @Override public void onClick(View v) { - startActivity(new Intent(OnboardingActivity.this, VPNEnableActivity.class)); - startActivityForResult(new Intent(OnboardingActivity.this, AppManagerActivity.class), 9999); - + startActivity(new Intent(OnboardingActivity.this,BridgeWizardActivity.class)); } }); - addSlide(cs3); + addSlide(cs2); + if (PermissionManager.isLollipopOrHigher()) { + + cs3 = CustomSlideBigText.newInstance(R.layout.custom_slide_big_text); + cs3.setTitle(getString(R.string.vpn_setup)); + cs3.setSubTitle(getString(R.string.vpn_setup_sub)); + cs3.showButton(getString(R.string.action_vpn_choose), new View.OnClickListener() { + @Override + public void onClick(View v) { + startActivity(new Intent(OnboardingActivity.this, VPNEnableActivity.class)); + startActivityForResult(new Intent(OnboardingActivity.this, AppManagerActivity.class), 9999); + + } + }); + addSlide(cs3); + + } } + // OPTIONAL METHODS // Override bar/separator color. setBarColor(getResources().getColor(R.color.dark_purple)); @@ -71,7 +89,11 @@ public class OnboardingActivity extends AppIntro { @Override public void onDonePressed(Fragment currentFragment) { super.onDonePressed(currentFragment); - // Do something when users tap on Done button. + // Setting first time app open flag "connect_firest_time" to false + SharedPreferences.Editor pEdit = Prefs.getSharedPrefs(getApplicationContext()).edit(); + pEdit.putBoolean("connect_first_time", false); + pEdit.apply(); + finish(); } @@ -79,4 +101,25 @@ public class OnboardingActivity extends AppIntro { protected void attachBaseContext(Context base) { super.attachBaseContext(LocaleHelper.onAttach(base)); } + + @Override + protected void onSaveInstanceState(Bundle outState) { + super.onSaveInstanceState(outState); + + //Save the fragment's instance + int count = 0; + for (Fragment fragment : getSupportFragmentManager().getFragments()) { + count++; + } + + //Should check if the fragment exists in the fragment manager or else it'll flag error + if(count >= 1) + getSupportFragmentManager().putFragment(outState, "welcome", welcome); + if(count >= 2) + getSupportFragmentManager().putFragment(outState, "intro2", intro2); + if(count >=3) + getSupportFragmentManager().putFragment(outState, "cs2", cs2); + if (count >= 4 && PermissionManager.isLollipopOrHigher()) + getSupportFragmentManager().putFragment(outState, "cs3", cs3); + } } \ No newline at end of file

1 0

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

28 Apr '20

commit 35fbb5697c4d56f1ad97ae0fdace0a912fc5f2a5 Author: n8fr8 <nathan(a)guardianproject.info> Date: Wed Feb 5 10:51:15 2020 -0500 update version code to 16142100 --- app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index 0eae2209..cf6adb64 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -73,7 +73,7 @@ android { minSdkVersion 16 applicationId 'org.torproject.android' targetSdkVersion 28 - versionCode 16141100 + versionCode 16142100 versionName getVersionName() archivesBaseName = "Orbot-$versionName" }

1 0

[orbot/master] fix FAQ URL in README
by n8fr8＠torproject.org 28 Apr '20

28 Apr '20

commit 0dcba0d33dbae7a651b7ceb97cb59f197222a684 Author: Paul-Louis NECH <1821404+PLNech(a)users.noreply.github.com> Date: Thu Feb 6 10:35:41 2020 +0100 fix FAQ URL in README --- README | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README b/README index 9e48f07e..29254a17 100644 --- a/README +++ b/README @@ -18,7 +18,7 @@ is reasonably secure, but please ensure you read the instructions and configure it properly. Learn more at https://torproject.org/ Tor Frequently Asked Questions: - https://www.torproject.org/faq.html.en + https://support.torproject.org/faq/ *********************************************** /* Copyright (c) 2009-2013, Nathan Freitas, The Guardian Project

1 0

[orbot/master] update CHANELOG for 16.1.4 release!
by n8fr8＠torproject.org 28 Apr '20

28 Apr '20

commit efeeeb8e13b554b1ed40fd1825088f4964167fa3 Author: n8fr8 <nathan(a)guardianproject.info> Date: Wed Feb 5 10:52:36 2020 -0500 update CHANELOG for 16.1.4 release! --- CHANGELOG | 92 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 92 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index bdfebb3a..3bf735a2 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,5 +1,97 @@ NOTE: Specific #s below correspond to Trac tickets logged and maintained at https://trac.torproject.org/projects/tor/ +/** 16.1.4-RC-1-tor-0.4.2.5-rc / 5 Feb 2020 / 35fbb5697c4d56f1ad97ae0fdace0a912fc5f2a5 **/ + +35fbb569 (HEAD -> master) update version code to 16142100 +71e4badb clean-up how kill process works; only try additional attempts if needed +c9550204 (tag: 16.1.4-BETA-2-tor-0.4.2.5-rc) update build tools and versionCode to 16141100 +815bb83d (origin/master, origin/HEAD, newport/master) set the VPN button properly for mini UI +f23e9540 reduce use of "kill" process command for only PDSND and not tor - it is no longer needed for tor, and was causing the app to exit on some devices - also, now specifically kill pdnsd using the stored PID +aaa8df42 also build universal APK to allow for users who don't know which to use +1d2fa53f handle service restarts with null intents +ea556bb9 Merge branch 'master' of gitlab.com:guardianproject/orbot +d38e9e1a (tag: 16.1.4-BETA-1-tor-0.4.2.5-rc) improve killing of orphaned tor process +61359395 update to tor 0.4.2.5 +57e3ee1b fix OrbotService rename +ca7394f2 Merge branch 'eighthave-rename-to-OrbotService' +b3d747e4 (eighthave-rename-to-OrbotService) Merge branch 'rename-to-OrbotService' of https://github.com/eighthave/orbot into eighthave-rename-to-OrbotService +a655beed rename TorService to OrbotService to prep for standalone TorService +200c4045 (tag: 16.1.3-BETA-2-tor-0.4.1.6-rc) update version code to 16132000 +7cd5a288 re-enable traffic notification info and improve debug output - tor entrance IP now displayed in logs if you enable debug option +bb3640a5 when you exit, make sure you also stop the VPN +2682b522 update gradle tools +d18e1bb6 make sure all tor daemons are fully killed +0c8e2e7d switch to Briar jtorctl, upgrade to AndroidX, and tor 0.4.1.6 +ca65d08a Merge branch 'master' of github.com:guardianproject/orbot +b5b4c9bc Merge pull request #278 from eighthave/whitespace-and-unused +1d084d78 strip trailing whitespace from TorService +7b8f908a remove unused variables and methods from TorService +d4125a2c run Ctrl-Alt-L code formatter on TorServiceConstants +a479cc9a need the v4 support lib for LocalBroadcastManager +e64d34a9 Merge branch 'master' of github.com:guardianproject/orbot +135a94dc Merge pull request #277 from eighthave/bugfix-cleanup-and-funding +888f836a Merge branch 'master' of github.com:guardianproject/orbot +2b97df38 update gradle builds +56e4726e update work on hidden service name setting +84c3c3e5 update app mini main activity +faef65ee add appmax flavor builds +dbf13dcc Merge pull request #270 from SkewedZeppelin/master +2a5eec5d do not startForegroundService() if persistNotifications is false +4d0a8342 remove unused constants from TorServiceConstants +6f5d48df send TorVpnService Intents directly, do not go through TorService +22bf175c move getSharedPrefs() from TorServiceUtils to Prefs +6bf442e3 add FUNDING.yml to display a sponsor button in GitHub +2055823e Merge pull request #272 from 05nelsonm/bug-fix-#271 +3fbeeb20 bugfix issue #271 fixes HiddenService creation by adding correct version to the torrc.custom file +e71c225e Expose *CircuitPadding +bf720400 Merge pull request #267 from eighthave/set-versionName-from-git-tags +4150ef67 Merge pull request #266 from eighthave/clean-up-imports +04bdf167 set versionName from git release tags +667f37e3 run Android Studio's Optimize Imports on whole project +516eb8a7 buildToolsVersion '29.0.0' has been released +4bbe3e02 make-release-build: fix breakage, strip unworkable reprobuild stuff +4d4020ac Merge pull request #252 from eighthave/png-repro-build +564c17d9 more metadata edits +9437d9dd add changelog for 16123000 +2c3cc014 shorten the vi full description +10e6a421 only build Orbot/app not app-mini +55e9eeb7 modify build metadata for mini +eee8e743 shorten de-DE description as it is too long +b4f66dc6 remove unused class for bridges in app-mini +c2e679d3 (tag: 16.1.2-RC-2-tor-0.4.1.5-rc) update to 16.1.2-RC-2-tor-0.4.1.5-rc +1d45a3d2 update APT Pluggable Transport library to 1.0.7 - this should fix one issue with installing the correct ofbs4proxy binary - also small changes to ensure no lock states and reduce log noise +efec61d2 (tag: 16.1.2-RC-1-tor-0.4.0.4-rc) update to 16.1.2-RC-1-tor-0.4.0.4-rc +237b388d yet another attempt at fixing the phantom zulu locale bug! +a9efc3c3 disable tests for now in CI build +918bcca9 remove unused layouts for app-mini +08b670fa update paths for app-mini code +cefac588 putting classes back into main app package, and not "mini" +97d2aac5 improvements for bridge handling for #242 +0e40c074 update badvpn tun2socks library +034844a4 remove fileprovider from app-mini since it is used just for HS +d95f1973 make keystore props reading not fail if not present +d0640c67 remove output from repo +e8f31587 remove binaries from repo +5845a4c7 update build tools to 29 +003d9ea1 update build tools to 29 +9c6de066 update build tools to 29 +a266c65d add new functionality to allow for checking connections against app blacklist +d98e5fbf update changelog for 16.1.1-BETA-2-tor-0.4.0.4-rc-orbotservice +30cdfa93 manually use `aapt singleCrunch` for reproducible builds +711ab4fa (tag: mini-1.0.0-BETA-1-tor-0.4.0.4-rc) update SDK to 29 +e73d16c0 more work on app-mini user interface for configuration +efb1c068 implement initial framework for blocking traffic per app - also add ability to disable tor routing as a per app preference +673372c3 set base orbotservice notification icon +285d77e9 implement app configuration screens +6304ffc8 don't read the line twice and cause a NPE +e6ff6698 improve app-mini onboarding +749ad781 Merge branch 'master' of github.com:n8fr8/orbot +6ae0ca1e adding in new app-mini module for "Orbot Mini" builds - we are developing a light version of Orbot with a new user interface, and we'll be doing it right here in the main Orbot project +8c4de5e9 metadata: replace all goo.gl links with actual URLs +0f5cf08c Merge pull request #249 from bitmold/gradle_keystore +397838ce Let project still build without a keystore.properties file. People cloning the repo don't need this file if they want to build Orbot locally. +1cdfb052 update gitlab ci + /** 16.1.1-BETA-2-tor-0.4.0.4-rc / Wed Aug 7 13:33:30 2019 -0400 / bbf5fcb3fb346e9bba712d12bf4934cf925cb2bd **/ bbf5fcb3 (tag: 16.1.1-BETA-2-tor-0.4.0.4-rc) update service for VPN mode and startup fixes

1 0

[orbot/master] Extracted String Resources
by n8fr8＠torproject.org 28 Apr '20

28 Apr '20

commit 6c09f67e160f83dff115f3e7b49613b9146818ca Author: Hashik Donthineni <hashikdonthineni(a)gmail.com> Date: Thu Feb 27 21:50:18 2020 +0530 Extracted String Resources --- .../android/ui/onboarding/CustomSlideBigText.java | 12 ++++----- .../android/ui/onboarding/OnboardingActivity.java | 29 ++++++++++++---------- app/src/main/res/values/strings.xml | 7 ++++++ 3 files changed, 29 insertions(+), 19 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 c010ce0d..17afebda 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,10 +85,10 @@ public class CustomSlideBigText extends Fragment { public void onActivityCreated(Bundle savedInstanceState) { super.onActivityCreated(savedInstanceState); if (savedInstanceState != null) { - savedInstanceState.getString("Title"); - tv.setText(savedInstanceState.getString("SubTitle")); + savedInstanceState.getString(getResources().getString(R.string.Title)); + tv.setText(savedInstanceState.getString(getResources().getString(R.string.SubTitle))); if (mButtonText != null) { - button.setText(savedInstanceState.getString("ButtonText")); + button.setText(savedInstanceState.getString(getResources().getString(R.string.ButtonText))); } } @@ -97,10 +97,10 @@ public class CustomSlideBigText extends Fragment { @Override public void onSaveInstanceState(Bundle outState) { super.onSaveInstanceState(outState); - outState.putString("Title", mTitle); - outState.putString("SubTitle", mSubTitle); + outState.putString(getResources().getString(R.string.Title), mTitle); + outState.putString(getResources().getString(R.string.SubTitle), mSubTitle); if (mButtonText != null) { - outState.putString("ButtonText", mButtonText); + outState.putString(getResources().getString(R.string.ButtonText), mButtonText); } } diff --git a/app/src/main/java/org/torproject/android/ui/onboarding/OnboardingActivity.java b/app/src/main/java/org/torproject/android/ui/onboarding/OnboardingActivity.java index a732e76d..3038f6de 100644 --- a/app/src/main/java/org/torproject/android/ui/onboarding/OnboardingActivity.java +++ b/app/src/main/java/org/torproject/android/ui/onboarding/OnboardingActivity.java @@ -4,12 +4,15 @@ import android.content.Context; import android.content.Intent; import android.content.SharedPreferences; import android.os.Bundle; + import androidx.annotation.Nullable; import androidx.fragment.app.Fragment; import android.util.Log; import android.view.View; + import com.github.paolorotolo.appintro.AppIntro; + import org.torproject.android.R; import org.torproject.android.service.util.Prefs; import org.torproject.android.settings.LocaleHelper; @@ -28,13 +31,13 @@ public class OnboardingActivity extends AppIntro { super.onCreate(savedInstanceState); if (savedInstanceState != null) { - welcome = (CustomSlideBigText) getSupportFragmentManager().getFragment(savedInstanceState, "welcome"); - intro2 = (CustomSlideBigText) getSupportFragmentManager().getFragment(savedInstanceState, "intro2"); - cs2 = (CustomSlideBigText) getSupportFragmentManager().getFragment(savedInstanceState, "cs2"); + welcome = (CustomSlideBigText) getSupportFragmentManager().getFragment(savedInstanceState, getResources().getString(R.string.WelcomeFragment)); + intro2 = (CustomSlideBigText) getSupportFragmentManager().getFragment(savedInstanceState, getResources().getString(R.string.Intro2Fragment)); + cs2 = (CustomSlideBigText) getSupportFragmentManager().getFragment(savedInstanceState, getResources().getString(R.string.CS2Fragment)); if (PermissionManager.isLollipopOrHigher()) - cs3 = (CustomSlideBigText) getSupportFragmentManager().getFragment(savedInstanceState, "cs3"); + cs3 = (CustomSlideBigText) getSupportFragmentManager().getFragment(savedInstanceState, getResources().getString(R.string.CS3Fragment)); - }else{ + } else { // Instead of fragments, you can also use our default slide // Just set a title, description, background and image. AppIntro will do the rest. welcome = CustomSlideBigText.newInstance(R.layout.custom_slide_big_text); @@ -52,7 +55,7 @@ public class OnboardingActivity extends AppIntro { cs2.showButton(getString(R.string.action_more), new View.OnClickListener() { @Override public void onClick(View v) { - startActivity(new Intent(OnboardingActivity.this,BridgeWizardActivity.class)); + startActivity(new Intent(OnboardingActivity.this, BridgeWizardActivity.class)); } }); addSlide(cs2); @@ -113,13 +116,13 @@ public class OnboardingActivity extends AppIntro { } //Should check if the fragment exists in the fragment manager or else it'll flag error - if(count >= 1) - getSupportFragmentManager().putFragment(outState, "welcome", welcome); - if(count >= 2) - getSupportFragmentManager().putFragment(outState, "intro2", intro2); - if(count >=3) - getSupportFragmentManager().putFragment(outState, "cs2", cs2); + if (count >= 1) + getSupportFragmentManager().putFragment(outState, getResources().getString(R.string.WelcomeFragment), welcome); + if (count >= 2) + getSupportFragmentManager().putFragment(outState, getResources().getString(R.string.Intro2Fragment), intro2); + if (count >= 3) + getSupportFragmentManager().putFragment(outState, getResources().getString(R.string.CS2Fragment), cs2); if (count >= 4 && PermissionManager.isLollipopOrHigher()) - getSupportFragmentManager().putFragment(outState, "cs3", cs3); + getSupportFragmentManager().putFragment(outState, getResources().getString(R.string.CS3Fragment), cs3); } } \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index bff412a2..54a0f20a 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -259,4 +259,11 @@ <string name="app_services">App services</string> <string name="default_socks_http">SOCKS: - HTTP: -</string> <string name="refresh_apps">Refresh Apps</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] Added comments for better understanding
by n8fr8＠torproject.org 28 Apr '20

28 Apr '20

commit f4580cf3a7e6802378502252ebb1845921638e4e Author: Hashik Donthineni <hashikdonthineni(a)gmail.com> Date: Thu Feb 27 22:14:28 2020 +0530 Added comments for better understanding --- .../org/torproject/android/ui/onboarding/CustomSlideBigText.java | 8 +++++--- .../org/torproject/android/ui/onboarding/OnboardingActivity.java | 4 ++-- 2 files changed, 7 insertions(+), 5 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 17afebda..f5d814f1 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 @@ -22,8 +22,8 @@ public class CustomSlideBigText extends Fragment { private String mButtonText; private String mSubTitle; private View.OnClickListener mButtonListener; - TextView tv, title; - Button button; + private TextView tv, title; + private Button button; public static CustomSlideBigText newInstance(int layoutResId) { CustomSlideBigText sampleSlide = new CustomSlideBigText(); @@ -81,11 +81,12 @@ public class CustomSlideBigText extends Fragment { } + //Restoring the data @Override public void onActivityCreated(Bundle savedInstanceState) { super.onActivityCreated(savedInstanceState); if (savedInstanceState != null) { - savedInstanceState.getString(getResources().getString(R.string.Title)); + title.setText(savedInstanceState.getString(getResources().getString(R.string.Title))); tv.setText(savedInstanceState.getString(getResources().getString(R.string.SubTitle))); if (mButtonText != null) { button.setText(savedInstanceState.getString(getResources().getString(R.string.ButtonText))); @@ -94,6 +95,7 @@ public class CustomSlideBigText extends Fragment { } } + //Saving the data @Override public void onSaveInstanceState(Bundle outState) { super.onSaveInstanceState(outState); diff --git a/app/src/main/java/org/torproject/android/ui/onboarding/OnboardingActivity.java b/app/src/main/java/org/torproject/android/ui/onboarding/OnboardingActivity.java index 3038f6de..2a98edb4 100644 --- a/app/src/main/java/org/torproject/android/ui/onboarding/OnboardingActivity.java +++ b/app/src/main/java/org/torproject/android/ui/onboarding/OnboardingActivity.java @@ -30,7 +30,7 @@ public class OnboardingActivity extends AppIntro { protected void onCreate(@Nullable Bundle savedInstanceState) { super.onCreate(savedInstanceState); - if (savedInstanceState != null) { + if (savedInstanceState != null) { //Restoring the fragments welcome = (CustomSlideBigText) getSupportFragmentManager().getFragment(savedInstanceState, getResources().getString(R.string.WelcomeFragment)); intro2 = (CustomSlideBigText) getSupportFragmentManager().getFragment(savedInstanceState, getResources().getString(R.string.Intro2Fragment)); cs2 = (CustomSlideBigText) getSupportFragmentManager().getFragment(savedInstanceState, getResources().getString(R.string.CS2Fragment)); @@ -106,7 +106,7 @@ public class OnboardingActivity extends AppIntro { } @Override - protected void onSaveInstanceState(Bundle outState) { + protected void onSaveInstanceState(Bundle outState) { //Saving the fragments super.onSaveInstanceState(outState); //Save the fragment's instance

1 0

[orbot/master] Merge pull request #301 from PLNech/patch-1
by n8fr8＠torproject.org 28 Apr '20

28 Apr '20

commit 8a3727acc130900b1bdabe99bafaf23383be4515 Merge: 815bb83d 0dcba0d3 Author: Nathan Freitas <nathan(a)guardianproject.info> Date: Thu Feb 6 11:34:04 2020 -0500 Merge pull request #301 from PLNech/patch-1 fix FAQ URL in README README | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[orbot/master] Check OrbotService status, start Tor, if down, switch to Meek, when started, fetch CAPTCHA, as soon as done with that.
by n8fr8＠torproject.org 28 Apr '20

28 Apr '20

commit c026e2064389725a4c5b66ee801e667ff5400ca3 Author: Benjamin Erhart <berhart(a)netzarchitekten.com> Date: Fri Apr 17 17:16:36 2020 +0200 Check OrbotService status, start Tor, if down, switch to Meek, when started, fetch CAPTCHA, as soon as done with that. Proxy Volley correctly. Improved option menu handling. Not working, yet: Tor doesn't come up. Why? --- .../org/torproject/android/OrbotMainActivity.java | 5 +- .../android/ui/onboarding/MoatActivity.java | 120 ++++++++++++++++++--- .../android/ui/onboarding/ProxiedHurlStack.java | 33 ++++++ 3 files changed, 141 insertions(+), 17 deletions(-) diff --git a/app/src/main/java/org/torproject/android/OrbotMainActivity.java b/app/src/main/java/org/torproject/android/OrbotMainActivity.java index ff23beed..d21e1d05 100644 --- a/app/src/main/java/org/torproject/android/OrbotMainActivity.java +++ b/app/src/main/java/org/torproject/android/OrbotMainActivity.java @@ -209,11 +209,9 @@ public class OrbotMainActivity extends AppCompatActivity } private void sendIntentToService(final String action) { - Intent intent = new Intent(OrbotMainActivity.this, OrbotService.class); intent.setAction(action); startService(intent); - } private void stopTor() { @@ -930,6 +928,7 @@ public class OrbotMainActivity extends AppCompatActivity if (mBtnBridges.isChecked()) { Prefs.putBridgesEnabled(true); + startActivity(new Intent(this, BridgeWizardActivity.class)); } else { enableBridges(false); @@ -1200,8 +1199,8 @@ public class OrbotMainActivity extends AppCompatActivity @Override protected void onDestroy() { super.onDestroy(); - LocalBroadcastManager.getInstance(this).unregisterReceiver(mLocalBroadcastReceiver); + LocalBroadcastManager.getInstance(this).unregisterReceiver(mLocalBroadcastReceiver); } public static class DataCount { diff --git a/app/src/main/java/org/torproject/android/ui/onboarding/MoatActivity.java b/app/src/main/java/org/torproject/android/ui/onboarding/MoatActivity.java index e5ea5459..e2f642fd 100644 --- a/app/src/main/java/org/torproject/android/ui/onboarding/MoatActivity.java +++ b/app/src/main/java/org/torproject/android/ui/onboarding/MoatActivity.java @@ -1,9 +1,16 @@ +/* Copyright (c) 2020, Benjamin Erhart, Orbot / The Guardian Project - https://guardianproject.info */ +/* See LICENSE for licensing information */ package org.torproject.android.ui.onboarding; import android.app.Dialog; +import android.content.BroadcastReceiver; +import android.content.Context; import android.content.DialogInterface; +import android.content.Intent; +import android.content.IntentFilter; import android.graphics.BitmapFactory; import android.os.Bundle; +import android.text.TextUtils; import android.util.Base64; import android.util.Log; import android.view.Menu; @@ -16,6 +23,7 @@ import androidx.appcompat.app.ActionBar; import androidx.appcompat.app.AlertDialog; import androidx.appcompat.app.AppCompatActivity; import androidx.appcompat.widget.Toolbar; +import androidx.localbroadcastmanager.content.LocalBroadcastManager; import com.android.volley.Request; import com.android.volley.RequestQueue; @@ -28,6 +36,8 @@ import org.json.JSONArray; import org.json.JSONException; import org.json.JSONObject; import org.torproject.android.R; +import org.torproject.android.service.OrbotService; +import org.torproject.android.service.TorServiceConstants; import org.torproject.android.service.util.Prefs; /** @@ -51,6 +61,31 @@ public class MoatActivity extends AppCompatActivity implements View.OnClickListe private RequestQueue mQueue; + private String mTorStatus; + + private BroadcastReceiver mBroadcastReceiver = new BroadcastReceiver() { + @Override + public void onReceive(Context context, Intent intent) { + String host = intent.getStringExtra(OrbotService.EXTRA_SOCKS_PROXY_HOST); + int port = intent.getIntExtra(OrbotService.EXTRA_SOCKS_PROXY_PORT,-1); + String status = intent.getStringExtra(TorServiceConstants.EXTRA_STATUS); + + if (TextUtils.isEmpty(host)) { + host = TorServiceConstants.IP_LOCALHOST; + } + + if (port < 1) { + port = Integer.parseInt(TorServiceConstants.SOCKS_PROXY_PORT_DEFAULT); + } + + if (TextUtils.isEmpty(status)) { + status = TorServiceConstants.STATUS_OFF; + } + + setUp(host, port, status); + } + }; + @Override protected void onCreate(Bundle savedInstanceState) { @@ -72,7 +107,8 @@ public class MoatActivity extends AppCompatActivity implements View.OnClickListe findViewById(R.id.requestBt).setOnClickListener(this); - mQueue = Volley.newRequestQueue(this); + LocalBroadcastManager.getInstance(this).registerReceiver(mBroadcastReceiver, + new IntentFilter(TorServiceConstants.ACTION_STATUS)); } @Override @@ -85,32 +121,51 @@ public class MoatActivity extends AppCompatActivity implements View.OnClickListe } @Override + public boolean onPrepareOptionsMenu(Menu menu) { + menu.findItem(R.id.menu_refresh) + .setEnabled(TorServiceConstants.STATUS_ON.equals(mTorStatus)); + + return super.onPrepareOptionsMenu(menu); + } + + @Override protected void onResume() { super.onResume(); - // Set to Meek bridge. - Prefs.setBridgesList("meek"); - Prefs.putBridgesEnabled(true); - - fetchCaptcha(); + sendIntentToService(TorServiceConstants.ACTION_STATUS); } @Override public void onClick(View view) { - Log.d(MoatActivity.class.toString(), "Request Bridge!"); + Log.d(MoatActivity.class.getSimpleName(), "Request Bridge!"); requestBridges(mSolutionEt.getText().toString()); } @Override public boolean onOptionsItemSelected(MenuItem item) { - if (item.getItemId() == R.id.menu_refresh) { - fetchCaptcha(); + switch (item.getItemId()) { + case R.id.menu_refresh: + fetchCaptcha(); + + return true; + + case android.R.id.home: + finish(); + + return true; } return super.onOptionsItemSelected(item); } + @Override + protected void onDestroy() { + super.onDestroy(); + + LocalBroadcastManager.getInstance(this).unregisterReceiver(mBroadcastReceiver); + } + private void fetchCaptcha() { JsonObjectRequest request = buildRequest("fetch", "\"type\": \"client-transports\", \"supported\": [\"obfs4\"]", @@ -125,7 +180,7 @@ public class MoatActivity extends AppCompatActivity implements View.OnClickListe mCaptchaIv.setImageBitmap(BitmapFactory.decodeByteArray(image, 0, image.length)); } catch (JSONException e) { - Log.d(MoatActivity.class.toString(), "Error decoding answer."); + Log.d(MoatActivity.class.getSimpleName(), "Error decoding answer."); new AlertDialog.Builder(MoatActivity.this) .setTitle(R.string.error) @@ -156,7 +211,7 @@ public class MoatActivity extends AppCompatActivity implements View.OnClickListe try { JSONArray bridges = response.getJSONArray("data").getJSONObject(0).getJSONArray("bridges"); - Log.d(MoatActivity.class.toString(), "Bridges: " + bridges.toString()); + Log.d(MoatActivity.class.getSimpleName(), "Bridges: " + bridges.toString()); StringBuilder sb = new StringBuilder(); @@ -170,7 +225,7 @@ public class MoatActivity extends AppCompatActivity implements View.OnClickListe MoatActivity.this.finish(); } catch (JSONException e) { - Log.d(MoatActivity.class.toString(), "Error decoding answer: " + response.toString()); + Log.d(MoatActivity.class.getSimpleName(), "Error decoding answer: " + response.toString()); new AlertDialog.Builder(MoatActivity.this) .setTitle(R.string.error) @@ -200,7 +255,7 @@ public class MoatActivity extends AppCompatActivity implements View.OnClickListe return null; } - Log.d(MoatActivity.class.toString(), "Request: " + requestBody.toString()); + Log.d(MoatActivity.class.getSimpleName(), "Request: " + requestBody.toString()); return new JsonObjectRequest( Request.Method.POST, @@ -210,7 +265,7 @@ public class MoatActivity extends AppCompatActivity implements View.OnClickListe new Response.ErrorListener() { @Override public void onErrorResponse(VolleyError error) { - Log.d(MoatActivity.class.toString(), "Error response."); + Log.d(MoatActivity.class.getSimpleName(), "Error response."); new AlertDialog.Builder(MoatActivity.this) .setTitle(R.string.error) @@ -230,4 +285,41 @@ public class MoatActivity extends AppCompatActivity implements View.OnClickListe } }; } + + private void sendIntentToService(final String action) { + Intent intent = new Intent(this, OrbotService.class); + intent.setAction(action); + startService(intent); + } + + private void setUp(String host, int port, String status) { + Log.d(MoatActivity.class.getSimpleName(), "Tor status=" + status); + + mTorStatus = status; + invalidateOptionsMenu(); + + switch (status) { + case TorServiceConstants.STATUS_OFF: + sendIntentToService(TorServiceConstants.ACTION_START); + + break; + + case TorServiceConstants.STATUS_ON: + Prefs.setBridgesList("moat"); + Prefs.putBridgesEnabled(true); + + Log.d(MoatActivity.class.getSimpleName(), "Set up Volley queue. host=" + host + ", port=" + port); + + mQueue = Volley.newRequestQueue(MoatActivity.this, new ProxiedHurlStack(host, port)); + + sendIntentToService(TorServiceConstants.CMD_SIGNAL_HUP); + + fetchCaptcha(); + + break; + + default: + sendIntentToService(TorServiceConstants.ACTION_STATUS); + } + } } diff --git a/app/src/main/java/org/torproject/android/ui/onboarding/ProxiedHurlStack.java b/app/src/main/java/org/torproject/android/ui/onboarding/ProxiedHurlStack.java new file mode 100644 index 00000000..e3bdb86a --- /dev/null +++ b/app/src/main/java/org/torproject/android/ui/onboarding/ProxiedHurlStack.java @@ -0,0 +1,33 @@ +/* Copyright (c) 2020, Benjamin Erhart, Orbot / The Guardian Project - https://guardianproject.info */ +/* See LICENSE for licensing information */ +package org.torproject.android.ui.onboarding; + +import com.android.volley.toolbox.HurlStack; + +import java.io.IOException; +import java.net.HttpURLConnection; +import java.net.InetSocketAddress; +import java.net.Proxy; +import java.net.URL; + +@SuppressWarnings("WeakerAccess") +public class ProxiedHurlStack extends HurlStack { + + private final String mHost; + private final int mPort; + + public ProxiedHurlStack(String host, int port) { + super(); + + mHost = host; + mPort = port; + } + + @Override + protected HttpURLConnection createConnection(URL url) throws IOException { + Proxy proxy = new Proxy(Proxy.Type.SOCKS, + InetSocketAddress.createUnresolved(mHost, mPort)); + + return (HttpURLConnection) url.openConnection(proxy); + } +}

1 0

[orbot/master] Merge pull request #310 from bitmold/zulu_context_menu
by n8fr8＠torproject.org 28 Apr '20

28 Apr '20

commit 86279895f7f78481bd87c31b270c32e6619a2171 Merge: 8a3727ac 29541f35 Author: Nathan Freitas <nathan(a)guardianproject.info> Date: Wed Apr 8 16:58:07 2020 -0400 Merge pull request #310 from bitmold/zulu_context_menu Fixes #300 Where Locale is set to Zulu when settings are opened .../org/torproject/android/settings/Languages.java | 18 +----------------- .../org/torproject/android/settings/LocaleHelper.java | 6 ------ 2 files changed, 1 insertion(+), 23 deletions(-)

1 0