Skip to content

Commit

Permalink
Update to v6.45
Browse files Browse the repository at this point in the history
  • Loading branch information
exalab999 committed Jul 12, 2022
1 parent a9feec8 commit 6d74afb
Show file tree
Hide file tree
Showing 11 changed files with 191 additions and 24 deletions.
2 changes: 2 additions & 0 deletions AnLinux/.idea/misc.xml

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

4 changes: 2 additions & 2 deletions AnLinux/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ android {
applicationId "exa.lnx.a"
minSdkVersion 21
targetSdkVersion 33
versionCode 640
versionName "6.40 Stable"
versionCode 645
versionName "6.45 Stable"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
}
buildTypes {
Expand Down
Binary file modified AnLinux/app/release/app-release.apk
Binary file not shown.
4 changes: 2 additions & 2 deletions AnLinux/app/release/output-metadata.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
"type": "SINGLE",
"filters": [],
"attributes": [],
"versionCode": 640,
"versionName": "6.40 Stable",
"versionCode": 645,
"versionName": "6.45 Stable",
"outputFile": "app-release.apk"
}
],
Expand Down
5 changes: 1 addition & 4 deletions AnLinux/app/src/main/java/exa/lnx/a/DesktopEnvironment.java
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@ public void notifyUserToChooseDistro(){
checkBox3.setChecked(true);
}else if(distro.equals("Parrot")){
checkBox4.setChecked(true);
}else if(distro.equals("BackVox")){
}else if(distro.equals("BackBox")){
checkBox5.setChecked(true);
}else if(distro.equals("Fedora")){
checkBox6.setChecked(true);
Expand Down Expand Up @@ -265,9 +265,6 @@ public void onClick(View view) {
checkBox6.setText(R.string.not_Supported);
checkBox7.setEnabled(false);
checkBox7.setText(R.string.not_Supported);
}else if(s.contains("arm")){
checkBox4.setEnabled(false);
checkBox4.setText(R.string.not_Supported);
}
alertDialog.setPositiveButton(R.string.ok, new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int which) {
Expand Down
147 changes: 142 additions & 5 deletions AnLinux/app/src/main/java/exa/lnx/a/HeavyDE.java
Original file line number Diff line number Diff line change
Expand Up @@ -81,9 +81,20 @@ public void onClick(View v) {
public void onClick(View view) {
ClipboardManager clipboard = (ClipboardManager)context.getSystemService(Context.CLIPBOARD_SERVICE);
if(desktop.equals("KDE")){
if(distro.equals("Ubuntu")){
if(distro.equals("Ubuntu") | distro.equals("BackBox")){
ClipData clip = ClipData.newPlainText("Command", "wget https://github.com/EXALAB/Anlinux-Resources/raw/master/Scripts/DesktopEnvironment/Heavy/KDE/Ubuntu/de-ubuntu-kde.sh && bash de-ubuntu-kde.sh");
clipboard.setPrimaryClip(clip);
}else if(distro.equals("Fedora")){
if(s.contains("arm") && !s.equals("arm64-v8a")){
ClipData clip = ClipData.newPlainText("Command", "wget https://github.com/EXALAB/Anlinux-Resources/raw/master/Scripts/DesktopEnvironment/Heavy/KDE/Yum/arm/de-yum-kde.sh && bash de-yum-kde.sh");
clipboard.setPrimaryClip(clip);
}else{
ClipData clip = ClipData.newPlainText("Command", "wget https://github.com/EXALAB/Anlinux-Resources/raw/master/Scripts/DesktopEnvironment/Heavy/KDE/Yum/de-yum-kde.sh && bash de-yum-kde.sh");
clipboard.setPrimaryClip(clip);
}
} else{
ClipData clip = ClipData.newPlainText("Command", "wget https://github.com/EXALAB/Anlinux-Resources/raw/master/Scripts/DesktopEnvironment/Heavy/KDE/Apt/de-apt-kde.sh && bash de-apt-kde.sh");
clipboard.setPrimaryClip(clip);
}
}
Toast.makeText(context, getString(R.string.command_copied), Toast.LENGTH_SHORT).show();
Expand Down Expand Up @@ -152,6 +163,86 @@ public void notifyUserToChooseDistro(){
LayoutInflater layoutInflater = LayoutInflater.from(getActivity());
View view = layoutInflater.inflate(R.layout.heavyde_chooser2, nullParent);
final CheckBox checkBox = view.findViewById(R.id.checkBox);
final CheckBox checkBox2 = view.findViewById(R.id.checkBox2);
final CheckBox checkBox3 = view.findViewById(R.id.checkBox3);
final CheckBox checkBox4 = view.findViewById(R.id.checkBox4);
final CheckBox checkBox5 = view.findViewById(R.id.checkBox5);
final CheckBox checkBox6 = view.findViewById(R.id.checkBox6);

if(distro.equals("Ubuntu")){
checkBox.setChecked(true);
}else if(distro.equals("Debian")){
checkBox2.setChecked(true);
}else if(distro.equals("Kali")){
checkBox3.setChecked(true);
}else if(distro.equals("Parrot")){
checkBox4.setChecked(true);
}else if(distro.equals("BackBox")){
checkBox5.setChecked(true);
}else if(distro.equals("Fedora")){
checkBox6.setChecked(true);
}

checkBox.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
checkBox2.setChecked(false);
checkBox3.setChecked(false);
checkBox4.setChecked(false);
checkBox5.setChecked(false);
checkBox6.setChecked(false);
}
});
checkBox2.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
checkBox.setChecked(false);
checkBox3.setChecked(false);
checkBox4.setChecked(false);
checkBox5.setChecked(false);
checkBox6.setChecked(false);
}
});
checkBox3.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
checkBox.setChecked(false);
checkBox2.setChecked(false);
checkBox4.setChecked(false);
checkBox5.setChecked(false);
checkBox6.setChecked(false);
}
});
checkBox4.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
checkBox.setChecked(false);
checkBox2.setChecked(false);
checkBox3.setChecked(false);
checkBox5.setChecked(false);
checkBox6.setChecked(false);
}
});
checkBox5.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
checkBox.setChecked(false);
checkBox2.setChecked(false);
checkBox3.setChecked(false);
checkBox4.setChecked(false);
checkBox6.setChecked(false);
}
});
checkBox6.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
checkBox.setChecked(false);
checkBox2.setChecked(false);
checkBox3.setChecked(false);
checkBox4.setChecked(false);
checkBox5.setChecked(false);
}
});

alertDialog.setView(view);
alertDialog.setCancelable(false);
Expand All @@ -164,15 +255,61 @@ public void onClick(DialogInterface dialog, int which) {
button3.setEnabled(true);
button4.setEnabled(true);
}
}else{
if(distro.equals("Ubuntu")){
distro = "nothing";
}else if(checkBox2.isChecked()){
if(!distro.equals("Debian")){
distro = "Debian";
button3.setEnabled(true);
button4.setEnabled(true);
}
}else if(checkBox3.isChecked()){
if(!distro.equals("Kali")){
distro = "Kali";
button3.setEnabled(true);
button4.setEnabled(true);
}
}else if(checkBox4.isChecked()){
if(!distro.equals("Parrot")){
distro = "Parrot";
button3.setEnabled(true);
button4.setEnabled(true);
}
}else if(checkBox5.isChecked()){
if(!distro.equals("BackBox")){
distro = "BackBox";
button3.setEnabled(true);
button4.setEnabled(true);
}
}else if(checkBox6.isChecked()){
if(!distro.equals("Fedora")){
distro = "Fedora";
button3.setEnabled(true);
button4.setEnabled(true);
}
}
if(desktop.equals("KDE")){
if(distro.equals("Ubuntu")){
textView3.setText(getString(R.string.gui_step2, "apt-get update && apt-get install wget -y && wget https://github.com/EXALAB/Anlinux-Resources/raw/master/Scripts/DesktopEnvironment/Heavy/KDE/Ubuntu/de-ubuntu-kde.sh && bash de-ubuntu-kde.sh", "KDE"));
textView4.setText(getString(R.string.gui_step3, "./start-ubuntu.sh"));
}else if(distro.equals("Debian")){
textView3.setText(getString(R.string.gui_step2, "apt-get update && apt-get install wget -y && wget https://github.com/EXALAB/Anlinux-Resources/raw/master/Scripts/DesktopEnvironment/Heavy/KDE/Apt/de-apt-kde.sh && bash de-apt-kde.sh", "KDE"));
textView4.setText(getString(R.string.gui_step3, "./start-debian.sh"));
}else if(distro.equals("Kali")){
textView3.setText(getString(R.string.gui_step2, "apt-get update && apt-get install wget -y && wget https://github.com/EXALAB/Anlinux-Resources/raw/master/Scripts/DesktopEnvironment/Heavy/KDE/Apt/de-apt-kde.sh && bash de-apt-kde.sh", "KDE"));
textView4.setText(getString(R.string.gui_step3, "./start-kali.sh"));
}else if(distro.equals("Parrot")){
textView3.setText(getString(R.string.gui_step2, "apt-get update && apt-get install wget -y && wget https://github.com/EXALAB/Anlinux-Resources/raw/master/Scripts/DesktopEnvironment/Heavy/KDE/Apt/de-apt-kde.sh && bash de-apt-kde.sh", "KDE"));
textView4.setText(getString(R.string.gui_step3, "./start-parrot.sh"));
}else if(distro.equals("BackBox")){
textView3.setText(getString(R.string.gui_step2, "apt-get update && apt-get install wget -y && wget https://github.com/EXALAB/Anlinux-Resources/raw/master/Scripts/DesktopEnvironment/Heavy/KDE/Ubuntu/de-ubuntu-kde.sh && bash de-ubuntu-kde.sh", "KDE"));
textView4.setText(getString(R.string.gui_step3, "./start-backbox.sh"));
}else if(distro.equals("Fedora")){
if(s.contains("arm") && !s.equals("arm64-v8a")){
textView3.setText(getString(R.string.gui_step2, "apt-get update && apt-get install wget -y && wget https://github.com/EXALAB/Anlinux-Resources/raw/master/Scripts/DesktopEnvironment/Heavy/KDE/Yum/arm/de-yum-kde.sh && bash de-yum-kde.sh", "KDE"));
textView4.setText(getString(R.string.gui_step3, "./start-fedora.sh"));
}else{
textView3.setText(getString(R.string.gui_step2, "apt-get update && apt-get install wget -y && wget https://github.com/EXALAB/Anlinux-Resources/raw/master/Scripts/DesktopEnvironment/Heavy/KDE/Yum/de-yum-kde.sh && bash de-yum-kde.sh", "KDE"));
textView4.setText(getString(R.string.gui_step3, "./start-fedora.sh"));
}
}
}
dialog.dismiss();
Expand Down Expand Up @@ -239,4 +376,4 @@ private boolean isPackageInstalled(String packageName, PackageManager packageMan
return false;
}
}
}
}
3 changes: 0 additions & 3 deletions AnLinux/app/src/main/java/exa/lnx/a/SSH.java
Original file line number Diff line number Diff line change
Expand Up @@ -259,9 +259,6 @@ public void onClick(View view) {
checkBox6.setText(R.string.not_Supported);
checkBox8.setEnabled(false);
checkBox8.setText(R.string.not_Supported);
}else if(s.contains("arm")){
checkBox4.setEnabled(false);
checkBox4.setText(R.string.not_Supported);
}
alertDialog.setPositiveButton(R.string.ok, new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int which) {
Expand Down
3 changes: 0 additions & 3 deletions AnLinux/app/src/main/java/exa/lnx/a/Uninstaller.java
Original file line number Diff line number Diff line change
Expand Up @@ -449,9 +449,6 @@ public void onClick(View view) {
checkBox9.setText(R.string.not_Supported);
checkBox11.setText(R.string.not_Supported);
checkBox12.setText(R.string.not_Supported);
}else if(s.contains("arm")){
checkBox5.setEnabled(false);
checkBox5.setText(R.string.not_Supported);
}
alertDialog.setPositiveButton(R.string.ok, new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int which) {
Expand Down
3 changes: 0 additions & 3 deletions AnLinux/app/src/main/java/exa/lnx/a/WindowManager.java
Original file line number Diff line number Diff line change
Expand Up @@ -218,9 +218,6 @@ public void onClick(View view) {
if(s.equals("i386")){
checkBox6.setEnabled(false);
checkBox6.setText(R.string.not_Supported);
}else if(s.contains("arm")){
checkBox4.setEnabled(false);
checkBox4.setText(R.string.not_Supported);
}
alertDialog.setPositiveButton(R.string.ok, new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int which) {
Expand Down
40 changes: 40 additions & 0 deletions AnLinux/app/src/main/res/layout/heavyde_chooser2.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,46 @@
android:layout_margin="10dp"
android:text="Ubuntu"/>

<CheckBox
android:id="@+id/checkBox2"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="10dp"
android:layout_below="@id/checkBox"
android:text="Debian"/>

<CheckBox
android:id="@+id/checkBox3"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="10dp"
android:layout_below="@id/checkBox2"
android:text="Kali"/>

<CheckBox
android:id="@+id/checkBox4"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="10dp"
android:layout_below="@id/checkBox3"
android:text="Parrot Security OS"/>

<CheckBox
android:id="@+id/checkBox5"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="10dp"
android:layout_below="@id/checkBox4"
android:text="BackBox"/>

<CheckBox
android:id="@+id/checkBox6"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="10dp"
android:layout_below="@id/checkBox5"
android:text="Fedora"/>

</RelativeLayout>

</ScrollView>
4 changes: 2 additions & 2 deletions AnLinux/app/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -69,8 +69,8 @@
<string name="de_step2_choose_first">Step 2: Please choose a Desktop Environment</string>
<string name="de_step3_choose_first">Step 3: Please choose a Desktop Environment first</string>
<string name="de_step4_choose_first">Step 4: Please choose a Desktop Environment first</string>
<string name="gui_step2">Step 2 : Copy the command to clipboard : %1$s \n\nThis should setup %2$s and Tiger VNC on the Linux System.</string>
<string name="gui_step3">Step 3 : Start Termux, paste and enter the command to install the desktop environment. Remember: you will need to run %1$s to run the Linux System before using this command.</string>
<string name="gui_step2">Step 3 : Copy the command to clipboard : %1$s \n\nThis should setup %2$s and Tiger VNC on the Linux System.</string>
<string name="gui_step3">Step 4 : Start Termux, paste and enter the command to install the desktop environment. Remember: you will need to run %1$s to run the Linux System before using this command.</string>
<string name="dashboard_step2">Step 2 : Copy the command to clipboard : %1$s \n\nThis should install %2$s on your system, you can then run %3$s to run the command line.</string>
<string name="dashboard_step3">Step 3 : Start Termux, paste and enter the command to install distro. Remember: you will need to run %1$s to run the command line.</string>
<string name="dashboard_step2_arch">Step 2 : Copy the command to clipboard : %1$s \n\nThis should install %2$s on your system, you can then run %3$s to run the command line.\n\nAfter that, you will need to run: chmod 755 additional.sh &amp;&amp; ./additional.sh to setup resolv.conf and pacman-key, otherwise network connection and pacman wont work!!! (First time only)</string>
Expand Down

0 comments on commit 6d74afb

Please sign in to comment.