fix permission

iebb · Dec 19, 2017 · e0de5bb · e0de5bb
1 parent 7658ff0
commit e0de5bb
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 1 deletion.
diff --git a/src/main/java/md/i0/krfam/MainActivity.java b/src/main/java/md/i0/krfam/MainActivity.java
@@ -1,17 +1,21 @@
 package md.i0.krfam;
 
+import android.Manifest;
 import android.app.AlertDialog;
 import android.app.Dialog;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
+import android.content.pm.PackageManager;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.graphics.Canvas;
 import android.graphics.Color;
 import android.graphics.Paint;
 import android.graphics.drawable.ColorDrawable;
 import android.os.Bundle;
+import android.support.v4.app.ActivityCompat;
+import android.support.v4.content.ContextCompat;
 import android.support.v7.app.AppCompatActivity;
 import android.text.Editable;
 import android.text.InputFilter;
@@ -647,6 +651,14 @@ public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
             }
         });
         registerForContextMenu(ACCOUNT_LIST);
+
+
+
+        int permission = ActivityCompat.checkSelfPermission(this, "android.permission.WRITE_EXTERNAL_STORAGE");
+        if (permission != PackageManager.PERMISSION_GRANTED) {
+            ActivityCompat.requestPermissions(this, new String[] {Manifest.permission.WRITE_EXTERNAL_STORAGE}, 1);
+        }
+
     }
 
     public void openSettings(View v) {
@@ -1262,5 +1274,14 @@ public void getPrevPage(View v) {
         CURRENT_OFFSET -= KRFAM.MAX_DISPLAY;
         getCurrentPage();
     }
+    @Override
+    public void onRequestPermissionsResult (int requestCode, String[] permissions, int[] grantResults) {
+        if (grantResults.length == 1 && PackageManager.PERMISSION_GRANTED == grantResults[0]) {
+
+        } else {
+            KRFAM.Toast("Unable to obtain permission!");
+        }
+    }
+
 
 }
diff --git a/src/main/java/md/i0/krfam/Server.java b/src/main/java/md/i0/krfam/Server.java
@@ -151,7 +151,8 @@ public void run() {
                     int num1 = binaryReader.readInt();
                     int num2 = num1 & 0x7F;
                     KRFAM.log("Save data Version: " + ((num1 & 65280) >> 8));
-                    int count1 = binaryReader.readByte() - num2;
+                    int b = (binaryReader.readByte() & 0xff);
+                    int count1 = b - num2;
 
                     byte[] iv = new byte[count1];
                     KRFAM.log("IV Length: " + count1);