Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
com.ccwangluo.accelerator
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
sheteng
com.ccwangluo.accelerator
Commits
528fea13
Commit
528fea13
authored
Sep 28, 2016
by
Max Lv
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Clean up
parent
5d7e8831
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
3 deletions
+2
-3
src/main/scala/com/github/shadowsocks/ScannerActivity.scala
src/main/scala/com/github/shadowsocks/ScannerActivity.scala
+2
-3
No files found.
src/main/scala/com/github/shadowsocks/ScannerActivity.scala
View file @
528fea13
package
com.github.shadowsocks
package
com.github.shadowsocks
import
android.Manifest
import
android.app.Activity
import
android.app.Activity
import
android.content.Intent
import
android.content.Intent
import
android.content.pm.PackageManager
import
android.content.pm.PackageManager
...
@@ -48,13 +47,13 @@ class ScannerActivity extends AppCompatActivity with ZXingScannerView.ResultHand
...
@@ -48,13 +47,13 @@ class ScannerActivity extends AppCompatActivity with ZXingScannerView.ResultHand
override
def
onResume
()
{
override
def
onResume
()
{
super
.
onResume
()
super
.
onResume
()
val
permissionCheck
=
ContextCompat
.
checkSelfPermission
(
this
,
val
permissionCheck
=
ContextCompat
.
checkSelfPermission
(
this
,
Manifest
.
permission
.
CAMERA
)
android
.
Manifest
.
permission
.
CAMERA
)
if
(
permissionCheck
==
PackageManager
.
PERMISSION_GRANTED
)
{
if
(
permissionCheck
==
PackageManager
.
PERMISSION_GRANTED
)
{
scannerView
.
setResultHandler
(
this
)
// Register ourselves as a handler for scan results.
scannerView
.
setResultHandler
(
this
)
// Register ourselves as a handler for scan results.
scannerView
.
startCamera
()
// Start camera on resume
scannerView
.
startCamera
()
// Start camera on resume
}
else
{
}
else
{
ActivityCompat
.
requestPermissions
(
this
,
ActivityCompat
.
requestPermissions
(
this
,
Array
(
Manifest
.
permission
.
CAMERA
),
MY_PERMISSIONS_REQUEST_CAMERA
)
Array
(
android
.
Manifest
.
permission
.
CAMERA
),
MY_PERMISSIONS_REQUEST_CAMERA
)
}
}
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment