Vpn status notifications

cybertarequested to merge
vpn_status_notifications into main

built on top of !15 (merged) which needs to be reviewed first

  • relates to #41 (closed)
  • shows ellapsed time since VPN was connected (using Android's notification chronometer feature)
  • added data usage statistics in notifications, facilitates to finish #63 (closed)
Edited by cyberta

Merge request reports

app/src/main/java/com/example/torwitharti/vpn/TorVpnService.kt

+8 −6
Changes for app/src/main/java/com/example/torwitharti/vpn/TorVpnService.kt: 8 added lines, 6 removed lines.
Original line number Diff line number Diff line
@@ -94,7 +94,7 @@ class TorVpnService : VpnService() { 
            establishVpn()

        } else if (action == ACTION_STOP_VPN) {

            Log.d(TAG, "service: stopping vpn...")

            stop()

            stop(false)

        } else {

            Log.d(TAG, "service unknown action: $action" );

        }
@@ -104,7 +104,7 @@ class TorVpnService : VpnService() { 
    override fun onRevoke() {

        super.onRevoke()

        Log.d(TAG, "service: onRevoke")

        stop()

        stop(false)

    }



    override fun onDestroy() {
@@ -118,9 +118,13 @@ class TorVpnService : VpnService() { 
        logObservable = null

    }



    private fun stop() {

    private fun stop(onError: Boolean) {

        Log.d(TAG, "service: stopping")

        if (onError) {

            VpnStatusObservable.update(ConnectionState.CONNECTION_ERROR)

        } else {

            VpnStatusObservable.update(ConnectionState.DISCONNECTING)

        }

        OnionMasq.stop()

        removeObservers()

        logHelper.stopLog()
@@ -200,10 +204,8 @@ class TorVpnService : VpnService() { 
            }, 0, 1000)

        } catch (e: Exception) {

            // Catch any exception

            OnionMasq.stop()

            e.printStackTrace()

            VpnStatusObservable.update(ConnectionState.CONNECTION_ERROR)

            stopSelf()

            stop(true)

        }

    }