io.appium.settings 3.4.0 → 3.5.0

package/README.md

@@ -286,6 +286,23 @@ The example of the resulting data:
 ```
 
 
+## Media Scanning
+
+Since version 3.5 Appium Settings supports broadcast messages handling
+that performs media scanning in response to `io.appium.settings.scan_media`
+intent. This was done due to `android.intent.action.MEDIA_SCANNER_SCAN_FILE` deprecation
+since Android API version 30. To scan the given file or folder for media data simply run:
+
+```bash
+$ adb shell am broadcast -a io.appium.settings.scan_media --es path /sdcard/media
+```
+
+This command will _recursively_ scan all files inside of `/sdcard/media` folder
+and add them to the media library if their MIME types are supported. If the
+file/folder in _path_ does not exist/is not readable or is not provided then an
+error will be returned and the corresponding log message would be written into logs.
+
+
 ## Notes:
 
 * You have to specify the receiver class if the app has never been executed before:

package/app/build.gradle

@@ -1,14 +1,13 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 28
-    buildToolsVersion '28.0.3'
+    compileSdkVersion 29
 
     defaultConfig {
         minSdkVersion 18
-        targetSdkVersion 28
-        versionCode 30
-        versionName "3.4.0"
+        targetSdkVersion 29
+        versionCode 31
+        versionName "3.5.0"
         applicationId "io.appium.settings"
     }
 

package/app/src/main/AndroidManifest.xml

@@ -4,6 +4,7 @@
     package="io.appium.settings">
 
     <uses-permission android:name="android.permission.DISABLE_KEYGUARD" />
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.WAKE_LOCK"/>
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.CHANGE_NETWORK_STATE" />
@@ -132,5 +133,8 @@
         <receiver android:name=".receivers.SmsReader"
                   android:exported="true"
                   tools:ignore="ExportedReceiver" />
+        <receiver android:name=".receivers.MediaScannerReceiver"
+            android:exported="true"
+            tools:ignore="ExportedReceiver" />
     </application>
 </manifest>

package/app/src/main/java/io/appium/settings/Settings.java

@@ -24,7 +24,7 @@ import android.os.Bundle;
 import android.os.Handler;
 import android.util.Log;
 
-import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 
 import io.appium.settings.receivers.AnimationSettingReceiver;
@@ -34,6 +34,7 @@ import io.appium.settings.receivers.DataConnectionSettingReceiver;
 import io.appium.settings.receivers.HasAction;
 import io.appium.settings.receivers.LocaleSettingReceiver;
 import io.appium.settings.receivers.LocationInfoReceiver;
+import io.appium.settings.receivers.MediaScannerReceiver;
 import io.appium.settings.receivers.NotificationsReceiver;
 import io.appium.settings.receivers.SmsReader;
 import io.appium.settings.receivers.UnpairBluetoothDevicesReceiver;
@@ -50,18 +51,19 @@ public class Settings extends Activity {
 
         LocationTracker.getInstance().start(this);
 
-        final List<Class<? extends BroadcastReceiver>> receiverClasses = new ArrayList<>();
-        receiverClasses.add(WiFiConnectionSettingReceiver.class);
-        receiverClasses.add(AnimationSettingReceiver.class);
-        receiverClasses.add(DataConnectionSettingReceiver.class);
-        receiverClasses.add(LocaleSettingReceiver.class);
-        receiverClasses.add(LocationInfoReceiver.class);
-        receiverClasses.add(ClipboardReceiver.class);
-        receiverClasses.add(BluetoothConnectionSettingReceiver.class);
-        receiverClasses.add(UnpairBluetoothDevicesReceiver.class);
-        receiverClasses.add(NotificationsReceiver.class);
-        receiverClasses.add(SmsReader.class);
-        registerSettingsReceivers(receiverClasses);
+        registerSettingsReceivers(Arrays.asList(
+                WiFiConnectionSettingReceiver.class,
+                AnimationSettingReceiver.class,
+                DataConnectionSettingReceiver.class,
+                LocaleSettingReceiver.class,
+                LocationInfoReceiver.class,
+                ClipboardReceiver.class,
+                BluetoothConnectionSettingReceiver.class,
+                UnpairBluetoothDevicesReceiver.class,
+                NotificationsReceiver.class,
+                SmsReader.class,
+                MediaScannerReceiver.class
+        ));
 
         // https://developer.android.com/about/versions/oreo/background-location-limits
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {

package/app/src/main/java/io/appium/settings/receivers/MediaScannerReceiver.java

@@ -0,0 +1,91 @@
+/*
+  Copyright 2012-present Appium Committers
+  <p>
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+  <p>
+  http://www.apache.org/licenses/LICENSE-2.0
+  <p>
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+ */
+
+package io.appium.settings.receivers;
+
+import android.app.Activity;
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.media.MediaScannerConnection;
+import android.util.Log;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+public class MediaScannerReceiver extends BroadcastReceiver
+        implements HasAction {
+    private static final String TAG = MediaScannerReceiver.class.getSimpleName();
+    private static final String ACTION = "io.appium.settings.scan_media";
+    private static final String PATH = "path";
+
+    private List<String> fetchFiles(File root) {
+        if (root.isFile()) {
+            return root.canRead()
+                    ? Collections.singletonList(root.toString())
+                    : Collections.emptyList();
+        }
+        File[] items = root.listFiles();
+        if (items == null) {
+            return Collections.emptyList();
+        }
+        List<String> filePaths = new ArrayList<>();
+        for (File item : items) {
+            filePaths.addAll(fetchFiles(item));
+        }
+        return filePaths;
+    }
+
+    /**
+     * Responds to broadcast requests like
+     * am broadcast -a io.appium.settings.scan_media -e path /sdcard/yolo
+     * by scanning all files/folders under the given path
+     */
+    @Override
+    public void onReceive(Context context, Intent intent) {
+        Log.d(TAG, "Scanning the requested media");
+        if (!intent.hasExtra(PATH)) {
+            Log.e(TAG, "No path has been provided");
+            setResultCode(Activity.RESULT_CANCELED);
+            setResultData("");
+            return;
+        }
+        File item = new File(intent.getStringExtra(PATH));
+        if (!item.exists()) {
+            Log.e(TAG, String.format("The item at '%s' does not exist", item.toString()));
+            setResultCode(Activity.RESULT_CANCELED);
+            setResultData("");
+            return;
+        }
+        List<String> filePaths = fetchFiles(item);
+        if (filePaths.isEmpty()) {
+            Log.i(TAG, String.format("Found no files to scan at '%s'", item.toString()));
+        } else {
+            MediaScannerConnection.scanFile(context, filePaths.toArray(new String[0]), null, null);
+            Log.i(TAG, String.format("Successfully scanned %s file(s) at '%s'",
+                    filePaths.size(), item.toString()));
+        }
+        setResultCode(Activity.RESULT_OK);
+        setResultData("");
+    }
+
+    @Override
+    public String getAction() {
+        return ACTION;
+    }
+}

package/build.gradle

@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.0.2'
+        classpath 'com.android.tools.build:gradle:7.0.3'
     }
 }
 

package/gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "io.appium.settings",
-  "version": "3.4.0",
+  "version": "3.5.0",
   "description": "App for dealing with Android settings",
   "main": "index.js",
   "scripts": {