Skip to content

Various fixes to save-as dialog #17

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

Open
jnlon wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Various fixes to save-as dialog #17

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b5b09a3
Show save as dialog on main thread
jnlon Aug 25, 2019
d135701
Fix filename extension detection regex
jnlon Aug 25, 2019
14d5b7f
Fix client not saving to downloads directory
jnlon Aug 25, 2019
dea7624
Apply user file name input from save as dialog
jnlon Aug 25, 2019
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
51 changes: 25 additions & 26 deletions app/src/main/java/com/gmail/afonsotrepa/pocketgopher/gopherclient/Page.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ public void download(final Context context)
}

//AlertDialog to be shown when method gets called
AlertDialog.Builder alertDialog = new AlertDialog.Builder(context);
final AlertDialog.Builder alertDialog = new AlertDialog.Builder(context);
alertDialog.setTitle("Save as:");

//the EditText where the user will input the name of the file
Expand All @@ -92,8 +92,9 @@ public void download(final Context context)
input.setText(selector.substring(selector.lastIndexOf("/") + 1)); //default file name
input.setTextAppearance(context, MainActivity.font);
alertDialog.setView(input);
final String fileName = input.getText().toString();

// create the handler for running UI code on main thread
final Handler handler = new Handler(Looper.getMainLooper());

alertDialog.setPositiveButton("Save",
new DialogInterface.OnClickListener()
Expand All @@ -106,14 +107,14 @@ public void onClick(final DialogInterface dialog, int which)
@Override
public void run()
{
Handler handler = new Handler(Looper.getMainLooper());

//get the downloads directory name
final String downloadDirectory =
Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOWNLOADS).toString();

//file is always saved in the download directory atm
File file = new File(
Environment.getExternalStoragePublicDirectory(Environment
.DIRECTORY_DOWNLOADS) +
"/" + fileName
);
final String fileName = input.getText().toString();
File file = new File(downloadDirectory + "/" + fileName);

try
{
Expand All @@ -122,28 +123,18 @@ public void run()
{
n += 1;

if (fileName.matches("(.*).(.*)"))
if (fileName.matches("(.*)\\.(.*)"))
{
file = new File(
Environment.getExternalStoragePublicDirectory
(Environment
.DIRECTORY_DOWNLOADS) +
"/" + fileName.substring(0, fileName
.indexOf
('.')) +
file = new File(downloadDirectory + "/" +
fileName.substring(0, fileName.indexOf('.')) +
"(" + String.valueOf(n) + ")" +
fileName.substring(fileName.indexOf(
'.'))
fileName.substring(fileName.indexOf('.'))
);
}
else
{
file = new File(
Environment.getExternalStoragePublicDirectory
(Environment
.DIRECTORY_DOWNLOADS) +
fileName +
"(" + String.valueOf(n) + ")"
file = new File(downloadDirectory + "/" +
fileName + "(" + String.valueOf(n) + ")"
);
}
}
Expand Down Expand Up @@ -178,7 +169,7 @@ public void run()
public void run()
{
Toast.makeText(context,
"File saved saved as: " + f.getName(),
"File saved as: " + f.getName(),
Toast.LENGTH_SHORT
).show();
}
Expand Down Expand Up @@ -216,7 +207,15 @@ public void onClick(DialogInterface dialog, int which)
}
);

alertDialog.show();
// show the alert dialog
handler.post(new Runnable()
{
@Override
public void run()
{
alertDialog.show();
}
});
}


Expand Down