change fdroid.org to belmaket.ir

This commit is contained in:
numb95 2016-10-27 12:37:23 +03:30
parent 9284fba673
commit 97205f172c
25 changed files with 59 additions and 59 deletions

View File

@ -12,7 +12,7 @@ Remember to include the following information:
* Device model * Device model
* F-Droid version * F-Droid version
* Steps to reproduce the issue * Steps to reproduce the issue
* Logcat - see [instructions](https://f-droid.org/wiki/page/Getting_logcat_messages_after_crash) * Logcat - see [instructions](https://belmarket.ir/wiki/page/Getting_logcat_messages_after_crash)
## Translating ## Translating

View File

@ -3,7 +3,7 @@
[![build status](https://gitlab.com/fdroid/fdroidclient/badges/master/build.svg)](https://gitlab.com/fdroid/fdroidclient/builds) [![build status](https://gitlab.com/fdroid/fdroidclient/badges/master/build.svg)](https://gitlab.com/fdroid/fdroidclient/builds)
[![Translation status](https://hosted.weblate.org/widgets/f-droid/-/svg-badge.svg)](https://hosted.weblate.org/engage/f-droid/) [![Translation status](https://hosted.weblate.org/widgets/f-droid/-/svg-badge.svg)](https://hosted.weblate.org/engage/f-droid/)
Client for [F-Droid](https://f-droid.org), the Free Software repository system Client for [F-Droid](https://belmarket.ir), the Free Software repository system
for Android. for Android.
## Building with Gradle ## Building with Gradle
@ -12,8 +12,8 @@ for Android.
## Direct download ## Direct download
You can [download the application](https://f-droid.org/FDroid.apk) directly You can [download the application](https://belmarket.ir/FDroid.apk) directly
from our site or [browse it in the repo](https://f-droid.org/app/org.belmarket.shop). from our site or [browse it in the repo](https://belmarket.ir/app/org.belmarket.shop).
## Contributing ## Contributing

View File

@ -2,7 +2,7 @@
<fdroid> <fdroid>
<repo name="F-Droid" icon="fdroid-icon.png" maxage="14" <repo name="F-Droid" icon="fdroid-icon.png" maxage="14"
pubkey="3082035e30820246a00302010202044c49cd00300d06092a864886f70d01010505003071310b300906035504061302554b3110300e06035504081307556e6b6e6f776e3111300f0603550407130857657468657262793110300e060355040a1307556e6b6e6f776e3110300e060355040b1307556e6b6e6f776e311930170603550403131043696172616e2047756c746e69656b73301e170d3130303732333137313032345a170d3337313230383137313032345a3071310b300906035504061302554b3110300e06035504081307556e6b6e6f776e3111300f0603550407130857657468657262793110300e060355040a1307556e6b6e6f776e3110300e060355040b1307556e6b6e6f776e311930170603550403131043696172616e2047756c746e69656b7330820122300d06092a864886f70d01010105000382010f003082010a028201010096d075e47c014e7822c89fd67f795d23203e2a8843f53ba4e6b1bf5f2fd0e225938267cfcae7fbf4fe596346afbaf4070fdb91f66fbcdf2348a3d92430502824f80517b156fab00809bdc8e631bfa9afd42d9045ab5fd6d28d9e140afc1300917b19b7c6c4df4a494cf1f7cb4a63c80d734265d735af9e4f09455f427aa65a53563f87b336ca2c19d244fcbba617ba0b19e56ed34afe0b253ab91e2fdb1271f1b9e3c3232027ed8862a112f0706e234cf236914b939bcf959821ecb2a6c18057e070de3428046d94b175e1d89bd795e535499a091f5bc65a79d539a8d43891ec504058acb28c08393b5718b57600a211e803f4a634e5c57f25b9b8c4422c6fd90203010001300d06092a864886f70d0101050500038201010008e4ef699e9807677ff56753da73efb2390d5ae2c17e4db691d5df7a7b60fc071ae509c5414be7d5da74df2811e83d3668c4a0b1abc84b9fa7d96b4cdf30bba68517ad2a93e233b042972ac0553a4801c9ebe07bf57ebe9a3b3d6d663965260e50f3b8f46db0531761e60340a2bddc3426098397fda54044a17e5244549f9869b460ca5e6e216b6f6a2db0580b480ca2afe6ec6b46eedacfa4aa45038809ece0c5978653d6c85f678e7f5a2156d1bedd8117751e64a4b0dcd140f3040b021821a8d93aed8d01ba36db6c82372211fed714d9a32607038cdfd565bd529ffc637212aaa2c224ef22b603eccefb5bf1e085c191d4b24fe742b17ab3f55d4e6f05ef" pubkey="3082035e30820246a00302010202044c49cd00300d06092a864886f70d01010505003071310b300906035504061302554b3110300e06035504081307556e6b6e6f776e3111300f0603550407130857657468657262793110300e060355040a1307556e6b6e6f776e3110300e060355040b1307556e6b6e6f776e311930170603550403131043696172616e2047756c746e69656b73301e170d3130303732333137313032345a170d3337313230383137313032345a3071310b300906035504061302554b3110300e06035504081307556e6b6e6f776e3111300f0603550407130857657468657262793110300e060355040a1307556e6b6e6f776e3110300e060355040b1307556e6b6e6f776e311930170603550403131043696172616e2047756c746e69656b7330820122300d06092a864886f70d01010105000382010f003082010a028201010096d075e47c014e7822c89fd67f795d23203e2a8843f53ba4e6b1bf5f2fd0e225938267cfcae7fbf4fe596346afbaf4070fdb91f66fbcdf2348a3d92430502824f80517b156fab00809bdc8e631bfa9afd42d9045ab5fd6d28d9e140afc1300917b19b7c6c4df4a494cf1f7cb4a63c80d734265d735af9e4f09455f427aa65a53563f87b336ca2c19d244fcbba617ba0b19e56ed34afe0b253ab91e2fdb1271f1b9e3c3232027ed8862a112f0706e234cf236914b939bcf959821ecb2a6c18057e070de3428046d94b175e1d89bd795e535499a091f5bc65a79d539a8d43891ec504058acb28c08393b5718b57600a211e803f4a634e5c57f25b9b8c4422c6fd90203010001300d06092a864886f70d0101050500038201010008e4ef699e9807677ff56753da73efb2390d5ae2c17e4db691d5df7a7b60fc071ae509c5414be7d5da74df2811e83d3668c4a0b1abc84b9fa7d96b4cdf30bba68517ad2a93e233b042972ac0553a4801c9ebe07bf57ebe9a3b3d6d663965260e50f3b8f46db0531761e60340a2bddc3426098397fda54044a17e5244549f9869b460ca5e6e216b6f6a2db0580b480ca2afe6ec6b46eedacfa4aa45038809ece0c5978653d6c85f678e7f5a2156d1bedd8117751e64a4b0dcd140f3040b021821a8d93aed8d01ba36db6c82372211fed714d9a32607038cdfd565bd529ffc637212aaa2c224ef22b603eccefb5bf1e085c191d4b24fe742b17ab3f55d4e6f05ef"
timestamp="1467169032" url="http://f-droid.org/repo" version="16"> timestamp="1467169032" url="http://belmarket.ir/repo" version="16">
<description> <description>
This is just a test of the extended permissions attributes. This is just a test of the extended permissions attributes.
</description> </description>

View File

@ -19,7 +19,7 @@ public class HttpDownloaderTest {
String[] urls = { String[] urls = {
"https://en.wikipedia.org/wiki/Index.html", "https://en.wikipedia.org/wiki/Index.html",
"https://mirrors.kernel.org/debian/dists/stable/Release", "https://mirrors.kernel.org/debian/dists/stable/Release",
"https://f-droid.org/repo/index.jar", "https://belmarket.ir/repo/index.jar",
// sites that use SNI for HTTPS // sites that use SNI for HTTPS
"https://guardianproject.info/fdroid/repo/index.jar", "https://guardianproject.info/fdroid/repo/index.jar",
//"https://microg.org/fdroid/repo/index.jar", //"https://microg.org/fdroid/repo/index.jar",
@ -44,7 +44,7 @@ public class HttpDownloaderTest {
@Test @Test
public void downloadUninterruptedTestWithProgress() throws IOException, InterruptedException { public void downloadUninterruptedTestWithProgress() throws IOException, InterruptedException {
final CountDownLatch latch = new CountDownLatch(1); final CountDownLatch latch = new CountDownLatch(1);
String urlString = "https://f-droid.org/repo/index.jar"; String urlString = "https://belmarket.ir/repo/index.jar";
receivedProgress = false; receivedProgress = false;
System.out.println("downloadUninterruptedTestWithProgress: " + urlString); System.out.println("downloadUninterruptedTestWithProgress: " + urlString);
receivedProgress = false; receivedProgress = false;
@ -111,7 +111,7 @@ public class HttpDownloaderTest {
@Test @Test
public void downloadThenCancel() throws IOException, InterruptedException { public void downloadThenCancel() throws IOException, InterruptedException {
final CountDownLatch latch = new CountDownLatch(2); final CountDownLatch latch = new CountDownLatch(2);
URL url = new URL("https://f-droid.org/repo/index.jar"); URL url = new URL("https://belmarket.ir/repo/index.jar");
File destFile = File.createTempFile("dl-", ""); File destFile = File.createTempFile("dl-", "");
final HttpDownloader httpDownloader = new HttpDownloader(url, destFile); final HttpDownloader httpDownloader = new HttpDownloader(url, destFile);
httpDownloader.setListener(new ProgressListener() { httpDownloader.setListener(new ProgressListener() {

View File

@ -157,8 +157,8 @@
<data android:scheme="http" /> <data android:scheme="http" />
<data android:scheme="https" /> <data android:scheme="https" />
<data android:host="f-droid.org" /> <data android:host="belmarket.ir" />
<data android:host="www.f-droid.org" /> <data android:host="www.belmarket.ir" />
<data android:pathPrefix="/app/" /> <data android:pathPrefix="/app/" />
</intent-filter> </intent-filter>
@ -170,8 +170,8 @@
<data android:scheme="http" /> <data android:scheme="http" />
<data android:scheme="https" /> <data android:scheme="https" />
<data android:host="f-droid.org" /> <data android:host="belmarket.ir" />
<data android:host="www.f-droid.org" /> <data android:host="www.belmarket.ir" />
<data android:pathPrefix="/repository/browse" /> <data android:pathPrefix="/repository/browse" />
</intent-filter> </intent-filter>

View File

@ -1005,7 +1005,7 @@ public class AppDetails extends AppCompatActivity {
shareIntent.setType("text/plain"); shareIntent.setType("text/plain");
shareIntent.putExtra(Intent.EXTRA_SUBJECT, app.name); shareIntent.putExtra(Intent.EXTRA_SUBJECT, app.name);
shareIntent.putExtra(Intent.EXTRA_TEXT, app.name + " (" + app.summary + ") - https://f-droid.org/app/" + app.packageName); shareIntent.putExtra(Intent.EXTRA_TEXT, app.name + " (" + app.summary + ") - https://belmarket.ir/app/" + app.packageName);
startActivity(Intent.createChooser(shareIntent, getString(R.string.menu_share))); startActivity(Intent.createChooser(shareIntent, getString(R.string.menu_share)));
} }

View File

@ -179,15 +179,15 @@ public class FDroid extends AppCompatActivity implements SearchView.OnQueryTextL
return; return;
} }
switch (host) { switch (host) {
case "f-droid.org": case "belmarket.ir":
if (path.startsWith("/repository/browse")) { if (path.startsWith("/repository/browse")) {
// http://f-droid.org/repository/browse?fdfilter=search+query // http://belmarket.ir/repository/browse?fdfilter=search+query
query = UriCompat.getQueryParameter(data, "fdfilter"); query = UriCompat.getQueryParameter(data, "fdfilter");
// http://f-droid.org/repository/browse?fdid=packageName // http://belmarket.ir/repository/browse?fdid=packageName
packageName = UriCompat.getQueryParameter(data, "fdid"); packageName = UriCompat.getQueryParameter(data, "fdid");
} else if (path.startsWith("/app")) { } else if (path.startsWith("/app")) {
// http://f-droid.org/app/packageName // http://belmarket.ir/app/packageName
packageName = data.getLastPathSegment(); packageName = data.getLastPathSegment();
if ("app".equals(packageName)) { if ("app".equals(packageName)) {
packageName = null; packageName = null;

View File

@ -71,7 +71,7 @@ import info.guardianproject.netcipher.NetCipher;
import info.guardianproject.netcipher.proxy.OrbotHelper; import info.guardianproject.netcipher.proxy.OrbotHelper;
import sun.net.www.protocol.bluetooth.Handler; import sun.net.www.protocol.bluetooth.Handler;
@ReportsCrashes(mailTo = "reports@f-droid.org", @ReportsCrashes(mailTo = "reports@belmarket.ir",
mode = ReportingInteractionMode.DIALOG, mode = ReportingInteractionMode.DIALOG,
reportDialogClass = org.belmarket.shop.acra.CrashReportActivity.class, reportDialogClass = org.belmarket.shop.acra.CrashReportActivity.class,
reportSenderFactoryClasses = org.belmarket.shop.acra.CrashReportSenderFactory.class reportSenderFactoryClasses = org.belmarket.shop.acra.CrashReportSenderFactory.class

View File

@ -25,11 +25,11 @@ import java.util.List;
class FDroidCertPins { class FDroidCertPins {
private static final String[] DEFAULT_PINS = { private static final String[] DEFAULT_PINS = {
// OU=PositiveSSL, CN=f-droid.org // OU=PositiveSSL, CN=belmarket.ir
// Fingerprint: 84B91CDF2312CB9BA7F3BE803783302F8D8C299F // Fingerprint: 84B91CDF2312CB9BA7F3BE803783302F8D8C299F
"638F93856E1F5EDFCBD40C46D4160CFF21B0713A", "638F93856E1F5EDFCBD40C46D4160CFF21B0713A",
// OU=PositiveSSL, CN=f-droid.org // OU=PositiveSSL, CN=belmarket.ir
"83a288fdbf7fb27ca2268d553168eb8f38298910", "83a288fdbf7fb27ca2268d553168eb8f38298910",
// OU=Gandi Standard SSL, CN=guardianproject.info // OU=Gandi Standard SSL, CN=guardianproject.info

View File

@ -170,7 +170,7 @@ public class Repo extends ValueObject {
/** /**
* If we haven't run an update for this repo yet, then the name * If we haven't run an update for this repo yet, then the name
* will be unknown, in which case we will just take a guess at an * will be unknown, in which case we will just take a guess at an
* appropriate name based on the url (e.g. "f-droid.org/archive") * appropriate name based on the url (e.g. "belmarket.ir/archive")
*/ */
public static String addressToName(String address) { public static String addressToName(String address) {
String tempName; String tempName;

View File

@ -121,7 +121,7 @@ public final class LocalRepoManager {
private String writeFdroidApkToWebroot() { private String writeFdroidApkToWebroot() {
ApplicationInfo appInfo; ApplicationInfo appInfo;
String fdroidClientURL = "https://f-droid.org/FDroid.apk"; String fdroidClientURL = "https://belmarket.ir/FDroid.apk";
try { try {
appInfo = pm.getApplicationInfo(fdroidPackageName, PackageManager.GET_META_DATA); appInfo = pm.getApplicationInfo(fdroidPackageName, PackageManager.GET_META_DATA);

View File

@ -80,7 +80,7 @@
android:layout_marginTop="8sp" android:layout_marginTop="8sp"
android:singleLine="false" android:singleLine="false"
android:textSize="13sp" android:textSize="13sp"
tools:text="Connects to F-Droid compatible repositories. The default repo is hosted at f-droid.org, which contains only bona fide FOSS. tools:text="Connects to F-Droid compatible repositories. The default repo is hosted at belmarket.ir, which contains only bona fide FOSS.
Android is open in the sense that you are free to install apks from anywhere you wish, but there are many good reasons for using a client/repository setup: Android is open in the sense that you are free to install apks from anywhere you wish, but there are many good reasons for using a client/repository setup:

View File

@ -3,9 +3,9 @@
<string name="app_description">F-Droid is an installable catalogue of FOSS (Free and Open Source Software) applications for the Android platform. The client makes it easy to browse, install, and keep track of updates on your device.</string> <string name="app_description">F-Droid is an installable catalogue of FOSS (Free and Open Source Software) applications for the Android platform. The client makes it easy to browse, install, and keep track of updates on your device.</string>
<string name="site_link">https://f-droid.org</string> <string name="site_link">https://belmarket.ir</string>
<string name="source_link">https://gitlab.com/fdroid/fdroidclient</string> <string name="source_link">https://gitlab.com/fdroid/fdroidclient</string>
<string name="team_email">team@f-droid.org</string> <string name="team_email">team@belmarket.ir</string>
<string name="license_gplv3_later">GNU General Public License version\u00A03 or later</string> <string name="license_gplv3_later">GNU General Public License version\u00A03 or later</string>
<string name="transition_app_item_icon">transition_app_item_icon</string> <string name="transition_app_item_icon">transition_app_item_icon</string>

View File

@ -139,7 +139,7 @@ public class DatabaseMigration {
String fingerprint = Utils.calcFingerprint(pubKey); String fingerprint = Utils.calcFingerprint(pubKey);
ContentValues fdroidValues = new ContentValues(); ContentValues fdroidValues = new ContentValues();
fdroidValues.put("address", "https://f-droid.org/repo"); fdroidValues.put("address", "https://belmarket.ir/repo");
fdroidValues.put("name", "F-Droid"); fdroidValues.put("name", "F-Droid");
fdroidValues.put("description", "The official FDroid repository. Applications in this repository are mostly built directory from the source code. Some are official binaries built by the original application developers - these will be replaced by source-built versions over time."); fdroidValues.put("description", "The official FDroid repository. Applications in this repository are mostly built directory from the source code. Some are official binaries built by the original application developers - these will be replaced by source-built versions over time.");
fdroidValues.put("pubkey", pubKey); fdroidValues.put("pubkey", pubKey);
@ -151,7 +151,7 @@ public class DatabaseMigration {
db.insert(TABLE_REPO, null, fdroidValues); db.insert(TABLE_REPO, null, fdroidValues);
ContentValues archiveValues = new ContentValues(); ContentValues archiveValues = new ContentValues();
archiveValues.put("address", "https://f-droid.org/archive"); archiveValues.put("address", "https://belmarket.ir/archive");
archiveValues.put("name", "F-Droid Archive"); archiveValues.put("name", "F-Droid Archive");
archiveValues.put("description", "The archive repository of the F-Droid client. This contains older versions of applications from the main repository."); archiveValues.put("description", "The archive repository of the F-Droid client. This contains older versions of applications from the main repository.");
archiveValues.put("pubkey", pubKey); archiveValues.put("pubkey", pubKey);

View File

@ -51,13 +51,13 @@ public class RepoProviderTest extends FDroidProviderTest {
@Test @Test
public void findByUrl() { public void findByUrl() {
Repo fdroidRepo = RepoProvider.Helper.findByAddress(context, "https://f-droid.org/repo"); Repo fdroidRepo = RepoProvider.Helper.findByAddress(context, "https://belmarket.ir/repo");
Repo fdroidArchiveRepo = RepoProvider.Helper.findByAddress(context, "https://f-droid.org/archive"); Repo fdroidArchiveRepo = RepoProvider.Helper.findByAddress(context, "https://belmarket.ir/archive");
String[] noRepos = { String[] noRepos = {
"https://not-a-repo.example.com", "https://not-a-repo.example.com",
"https://f-droid.org", "https://belmarket.ir",
"https://f-droid.org/", "https://belmarket.ir/",
}; };
for (String url : noRepos) { for (String url : noRepos) {
@ -65,21 +65,21 @@ public class RepoProviderTest extends FDroidProviderTest {
} }
String[] fdroidRepoUrls = { String[] fdroidRepoUrls = {
"https://f-droid.org/repo/index.jar", "https://belmarket.ir/repo/index.jar",
"https://f-droid.org/repo/index.jar?random-junk-in-query=yes", "https://belmarket.ir/repo/index.jar?random-junk-in-query=yes",
"https://f-droid.org/repo/index.jar?random-junk-in-query=yes&more-junk", "https://belmarket.ir/repo/index.jar?random-junk-in-query=yes&more-junk",
"https://f-droid.org/repo/icons/org.belmarket.shop.100.png", "https://belmarket.ir/repo/icons/org.belmarket.shop.100.png",
"https://f-droid.org/repo/icons-640/org.belmarket.shop.100.png", "https://belmarket.ir/repo/icons-640/org.belmarket.shop.100.png",
}; };
assertUrlsBelongToRepo(fdroidRepoUrls, fdroidRepo); assertUrlsBelongToRepo(fdroidRepoUrls, fdroidRepo);
String[] fdroidArchiveUrls = { String[] fdroidArchiveUrls = {
"https://f-droid.org/archive/index.jar", "https://belmarket.ir/archive/index.jar",
"https://f-droid.org/archive/index.jar?random-junk-in-query=yes", "https://belmarket.ir/archive/index.jar?random-junk-in-query=yes",
"https://f-droid.org/archive/index.jar?random-junk-in-query=yes&more-junk", "https://belmarket.ir/archive/index.jar?random-junk-in-query=yes&more-junk",
"https://f-droid.org/archive/icons/org.belmarket.shop.100.png", "https://belmarket.ir/archive/icons/org.belmarket.shop.100.png",
"https://f-droid.org/archive/icons-640/org.belmarket.shop.100.png", "https://belmarket.ir/archive/icons-640/org.belmarket.shop.100.png",
}; };
assertUrlsBelongToRepo(fdroidArchiveUrls, fdroidArchiveRepo); assertUrlsBelongToRepo(fdroidArchiveUrls, fdroidArchiveRepo);

View File

@ -35,8 +35,8 @@ public abstract class MultiRepoUpdaterTest extends FDroidProviderTest {
protected static final String REPO_ARCHIVE = "Test F-Droid repo (Archive)"; protected static final String REPO_ARCHIVE = "Test F-Droid repo (Archive)";
protected static final String REPO_CONFLICTING = "Test F-Droid repo with different apps"; protected static final String REPO_CONFLICTING = "Test F-Droid repo with different apps";
protected static final String REPO_MAIN_URI = "https://f-droid.org/repo"; protected static final String REPO_MAIN_URI = "https://belmarket.ir/repo";
protected static final String REPO_ARCHIVE_URI = "https://f-droid.org/archive"; protected static final String REPO_ARCHIVE_URI = "https://belmarket.ir/archive";
protected static final String REPO_CONFLICTING_URI = "https://example.com/conflicting/fdroid/repo"; protected static final String REPO_CONFLICTING_URI = "https://example.com/conflicting/fdroid/repo";
private static final String PUB_KEY = private static final String PUB_KEY =

View File

@ -106,7 +106,7 @@ public class RepoXMLHandlerTest {
Repo expectedRepo = new Repo(); Repo expectedRepo = new Repo();
expectedRepo.name = "F-Droid"; expectedRepo.name = "F-Droid";
expectedRepo.signingCertificate = "308201ee30820157a0030201020204300d845b300d06092a864886f70d01010b0500302a3110300e060355040b1307462d44726f6964311630140603550403130d70616c6174736368696e6b656e301e170d3134303432373030303633315a170d3431303931323030303633315a302a3110300e060355040b1307462d44726f6964311630140603550403130d70616c6174736368696e6b656e30819f300d06092a864886f70d010101050003818d0030818902818100a439472e4b6d01141bfc94ecfe131c7c728fdda670bb14c57ca60bd1c38a8b8bc0879d22a0a2d0bc0d6fdd4cb98d1d607c2caefbe250a0bd0322aedeb365caf9b236992fac13e6675d3184a6c7c6f07f73410209e399a9da8d5d7512bbd870508eebacff8b57c3852457419434d34701ccbf692267cbc3f42f1c5d1e23762d790203010001a321301f301d0603551d0e041604140b1840691dab909746fde4bfe28207d1cae15786300d06092a864886f70d01010b05000381810062424c928ffd1b6fd419b44daafef01ca982e09341f7077fb865905087aeac882534b3bd679b51fdfb98892cef38b63131c567ed26c9d5d9163afc775ac98ad88c405d211d6187bde0b0d236381cc574ba06ef9080721a92ae5a103a7301b2c397eecc141cc850dd3e123813ebc41c59d31ddbcb6e984168280c53272f6a442b"; expectedRepo.signingCertificate = "308201ee30820157a0030201020204300d845b300d06092a864886f70d01010b0500302a3110300e060355040b1307462d44726f6964311630140603550403130d70616c6174736368696e6b656e301e170d3134303432373030303633315a170d3431303931323030303633315a302a3110300e060355040b1307462d44726f6964311630140603550403130d70616c6174736368696e6b656e30819f300d06092a864886f70d010101050003818d0030818902818100a439472e4b6d01141bfc94ecfe131c7c728fdda670bb14c57ca60bd1c38a8b8bc0879d22a0a2d0bc0d6fdd4cb98d1d607c2caefbe250a0bd0322aedeb365caf9b236992fac13e6675d3184a6c7c6f07f73410209e399a9da8d5d7512bbd870508eebacff8b57c3852457419434d34701ccbf692267cbc3f42f1c5d1e23762d790203010001a321301f301d0603551d0e041604140b1840691dab909746fde4bfe28207d1cae15786300d06092a864886f70d01010b05000381810062424c928ffd1b6fd419b44daafef01ca982e09341f7077fb865905087aeac882534b3bd679b51fdfb98892cef38b63131c567ed26c9d5d9163afc775ac98ad88c405d211d6187bde0b0d236381cc574ba06ef9080721a92ae5a103a7301b2c397eecc141cc850dd3e123813ebc41c59d31ddbcb6e984168280c53272f6a442b";
expectedRepo.description = "The official repository of the F-Droid client. Applications in this repository are either official binaries built by the original application developers, or are binaries built from source by the admin of f-droid.org using the tools on https://gitorious.org/f-droid."; expectedRepo.description = "The official repository of the F-Droid client. Applications in this repository are either official binaries built by the original application developers, or are binaries built from source by the admin of belmarket.ir using the tools on https://gitorious.org/f-droid.";
expectedRepo.timestamp = 1398733213; expectedRepo.timestamp = 1398733213;
RepoDetails actualDetails = getFromFile("simpleIndex.xml"); RepoDetails actualDetails = getFromFile("simpleIndex.xml");
handlerTestSuite(expectedRepo, actualDetails, 0, 0, -1, 12); handlerTestSuite(expectedRepo, actualDetails, 0, 0, -1, 12);
@ -142,7 +142,7 @@ public class RepoXMLHandlerTest {
Repo expectedRepo = new Repo(); Repo expectedRepo = new Repo();
expectedRepo.name = "non-public test repo"; expectedRepo.name = "non-public test repo";
expectedRepo.signingCertificate = "308204e1308202c9a0030201020204483450fa300d06092a864886f70d01010b050030213110300e060355040b1307462d44726f6964310d300b06035504031304736f7661301e170d3136303832333133333131365a170d3434303130393133333131365a30213110300e060355040b1307462d44726f6964310d300b06035504031304736f766130820222300d06092a864886f70d01010105000382020f003082020a0282020100dfdcd120f3ab224999dddf4ea33ea588d295e4d7130bef48c143e9d76e5c0e0e9e5d45e64208e35feebc79a83f08939dd6a343b7d1e2179930a105a1249ccd36d88ff3feffc6e4dc53dae0163a7876dd45ecc1ddb0adf5099aa56c1a84b52affcd45d0711ffa4de864f35ac0333ebe61ea8673eeda35a88f6af678cc4d0f80b089338ac8f2a8279a64195c611d19445cab3fd1a020afed9bd739bb95142fb2c00a8f847db5ef3325c814f8eb741bacf86ed3907bfe6e4564d2de5895df0c263824e0b75407589bae2d3a4666c13b92102d8781a8ee9bb4a5a1a78c4a9c21efdaf5584da42e84418b28f5a81d0456a3dc5b420991801e6b21e38c99bbe018a5b2d690894a114bc860d35601416aa4dc52216aff8a288d4775cddf8b72d45fd2f87303a8e9c0d67e442530be28eaf139894337266e0b33d57f949256ab32083bcc545bc18a83c9ab8247c12aea037e2b68dee31c734cb1f04f241d3b94caa3a2b258ffaf8e6eae9fbbe029a934dc0a0859c5f120334812693a1c09352340a39f2a678dbc1afa2a978bfee43afefcb7e224a58af2f3d647e5745db59061236b8af6fcfd93b3602f9e456978534f3a7851e800071bf56da80401c81d91c45f82568373af0576b1cc5eef9b85654124b6319770be3cdba3fbebe3715e8918fb6c8966624f3d0e815effac3d2ee06dd34ab9c693218b2c7c06ba99d6b74d4f17b8c3cb0203010001a321301f301d0603551d0e04160414d62bee9f3798509546acc62eb1de14b08b954d4f300d06092a864886f70d01010b05000382020100743f7c5692085895f9d1fffad390fb4202c15f123ed094df259185960fd6dadf66cb19851070f180297bba4e6996a4434616573b375cfee94fee73a4505a7ec29136b7e6c22e6436290e3686fe4379d4e3140ec6a08e70cfd3ed5b634a5eb5136efaaabf5f38e0432d3d79568a556970b8cfba2972f5d23a3856d8a981b9e9bbbbb88f35e708bde9cbc5f681cbd974085b9da28911296fe2579fa64bbe9fa0b93475a7a8db051080b0c5fade0d1c018e7858cd4cbe95145b0620e2f632cbe0f8af9cbf22e2fdaa72245ae31b0877b07181cc69dd2df74454251d8de58d25e76354abe7eb690f22e59b08795a8f2c98c578e0599503d9085927634072c82c9f82abd50fd12b8fd1a9d1954eb5cc0b4cfb5796b5aaec0356643b4a65a368442d92ef94edd3ac6a2b7fe3571b8cf9f462729228aab023ef9183f73792f5379633ccac51079177d604c6bc1873ada6f07d8da6d68c897e88a5fa5d63fdb8df820f46090e0716e7562dd3c140ba279a65b996f60addb0abe29d4bf2f5abe89480771d492307b926d91f02f341b2148502903c43d40f3c6c86a811d060711f0698b384acdcc0add44eb54e42962d3d041accc715afd49407715adc09350cb55e8d9281a3b0b6b5fcd91726eede9b7c8b13afdebb2c2b377629595f1096ba62fb14946dbac5f3c5f0b4e5b712e7acc7dcf6c46cdc5e6d6dfdeee55a0c92c2d70f080ac6"; expectedRepo.signingCertificate = "308204e1308202c9a0030201020204483450fa300d06092a864886f70d01010b050030213110300e060355040b1307462d44726f6964310d300b06035504031304736f7661301e170d3136303832333133333131365a170d3434303130393133333131365a30213110300e060355040b1307462d44726f6964310d300b06035504031304736f766130820222300d06092a864886f70d01010105000382020f003082020a0282020100dfdcd120f3ab224999dddf4ea33ea588d295e4d7130bef48c143e9d76e5c0e0e9e5d45e64208e35feebc79a83f08939dd6a343b7d1e2179930a105a1249ccd36d88ff3feffc6e4dc53dae0163a7876dd45ecc1ddb0adf5099aa56c1a84b52affcd45d0711ffa4de864f35ac0333ebe61ea8673eeda35a88f6af678cc4d0f80b089338ac8f2a8279a64195c611d19445cab3fd1a020afed9bd739bb95142fb2c00a8f847db5ef3325c814f8eb741bacf86ed3907bfe6e4564d2de5895df0c263824e0b75407589bae2d3a4666c13b92102d8781a8ee9bb4a5a1a78c4a9c21efdaf5584da42e84418b28f5a81d0456a3dc5b420991801e6b21e38c99bbe018a5b2d690894a114bc860d35601416aa4dc52216aff8a288d4775cddf8b72d45fd2f87303a8e9c0d67e442530be28eaf139894337266e0b33d57f949256ab32083bcc545bc18a83c9ab8247c12aea037e2b68dee31c734cb1f04f241d3b94caa3a2b258ffaf8e6eae9fbbe029a934dc0a0859c5f120334812693a1c09352340a39f2a678dbc1afa2a978bfee43afefcb7e224a58af2f3d647e5745db59061236b8af6fcfd93b3602f9e456978534f3a7851e800071bf56da80401c81d91c45f82568373af0576b1cc5eef9b85654124b6319770be3cdba3fbebe3715e8918fb6c8966624f3d0e815effac3d2ee06dd34ab9c693218b2c7c06ba99d6b74d4f17b8c3cb0203010001a321301f301d0603551d0e04160414d62bee9f3798509546acc62eb1de14b08b954d4f300d06092a864886f70d01010b05000382020100743f7c5692085895f9d1fffad390fb4202c15f123ed094df259185960fd6dadf66cb19851070f180297bba4e6996a4434616573b375cfee94fee73a4505a7ec29136b7e6c22e6436290e3686fe4379d4e3140ec6a08e70cfd3ed5b634a5eb5136efaaabf5f38e0432d3d79568a556970b8cfba2972f5d23a3856d8a981b9e9bbbbb88f35e708bde9cbc5f681cbd974085b9da28911296fe2579fa64bbe9fa0b93475a7a8db051080b0c5fade0d1c018e7858cd4cbe95145b0620e2f632cbe0f8af9cbf22e2fdaa72245ae31b0877b07181cc69dd2df74454251d8de58d25e76354abe7eb690f22e59b08795a8f2c98c578e0599503d9085927634072c82c9f82abd50fd12b8fd1a9d1954eb5cc0b4cfb5796b5aaec0356643b4a65a368442d92ef94edd3ac6a2b7fe3571b8cf9f462729228aab023ef9183f73792f5379633ccac51079177d604c6bc1873ada6f07d8da6d68c897e88a5fa5d63fdb8df820f46090e0716e7562dd3c140ba279a65b996f60addb0abe29d4bf2f5abe89480771d492307b926d91f02f341b2148502903c43d40f3c6c86a811d060711f0698b384acdcc0add44eb54e42962d3d041accc715afd49407715adc09350cb55e8d9281a3b0b6b5fcd91726eede9b7c8b13afdebb2c2b377629595f1096ba62fb14946dbac5f3c5f0b4e5b712e7acc7dcf6c46cdc5e6d6dfdeee55a0c92c2d70f080ac6";
expectedRepo.description = "This is a repository of apps to be used with F-Droid. Applications in this repository are either official binaries built by the original application developers, or are binaries built from source by the admin of f-droid.org using the tools on https://gitlab.com/u/fdroid."; expectedRepo.description = "This is a repository of apps to be used with F-Droid. Applications in this repository are either official binaries built by the original application developers, or are binaries built from source by the admin of belmarket.ir using the tools on https://gitlab.com/u/fdroid.";
expectedRepo.timestamp = 1472071347; expectedRepo.timestamp = 1472071347;
RepoDetails actualDetails = getFromFile("pushRequestsIndex.xml", Repo.PUSH_REQUEST_IGNORE); RepoDetails actualDetails = getFromFile("pushRequestsIndex.xml", Repo.PUSH_REQUEST_IGNORE);
handlerTestSuite(expectedRepo, actualDetails, 2, 14, -1, 17); handlerTestSuite(expectedRepo, actualDetails, 2, 14, -1, 17);
@ -158,7 +158,7 @@ public class RepoXMLHandlerTest {
Repo expectedRepo = new Repo(); Repo expectedRepo = new Repo();
expectedRepo.name = "non-public test repo"; expectedRepo.name = "non-public test repo";
expectedRepo.signingCertificate = "308204e1308202c9a0030201020204483450fa300d06092a864886f70d01010b050030213110300e060355040b1307462d44726f6964310d300b06035504031304736f7661301e170d3136303832333133333131365a170d3434303130393133333131365a30213110300e060355040b1307462d44726f6964310d300b06035504031304736f766130820222300d06092a864886f70d01010105000382020f003082020a0282020100dfdcd120f3ab224999dddf4ea33ea588d295e4d7130bef48c143e9d76e5c0e0e9e5d45e64208e35feebc79a83f08939dd6a343b7d1e2179930a105a1249ccd36d88ff3feffc6e4dc53dae0163a7876dd45ecc1ddb0adf5099aa56c1a84b52affcd45d0711ffa4de864f35ac0333ebe61ea8673eeda35a88f6af678cc4d0f80b089338ac8f2a8279a64195c611d19445cab3fd1a020afed9bd739bb95142fb2c00a8f847db5ef3325c814f8eb741bacf86ed3907bfe6e4564d2de5895df0c263824e0b75407589bae2d3a4666c13b92102d8781a8ee9bb4a5a1a78c4a9c21efdaf5584da42e84418b28f5a81d0456a3dc5b420991801e6b21e38c99bbe018a5b2d690894a114bc860d35601416aa4dc52216aff8a288d4775cddf8b72d45fd2f87303a8e9c0d67e442530be28eaf139894337266e0b33d57f949256ab32083bcc545bc18a83c9ab8247c12aea037e2b68dee31c734cb1f04f241d3b94caa3a2b258ffaf8e6eae9fbbe029a934dc0a0859c5f120334812693a1c09352340a39f2a678dbc1afa2a978bfee43afefcb7e224a58af2f3d647e5745db59061236b8af6fcfd93b3602f9e456978534f3a7851e800071bf56da80401c81d91c45f82568373af0576b1cc5eef9b85654124b6319770be3cdba3fbebe3715e8918fb6c8966624f3d0e815effac3d2ee06dd34ab9c693218b2c7c06ba99d6b74d4f17b8c3cb0203010001a321301f301d0603551d0e04160414d62bee9f3798509546acc62eb1de14b08b954d4f300d06092a864886f70d01010b05000382020100743f7c5692085895f9d1fffad390fb4202c15f123ed094df259185960fd6dadf66cb19851070f180297bba4e6996a4434616573b375cfee94fee73a4505a7ec29136b7e6c22e6436290e3686fe4379d4e3140ec6a08e70cfd3ed5b634a5eb5136efaaabf5f38e0432d3d79568a556970b8cfba2972f5d23a3856d8a981b9e9bbbbb88f35e708bde9cbc5f681cbd974085b9da28911296fe2579fa64bbe9fa0b93475a7a8db051080b0c5fade0d1c018e7858cd4cbe95145b0620e2f632cbe0f8af9cbf22e2fdaa72245ae31b0877b07181cc69dd2df74454251d8de58d25e76354abe7eb690f22e59b08795a8f2c98c578e0599503d9085927634072c82c9f82abd50fd12b8fd1a9d1954eb5cc0b4cfb5796b5aaec0356643b4a65a368442d92ef94edd3ac6a2b7fe3571b8cf9f462729228aab023ef9183f73792f5379633ccac51079177d604c6bc1873ada6f07d8da6d68c897e88a5fa5d63fdb8df820f46090e0716e7562dd3c140ba279a65b996f60addb0abe29d4bf2f5abe89480771d492307b926d91f02f341b2148502903c43d40f3c6c86a811d060711f0698b384acdcc0add44eb54e42962d3d041accc715afd49407715adc09350cb55e8d9281a3b0b6b5fcd91726eede9b7c8b13afdebb2c2b377629595f1096ba62fb14946dbac5f3c5f0b4e5b712e7acc7dcf6c46cdc5e6d6dfdeee55a0c92c2d70f080ac6"; expectedRepo.signingCertificate = "308204e1308202c9a0030201020204483450fa300d06092a864886f70d01010b050030213110300e060355040b1307462d44726f6964310d300b06035504031304736f7661301e170d3136303832333133333131365a170d3434303130393133333131365a30213110300e060355040b1307462d44726f6964310d300b06035504031304736f766130820222300d06092a864886f70d01010105000382020f003082020a0282020100dfdcd120f3ab224999dddf4ea33ea588d295e4d7130bef48c143e9d76e5c0e0e9e5d45e64208e35feebc79a83f08939dd6a343b7d1e2179930a105a1249ccd36d88ff3feffc6e4dc53dae0163a7876dd45ecc1ddb0adf5099aa56c1a84b52affcd45d0711ffa4de864f35ac0333ebe61ea8673eeda35a88f6af678cc4d0f80b089338ac8f2a8279a64195c611d19445cab3fd1a020afed9bd739bb95142fb2c00a8f847db5ef3325c814f8eb741bacf86ed3907bfe6e4564d2de5895df0c263824e0b75407589bae2d3a4666c13b92102d8781a8ee9bb4a5a1a78c4a9c21efdaf5584da42e84418b28f5a81d0456a3dc5b420991801e6b21e38c99bbe018a5b2d690894a114bc860d35601416aa4dc52216aff8a288d4775cddf8b72d45fd2f87303a8e9c0d67e442530be28eaf139894337266e0b33d57f949256ab32083bcc545bc18a83c9ab8247c12aea037e2b68dee31c734cb1f04f241d3b94caa3a2b258ffaf8e6eae9fbbe029a934dc0a0859c5f120334812693a1c09352340a39f2a678dbc1afa2a978bfee43afefcb7e224a58af2f3d647e5745db59061236b8af6fcfd93b3602f9e456978534f3a7851e800071bf56da80401c81d91c45f82568373af0576b1cc5eef9b85654124b6319770be3cdba3fbebe3715e8918fb6c8966624f3d0e815effac3d2ee06dd34ab9c693218b2c7c06ba99d6b74d4f17b8c3cb0203010001a321301f301d0603551d0e04160414d62bee9f3798509546acc62eb1de14b08b954d4f300d06092a864886f70d01010b05000382020100743f7c5692085895f9d1fffad390fb4202c15f123ed094df259185960fd6dadf66cb19851070f180297bba4e6996a4434616573b375cfee94fee73a4505a7ec29136b7e6c22e6436290e3686fe4379d4e3140ec6a08e70cfd3ed5b634a5eb5136efaaabf5f38e0432d3d79568a556970b8cfba2972f5d23a3856d8a981b9e9bbbbb88f35e708bde9cbc5f681cbd974085b9da28911296fe2579fa64bbe9fa0b93475a7a8db051080b0c5fade0d1c018e7858cd4cbe95145b0620e2f632cbe0f8af9cbf22e2fdaa72245ae31b0877b07181cc69dd2df74454251d8de58d25e76354abe7eb690f22e59b08795a8f2c98c578e0599503d9085927634072c82c9f82abd50fd12b8fd1a9d1954eb5cc0b4cfb5796b5aaec0356643b4a65a368442d92ef94edd3ac6a2b7fe3571b8cf9f462729228aab023ef9183f73792f5379633ccac51079177d604c6bc1873ada6f07d8da6d68c897e88a5fa5d63fdb8df820f46090e0716e7562dd3c140ba279a65b996f60addb0abe29d4bf2f5abe89480771d492307b926d91f02f341b2148502903c43d40f3c6c86a811d060711f0698b384acdcc0add44eb54e42962d3d041accc715afd49407715adc09350cb55e8d9281a3b0b6b5fcd91726eede9b7c8b13afdebb2c2b377629595f1096ba62fb14946dbac5f3c5f0b4e5b712e7acc7dcf6c46cdc5e6d6dfdeee55a0c92c2d70f080ac6";
expectedRepo.description = "This is a repository of apps to be used with F-Droid. Applications in this repository are either official binaries built by the original application developers, or are binaries built from source by the admin of f-droid.org using the tools on https://gitlab.com/u/fdroid."; expectedRepo.description = "This is a repository of apps to be used with F-Droid. Applications in this repository are either official binaries built by the original application developers, or are binaries built from source by the admin of belmarket.ir using the tools on https://gitlab.com/u/fdroid.";
expectedRepo.timestamp = 1472071347; expectedRepo.timestamp = 1472071347;
RepoDetails actualDetails = getFromFile("pushRequestsIndex.xml", Repo.PUSH_REQUEST_ACCEPT_ALWAYS); RepoDetails actualDetails = getFromFile("pushRequestsIndex.xml", Repo.PUSH_REQUEST_ACCEPT_ALWAYS);
handlerTestSuite(expectedRepo, actualDetails, 2, 14, -1, 17); handlerTestSuite(expectedRepo, actualDetails, 2, 14, -1, 17);

View File

@ -2,7 +2,7 @@
<fdroid> <fdroid>
<repo name="F-Droid" icon="fdroid-icon.png" maxage="14" <repo name="F-Droid" icon="fdroid-icon.png" maxage="14"
pubkey="3082035e30820246a00302010202044c49cd00300d06092a864886f70d01010505003071310b300906035504061302554b3110300e06035504081307556e6b6e6f776e3111300f0603550407130857657468657262793110300e060355040a1307556e6b6e6f776e3110300e060355040b1307556e6b6e6f776e311930170603550403131043696172616e2047756c746e69656b73301e170d3130303732333137313032345a170d3337313230383137313032345a3071310b300906035504061302554b3110300e06035504081307556e6b6e6f776e3111300f0603550407130857657468657262793110300e060355040a1307556e6b6e6f776e3110300e060355040b1307556e6b6e6f776e311930170603550403131043696172616e2047756c746e69656b7330820122300d06092a864886f70d01010105000382010f003082010a028201010096d075e47c014e7822c89fd67f795d23203e2a8843f53ba4e6b1bf5f2fd0e225938267cfcae7fbf4fe596346afbaf4070fdb91f66fbcdf2348a3d92430502824f80517b156fab00809bdc8e631bfa9afd42d9045ab5fd6d28d9e140afc1300917b19b7c6c4df4a494cf1f7cb4a63c80d734265d735af9e4f09455f427aa65a53563f87b336ca2c19d244fcbba617ba0b19e56ed34afe0b253ab91e2fdb1271f1b9e3c3232027ed8862a112f0706e234cf236914b939bcf959821ecb2a6c18057e070de3428046d94b175e1d89bd795e535499a091f5bc65a79d539a8d43891ec504058acb28c08393b5718b57600a211e803f4a634e5c57f25b9b8c4422c6fd90203010001300d06092a864886f70d0101050500038201010008e4ef699e9807677ff56753da73efb2390d5ae2c17e4db691d5df7a7b60fc071ae509c5414be7d5da74df2811e83d3668c4a0b1abc84b9fa7d96b4cdf30bba68517ad2a93e233b042972ac0553a4801c9ebe07bf57ebe9a3b3d6d663965260e50f3b8f46db0531761e60340a2bddc3426098397fda54044a17e5244549f9869b460ca5e6e216b6f6a2db0580b480ca2afe6ec6b46eedacfa4aa45038809ece0c5978653d6c85f678e7f5a2156d1bedd8117751e64a4b0dcd140f3040b021821a8d93aed8d01ba36db6c82372211fed714d9a32607038cdfd565bd529ffc637212aaa2c224ef22b603eccefb5bf1e085c191d4b24fe742b17ab3f55d4e6f05ef" pubkey="3082035e30820246a00302010202044c49cd00300d06092a864886f70d01010505003071310b300906035504061302554b3110300e06035504081307556e6b6e6f776e3111300f0603550407130857657468657262793110300e060355040a1307556e6b6e6f776e3110300e060355040b1307556e6b6e6f776e311930170603550403131043696172616e2047756c746e69656b73301e170d3130303732333137313032345a170d3337313230383137313032345a3071310b300906035504061302554b3110300e06035504081307556e6b6e6f776e3111300f0603550407130857657468657262793110300e060355040a1307556e6b6e6f776e3110300e060355040b1307556e6b6e6f776e311930170603550403131043696172616e2047756c746e69656b7330820122300d06092a864886f70d01010105000382010f003082010a028201010096d075e47c014e7822c89fd67f795d23203e2a8843f53ba4e6b1bf5f2fd0e225938267cfcae7fbf4fe596346afbaf4070fdb91f66fbcdf2348a3d92430502824f80517b156fab00809bdc8e631bfa9afd42d9045ab5fd6d28d9e140afc1300917b19b7c6c4df4a494cf1f7cb4a63c80d734265d735af9e4f09455f427aa65a53563f87b336ca2c19d244fcbba617ba0b19e56ed34afe0b253ab91e2fdb1271f1b9e3c3232027ed8862a112f0706e234cf236914b939bcf959821ecb2a6c18057e070de3428046d94b175e1d89bd795e535499a091f5bc65a79d539a8d43891ec504058acb28c08393b5718b57600a211e803f4a634e5c57f25b9b8c4422c6fd90203010001300d06092a864886f70d0101050500038201010008e4ef699e9807677ff56753da73efb2390d5ae2c17e4db691d5df7a7b60fc071ae509c5414be7d5da74df2811e83d3668c4a0b1abc84b9fa7d96b4cdf30bba68517ad2a93e233b042972ac0553a4801c9ebe07bf57ebe9a3b3d6d663965260e50f3b8f46db0531761e60340a2bddc3426098397fda54044a17e5244549f9869b460ca5e6e216b6f6a2db0580b480ca2afe6ec6b46eedacfa4aa45038809ece0c5978653d6c85f678e7f5a2156d1bedd8117751e64a4b0dcd140f3040b021821a8d93aed8d01ba36db6c82372211fed714d9a32607038cdfd565bd529ffc637212aaa2c224ef22b603eccefb5bf1e085c191d4b24fe742b17ab3f55d4e6f05ef"
timestamp="1467169032" url="http://f-droid.org/repo" version="16"> timestamp="1467169032" url="http://belmarket.ir/repo" version="16">
<description> <description>
This is just a test of the extended permissions attributes. This is just a test of the extended permissions attributes.
</description> </description>

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -1,6 +1,6 @@
<?xml version="1.0" ?><fdroid><repo icon="fdroid-icon.png" name="F-Droid" pubkey="308201ee30820157a0030201020204300d845b300d06092a864886f70d01010b0500302a3110300e060355040b1307462d44726f6964311630140603550403130d70616c6174736368696e6b656e301e170d3134303432373030303633315a170d3431303931323030303633315a302a3110300e060355040b1307462d44726f6964311630140603550403130d70616c6174736368696e6b656e30819f300d06092a864886f70d010101050003818d0030818902818100a439472e4b6d01141bfc94ecfe131c7c728fdda670bb14c57ca60bd1c38a8b8bc0879d22a0a2d0bc0d6fdd4cb98d1d607c2caefbe250a0bd0322aedeb365caf9b236992fac13e6675d3184a6c7c6f07f73410209e399a9da8d5d7512bbd870508eebacff8b57c3852457419434d34701ccbf692267cbc3f42f1c5d1e23762d790203010001a321301f301d0603551d0e041604140b1840691dab909746fde4bfe28207d1cae15786300d06092a864886f70d01010b05000381810062424c928ffd1b6fd419b44daafef01ca982e09341f7077fb865905087aeac882534b3bd679b51fdfb98892cef38b63131c567ed26c9d5d9163afc775ac98ad88c405d211d6187bde0b0d236381cc574ba06ef9080721a92ae5a103a7301b2c397eecc141cc850dd3e123813ebc41c59d31ddbcb6e984168280c53272f6a442b" timestamp="1398733213" url="https://f-droid.org/repo" version="12"><description> <?xml version="1.0" ?><fdroid><repo icon="fdroid-icon.png" name="F-Droid" pubkey="308201ee30820157a0030201020204300d845b300d06092a864886f70d01010b0500302a3110300e060355040b1307462d44726f6964311630140603550403130d70616c6174736368696e6b656e301e170d3134303432373030303633315a170d3431303931323030303633315a302a3110300e060355040b1307462d44726f6964311630140603550403130d70616c6174736368696e6b656e30819f300d06092a864886f70d010101050003818d0030818902818100a439472e4b6d01141bfc94ecfe131c7c728fdda670bb14c57ca60bd1c38a8b8bc0879d22a0a2d0bc0d6fdd4cb98d1d607c2caefbe250a0bd0322aedeb365caf9b236992fac13e6675d3184a6c7c6f07f73410209e399a9da8d5d7512bbd870508eebacff8b57c3852457419434d34701ccbf692267cbc3f42f1c5d1e23762d790203010001a321301f301d0603551d0e041604140b1840691dab909746fde4bfe28207d1cae15786300d06092a864886f70d01010b05000381810062424c928ffd1b6fd419b44daafef01ca982e09341f7077fb865905087aeac882534b3bd679b51fdfb98892cef38b63131c567ed26c9d5d9163afc775ac98ad88c405d211d6187bde0b0d236381cc574ba06ef9080721a92ae5a103a7301b2c397eecc141cc850dd3e123813ebc41c59d31ddbcb6e984168280c53272f6a442b" timestamp="1398733213" url="https://belmarket.ir/repo" version="12"><description>
The official repository of the F-Droid client. Applications in this repository The official repository of the F-Droid client. Applications in this repository
are either official binaries built by the original application developers, or are either official binaries built by the original application developers, or
are binaries built from source by the admin of f-droid.org using the tools on are binaries built from source by the admin of belmarket.ir using the tools on
https://gitorious.org/f-droid. https://gitorious.org/f-droid.
</description></repo></fdroid> </description></repo></fdroid>

View File

@ -33,13 +33,13 @@ function wait {
APP_TO_SHOW=org.belmarket.shop APP_TO_SHOW=org.belmarket.shop
SEARCH_QUERY=book+reader SEARCH_QUERY=book+reader
view "Search for '$SEARCH_QUERY' (fdroid web)" http://f-droid.org/repository/browse?fdfilter=$SEARCH_QUERY view "Search for '$SEARCH_QUERY' (fdroid web)" http://belmarket.ir/repository/browse?fdfilter=$SEARCH_QUERY
view "Search for '$SEARCH_QUERY' (market)" market://search?q=$SEARCH_QUERY view "Search for '$SEARCH_QUERY' (market)" market://search?q=$SEARCH_QUERY
view "Search for '$SEARCH_QUERY' (play)" http://play.google.com/store/search?q=$SEARCH_QUERY view "Search for '$SEARCH_QUERY' (play)" http://play.google.com/store/search?q=$SEARCH_QUERY
view "Search for '$SEARCH_QUERY' (amazon)" http://amazon.com/gp/mas/dl/android?s=$SEARCH_QUERY view "Search for '$SEARCH_QUERY' (amazon)" http://amazon.com/gp/mas/dl/android?s=$SEARCH_QUERY
view "Search for '$SEARCH_QUERY' (fdroid)" fdroid.search:$SEARCH_QUERY view "Search for '$SEARCH_QUERY' (fdroid)" fdroid.search:$SEARCH_QUERY
view "View '$APP_TO_SHOW' (fdroid web fdid)" http://f-droid.org/repository/browse?fdid=$APP_TO_SHOW view "View '$APP_TO_SHOW' (fdroid web fdid)" http://belmarket.ir/repository/browse?fdid=$APP_TO_SHOW
view "View '$APP_TO_SHOW' (fdroid web /app/ path)" http://f-droid.org/app/$APP_TO_SHOW view "View '$APP_TO_SHOW' (fdroid web /app/ path)" http://belmarket.ir/app/$APP_TO_SHOW
view "View '$APP_TO_SHOW' (market)" market://details?id=$APP_TO_SHOW view "View '$APP_TO_SHOW' (market)" market://details?id=$APP_TO_SHOW
view "View '$APP_TO_SHOW' (play)" http://play.google.com/store/apps/details?id=$APP_TO_SHOW view "View '$APP_TO_SHOW' (play)" http://play.google.com/store/apps/details?id=$APP_TO_SHOW
view "View '$APP_TO_SHOW' (amazon)" amzn://apps/android?p=$APP_TO_SHOW view "View '$APP_TO_SHOW' (amazon)" amzn://apps/android?p=$APP_TO_SHOW

View File

@ -13,7 +13,7 @@ REMOTE="weblate"
REMOTE_URL="git://git.weblate.org/f-droid.git" REMOTE_URL="git://git.weblate.org/f-droid.git"
REMOTE_BRANCH="master" REMOTE_BRANCH="master"
AUTHOR="F-Droid Translatebot <team@f-droid.org>" AUTHOR="F-Droid Translatebot <team@belmarket.ir>"
if ! git ls-remote --exit-code $REMOTE >/dev/null 2>/dev/null; then if ! git ls-remote --exit-code $REMOTE >/dev/null 2>/dev/null; then
echo "Remote doesn't exist! Try the following:" echo "Remote doesn't exist! Try the following:"