hopefully this will fix some crashes

Calsign · May 17, 2020 · 4597902 · 4597902
1 parent d0121af
commit 4597902
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 20 deletions.
diff --git a/APDE/src/main/java/com/calsignlabs/apde/APDE.java b/APDE/src/main/java/com/calsignlabs/apde/APDE.java
@@ -811,23 +811,27 @@ public static enum StorageDriveType {
 	final static double BYTE_PER_GB = 1_073_741_824.0d; // 1024^3
 
 	public static String getAvailableSpace(File drive) {
-		StatFs stat = new StatFs(drive.getAbsolutePath());
-
-		DecimalFormat df = new DecimalFormat("#.00");
-		df.setRoundingMode(RoundingMode.HALF_UP);
-
-		long available;
-		long total;
-
-		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR2) {
-			available = stat.getAvailableBytes();
-			total = stat.getTotalBytes();
-		} else {
-			available = stat.getAvailableBlocks() * stat.getBlockSize();
-			total = stat.getBlockCount() * stat.getBlockSize();
+		try {
+			StatFs stat = new StatFs(drive.getAbsolutePath());
+
+			DecimalFormat df = new DecimalFormat("#.00");
+			df.setRoundingMode(RoundingMode.HALF_UP);
+
+			long available;
+			long total;
+
+			if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR2) {
+				available = stat.getAvailableBytes();
+				total = stat.getTotalBytes();
+			} else {
+				available = stat.getAvailableBlocks() * stat.getBlockSize();
+				total = stat.getBlockCount() * stat.getBlockSize();
+			}
+
+			return df.format(available / BYTE_PER_GB) + " GB free of " + df.format(total / BYTE_PER_GB) + " GB";
+		} catch (IllegalArgumentException e) {
+			return "Failed to stat FS";
 		}
-
-		return df.format(available / BYTE_PER_GB) + " GB free of " + df.format(total / BYTE_PER_GB) + " GB";
 	}
 
 	/**

diff --git a/APDE/src/main/java/com/calsignlabs/apde/EditorActivity.java b/APDE/src/main/java/com/calsignlabs/apde/EditorActivity.java
@@ -722,9 +722,11 @@ public void onGlobalLayout() {
 						consoleWasHidden = false;
 					}
 
-					// Remove any unnecessary focus from the code area
-					getSelectedCodeArea().clearFocus();
-					getSelectedCodeArea().matchingBracket = -1;
+					if (getSelectedCodeArea() != null) {
+						// Remove any unnecessary focus from the code area
+						getSelectedCodeArea().clearFocus();
+						getSelectedCodeArea().matchingBracket = -1;
+					}
 
 					// Update the character insert tray
 					toggleCharInsertsProblemOverviewButton(true, true);
@@ -1322,7 +1324,7 @@ public void onResume() {
 
 		Intent intent = getIntent();
 
-		if ((intent.getAction().equals(Intent.ACTION_VIEW) || intent.getAction().equals(Intent.ACTION_EDIT))) {
+		if (intent.getAction() != null && (intent.getAction().equals(Intent.ACTION_VIEW) || intent.getAction().equals(Intent.ACTION_EDIT)) && intent.getData() != null) {
 			String scheme = intent.getData().getScheme();
 			String filePath = intent.getData().getPath();