Skip to content

Commit

Permalink
add back scanner From shadowsocksrr#7
Browse files Browse the repository at this point in the history
Signed-off-by: Love4Taylor <[email protected]>
  • Loading branch information
love4taylor committed Sep 2, 2017
1 parent 6ef0532 commit 00c46a6
Show file tree
Hide file tree
Showing 10 changed files with 453 additions and 208 deletions.
1 change: 1 addition & 0 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ libraryDependencies ++=
"com.twofortyfouram" % "android-plugin-api-for-locale" % "1.0.2" ::
"dnsjava" % "dnsjava" % "2.1.7" ::
"eu.chainfire" % "libsuperuser" % "1.0.0.+" ::
"me.dm7.barcodescanner" % "zxing" % "1.9.8" ::
"net.glxn.qrgen" % "android" % "2.0" ::
"com.squareup.okhttp3" % "okhttp" % "3.8.0" ::
"com.google.code.findbugs" % "jsr305" % "1.3.+" ::
Expand Down
7 changes: 5 additions & 2 deletions src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools" package="com.github.shadowsocks"
android:versionCode="318"
android:versionName="3.4.0.7">
android:versionCode="319"
android:versionName="3.4.0.8">

<uses-permission android:name="android.permission.INTERNET"/>
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
<uses-permission android:name="android.permission.NFC" />
<uses-permission android:name="android.permission.CAMERA" />

<uses-feature android:name="android.hardware.touchscreen"
android:required="false"/>
Expand All @@ -16,6 +17,8 @@
android:required="false"/>
<uses-feature android:name="android.software.leanback"
android:required="false"/>
<uses-feature android:name="android.hardware.camera"
android:required="false"/>

<uses-sdk
android:minSdkVersion="16"
Expand Down
Loading

0 comments on commit 00c46a6

Please sign in to comment.