Skip to content

Commit c08c7cc

Browse files
committed
Cleaning up code and removing over caffeinated speculative generality in my custom exception class
1 parent f0e300c commit c08c7cc

3 files changed

Lines changed: 6 additions & 37 deletions

File tree

AndroidFilePickerLightLibrary/src/main/java/com/maxieds/androidfilepickerlightlibrary/DisplayFragments.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -286,12 +286,10 @@ public static void resetLayout(View layoutContainer, DisplayTypes.FileType fileI
286286

287287
public static class FolderNavigationFragment {
288288

289-
public static TextView dirsTwoBackText = null;
290289
public static TextView dirsOneBackText = null;
291290

292291
public static FolderNavigationFragment createNewFolderNavFragment(View navBtnsContainerView) {
293292
FolderNavigationFragment folderNavFragment = new FolderNavigationFragment();
294-
dirsTwoBackText = FileChooserActivity.getInstance().findViewById(R.id.mainDirNavBackTwoPathDisplayText);
295293
dirsOneBackText = FileChooserActivity.getInstance().findViewById(R.id.mainDirNavBackOnePathDisplayText);
296294
updateFolderHistoryPaths(null, true);
297295
return folderNavFragment;
@@ -314,14 +312,12 @@ public static void updateFolderHistoryPaths(String nextFolderEntryPointPath, boo
314312
folderHistoryOneBackPath = nextFolderEntryPointPath;
315313
}
316314
DisplayFragments.FolderNavigationFragment.dirsOneBackText.setText(folderHistoryOneBackPath);
317-
//DisplayFragments.FolderNavigationFragment.dirsTwoBackText.setText(folderHistoryTwoBackPath);
318315
}
319316

320317
public static void backupFolderHistoryPaths() {
321318
folderHistoryOneBackPath = folderHistoryTwoBackPath;
322319
folderHistoryTwoBackPath = EMPTY_FOLDER_HISTORY_PATH;
323320
DisplayFragments.FolderNavigationFragment.dirsOneBackText.setText(folderHistoryOneBackPath);
324-
//DisplayFragments.FolderNavigationFragment.dirsTwoBackText.setText(folderHistoryTwoBackPath);
325321
}
326322

327323
public void cancelAllOperationsInProgress() {

AndroidFilePickerLightLibrary/src/main/java/com/maxieds/androidfilepickerlightlibrary/FileChooserException.java

Lines changed: 6 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,10 @@ private static int claimNextUniqueErrorCode() {
3939

4040
/* Custom formatting and packaging/preparation of the returned data expected by the
4141
* client application (basically a rough serialization to byte buffer type object spec):
42+
*
43+
* Leaving this in as a spec for later. Maybe it will become more useful as the library
44+
* grows and Android 11+ forces users to use newer functionality to access files on the
45+
* local disk.
4246
*/
4347
public interface ExceptionDataFieldFormatter {
4448

@@ -110,36 +114,19 @@ protected void configureExceptionParams(int errorCode, String baseExcptDesc, boo
110114
this.isError = defaultIsError;
111115
}
112116

117+
/* Standard-ish Exception class handling and methods: */
113118
@Override
114119
public String getMessage() {
115120
return getErrorMessage();
116121
}
117-
118-
/* Standard-ish Exception class handling and methods: */
119-
public String getExceptionMessage() { return null; }
120-
public String[] getStackTraceAsStringArray() { return null; }
121122
public String toString() { return getMessage(); }
122123

123124
/* For uses of communicating other information by exception: */
124125
public boolean isError() { return isError; }
125126
public int getErrorCode() { return errorCode; }
126-
public Intent getAsIntent() { return null; }
127+
public Intent packageAsIntent() { return null; }
127128
public String getCauseAsString() { return this.getClass().getName(); }
128-
129-
/* Custom error messages and printing methods: */
130-
public String getExceptionName() { return this.getClass().getName(); }
131-
public String getExceptionBaseDesc() { return null; }
132129
public String getErrorMessage() { return errorMsg; }
133-
public String getErrorMessageFull() { return null; }
134-
public String getInvokingSourceFile() { return null; }
135-
public int getInvokingLineNumber() { return -1; }
136-
public String prettyPrintException(boolean verboseStackTrace) { return null; }
137-
138-
/* Obtaining file selection data passed by the exceptional instance: */
139-
public boolean hasDataItems() { return false; }
140-
public int dataTypeItemsCount() { return 0; }
141-
public <DataTypeT extends Object> DataTypeT getTypedDataSingle() { return null; }
142-
public <DataTypeT extends Object> List<DataTypeT> getTypedDataAsList() { return null; }
143130

144131
private static String resolveFilePathFromObjectType(Object dataItem) {
145132
if(dataItem instanceof String) {

AndroidFilePickerLightLibrary/src/main/res/layout/main_picker_activity_base_layout.xml

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -151,20 +151,6 @@
151151
android:typeface="serif"
152152
/>
153153

154-
<TextView
155-
android:id="@+id/mainDirNavBackTwoPathDisplayText"
156-
android:layout_width="wrap_content"
157-
android:layout_height="wrap_content"
158-
android:gravity="left|center_vertical"
159-
android:layout_gravity="left|center_vertical"
160-
android:text=""
161-
android:textColor="?__colorPrimaryDark"
162-
android:textSize="14sp"
163-
android:textStyle="normal|bold"
164-
android:typeface="serif"
165-
android:visibility="gone"
166-
/>
167-
168154
</LinearLayout>
169155

170156
</LinearLayout>

0 commit comments

Comments
 (0)