- tor-commits - lists.torproject.org

[translation/bridgedb_completed] https://gitweb.torproject.org/translation.git/commit/?h=bridgedb_completed
by translation＠torproject.org 29 Apr '20

29 Apr '20

commit b45b0fd0e2900225b56ac943d9bc9ef9fd898aab Author: Translation commit bot <translation(a)torproject.org> Date: Wed Apr 29 06:15:24 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=bridgedb_completed --- tr/LC_MESSAGES/bridgedb.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tr/LC_MESSAGES/bridgedb.po b/tr/LC_MESSAGES/bridgedb.po index a10d2a8517..9f0bc2b659 100644 --- a/tr/LC_MESSAGES/bridgedb.po +++ b/tr/LC_MESSAGES/bridgedb.po @@ -28,8 +28,8 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" "POT-Creation-Date: 2020-04-09 14:45-0700\n" -"PO-Revision-Date: 2020-04-16 09:25+0000\n" -"Last-Translator: T. E. Kalayci <tekrei(a)gmail.com>\n" +"PO-Revision-Date: 2020-04-29 06:15+0000\n" +"Last-Translator: Kaya Zeren <kayazeren(a)gmail.com>\n" "Language-Team: Turkish (http://www.transifex.com/otf/torproject/language/tr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -200,7 +200,7 @@ msgstr "%sK%söprüleri Al" #: bridgedb/strings.py:33 msgid "[This is an automated email.]" -msgstr "" +msgstr "[Bu otomatik bir e-postadır.]" #: bridgedb/strings.py:35 msgid "Here are your bridges:"

1 0

[translation/bridgedb] https://gitweb.torproject.org/translation.git/commit/?h=bridgedb
by translation＠torproject.org 29 Apr '20

29 Apr '20

commit eebe76a9da676d69bb9ef6c4617af430e9aab36c Author: Translation commit bot <translation(a)torproject.org> Date: Wed Apr 29 06:15:17 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=bridgedb --- tr/LC_MESSAGES/bridgedb.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tr/LC_MESSAGES/bridgedb.po b/tr/LC_MESSAGES/bridgedb.po index 20f24d1480..ed82ea0a8a 100644 --- a/tr/LC_MESSAGES/bridgedb.po +++ b/tr/LC_MESSAGES/bridgedb.po @@ -28,8 +28,8 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" "POT-Creation-Date: 2020-04-09 14:45-0700\n" -"PO-Revision-Date: 2020-04-16 09:25+0000\n" -"Last-Translator: T. E. Kalayci <tekrei(a)gmail.com>\n" +"PO-Revision-Date: 2020-04-29 06:15+0000\n" +"Last-Translator: Kaya Zeren <kayazeren(a)gmail.com>\n" "Language-Team: Turkish (http://www.transifex.com/otf/torproject/language/tr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n"

1 0

[tor-browser-build/master] Bug 33573: Update pion-webrtc version to 2.2.3
by sysrqb＠torproject.org 29 Apr '20

29 Apr '20

commit 02a73e328b08882cff7a20cedac446aad423de35 Author: Cecylia Bocovich <cohosh(a)torproject.org> Date: Thu Mar 12 16:28:32 2020 +0000 Bug 33573: Update pion-webrtc version to 2.2.3 --- projects/agouti/config | 17 +++++++++++++++++ projects/goerrors/config | 2 +- projects/goxcrypto/config | 2 +- projects/goxxerrors/config | 17 +++++++++++++++++ projects/pion-datachannel/config | 2 +- projects/pion-dtls/config | 8 +++++++- projects/pion-ice/config | 8 ++++---- projects/pion-rtp/config | 6 +++++- projects/pion-sctp/config | 2 +- projects/pion-sdp/config | 2 +- projects/pion-srtp/config | 5 +---- projects/pion-turn/config | 14 +------------- projects/pion-webrtc/config | 8 ++++---- projects/testify/config | 2 +- 14 files changed, 62 insertions(+), 33 deletions(-) diff --git a/projects/agouti/config b/projects/agouti/config new file mode 100644 index 0000000..086aa86 --- /dev/null +++ b/projects/agouti/config @@ -0,0 +1,17 @@ +# vim: filetype=yaml sw=2 +version: '[% c("abbrev") %]' +git_url: https://github.com/sclevine/agouti +git_hash: e3f6c97a4077ad821daab49db8172cf9f6690faf #v3.0.0 +filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' + +build: '[% c("projects/go/var/build_go_lib") %]' + +var: + container: + use_container: 1 + go_lib: github.com/sclevine/agouti + +input_files: + - project: container-image + - name: go + project: go diff --git a/projects/goerrors/config b/projects/goerrors/config index c9a34e8..626f7d5 100644 --- a/projects/goerrors/config +++ b/projects/goerrors/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' git_url: https://github.com/pkg/errors -git_hash: ba968bfe8b2f7e042a574c888954fccecfa385b4 # v0.8.1 +git_hash: 614d223910a179a466c1767a985424175c39b465 # v0.9.1 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' build: '[% c("projects/go/var/build_go_lib") %]' diff --git a/projects/goxcrypto/config b/projects/goxcrypto/config index 698f94b..1e23034 100644 --- a/projects/goxcrypto/config +++ b/projects/goxcrypto/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' git_url: https://go.googlesource.com/crypto -git_hash: ff983b9c42bc9fbf91556e191cc8efb585c16908 +git_hash: 69ecbb4d6d5dab05e49161c6e77ea40a030884e1 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' build: '[% c("projects/go/var/build_go_lib") %]' diff --git a/projects/goxxerrors/config b/projects/goxxerrors/config new file mode 100644 index 0000000..08d6777 --- /dev/null +++ b/projects/goxxerrors/config @@ -0,0 +1,17 @@ +# vim: filetype=yaml sw=2 +version: '[% c("abbrev") %]' +git_url: https://golang.org/x/xerrors +git_hash: 9bdfabe68543c54f90421aeb9a60ef8061b5b544 +filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' + +build: '[% c("projects/go/var/build_go_lib") %]' + +var: + container: + use_container: 1 + go_lib: golang.org/x/xerrors + +input_files: + - project: container-image + - name: go + project: go diff --git a/projects/pion-datachannel/config b/projects/pion-datachannel/config index b8a521c..c36a0bb 100644 --- a/projects/pion-datachannel/config +++ b/projects/pion-datachannel/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' git_url: https://github.com/pion/datachannel -git_hash: 58b4a51d48764c2cb19e0c7ced43640a87857c69 # v1.4.13 +git_hash: a245abfdaab4a9406cc2e18ad303b5d0717d43af # v1.4.16 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' build: '[% c("projects/go/var/build_go_lib") %]' diff --git a/projects/pion-dtls/config b/projects/pion-dtls/config index 244c764..0ee19b4 100644 --- a/projects/pion-dtls/config +++ b/projects/pion-dtls/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' git_url: https://github.com/pion/dtls -git_hash: 8748e4ac8bf7960bbf399e6f23a9bf4dd30d4e92 # v2.0.0-rc.3 +git_hash: 147774b64b6a8ac9bd0af5a7efff69ee8e0fd4a8 # v2.0.0-rc.7 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' build: '[% c("projects/go/var/build_go_lib") %]' @@ -12,6 +12,8 @@ var: go_lib: github.com/pion/dtls go_lib_deps: - goxcrypto + - goxnet + - goxxerrors - pion-logging - pion-transport @@ -21,6 +23,10 @@ input_files: project: go - name: goxcrypto project: goxcrypto + - name: goxnet + project: goxnet + - name: goxxerrors + project: goxxerrors - name: pion-logging project: pion-logging - name: pion-transport diff --git a/projects/pion-ice/config b/projects/pion-ice/config index 56d0a03..042c014 100644 --- a/projects/pion-ice/config +++ b/projects/pion-ice/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' git_url: https://github.com/pion/ice -git_hash: 57e7b93a4bac70ee2fd3b38cc2fdf3c6d586ed27 # v0.7.6 +git_hash: 5b6a2756ccaa173bd14050acf3d6e5d5d371bae8 # v0.7.10 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' build: '[% c("projects/go/var/build_go_lib") %]' @@ -12,7 +12,7 @@ var: go_lib: github.com/pion/ice go_lib_deps: - goxnet - - goxsys + - pion-dtls - pion-logging - pion-mdns - pion-stun @@ -26,8 +26,8 @@ input_files: project: go - name: goxnet project: goxnet - - name: goxsys - project: goxsys + - name: pion-dtls + project: pion-dtls - name: pion-logging project: pion-logging - name: pion-mdns diff --git a/projects/pion-rtp/config b/projects/pion-rtp/config index 5e63b29..b926612 100644 --- a/projects/pion-rtp/config +++ b/projects/pion-rtp/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' git_url: https://github.com/pion/rtp -git_hash: 94055aff4ae00d46f218eab6949fa713d48306af # v1.1.4 +git_hash: f7a712d0fb41baeacb3e2ef9ed68ed1aa42afb82 # v1.3.2 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' build: '[% c("projects/go/var/build_go_lib") %]' @@ -10,8 +10,12 @@ var: container: use_container: 1 go_lib: github.com/pion/rtp + go_lib_deps: + - testify input_files: - project: container-image - name: go project: go + - name: testify + project: testify diff --git a/projects/pion-sctp/config b/projects/pion-sctp/config index a81911c..89da952 100644 --- a/projects/pion-sctp/config +++ b/projects/pion-sctp/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' git_url: https://github.com/pion/sctp -git_hash: ced24b2276cf7991920a301ce5f0735cabafaf3e # v1.7.3 +git_hash: 9e890a28db4990b61ba414e35f79108c19e0a7db # v1.7.6 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' build: '[% c("projects/go/var/build_go_lib") %]' diff --git a/projects/pion-sdp/config b/projects/pion-sdp/config index 1a865d4..ed2dbdc 100644 --- a/projects/pion-sdp/config +++ b/projects/pion-sdp/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' git_url: https://github.com/pion/sdp -git_hash: 9b824fbb8047370a0073ef4b9ebae356e7536502 # v2.3.1 +git_hash: 06fd9e503a8f545f663a757afb09b1e1833c7b2d # v2.3.4 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' build: '[% c("projects/go/var/build_go_lib") %]' diff --git a/projects/pion-srtp/config b/projects/pion-srtp/config index eac420c..310cf75 100644 --- a/projects/pion-srtp/config +++ b/projects/pion-srtp/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' git_url: https://github.com/pion/srtp -git_hash: 0741c018e441a3502045133280347b9deba1e9d8 # v1.2.6 +git_hash: 57349fe0710b65080a26d8855aa18689364560c3 # v1.2.7 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' build: '[% c("projects/go/var/build_go_lib") %]' @@ -12,7 +12,6 @@ var: go_lib: github.com/pion/srtp go_lib_deps: - go-spew - - goerrors - pion-logging - pion-rtcp - pion-rtp @@ -25,8 +24,6 @@ input_files: project: go - name: go-spew project: go-spew - - name: goerrors - project: goerrors - name: pion-logging project: pion-logging - name: pion-rtcp diff --git a/projects/pion-turn/config b/projects/pion-turn/config index 2cbef46..44d81c0 100644 --- a/projects/pion-turn/config +++ b/projects/pion-turn/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' git_url: https://github.com/pion/turn -git_hash: bac88c5c692a9826c9703b2950dc52093ae1779a # v1.4.0 +git_hash: b54907e0b25fb5eea5d860ac61f1bf41ea8a6b01 # v2.0.3 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' build: '[% c("projects/go/var/build_go_lib") %]' @@ -11,32 +11,20 @@ var: use_container: 1 go_lib: github.com/pion/turn go_lib_deps: - - go-spew - - gocheck - - goerrors - pion-logging - pion-stun - pion-transport - - pretty - testify input_files: - project: container-image - name: go project: go - - name: go-spew - project: go-spew - - name: gocheck - project: gocheck - - name: goerrors - project: goerrors - name: pion-logging project: pion-logging - name: pion-stun project: pion-stun - name: pion-transport project: pion-transport - - name: pretty - project: pretty - name: testify project: testify diff --git a/projects/pion-webrtc/config b/projects/pion-webrtc/config index c27a3df..f4bde82 100644 --- a/projects/pion-webrtc/config +++ b/projects/pion-webrtc/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' git_url: https://github.com/pion/webrtc -git_hash: 77c6e3b827e40175572fcf2894bb81ab1e8fd2c9 # v2.1.18 +git_hash: 1f448413f22d6c32d690db594748d8ad5d3812f5 # v2.2.3 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' build: '[% c("projects/go/var/build_go_lib") %]' @@ -11,7 +11,7 @@ var: use_container: 1 go_lib: github.com/pion/webrtc go_lib_deps: - - goxcrypto + - agouti - pion-datachannel - pion-dtls - pion-ice @@ -28,8 +28,8 @@ input_files: - project: container-image - name: go project: go - - name: goxcrypto - project: goxcrypto + - name: agouti + project: agouti - name: pion-datachannel project: pion-datachannel - name: pion-dtls diff --git a/projects/testify/config b/projects/testify/config index 9b20867..bbb82c3 100644 --- a/projects/testify/config +++ b/projects/testify/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' git_url: https://github.com/stretchr/testify -git_hash: 221dbe5ed46703ee255b1da0dec05086f5035f62 # v1.4.0 +git_hash: 3ebf1ddaeb260c4b1ae502a01c7844fa8c1fa0e9 # v1.5.1 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' build: '[% c("projects/go/var/build_go_lib") %]'

1 0

[orbot/master] fix unneeded includes
by n8fr8＠torproject.org 28 Apr '20

28 Apr '20

commit c41d453ec1f7b578e6f34b9060f055520bb3c422 Author: n8fr8 <nathan(a)guardianproject.info> Date: Tue Apr 28 17:12:46 2020 -0400 fix unneeded includes --- app/src/main/java/org/torproject/android/OrbotApp.java | 3 --- 1 file changed, 3 deletions(-) diff --git a/app/src/main/java/org/torproject/android/OrbotApp.java b/app/src/main/java/org/torproject/android/OrbotApp.java index 166e5efc..e1f83233 100644 --- a/app/src/main/java/org/torproject/android/OrbotApp.java +++ b/app/src/main/java/org/torproject/android/OrbotApp.java @@ -12,9 +12,6 @@ import android.content.Intent; import android.content.pm.PackageManager; import android.content.res.Configuration; import androidx.core.app.NotificationCompat; -import com.github.javiersantos.appupdater.AppUpdater; -import com.github.javiersantos.appupdater.enums.Display; -import com.github.javiersantos.appupdater.enums.UpdateFrom; import org.torproject.android.service.OrbotConstants; import org.torproject.android.service.util.Prefs; import org.torproject.android.settings.Languages;

1 0

[orbot/master] Fixed Unused Imports
by n8fr8＠torproject.org 28 Apr '20

28 Apr '20

commit a09b4ebe04670d27cd28bfe0036cf8219282abbd Author: Hashik Donthineni <hashikdonthineni(a)gmail.com> Date: Fri Mar 27 10:29:22 2020 +0530 Fixed Unused Imports --- .../org/torproject/android/ui/onboarding/CustomSlideBigText.java | 7 +++---- .../org/torproject/android/ui/onboarding/OnboardingActivity.java | 7 +------ 2 files changed, 4 insertions(+), 10 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 f5d814f1..c1add577 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,10 +1,6 @@ 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; @@ -12,6 +8,9 @@ import android.view.ViewGroup; import android.widget.Button; import android.widget.TextView; +import androidx.annotation.Nullable; +import androidx.fragment.app.Fragment; + import org.torproject.android.R; public class CustomSlideBigText extends Fragment { 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 2a98edb4..16b724f8 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,13 +4,11 @@ import android.content.Context; import android.content.Intent; import android.content.SharedPreferences; import android.os.Bundle; +import android.view.View; 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; @@ -20,9 +18,6 @@ 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;

1 0

[orbot/master] handle NPE since node is not yet set
by n8fr8＠torproject.org 28 Apr '20

28 Apr '20

commit 73b0b0d7f2f91e6cc0e16d7f422bb6a0a4291df8 Author: n8fr8 <nathan(a)guardianproject.info> Date: Wed Feb 5 23:00:31 2020 -0500 handle NPE since node is not yet set --- .../src/main/java/org/torproject/android/service/TorEventHandler.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/orbotservice/src/main/java/org/torproject/android/service/TorEventHandler.java b/orbotservice/src/main/java/org/torproject/android/service/TorEventHandler.java index def94fcf..e8de7024 100644 --- a/orbotservice/src/main/java/org/torproject/android/service/TorEventHandler.java +++ b/orbotservice/src/main/java/org/torproject/android/service/TorEventHandler.java @@ -6,6 +6,7 @@ import net.freehaven.tor.control.EventHandler; import org.torproject.android.service.util.ExternalIPFetcher; import org.torproject.android.service.util.Prefs; +import org.w3c.dom.Text; import java.text.NumberFormat; import java.util.HashMap; @@ -178,7 +179,7 @@ public class TorEventHandler implements EventHandler, TorServiceConstants { if (nodeParts.length == 1) { nodeId = nodeParts[0].substring(1); - nodeName = node.id; + nodeName = nodeId; } else if (nodeParts.length == 2) { nodeId = nodeParts[0].substring(1); nodeName = nodeParts[1];

1 0

[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