Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Loading file update #19

Merged
merged 2 commits into from
Nov 7, 2023
Merged

Loading file update #19

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ff73b5f
update Threads
SlaVcE14 Nov 6, 2023
27a12c6
replace with lambda
SlaVcE14 Nov 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
105 changes: 50 additions & 55 deletions app/src/main/java/com/sjapps/jsonlist/MainActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@
import static com.sjapps.jsonlist.java.JsonFunctions.*;

import androidx.activity.OnBackPressedCallback;
import androidx.activity.result.ActivityResult;
import androidx.activity.result.ActivityResultCallback;
import androidx.activity.result.ActivityResultLauncher;
import androidx.activity.result.contract.ActivityResultContracts;
import androidx.appcompat.app.AppCompatActivity;
Expand All @@ -26,6 +24,8 @@
import android.widget.TextView;
import android.widget.Toast;

import com.google.android.material.snackbar.BaseTransientBottomBar;
import com.google.android.material.snackbar.Snackbar;
import com.google.gson.JsonArray;
import com.google.gson.JsonElement;
import com.google.gson.JsonObject;
Expand Down Expand Up @@ -56,6 +56,7 @@ public class MainActivity extends AppCompatActivity {
ViewGroup viewGroup;
AutoTransition autoTransition = new AutoTransition();
Handler handler = new Handler();
Thread readFileThread;

@Override
protected void onResume() {
Expand Down Expand Up @@ -87,16 +88,8 @@ protected void onCreate(Bundle savedInstanceState) {

Intent intent = getIntent();
Log.d(TAG, "onCreate: " + intent);
if (Intent.ACTION_VIEW.equals(intent.getAction())){

Log.d(TAG, "onCreate: " + intent.getData());

String FileData = FileSystem.LoadDataFromFile(this,intent.getData());
// Log.d(TAG, "onCreate: " + FileData);
if (FileData != null)
LoadData(FileData);
else
Log.d(TAG, "onCreate: null data");
if (Intent.ACTION_VIEW.equals(intent.getAction())) {
ReadFile(intent.getData());
}
if (intent.getAction().equals("android.intent.action.OPEN_FILE")){
ImportFromFile();
Expand Down Expand Up @@ -134,13 +127,8 @@ public void handleOnBackPressed() {
return;
}


TransitionManager.beginDelayedTransition(viewGroup, autoTransition);



data.goBack();

open(JsonData.getPathFormat(data.getPath()), data.getPath());
if (data.isEmptyPath()) {
backBtn.setVisibility(View.GONE);
Expand Down Expand Up @@ -188,13 +176,10 @@ private void LoadData(String Data) {
progressBar.setVisibility(View.VISIBLE);
emptyListTxt.setVisibility(View.GONE);

new Thread(() -> {
readFileThread = new Thread(() -> {
ArrayList<ListItem> temp = data.getRootList();
JsonElement element;
try {



element = JsonParser.parseString(Data);

} catch (OutOfMemoryError e) {
Expand Down Expand Up @@ -245,9 +230,8 @@ private void LoadData(String Data) {

handler.post(() -> progressBar.setVisibility(View.GONE));

}).start();


});
readFileThread.start();
}

public void open(String Title, String path) {
Expand Down Expand Up @@ -275,6 +259,11 @@ public void open(String Title, String path) {
}

private void ImportFromFile() {
if (readFileThread != null && readFileThread.isAlive()) {
Snackbar.make(getWindow().getDecorView(),"Loading file in progress, try again later", BaseTransientBottomBar.LENGTH_SHORT).show();
return;
}

Intent intent = new Intent(Intent.ACTION_GET_CONTENT);
intent.addCategory(Intent.CATEGORY_OPENABLE);
intent.setType("application/json");
Expand All @@ -284,41 +273,47 @@ private void ImportFromFile() {

ActivityResultLauncher<Intent> ActivityResultData = registerForActivityResult(
new ActivityResultContracts.StartActivityForResult(),
new ActivityResultCallback<ActivityResult>() {
@Override
public void onActivityResult(ActivityResult result) {
if (result.getResultCode() != Activity.RESULT_OK) {
if(result.getResultCode() == Activity.RESULT_CANCELED){
Toast.makeText(MainActivity.this,"Import data canceled",Toast.LENGTH_SHORT).show();
}
return;
}
if (result.getData() == null || result.getData().getData() == null){
Toast.makeText(MainActivity.this, "Fail to load data", Toast.LENGTH_SHORT).show();
return;
result -> {
if (result.getResultCode() != Activity.RESULT_OK) {
if(result.getResultCode() == Activity.RESULT_CANCELED){
Toast.makeText(MainActivity.this,"Import data canceled",Toast.LENGTH_SHORT).show();
}
//File
Uri uri = result.getData().getData();
progressBar.setVisibility(View.VISIBLE);
loadingFileTxt.setVisibility(View.VISIBLE);
new Thread(() -> {
String Data = FileSystem.LoadDataFromFile(MainActivity.this, uri);

if (Data == null) {
Log.d(TAG, "onActivityResult: null data");
return;
}
handler.post(() -> {
progressBar.setVisibility(View.GONE);
loadingFileTxt.setVisibility(View.GONE);
LoadData(Data);
});

}).start();

return;
}
if (result.getData() == null || result.getData().getData() == null){
Toast.makeText(MainActivity.this, "Fail to load data", Toast.LENGTH_SHORT).show();
return;
}
//File
ReadFile(result.getData().getData());
});

void ReadFile(Uri uri){
if (readFileThread != null && readFileThread.isAlive()){
return;
}
progressBar.setVisibility(View.VISIBLE);
loadingFileTxt.setVisibility(View.VISIBLE);


readFileThread = new Thread(() -> {
String Data = FileSystem.LoadDataFromFile(MainActivity.this, uri);

if (Data == null) {
Log.d(TAG, "ReadFile: null data");
return;
}
handler.post(() -> {
progressBar.setVisibility(View.GONE);
loadingFileTxt.setVisibility(View.GONE);
LoadData(Data);
});

});
readFileThread.start();

}

void fileTooLargeException(){
postMessageException("File is too large");
}
Expand Down