Skip to content

Commit

Permalink
remove unnecessary use of FileProvider to support complex paths
Browse files Browse the repository at this point in the history
- use of FileProvider to generate Uris for image views isn't needed for
internal rendering of images
- FileProvider also removed spaces, emoji, or other user configured strings in the settings for the folder path
  • Loading branch information
n8fr8 committed Oct 3, 2018
1 parent 87f3062 commit 4504262
Showing 1 changed file with 4 additions and 15 deletions.
19 changes: 4 additions & 15 deletions src/main/java/org/havenapp/main/ui/EventTriggerAdapter.java
Original file line number Diff line number Diff line change
Expand Up @@ -18,18 +18,18 @@
import com.github.derlio.waveform.soundfile.SoundFile;
import com.stfalcon.frescoimageviewer.ImageViewer;

import org.havenapp.main.R;
import org.havenapp.main.model.EventTrigger;

import java.io.File;
import java.util.ArrayList;
import java.util.List;

import androidx.annotation.NonNull;
import androidx.core.content.FileProvider;
import androidx.recyclerview.widget.RecyclerView;
import nl.changer.audiowife.AudioWife;

import org.havenapp.main.R;

/**
* Created by n8fr8 on 4/16/17.
*/
Expand All @@ -42,8 +42,6 @@ public class EventTriggerAdapter extends RecyclerView.Adapter<EventTriggerAdapte

private OnItemClickListener clickListener;

private final static String AUTHORITY = "org.havenapp.main.fileprovider";

EventTriggerAdapter(Context context, List<EventTrigger> eventTriggers) {
this.context = context;
this.eventTriggers = eventTriggers;
Expand All @@ -54,12 +52,7 @@ public class EventTriggerAdapter extends RecyclerView.Adapter<EventTriggerAdapte
if (trigger.getType() == EventTrigger.CAMERA
&& (!TextUtils.isEmpty(trigger.getPath())))
{
Uri fileUri = FileProvider.getUriForFile(
context,
AUTHORITY,
new File(trigger.getPath()));

eventTriggerImagePaths.add(fileUri);
eventTriggerImagePaths.add(Uri.fromFile( new File(trigger.getPath())));
}
}
}
Expand Down Expand Up @@ -113,10 +106,7 @@ public boolean onLongClick(View view) {
case EventTrigger.CAMERA:
holder.image.setVisibility(View.VISIBLE);

Uri fileUri = FileProvider.getUriForFile(
context,
AUTHORITY,
new File(eventTrigger.getPath()));
Uri fileUri = Uri.fromFile(new File(eventTrigger.getPath()));
holder.image.setImageURI(fileUri);

holder.image.setOnClickListener(view -> {
Expand Down Expand Up @@ -170,7 +160,6 @@ public boolean reportProgress(double fractionComplete) {
audioWife.init(context, Uri.fromFile(fileSound))
.useDefaultUi(holder.extra, inflater);


break;
case EventTrigger.ACCELEROMETER:
desc += "\n" + context.getString(R.string.data_speed) + ": " + eventTrigger.getPath();
Expand Down

0 comments on commit 4504262

Please sign in to comment.