fix style and edit fdroid.fdroid.org to org.belmarket.shop

CONTRIBUTING.md

@@ -51,7 +51,7 @@ it. We enforce some of these, but not all, via checkstyle.
 
 To get all the logcat messages by F-Droid, you can run:
 
-    adb logcat | grep `adb shell ps | grep org.fdroid.fdroid | cut -c10-15`
+    adb logcat | grep `adb shell ps | grep org.belmarket.shop | cut -c10-15`
 
 ## Building tips
 

README.md

@@ -13,7 +13,7 @@ for Android.
 ## Direct download
 
 You can [download the application](https://f-droid.org/FDroid.apk) directly
-from our site or [browse it in the repo](https://f-droid.org/app/org.fdroid.fdroid).
+from our site or [browse it in the repo](https://f-droid.org/app/org.belmarket.shop).
 
 ## Contributing
 

app/proguard-rules.pro

@@ -1,7 +1,7 @@
 -dontobfuscate
 -dontoptimize
 -keepattributes SourceFile,LineNumberTable,Exceptions
--keep class org.fdroid.fdroid.** {*;}
+-keep class org.belmarket.shop.** {*;}
 -dontskipnonpubliclibraryclassmembers
 -dontwarn android.test.**
 -dontwarn com.android.support.test.**

app/src/androidTest/AndroidManifest.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- package name must be unique so suffix with "tests" so package loader doesn't ignore us -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="org.fdroid.fdroid.tests"
+          package="org.belmarket.shop.tests"
           android:versionCode="1"
           android:versionName="1.0">
     <!-- We add an application tag here just so that we can indicate that
@@ -14,10 +14,10 @@
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
     <!--
     This declares that this application uses the instrumentation test runner targeting
-    the package of org.fdroid.fdroid.  To run the tests use the command:
+    the package of org.belmarket.shop.  To run the tests use the command:
-    "adb shell am instrument -w org.fdroid.fdroid.tests/android.test.InstrumentationTestRunner"
+    "adb shell am instrument -w org.belmarket.shop.tests/android.test.InstrumentationTestRunner"
     -->
     <instrumentation android:name="com.zutubi.android.junitreport.JUnitReportTestRunner"
-                     android:targetPackage="org.fdroid.fdroid"
+                     android:targetPackage="org.belmarket.shop"
-                     android:label="Tests for org.fdroid.fdroid" />
+                     android:label="Tests for org.belmarket.shop" />
 </manifest>

app/src/androidTest/java/org/fdroid/fdroid/AssetUtils.java

@@ -1,4 +1,4 @@
-package org.fdroid.fdroid;
+package org.belmarket.shop;
 
 import android.content.Context;
 import android.support.annotation.Nullable;

app/src/androidTest/java/org/fdroid/fdroid/CleanCacheServiceTest.java

@@ -1,11 +1,11 @@
-package org.fdroid.fdroid;
+package org.belmarket.shop;
 
 import android.app.Instrumentation;
 import android.support.test.InstrumentationRegistry;
 import android.support.test.runner.AndroidJUnit4;
 
 import org.apache.commons.io.FileUtils;
-import org.fdroid.fdroid.compat.FileCompatTest;
+import org.belmarket.shop.compat.FileCompatTest;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 

app/src/androidTest/java/org/fdroid/fdroid/compat/FileCompatTest.java

@@ -1,4 +1,4 @@
-package org.fdroid.fdroid.compat;
+package org.belmarket.shop.compat;
 
 import android.app.Instrumentation;
 import android.content.Context;
@@ -7,8 +7,8 @@ import android.os.Environment;
 import android.support.test.InstrumentationRegistry;
 import android.support.test.runner.AndroidJUnit4;
 
-import org.fdroid.fdroid.AssetUtils;
+import org.belmarket.shop.AssetUtils;
-import org.fdroid.fdroid.data.SanitizedFile;
+import org.belmarket.shop.data.SanitizedFile;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;

app/src/androidTest/java/org/fdroid/fdroid/installer/ApkVerifierTest.java

@@ -17,7 +17,7 @@
  * MA 02110-1301, USA.
  */
 
-package org.fdroid.fdroid.installer;
+package org.belmarket.shop.installer;
 
 import android.app.Instrumentation;
 import android.net.Uri;
@@ -27,13 +27,13 @@ import android.support.test.InstrumentationRegistry;
 import android.support.test.runner.AndroidJUnit4;
 import android.util.Log;
 
-import org.fdroid.fdroid.AssetUtils;
+import org.belmarket.shop.AssetUtils;
-import org.fdroid.fdroid.RepoXMLHandler;
+import org.belmarket.shop.RepoXMLHandler;
-import org.fdroid.fdroid.Utils;
+import org.belmarket.shop.Utils;
-import org.fdroid.fdroid.compat.FileCompatTest;
+import org.belmarket.shop.compat.FileCompatTest;
-import org.fdroid.fdroid.data.Apk;
+import org.belmarket.shop.data.Apk;
-import org.fdroid.fdroid.data.Repo;
+import org.belmarket.shop.data.Repo;
-import org.fdroid.fdroid.mock.RepoDetails;
+import org.belmarket.shop.mock.RepoDetails;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;

app/src/androidTest/java/org/fdroid/fdroid/net/HttpDownloaderTest.java

@@ -1,7 +1,7 @@
 
-package org.fdroid.fdroid.net;
+package org.belmarket.shop.net;
 
-import org.fdroid.fdroid.ProgressListener;
+import org.belmarket.shop.ProgressListener;
 import org.junit.Test;
 
 import java.io.File;

app/src/main/AndroidManifest.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="org.fdroid.fdroid"
+    package="org.belmarket.shop"
     android:installLocation="auto">
 
     <uses-sdk
@@ -65,48 +65,48 @@
         >
 
         <provider
-            android:authorities="org.fdroid.fdroid.data.AppProvider"
+            android:authorities="org.belmarket.shop.data.AppProvider"
-            android:name="org.fdroid.fdroid.data.AppProvider"
+            android:name="org.belmarket.shop.data.AppProvider"
             android:exported="false"/>
 
         <provider
-            android:authorities="org.fdroid.fdroid.data.RepoProvider"
+            android:authorities="org.belmarket.shop.data.RepoProvider"
-            android:name="org.fdroid.fdroid.data.RepoProvider"
+            android:name="org.belmarket.shop.data.RepoProvider"
             android:exported="false"/>
 
         <provider
-            android:authorities="org.fdroid.fdroid.data.ApkProvider"
+            android:authorities="org.belmarket.shop.data.ApkProvider"
-            android:name="org.fdroid.fdroid.data.ApkProvider"
+            android:name="org.belmarket.shop.data.ApkProvider"
             android:exported="false"/>
 
         <provider
-            android:authorities="org.fdroid.fdroid.data.TempApkProvider"
+            android:authorities="org.belmarket.shop.data.TempApkProvider"
-            android:name="org.fdroid.fdroid.data.TempApkProvider"
+            android:name="org.belmarket.shop.data.TempApkProvider"
             android:exported="false"/>
 
         <provider
-            android:authorities="org.fdroid.fdroid.data.TempAppProvider"
+            android:authorities="org.belmarket.shop.data.TempAppProvider"
-            android:name="org.fdroid.fdroid.data.TempAppProvider"
+            android:name="org.belmarket.shop.data.TempAppProvider"
             android:exported="false"/>
 
         <provider
-            android:authorities="org.fdroid.fdroid.data.InstalledAppProvider"
+            android:authorities="org.belmarket.shop.data.InstalledAppProvider"
-            android:name="org.fdroid.fdroid.data.InstalledAppProvider"
+            android:name="org.belmarket.shop.data.InstalledAppProvider"
             android:exported="false"/>
 
         <provider
-            android:authorities="org.fdroid.fdroid.data.AppPrefsProvider"
+            android:authorities="org.belmarket.shop.data.AppPrefsProvider"
-            android:name="org.fdroid.fdroid.data.AppPrefsProvider"
+            android:name="org.belmarket.shop.data.AppPrefsProvider"
             android:exported="false"/>
 
         <provider
-            android:authorities="org.fdroid.fdroid.data.PackageProvider"
+            android:authorities="org.belmarket.shop.data.PackageProvider"
-            android:name="org.fdroid.fdroid.data.PackageProvider"
+            android:name="org.belmarket.shop.data.PackageProvider"
             android:exported="false"/>
 
         <provider
-            android:name="org.fdroid.fdroid.installer.ApkFileProvider"
+            android:name="org.belmarket.shop.installer.ApkFileProvider"
-            android:authorities="org.fdroid.fdroid.installer.ApkFileProvider"
+            android:authorities="org.belmarket.shop.installer.ApkFileProvider"
             android:exported="false"
             android:grantUriPermissions="true">
             <meta-data
@@ -115,7 +115,7 @@
         </provider>
         <provider
             android:name="android.support.v4.content.FileProvider"
-            android:authorities="org.fdroid.fdroid.installer"
+            android:authorities="org.belmarket.shop.installer"
             android:exported="false"
             android:grantUriPermissions="true">
             <meta-data
@@ -370,7 +370,7 @@
 
                 <category android:name="android.intent.category.DEFAULT" />
 
-                <data android:mimeType="application/vnd.org.fdroid.fdroid.repo" />
+                <data android:mimeType="application/vnd.org.belmarket.shop.repo" />
             </intent-filter>
         </activity>
         <activity

app/src/main/java/org/fdroid/fdroid/#RepoUpdater.java#

@@ -1,6 +1,6 @@
 
 
-package org.fdroid.fdroid;
+package org.belmarket.shop;
 
 import android.content.ContentValues;
 import android.content.Context;
@@ -9,14 +9,14 @@ import android.support.annotation.Nullable;
 import android.text.TextUtils;
 import android.util.Log;
 
-import org.fdroid.fdroid.data.Apk;
+import org.belmarket.shop.data.Apk;
-import org.fdroid.fdroid.data.App;
+import org.belmarket.shop.data.App;
-import org.fdroid.fdroid.data.Repo;
+import org.belmarket.shop.data.Repo;
-import org.fdroid.fdroid.data.RepoPersister;
+import org.belmarket.shop.data.RepoPersister;
-import org.fdroid.fdroid.data.RepoProvider;
+import org.belmarket.shop.data.RepoProvider;
-import org.fdroid.fdroid.data.Schema.RepoTable;
+import org.belmarket.shop.data.Schema.RepoTable;
-import org.fdroid.fdroid.net.Downloader;
+import org.belmarket.shop.net.Downloader;
-import org.fdroid.fdroid.net.DownloaderFactory;
+import org.belmarket.shop.net.DownloaderFactory;
 import org.xml.sax.InputSource;
 import org.xml.sax.SAXException;
 import org.xml.sax.XMLReader;

app/src/main/java/org/fdroid/fdroid/#RepoXMLHandler.java#

@@ -17,14 +17,14 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package org.fdroid.fdroid;
+package org.belmarket.shop;
 
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 
-import org.fdroid.fdroid.data.Apk;
+import org.belmarket.shop.data.Apk;
-import org.fdroid.fdroid.data.App;
+import org.belmarket.shop.data.App;
-import org.fdroid.fdroid.data.Repo;
+import org.belmarket.shop.data.Repo;
 import org.xml.sax.Attributes;
 import org.xml.sax.SAXException;
 import org.xml.sax.helpers.DefaultHandler;

app/src/main/java/org/fdroid/fdroid/AppDetails.java

@@ -19,7 +19,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package org.fdroid.fdroid;
+package org.belmarket.shop;
 
 import android.app.Activity;
 import android.app.PendingIntent;
@@ -78,21 +78,21 @@ import com.nostra13.universalimageloader.core.DisplayImageOptions;
 import com.nostra13.universalimageloader.core.ImageLoader;
 import com.nostra13.universalimageloader.core.assist.ImageScaleType;
 
-import org.fdroid.fdroid.data.Apk;
+import org.belmarket.shop.data.Apk;
-import org.fdroid.fdroid.data.ApkProvider;
+import org.belmarket.shop.data.ApkProvider;
-import org.fdroid.fdroid.data.App;
+import org.belmarket.shop.data.App;
-import org.fdroid.fdroid.data.AppPrefs;
+import org.belmarket.shop.data.AppPrefs;
-import org.fdroid.fdroid.data.AppPrefsProvider;
+import org.belmarket.shop.data.AppPrefsProvider;
-import org.fdroid.fdroid.data.AppProvider;
+import org.belmarket.shop.data.AppProvider;
-import org.fdroid.fdroid.data.InstalledAppProvider;
+import org.belmarket.shop.data.InstalledAppProvider;
-import org.fdroid.fdroid.data.RepoProvider;
+import org.belmarket.shop.data.RepoProvider;
-import org.fdroid.fdroid.data.Schema;
+import org.belmarket.shop.data.Schema;
-import org.fdroid.fdroid.installer.InstallManagerService;
+import org.belmarket.shop.installer.InstallManagerService;
-import org.fdroid.fdroid.installer.Installer;
+import org.belmarket.shop.installer.Installer;
-import org.fdroid.fdroid.installer.InstallerFactory;
+import org.belmarket.shop.installer.InstallerFactory;
-import org.fdroid.fdroid.installer.InstallerService;
+import org.belmarket.shop.installer.InstallerService;
-import org.fdroid.fdroid.net.Downloader;
+import org.belmarket.shop.net.Downloader;
-import org.fdroid.fdroid.net.DownloaderService;
+import org.belmarket.shop.net.DownloaderService;
 import org.fdroid.fdroid.privileged.views.AppDiff;
 import org.fdroid.fdroid.privileged.views.AppSecurityPermissions;
 

app/src/main/java/org/fdroid/fdroid/AppFilter.java

@@ -16,9 +16,9 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package org.fdroid.fdroid;
+package org.belmarket.shop;
 
-import org.fdroid.fdroid.data.App;
+import org.belmarket.shop.data.App;
 
 public class AppFilter {
 

app/src/main/java/org/fdroid/fdroid/CleanCacheService.java

@@ -1,4 +1,4 @@
-package org.fdroid.fdroid;
+package org.belmarket.shop;
 
 import android.app.AlarmManager;
 import android.app.IntentService;
@@ -10,7 +10,7 @@ import android.os.Process;
 import android.os.SystemClock;
 
 import org.apache.commons.io.FileUtils;
-import org.fdroid.fdroid.installer.ApkCache;
+import org.belmarket.shop.installer.ApkCache;
 
 import java.io.File;
 import java.util.concurrent.TimeUnit;
@@ -78,7 +78,7 @@ public class CleanCacheService extends IntentService {
     }
 
     /**
-     * {@link org.fdroid.fdroid.installer.Installer} instances copy the APK into
+     * {@link org.belmarket.shop.installer.Installer} instances copy the APK into
      * a safe place before installing.  It doesn't clean up them reliably yet.
      */
     private void deleteOldInstallerFiles() {
@@ -109,7 +109,7 @@ public class CleanCacheService extends IntentService {
      * after the SD card becomes available).
      * <p>
      * This also deletes temp files that are created by
-     * {@link org.fdroid.fdroid.net.DownloaderFactory#create(Context, String)}, e.g. "dl-*"
+     * {@link org.belmarket.shop.net.DownloaderFactory#create(Context, String)}, e.g. "dl-*"
      */
     private void deleteStrayIndexFiles() {
         File cacheDir = getCacheDir();

app/src/main/java/org/fdroid/fdroid/CleanCacheService21.java

@@ -1,4 +1,4 @@
-package org.fdroid.fdroid;
+package org.belmarket.shop;
 
 import android.annotation.TargetApi;
 import android.system.ErrnoException;

app/src/main/java/org/fdroid/fdroid/CompatibilityChecker.java

@@ -1,4 +1,4 @@
-package org.fdroid.fdroid;
+package org.belmarket.shop;
 
 import android.content.Context;
 import android.content.SharedPreferences;
@@ -9,8 +9,8 @@ import android.preference.PreferenceManager;
 import android.support.annotation.Nullable;
 import android.text.TextUtils;
 
-import org.fdroid.fdroid.compat.SupportedArchitectures;
+import org.belmarket.shop.compat.SupportedArchitectures;
-import org.fdroid.fdroid.data.Apk;
+import org.belmarket.shop.data.Apk;
 
 import java.util.ArrayList;
 import java.util.Collections;

app/src/main/java/org/fdroid/fdroid/FDroid.java

@@ -17,7 +17,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package org.fdroid.fdroid;
+package org.belmarket.shop;
 
 import android.app.NotificationManager;
 import android.app.SearchManager;
@@ -44,13 +44,13 @@ import android.view.View;
 import android.widget.TextView;
 import android.widget.Toast;
 
-import org.fdroid.fdroid.compat.TabManager;
+import org.belmarket.shop.compat.TabManager;
-import org.fdroid.fdroid.compat.UriCompat;
+import org.belmarket.shop.compat.UriCompat;
-import org.fdroid.fdroid.data.AppProvider;
+import org.belmarket.shop.data.AppProvider;
-import org.fdroid.fdroid.data.NewRepoConfig;
+import org.belmarket.shop.data.NewRepoConfig;
-import org.fdroid.fdroid.views.AppListFragmentPagerAdapter;
+import org.belmarket.shop.views.AppListFragmentPagerAdapter;
-import org.fdroid.fdroid.views.ManageReposActivity;
+import org.belmarket.shop.views.ManageReposActivity;
-import org.fdroid.fdroid.views.swap.SwapWorkflowActivity;
+import org.belmarket.shop.views.swap.SwapWorkflowActivity;
 
 public class FDroid extends AppCompatActivity implements SearchView.OnQueryTextListener {
 
@@ -62,7 +62,7 @@ public class FDroid extends AppCompatActivity implements SearchView.OnQueryTextL
 
     public static final String EXTRA_TAB_UPDATE = "extraTab";
 
-    private static final String ACTION_ADD_REPO = "org.fdroid.fdroid.FDroid.ACTION_ADD_REPO";
+    private static final String ACTION_ADD_REPO = "org.belmarket.shop.FDroid.ACTION_ADD_REPO";
 
     private static final String ADD_REPO_INTENT_HANDLED = "addRepoIntentHandled";
 
@@ -382,7 +382,7 @@ public class FDroid extends AppCompatActivity implements SearchView.OnQueryTextL
                 }
                 break;
             case REQUEST_ENABLE_BLUETOOTH:
-                fdroidApp.sendViaBluetooth(this, resultCode, "org.fdroid.fdroid");
+                fdroidApp.sendViaBluetooth(this, resultCode, "org.belmarket.shop");
                 break;
         }
     }

app/src/main/java/org/fdroid/fdroid/FDroidApp.java

@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package org.fdroid.fdroid;
+package org.belmarket.shop;
 
 import android.annotation.TargetApi;
 import android.app.Activity;
@@ -50,15 +50,15 @@ import org.acra.ACRA;
 import org.acra.ReportingInteractionMode;
 import org.acra.annotation.ReportsCrashes;
 import org.apache.commons.net.util.SubnetUtils;
-import org.fdroid.fdroid.Preferences.ChangeListener;
+import org.belmarket.shop.Preferences.ChangeListener;
-import org.fdroid.fdroid.Preferences.Theme;
+import org.belmarket.shop.Preferences.Theme;
-import org.fdroid.fdroid.compat.PRNGFixes;
+import org.belmarket.shop.compat.PRNGFixes;
-import org.fdroid.fdroid.data.AppProvider;
+import org.belmarket.shop.data.AppProvider;
-import org.fdroid.fdroid.data.InstalledAppProviderService;
+import org.belmarket.shop.data.InstalledAppProviderService;
-import org.fdroid.fdroid.data.Repo;
+import org.belmarket.shop.data.Repo;
-import org.fdroid.fdroid.installer.InstallHistoryService;
+import org.belmarket.shop.installer.InstallHistoryService;
-import org.fdroid.fdroid.net.IconDownloader;
+import org.belmarket.shop.net.IconDownloader;
-import org.fdroid.fdroid.net.WifiStateChangeService;
+import org.belmarket.shop.net.WifiStateChangeService;
 
 import java.net.URL;
 import java.net.URLStreamHandler;
@@ -73,8 +73,8 @@ import sun.net.www.protocol.bluetooth.Handler;
 
 @ReportsCrashes(mailTo = "reports@f-droid.org",
         mode = ReportingInteractionMode.DIALOG,
-        reportDialogClass = org.fdroid.fdroid.acra.CrashReportActivity.class,
+        reportDialogClass = org.belmarket.shop.acra.CrashReportActivity.class,
-        reportSenderFactoryClasses = org.fdroid.fdroid.acra.CrashReportSenderFactory.class
+        reportSenderFactoryClasses = org.belmarket.shop.acra.CrashReportSenderFactory.class
 )
 public class FDroidApp extends Application {
 
@@ -161,7 +161,7 @@ public class FDroidApp extends Application {
 
     /**
      * Initialize the settings needed to run a local swap repo. This should
-     * only ever be called in {@link org.fdroid.fdroid.net.WifiStateChangeService.WifiInfoThread},
+     * only ever be called in {@link org.belmarket.shop.net.WifiStateChangeService.WifiInfoThread},
      * after the single init call in {@link FDroidApp#onCreate()}.
      */
     public static void initWifiSettings() {
@@ -314,12 +314,12 @@ public class FDroidApp extends Application {
     }
 
     /**
-     * Asks if the current process is "org.fdroid.fdroid:acra".
+     * Asks if the current process is "org.belmarket.shop:acra".
      *
      * This is helpful for bailing out of the {@link FDroidApp#onCreate} method early, preventing
      * problems that arise from executing the code twice. This happens due to the `android:process`
      * statement in AndroidManifest.xml causes another process to be created to run
-     * {@link org.fdroid.fdroid.acra.CrashReportActivity}. This was causing lots of things to be
+     * {@link org.belmarket.shop.acra.CrashReportActivity}. This was causing lots of things to be
      * started/run twice including {@link CleanCacheService} and {@link WifiStateChangeService}.
      *
      * Note that it is not perfect, because some devices seem to not provide a list of running app
@@ -336,7 +336,7 @@ public class FDroidApp extends Application {
 
         int pid = android.os.Process.myPid();
         for (RunningAppProcessInfo processInfo : processes) {
-            if (processInfo.pid == pid && "org.fdroid.fdroid:acra".equals(processInfo.processName)) {
+            if (processInfo.pid == pid && "org.belmarket.shop:acra".equals(processInfo.processName)) {
                 return true;
             }
         }

app/src/main/java/org/fdroid/fdroid/FDroidCertPins.java

@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package org.fdroid.fdroid;
+package org.belmarket.shop;
 
 import java.util.ArrayList;
 import java.util.Arrays;

app/src/main/java/org/fdroid/fdroid/Hasher.java

@@ -18,7 +18,7 @@
  * 02110-1301, USA.
  */
 
-package org.fdroid.fdroid;
+package org.belmarket.shop;
 
 import java.io.BufferedInputStream;
 import java.io.File;

app/src/main/java/org/fdroid/fdroid/NfcHelper.java

@@ -1,4 +1,4 @@
-package org.fdroid.fdroid;
+package org.belmarket.shop;
 
 import android.annotation.TargetApi;
 import android.app.Activity;

app/src/main/java/org/fdroid/fdroid/NfcNotEnabledActivity.java

@@ -1,4 +1,4 @@
-package org.fdroid.fdroid;
+package org.belmarket.shop;
 
 import android.annotation.TargetApi;
 import android.content.Intent;

app/src/main/java/org/fdroid/fdroid/Preferences.java

@@ -1,4 +1,4 @@
-package org.fdroid.fdroid;
+package org.belmarket.shop;
 
 import android.content.Context;
 import android.content.SharedPreferences;
@@ -24,7 +24,7 @@ import info.guardianproject.netcipher.NetCipher;
  * Handles shared preferences for FDroid, looking after the names of
  * preferences, default values and caching. Needs to be setup in the FDroidApp
  * (using {@link Preferences#setup(android.content.Context)} before it gets
- * accessed via the {@link org.fdroid.fdroid.Preferences#get()}
+ * accessed via the {@link org.belmarket.shop.Preferences#get()}
  * singleton method.
  */
 public final class Preferences implements SharedPreferences.OnSharedPreferenceChangeListener {
@@ -125,7 +125,7 @@ public final class Preferences implements SharedPreferences.OnSharedPreferenceCh
      * of the Privileged Extension.  The preference provides a way to disable using the
      * Privileged Extension even though its installed.
      *
-     * @see org.fdroid.fdroid.views.fragments.PreferencesFragment#initPrivilegedInstallerPreference()
+     * @see org.belmarket.shop.views.fragments.PreferencesFragment#initPrivilegedInstallerPreference()
      */
     public boolean isPrivilegedInstallerEnabled() {
         return preferences.getBoolean(PREF_PRIVILEGED_INSTALLER, DEFAULT_PRIVILEGED_INSTALLER);

app/src/main/java/org/fdroid/fdroid/PreferencesActivity.java

@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package org.fdroid.fdroid;
+package org.belmarket.shop;
 
 import android.os.Build;
 import android.os.Bundle;
@@ -26,7 +26,7 @@ import android.support.v7.app.ActionBarActivity;
 import android.view.MenuItem;
 import android.widget.LinearLayout;
 
-import org.fdroid.fdroid.views.fragments.PreferencesFragment;
+import org.belmarket.shop.views.fragments.PreferencesFragment;
 
 public class PreferencesActivity extends ActionBarActivity {
 

app/src/main/java/org/fdroid/fdroid/ProgressBufferedInputStream.java

@@ -1,4 +1,4 @@
-package org.fdroid.fdroid;
+package org.belmarket.shop;
 
 import java.io.BufferedInputStream;
 import java.io.IOException;

app/src/main/java/org/fdroid/fdroid/ProgressListener.java

@@ -1,4 +1,4 @@
-package org.fdroid.fdroid;
+package org.belmarket.shop;
 
 import java.net.URL;
 

app/src/main/java/org/fdroid/fdroid/QrGenAsyncTask.java

@@ -1,4 +1,4 @@
-package org.fdroid.fdroid;
+package org.belmarket.shop;
 
 import android.annotation.TargetApi;
 import android.app.Activity;

app/src/main/java/org/fdroid/fdroid/RepoUpdater.java

@@ -20,7 +20,7 @@
  * MA 02110-1301, USA.
  */
 
-package org.fdroid.fdroid;
+package org.belmarket.shop;
 
 import android.content.ContentResolver;
 import android.content.ContentValues;
@@ -32,19 +32,19 @@ import android.support.annotation.Nullable;
 import android.text.TextUtils;
 import android.util.Log;
 
-import org.fdroid.fdroid.data.Apk;
+import org.belmarket.shop.data.Apk;
-import org.fdroid.fdroid.data.ApkProvider;
+import org.belmarket.shop.data.ApkProvider;
-import org.fdroid.fdroid.data.App;
+import org.belmarket.shop.data.App;
-import org.fdroid.fdroid.data.AppProvider;
+import org.belmarket.shop.data.AppProvider;
-import org.fdroid.fdroid.data.Repo;
+import org.belmarket.shop.data.Repo;
-import org.fdroid.fdroid.data.RepoPersister;
+import org.belmarket.shop.data.RepoPersister;
-import org.fdroid.fdroid.data.RepoProvider;
+import org.belmarket.shop.data.RepoProvider;
-import org.fdroid.fdroid.data.RepoPushRequest;
+import org.belmarket.shop.data.RepoPushRequest;
-import org.fdroid.fdroid.data.Schema.RepoTable;
+import org.belmarket.shop.data.Schema.RepoTable;
-import org.fdroid.fdroid.installer.InstallManagerService;
+import org.belmarket.shop.installer.InstallManagerService;
-import org.fdroid.fdroid.installer.InstallerService;
+import org.belmarket.shop.installer.InstallerService;
-import org.fdroid.fdroid.net.Downloader;
+import org.belmarket.shop.net.Downloader;
-import org.fdroid.fdroid.net.DownloaderFactory;
+import org.belmarket.shop.net.DownloaderFactory;
 import org.xml.sax.InputSource;
 import org.xml.sax.SAXException;
 import org.xml.sax.XMLReader;

app/src/main/java/org/fdroid/fdroid/RepoXMLHandler.java

@@ -17,17 +17,17 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package org.fdroid.fdroid;
+package org.belmarket.shop;
 
 import android.os.Build;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 
-import org.fdroid.fdroid.data.Apk;
+import org.belmarket.shop.data.Apk;
-import org.fdroid.fdroid.data.App;
+import org.belmarket.shop.data.App;
-import org.fdroid.fdroid.data.Repo;
+import org.belmarket.shop.data.Repo;
-import org.fdroid.fdroid.data.RepoPushRequest;
+import org.belmarket.shop.data.RepoPushRequest;
-import org.fdroid.fdroid.data.Schema.ApkTable;
+import org.belmarket.shop.data.Schema.ApkTable;
 import org.xml.sax.Attributes;
 import org.xml.sax.SAXException;
 import org.xml.sax.helpers.DefaultHandler;

app/src/main/java/org/fdroid/fdroid/UpdateService.java

@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package org.fdroid.fdroid;
+package org.belmarket.shop;
 
 import android.app.AlarmManager;
 import android.app.IntentService;
@@ -41,14 +41,14 @@ import android.text.TextUtils;
 import android.util.Log;
 import android.widget.Toast;
 
-import org.fdroid.fdroid.data.Apk;
+import org.belmarket.shop.data.Apk;
-import org.fdroid.fdroid.data.ApkProvider;
+import org.belmarket.shop.data.ApkProvider;
-import org.fdroid.fdroid.data.App;
+import org.belmarket.shop.data.App;
-import org.fdroid.fdroid.data.AppProvider;
+import org.belmarket.shop.data.AppProvider;
-import org.fdroid.fdroid.data.Repo;
+import org.belmarket.shop.data.Repo;
-import org.fdroid.fdroid.data.RepoProvider;
+import org.belmarket.shop.data.RepoProvider;
-import org.fdroid.fdroid.data.Schema;
+import org.belmarket.shop.data.Schema;
-import org.fdroid.fdroid.installer.InstallManagerService;
+import org.belmarket.shop.installer.InstallManagerService;
 
 import java.net.URL;
 import java.util.ArrayList;

app/src/main/java/org/fdroid/fdroid/Utils.java

@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package org.fdroid.fdroid;
+package org.belmarket.shop;
 
 import android.content.Context;
 import android.content.pm.PackageManager;
@@ -37,9 +37,9 @@ import com.nostra13.universalimageloader.core.assist.ImageScaleType;
 import com.nostra13.universalimageloader.core.display.FadeInBitmapDisplayer;
 import com.nostra13.universalimageloader.utils.StorageUtils;
 
-import org.fdroid.fdroid.compat.FileCompat;
+import org.belmarket.shop.compat.FileCompat;
-import org.fdroid.fdroid.data.Repo;
+import org.belmarket.shop.data.Repo;
-import org.fdroid.fdroid.data.SanitizedFile;
+import org.belmarket.shop.data.SanitizedFile;
 import org.xml.sax.XMLReader;
 
 import java.io.BufferedInputStream;

app/src/main/java/org/fdroid/fdroid/acra/CrashReportActivity.java

@@ -1,4 +1,4 @@
-package org.fdroid.fdroid.acra;
+package org.belmarket.shop.acra;
 
 import android.content.DialogInterface;
 import android.os.Bundle;
@@ -6,7 +6,7 @@ import android.support.v7.app.AlertDialog;
 import android.widget.EditText;
 
 import org.acra.dialog.BaseCrashReportDialog;
-import org.fdroid.fdroid.R;
+import org.belmarket.shop.R;
 
 public class CrashReportActivity extends BaseCrashReportDialog
         implements DialogInterface.OnDismissListener, DialogInterface.OnClickListener {

app/src/main/java/org/fdroid/fdroid/acra/CrashReportSender.java

@@ -1,5 +1,5 @@
 
-package org.fdroid.fdroid.acra;
+package org.belmarket.shop.acra;
 
 import android.content.Context;
 import android.content.Intent;

app/src/main/java/org/fdroid/fdroid/acra/CrashReportSenderFactory.java

@@ -1,4 +1,4 @@
-package org.fdroid.fdroid.acra;
+package org.belmarket.shop.acra;
 
 import android.content.Context;
 import android.support.annotation.NonNull;

app/src/main/java/org/fdroid/fdroid/compat/ArrayAdapterCompat.java

@@ -1,4 +1,4 @@
-package org.fdroid.fdroid.compat;
+package org.belmarket.shop.compat;
 
 import android.annotation.TargetApi;
 import android.os.Build;

app/src/main/java/org/fdroid/fdroid/compat/ClipboardCompat.java

@@ -1,4 +1,4 @@
-package org.fdroid.fdroid.compat;
+package org.belmarket.shop.compat;
 
 import android.annotation.TargetApi;
 import android.content.ClipData;

app/src/main/java/org/fdroid/fdroid/compat/CursorAdapterCompat.java

@@ -1,4 +1,4 @@
-package org.fdroid.fdroid.compat;
+package org.belmarket.shop.compat;
 
 public class CursorAdapterCompat {
 

app/src/main/java/org/fdroid/fdroid/compat/FileCompat.java

@@ -1,13 +1,13 @@
-package org.fdroid.fdroid.compat;
+package org.belmarket.shop.compat;
 
 import android.annotation.TargetApi;
 import android.os.Build;
 import android.system.ErrnoException;
 import android.util.Log;
 
-import org.fdroid.fdroid.FDroidApp;
+import org.belmarket.shop.FDroidApp;
-import org.fdroid.fdroid.Utils;
+import org.belmarket.shop.Utils;
-import org.fdroid.fdroid.data.SanitizedFile;
+import org.belmarket.shop.data.SanitizedFile;
 
 import java.io.IOException;
 import java.lang.reflect.Method;

app/src/main/java/org/fdroid/fdroid/compat/PRNGFixes.java

@@ -1,4 +1,4 @@
-package org.fdroid.fdroid.compat;
+package org.belmarket.shop.compat;
 
 /*
  * This software is provided 'as-is', without any express or implied

app/src/main/java/org/fdroid/fdroid/compat/PackageManagerCompat.java

@@ -1,11 +1,11 @@
-package org.fdroid.fdroid.compat;
+package org.belmarket.shop.compat;
 
 import android.annotation.TargetApi;
 import android.content.pm.PackageManager;
 import android.os.Build;
 import android.util.Log;
 
-import org.fdroid.fdroid.Utils;
+import org.belmarket.shop.Utils;
 
 public class PackageManagerCompat {
 
@@ -15,7 +15,7 @@ public class PackageManagerCompat {
     public static void setInstaller(PackageManager mPm, String packageName) {
         if (Build.VERSION.SDK_INT < 11) return;
         try {
-            mPm.setInstallerPackageName(packageName, "org.fdroid.fdroid");
+            mPm.setInstallerPackageName(packageName, "org.belmarket.shop");
             Utils.debugLog(TAG, "Installer package name for " + packageName + " set successfully");
         } catch (Exception e) {
             // Many problems can occur:

app/src/main/java/org/fdroid/fdroid/compat/SupportedArchitectures.java

@@ -1,4 +1,4 @@
-package org.fdroid.fdroid.compat;
+package org.belmarket.shop.compat;
 
 import android.annotation.TargetApi;
 import android.os.Build;

app/src/main/java/org/fdroid/fdroid/compat/TabManager.java

@@ -1,4 +1,4 @@
-package org.fdroid.fdroid.compat;
+package org.belmarket.shop.compat;
 
 import android.content.res.Configuration;
 import android.support.v4.app.FragmentTransaction;
@@ -8,7 +8,7 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.Spinner;
 
-import org.fdroid.fdroid.FDroid;
+import org.belmarket.shop.FDroid;
 
 import java.util.ArrayList;
 import java.util.List;

app/src/main/java/org/fdroid/fdroid/compat/UriCompat.java

@@ -1,4 +1,4 @@
-package org.fdroid.fdroid.compat;
+package org.belmarket.shop.compat;
 
 import android.net.Uri;
 import android.os.Build;

app/src/main/java/org/fdroid/fdroid/data/Apk.java

@@ -1,4 +1,4 @@
-package org.fdroid.fdroid.data;
+package org.belmarket.shop.data;
 
 import android.annotation.TargetApi;
 import android.content.ContentValues;
@@ -7,9 +7,9 @@ import android.os.Build;
 import android.os.Parcel;
 import android.os.Parcelable;
 
-import org.fdroid.fdroid.RepoXMLHandler;
+import org.belmarket.shop.RepoXMLHandler;
-import org.fdroid.fdroid.Utils;
+import org.belmarket.shop.Utils;
-import org.fdroid.fdroid.data.Schema.ApkTable.Cols;
+import org.belmarket.shop.data.Schema.ApkTable.Cols;
 
 import java.io.File;
 import java.util.Date;

app/src/main/java/org/fdroid/fdroid/data/ApkProvider.java

@@ -1,4 +1,4 @@
-package org.fdroid.fdroid.data;
+package org.belmarket.shop.data;
 
 import android.content.ContentResolver;
 import android.content.ContentValues;
@@ -8,11 +8,11 @@ import android.database.Cursor;
 import android.net.Uri;
 import android.util.Log;
 
-import org.fdroid.fdroid.data.Schema.ApkTable;
+import org.belmarket.shop.data.Schema.ApkTable;
-import org.fdroid.fdroid.data.Schema.ApkTable.Cols;
+import org.belmarket.shop.data.Schema.ApkTable.Cols;
-import org.fdroid.fdroid.data.Schema.AppMetadataTable;
+import org.belmarket.shop.data.Schema.AppMetadataTable;
-import org.fdroid.fdroid.data.Schema.PackageTable;
+import org.belmarket.shop.data.Schema.PackageTable;
-import org.fdroid.fdroid.data.Schema.RepoTable;
+import org.belmarket.shop.data.Schema.RepoTable;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -270,9 +270,9 @@ public class ApkProvider extends FDroidProvider {
 
     /**
      * Intentionally left protected because it will break if apks is larger than
-     * {@link org.fdroid.fdroid.data.ApkProvider#MAX_APKS_TO_QUERY}. Instead of using
+     * {@link org.belmarket.shop.data.ApkProvider#MAX_APKS_TO_QUERY}. Instead of using
      * this directly, think about using
-     * {@link org.fdroid.fdroid.data.ApkProvider.Helper#knownApks(android.content.Context, java.util.List, String[])}
+     * {@link org.belmarket.shop.data.ApkProvider.Helper#knownApks(android.content.Context, java.util.List, String[])}
      */
     static Uri getContentUri(List<Apk> apks) {
         return getContentUri().buildUpon()

app/src/main/java/org/fdroid/fdroid/data/App.java

@@ -1,4 +1,4 @@
-package org.fdroid.fdroid.data;
+package org.belmarket.shop.data;
 
 import android.content.ContentValues;
 import android.content.Context;
@@ -16,10 +16,10 @@ import android.text.TextUtils;
 import android.util.Log;
 
 import org.apache.commons.io.filefilter.RegexFileFilter;
-import org.fdroid.fdroid.AppFilter;
+import org.belmarket.shop.AppFilter;
-import org.fdroid.fdroid.FDroidApp;
+import org.belmarket.shop.FDroidApp;
-import org.fdroid.fdroid.Utils;
+import org.belmarket.shop.Utils;
-import org.fdroid.fdroid.data.Schema.AppMetadataTable.Cols;
+import org.belmarket.shop.data.Schema.AppMetadataTable.Cols;
 import org.xmlpull.v1.XmlPullParser;
 import org.xmlpull.v1.XmlPullParserException;
 

app/src/main/java/org/fdroid/fdroid/data/AppPrefs.java

@@ -1,4 +1,4 @@
-package org.fdroid.fdroid.data;
+package org.belmarket.shop.data;
 
 public class AppPrefs extends ValueObject {
 

app/src/main/java/org/fdroid/fdroid/data/AppPrefsProvider.java

@@ -1,4 +1,4 @@
-package org.fdroid.fdroid.data;
+package org.belmarket.shop.data;
 
 import android.content.ContentValues;
 import android.content.Context;
@@ -8,8 +8,8 @@ import android.net.Uri;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 
-import org.fdroid.fdroid.data.Schema.AppPrefsTable;
+import org.belmarket.shop.data.Schema.AppPrefsTable;
-import org.fdroid.fdroid.data.Schema.AppPrefsTable.Cols;
+import org.belmarket.shop.data.Schema.AppPrefsTable.Cols;
 
 public class AppPrefsProvider extends FDroidProvider {
 

app/src/main/java/org/fdroid/fdroid/data/AppProvider.java

@@ -1,4 +1,4 @@
-package org.fdroid.fdroid.data;
+package org.belmarket.shop.data;
 
 import android.content.ContentResolver;
 import android.content.ContentValues;
@@ -9,16 +9,16 @@ import android.net.Uri;
 import android.text.TextUtils;
 import android.util.Log;
 
-import org.fdroid.fdroid.Preferences;
+import org.belmarket.shop.Preferences;
-import org.fdroid.fdroid.R;
+import org.belmarket.shop.R;
-import org.fdroid.fdroid.Utils;
+import org.belmarket.shop.Utils;
-import org.fdroid.fdroid.data.Schema.ApkTable;
+import org.belmarket.shop.data.Schema.ApkTable;
-import org.fdroid.fdroid.data.Schema.AppPrefsTable;
+import org.belmarket.shop.data.Schema.AppPrefsTable;
-import org.fdroid.fdroid.data.Schema.AppMetadataTable;
+import org.belmarket.shop.data.Schema.AppMetadataTable;
-import org.fdroid.fdroid.data.Schema.AppMetadataTable.Cols;
+import org.belmarket.shop.data.Schema.AppMetadataTable.Cols;
-import org.fdroid.fdroid.data.Schema.InstalledAppTable;
+import org.belmarket.shop.data.Schema.InstalledAppTable;
-import org.fdroid.fdroid.data.Schema.PackageTable;
+import org.belmarket.shop.data.Schema.PackageTable;
-import org.fdroid.fdroid.data.Schema.RepoTable;
+import org.belmarket.shop.data.Schema.RepoTable;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -28,7 +28,7 @@ import java.util.List;
 import java.util.Set;
 
 /**
- * Each app has a bunch of metadata that it associates with a package name (such as org.fdroid.fdroid).
+ * Each app has a bunch of metadata that it associates with a package name (such as org.belmarket.shop).
  * Multiple repositories can host the same package, and provide different metadata for that app.
  *
  * As such, it is usually the case that you are interested in an {@link App} which has its metadata
@@ -193,12 +193,12 @@ public class AppProvider extends FDroidProvider {
     /**
      * A QuerySelection which is aware of the option/need to join onto the
      * installed apps table. Not that the base classes
-     * {@link org.fdroid.fdroid.data.QuerySelection#add(QuerySelection)} and
+     * {@link org.belmarket.shop.data.QuerySelection#add(QuerySelection)} and
-     * {@link org.fdroid.fdroid.data.QuerySelection#add(String, String[])} methods
+     * {@link org.belmarket.shop.data.QuerySelection#add(String, String[])} methods
-     * will only return the base class {@link org.fdroid.fdroid.data.QuerySelection}
+     * will only return the base class {@link org.belmarket.shop.data.QuerySelection}
      * which is not aware of the installed app table.
      * However, the
-     * {@link org.fdroid.fdroid.data.AppProvider.AppQuerySelection#add(org.fdroid.fdroid.data.AppProvider.AppQuerySelection)}
+     * {@link org.belmarket.shop.data.AppProvider.AppQuerySelection#add(org.belmarket.shop.data.AppProvider.AppQuerySelection)}
      * method from this class will return an instance of this class, that is aware of
      * the install apps table.
      */

app/src/main/java/org/fdroid/fdroid/data/DBHelper.java

@@ -21,7 +21,7 @@
  * MA 02110-1301, USA.
  */
 
-package org.fdroid.fdroid.data;
+package org.belmarket.shop.data;
 
 import android.content.ContentValues;
 import android.content.Context;
@@ -31,14 +31,14 @@ import android.database.sqlite.SQLiteOpenHelper;
 import android.text.TextUtils;
 import android.util.Log;
 
-import org.fdroid.fdroid.R;
+import org.belmarket.shop.R;
-import org.fdroid.fdroid.Utils;
+import org.belmarket.shop.Utils;
-import org.fdroid.fdroid.data.Schema.ApkTable;
+import org.belmarket.shop.data.Schema.ApkTable;
-import org.fdroid.fdroid.data.Schema.PackageTable;
+import org.belmarket.shop.data.Schema.PackageTable;
-import org.fdroid.fdroid.data.Schema.AppPrefsTable;
+import org.belmarket.shop.data.Schema.AppPrefsTable;
-import org.fdroid.fdroid.data.Schema.AppMetadataTable;
+import org.belmarket.shop.data.Schema.AppMetadataTable;
-import org.fdroid.fdroid.data.Schema.InstalledAppTable;
+import org.belmarket.shop.data.Schema.InstalledAppTable;
-import org.fdroid.fdroid.data.Schema.RepoTable;
+import org.belmarket.shop.data.Schema.RepoTable;
 
 import java.util.ArrayList;
 import java.util.List;

app/src/main/java/org/fdroid/fdroid/data/FDroidProvider.java

@@ -1,4 +1,4 @@
-package org.fdroid.fdroid.data;
+package org.belmarket.shop.data;
 
 import android.annotation.TargetApi;
 import android.content.ContentProvider;
@@ -13,7 +13,7 @@ import android.net.Uri;
 import android.os.Build;
 import android.support.annotation.NonNull;
 
-import org.fdroid.fdroid.Utils;
+import org.belmarket.shop.Utils;
 
 import java.util.ArrayList;
 import java.util.HashSet;
@@ -24,7 +24,7 @@ public abstract class FDroidProvider extends ContentProvider {
 
     private static final String TAG = "FDroidProvider";
 
-    static final String AUTHORITY = "org.fdroid.fdroid.data";
+    static final String AUTHORITY = "org.belmarket.shop.data";
 
     static final int CODE_LIST   = 1;
     static final int CODE_SINGLE = 2;

app/src/main/java/org/fdroid/fdroid/data/InstalledAppProvider.java

@@ -1,4 +1,4 @@
-package org.fdroid.fdroid.data;
+package org.belmarket.shop.data;
 
 import android.content.ContentValues;
 import android.content.Context;
@@ -11,10 +11,10 @@ import android.database.Cursor;
 import android.net.Uri;
 import android.util.Log;
 
-import org.fdroid.fdroid.R;
+import org.belmarket.shop.R;
-import org.fdroid.fdroid.Utils;
+import org.belmarket.shop.Utils;
-import org.fdroid.fdroid.data.Schema.InstalledAppTable;
+import org.belmarket.shop.data.Schema.InstalledAppTable;
-import org.fdroid.fdroid.data.Schema.InstalledAppTable.Cols;
+import org.belmarket.shop.data.Schema.InstalledAppTable.Cols;
 
 import java.util.HashMap;
 import java.util.Map;

app/src/main/java/org/fdroid/fdroid/data/InstalledAppProviderService.java

@@ -1,4 +1,4 @@
-package org.fdroid.fdroid.data;
+package org.belmarket.shop.data;
 
 import android.app.IntentService;
 import android.content.ContentValues;
@@ -11,9 +11,9 @@ import android.net.Uri;
 import android.os.Process;
 import android.support.annotation.Nullable;
 
-import org.fdroid.fdroid.Hasher;
+import org.belmarket.shop.Hasher;
-import org.fdroid.fdroid.Utils;
+import org.belmarket.shop.Utils;
-import org.fdroid.fdroid.data.Schema.InstalledAppTable;
+import org.belmarket.shop.data.Schema.InstalledAppTable;
 
 import java.io.File;
 import java.security.NoSuchAlgorithmException;
@@ -41,10 +41,10 @@ import rx.subjects.PublishSubject;
 public class InstalledAppProviderService extends IntentService {
     private static final String TAG = "InstalledAppProviderSer";
 
-    private static final String ACTION_INSERT = "org.fdroid.fdroid.data.action.INSERT";
+    private static final String ACTION_INSERT = "org.belmarket.shop.data.action.INSERT";
-    private static final String ACTION_DELETE = "org.fdroid.fdroid.data.action.DELETE";
+    private static final String ACTION_DELETE = "org.belmarket.shop.data.action.DELETE";
 
-    private static final String EXTRA_PACKAGE_INFO = "org.fdroid.fdroid.data.extra.PACKAGE_INFO";
+    private static final String EXTRA_PACKAGE_INFO = "org.belmarket.shop.data.extra.PACKAGE_INFO";
 
     /**
      * This is for notifing the users of this {@link android.content.ContentProvider}

app/src/main/java/org/fdroid/fdroid/data/LoggingQuery.java

@@ -1,10 +1,10 @@
-package org.fdroid.fdroid.data;
+package org.belmarket.shop.data;
 
 import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;
 
-import org.fdroid.fdroid.BuildConfig;
+import org.belmarket.shop.BuildConfig;
-import org.fdroid.fdroid.Utils;
+import org.belmarket.shop.Utils;
 
 /**
  * Helper class to log slow queries to logcat when in debug mode. When not in debug mode, it

app/src/main/java/org/fdroid/fdroid/data/NewRepoConfig.java

@@ -1,14 +1,14 @@
-package org.fdroid.fdroid.data;
+package org.belmarket.shop.data;
 
 import android.content.Context;
 import android.content.Intent;
 import android.net.Uri;
 import android.text.TextUtils;
 
-import org.fdroid.fdroid.R;
+import org.belmarket.shop.R;
-import org.fdroid.fdroid.Utils;
+import org.belmarket.shop.Utils;
-import org.fdroid.fdroid.localrepo.peers.WifiPeer;
+import org.belmarket.shop.localrepo.peers.WifiPeer;
-import org.fdroid.fdroid.views.swap.SwapWorkflowActivity;
+import org.belmarket.shop.views.swap.SwapWorkflowActivity;
 
 import java.util.Arrays;
 import java.util.Locale;

app/src/main/java/org/fdroid/fdroid/data/ObbUrlActivity.java

@@ -1,4 +1,4 @@
-package org.fdroid.fdroid.data;
+package org.belmarket.shop.data;
 
 import android.app.Activity;
 import android.content.ComponentName;
@@ -8,7 +8,7 @@ import android.content.pm.PackageManager;
 import android.net.Uri;
 import android.os.Bundle;
 
-import org.fdroid.fdroid.Utils;
+import org.belmarket.shop.Utils;
 
 /**
  * Replies with the public download URL for the OBB that belongs to the
@@ -21,10 +21,10 @@ import org.fdroid.fdroid.Utils;
 public class ObbUrlActivity extends Activity {
     public static final String TAG = "ObbUrlActivity";
 
-    public static final String ACTION_GET_OBB_MAIN_URL = "org.fdroid.fdroid.action.GET_OBB_MAIN_URL";
+    public static final String ACTION_GET_OBB_MAIN_URL = "org.belmarket.shop.action.GET_OBB_MAIN_URL";
-    public static final String ACTION_GET_OBB_PATCH_URL = "org.fdroid.fdroid.action.GET_OBB_PATCH_URL";
+    public static final String ACTION_GET_OBB_PATCH_URL = "org.belmarket.shop.action.GET_OBB_PATCH_URL";
 
-    public static final String EXTRA_SHA256 = "org.fdroid.fdroid.extra.SHA256";
+    public static final String EXTRA_SHA256 = "org.belmarket.shop.extra.SHA256";
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {

app/src/main/java/org/fdroid/fdroid/data/OrderClause.java

@@ -1,4 +1,4 @@
-package org.fdroid.fdroid.data;
+package org.belmarket.shop.data;
 
 class OrderClause {
 

app/src/main/java/org/fdroid/fdroid/data/PackageProvider.java

@@ -1,4 +1,4 @@
-package org.fdroid.fdroid.data;
+package org.belmarket.shop.data;
 
 import android.content.ContentValues;
 import android.content.Context;
@@ -6,8 +6,8 @@ import android.content.UriMatcher;
 import android.database.Cursor;
 import android.net.Uri;
 
-import org.fdroid.fdroid.data.Schema.PackageTable;
+import org.belmarket.shop.data.Schema.PackageTable;
-import org.fdroid.fdroid.data.Schema.PackageTable.Cols;
+import org.belmarket.shop.data.Schema.PackageTable.Cols;
 
 public class PackageProvider extends FDroidProvider {
 

app/src/main/java/org/fdroid/fdroid/data/QueryBuilder.java

@@ -1,4 +1,4 @@
-package org.fdroid.fdroid.data;
+package org.belmarket.shop.data;
 
 import android.support.annotation.Nullable;
 import android.text.TextUtils;

app/src/main/java/org/fdroid/fdroid/data/QuerySelection.java

@@ -1,4 +1,4 @@
-package org.fdroid.fdroid.data;
+package org.belmarket.shop.data;
 
 import android.text.TextUtils;
 

app/src/main/java/org/fdroid/fdroid/data/Repo.java

@@ -21,14 +21,14 @@
  * MA 02110-1301, USA.
  */
 
-package org.fdroid.fdroid.data;
+package org.belmarket.shop.data;
 
 import android.content.ContentValues;
 import android.database.Cursor;
 import android.text.TextUtils;
 
-import org.fdroid.fdroid.Utils;
+import org.belmarket.shop.Utils;
-import org.fdroid.fdroid.data.Schema.RepoTable.Cols;
+import org.belmarket.shop.data.Schema.RepoTable.Cols;
 
 import java.net.MalformedURLException;
 import java.net.URL;

app/src/main/java/org/fdroid/fdroid/data/RepoPersister.java

@@ -1,4 +1,4 @@
-package org.fdroid.fdroid.data;
+package org.belmarket.shop.data;
 
 import android.content.ContentProviderOperation;
 import android.content.ContentValues;
@@ -9,9 +9,9 @@ import android.os.RemoteException;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 
-import org.fdroid.fdroid.CompatibilityChecker;
+import org.belmarket.shop.CompatibilityChecker;
-import org.fdroid.fdroid.RepoUpdater;
+import org.belmarket.shop.RepoUpdater;
-import org.fdroid.fdroid.Utils;
+import org.belmarket.shop.Utils;
 
 import java.util.ArrayList;
 import java.util.HashMap;

app/src/main/java/org/fdroid/fdroid/data/RepoProvider.java

@@ -1,4 +1,4 @@
-package org.fdroid.fdroid.data;
+package org.belmarket.shop.data;
 
 import android.content.ContentResolver;
 import android.content.ContentUris;
@@ -11,9 +11,9 @@ import android.support.annotation.Nullable;
 import android.text.TextUtils;
 import android.util.Log;
 
-import org.fdroid.fdroid.Utils;
+import org.belmarket.shop.Utils;
-import org.fdroid.fdroid.data.Schema.RepoTable;
+import org.belmarket.shop.data.Schema.RepoTable;
-import org.fdroid.fdroid.data.Schema.RepoTable.Cols;
+import org.belmarket.shop.data.Schema.RepoTable.Cols;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -59,11 +59,11 @@ public class RepoProvider extends FDroidProvider {
          * repository. Therefore, that repository must exist in the database. The way to find out
          * which repository a particular URL came from requires some consideration:
          *  * Repositories can exist at particular paths on a server (e.g. /fdroid/repo)
-         *  * Individual files can exist at a more specific path on the repo (e.g. /fdroid/repo/icons/org.fdroid.fdroid.png)
+         *  * Individual files can exist at a more specific path on the repo (e.g. /fdroid/repo/icons/org.belmarket.shop.png)
          *
-         * So for a given URL "/fdroid/repo/icons/org.fdroid.fdroid.png" we don't actually know
+         * So for a given URL "/fdroid/repo/icons/org.belmarket.shop.png" we don't actually know
-         * whether it is for the file "org.fdroid.fdroid.png" at repository "/fdroid/repo/icons" or
+         * whether it is for the file "org.belmarket.shop.png" at repository "/fdroid/repo/icons" or
-         * the file "icons/org.fdroid.fdroid.png" at the repository at "/fdroid/repo".
+         * the file "icons/org.belmarket.shop.png" at the repository at "/fdroid/repo".
          */
         @Nullable
         public static Repo findByUrl(Context context, Uri uri, String[] projection) {

app/src/main/java/org/fdroid/fdroid/data/RepoPushRequest.java

@@ -17,7 +17,7 @@
  * MA 02110-1301, USA.
  */
 
-package org.fdroid.fdroid.data;
+package org.belmarket.shop.data;
 
 import android.support.annotation.Nullable;
 

app/src/main/java/org/fdroid/fdroid/data/SanitizedFile.java

@@ -1,4 +1,4 @@
-package org.fdroid.fdroid.data;
+package org.belmarket.shop.data;
 
 import java.io.File;
 
@@ -21,7 +21,7 @@ public class SanitizedFile extends File {
     }
 
     /**
-     * Used by the {@link org.fdroid.fdroid.data.SanitizedFile#knownSanitized(java.io.File)}
+     * Used by the {@link org.belmarket.shop.data.SanitizedFile#knownSanitized(java.io.File)}
      * method, but intentionally kept private so people don't think that any sanitization
      * will occur by passing a file in - because it wont.
      */
@@ -55,7 +55,7 @@ public class SanitizedFile extends File {
     }
 
     /**
-     * @see {@link org.fdroid.fdroid.data.SanitizedFile#knownSanitized(String)}
+     * @see {@link org.belmarket.shop.data.SanitizedFile#knownSanitized(String)}
      */
     public static SanitizedFile knownSanitized(File file) {
         return new SanitizedFile(file);

app/src/main/java/org/fdroid/fdroid/data/Schema.java

@@ -1,4 +1,4 @@
-package org.fdroid.fdroid.data;
+package org.belmarket.shop.data;
 
 import android.provider.BaseColumns;
 

app/src/main/java/org/fdroid/fdroid/data/TempApkProvider.java

@@ -1,4 +1,4 @@
-package org.fdroid.fdroid.data;
+package org.belmarket.shop.data;
 
 import android.content.ContentValues;
 import android.content.Context;
@@ -6,7 +6,7 @@ import android.content.UriMatcher;
 import android.database.sqlite.SQLiteDatabase;
 import android.net.Uri;
 
-import org.fdroid.fdroid.data.Schema.ApkTable;
+import org.belmarket.shop.data.Schema.ApkTable;
 
 import java.util.List;
 
@@ -75,7 +75,7 @@ public class TempApkProvider extends ApkProvider {
          * table and populates it with all the data from the real apk provider table.
          *
          * This is package local because it must be invoked after
-         * {@link org.fdroid.fdroid.data.TempAppProvider.Helper#init(Context)}. Due to this
+         * {@link org.belmarket.shop.data.TempAppProvider.Helper#init(Context)}. Due to this
          * dependence, that method invokes this one itself, rather than leaving it to the
          * {@link RepoPersister}.
          */

app/src/main/java/org/fdroid/fdroid/data/TempAppProvider.java

@@ -1,4 +1,4 @@
-package org.fdroid.fdroid.data;
+package org.belmarket.shop.data;
 
 import android.content.ContentValues;
 import android.content.Context;
@@ -11,10 +11,10 @@ import android.text.TextUtils;
 
 import java.util.List;
 
-import org.fdroid.fdroid.data.Schema.ApkTable;
+import org.belmarket.shop.data.Schema.ApkTable;
-import org.fdroid.fdroid.data.Schema.AppMetadataTable;
+import org.belmarket.shop.data.Schema.AppMetadataTable;
-import org.fdroid.fdroid.data.Schema.AppMetadataTable.Cols;
+import org.belmarket.shop.data.Schema.AppMetadataTable.Cols;
-import org.fdroid.fdroid.data.Schema.PackageTable;
+import org.belmarket.shop.data.Schema.PackageTable;
 
 /**
  * This class does all of its operations in a temporary sqlite table.

app/src/main/java/org/fdroid/fdroid/data/ValueObject.java

@@ -1,4 +1,4 @@
-package org.fdroid.fdroid.data;
+package org.belmarket.shop.data;
 
 import android.database.Cursor;
 

app/src/main/java/org/fdroid/fdroid/installer/ApkCache.java

@@ -17,7 +17,7 @@
  * MA 02110-1301, USA.
  */
 
-package org.fdroid.fdroid.installer;
+package org.belmarket.shop.installer;
 
 import android.content.Context;
 import android.net.Uri;
@@ -25,9 +25,9 @@ import android.net.Uri;
 import com.nostra13.universalimageloader.utils.StorageUtils;
 
 import org.apache.commons.io.FileUtils;
-import org.fdroid.fdroid.Hasher;
+import org.belmarket.shop.Hasher;
-import org.fdroid.fdroid.data.Apk;
+import org.belmarket.shop.data.Apk;
-import org.fdroid.fdroid.data.SanitizedFile;
+import org.belmarket.shop.data.SanitizedFile;
 
 import java.io.File;
 import java.io.IOException;

app/src/main/java/org/fdroid/fdroid/installer/ApkFileProvider.java

@@ -17,14 +17,14 @@
  * MA 02110-1301, USA.
  */
 
-package org.fdroid.fdroid.installer;
+package org.belmarket.shop.installer;
 
 import android.content.Context;
 import android.net.Uri;
 import android.support.v4.content.FileProvider;
 
-import org.fdroid.fdroid.data.Apk;
+import org.belmarket.shop.data.Apk;
-import org.fdroid.fdroid.data.SanitizedFile;
+import org.belmarket.shop.data.SanitizedFile;
 
 import java.io.File;
 import java.io.IOException;
@@ -44,7 +44,7 @@ import java.io.IOException;
  */
 public class ApkFileProvider extends FileProvider {
 
-    private static final String AUTHORITY = "org.fdroid.fdroid.installer.ApkFileProvider";
+    private static final String AUTHORITY = "org.belmarket.shop.installer.ApkFileProvider";
 
     /**
      * Copies the APK into private data directory of F-Droid and returns a "file" or "content" Uri

app/src/main/java/org/fdroid/fdroid/installer/ApkSignatureVerifier.java

@@ -17,7 +17,7 @@
  * MA 02110-1301, USA.
  */
 
-package org.fdroid.fdroid.installer;
+package org.belmarket.shop.installer;
 
 import android.annotation.SuppressLint;
 import android.content.Context;
@@ -25,7 +25,7 @@ import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
 import android.content.pm.Signature;
 
-import org.fdroid.fdroid.Utils;
+import org.belmarket.shop.Utils;
 import org.spongycastle.util.encoders.Hex;
 
 import java.io.ByteArrayOutputStream;

app/src/main/java/org/fdroid/fdroid/installer/ApkVerifier.java

@@ -17,7 +17,7 @@
  * MA 02110-1301, USA.
  */
 
-package org.fdroid.fdroid.installer;
+package org.belmarket.shop.installer;
 
 import android.content.Context;
 import android.content.pm.PackageInfo;
@@ -27,8 +27,8 @@ import android.support.annotation.Nullable;
 import android.text.TextUtils;
 import android.util.Log;
 
-import org.fdroid.fdroid.Utils;
+import org.belmarket.shop.Utils;
-import org.fdroid.fdroid.data.Apk;
+import org.belmarket.shop.data.Apk;
 
 import java.util.Arrays;
 import java.util.HashSet;

app/src/main/java/org/fdroid/fdroid/installer/DefaultInstaller.java

@@ -18,7 +18,7 @@
  * MA 02110-1301, USA.
  */
 
-package org.fdroid.fdroid.installer;
+package org.belmarket.shop.installer;
 
 import android.app.PendingIntent;
 import android.content.Context;
@@ -26,7 +26,7 @@ import android.content.Intent;
 import android.net.Uri;
 import android.os.Build;
 
-import org.fdroid.fdroid.data.Apk;
+import org.belmarket.shop.data.Apk;
 
 /**
  * The default installer of F-Droid. It uses the normal Intents APIs of Android

app/src/main/java/org/fdroid/fdroid/installer/DefaultInstallerActivity.java

@@ -18,7 +18,7 @@
  * MA 02110-1301, USA.
  */
 
-package org.fdroid.fdroid.installer;
+package org.belmarket.shop.installer;
 
 import android.annotation.SuppressLint;
 import android.app.Activity;
@@ -31,8 +31,8 @@ import android.os.Bundle;
 import android.support.v4.app.FragmentActivity;
 import android.util.Log;
 
-import org.fdroid.fdroid.R;
+import org.belmarket.shop.R;
-import org.fdroid.fdroid.data.Apk;
+import org.belmarket.shop.data.Apk;
 
 /**
  * A transparent activity as a wrapper around Android's PackageInstaller Intents
@@ -40,8 +40,8 @@ import org.fdroid.fdroid.data.Apk;
 public class DefaultInstallerActivity extends FragmentActivity {
     private static final String TAG = "DefaultInstallerActivit";
 
-    static final String ACTION_INSTALL_PACKAGE = "org.fdroid.fdroid.installer.DefaultInstaller.action.INSTALL_PACKAGE";
+    static final String ACTION_INSTALL_PACKAGE = "org.belmarket.shop.installer.DefaultInstaller.action.INSTALL_PACKAGE";
-    static final String ACTION_UNINSTALL_PACKAGE = "org.fdroid.fdroid.installer.DefaultInstaller.action.UNINSTALL_PACKAGE";
+    static final String ACTION_UNINSTALL_PACKAGE = "org.belmarket.shop.installer.DefaultInstaller.action.UNINSTALL_PACKAGE";
 
     private static final int REQUEST_CODE_INSTALL = 0;
     private static final int REQUEST_CODE_UNINSTALL = 1;

app/src/main/java/org/fdroid/fdroid/installer/ErrorDialogActivity.java

@@ -17,7 +17,7 @@
  * MA 02110-1301, USA.
  */
 
-package org.fdroid.fdroid.installer;
+package org.belmarket.shop.installer;
 
 import android.app.Activity;
 import android.content.DialogInterface;
@@ -28,7 +28,7 @@ import android.support.v4.app.FragmentActivity;
 import android.support.v7.app.AlertDialog;
 import android.view.ContextThemeWrapper;
 
-import org.fdroid.fdroid.FDroidApp;
+import org.belmarket.shop.FDroidApp;
 
 public class ErrorDialogActivity extends FragmentActivity {
 

app/src/main/java/org/fdroid/fdroid/installer/ExtensionInstaller.java

@@ -18,15 +18,15 @@
  * MA 02110-1301, USA.
  */
 
-package org.fdroid.fdroid.installer;
+package org.belmarket.shop.installer;
 
 import android.app.PendingIntent;
 import android.content.Context;
 import android.content.Intent;
 import android.net.Uri;
 
-import org.fdroid.fdroid.BuildConfig;
+import org.belmarket.shop.BuildConfig;
-import org.fdroid.fdroid.data.Apk;
+import org.belmarket.shop.data.Apk;
 import org.fdroid.fdroid.privileged.install.InstallExtensionDialogActivity;
 
 import java.io.File;

app/src/main/java/org/fdroid/fdroid/installer/InstallHistoryService.java

@@ -17,7 +17,7 @@
  * MA 02110-1301, USA.
  */
 
-package org.fdroid.fdroid.installer;
+package org.belmarket.shop.installer;
 
 import android.app.IntentService;
 import android.content.BroadcastReceiver;
@@ -29,8 +29,8 @@ import android.os.Process;
 import android.support.v4.content.LocalBroadcastManager;
 import android.text.TextUtils;
 
-import org.fdroid.fdroid.Utils;
+import org.belmarket.shop.Utils;
-import org.fdroid.fdroid.data.Apk;
+import org.belmarket.shop.data.Apk;
 
 import java.io.File;
 import java.io.FileWriter;
@@ -47,7 +47,7 @@ import java.util.List;
 public class InstallHistoryService extends IntentService {
     public static final String TAG = "InstallHistoryService";
 
-    public static final Uri LOG_URI = Uri.parse("content://org.fdroid.fdroid.installer/install_history/all");
+    public static final Uri LOG_URI = Uri.parse("content://org.belmarket.shop.installer/install_history/all");
 
     private static BroadcastReceiver broadcastReceiver;
 

app/src/main/java/org/fdroid/fdroid/installer/InstallManagerService.java

@@ -1,4 +1,4 @@
-package org.fdroid.fdroid.installer;
+package org.belmarket.shop.installer;
 
 import android.app.Notification;
 import android.app.NotificationManager;
@@ -20,17 +20,17 @@ import android.text.TextUtils;
 
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.filefilter.WildcardFileFilter;
-import org.fdroid.fdroid.AppDetails;
+import org.belmarket.shop.AppDetails;
-import org.fdroid.fdroid.Hasher;
+import org.belmarket.shop.Hasher;
-import org.fdroid.fdroid.R;
+import org.belmarket.shop.R;
-import org.fdroid.fdroid.Utils;
+import org.belmarket.shop.Utils;
-import org.fdroid.fdroid.compat.PackageManagerCompat;
+import org.belmarket.shop.compat.PackageManagerCompat;
-import org.fdroid.fdroid.data.Apk;
+import org.belmarket.shop.data.Apk;
-import org.fdroid.fdroid.data.App;
+import org.belmarket.shop.data.App;
-import org.fdroid.fdroid.data.AppProvider;
+import org.belmarket.shop.data.AppProvider;
-import org.fdroid.fdroid.data.Schema;
+import org.belmarket.shop.data.Schema;
-import org.fdroid.fdroid.net.Downloader;
+import org.belmarket.shop.net.Downloader;
-import org.fdroid.fdroid.net.DownloaderService;
+import org.belmarket.shop.net.DownloaderService;
 
 import java.io.File;
 import java.io.FileFilter;
@@ -77,11 +77,11 @@ import java.util.Set;
 public class InstallManagerService extends Service {
     private static final String TAG = "InstallManagerService";
 
-    private static final String ACTION_INSTALL = "org.fdroid.fdroid.installer.action.INSTALL";
+    private static final String ACTION_INSTALL = "org.belmarket.shop.installer.action.INSTALL";
-    private static final String ACTION_CANCEL = "org.fdroid.fdroid.installer.action.CANCEL";
+    private static final String ACTION_CANCEL = "org.belmarket.shop.installer.action.CANCEL";
 
-    private static final String EXTRA_APP = "org.fdroid.fdroid.installer.extra.APP";
+    private static final String EXTRA_APP = "org.belmarket.shop.installer.extra.APP";
-    private static final String EXTRA_APK = "org.fdroid.fdroid.installer.extra.APK";
+    private static final String EXTRA_APK = "org.belmarket.shop.installer.extra.APK";
 
     /**
      * The collection of {@link Apk}s that are actively going through this whole process,

app/src/main/java/org/fdroid/fdroid/installer/Installer.java

@@ -18,7 +18,7 @@
  * MA 02110-1301, USA.
  */
 
-package org.fdroid.fdroid.installer;
+package org.belmarket.shop.installer;
 
 import android.app.PendingIntent;
 import android.content.Context;
@@ -30,8 +30,8 @@ import android.support.v4.content.LocalBroadcastManager;
 import android.text.TextUtils;
 import android.util.Log;
 
-import org.fdroid.fdroid.data.Apk;
+import org.belmarket.shop.data.Apk;
-import org.fdroid.fdroid.data.ApkProvider;
+import org.belmarket.shop.data.ApkProvider;
 import org.fdroid.fdroid.privileged.views.AppDiff;
 import org.fdroid.fdroid.privileged.views.AppSecurityPermissions;
 import org.fdroid.fdroid.privileged.views.InstallConfirmActivity;
@@ -48,15 +48,15 @@ public abstract class Installer {
     final Context context;
     final Apk apk;
 
-    public static final String ACTION_INSTALL_STARTED = "org.fdroid.fdroid.installer.Installer.action.INSTALL_STARTED";
+    public static final String ACTION_INSTALL_STARTED = "org.belmarket.shop.installer.Installer.action.INSTALL_STARTED";
-    public static final String ACTION_INSTALL_COMPLETE = "org.fdroid.fdroid.installer.Installer.action.INSTALL_COMPLETE";
+    public static final String ACTION_INSTALL_COMPLETE = "org.belmarket.shop.installer.Installer.action.INSTALL_COMPLETE";
-    public static final String ACTION_INSTALL_INTERRUPTED = "org.fdroid.fdroid.installer.Installer.action.INSTALL_INTERRUPTED";
+    public static final String ACTION_INSTALL_INTERRUPTED = "org.belmarket.shop.installer.Installer.action.INSTALL_INTERRUPTED";
-    public static final String ACTION_INSTALL_USER_INTERACTION = "org.fdroid.fdroid.installer.Installer.action.INSTALL_USER_INTERACTION";
+    public static final String ACTION_INSTALL_USER_INTERACTION = "org.belmarket.shop.installer.Installer.action.INSTALL_USER_INTERACTION";
 
-    public static final String ACTION_UNINSTALL_STARTED = "org.fdroid.fdroid.installer.Installer.action.UNINSTALL_STARTED";
+    public static final String ACTION_UNINSTALL_STARTED = "org.belmarket.shop.installer.Installer.action.UNINSTALL_STARTED";
-    public static final String ACTION_UNINSTALL_COMPLETE = "org.fdroid.fdroid.installer.Installer.action.UNINSTALL_COMPLETE";
+    public static final String ACTION_UNINSTALL_COMPLETE = "org.belmarket.shop.installer.Installer.action.UNINSTALL_COMPLETE";
-    public static final String ACTION_UNINSTALL_INTERRUPTED = "org.fdroid.fdroid.installer.Installer.action.UNINSTALL_INTERRUPTED";
+    public static final String ACTION_UNINSTALL_INTERRUPTED = "org.belmarket.shop.installer.Installer.action.UNINSTALL_INTERRUPTED";
-    public static final String ACTION_UNINSTALL_USER_INTERACTION = "org.fdroid.fdroid.installer.Installer.action.UNINSTALL_USER_INTERACTION";
+    public static final String ACTION_UNINSTALL_USER_INTERACTION = "org.belmarket.shop.installer.Installer.action.UNINSTALL_USER_INTERACTION";
 
     /**
      * The URI where the APK was originally downloaded from. This is also used
@@ -66,10 +66,10 @@ public abstract class Installer {
      *
      * @see Intent#EXTRA_ORIGINATING_URI
      */
-    static final String EXTRA_DOWNLOAD_URI = "org.fdroid.fdroid.installer.Installer.extra.DOWNLOAD_URI";
+    static final String EXTRA_DOWNLOAD_URI = "org.belmarket.shop.installer.Installer.extra.DOWNLOAD_URI";
-    public static final String EXTRA_APK = "org.fdroid.fdroid.installer.Installer.extra.APK";
+    public static final String EXTRA_APK = "org.belmarket.shop.installer.Installer.extra.APK";
-    public static final String EXTRA_USER_INTERACTION_PI = "org.fdroid.fdroid.installer.Installer.extra.USER_INTERACTION_PI";
+    public static final String EXTRA_USER_INTERACTION_PI = "org.belmarket.shop.installer.Installer.extra.USER_INTERACTION_PI";
-    public static final String EXTRA_ERROR_MESSAGE = "org.fdroid.fdroid.net.installer.Installer.extra.ERROR_MESSAGE";
+    public static final String EXTRA_ERROR_MESSAGE = "org.belmarket.shop.net.installer.Installer.extra.ERROR_MESSAGE";
 
     /**
      * @param apk must be included so that all the phases of the install process

app/src/main/java/org/fdroid/fdroid/installer/InstallerFactory.java

@@ -18,13 +18,13 @@
  * MA 02110-1301, USA.
  */
 
-package org.fdroid.fdroid.installer;
+package org.belmarket.shop.installer;
 
 import android.content.Context;
 import android.text.TextUtils;
 
-import org.fdroid.fdroid.Utils;
+import org.belmarket.shop.Utils;
-import org.fdroid.fdroid.data.Apk;
+import org.belmarket.shop.data.Apk;
 
 public class InstallerFactory {
 

app/src/main/java/org/fdroid/fdroid/installer/InstallerService.java

@@ -18,7 +18,7 @@
  * MA 02110-1301, USA.
  */
 
-package org.fdroid.fdroid.installer;
+package org.belmarket.shop.installer;
 
 import android.app.IntentService;
 import android.content.Context;
@@ -27,8 +27,8 @@ import android.net.Uri;
 
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.filefilter.WildcardFileFilter;
-import org.fdroid.fdroid.Utils;
+import org.belmarket.shop.Utils;
-import org.fdroid.fdroid.data.Apk;
+import org.belmarket.shop.data.Apk;
 
 import java.io.File;
 import java.io.FileFilter;
@@ -55,8 +55,8 @@ import java.io.FileFilter;
 public class InstallerService extends IntentService {
     public static final String TAG = "InstallerService";
 
-    private static final String ACTION_INSTALL = "org.fdroid.fdroid.installer.InstallerService.action.INSTALL";
+    private static final String ACTION_INSTALL = "org.belmarket.shop.installer.InstallerService.action.INSTALL";
-    private static final String ACTION_UNINSTALL = "org.fdroid.fdroid.installer.InstallerService.action.UNINSTALL";
+    private static final String ACTION_UNINSTALL = "org.belmarket.shop.installer.InstallerService.action.UNINSTALL";
 
     public InstallerService() {
         super("InstallerService");

app/src/main/java/org/fdroid/fdroid/installer/PrivilegedInstaller.java

@@ -19,7 +19,7 @@
  * MA 02110-1301, USA.
  */
 
-package org.fdroid.fdroid.installer;
+package org.belmarket.shop.installer;
 
 import android.content.ComponentName;
 import android.content.Context;
@@ -31,9 +31,9 @@ import android.os.IBinder;
 import android.os.RemoteException;
 import android.util.Log;
 
-import org.fdroid.fdroid.Preferences;
+import org.belmarket.shop.Preferences;
-import org.fdroid.fdroid.R;
+import org.belmarket.shop.R;
-import org.fdroid.fdroid.data.Apk;
+import org.belmarket.shop.data.Apk;
 import org.fdroid.fdroid.privileged.IPrivilegedCallback;
 import org.fdroid.fdroid.privileged.IPrivilegedService;
 

app/src/main/java/org/fdroid/fdroid/localrepo/CacheSwapAppsService.java

@@ -1,4 +1,4 @@
-package org.fdroid.fdroid.localrepo;
+package org.belmarket.shop.localrepo;
 
 import android.app.IntentService;
 import android.content.Context;
@@ -7,9 +7,9 @@ import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageManager;
 
 import org.apache.commons.io.FileUtils;
-import org.fdroid.fdroid.FDroidApp;
+import org.belmarket.shop.FDroidApp;
-import org.fdroid.fdroid.Utils;
+import org.belmarket.shop.Utils;
-import org.fdroid.fdroid.data.App;
+import org.belmarket.shop.data.App;
 
 import java.io.File;
 import java.io.IOException;
@@ -20,14 +20,14 @@ import java.security.cert.CertificateEncodingException;
  * which are available for swapping.  It does not cache system apps, since those are
  * rarely swapped.  This is meant to start running when {@link SwapService} starts.
  * <p>
- * This could probably be replaced by {@link org.fdroid.fdroid.data.InstalledAppProvider}
+ * This could probably be replaced by {@link org.belmarket.shop.data.InstalledAppProvider}
  * if that contained all of the info to generate complete {@link App} and
- * {@link org.fdroid.fdroid.data.Apk} instances.
+ * {@link org.belmarket.shop.data.Apk} instances.
  */
 public class CacheSwapAppsService extends IntentService {
     private static final String TAG = "CacheSwapAppsService";
 
-    private static final String ACTION_PARSE_APP = "org.fdroid.fdroid.localrepo.action.PARSE_APP";
+    private static final String ACTION_PARSE_APP = "org.belmarket.shop.localrepo.action.PARSE_APP";
 
     public CacheSwapAppsService() {
         super("CacheSwapAppsService");

app/src/main/java/org/fdroid/fdroid/localrepo/LocalRepoKeyStore.java

@@ -1,10 +1,10 @@
-package org.fdroid.fdroid.localrepo;
+package org.belmarket.shop.localrepo;
 
 import android.content.Context;
 import android.util.Log;
 
-import org.fdroid.fdroid.FDroidApp;
+import org.belmarket.shop.FDroidApp;
-import org.fdroid.fdroid.Utils;
+import org.belmarket.shop.Utils;
 import org.spongycastle.asn1.ASN1Sequence;
 import org.spongycastle.asn1.x500.X500Name;
 import org.spongycastle.asn1.x509.GeneralName;

app/src/main/java/org/fdroid/fdroid/localrepo/LocalRepoManager.java

@@ -1,4 +1,4 @@
-package org.fdroid.fdroid.localrepo;
+package org.belmarket.shop.localrepo;
 
 import android.content.Context;
 import android.content.pm.ApplicationInfo;
@@ -15,13 +15,13 @@ import android.support.annotation.Nullable;
 import android.text.TextUtils;
 import android.util.Log;
 
-import org.fdroid.fdroid.FDroidApp;
+import org.belmarket.shop.FDroidApp;
-import org.fdroid.fdroid.Hasher;
+import org.belmarket.shop.Hasher;
-import org.fdroid.fdroid.Preferences;
+import org.belmarket.shop.Preferences;
-import org.fdroid.fdroid.Utils;
+import org.belmarket.shop.Utils;
-import org.fdroid.fdroid.data.Apk;
+import org.belmarket.shop.data.Apk;
-import org.fdroid.fdroid.data.App;
+import org.belmarket.shop.data.App;
-import org.fdroid.fdroid.data.SanitizedFile;
+import org.belmarket.shop.data.SanitizedFile;
 import org.xmlpull.v1.XmlPullParserException;
 import org.xmlpull.v1.XmlPullParserFactory;
 import org.xmlpull.v1.XmlSerializer;
@@ -364,7 +364,7 @@ public final class LocalRepoManager {
         }
 
         /**
-         * Alias for {@link org.fdroid.fdroid.localrepo.LocalRepoManager.IndexXmlBuilder#tag(String, String)}
+         * Alias for {@link org.belmarket.shop.localrepo.LocalRepoManager.IndexXmlBuilder#tag(String, String)}
          * That accepts a number instead of string.
          *
          * @see IndexXmlBuilder#tag(String, String)
@@ -374,7 +374,7 @@ public final class LocalRepoManager {
         }
 
         /**
-         * Alias for {@link org.fdroid.fdroid.localrepo.LocalRepoManager.IndexXmlBuilder#tag(String, String)}
+         * Alias for {@link org.belmarket.shop.localrepo.LocalRepoManager.IndexXmlBuilder#tag(String, String)}
          * that accepts a date instead of a string.
          *
          * @see IndexXmlBuilder#tag(String, String)

app/src/main/java/org/fdroid/fdroid/localrepo/SwapService.java

@@ -1,4 +1,4 @@
-package org.fdroid.fdroid.localrepo;
+package org.belmarket.shop.localrepo;
 
 import android.app.Notification;
 import android.app.PendingIntent;
@@ -26,22 +26,22 @@ import org.apache.http.NameValuePair;
 import org.apache.http.client.entity.UrlEncodedFormEntity;
 import org.apache.http.client.methods.HttpPost;
 import org.apache.http.message.BasicNameValuePair;
-import org.fdroid.fdroid.FDroidApp;
+import org.belmarket.shop.FDroidApp;
-import org.fdroid.fdroid.Preferences;
+import org.belmarket.shop.Preferences;
-import org.fdroid.fdroid.R;
+import org.belmarket.shop.R;
-import org.fdroid.fdroid.UpdateService;
+import org.belmarket.shop.UpdateService;
-import org.fdroid.fdroid.Utils;
+import org.belmarket.shop.Utils;
-import org.fdroid.fdroid.data.App;
+import org.belmarket.shop.data.App;
-import org.fdroid.fdroid.data.Repo;
+import org.belmarket.shop.data.Repo;
-import org.fdroid.fdroid.data.RepoProvider;
+import org.belmarket.shop.data.RepoProvider;
-import org.fdroid.fdroid.data.Schema;
+import org.belmarket.shop.data.Schema;
-import org.fdroid.fdroid.localrepo.peers.Peer;
+import org.belmarket.shop.localrepo.peers.Peer;
-import org.fdroid.fdroid.localrepo.peers.PeerFinder;
+import org.belmarket.shop.localrepo.peers.PeerFinder;
-import org.fdroid.fdroid.localrepo.type.BluetoothSwap;
+import org.belmarket.shop.localrepo.type.BluetoothSwap;
-import org.fdroid.fdroid.localrepo.type.SwapType;
+import org.belmarket.shop.localrepo.type.SwapType;
-import org.fdroid.fdroid.localrepo.type.WifiSwap;
+import org.belmarket.shop.localrepo.type.WifiSwap;
-import org.fdroid.fdroid.net.WifiStateChangeService;
+import org.belmarket.shop.net.WifiStateChangeService;
-import org.fdroid.fdroid.views.swap.SwapWorkflowActivity;
+import org.belmarket.shop.views.swap.SwapWorkflowActivity;
 
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
@@ -449,16 +449,16 @@ public class SwapService extends Service {
         return wifiSwap.isConnected() && wifiSwap.getBonjour().isConnected();
     }
 
-    public static final String ACTION_PEER_FOUND = "org.fdroid.fdroid.SwapManager.ACTION_PEER_FOUND";
+    public static final String ACTION_PEER_FOUND = "org.belmarket.shop.SwapManager.ACTION_PEER_FOUND";
     public static final String EXTRA_PEER = "EXTRA_PEER";
 
     // ===============================================================
     //        Old SwapService stuff being merged into that.
     // ===============================================================
 
-    public static final String BONJOUR_STATE_CHANGE = "org.fdroid.fdroid.BONJOUR_STATE_CHANGE";
+    public static final String BONJOUR_STATE_CHANGE = "org.belmarket.shop.BONJOUR_STATE_CHANGE";
-    public static final String BLUETOOTH_STATE_CHANGE = "org.fdroid.fdroid.BLUETOOTH_STATE_CHANGE";
+    public static final String BLUETOOTH_STATE_CHANGE = "org.belmarket.shop.BLUETOOTH_STATE_CHANGE";
-    public static final String WIFI_STATE_CHANGE = "org.fdroid.fdroid.WIFI_STATE_CHANGE";
+    public static final String WIFI_STATE_CHANGE = "org.belmarket.shop.WIFI_STATE_CHANGE";
     public static final String EXTRA_STARTING = "STARTING";
     public static final String EXTRA_STARTED = "STARTED";
     public static final String EXTRA_STOPPING = "STOPPING";

app/src/main/java/org/fdroid/fdroid/localrepo/peers/BluetoothFinder.java

@@ -1,4 +1,4 @@
-package org.fdroid.fdroid.localrepo.peers;
+package org.belmarket.shop.localrepo.peers;
 
 import android.bluetooth.BluetoothAdapter;
 import android.bluetooth.BluetoothClass;
@@ -9,7 +9,7 @@ import android.content.Intent;
 import android.content.IntentFilter;
 import android.util.Log;
 
-import org.fdroid.fdroid.Utils;
+import org.belmarket.shop.Utils;
 
 import rx.Observable;
 import rx.Subscriber;

app/src/main/java/org/fdroid/fdroid/localrepo/peers/BluetoothPeer.java

@@ -1,10 +1,10 @@
-package org.fdroid.fdroid.localrepo.peers;
+package org.belmarket.shop.localrepo.peers;
 
 import android.bluetooth.BluetoothDevice;
 import android.os.Parcel;
 
-import org.fdroid.fdroid.R;
+import org.belmarket.shop.R;
-import org.fdroid.fdroid.localrepo.type.BluetoothSwap;
+import org.belmarket.shop.localrepo.type.BluetoothSwap;
 
 public class BluetoothPeer implements Peer {
 

app/src/main/java/org/fdroid/fdroid/localrepo/peers/BonjourFinder.java

@@ -1,10 +1,10 @@
-package org.fdroid.fdroid.localrepo.peers;
+package org.belmarket.shop.localrepo.peers;
 
 import android.content.Context;
 import android.net.wifi.WifiManager;
 
-import org.fdroid.fdroid.FDroidApp;
+import org.belmarket.shop.FDroidApp;
-import org.fdroid.fdroid.Utils;
+import org.belmarket.shop.Utils;
 
 import java.io.IOException;
 import java.net.InetAddress;

app/src/main/java/org/fdroid/fdroid/localrepo/peers/BonjourPeer.java

@@ -1,4 +1,4 @@
-package org.fdroid.fdroid.localrepo.peers;
+package org.belmarket.shop.localrepo.peers;
 
 import android.net.Uri;
 import android.os.Parcel;

app/src/main/java/org/fdroid/fdroid/localrepo/peers/Peer.java

@@ -1,4 +1,4 @@
-package org.fdroid.fdroid.localrepo.peers;
+package org.belmarket.shop.localrepo.peers;
 
 import android.os.Parcelable;
 import android.support.annotation.DrawableRes;

app/src/main/java/org/fdroid/fdroid/localrepo/peers/PeerFinder.java

@@ -1,4 +1,4 @@
-package org.fdroid.fdroid.localrepo.peers;
+package org.belmarket.shop.localrepo.peers;
 
 import android.content.Context;
 

app/src/main/java/org/fdroid/fdroid/localrepo/peers/WifiPeer.java

@@ -1,10 +1,10 @@
-package org.fdroid.fdroid.localrepo.peers;
+package org.belmarket.shop.localrepo.peers;
 
 import android.net.Uri;
 import android.os.Parcel;
 
-import org.fdroid.fdroid.R;
+import org.belmarket.shop.R;
-import org.fdroid.fdroid.data.NewRepoConfig;
+import org.belmarket.shop.data.NewRepoConfig;
 
 public class WifiPeer implements Peer {
 

app/src/main/java/org/fdroid/fdroid/localrepo/type/BluetoothSwap.java

@@ -1,4 +1,4 @@
-package org.fdroid.fdroid.localrepo.type;
+package org.belmarket.shop.localrepo.type;
 
 import android.bluetooth.BluetoothAdapter;
 import android.content.BroadcastReceiver;
@@ -9,9 +9,9 @@ import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.util.Log;
 
-import org.fdroid.fdroid.Utils;
+import org.belmarket.shop.Utils;
-import org.fdroid.fdroid.localrepo.SwapService;
+import org.belmarket.shop.localrepo.SwapService;
-import org.fdroid.fdroid.net.bluetooth.BluetoothServer;
+import org.belmarket.shop.net.bluetooth.BluetoothServer;
 
 public final class BluetoothSwap extends SwapType {
 

app/src/main/java/org/fdroid/fdroid/localrepo/type/BonjourBroadcast.java

@@ -1,13 +1,13 @@
-package org.fdroid.fdroid.localrepo.type;
+package org.belmarket.shop.localrepo.type;
 
 import android.content.Context;
 import android.support.annotation.Nullable;
 import android.util.Log;
 
-import org.fdroid.fdroid.FDroidApp;
+import org.belmarket.shop.FDroidApp;
-import org.fdroid.fdroid.Preferences;
+import org.belmarket.shop.Preferences;
-import org.fdroid.fdroid.Utils;
+import org.belmarket.shop.Utils;
-import org.fdroid.fdroid.localrepo.SwapService;
+import org.belmarket.shop.localrepo.SwapService;
 
 import java.io.IOException;
 import java.net.InetAddress;

app/src/main/java/org/fdroid/fdroid/localrepo/type/SwapType.java

@@ -1,4 +1,4 @@
-package org.fdroid.fdroid.localrepo.type;
+package org.belmarket.shop.localrepo.type;
 
 import android.content.Context;
 import android.content.Intent;
@@ -6,8 +6,8 @@ import android.os.AsyncTask;
 import android.support.annotation.NonNull;
 import android.support.v4.content.LocalBroadcastManager;
 
-import org.fdroid.fdroid.Utils;
+import org.belmarket.shop.Utils;
-import org.fdroid.fdroid.localrepo.SwapService;
+import org.belmarket.shop.localrepo.SwapService;
 
 /**
  * There is lots of common functionality, and a common API among different communication protocols
@@ -53,9 +53,9 @@ public abstract class SwapType {
     protected void onStopped() { }
 
     /**
-     * Sends either a {@link org.fdroid.fdroid.localrepo.SwapService#EXTRA_STARTING},
+     * Sends either a {@link org.belmarket.shop.localrepo.SwapService#EXTRA_STARTING},
-     * {@link org.fdroid.fdroid.localrepo.SwapService#EXTRA_STARTED} or
+     * {@link org.belmarket.shop.localrepo.SwapService#EXTRA_STARTED} or
-     * {@link org.fdroid.fdroid.localrepo.SwapService#EXTRA_STOPPED} broadcast.
+     * {@link org.belmarket.shop.localrepo.SwapService#EXTRA_STOPPED} broadcast.
      */
     protected final void sendBroadcast(String extra) {
         if (getBroadcastAction() != null) {

app/src/main/java/org/fdroid/fdroid/localrepo/type/WifiSwap.java

@@ -1,4 +1,4 @@
-package org.fdroid.fdroid.localrepo.type;
+package org.belmarket.shop.localrepo.type;
 
 import android.annotation.SuppressLint;
 import android.content.Context;
@@ -8,12 +8,12 @@ import android.os.Looper;
 import android.os.Message;
 import android.util.Log;
 
-import org.fdroid.fdroid.FDroidApp;
+import org.belmarket.shop.FDroidApp;
-import org.fdroid.fdroid.Preferences;
+import org.belmarket.shop.Preferences;
-import org.fdroid.fdroid.Utils;
+import org.belmarket.shop.Utils;
-import org.fdroid.fdroid.localrepo.SwapService;
+import org.belmarket.shop.localrepo.SwapService;
-import org.fdroid.fdroid.net.LocalHTTPD;
+import org.belmarket.shop.net.LocalHTTPD;
-import org.fdroid.fdroid.net.WifiStateChangeService;
+import org.belmarket.shop.net.WifiStateChangeService;
 
 import java.io.IOException;
 import java.net.BindException;

app/src/main/java/org/fdroid/fdroid/net/BluetoothDownloader.java

@@ -1,15 +1,15 @@
-package org.fdroid.fdroid.net;
+package org.belmarket.shop.net;
 
 import android.support.annotation.Nullable;
 import android.util.Log;
 
 import org.apache.commons.io.input.BoundedInputStream;
-import org.fdroid.fdroid.Utils;
+import org.belmarket.shop.Utils;
-import org.fdroid.fdroid.net.bluetooth.BluetoothClient;
+import org.belmarket.shop.net.bluetooth.BluetoothClient;
-import org.fdroid.fdroid.net.bluetooth.BluetoothConnection;
+import org.belmarket.shop.net.bluetooth.BluetoothConnection;
-import org.fdroid.fdroid.net.bluetooth.FileDetails;
+import org.belmarket.shop.net.bluetooth.FileDetails;
-import org.fdroid.fdroid.net.bluetooth.httpish.Request;
+import org.belmarket.shop.net.bluetooth.httpish.Request;
-import org.fdroid.fdroid.net.bluetooth.httpish.Response;
+import org.belmarket.shop.net.bluetooth.httpish.Response;
 
 import java.io.File;
 import java.io.IOException;