Skip to content

Commit

Permalink
Merge pull request #156 from brarcher/mimetype
Browse files Browse the repository at this point in the history
Report accurate mime type when sending backup data
  • Loading branch information
brarcher committed Nov 25, 2017
2 parents 7b4c119 + f480bd0 commit c760465
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 9 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@
import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.util.List;

public class ImportExportActivity extends AppCompatActivity
Expand Down Expand Up @@ -341,7 +340,7 @@ public void onClick(DialogInterface dialog, int which)
Uri outputUri = FileProvider.getUriForFile(ImportExportActivity.this, BuildConfig.APPLICATION_ID, path);
Intent sendIntent = new Intent(Intent.ACTION_SEND);
sendIntent.putExtra(Intent.EXTRA_STREAM, outputUri);
sendIntent.setType("text/plain");
sendIntent.setType("text/csv");

// set flag to give temporary permission to external app to use the FileProvider
sendIntent.setFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
Expand Down
4 changes: 0 additions & 4 deletions app/src/main/java/protect/card_locker/MainActivity.java
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,7 @@
import android.content.SharedPreferences;
import android.content.pm.PackageInfo;
import android.content.pm.PackageManager;
import android.content.pm.ShortcutInfo;
import android.content.pm.ShortcutManager;
import android.database.Cursor;
import android.os.Build;
import android.os.Bundle;
import android.support.v7.app.AlertDialog;
import android.support.v7.app.AppCompatActivity;
Expand All @@ -30,7 +27,6 @@
import com.google.common.collect.ImmutableMap;

import java.util.Calendar;
import java.util.List;
import java.util.Map;

import protect.card_locker.intro.IntroActivity;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,10 @@
package protect.card_locker.intro;

import android.os.Bundle;
import android.support.annotation.LayoutRes;
import android.support.v4.app.Fragment;

import com.github.paolorotolo.appintro.AppIntro;

import protect.card_locker.R;


public class IntroActivity extends AppIntro
{
Expand Down

0 comments on commit c760465

Please sign in to comment.