Browse Source

Merge pull request #372 from nextcloud/fixSendLogCrash

fix crash during log sending when exposing URI on Android 7+
Andy Scherzinger 8 years ago
parent
commit
d8f07d3abc
1 changed files with 12 additions and 3 deletions
  1. 12 3
      src/com/owncloud/android/ui/activity/LogHistoryActivity.java

+ 12 - 3
src/com/owncloud/android/ui/activity/LogHistoryActivity.java

@@ -23,10 +23,12 @@ import android.content.ActivityNotFoundException;
 import android.content.Intent;
 import android.net.Uri;
 import android.os.AsyncTask;
+import android.os.Build;
 import android.os.Bundle;
 import android.support.v4.app.Fragment;
 import android.support.v4.app.FragmentManager;
 import android.support.v4.app.FragmentTransaction;
+import android.support.v4.content.FileProvider;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.View.OnClickListener;
@@ -150,11 +152,18 @@ public class LogHistoryActivity extends ToolbarActivity {
         ArrayList<Uri> uris = new ArrayList<Uri>();
 
         // Convert from paths to Android friendly Parcelable Uri's
-        for (String file : Log_OC.getLogFileNames())
-        {
+        for (String file : Log_OC.getLogFileNames()) {
             File logFile = new File(mLogPath, file);
             if (logFile.exists()) {
-                uris.add(Uri.fromFile(logFile));
+                if (Build.VERSION.SDK_INT < Build.VERSION_CODES.N) {
+                    uris.add(Uri.fromFile(logFile));
+                } else {
+                    uris.add(FileProvider.getUriForFile(
+                            this,
+                            getString(R.string.file_provider_authority),
+                            logFile
+                    ));
+                }
             }
         }