mirror
/
SSTVEncoder2
kopia lustrzana https://github.com/olgamiller/SSTVEncoder2
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

Prevent ErrnoException class not found error for API level 15

pull/3/head
Olga Miller 2017-01-07 16:41:58 +01:00
rodzic 2e68bb431a
commit c08b6e7c4b
1 zmienionych plików z 4 dodań i 2 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

6
app/src/main/java/om/sstvencoder/MainActivity.java
Wyświetl plik

@ -30,6 +30,7 @@ import android.os.Build;
import android.os.Bundle; import android.os.Bundle;
import android.provider.MediaStore; import android.provider.MediaStore;
import android.support.annotation.NonNull; import android.support.annotation.NonNull;
import android.support.annotation.RequiresApi;
import android.support.v4.app.ActivityCompat; import android.support.v4.app.ActivityCompat;
import android.support.v4.content.ContextCompat; import android.support.v4.content.ContextCompat;
import android.support.v7.app.AppCompatActivity; import android.support.v7.app.AppCompatActivity;
@ -112,7 +113,8 @@ public class MainActivity extends AppCompatActivity {
try { try {
stream = resolver.openInputStream(uri); stream = resolver.openInputStream(uri);
} catch (Exception ex) { // e.g. FileNotFoundException, SecurityException } catch (Exception ex) { // e.g. FileNotFoundException, SecurityException
if (isPermissionException(ex) && needsRequestReadPermission()) { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M && isPermissionException(ex)
&& needsRequestReadPermission()) {
requestReadPermission(REQUEST_LOAD_IMAGE_PERMISSION); requestReadPermission(REQUEST_LOAD_IMAGE_PERMISSION);
return false; return false;
} }
@ -150,7 +152,7 @@ public class MainActivity extends AppCompatActivity {
return type != null && type.startsWith("image/"); return type != null && type.startsWith("image/");
} }
@TargetApi(Build.VERSION_CODES.LOLLIPOP) @RequiresApi(Build.VERSION_CODES.LOLLIPOP)
private boolean isPermissionException(Exception ex) { private boolean isPermissionException(Exception ex) {
return ex.getCause() instanceof ErrnoException return ex.getCause() instanceof ErrnoException
&& ((ErrnoException) ex.getCause()).errno == OsConstants.EACCES; && ((ErrnoException) ex.getCause()).errno == OsConstants.EACCES;