Skip to content

Commit

Permalink
优化代码结构
Browse files Browse the repository at this point in the history
  • Loading branch information
dadaewqq committed Oct 23, 2019
1 parent fca37c9 commit 99b9744
Show file tree
Hide file tree
Showing 8 changed files with 164 additions and 173 deletions.
60 changes: 0 additions & 60 deletions .idea/inspectionProfiles/Project_Default.xml
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 0 additions & 6 deletions .idea/smartfox_info.xml
View file

This file was deleted.

2 changes: 1 addition & 1 deletion app/src/main/AndroidManifest.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
android:roundIcon="@mipmap/ic_launcher_round"
android:supportsRtl="true"
android:theme="@android:style/Theme.Translucent.NoTitleBar"
tools:ignore="GoogleAppIndexingWarning"
tools:ignore="AllowBackup,GoogleAppIndexingWarning"
tools:targetApi="q">
<activity
android:name=".activity.MainActivity"
Expand Down
83 changes: 19 additions & 64 deletions app/src/main/java/com/modosa/dpmapkinstaller/activity/AbstractInstallActivity.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,6 @@
import android.content.Context;
import android.content.Intent;
import android.content.SharedPreferences;
import android.content.pm.ApplicationInfo;
import android.content.pm.PackageInfo;
import android.content.pm.PackageManager;
import android.net.Uri;
import android.os.Build;
import android.os.Bundle;
Expand All @@ -27,8 +24,7 @@
import androidx.core.content.ContextCompat;

import com.modosa.dpmapkinstaller.R;
import com.modosa.dpmapkinstaller.utils.ApplicationLabelUtils;
import com.modosa.dpmapkinstaller.utils.FileSizeUtils;
import com.modosa.dpmapkinstaller.utils.AppInfoUtils;

import java.io.File;
import java.io.FileOutputStream;
Expand Down Expand Up @@ -58,15 +54,15 @@ public abstract class AbstractInstallActivity extends Activity {
private SharedPreferences.Editor editor;
private AlertDialog alertDialog;
private String cachePath;
private String pkgname;
private String pkgName;

@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
String action = getIntent().getAction();
if (Intent.ACTION_DELETE.equals(action) || Intent.ACTION_UNINSTALL_PACKAGE.equals(action)) {
pkgname = Objects.requireNonNull(getIntent().getData()).getEncodedSchemeSpecificPart();
if (pkgname == null) {
pkgName = Objects.requireNonNull(getIntent().getData()).getEncodedSchemeSpecificPart();
if (pkgName == null) {
showToast0(getString(R.string.failed_prase));
finish();
} else {
Expand All @@ -93,35 +89,11 @@ public void onCreate(Bundle savedInstanceState) {

}

private String[] getExistedVersion(String pkgname) {
PackageManager pm = getPackageManager();
ApplicationInfo applicationInfo = null;
try {
applicationInfo = pm.getApplicationInfo(pkgname, 0);
} catch (Exception ignore) {
}
if (applicationInfo == null) {
return null;
} else {
String apkPath = applicationInfo.sourceDir;
PackageInfo pkgInfo = pm.getPackageArchiveInfo(apkPath, PackageManager.GET_ACTIVITIES);
if (pkgInfo != null) {
pkgInfo.applicationInfo.sourceDir = apkPath;
pkgInfo.applicationInfo.publicSourceDir = apkPath;
return new String[]{pkgInfo.versionName,
Build.VERSION.SDK_INT < Build.VERSION_CODES.P ? Integer.toString(pkgInfo.versionCode) : Long.toString(pkgInfo.getLongVersionCode())};
} else {
return null;
}
}

}

private void initUninstall() {
String[] version = getExistedVersion(pkgname);
String[] version = AppInfoUtils.getApplicationVersion(this, pkgName);

packageLable = ApplicationLabelUtils.getApplicationLabel(this, null, null, pkgname);
if (ApplicationLabelUtils.UNINSTALLED.equals(packageLable)) {
packageLable = AppInfoUtils.getApplicationLabel(this, pkgName);
if (AppInfoUtils.UNINSTALLED.equals(packageLable)) {
packageLable = "Uninstalled";
}

Expand All @@ -137,7 +109,7 @@ private void initUninstall() {
.append(
String.format(
getString(R.string.message_packagename),
pkgname
pkgName
)
)
.append(nl);
Expand All @@ -155,7 +127,7 @@ private void initUninstall() {
builder.setTitle(getString(R.string.dialog_uninstall_title));
builder.setMessage(alertDialogMessage + nl + nl + getString(R.string.message_uninstalConfirm));
builder.setPositiveButton(android.R.string.yes, (dialogInterface, i) -> {
startUninstall(pkgname);
startUninstall(pkgName);
finish();
});
builder.setNegativeButton(android.R.string.no, (dialogInterface, i) -> finish());
Expand All @@ -180,7 +152,7 @@ private void initInstall() {
finish();
} else {

String[] version = getExistedVersion(apkinfo[1]);
String[] version = AppInfoUtils.getApplicationVersion(this, apkinfo[1]);

alertDialogMessage = new StringBuilder();
alertDialogMessage
Expand Down Expand Up @@ -274,6 +246,7 @@ private String reflectGetReferrer() {
try {
Class activityClass = Class.forName("android.app.Activity");

//noinspection JavaReflectionMemberAccess
Field refererField = activityClass.getDeclaredField("mReferrer");
refererField.setAccessible(true);
return (String) refererField.get(this);
Expand Down Expand Up @@ -301,8 +274,8 @@ private String[] checkInstallSource() {
}
}
String refererPackageLabel =
ApplicationLabelUtils.getApplicationLabel(this, null, null, fromPkgName);
if (ApplicationLabelUtils.UNINSTALLED.equals(refererPackageLabel)) {
AppInfoUtils.getApplicationLabel(this, fromPkgName);
if (AppInfoUtils.UNINSTALLED.equals(refererPackageLabel)) {
fromPkgLabel = ILLEGALPKGNAME;
} else {
fromPkgLabel = refererPackageLabel;
Expand Down Expand Up @@ -347,12 +320,12 @@ private String preInstall() {
showToast0(getString(R.string.failed_prase));
finish();
}
apkinfo = getApkPkgInfo(apkPath);
apkinfo = AppInfoUtils.getApkInfo(this, apkPath);
if (apkinfo != null) {
return apkPath;
} else {

if (ContentResolver.SCHEME_FILE.equals(uri.getScheme()) && apkPath != null && getExistedVersion("moe.shizuku.redirectstorage") != null) {
if (ContentResolver.SCHEME_FILE.equals(uri.getScheme()) && apkPath != null && AppInfoUtils.getApplicationVersion(this, "moe.shizuku.redirectstorage") != null) {
return checkSR(apkPath);
} else {
return null;
Expand All @@ -373,7 +346,7 @@ private String checkSR(@NonNull String apkPath) {
stringBuilder.insert(prefix.length(), toInsert);
apkPath = stringBuilder.toString();
Log.e("SRnewpath", apkPath);
apkinfo = getApkPkgInfo(apkPath);
apkinfo = AppInfoUtils.getApkInfo(this, apkPath);
if (apkinfo != null) {
return apkPath;
} else {
Expand All @@ -386,7 +359,7 @@ private String checkSR(@NonNull String apkPath) {

protected abstract void startInstall(String apkPath);

protected abstract void startUninstall(String pkgname);
protected abstract void startUninstall(String pkgName);

private void requestPermission() {
ActivityCompat.requestPermissions(this, permissions, 0x233);
Expand All @@ -397,9 +370,9 @@ private boolean checkPermission() {
return (permissionRead == 0);
}

void copyErr(String Err) {
void copyErr(String err) {
ClipboardManager clipboard = (ClipboardManager) getSystemService(Context.CLIPBOARD_SERVICE);
ClipData clipData = ClipData.newPlainText(null, Err);
ClipData clipData = ClipData.newPlainText(null, err);
Objects.requireNonNull(clipboard).setPrimaryClip(clipData);
}

Expand Down Expand Up @@ -451,23 +424,5 @@ private void deleteSingleFile(File file) {
}
}

private String[] getApkPkgInfo(String apkPath) {
if (apkPath == null) {
return null;
} else {
PackageManager pm = this.getPackageManager();
PackageInfo pkgInfo = pm.getPackageArchiveInfo(apkPath, PackageManager.GET_ACTIVITIES);

if (pkgInfo != null) {
pkgInfo.applicationInfo.sourceDir = apkPath;
pkgInfo.applicationInfo.publicSourceDir = apkPath;

return new String[]{pm.getApplicationLabel(pkgInfo.applicationInfo).toString(), pkgInfo.packageName, pkgInfo.versionName,
Build.VERSION.SDK_INT < Build.VERSION_CODES.P ?
Integer.toString(pkgInfo.versionCode) : Long.toString(pkgInfo.getLongVersionCode()), FileSizeUtils.getAutoFolderOrFileSize(apkPath)};
}
return null;
}
}

}
6 changes: 3 additions & 3 deletions app/src/main/java/com/modosa/dpmapkinstaller/activity/InstallActivity.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,12 +64,12 @@ public void startInstall(String apkPath) {
}

@Override
protected void startUninstall(String pkgname) {
Log.d("Start uninstall", pkgname);
protected void startUninstall(String pkgName) {
Log.d("Start uninstall", pkgName);
new Thread(() -> {
Looper.prepare();
try {
String result = PackageInstallerUtil.uninstallPackage(this, pkgname);
String result = PackageInstallerUtil.uninstallPackage(this, pkgName);
if (result == null) {
showToast0(String.format(getString(R.string.success_uninstall), packageLable));
} else {
Expand Down
Loading

0 comments on commit 99b9744

Please sign in to comment.