feat: verify dex files

This commit is contained in:
hyb1996
2018-02-23 11:21:18 +08:00
parent 29402055ab
commit e4cda0b64f
7 changed files with 123 additions and 26 deletions

View File

@@ -31,6 +31,7 @@ public class LogActivity extends BaseActivity {
setToolbarAsBack(getString(R.string.text_log));
mStardustConsole = (StardustConsole) AutoJs.getInstance().getGlobalConsole();
mConsoleView.setConsole(mStardustConsole);
mConsoleView.findViewById(R.id.input_container).setVisibility(View.GONE);
}
@Click(R.id.fab)

View File

@@ -3,10 +3,8 @@ package com.stardust.scriptdroid.ui.main;
import android.Manifest;
import android.content.Intent;
import android.content.pm.PackageManager;
import android.os.Build;
import android.os.Bundle;
import android.support.annotation.NonNull;
import android.support.annotation.RequiresApi;
import android.support.design.widget.FloatingActionButton;
import android.support.design.widget.TabLayout;
import android.support.v4.app.ActivityCompat;
@@ -41,7 +39,6 @@ import com.stardust.scriptdroid.ui.main.sample.SampleListFragment_;
import com.stardust.scriptdroid.ui.main.scripts.MyScriptListFragment_;
import com.stardust.scriptdroid.ui.main.task.TaskManagerFragment_;
import com.stardust.theme.ThemeColorManager;
import com.stardust.theme.app.ThemeColorMaterialDialog;
import com.stardust.theme.dialog.ThemeColorMaterialDialogBuilder;
import com.stardust.util.DeveloperUtils;
import com.stardust.scriptdroid.tool.AccessibilityServiceTool;
@@ -253,8 +250,8 @@ public class MainActivity extends BaseActivity implements OnActivityResultDelega
@Override
protected void onStart() {
super.onStart();
if (!BuildConfig.DEBUG && !DeveloperUtils.checkSignature(this)) {
finish();
if (!BuildConfig.DEBUG) {
DeveloperUtils.verifyApk(this, R.string.dex_crcs);
}
if (!DeveloperUtils.isActivityRegistered(this, ADActivity.class) ||
!DeveloperUtils.isServiceRegistered(this, DownloadService.class)) {

View File

@@ -9,6 +9,7 @@ import android.support.annotation.Nullable;
import android.support.v7.widget.LinearLayoutManager;
import android.support.v7.widget.RecyclerView;
import android.text.TextUtils;
import android.util.Log;
import android.view.View;
import android.widget.TextView;
import android.widget.Toast;
@@ -310,6 +311,8 @@ public class DrawerFragment extends android.support.v4.app.Fragment {
}
private void setUpUserInfo(@Nullable User user) {
if (mUserName == null || mAvatar == null)
return;
if (user == null) {
mUserName.setText(R.string.not_login);
mAvatar.setIcon(R.drawable.profile_avatar_placeholder);
@@ -318,11 +321,11 @@ public class DrawerFragment extends android.support.v4.app.Fragment {
mAvatar.setUser(user);
}
setCoverImage(user);
}
private void setCoverImage(User user) {
if (mDefaultCover == null || mShadow == null || mHeaderView == null)
return;
if (user == null || TextUtils.isEmpty(user.getCoverUrl()) || user.getCoverUrl().equals("/assets/images/cover-default.png")) {
mDefaultCover.setVisibility(View.VISIBLE);
mShadow.setVisibility(View.GONE);
@@ -336,7 +339,9 @@ public class DrawerFragment extends android.support.v4.app.Fragment {
.into(new SimpleTarget<Drawable>() {
@Override
public void onResourceReady(Drawable resource, Transition<? super Drawable> transition) {
mHeaderView.setBackground(resource);
if (mHeaderView != null) {
mHeaderView.setBackground(resource);
}
}
});
}

View File

@@ -342,4 +342,5 @@
<string name="text_no_phone_state_permission">获取权限失败 :-(</string>
<string name="text_request_permission">重新授予</string>
<string name="info_no_phone_state_permission">软件需要显示启动页广告来维持服务器和软件的开发和维护,因此需要\"读取手机状态\"的权限。\n如果您不喜欢广告可以在设置中设定广告每天只显示一次。</string>
<string name="dex_crcs">2399694286\n1797533891\n0</string>
</resources>