app

@@ -1 +1 @@
-Subproject commit 54b10c818e5c49a74044d076841f9e57a6ad1dc1
+Subproject commit d362d9e8dd9e0f87262bcb61f996182633e7f008

src/main/java/io/lbry/browser/LbrynetService.java

@@ -242,7 +242,9 @@ public class LbrynetService extends PythonService {
                     try {
                         JSONObject response = new JSONObject(fileList);
                         if (!response.has("error")) {
-                            JSONArray fileItems = response.optJSONArray("result");
+                            JSONObject result = response.getJSONObject("result");
+                            if (result != null) {
+                                JSONArray fileItems = response.optJSONArray("items");
                                 if (fileItems != null && fileItems.length() > 0) {
                                     // TODO: Create Java FileItem class
                                     JSONObject item = fileItems.getJSONObject(0);
@@ -267,6 +269,7 @@ public class LbrynetService extends PythonService {
                                     }
                                 }
                             }
+                        }
                     } catch (JSONException ex) {
                         // pass
                     }
@@ -287,7 +290,9 @@ public class LbrynetService extends PythonService {
     private void handlePollFileResponse(JSONObject response) {
         Context context = getApplicationContext();
         if (response.has("result")) {
-            JSONArray fileItems = response.optJSONArray("result");
+            JSONObject result = response.optJSONObject("result");
+            if (result != null) {
+                JSONArray fileItems = result.optJSONArray("items");
                 if (fileItems != null) {
                     try {
                         //List<String> itemUris = new ArrayList<String>();
@@ -301,6 +306,7 @@ public class LbrynetService extends PythonService {
                             String claimId = item.getString("claim_id");
                             String claimName = item.getString("claim_name");
                             String uri = String.format("lbry://%s#%s", claimName, claimId);
+
                             boolean completed = item.getBoolean("completed");
                             double writtenBytes = item.optDouble("written_bytes", -1);
                             double totalBytes = item.optDouble("total_bytes", -1);
@@ -358,6 +364,7 @@ public class LbrynetService extends PythonService {
                     }
                 }
             }
+        }
 
         if (!downloadManager.hasActiveDownloads()) {
             // stop polling

src/main/java/io/lbry/browser/MainActivity.java

@@ -38,6 +38,8 @@ import com.facebook.react.bridge.Arguments;
 import com.facebook.react.bridge.ReactContext;
 import com.facebook.react.bridge.WritableArray;
 import com.facebook.react.bridge.WritableMap;
+import com.facebook.react.bridge.ReadableNativeArray;
+import com.facebook.react.bridge.ReadableNativeMap;
 import com.facebook.react.modules.core.DeviceEventManagerModule;
 import com.facebook.react.modules.core.PermissionAwareActivity;
 import com.facebook.react.modules.core.PermissionListener;
@@ -128,14 +130,6 @@ public class MainActivity extends Activity implements DefaultHardwareBackBtnHand
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-            // Request external storage permission on Android version >= 6
-            checkPermission(Manifest.permission.WRITE_EXTERNAL_STORAGE,
-                            STORAGE_PERMISSION_REQ_CODE,
-                            "LBRY requires access to your device storage to be able to download files and media.",
-                            this);
-        }
-
         super.onCreate(savedInstanceState);
         currentActivity = this;
 
@@ -365,6 +359,7 @@ public class MainActivity extends Activity implements DefaultHardwareBackBtnHand
 
     @Override
     public void onRequestPermissionsResult(int requestCode, String permissions[], int[] grantResults) {
+        ReactContext reactContext = mReactInstanceManager.getCurrentReactContext();
         switch (requestCode) {
             case STORAGE_PERMISSION_REQ_CODE:
                 if (grantResults.length > 0 && grantResults[0] == PackageManager.PERMISSION_GRANTED) {
@@ -373,22 +368,25 @@ public class MainActivity extends Activity implements DefaultHardwareBackBtnHand
                                                    Uri.parse("package:" + getPackageName()));
                         startActivityForResult(intent, OVERLAY_PERMISSION_REQ_CODE);
                     }
-                } else {
+                    if (reactContext != null) {
-                    // Permission not granted. Show a message and terminate the application
+                        reactContext.getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class)
-                    Toast.makeText(this,
+                            .emit("onStoragePermissionGranted", null);
-                        "LBRY requires access to your device storage to be able to download files and media." +
+                    }
-                        " Please enable the storage permission and restart the app.", Toast.LENGTH_LONG).show();
+                } else {
-                    if (serviceRunning) {
+                    // Permission not granted
-                        ServiceHelper.stop(this, LbrynetService.class);
+                    /*Toast.makeText(this,
+                        "LBRY requires access to your device storage to be able to download files and media." +
+                        " Please enable the storage permission and restart the app.", Toast.LENGTH_LONG).show();*/
+                    if (reactContext != null) {
+                        reactContext.getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class)
+                            .emit("onStoragePermissionRefused", null);
                     }
-                    finish();
                 }
                 break;
 
             case PHONE_STATE_PERMISSION_REQ_CODE:
                 if (grantResults.length > 0 && grantResults[0] == PackageManager.PERMISSION_GRANTED) {
                     // Permission granted. Emit an onPhoneStatePermissionGranted event
-                    ReactContext reactContext = mReactInstanceManager.getCurrentReactContext();
                     if (reactContext != null) {
                         reactContext.getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class)
                             .emit("onPhoneStatePermissionGranted", null);
@@ -403,7 +401,6 @@ public class MainActivity extends Activity implements DefaultHardwareBackBtnHand
             case RECEIVE_SMS_PERMISSION_REQ_CODE:
                 if (grantResults.length > 0 && grantResults[0] == PackageManager.PERMISSION_GRANTED) {
                     // Permission granted. Emit an onPhoneStatePermissionGranted event
-                    ReactContext reactContext = mReactInstanceManager.getCurrentReactContext();
                     if (reactContext != null) {
                         reactContext.getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class)
                             .emit("onReceiveSmsPermissionGranted", null);
@@ -609,6 +606,15 @@ public class MainActivity extends Activity implements DefaultHardwareBackBtnHand
                         true);
     }
 
+    public static void checkStoragePermission(Context context) {
+        // Request read phone state permission
+        checkPermission(Manifest.permission.WRITE_EXTERNAL_STORAGE,
+                        STORAGE_PERMISSION_REQ_CODE,
+                        "LBRY requires access to your device storage to be able to download files and media.",
+                        context,
+                        true);
+    }
+
     private boolean isServiceRunning(Class<?> serviceClass) {
         ActivityManager manager = (ActivityManager) getSystemService(Context.ACTIVITY_SERVICE);
         for (ActivityManager.RunningServiceInfo serviceInfo : manager.getRunningServices(Integer.MAX_VALUE)) {

src/main/java/io/lbry/browser/Utils.java

@@ -62,6 +62,8 @@ public final class Utils {
 
     public static final String SDK_URL = "http://127.0.0.1:5279";
 
+    public static final String SP_DOWNLOAD_DIR_KEY = "download_dir";
+
     public static String getAndroidRelease() {
         return android.os.Build.VERSION.RELEASE;
     }
@@ -114,6 +116,16 @@ public final class Utils {
         return file.getAbsolutePath();
     }
 
+    public static String getConfiguredDownloadDirectory(Context context) {
+        // use the default folder (usually [private files]/Download with WRITE_EXTERNAL_STOAGE permission not granted)
+        // if none is configured or specified
+        String defaultDirectory = String.format("%s/Download", getInternalStorageDir(context));
+
+        SharedPreferences pref = context.getSharedPreferences(SP_NAME, Context.MODE_PRIVATE);
+        String downloadDirectory = pref.getString(SP_DOWNLOAD_DIR_KEY, defaultDirectory);
+        return downloadDirectory;
+    }
+
     public static void saveApiSecret(String secret, Context context, KeyStore keyStore) {
         try {
             SharedPreferences pref = context.getSharedPreferences(SP_NAME, Context.MODE_PRIVATE);

src/main/java/io/lbry/browser/reactmodules/UtilityModule.java

@@ -207,6 +207,19 @@ public class UtilityModule extends ReactContextBaseJavaModule {
         }
     }
 
+    @ReactMethod
+    public void canReadWriteStorage(final Promise promise) {
+        promise.resolve(MainActivity.hasPermission(Manifest.permission.WRITE_EXTERNAL_STORAGE, MainActivity.getActivity()));
+    }
+
+    @ReactMethod
+    public void requestStoragePermission() {
+        MainActivity activity = (MainActivity) MainActivity.getActivity();
+        if (activity != null) {
+            MainActivity.checkStoragePermission(activity);
+        }
+    }
+
     @ReactMethod
     public void shareLogFile(Callback errorCallback) {
         String logFileName = "lbrynet.log";
@@ -378,6 +391,7 @@ public class UtilityModule extends ReactContextBaseJavaModule {
         Intent intent = new Intent();
         intent.setAction(LbrynetService.ACTION_QUEUE_DOWNLOAD);
         intent.putExtra("outpoint", outpoint);
+
         if (context != null) {
             context.sendBroadcast(intent);
         }
@@ -450,4 +464,10 @@ public class UtilityModule extends ReactContextBaseJavaModule {
 
         promise.resolve(null);
     }
+
+    @ReactMethod
+    public void getDownloadDirectory(Promise promise) {
+        // This obtains a public default download directory after the storage permission has been granted
+        promise.resolve(Utils.getConfiguredDownloadDirectory(context));
+    }
 }

src/main/python/lbrynetservice.py

@@ -73,10 +73,12 @@ def configure_logging(conf):
 def start():
     keyring.set_keyring(LbryAndroidKeyring())
     private_storage_dir = lbrynet_android_utils.getAppInternalStorageDir(service.getApplicationContext())
+    configured_download_dir = lbrynet_android_utils.getConfiguredDownloadDirectory(service.getApplicationContext())
+    print('configured_download_dir={}'.format(configured_download_dir))
     conf = Config(
         data_dir=f'{private_storage_dir}/lbrynet',
         wallet_dir=f'{private_storage_dir}/lbryum',
-        download_dir=f'{lbrynet_android_utils.getInternalStorageDir(service.getApplicationContext())}/Download',
+        download_dir=configured_download_dir,
         blob_lru_cache_size=32,
         components_to_skip=[DHT_COMPONENT, HASH_ANNOUNCER_COMPONENT, PEER_PROTOCOL_SERVER_COMPONENT],
         save_blobs=False,