Leaf-WAI/assistant-android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1、fix skipactivity/baseappcompatactivity potential npe

Browse Source 
2、fix appcontroller logic
This commit is contained in:
CsHeng
2017-05-08 15:22:57 +08:00
parent 1c6907373b
commit 375f538bc1
8 changed files with 139 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/src/main/java/com/gh/base/BaseAppCompatActivity.java
View File

@ -200,8 +200,11 @@ abstract class BaseAppCompatActivity extends BaseAppCompatActivityLog implements
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
mContentView = getLayoutInflater().inflate(getLayoutId(), null);
setContentView(getLayoutId());
final int layoutId = getLayoutId();
if (layoutId != 0) {
mContentView = getLayoutInflater().inflate(layoutId, null);
setContentView(mContentView);
}
if (savedInstanceState == null) {
handleRedirectIntent(getIntent());
}