Skip to content

Commit 4d4d384

Browse files
committed
missing @requiredpermission
1 parent f0fef1b commit 4d4d384

File tree

3 files changed

+21
-7
lines changed

3 files changed

+21
-7
lines changed

app/src/main/java/com/zeroone/concealexample/MainActivity.java

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,14 @@
11
package com.zeroone.concealexample;
22

3+
import android.Manifest;
34
import android.content.Intent;
5+
import android.content.pm.PackageManager;
46
import android.content.res.Resources;
57
import android.graphics.Bitmap;
68
import android.graphics.BitmapFactory;
79
import android.net.Uri;
810
import android.os.Environment;
11+
import android.support.v4.app.ActivityCompat;
912
import android.support.v7.app.AppCompatActivity;
1013
import android.os.Bundle;
1114
import android.util.Log;
@@ -31,14 +34,20 @@ protected void onCreate(Bundle savedInstanceState) {
3134
super.onCreate(savedInstanceState);
3235
setContentView(R.layout.activity_main);
3336

34-
File getFile = new File(Environment.getExternalStorageDirectory().getAbsolutePath()+"/.files/here.pdf");
37+
File getFile = new File(Environment.getExternalStorageDirectory().getAbsolutePath() + "/.files/here.pdf");
38+
39+
if (ActivityCompat.checkSelfPermission(this, Manifest.permission.READ_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED
40+
|| ActivityCompat.checkSelfPermission(this, Manifest.permission.WRITE_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED) {
41+
return;
42+
}
43+
3544

3645
new ConcealPrefRepository.Editor()
37-
.putString(NAME_KEY,"Hafiq Iqmal")
38-
.putInt(AGE_KEY,24)
39-
.putString(EMAIL_KEY,"[email protected]")
40-
.putImage(IMAGE_KEY,BitmapFactory.decodeResource(this.getResources(), R.mipmap.ic_launcher))
41-
.putFile(FILE_KEY,getFile,true)
46+
.putString(NAME_KEY, "Hafiq Iqmal")
47+
.putInt(AGE_KEY, 24)
48+
.putString(EMAIL_KEY, "[email protected]")
49+
.putImage(IMAGE_KEY, BitmapFactory.decodeResource(this.getResources(), R.mipmap.ic_launcher))
50+
.putFile(FILE_KEY, getFile, true)
4251
.apply();
4352

4453

library/src/main/java/com/zeroone/conceal/ConcealCrypto.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
package com.zeroone.conceal;
22

3+
import android.Manifest;
34
import android.content.Context;
45
import android.graphics.Bitmap;
56
import android.graphics.BitmapFactory;
7+
import android.support.annotation.RequiresPermission;
68
import android.util.Base64;
79
import android.util.Log;
810

@@ -133,6 +135,7 @@ public byte[] obscure(byte[] bytes){
133135
}
134136

135137
//encrypt files
138+
@RequiresPermission(allOf = {Manifest.permission.READ_EXTERNAL_STORAGE, Manifest.permission.WRITE_EXTERNAL_STORAGE})
136139
public File obscureFile(File file,boolean deleteOldFile){
137140
if (enableCrypto) {
138141
try {
@@ -199,6 +202,7 @@ public byte[] deObscure(byte[] cipher){
199202
}
200203

201204
//decrypt file
205+
@RequiresPermission(allOf = {Manifest.permission.READ_EXTERNAL_STORAGE, Manifest.permission.WRITE_EXTERNAL_STORAGE})
202206
public File deObscureFile(File file,boolean deleteOldFile){
203207
if (enableCrypto) {
204208
try {

library/src/main/java/com/zeroone/conceal/ConcealPrefRepository.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ public List<CryptoFile> getAllConcealEncryptedFiles(){
117117
return getListFiles(getDirectory());
118118
}
119119

120-
/* get list of key and values inside sharedpreferences */
120+
/* get list of key and values inside sharedPreferences */
121121
public Map<String,String> getAllSharedPrefData(){
122122
Map<String,?> keys = getPreferences().getAll();
123123
Map<String,String> data = new HashMap<>();
@@ -563,6 +563,7 @@ public Editor putImage(String key, File file){
563563
return this;
564564
}
565565

566+
@RequiresPermission(allOf = {Manifest.permission.READ_EXTERNAL_STORAGE, Manifest.permission.WRITE_EXTERNAL_STORAGE})
566567
public Editor putFile(String key,File file,boolean deleteOldFile){
567568
try {
568569
if (file.exists() && !FileUtils.isFileForImage(file)) {

0 commit comments

Comments
 (0)