commit 41f3f79efe90ab1e68ae629943959cea12f63ad7 Author: Mygod Date: Wed Jan 3 10:45:14 2018 +0800 Initial commit Hotspot works. VPN not yet. diff --git a/.gitignore b/.gitignore new file mode 100644 index 00000000..39fb081a --- /dev/null +++ b/.gitignore @@ -0,0 +1,9 @@ +*.iml +.gradle +/local.properties +/.idea/workspace.xml +/.idea/libraries +.DS_Store +/build +/captures +.externalNativeBuild diff --git a/.idea/encodings.xml b/.idea/encodings.xml new file mode 100644 index 00000000..97626ba4 --- /dev/null +++ b/.idea/encodings.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml new file mode 100644 index 00000000..ead4b88b --- /dev/null +++ b/.idea/gradle.xml @@ -0,0 +1,18 @@ + + + + + + \ No newline at end of file diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml new file mode 100644 index 00000000..d606a954 --- /dev/null +++ b/.idea/inspectionProfiles/Project_Default.xml @@ -0,0 +1,6 @@ + + + + \ No newline at end of file diff --git a/.idea/markdown-navigator/profiles_settings.xml b/.idea/markdown-navigator/profiles_settings.xml new file mode 100644 index 00000000..57927c5a --- /dev/null +++ b/.idea/markdown-navigator/profiles_settings.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 00000000..85bfba47 --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,118 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1.8 + + + + + + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 00000000..5d072e96 --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml new file mode 100644 index 00000000..7f68460d --- /dev/null +++ b/.idea/runConfigurations.xml @@ -0,0 +1,12 @@ + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 00000000..94a25f7f --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/build.gradle b/build.gradle new file mode 100644 index 00000000..dd9b4ee5 --- /dev/null +++ b/build.gradle @@ -0,0 +1,29 @@ +// Top-level build file where you can add configuration options common to all sub-projects/modules. + +buildscript { + ext { + androidPluginVersion = '3.0.1' + kotlinVersion = '1.2.10' + supportLibraryVersion = '27.0.2' + takisoftFixVersion = '27.0.2.0' + } + repositories { + google() + jcenter() + } + dependencies { + classpath "com.android.tools.build:gradle:$androidPluginVersion" + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion" + } +} + +allprojects { + repositories { + google() + jcenter() + } +} + +task clean(type: Delete) { + delete rootProject.buildDir +} diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 00000000..aac7c9b4 --- /dev/null +++ b/gradle.properties @@ -0,0 +1,17 @@ +# Project-wide Gradle settings. + +# IDE (e.g. Android Studio) users: +# Gradle settings configured through the IDE *will override* +# any settings specified in this file. + +# For more details on how to configure your build environment visit +# http://www.gradle.org/docs/current/userguide/build_environment.html + +# Specifies the JVM arguments used for the daemon process. +# The setting is particularly useful for tweaking memory settings. +org.gradle.jvmargs=-Xmx1536m + +# When configured, Gradle will run in incubating parallel mode. +# This option should only be used with decoupled projects. More details, visit +# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects +# org.gradle.parallel=true diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 00000000..13372aef Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 00000000..6659795e --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,6 @@ +#Wed Jan 03 07:06:26 CST 2018 +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip diff --git a/gradlew b/gradlew new file mode 100755 index 00000000..9d82f789 --- /dev/null +++ b/gradlew @@ -0,0 +1,160 @@ +#!/usr/bin/env bash + +############################################################################## +## +## Gradle start up script for UN*X +## +############################################################################## + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS="" + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$0"` + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD="maximum" + +warn ( ) { + echo "$*" +} + +die ( ) { + echo + echo "$*" + echo + exit 1 +} + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +case "`uname`" in + CYGWIN* ) + cygwin=true + ;; + Darwin* ) + darwin=true + ;; + MINGW* ) + msys=true + ;; +esac + +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> $.*$$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >/dev/null +APP_HOME="`pwd -P`" +cd "$SAVED" >/dev/null + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD="java" + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ] ; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then + MAX_FD="$MAX_FD_LIMIT" + fi + ulimit -n $MAX_FD + if [ $? -ne 0 ] ; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" + fi +fi + +# For Darwin, add options to specify how the application appears in the dock +if $darwin; then + GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" +fi + +# For Cygwin, switch paths to Windows format before running java +if $cygwin ; then + APP_HOME=`cygpath --path --mixed "$APP_HOME"` + CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + JAVACMD=`cygpath --unix "$JAVACMD"` + + # We build the pattern for arguments to be converted via cygpath + ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` + SEP="" + for dir in $ROOTDIRSRAW ; do + ROOTDIRS="$ROOTDIRS$SEP$dir" + SEP="|" + done + OURCYGPATTERN="(^($ROOTDIRS))" + # Add a user-defined pattern to the cygpath arguments + if [ "$GRADLE_CYGPATTERN" != "" ] ; then + OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" + fi + # Now convert the arguments - kludge to limit ourselves to /bin/sh + i=0 + for arg in "$@" ; do + CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` + CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option + + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition + eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` + else + eval `echo args$i`="\"$arg\"" + fi + i=$((i+1)) + done + case $i in + (0) set -- ;; + (1) set -- "$args0" ;; + (2) set -- "$args0" "$args1" ;; + (3) set -- "$args0" "$args1" "$args2" ;; + (4) set -- "$args0" "$args1" "$args2" "$args3" ;; + (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + esac +fi + +# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules +function splitJvmOpts() { + JVM_OPTS=("$@") +} +eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS +JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME" + +exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 00000000..aec99730 --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,90 @@ +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS= + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto init + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto init + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:init +@rem Get command-line arguments, handling Windowz variants + +if not "%OS%" == "Windows_NT" goto win9xME_args +if "%@eval[2+2]" == "4" goto 4NT_args + +:win9xME_args +@rem Slurp the command line arguments. +set CMD_LINE_ARGS= +set _SKIP=2 + +:win9xME_args_slurp +if "x%~1" == "x" goto execute + +set CMD_LINE_ARGS=%* +goto execute + +:4NT_args +@rem Get arguments from the 4NT Shell from JP Software +set CMD_LINE_ARGS=%$ + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/mobile/.gitignore b/mobile/.gitignore new file mode 100644 index 00000000..4a207df0 --- /dev/null +++ b/mobile/.gitignore @@ -0,0 +1,5 @@ +/build + +# tests aren't ready yet +/src/androidTest +/src/test diff --git a/mobile/build.gradle b/mobile/build.gradle new file mode 100644 index 00000000..977dd270 --- /dev/null +++ b/mobile/build.gradle @@ -0,0 +1,43 @@ +apply plugin: 'com.android.application' +apply plugin: 'kotlin-android' +apply plugin: 'kotlin-android-extensions' +apply plugin: 'kotlin-kapt' + +android { + buildToolsVersion "27.0.3" + compileSdkVersion 27 + defaultConfig { + applicationId "be.mygod.vpnhotspot" + minSdkVersion 21 + targetSdkVersion 27 + versionCode 1 + versionName "0.0.1" + testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" + vectorDrawables.useSupportLibrary true + } + buildTypes { + debug { + pseudoLocalesEnabled true + } + release { + shrinkResources true + minifyEnabled true + proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' + } + } + dataBinding.enabled = true +} + +dependencies { + kapt "com.android.databinding:compiler:$androidPluginVersion" + implementation fileTree(dir: 'libs', include: ['*.jar']) + implementation "com.android.support:customtabs:$supportLibraryVersion" + implementation "com.android.support:preference-v14:$supportLibraryVersion" + implementation "com.takisoft.fix:preference-v7:$takisoftFixVersion" + implementation "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlinVersion" + testImplementation 'junit:junit:4.12' + androidTestImplementation 'com.android.support.test:runner:1.0.1' + androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.1' +} + +kapt.generateStubs = true diff --git a/mobile/proguard-rules.pro b/mobile/proguard-rules.pro new file mode 100644 index 00000000..f1b42451 --- /dev/null +++ b/mobile/proguard-rules.pro @@ -0,0 +1,21 @@ +# Add project specific ProGuard rules here. +# You can control the set of applied configuration files using the +# proguardFiles setting in build.gradle. +# +# For more details, see +# http://developer.android.com/guide/developing/tools/proguard.html + +# If your project uses WebView with JS, uncomment the following +# and specify the fully qualified class name to the JavaScript interface +# class: +#-keepclassmembers class fqcn.of.javascript.interface.for.webview { +# public *; +#} + +# Uncomment this to preserve the line number information for +# debugging stack traces. +#-keepattributes SourceFile,LineNumberTable + +# If you keep the line number information, uncomment this to +# hide the original source file name. +#-renamesourcefileattribute SourceFile diff --git a/mobile/src/main/AndroidManifest.xml b/mobile/src/main/AndroidManifest.xml new file mode 100644 index 00000000..11e2aaeb --- /dev/null +++ b/mobile/src/main/AndroidManifest.xml @@ -0,0 +1,29 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/mobile/src/main/java/be/mygod/vpnhotspot/App.kt b/mobile/src/main/java/be/mygod/vpnhotspot/App.kt new file mode 100644 index 00000000..a482328d --- /dev/null +++ b/mobile/src/main/java/be/mygod/vpnhotspot/App.kt @@ -0,0 +1,15 @@ +package be.mygod.vpnhotspot + +import android.app.Application +import android.app.NotificationChannel +import android.app.NotificationManager +import android.os.Build + +class App : Application() { + override fun onCreate() { + super.onCreate() + if (Build.VERSION.SDK_INT >= 26) getSystemService(NotificationManager::class.java) + .createNotificationChannel(NotificationChannel(HotspotService.CHANNEL, + "Hotspot Service", NotificationManager.IMPORTANCE_LOW)) + } +} diff --git a/mobile/src/main/java/be/mygod/vpnhotspot/HotspotService.kt b/mobile/src/main/java/be/mygod/vpnhotspot/HotspotService.kt new file mode 100644 index 00000000..0c5ce335 --- /dev/null +++ b/mobile/src/main/java/be/mygod/vpnhotspot/HotspotService.kt @@ -0,0 +1,156 @@ +package be.mygod.vpnhotspot + +import android.app.Service +import android.content.BroadcastReceiver +import android.content.Context +import android.content.Intent +import android.net.wifi.p2p.WifiP2pGroup +import android.net.wifi.p2p.WifiP2pManager +import android.os.Binder +import android.os.Looper +import android.support.v4.app.NotificationCompat +import android.support.v4.content.ContextCompat +import android.util.Log +import android.widget.Toast + +class HotspotService : Service(), WifiP2pManager.ChannelListener { + companion object { + const val CHANNEL = "hotspot" + private const val TAG = "HotspotService" + } + + enum class Status { + IDLE, STARTING, ACTIVE + } + + inner class HotspotBinder : Binder() { + val service get() = this@HotspotService + val status get() = this@HotspotService.status + var data: MainActivity.Data? = null + + fun shutdown() { + p2pManager.removeGroup(channel, object : WifiP2pManager.ActionListener { + override fun onSuccess() = clean() + override fun onFailure(reason: Int) { + Toast.makeText(this@HotspotService, "Failed to remove P2P group (reason: $reason)", + Toast.LENGTH_SHORT).show() + } + }) + } + } + + private lateinit var p2pManager: WifiP2pManager + private lateinit var channel: WifiP2pManager.Channel + private lateinit var group: WifiP2pGroup + private var receiver: BroadcastReceiver? = null + private val binder = HotspotBinder() + + private var status = Status.IDLE + set(value) { + field = value + binder.data?.onStatusChanged() + } + + override fun onBind(intent: Intent) = binder + + override fun onCreate() { + super.onCreate() + p2pManager = getSystemService(Context.WIFI_P2P_SERVICE) as WifiP2pManager + onChannelDisconnected() + } + + override fun onChannelDisconnected() { + channel = p2pManager.initialize(this, Looper.getMainLooper(), this) + } + + override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int { + if (status != Status.IDLE) return START_NOT_STICKY + status = Status.STARTING + initReceiver() + p2pManager.requestGroupInfo(channel, { + when { + it == null -> doStart() + it.isGroupOwner -> doStart(it) + else -> { + Log.i(TAG, "Removing old group ($it)") + p2pManager.removeGroup(channel, object : WifiP2pManager.ActionListener { + override fun onSuccess() = doStart() + override fun onFailure(reason: Int) { + Toast.makeText(this@HotspotService, "Failed to remove old P2P group (reason: $reason)", + Toast.LENGTH_SHORT).show() + } + }) + } + } + }) + return START_NOT_STICKY + } + + private fun doStart() { + p2pManager.createGroup(channel, object : WifiP2pManager.ActionListener, WifiP2pManager.GroupInfoListener { + private fun shutdown() { + startForeground(0, NotificationCompat.Builder(this@HotspotService, CHANNEL) + .build()) + clean() + } + + private var tries = 0 + override fun onSuccess() = p2pManager.requestGroupInfo(channel, this) + override fun onGroupInfoAvailable(group: WifiP2pGroup?) { + if (group != null && group.isGroupOwner) doStart(group) else if (tries < 10) { + Thread.sleep(30L shl tries++) + onSuccess() + } else { + Log.w(TAG, "Unexpected group: $group") + shutdown() + } + } + + override fun onFailure(reason: Int) { + Toast.makeText(this@HotspotService, "Failed to create P2P group (reason: $reason)", + Toast.LENGTH_SHORT).show() + shutdown() + } + }) + } + private fun doStart(group: WifiP2pGroup) { + status = Status.ACTIVE + this.group = group + startForeground(1, NotificationCompat.Builder(this@HotspotService, CHANNEL) + .setColor(ContextCompat.getColor(this@HotspotService, R.color.colorPrimary)) + .setContentTitle(group.networkName) + .setSubText(group.passphrase) + .setSmallIcon(R.drawable.ic_device_wifi_tethering) + .build()) + } + + private fun initReceiver() { + return + receiver = object : BroadcastReceiver() { + override fun onReceive(context: Context, intent: Intent) { + when (intent.action) { + // TODO + } + } + } + registerReceiver(receiver, createIntentFilter( + WifiP2pManager.WIFI_P2P_STATE_CHANGED_ACTION, + WifiP2pManager.WIFI_P2P_PEERS_CHANGED_ACTION, + WifiP2pManager.WIFI_P2P_CONNECTION_CHANGED_ACTION, + WifiP2pManager.WIFI_P2P_THIS_DEVICE_CHANGED_ACTION)) + } + + private fun clean() { + status = Status.IDLE + stopForeground(true) + } + + override fun onDestroy() { + if (status != Status.IDLE) binder.shutdown() + if (receiver != null) { + unregisterReceiver(receiver) + receiver = null + } + super.onDestroy() + } +} diff --git a/mobile/src/main/java/be/mygod/vpnhotspot/MainActivity.kt b/mobile/src/main/java/be/mygod/vpnhotspot/MainActivity.kt new file mode 100644 index 00000000..312d4385 --- /dev/null +++ b/mobile/src/main/java/be/mygod/vpnhotspot/MainActivity.kt @@ -0,0 +1,80 @@ +package be.mygod.vpnhotspot + +import android.content.ComponentName +import android.content.Context +import android.content.Intent +import android.content.ServiceConnection +import android.databinding.BaseObservable +import android.databinding.Bindable +import android.databinding.DataBindingUtil +import android.os.Bundle +import android.os.IBinder +import android.support.v4.content.ContextCompat +import android.support.v7.app.AppCompatActivity +import be.mygod.vpnhotspot.databinding.MainActivityBinding + +class MainActivity : AppCompatActivity(), ServiceConnection { + inner class Data : BaseObservable() { + val switchEnabled: Boolean + @Bindable get() = when (binder?.status) { + HotspotService.Status.IDLE -> true + HotspotService.Status.ACTIVE -> true + else -> false + } + var serviceStarted: Boolean + @Bindable get() = when (binder?.status) { + HotspotService.Status.STARTING -> true + HotspotService.Status.ACTIVE -> true + else -> false + } + set(value) { + val binder = binder + when (binder?.status) { + HotspotService.Status.IDLE -> + ContextCompat.startForegroundService(this@MainActivity, + Intent(this@MainActivity, HotspotService::class.java)) + HotspotService.Status.ACTIVE -> binder.shutdown() + } + } + + fun onStatusChanged() { + notifyPropertyChanged(BR.switchEnabled) + notifyPropertyChanged(BR.serviceStarted) + } + fun onBinderChanged() { + onStatusChanged() + } + } + + private lateinit var binding: MainActivityBinding + private val data = Data() + private var binder: HotspotService.HotspotBinder? = null + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + binding = DataBindingUtil.setContentView(this, R.layout.main_activity) + binding.data = data + } + + override fun onStart() { + super.onStart() + bindService(Intent(this, HotspotService::class.java), this, Context.BIND_AUTO_CREATE) + } + + override fun onStop() { + unbindService(this) + super.onStop() + } + + override fun onServiceConnected(name: ComponentName?, service: IBinder?) { + val binder = service as HotspotService.HotspotBinder + binder.data = data + this.binder = binder + data.onBinderChanged() + } + + override fun onServiceDisconnected(name: ComponentName?) { + binder?.data = null + binder = null + } +} diff --git a/mobile/src/main/java/be/mygod/vpnhotspot/Utils.kt b/mobile/src/main/java/be/mygod/vpnhotspot/Utils.kt new file mode 100644 index 00000000..6c69dd09 --- /dev/null +++ b/mobile/src/main/java/be/mygod/vpnhotspot/Utils.kt @@ -0,0 +1,9 @@ +package be.mygod.vpnhotspot + +import android.content.IntentFilter + +fun createIntentFilter(vararg actions: String): IntentFilter { + val result = IntentFilter() + actions.forEach { result.addAction(it) } + return result +} diff --git a/mobile/src/main/res/drawable/ic_device_wifi_tethering.xml b/mobile/src/main/res/drawable/ic_device_wifi_tethering.xml new file mode 100644 index 00000000..4e556352 --- /dev/null +++ b/mobile/src/main/res/drawable/ic_device_wifi_tethering.xml @@ -0,0 +1,9 @@ + + + diff --git a/mobile/src/main/res/layout/main_activity.xml b/mobile/src/main/res/layout/main_activity.xml new file mode 100644 index 00000000..acf98b7c --- /dev/null +++ b/mobile/src/main/res/layout/main_activity.xml @@ -0,0 +1,103 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/mobile/src/main/res/values/colors.xml b/mobile/src/main/res/values/colors.xml new file mode 100644 index 00000000..3ab3e9cb --- /dev/null +++ b/mobile/src/main/res/values/colors.xml @@ -0,0 +1,6 @@ + + + #3F51B5 + #303F9F + #FF4081 + diff --git a/mobile/src/main/res/values/strings.xml b/mobile/src/main/res/values/strings.xml new file mode 100644 index 00000000..b0fb706f --- /dev/null +++ b/mobile/src/main/res/values/strings.xml @@ -0,0 +1,3 @@ + + VPN Hotspot + diff --git a/mobile/src/main/res/values/styles.xml b/mobile/src/main/res/values/styles.xml new file mode 100644 index 00000000..0eb88fe3 --- /dev/null +++ b/mobile/src/main/res/values/styles.xml @@ -0,0 +1,11 @@ + + + + + + diff --git a/settings.gradle b/settings.gradle new file mode 100644 index 00000000..6070d9b3 --- /dev/null +++ b/settings.gradle @@ -0,0 +1 @@ +include ':mobile'