update to sdk 112

lbryio · Nov 23, 2022 · ff4e2e5 · ff4e2e5
1 parent 4e4ac58
commit ff4e2e5
Show file tree

Hide file tree

Showing 6 changed files with 38 additions and 35 deletions.
diff --git a/buildozer.spec.arm.ci b/buildozer.spec.arm.ci
@@ -39,7 +39,7 @@ version.filename = %(source.dir)s/main.py
 
 # (list) Application requirements
 # comma seperated e.g. requirements = sqlite3,kivy
-requirements = python3crystax, openssl, sqlite3, hostpython3crystax, android, distro==1.4.0, pyjnius, certifi==2021.5.30, appdirs==1.4.3, docopt==0.6.2, base58==1.0.0, colorama==0.3.7, ecdsa==0.13.3, jsonschema==2.6.0, pbkdf2==1.3, pyyaml, protobuf==3.6.1, keyring==21.0.0, defusedxml, netifaces, aioupnp==0.0.17, asn1crypto, mock, cryptography, aiohttp==3.6.0, multidict==4.5.2, idna, yarl==1.3.0, chardet==3.0.4, async_timeout==3.0.1, coincurve, msgpack==0.6.1, six, attrs==18.2.0, pylru, hachoir, prometheus_client==0.8.0, "git+https://github.com/lbryio/lbry-sdk@v0.102.0#egg=lbry"
+requirements = python3crystax, openssl, sqlite3, hostpython3crystax, android, distro==1.4.0, pyjnius, certifi==2021.5.30, appdirs==1.4.3, docopt==0.6.2, base58==1.0.0, colorama==0.3.7, ecdsa==0.13.3, jsonschema==2.6.0, pbkdf2==1.3, pyyaml, protobuf==3.6.1, keyring==21.0.0, defusedxml, netifaces, aioupnp==0.0.17, asn1crypto, mock, cryptography, aiohttp==3.6.0, multidict==4.5.2, idna, yarl==1.3.0, chardet==3.0.4, async_timeout==3.0.1, coincurve, msgpack==0.6.1, six, attrs==18.2.0, pylru, hachoir, prometheus_client==0.8.0, "git+https://github.com/lbryio/lbry-sdk@v0.112.0#egg=lbry"
 
 # (str) Custom source folders for requirements
 # Sets custom source for any requirements with recipes

diff --git a/buildozer.spec.arm64.ci b/buildozer.spec.arm64.ci
@@ -39,7 +39,7 @@ version.filename = %(source.dir)s/main.py
 
 # (list) Application requirements
 # comma seperated e.g. requirements = sqlite3,kivy
-requirements = python3crystax, openssl, sqlite3, hostpython3crystax, android, distro==1.4.0, pyjnius, certifi==2021.5.30, appdirs==1.4.3, docopt==0.6.2, base58==1.0.0, colorama==0.3.7, ecdsa==0.13.3, jsonschema==2.6.0, pbkdf2==1.3, pyyaml, protobuf==3.6.1, keyring==21.0.0, defusedxml, netifaces, aioupnp==0.0.17, asn1crypto, mock, cryptography, aiohttp==3.6.0, multidict==4.5.2, idna, yarl==1.3.0, chardet==3.0.4, async_timeout==3.0.1, coincurve, msgpack==0.6.1, six, attrs==18.2.0, pylru, hachoir, prometheus_client==0.8.0, "git+https://github.com/lbryio/lbry-sdk@v0.102.0#egg=lbry"
+requirements = python3crystax, openssl, sqlite3, hostpython3crystax, android, distro==1.4.0, pyjnius, certifi==2021.5.30, appdirs==1.4.3, docopt==0.6.2, base58==1.0.0, colorama==0.3.7, ecdsa==0.13.3, jsonschema==2.6.0, pbkdf2==1.3, pyyaml, protobuf==3.6.1, keyring==21.0.0, defusedxml, netifaces, aioupnp==0.0.17, asn1crypto, mock, cryptography, aiohttp==3.6.0, multidict==4.5.2, idna, yarl==1.3.0, chardet==3.0.4, async_timeout==3.0.1, coincurve, msgpack==0.6.1, six, attrs==18.2.0, pylru, hachoir, prometheus_client==0.8.0, "git+https://github.com/lbryio/lbry-sdk@v0.112.0#egg=lbry"
 
 # (str) Custom source folders for requirements
 # Sets custom source for any requirements with recipes

diff --git a/buildozer.spec.sample b/buildozer.spec.sample
@@ -39,7 +39,7 @@ version.filename = %(source.dir)s/main.py
 
 # (list) Application requirements
 # comma seperated e.g. requirements = sqlite3,kivy
-requirements = python3crystax, openssl, sqlite3, hostpython3crystax, android, distro==1.4.0, pyjnius, certifi==2021.5.30, appdirs==1.4.3, docopt==0.6.2, base58==1.0.0, colorama==0.3.7, ecdsa==0.13.3, jsonschema==2.6.0, pbkdf2==1.3, pyyaml, protobuf==3.6.1, keyring==21.0.0, defusedxml, netifaces, aioupnp==0.0.17, asn1crypto, mock, cryptography, aiohttp==3.6.0, multidict==4.5.2, idna, yarl==1.3.0, chardet==3.0.4, async_timeout==3.0.1, coincurve, msgpack==0.6.1, six, attrs==18.2.0, pylru, hachoir, prometheus_client==0.8.0, "git+https://github.com/lbryio/lbry-sdk@v0.102.0#egg=lbry"
+requirements = python3crystax, openssl, sqlite3, hostpython3crystax, android, distro==1.4.0, pyjnius, certifi==2021.5.30, appdirs==1.4.3, docopt==0.6.2, base58==1.0.0, colorama==0.3.7, ecdsa==0.13.3, jsonschema==2.6.0, pbkdf2==1.3, pyyaml, protobuf==3.6.1, keyring==21.0.0, defusedxml, netifaces, aioupnp==0.0.17, asn1crypto, mock, cryptography, aiohttp==3.6.0, multidict==4.5.2, idna, yarl==1.3.0, chardet==3.0.4, async_timeout==3.0.1, coincurve, msgpack==0.6.1, six, attrs==18.2.0, pylru, hachoir, prometheus_client==0.8.0, "git+https://github.com/lbryio/lbry-sdk@v0.112.0#egg=lbry"
 
 # (str) Custom source folders for requirements
 # Sets custom source for any requirements with recipes

diff --git a/buildozer.spec.vagrant b/buildozer.spec.vagrant
@@ -275,4 +275,4 @@ warn_on_root = 1
 #    Then, invoke the command line with the "demo" profile:
 #
 #buildozer --profile demo android debug
-requirements = python3crystax, openssl, sqlite3, hostpython3crystax, android, distro==1.4.0, pyjnius, certifi==2020.12.5, appdirs==1.4.3, docopt==0.6.2, base58==1.0.0, colorama==0.3.7, ecdsa==0.13.3, jsonschema==2.6.0, pbkdf2==1.3, pyyaml, protobuf==3.6.1, keyring==21.0.0, defusedxml, aioupnp==0.0.17, asn1crypto, mock, cryptography, aiohttp==3.5.4, multidict==4.5.2, yarl==1.3.0, chardet==3.0.4, async_timeout==3.0.1, coincurve, msgpack==0.6.1, six, attrs==18.2.0, pylru, hachoir, prometheus_client==0.8.0, "git+https://github.com/lbryio/lbry-sdk@v0.102.0#egg=lbry"
+requirements = python3crystax, openssl, sqlite3, hostpython3crystax, android, distro==1.4.0, pyjnius, certifi==2020.12.5, appdirs==1.4.3, docopt==0.6.2, base58==1.0.0, colorama==0.3.7, ecdsa==0.13.3, jsonschema==2.6.0, pbkdf2==1.3, pyyaml, protobuf==3.6.1, keyring==21.0.0, defusedxml, aioupnp==0.0.17, asn1crypto, mock, cryptography, aiohttp==3.5.4, multidict==4.5.2, yarl==1.3.0, chardet==3.0.4, async_timeout==3.0.1, coincurve, msgpack==0.6.1, six, attrs==18.2.0, pylru, hachoir, prometheus_client==0.8.0, "git+https://github.com/lbryio/lbry-sdk@v0.112.0#egg=lbry"
diff --git a/src/main/java/io/lbry/lbrysdk/LbrynetService.java b/src/main/java/io/lbry/lbrysdk/LbrynetService.java
@@ -56,7 +56,7 @@
  */
 public final class LbrynetService extends PythonService {
 
-    public static final String LBRY_SDK_VERSION = "0.102.0";
+    public static final String LBRY_SDK_VERSION = "0.112.0";
 
     public static final int SERVICE_NOTIFICATION_GROUP_ID = 5;
     public static final String ACTION_STOP_SERVICE = "io.lbry.browser.ACTION_STOP_SERVICE";
@@ -143,8 +143,7 @@ public void setPendingContextIntent(PendingIntent pendingIntent) {
 
         // update the notification with the context intent
         Notification notification = buildNotification();
-        NotificationManager notificationManager =
-            (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE);
+        NotificationManager notificationManager = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE);
         notificationManager.notify(1, notification);
     }
 
@@ -159,25 +158,24 @@ private Notification buildNotification() {
 
         String serviceDescription = "The LBRY service is running in the background.";
         Notification notification = builder.setColor(ContextCompat.getColor(this, R.color.lbryGreen))
-                                           .setContentText(serviceDescription)
-                                           .setGroup(GROUP_SERVICE)
-                                           .setWhen(System.currentTimeMillis())
-                                           .setSmallIcon(R.drawable.ic_lbry)
-                                           .setOngoing(true)
-                                           .addAction(android.R.drawable.ic_menu_close_clear_cancel, "Stop", stopPendingIntent)
-                                           .build();
+                .setContentText(serviceDescription)
+                .setGroup(GROUP_SERVICE)
+                .setWhen(System.currentTimeMillis())
+                .setSmallIcon(R.drawable.ic_lbry)
+                .setOngoing(true)
+                .addAction(android.R.drawable.ic_menu_close_clear_cancel, "Stop", stopPendingIntent)
+                .build();
 
         return notification;
     }
 
     @Override
     protected void doStartForeground(Bundle extras) {
         downloadManager = new DownloadManager(this);
-        NotificationManager notificationManager =
-            (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE);
+        NotificationManager notificationManager = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE);
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
             NotificationChannel channel = new NotificationChannel(
-                NOTIFICATION_CHANNEL_ID, "LBRY Browser", NotificationManager.IMPORTANCE_LOW);
+                    NOTIFICATION_CHANNEL_ID, "LBRY Browser", NotificationManager.IMPORTANCE_LOW);
             channel.setDescription("LBRY service notification channel");
             channel.setShowBadge(false);
             notificationManager.createNotificationChannel(channel);
@@ -186,11 +184,11 @@ protected void doStartForeground(Bundle extras) {
         // Create the notification group
         NotificationCompat.Builder groupBuilder = new NotificationCompat.Builder(this, NOTIFICATION_CHANNEL_ID);
         groupBuilder.setContentTitle("LBRY Browser")
-                    .setColor(ContextCompat.getColor(this, R.color.lbryGreen))
-                    .setSmallIcon(R.drawable.ic_lbry)
-                    .setPriority(NotificationCompat.PRIORITY_LOW)
-                    .setGroup(GROUP_SERVICE)
-                    .setGroupSummary(true);
+                .setColor(ContextCompat.getColor(this, R.color.lbryGreen))
+                .setSmallIcon(R.drawable.ic_lbry)
+                .setPriority(NotificationCompat.PRIORITY_LOW)
+                .setGroup(GROUP_SERVICE)
+                .setGroupSummary(true);
         notificationManager.notify(SERVICE_NOTIFICATION_GROUP_ID, groupBuilder.build());
 
         Notification notification = buildNotification();
@@ -221,7 +219,8 @@ private void pollFileList() {
                         JSONObject result = status.getJSONObject("result");
                         if (result.has("startup_status")) {
                             JSONObject startupStatus = result.getJSONObject("startup_status");
-                            fileManagerReady = startupStatus.has("file_manager") && startupStatus.getBoolean("file_manager");
+                            fileManagerReady = startupStatus.has("file_manager")
+                                    && startupStatus.getBoolean("file_manager");
                         }
                     }
                 }
@@ -232,8 +231,10 @@ private void pollFileList() {
                 params.put("page_size", 100);
                 params.put("reverse", true);
                 params.put("sort", "added_on");
-                /*params.put("status", "stopped");
-                params.put("comparison", "ne");*/
+                /*
+                 * params.put("status", "stopped");
+                 * params.put("comparison", "ne");
+                 */
 
                 String fileList = Utils.sdkCall("file_list", params);
                 if (fileList != null) {
@@ -273,15 +274,17 @@ protected void onPostExecute(String fileList) {
                                 if (fileItems != null && fileItems.length() > 0) {
                                     // TODO: Create Java FileItem class
                                     JSONObject item = fileItems.getJSONObject(0);
-                                    String downloadPath = item.isNull("download_path") ? null : item.getString("download_path");
+                                    String downloadPath = item.isNull("download_path") ? null
+                                            : item.getString("download_path");
                                     if (downloadPath == null || downloadPath.trim().length() == 0) {
                                         return;
                                     }
                                     String claimId = item.getString("claim_id");
                                     String claimName = item.getString("claim_name");
                                     String uri = String.format("lbry://%s#%s", claimName, claimId);
 
-                                    if (!downloadManager.isDownloadActive(uri) && !downloadManager.isDownloadCompleted(uri)) {
+                                    if (!downloadManager.isDownloadActive(uri)
+                                            && !downloadManager.isDownloadCompleted(uri)) {
                                         downloadManager.clearWrittenBytesForDownload(uri);
                                         File file = new File(downloadPath);
                                         Intent intent = createDownloadEventIntent(uri, outpoint, item.toString());
@@ -443,7 +446,6 @@ private void handlePollFileResponse(JSONObject response) {
         }
     }
 
-
     private static Intent createDownloadEventIntent(String uri, String outpoint, String fileInfo) {
         Intent intent = new Intent();
         intent.setAction(DownloadManager.ACTION_DOWNLOAD_EVENT);
@@ -470,14 +472,15 @@ public int onStartCommand(Intent intent, int flags, int startId) {
 
         if (intent == null) {
             intent = ServiceHelper.buildIntent(
-                getApplicationContext(), "", LbrynetService.class, "lbrynetservice");
+                    getApplicationContext(), "", LbrynetService.class, "lbrynetservice");
         }
 
         // send a broadcast indicating that the service has started
         Intent startedIntent = new Intent(LBRY_SDK_SERVICE_STARTED);
         sendBroadcast(startedIntent);
 
-        // no need to iterate the checks repeatedly here, because this is service startup
+        // no need to iterate the checks repeatedly here, because this is service
+        // startup
         checkDownloads();
 
         return super.onStartCommand(intent, flags, startId);
@@ -496,8 +499,8 @@ public void onDestroy() {
         }
 
         Context context = getApplicationContext();
-        NotificationManager notificationManager =
-            (NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE);
+        NotificationManager notificationManager = (NotificationManager) context
+                .getSystemService(Context.NOTIFICATION_SERVICE);
         notificationManager.cancelAll();
 
         super.onDestroy();
@@ -550,15 +553,15 @@ public void unpackData(final String resource, File target) {
         // If the disk data is out of date, extract it and write the
         // version file.
         // if (! data_version.equals(disk_version)) {
-        if (! data_version.equals(disk_version)) {
+        if (!data_version.equals(disk_version)) {
             Log.v(TAG, "Extracting " + resource + " assets.");
 
             recursiveDelete(target);
             target.mkdirs();
 
             AssetExtract ae = new AssetExtract(getApplicationContext());
             if (!ae.extractTar(resource + ".mp3", target.getAbsolutePath())) {
-                //toastError("Could not extract " + resource + " data.");
+                // toastError("Could not extract " + resource + " data.");
                 Log.e(TAG, "Could not extract " + resource + " data.");
             }
 

diff --git a/src/main/python/main.py b/src/main/python/main.py
@@ -1,5 +1,5 @@
 # going forward, this should match sdk version
-__version__ = "0.111.0"
+__version__ = "0.112.0"
 
 class ServiceApp(App):
     def build(self):