Reboot choose

nikita-yfh · Jul 24, 2022 · e0bb663 · e0bb663
1 parent c85cb8a
commit e0bb663
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 6 deletions.
diff --git a/app/src/main/java/ru/nikita/adb/FastbootActivity.java b/app/src/main/java/ru/nikita/adb/FastbootActivity.java
@@ -1,7 +1,5 @@
 package ru.nikita.adb;
 
-import java.util.HashMap;
-import java.util.Iterator;
 import java.util.List;
 import java.util.ArrayList;
 import android.os.Bundle;
@@ -11,7 +9,9 @@
 import android.widget.ArrayAdapter;
 import android.widget.Toast;
 import android.app.Activity;
+import android.app.AlertDialog;
 import android.content.Intent;
+import android.content.DialogInterface;
 import android.hardware.usb.UsbManager;
 import android.hardware.usb.UsbDevice;
 import ru.nikita.adb.FastbootVariablesListActivity;
@@ -78,8 +78,23 @@ public void deviceInfoAll(View view){
 	}
 	public void reboot(View view){
 		try {
-			if(getSelectedDevice().openConnection(this))
-				getSelectedDevice().reboot();
+			if(getSelectedDevice().openConnection(this)) {
+				AlertDialog.Builder b = new AlertDialog.Builder(this);
+				b.setTitle(R.string.reboot);
+				final String[] items = {
+					"",
+					"bootloader",
+					"recovery",
+				};
+				b.setItems(R.array.fastboot_reboot, new DialogInterface.OnClickListener() {
+					@Override
+					public void onClick(DialogInterface dialog, int which){
+						dialog.dismiss();
+						getSelectedDevice().reboot(items[which]);
+					}
+				});
+				b.show();
+			}
 		} catch(FastbootException e) {
 			e.showToast(this);
 		}

diff --git a/app/src/main/java/ru/nikita/adb/FastbootDevice.java b/app/src/main/java/ru/nikita/adb/FastbootDevice.java
@@ -86,8 +86,8 @@ private String readOnce() {
 		return response;
 	}
 
-	public void reboot() {
-		write("reboot");
+	public void reboot(String target) {
+		write("reboot-" + target);
 		readOnce();
 	}