Skip to content
Snippets Groups Projects

Fix on/off button animations

Merged cyberta requested to merge fix_on_off_btn_color into main
All threads resolved!

Fixes initialization of the layout of the on/off button. Fixes also the transition animation between different connectivity states. Adds text color animations so that the text of the button also smoothly changes on ConnectionState changes. Fixes a rare crash as well.

fixes #141 (closed)

Merge request reports

Loading
Loading

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
  • added Sponsor 101 label

  • cyberta requested review from @kwadronaut

    requested review from @kwadronaut

  • cyberta changed title from Fixes initialization of the layout of the on/off button. Fixes also the... to Fix on/off button animations

    changed title from Fixes initialization of the layout of the on/off button. Fixes also the... to Fix on/off button animations

  • cyberta added 1 commit

    added 1 commit

    • 48a91ca8 - remove unnecessary debug log

    Compare with previous version

    • Resolved by kwadronaut

      Background of the quick settings tile is now always transparent/greyed out it seems? Or was that changed in a different commit? Functionality works though.

      tile

      ➜  91 adb logcat --pid=`adb shell pidof -s org.torproject.vpn` 
      --------- beginning of main
      03-13 11:28:01.385 30661 30712 I onionmasq: arti_client::client: Running without a keystore
      03-13 11:28:01.386 30661 30712 D onionmasq: onionmasq_mobile: successfully created tun interface
      03-13 11:28:01.386 30661 30712 D onionmasq: onionmasq_mobile: starting onionmasq...
      03-13 11:28:01.386 30661 30691 D onionmasq: onionmasq_mobile: starting bootstrap event listening ...
      03-13 11:28:01.387 30661 30692 I onionmasq: onion_tunnel::dns: Starting DNS manager
      03-13 11:28:01.387 30661 30693 I onionmasq: tor_dirmgr: Didn't get usable directory from cache.
      03-13 11:28:01.387 30661 30693 I onionmasq: tor_dirmgr::bootstrap: 1: Looking for a consensus.attempt=1
      03-13 11:28:01.389 30661 30690 D onionmasq: onionmasq_mobile::scaffolding: AndroidScaffolding::protect() for fd 98
      03-13 11:28:01.389 30661 30686 D onionmasq: onionmasq_mobile::scaffolding: AndroidScaffolding::protect() for fd 97
      03-13 11:28:01.389 30661 30692 D onionmasq: onionmasq_mobile::scaffolding: AndroidScaffolding::protect() for fd 99
      03-13 11:28:01.381 30661 30661 W DefaultDispatch: type=1400 audit(0.0:2194): avc:  denied  { read } for  name="somaxconn" dev="proc" ino=972447 scontext=u:r:untrusted_app:s0:c157,c257,c512,c768 tcontext=u:object_r:proc_net:s0 tclass=file permissive=0 app=org.torproject.vpn
      03-13 11:28:01.539 30661 30686 D onionmasq: onionmasq_mobile::scaffolding: AndroidScaffolding::protect() for fd 100
      03-13 11:28:01.875 30661 30661 D TorVpnService: service: onStartCommand
      03-13 11:28:01.877 30661 30661 D TorVpnService: service: stopping vpn...
      03-13 11:28:01.877 30661 30661 D TorVpnService: service: stopping
      03-13 11:28:01.877 30661 30661 D VpnStatusObservable: status update: DISCONNECTING
      03-13 11:28:01.882 30661 30661 D onionmasq: onionmasq_mobile: closing proxy...
      03-13 11:28:01.882 30661 30712 D onionmasq: onionmasq_mobile: stopped onionmasq...
      03-13 11:28:01.900 30661 30661 W .torproject.vpn: Accessing hidden field Landroid/app/ActivityThread;->mServices:Landroid/util/ArrayMap; (unsupported, reflection, allowed)
      03-13 11:28:01.907 30661 30661 D TorVpnService: service: onDestroy
      03-13 11:28:01.909 30661 30661 D VpnStatusObservable: status update: DISCONNECTED
      03-13 11:28:01.930 30661 30661 D LeakCanary: Watching instance of org.torproject.vpn.vpn.TorVpnService (org.torproject.vpn.vpn.TorVpnService received Service#onDestroy() callback) with key f3171bdc-e852-4ba5-b735-32be50ad7934
      03-13 11:28:03.119 30661 30690 I onionmasq: tor_dirmgr::bootstrap: 1: Downloading certificates for consensus (we are missing 8/8).attempt=1
      03-13 11:28:05.590 30661 30692 I onionmasq: tor_dirmgr::bootstrap: 1: Downloading microdescriptors (we are missing 7599).attempt=1
      03-13 11:28:06.395 30661 30691 D onionmasq: onionmasq_mobile::scaffolding: AndroidScaffolding::protect() for fd 93
      03-13 11:28:06.546 30661 30691 D onionmasq: onionmasq_mobile::scaffolding: AndroidScaffolding::protect() for fd 99
      03-13 11:28:15.672 30661 30686 I onionmasq: tor_dirmgr: Marked consensus usable.
      03-13 11:28:15.728 30661 30686 I onionmasq: tor_dirmgr: We have enough information to build circuits.
      03-13 11:28:16.191 30661 30686 D onionmasq: onionmasq_mobile::scaffolding: AndroidScaffolding::protect() for fd 93
      03-13 11:28:16.729 30661 30686 I onionmasq: tor_dirmgr::bootstrap: 2: Downloading microdescriptors (we are missing 5).attempt=1
      03-13 11:28:16.788 30661 30686 I onionmasq: tor_dirmgr: Directory is complete.attempt=1
      03-13 11:28:17.257 30661 30686 I onionmasq: tor_guardmgr::guard: We have found that guard [scrubbed] is usable.
      03-13 11:28:17.319 30661 30688 I onionmasq: tor_circmgr: Flushed persistent state at exit.
      03-13 11:31:26.514 30661 30661 D TILE_TOR_VPN: onStopListening
      03-13 11:31:26.514 30661 30661 D TILE_TOR_VPN: onStopListening - remove observer
      03-13 11:31:31.308 30661 30661 D TILE_TOR_VPN: onStartListening
      03-13 11:31:31.308 30661 30661 D TILE_TOR_VPN: onStartListening - observe forever
      03-13 11:31:31.701 30661 30661 D VpnStatusObservable: status update: CONNECTING
      03-13 11:31:31.716 30661 30661 D TorVpnService: service: onStartCommand
      03-13 11:31:31.723 30661 30661 D TorVpnService: service: starting vpn...
      03-13 11:31:31.746 30661 30712 D onionmasq: onionmasq_mobile: Onionmasq_runProxy on Android API 34
      03-13 11:31:31.746 30661 30712 D onionmasq: onionmasq_mobile: creating onion_tunnel...
      03-13 11:31:31.748 30661 30661 D VpnStatusObservable: status update: CONNECTED
      03-13 11:31:31.750 30661 30712 I onionmasq: arti_client::client: Running without a keystore
      03-13 11:31:31.751 30661 30712 D onionmasq: onionmasq_mobile: successfully created tun interface
      03-13 11:31:31.751 30661 30712 D onionmasq: onionmasq_mobile: starting onionmasq...
      03-13 11:31:31.751 30661 30686 D onionmasq: onionmasq_mobile: starting bootstrap event listening ...
      03-13 11:31:31.751 30661 30690 I onionmasq: onion_tunnel::dns: Starting DNS manager
      03-13 11:31:33.225 30661 30688 I onionmasq: tor_dirmgr: Marked consensus usable.
      03-13 11:31:33.233 30661 30688 I onionmasq: tor_dirmgr: Loaded a good directory from cache.
      03-13 11:31:33.234 30661 30689 I onionmasq: onionmasq_mobile: Bootstrapping completed.
      03-13 11:31:33.242 30661 30661 D VpnStatusObservable: status update: CONNECTED
      03-13 11:31:33.406 30661 30692 D onionmasq: onionmasq_mobile::scaffolding: AndroidScaffolding::protect() for fd 89
      03-13 11:31:33.407 30661 30691 D onionmasq: onionmasq_mobile::scaffolding: AndroidScaffolding::protect() for fd 95
      03-13 11:31:33.517 30661 30688 I onionmasq: tor_dirmgr: Marked consensus usable.
      03-13 11:31:33.524 30661 30688 I onionmasq: tor_dirmgr: Directory is complete.attempt=2
      03-13 11:31:34.566 30661 30692 I onionmasq: tor_guardmgr::guard: We have found that guard [scrubbed] is usable.
      03-13 11:31:35.566 30661 30688 I onionmasq: tor_guardmgr::guard: We have found that guard [scrubbed] is usable.
  • kwadronaut resolved all threads

    resolved all threads

  • kwadronaut approved this merge request

    approved this merge request

  • Only need to rebase ;)

  • cyberta added 9 commits

    added 9 commits

    • 48a91ca8...de33f616 - 6 commits from branch main
    • cc13a7a3 - Fixes initialization of the layout of the on/off button. Fixes also the...
    • 3d272097 - Fix crash if that occours if the user removes the VPN permissions while the...
    • c304ed24 - remove unnecessary debug log

    Compare with previous version

  • cyberta enabled an automatic merge when the pipeline for c304ed24 succeeds

    enabled an automatic merge when the pipeline for c304ed24 succeeds

  • merged

Please register or sign in to reply
Loading