basic changes needed for wortking bobstore

app/src/main/AndroidManifest.xml

@@ -60,7 +60,7 @@
         android:description="@string/app_description"
         android:fullBackupContent="@xml/backup_rules"
         android:icon="@drawable/ic_launcher"
-        android:label="@string/app_name"
+        android:label="BoB15TV Store"
         android:networkSecurityConfig="@xml/network_security_config"
         android:supportsRtl="true"
         android:theme="@style/Theme.App">

app/src/main/res/values/default_repos.xml

@@ -4,87 +4,23 @@
     <string-array name="default_repos">
 
         <!-- name -->
-        <item>F-Droid Archive</item>
+        <item>BoBTV</item>
         <!-- address -->
-        <item>https://f-droid.org/archive</item>
+        <item>http://vps.k-world.me.uk:8088</item>
         <!-- description -->
-        <item>The archive repository of the F-Droid client. This contains older versions of
+        <item>The BobTV Repo
-            applications from the main repository.
         </item>
         <!-- version -->
-        <item>13</item>
+        <item>1</item>
         <!-- enabled -->
-        <item>0</item>
+        <item>1</item>
         <!-- priority -->
         <item>1</item>
         <!-- push requests -->
         <item>ignore</item>
         <!-- pubkey -->
         <item>
-            3082035e30820246a00302010202044c49cd00300d06092a864886f70d01010505003071310b300906035504061302554b3110300e06035504081307556e6b6e6f776e3111300f0603550407130857657468657262793110300e060355040a1307556e6b6e6f776e3110300e060355040b1307556e6b6e6f776e311930170603550403131043696172616e2047756c746e69656b73301e170d3130303732333137313032345a170d3337313230383137313032345a3071310b300906035504061302554b3110300e06035504081307556e6b6e6f776e3111300f0603550407130857657468657262793110300e060355040a1307556e6b6e6f776e3110300e060355040b1307556e6b6e6f776e311930170603550403131043696172616e2047756c746e69656b7330820122300d06092a864886f70d01010105000382010f003082010a028201010096d075e47c014e7822c89fd67f795d23203e2a8843f53ba4e6b1bf5f2fd0e225938267cfcae7fbf4fe596346afbaf4070fdb91f66fbcdf2348a3d92430502824f80517b156fab00809bdc8e631bfa9afd42d9045ab5fd6d28d9e140afc1300917b19b7c6c4df4a494cf1f7cb4a63c80d734265d735af9e4f09455f427aa65a53563f87b336ca2c19d244fcbba617ba0b19e56ed34afe0b253ab91e2fdb1271f1b9e3c3232027ed8862a112f0706e234cf236914b939bcf959821ecb2a6c18057e070de3428046d94b175e1d89bd795e535499a091f5bc65a79d539a8d43891ec504058acb28c08393b5718b57600a211e803f4a634e5c57f25b9b8c4422c6fd90203010001300d06092a864886f70d0101050500038201010008e4ef699e9807677ff56753da73efb2390d5ae2c17e4db691d5df7a7b60fc071ae509c5414be7d5da74df2811e83d3668c4a0b1abc84b9fa7d96b4cdf30bba68517ad2a93e233b042972ac0553a4801c9ebe07bf57ebe9a3b3d6d663965260e50f3b8f46db0531761e60340a2bddc3426098397fda54044a17e5244549f9869b460ca5e6e216b6f6a2db0580b480ca2afe6ec6b46eedacfa4aa45038809ece0c5978653d6c85f678e7f5a2156d1bedd8117751e64a4b0dcd140f3040b021821a8d93aed8d01ba36db6c82372211fed714d9a32607038cdfd565bd529ffc637212aaa2c224ef22b603eccefb5bf1e085c191d4b24fe742b17ab3f55d4e6f05ef
+            308204fb308202e3a0030201020204017b260a300d06092a864886f70d01010b0500302e3110300e060355040b1307462d44726f6964311a3018060355040313117670732e6b2d776f726c642e6d652e756b301e170d3231303632323131323730305a170d3438313130373131323730305a302e3110300e060355040b1307462d44726f6964311a3018060355040313117670732e6b2d776f726c642e6d652e756b30820222300d06092a864886f70d01010105000382020f003082020a0282020100a117a8fa419a4e1e7fc419696744e124e8ceab6e38da0c77820225b3006acaa44c3d8f2f30d66a1389b61b69467576b8a26cded04265aaebb781855a4564f2172857bfe5c6abe00a9e3635e2f5db91c16b619defef5ca28120e111f2a3303b5fab6e652b36ff94f16cf441e28ddcb17d7db71cd1c0cce0c4da1b003c1cca1f45368723cf9b79fbbdcd4d763b7748a499434a633912d22ec2cbf8e73cbc86c2583eea4c6cf6b7819ea4cd8f11551209befd43fc7225e8dc972d15bf0266618224a7ab0110d4c874abc44750d30a8b68624093255f21a72a0f76261167f7b87e03d7ee807677d91dffc91ae1a5b8716f286b9492472351ebe5a4f8b17be875ac60adcd2666d64c68f3eb1dfadc481f990eba379d141472ed51c6962241265f3a77f065c764d89e1283e0cc594e2b3a76bb5364cda080fd5c73d3bf5c3bcd63909cf0dfb489dc67f0752cb312e195b274a9a117ff4e50b0d09f98894136544fd214b2f7cf67f468cbe16966379858f08ba418fc330f578c50acd726ffc3c4904c42722a2ba55b214d78899c479d5cafebc3337ac6c485cc59c4aa162627e6796b081bd6c2ebe30933ed8a9facf13e97961f3368ac407ee92c5ee24fcdc219cb7e36bcd2fa4b4083ded7bf24973295bc6118608d63b4440e9b8c38f44118eb82bbe8d7dc1f48e56a4b5300762634e4d6c3e61a232262fa29c1705d8851fca004340f0203010001a321301f301d0603551d0e041604147ba21d05a77640f662caec346ab8e0c442486711300d06092a864886f70d01010b050003820201001d6e60d7e7d8f077458e1a315c03f3699c29797cac9d27b2e42c21fff2183d0dc95345b9359958696bb1ae298be1ce22359e899e9cef81eb66946a7abfe107cc537d3cb89e81b81886adc79b76f0f38c3d0d69a8741c4458e297cbe5419e1412b14e02f714bdb15cd29d2ba5daf11220d29b5ae7fc147922d3f9b8f31d50117af7bc870aa97fcba569b92799c3638c811413df3d46c4d6c003b3c14472d5690a107440691ccacdb4bc709ee80f548314bafabbe330eabbf9fd63f51c1fc1cdf49f6a7d28b8ada2dd75fd01c6fceae05d1a49467ba4339a4cfbd3dc470d572e84fdaafb96c9fc707f24a96db2695d6b9bfe5318ca0dd6e68f6c3d23734d680006e48deeeb3924d6f9bc1e4b304aa0021572aeee64b643bff40eadba7580845d127f797c501b27f7b1c456bfa36d33e9260f440b3902f59668028187d5df589d47bb3fe5c57f09dfc3a2c987c4b82ddc982633eebfb75cd696e95e46702101cee681579b1165a04aeb5e97c195fee189f629850bf8326473db8dce4429e3abb62275996a1162b6ebe20c36cd4fabd24c94596bb6e71f220e67aa3af28e6fb9ffeaf44c5254f53b5fd297ebcddb553aca9c4c844e1c294c4ad33f965f829ff866d317042182929ed27516ccdd2149861dac0b548db26b9d72a60e04e4b3698ab0427e3e4a77a92a2ff997a5b727ba298570995c00a0644ca48228d44966ab87678b
-        </item>
-
-        <!-- name -->
-        <item>F-Droid</item>
-        <!-- address -->
-        <item>https://f-droid.org/repo</item>
-        <!-- description -->
-        <item>The official F-Droid Free Software repository. Everything in this repository is always built from the source code.
-        </item>
-        <!-- version -->
-        <item>13</item>
-        <!-- enabled -->
-        <item>1</item>
-        <!-- priority -->
-        <item>2</item>
-        <!-- push requests -->
-        <item>ignore</item>
-        <!-- pubkey -->
-        <item>
-            3082035e30820246a00302010202044c49cd00300d06092a864886f70d01010505003071310b300906035504061302554b3110300e06035504081307556e6b6e6f776e3111300f0603550407130857657468657262793110300e060355040a1307556e6b6e6f776e3110300e060355040b1307556e6b6e6f776e311930170603550403131043696172616e2047756c746e69656b73301e170d3130303732333137313032345a170d3337313230383137313032345a3071310b300906035504061302554b3110300e06035504081307556e6b6e6f776e3111300f0603550407130857657468657262793110300e060355040a1307556e6b6e6f776e3110300e060355040b1307556e6b6e6f776e311930170603550403131043696172616e2047756c746e69656b7330820122300d06092a864886f70d01010105000382010f003082010a028201010096d075e47c014e7822c89fd67f795d23203e2a8843f53ba4e6b1bf5f2fd0e225938267cfcae7fbf4fe596346afbaf4070fdb91f66fbcdf2348a3d92430502824f80517b156fab00809bdc8e631bfa9afd42d9045ab5fd6d28d9e140afc1300917b19b7c6c4df4a494cf1f7cb4a63c80d734265d735af9e4f09455f427aa65a53563f87b336ca2c19d244fcbba617ba0b19e56ed34afe0b253ab91e2fdb1271f1b9e3c3232027ed8862a112f0706e234cf236914b939bcf959821ecb2a6c18057e070de3428046d94b175e1d89bd795e535499a091f5bc65a79d539a8d43891ec504058acb28c08393b5718b57600a211e803f4a634e5c57f25b9b8c4422c6fd90203010001300d06092a864886f70d0101050500038201010008e4ef699e9807677ff56753da73efb2390d5ae2c17e4db691d5df7a7b60fc071ae509c5414be7d5da74df2811e83d3668c4a0b1abc84b9fa7d96b4cdf30bba68517ad2a93e233b042972ac0553a4801c9ebe07bf57ebe9a3b3d6d663965260e50f3b8f46db0531761e60340a2bddc3426098397fda54044a17e5244549f9869b460ca5e6e216b6f6a2db0580b480ca2afe6ec6b46eedacfa4aa45038809ece0c5978653d6c85f678e7f5a2156d1bedd8117751e64a4b0dcd140f3040b021821a8d93aed8d01ba36db6c82372211fed714d9a32607038cdfd565bd529ffc637212aaa2c224ef22b603eccefb5bf1e085c191d4b24fe742b17ab3f55d4e6f05ef
-        </item>
-
-        <!-- name -->
-        <item>Guardian Project Archive</item>
-        <!-- address -->
-        <item>https://guardianproject.info/fdroid/archive</item>
-        <!-- description -->
-        <item>The official repository of The Guardian Project apps for use with F-Droid client. This
-            contains older versions of applications from the main repository.
-        </item>
-        <!-- version -->
-        <item>13</item>
-        <!-- enabled -->
-        <item>0</item>
-        <!-- priority -->
-        <item>3</item>
-        <!-- push requests -->
-        <item>ignore</item>
-        <!-- pubkey -->
-        <item>
-            308205d8308203c0020900a397b4da7ecda034300d06092a864886f70d01010505003081ad310b30090603550406130255533111300f06035504080c084e657720596f726b3111300f06035504070c084e657720596f726b31143012060355040b0c0b4644726f6964205265706f31193017060355040a0c10477561726469616e2050726f6a656374311d301b06035504030c14677561726469616e70726f6a6563742e696e666f3128302606092a864886f70d0109011619726f6f7440677561726469616e70726f6a6563742e696e666f301e170d3134303632363139333931385a170d3431313131303139333931385a3081ad310b30090603550406130255533111300f06035504080c084e657720596f726b3111300f06035504070c084e657720596f726b31143012060355040b0c0b4644726f6964205265706f31193017060355040a0c10477561726469616e2050726f6a656374311d301b06035504030c14677561726469616e70726f6a6563742e696e666f3128302606092a864886f70d0109011619726f6f7440677561726469616e70726f6a6563742e696e666f30820222300d06092a864886f70d01010105000382020f003082020a0282020100b3cd79121b9b883843be3c4482e320809106b0a23755f1dd3c7f46f7d315d7bb2e943486d61fc7c811b9294dcc6b5baac4340f8db2b0d5e14749e7f35e1fc211fdbc1071b38b4753db201c314811bef885bd8921ad86facd6cc3b8f74d30a0b6e2e6e576f906e9581ef23d9c03e926e06d1f033f28bd1e21cfa6a0e3ff5c9d8246cf108d82b488b9fdd55d7de7ebb6a7f64b19e0d6b2ab1380a6f9d42361770d1956701a7f80e2de568acd0bb4527324b1e0973e89595d91c8cc102d9248525ae092e2c9b69f7414f724195b81427f28b1d3d09a51acfe354387915fd9521e8c890c125fc41a12bf34d2a1b304067ab7251e0e9ef41833ce109e76963b0b256395b16b886bca21b831f1408f836146019e7908829e716e72b81006610a2af08301de5d067c9e114a1e5759db8a6be6a3cc2806bcfe6fafd41b5bc9ddddb3dc33d6f605b1ca7d8a9e0ecdd6390d38906649e68a90a717bea80fa220170eea0c86fc78a7e10dac7b74b8e62045a3ecca54e035281fdc9fe5920a855fde3c0be522e3aef0c087524f13d973dff3768158b01a5800a060c06b451ec98d627dd052eda804d0556f60dbc490d94e6e9dea62ffcafb5beffbd9fc38fb2f0d7050004fe56b4dda0a27bc47554e1e0a7d764e17622e71f83a475db286bc7862deee1327e2028955d978272ea76bf0b88e70a18621aba59ff0c5993ef5f0e5d6b6b98e68b70203010001300d06092a864886f70d0101050500038202010079c79c8ef408a20d243d8bd8249fb9a48350dc19663b5e0fce67a8dbcb7de296c5ae7bbf72e98a2020fb78f2db29b54b0e24b181aa1c1d333cc0303685d6120b03216a913f96b96eb838f9bff125306ae3120af838c9fc07ebb5100125436bd24ec6d994d0bff5d065221871f8410daf536766757239bf594e61c5432c9817281b985263bada8381292e543a49814061ae11c92a316e7dc100327b59e3da90302c5ada68c6a50201bda1fcce800b53f381059665dbabeeb0b50eb22b2d7d2d9b0aa7488ca70e67ac6c518adb8e78454a466501e89d81a45bf1ebc350896f2c3ae4b6679ecfbf9d32960d4f5b493125c7876ef36158562371193f600bc511000a67bdb7c664d018f99d9e589868d103d7e0994f166b2ba18ff7e67d8c4da749e44dfae1d930ae5397083a51675c409049dfb626a96246c0015ca696e94ebb767a20147834bf78b07fece3f0872b057c1c519ff882501995237d8206b0b3832f78753ebd8dcbd1d3d9f5ba733538113af6b407d960ec4353c50eb38ab29888238da843cd404ed8f4952f59e4bbc0035fc77a54846a9d419179c46af1b4a3b7fc98e4d312aaa29b9b7d79e739703dc0fa41c7280d5587709277ffa11c3620f5fba985b82c238ba19b17ebd027af9424be0941719919f620dd3bb3c3f11638363708aa11f858e153cf3a69bce69978b90e4a273836100aa1e617ba455cd00426847f
-        </item>
-
-        <!-- name -->
-        <item>Guardian Project</item>
-        <!-- address -->
-        <item>https://guardianproject.info/fdroid/repo</item>
-        <!-- description -->
-        <item>The official app repository of The Guardian Project. Applications in this repository
-            are official binaries build by the original application developers and signed by the
-            same key as the APKs that are released in the Google Play store.
-        </item>
-        <!-- version -->
-        <item>13</item>
-        <!-- enabled -->
-        <item>0</item>
-        <!-- priority -->
-        <item>4</item>
-        <!-- push requests -->
-        <item>ignore</item>
-        <!-- pubkey -->
-        <item>
-            308205d8308203c0020900a397b4da7ecda034300d06092a864886f70d01010505003081ad310b30090603550406130255533111300f06035504080c084e657720596f726b3111300f06035504070c084e657720596f726b31143012060355040b0c0b4644726f6964205265706f31193017060355040a0c10477561726469616e2050726f6a656374311d301b06035504030c14677561726469616e70726f6a6563742e696e666f3128302606092a864886f70d0109011619726f6f7440677561726469616e70726f6a6563742e696e666f301e170d3134303632363139333931385a170d3431313131303139333931385a3081ad310b30090603550406130255533111300f06035504080c084e657720596f726b3111300f06035504070c084e657720596f726b31143012060355040b0c0b4644726f6964205265706f31193017060355040a0c10477561726469616e2050726f6a656374311d301b06035504030c14677561726469616e70726f6a6563742e696e666f3128302606092a864886f70d0109011619726f6f7440677561726469616e70726f6a6563742e696e666f30820222300d06092a864886f70d01010105000382020f003082020a0282020100b3cd79121b9b883843be3c4482e320809106b0a23755f1dd3c7f46f7d315d7bb2e943486d61fc7c811b9294dcc6b5baac4340f8db2b0d5e14749e7f35e1fc211fdbc1071b38b4753db201c314811bef885bd8921ad86facd6cc3b8f74d30a0b6e2e6e576f906e9581ef23d9c03e926e06d1f033f28bd1e21cfa6a0e3ff5c9d8246cf108d82b488b9fdd55d7de7ebb6a7f64b19e0d6b2ab1380a6f9d42361770d1956701a7f80e2de568acd0bb4527324b1e0973e89595d91c8cc102d9248525ae092e2c9b69f7414f724195b81427f28b1d3d09a51acfe354387915fd9521e8c890c125fc41a12bf34d2a1b304067ab7251e0e9ef41833ce109e76963b0b256395b16b886bca21b831f1408f836146019e7908829e716e72b81006610a2af08301de5d067c9e114a1e5759db8a6be6a3cc2806bcfe6fafd41b5bc9ddddb3dc33d6f605b1ca7d8a9e0ecdd6390d38906649e68a90a717bea80fa220170eea0c86fc78a7e10dac7b74b8e62045a3ecca54e035281fdc9fe5920a855fde3c0be522e3aef0c087524f13d973dff3768158b01a5800a060c06b451ec98d627dd052eda804d0556f60dbc490d94e6e9dea62ffcafb5beffbd9fc38fb2f0d7050004fe56b4dda0a27bc47554e1e0a7d764e17622e71f83a475db286bc7862deee1327e2028955d978272ea76bf0b88e70a18621aba59ff0c5993ef5f0e5d6b6b98e68b70203010001300d06092a864886f70d0101050500038202010079c79c8ef408a20d243d8bd8249fb9a48350dc19663b5e0fce67a8dbcb7de296c5ae7bbf72e98a2020fb78f2db29b54b0e24b181aa1c1d333cc0303685d6120b03216a913f96b96eb838f9bff125306ae3120af838c9fc07ebb5100125436bd24ec6d994d0bff5d065221871f8410daf536766757239bf594e61c5432c9817281b985263bada8381292e543a49814061ae11c92a316e7dc100327b59e3da90302c5ada68c6a50201bda1fcce800b53f381059665dbabeeb0b50eb22b2d7d2d9b0aa7488ca70e67ac6c518adb8e78454a466501e89d81a45bf1ebc350896f2c3ae4b6679ecfbf9d32960d4f5b493125c7876ef36158562371193f600bc511000a67bdb7c664d018f99d9e589868d103d7e0994f166b2ba18ff7e67d8c4da749e44dfae1d930ae5397083a51675c409049dfb626a96246c0015ca696e94ebb767a20147834bf78b07fece3f0872b057c1c519ff882501995237d8206b0b3832f78753ebd8dcbd1d3d9f5ba733538113af6b407d960ec4353c50eb38ab29888238da843cd404ed8f4952f59e4bbc0035fc77a54846a9d419179c46af1b4a3b7fc98e4d312aaa29b9b7d79e739703dc0fa41c7280d5587709277ffa11c3620f5fba985b82c238ba19b17ebd027af9424be0941719919f620dd3bb3c3f11638363708aa11f858e153cf3a69bce69978b90e4a273836100aa1e617ba455cd00426847f
         </item>
 
     </string-array>

build.gradle

@@ -5,7 +5,7 @@ buildscript {
         jcenter() // download from jCenter as last resort https://blog.autsoft.hu/a-confusing-dependency
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.6.3'
+        classpath 'com.android.tools.build:gradle:4.2.1'
     }
 }
 allprojects {

gradle/wrapper/gradle-wrapper.properties

@@ -3,5 +3,5 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.4.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip
-distributionSha256Sum=e58cdff0cee6d9b422dcd08ebeb3177bc44eaa09bd9a2e838ff74c408fe1cbcd
+#distributionSha256Sum=e58cdff0cee6d9b422dcd08ebeb3177bc44eaa09bd9a2e838ff74c408fe1cbcd

rls/basic/debug/output-metadata.json

@@ -0,0 +1,18 @@
+{
+  "version": 2,
+  "artifactType": {
+    "type": "APK",
+    "kind": "Directory"
+  },
+  "applicationId": "org.fdroid.basic.debug",
+  "variantName": "basicDebug",
+  "elements": [
+    {
+      "type": "SINGLE",
+      "filters": [],
+      "versionCode": 1013001,
+      "versionName": "1.13-alpha1-22-gb066c4017-debug",
+      "outputFile": "app-basic-debug.apk"
+    }
+  ]
+}

rls/basic/release/output-metadata.json

@@ -0,0 +1,18 @@
+{
+  "version": 2,
+  "artifactType": {
+    "type": "APK",
+    "kind": "Directory"
+  },
+  "applicationId": "org.fdroid.basic",
+  "variantName": "basicRelease",
+  "elements": [
+    {
+      "type": "SINGLE",
+      "filters": [],
+      "versionCode": 1013001,
+      "versionName": "1.13-alpha1-22-gb066c4017",
+      "outputFile": "app-basic-release.apk"
+    }
+  ]
+}