Skip to content

Commit

Permalink
2.2.1
Browse files Browse the repository at this point in the history 
Fix some text unreadable in light mode
Fix app creating empty AntiSplit-M folder when merging cancelled
Fix logs not empty after cancelling merging
add some more validation
  • Loading branch information
@AbdurazaaqMohammed
AbdurazaaqMohammed committed Feb 1, 2025
1 parent b0c28c6 commit 5a45295
Show file tree
Hide file tree
Showing 16 changed files with 173 additions and 59 deletions.
6 changes: 6 additions & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,9 @@
.cxx
local.properties
/images
/app/release
.idea/runConfigurations.xml
.idea/gradle.xml
.idea/vcs.xml
.idea/gradle.xml
.idea/deploymentTargetSelector.xml
2 changes: 1 addition & 1 deletion .idea/.name
View file

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

10 changes: 10 additions & 0 deletions .idea/deploymentTargetSelector.xml
View file

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

3 changes: 2 additions & 1 deletion .idea/gradle.xml
View file

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

17 changes: 17 additions & 0 deletions .idea/runConfigurations.xml
View file

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

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

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

4 changes: 2 additions & 2 deletions app/build.gradle.kts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ android {
applicationId = "com.abdurazaaqmohammed.AntiSplit"
minSdk = 19
targetSdk = 35
versionCode = 48
versionName = "2.2.0"
versionCode = 49
versionName = "2.2.1"
multiDexEnabled = true
}

Expand Down
107 changes: 79 additions & 28 deletions app/src/main/java/com/abdurazaaqmohammed/AntiSplit/main/MainActivity.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,12 @@
import android.annotation.TargetApi;
import android.app.Activity;
import android.app.DownloadManager;
import android.content.BroadcastReceiver;
import android.content.ClipData;
import android.content.ClipboardManager;
import android.content.Context;
import android.content.Intent;
import android.content.IntentFilter;
import android.content.SharedPreferences;
import android.content.pm.ApplicationInfo;
import android.content.pm.PackageInfo;
Expand Down Expand Up @@ -55,6 +57,7 @@
import androidx.activity.result.IntentSenderRequest;
import androidx.activity.result.contract.ActivityResultContracts;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.annotation.RequiresApi;
import androidx.appcompat.app.AlertDialog;
import androidx.appcompat.app.AppCompatActivity;
Expand All @@ -64,6 +67,7 @@
import com.abdurazaaqmohammed.AntiSplit.R;
import com.abdurazaaqmohammed.utils.CompareUtils;
import com.abdurazaaqmohammed.utils.DeviceSpecsUtil;
import com.abdurazaaqmohammed.utils.InstallUtil;
import com.abdurazaaqmohammed.utils.LanguageUtil;
import com.abdurazaaqmohammed.utils.LegacyUtils;
import com.abdurazaaqmohammed.utils.RunUtil;
Expand All @@ -74,6 +78,7 @@
import com.google.android.material.textfield.TextInputEditText;
import com.google.android.material.textfield.TextInputLayout;
import com.google.android.material.textview.MaterialTextView;
import com.reandroid.Merger;
import com.reandroid.apk.ApkBundle;
import com.reandroid.apkeditor.Util;
import com.starry.FileUtils;
Expand Down Expand Up @@ -204,11 +209,11 @@ protected void onCreate(Bundle savedInstanceState) {
.addCategory(Intent.CATEGORY_OPENABLE)
.setType("*/*")
.putExtra(Intent.EXTRA_ALLOW_MULTIPLE, true)
.putExtra(Intent.EXTRA_MIME_TYPES, com.abdurazaaqmohammed.utils.FileUtils.doesNotHaveStoragePerm(this) ?
new String[]{"application/zip", "application/vnd.android.package-archive", "application/octet-stream"} :
new String[]{"application/zip", "application/vnd.android.package-archive", "application/octet-stream", ""}) // XAPK usually octet-stream
.putExtra(Intent.EXTRA_MIME_TYPES,
new String[]{"application/zip", "application/vnd.android.package-archive", "application/octet-stream"}) // XAPK usually octet-stream
, 1)
);
cleanupAppFolder();

// Check if user shared or opened file with the app.
final Intent openIntent = getIntent();
Expand Down Expand Up @@ -293,6 +298,7 @@ public void onRequestPermissionsResult(int requestCode, @NonNull String[] permis

@Override
protected void onPause() {
unregisterReceiver(onDownloadComplete);
getSharedPreferences("set", Context.MODE_PRIVATE).edit()
.putBoolean("logEnabled", logEnabled)
.putInt("saveMode", saveMode)
Expand Down Expand Up @@ -425,11 +431,22 @@ public void toggleAnimation(boolean on) {
protected void onActivityResult(int requestCode, int resultCode, Intent data) {
super.onActivityResult(requestCode, resultCode, data);
if(requestCode == 9 && com.abdurazaaqmohammed.utils.FileUtils.doesNotHaveStoragePerm(this)) saveMode = 0;
else if (resultCode == RESULT_OK && data != null) switch (requestCode) {
else if(resultCode != RESULT_OK) {
((TextView) findViewById(R.id.logField)).setText("");
((TextView) findViewById(R.id.errorField)).setText("");
cleanupAppFolder();
}
else if (data != null) switch (requestCode) {
case 1:
// opened through button in the app
ClipData clipData = data.getClipData();
if (clipData == null) processOneSplitApkUri(data.getData());
if (clipData == null) {
Uri uri = data.getData();
if(uri == null) showError("input Uri null");
else if(uri.toString().endsWith(".apk")) {
showError(rss.getString(R.string.not_split));
} else processOneSplitApkUri(uri);
}
else {
//multiple files selected
Uri first = clipData.getItemAt(0).getUri();
Expand All @@ -453,6 +470,7 @@ else if (resultCode == RESULT_OK && data != null) switch (requestCode) {
case 2:
// going to process and save a file now
((TextView) findViewById(R.id.logField)).setText("");
((TextView) findViewById(R.id.errorField)).setText("");
process(data.getData());
break;
}
Expand All @@ -462,6 +480,38 @@ else if (resultCode == RESULT_OK && data != null) switch (requestCode) {
result -> {
if (result.getResultCode() == Activity.RESULT_OK) logger.logMessage("Deleted ");
});
@SuppressLint("UnspecifiedRegisterReceiverFlag")
@Override
protected void onResume() {
super.onResume();
if (LegacyUtils.supportsFileChannel) {
registerReceiver(onDownloadComplete, new IntentFilter(DownloadManager.ACTION_DOWNLOAD_COMPLETE), Context.RECEIVER_NOT_EXPORTED);
} else registerReceiver(onDownloadComplete, new IntentFilter(DownloadManager.ACTION_DOWNLOAD_COMPLETE));
}

long downloadId;
private final BroadcastReceiver onDownloadComplete = new BroadcastReceiver() {
@Override
public void onReceive(Context context, Intent intent) {
long id = intent.getLongExtra(DownloadManager.EXTRA_DOWNLOAD_ID, -1);

if (id == downloadId) {
DownloadManager.Query query = new DownloadManager.Query();
query.setFilterById(id);
DownloadManager downloadManager = (DownloadManager) getSystemService(DOWNLOAD_SERVICE);
try (Cursor cursor = downloadManager.query(query)) {
if (cursor.moveToFirst()) {
int columnIndex = cursor.getColumnIndex(DownloadManager.COLUMN_STATUS);
if (DownloadManager.STATUS_SUCCESSFUL == cursor.getInt(columnIndex)) {
int columnIndex1 = cursor.getColumnIndex(DownloadManager.COLUMN_LOCAL_URI);
String fileUri = cursor.getString(columnIndex1);
InstallUtil.installApk(MainActivity.this, Uri.parse(fileUri));
}
}
}
}
}
};

private void checkForUpdates(boolean toast) {
new Thread(() -> {
Expand All @@ -478,7 +528,6 @@ private void checkForUpdates(boolean toast) {
String latestVersion = "";
String changelog = "";
String dl = "";
// return new String[]{ver, changelog, dl};
boolean rightBranch = false;
while ((line = reader.readLine()) != null) {
if(line.contains("browser_download_url")) {
Expand All @@ -497,7 +546,7 @@ private void checkForUpdates(boolean toast) {
currentVer = null;
}
boolean newVer = false;
char[] curr = TextUtils.isEmpty(currentVer) ? new char[] {'2', '1', '1'} : currentVer.replace(".", "").toCharArray();
char[] curr = TextUtils.isEmpty(currentVer) ? new char[] {'2', '2', '1'} : currentVer.replace(".", "").toCharArray();
char[] latest = latestVersion.replace(".", "").toCharArray();

int maxLength = Math.max(curr.length, latest.length);
Expand Down Expand Up @@ -534,11 +583,14 @@ private void checkForUpdates(boolean toast) {
getHandler().post(() -> {
AlertDialog alertDialog = new MaterialAlertDialogBuilder(MainActivity.this).setCustomTitle(title).setView(changelogText).setPositiveButton(rss.getString(R.string.dl), (dialog, which) -> {
if (checkUpdateAfterStoragePermission == null)
checkUpdateAfterStoragePermission = () ->
((DownloadManager) MainActivity.this.getSystemService(DOWNLOAD_SERVICE)).enqueue(new DownloadManager.Request(Uri.parse(link))
.setTitle(filename).setDescription(filename).setMimeType("application/vnd.android.package-archive")
.setDestinationInExternalPublicDir(Environment.DIRECTORY_DOWNLOADS, filename)
.setNotificationVisibility(DownloadManager.Request.VISIBILITY_VISIBLE | DownloadManager.Request.VISIBILITY_VISIBLE_NOTIFY_COMPLETED));
checkUpdateAfterStoragePermission = () -> {
DownloadManager.Request request = new DownloadManager.Request(Uri.parse(link))
.setTitle(filename).setDescription(filename).setMimeType("application/vnd.android.package-archive")
.setDestinationInExternalPublicDir(Environment.DIRECTORY_DOWNLOADS, filename)
.setNotificationVisibility(DownloadManager.Request.VISIBILITY_VISIBLE | DownloadManager.Request.VISIBILITY_VISIBLE_NOTIFY_COMPLETED);
downloadId =
((DownloadManager) MainActivity.this.getSystemService(DOWNLOAD_SERVICE)).enqueue(request);
};
if (Build.VERSION.SDK_INT < 29 && com.abdurazaaqmohammed.utils.FileUtils.doesNotHaveStoragePerm(this))
MainActivity.this.checkStoragePerm(10);
else checkUpdateAfterStoragePermission.run();
Expand Down Expand Up @@ -688,11 +740,7 @@ private void showSuccess() {
runOnUiThread(() -> Toast.makeText(this, success, Toast.LENGTH_SHORT).show());
if(signApk && com.reandroid.Merger.signedApk != null) {
installButton.setVisibility(View.VISIBLE);
installButton.setOnClickListener(v -> //if (supportsFileChannel && !getPackageManager().canRequestPackageInstalls()) startActivityForResult(new Intent(Settings.ACTION_MANAGE_UNKNOWN_APP_SOURCES).setData(Uri.parse(String.format("package:%s", getPackageName()))), 1234);
startActivity(new Intent(Intent.ACTION_INSTALL_PACKAGE)
.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION)
.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP)
.setData(com.reandroid.Merger.signedApk)));
installButton.setOnClickListener(v -> InstallUtil.installApk(MainActivity.this, Merger.signedApk));
} else installButton.setVisibility(View.GONE);
}
}
Expand Down Expand Up @@ -784,7 +832,7 @@ public String getOriginalFileName(Uri uri) {

logger.logMessage(result);

return TextUtils.isEmpty(result) ? "filename_not_found" : result.replaceFirst("\\.(?:xapk|aspk|apk[sm])$", suffix + ".apk");
return TextUtils.isEmpty(result) ? "filename_not_found" : result.replaceFirst("\\.(?:zip|xapk|aspk|apk[sm])$", suffix + ".apk");
}

@SuppressLint("InlinedApi")
Expand Down Expand Up @@ -821,7 +869,7 @@ private void selectDirToSaveAPKOrSaveNow() {
}
String newFilePath = TextUtils.isEmpty(originalFilePath) ?
outputFolder + File.separator + getOriginalFileName(splitAPKUri) // If originalFilePath is null urisAreSplitApks must be true because getNameFromNonSplitApks will always return something
: originalFilePath.replaceFirst("\\.(?:xapk|aspk|apk[sm])", suffix + ".apk");
: originalFilePath.replaceFirst("\\.(?:zip|xapk|aspk|apk[sm])", suffix + ".apk");
if(TextUtils.isEmpty(newFilePath) ||
newFilePath.startsWith("/data/")
// || !(f = new File(newFilePath)).createNewFile() || f.canWrite()
Expand All @@ -832,6 +880,7 @@ private void selectDirToSaveAPKOrSaveNow() {
} else f = new File(outputFolder, urisAreSplitApks ? getOriginalFileName(splitAPKUri) : getNameFromNonSplitApks());

((TextView) findViewById(R.id.logField)).setText("");
((TextView) findViewById(R.id.errorField)).setText("");
f = com.abdurazaaqmohammed.utils.FileUtils.getUnusedFile(f);
logger.logMessage(rss.getString(R.string.output) + f);
process(Uri.fromFile(f));
Expand Down Expand Up @@ -1084,22 +1133,24 @@ public void afterTextChanged(Editable s) {
AlertDialog ad = new MaterialAlertDialogBuilder(MainActivity.this).setCustomTitle(title).setView(settingsDialog)
.setPositiveButton(rss.getString(R.string.close), (dialog, which) -> dialog.dismiss()).create();
MainActivity.this.styleAlertDialog(ad);
// CompoundButton askSwitch = settingsDialog.findViewById(R.id.ask);
// askSwitch.setChecked(ask);
// askSwitch.setOnCheckedChangeListener((buttonView, isChecked) -> {
// if (!(ask = isChecked) && com.abdurazaaqmohammed.utils.FileUtils.doesNotHaveStoragePerm(this)) {
// MainActivity.this.checkStoragePerm(9);
// ad.dismiss();
// }
// });

TextInputLayout dropdownLayout = settingsDialog.findViewById(R.id.dropdown_menu);
AutoCompleteTextView autoCompleteTextView = settingsDialog.findViewById(R.id.auto_complete_tv);

String[] items = {rss.getString(R.string.ask), rss.getString(R.string.same), rss.getString(R.string.pick_folder)};
dropdownLayout.setHint(rss.getString(R.string.file_save_method));

ArrayAdapter<String> adapter = new ArrayAdapter<>(this, R.layout.dropdownitem, items);
ArrayAdapter<String> adapter = new ArrayAdapter<String>(this, R.layout.dropdownitem, items) {
@NonNull
@Override
public View getView(int position, @Nullable View convertView, @NonNull ViewGroup parent) {
if(convertView == null) convertView = LayoutInflater.from(MainActivity.this).inflate(R.layout.dropdownitem, parent, false);
TextView view = (TextView) convertView;
view.setTextColor(theme == R.style.Theme_MyApp_Light ? Color.BLACK : Color.WHITE);
view.setText(items[position]);
return convertView;
}
};
autoCompleteTextView.setText(items[saveMode]);
autoCompleteTextView.setAdapter(adapter);
autoCompleteTextView.setThreshold(1);
Expand Down
11 changes: 7 additions & 4 deletions app/src/main/java/com/abdurazaaqmohammed/utils/DeviceSpecsUtil.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -105,8 +105,9 @@ private List<String> getListOfSplitsFromFile(File file) throws IOException {

public List<String> getListOfSplits(Uri splitAPKUri) throws IOException {
List<String> splits = new ArrayList<>();
File file = new File(FileUtils.getPath(splitAPKUri, context));
if(file.canRead()) return getListOfSplitsFromFile(file);
String path = FileUtils.getPath(splitAPKUri, context);
File file;
if(!TextUtils.isEmpty(path) && (file = new File(path)) != null && file.canRead()) return getListOfSplitsFromFile(file);

try (InputStream is = context.getContentResolver().openInputStream(splitAPKUri);
ZipFileInput zis = new ZipFileInput(is)) {
Expand All @@ -116,14 +117,16 @@ public List<String> getListOfSplits(Uri splitAPKUri) throws IOException {
if (name.endsWith(".apk")) splits.add(name);
}
} catch (Exception e) {
String uriString = splitAPKUri.toString();
try(InputStream is = context.getContentResolver().openInputStream(splitAPKUri)) {
com.abdurazaaqmohammed.utils.FileUtils.copyFile(is, file = new File(context.getCacheDir(), file.getName()));
com.abdurazaaqmohammed.utils.FileUtils.copyFile(is, file = new File(context.getCacheDir(), uriString.substring(uriString.lastIndexOf('/') + 1)));
return getListOfSplitsFromFile(file);
}
}
if(splits.size() > 1) return splits;
try(InputStream is = context.getContentResolver().openInputStream(splitAPKUri)) {
com.abdurazaaqmohammed.utils.FileUtils.copyFile(is, file = new File(context.getCacheDir(), file.getName()));
String uriString = splitAPKUri.toString();
com.abdurazaaqmohammed.utils.FileUtils.copyFile(is, file = new File(context.getCacheDir(), uriString.substring(uriString.lastIndexOf('/') + 1)));
return getListOfSplitsFromFile(file);
}
}
Expand Down
Loading

0 comments on commit 5a45295

Please sign in to comment.