Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
M
Magisk
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
Magisk
Commits
aaa12853
Commit
aaa12853
authored
Jul 13, 2017
by
topjohnwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Prevent crashing when requesting SN check while checking
Fixed #208, fixed #212
parent
b0ab55b0
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
11 additions
and
5 deletions
+11
-5
SafetyNetHelper.java
...main/java/com/topjohnwu/magisk/utils/SafetyNetHelper.java
+11
-5
No files found.
app/src/main/java/com/topjohnwu/magisk/utils/SafetyNetHelper.java
View file @
aaa12853
...
@@ -20,6 +20,8 @@ import java.security.SecureRandom;
...
@@ -20,6 +20,8 @@ import java.security.SecureRandom;
public
abstract
class
SafetyNetHelper
public
abstract
class
SafetyNetHelper
implements
GoogleApiClient
.
OnConnectionFailedListener
,
GoogleApiClient
.
ConnectionCallbacks
{
implements
GoogleApiClient
.
OnConnectionFailedListener
,
GoogleApiClient
.
ConnectionCallbacks
{
private
static
boolean
isRunning
=
false
;
private
GoogleApiClient
mGoogleApiClient
;
private
GoogleApiClient
mGoogleApiClient
;
private
Result
ret
;
private
Result
ret
;
protected
FragmentActivity
mActivity
;
protected
FragmentActivity
mActivity
;
...
@@ -27,17 +29,20 @@ public abstract class SafetyNetHelper
...
@@ -27,17 +29,20 @@ public abstract class SafetyNetHelper
public
SafetyNetHelper
(
FragmentActivity
activity
)
{
public
SafetyNetHelper
(
FragmentActivity
activity
)
{
ret
=
new
Result
();
ret
=
new
Result
();
mActivity
=
activity
;
mActivity
=
activity
;
mGoogleApiClient
=
new
GoogleApiClient
.
Builder
(
activity
)
.
enableAutoManage
(
activity
,
this
)
.
addApi
(
SafetyNet
.
API
)
.
addConnectionCallbacks
(
this
)
.
build
();
}
}
// Entry point to start test
// Entry point to start test
public
void
requestTest
()
{
public
void
requestTest
()
{
if
(
isRunning
)
return
;
// Connect Google Service
// Connect Google Service
mGoogleApiClient
=
new
GoogleApiClient
.
Builder
(
mActivity
)
.
enableAutoManage
(
mActivity
,
this
)
.
addApi
(
SafetyNet
.
API
)
.
addConnectionCallbacks
(
this
)
.
build
();
mGoogleApiClient
.
connect
();
mGoogleApiClient
.
connect
();
isRunning
=
true
;
}
}
@Override
@Override
...
@@ -92,6 +97,7 @@ public abstract class SafetyNetHelper
...
@@ -92,6 +97,7 @@ public abstract class SafetyNetHelper
// Disconnect
// Disconnect
mGoogleApiClient
.
stopAutoManage
(
mActivity
);
mGoogleApiClient
.
stopAutoManage
(
mActivity
);
mGoogleApiClient
.
disconnect
();
mGoogleApiClient
.
disconnect
();
isRunning
=
false
;
handleResults
(
ret
);
handleResults
(
ret
);
});
});
}
}
...
...
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