Change package name.

AndroidManifest.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
      xmlns:tools="http://schemas.android.com/tools"
-      package="dk.jens.backup"
+      package="cn.drapl.backup"
       android:versionCode="19"
       android:versionName="0.2.12.1">
     <uses-sdk android:minSdkVersion="16"
@@ -12,53 +12,53 @@
     <uses-permission android:name="android.permission.ACCESS_SUPERUSER"></uses-permission>
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"></uses-permission>
     <application android:label="@string/app_name" android:icon="@drawable/backup2">
-        <activity android:name="OAndBackup"
+        <activity android:name="cn.drapl.backup.OAndBackup"
             android:label="@string/app_name"
             android:launchMode="singleTop">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-        <activity android:name="BatchActivity"
+        <activity android:name="cn.drapl.backup.BatchActivity"
             android:label="@string/app_name"
-            android:parentActivityName="dk.jens.backup.OAndBackup" >
+            android:parentActivityName="cn.drapl.backup.OAndBackup" >
         </activity>
-        <activity android:name=".Preferences"
+        <activity android:name="cn.drapl.backup.Preferences"
             android:label="@string/prefs_title"
-            android:parentActivityName="dk.jens.backup.OAndBackup"
+            android:parentActivityName="cn.drapl.backup.OAndBackup"
             android:launchMode="singleTop">
         </activity>
-        <activity android:name=".schedules.Scheduler"
+        <activity android:name="cn.drapl.backup.schedules.Scheduler"
             android:label="@string/sched_title"
             android:windowSoftInputMode="stateHidden"
-            android:parentActivityName="dk.jens.backup.OAndBackup" >
+            android:parentActivityName="cn.drapl.backup.OAndBackup" >
         </activity>
-        <activity android:name=".ui.Help"
+        <activity android:name="cn.drapl.backup.ui.Help"
             android:label="@string/help_title"
             android:windowSoftInputMode="stateHidden"
-            android:parentActivityName="dk.jens.backup.OAndBackup" >
+            android:parentActivityName="cn.drapl.backup.OAndBackup" >
         </activity>
-        <activity android:name=".Tools"
+        <activity android:name="cn.drapl.backup.Tools"
             android:label="@string/tools_title"
             android:windowSoftInputMode="stateHidden"
-            android:parentActivityName="dk.jens.backup.OAndBackup"
+            android:parentActivityName="cn.drapl.backup.OAndBackup"
             android:launchMode="singleTop">
         </activity>
-        <activity android:name=".ui.FileBrowser"
+        <activity android:name="cn.drapl.backup.ui.FileBrowser"
             android:label="@string/filebrowser_title"
-            android:parentActivityName="dk.jens.backup.Preferences" >
+            android:parentActivityName="cn.drapl.backup.Preferences" >
         </activity>
-        <activity android:name=".LogViewer"
+        <activity android:name="cn.drapl.backup.LogViewer"
             android:label="logviewer"
-            android:parentActivityName="dk.jens.backup.Tools" >
+            android:parentActivityName="cn.drapl.backup.Tools" >
         </activity>
-        <receiver android:name=".schedules.AlarmReceiver" />
-        <receiver android:name=".schedules.BootReceiver">
+        <receiver android:name="cn.drapl.backup.schedules.AlarmReceiver" />
+        <receiver android:name="cn.drapl.backup.schedules.BootReceiver">
             <intent-filter>
                 <action android:name="android.intent.action.BOOT_COMPLETED"/>
             </intent-filter>
         </receiver>
-        <service android:name="dk.jens.backup.schedules.ScheduleService" />
+        <service android:name="cn.drapl.backup.schedules.ScheduleService" />
     </application>
 </manifest>

res/values/strings.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="app_name">oandbackup</string>
+    <string name="app_name">MultiUser Backup</string>
     <string name="backup">backup</string>
     <string name="restore">restore</string>
     <string name="backupConfirmation">backup?</string>

res/xml/preferences.xml

@@ -81,7 +81,7 @@
     <PreferenceCategory
         android:title="@string/prefs_pathscategory"
         android:key="pathscategory" >
-        <dk.jens.backup.FileBrowserEditTextPreference
+        <cn.drapl.backup.FileBrowserEditTextPreference
             android:key="pathBackupFolder"
             android:title="@string/prefs_pathBackupFolder"
             android:summary="@string/prefs_summaryBackupFolder"

src/dk/jens/backup/ActionListener.java → src/cn/drapl/backup/ActionListener.java

@@ -1,4 +1,4 @@
-package dk.jens.backup;
+package cn.drapl.backup;
 
 public interface ActionListener {
     void onActionCalled(AppInfo appInfo, BackupRestoreHelper.ActionType actionType, int mode, String user);

src/dk/jens/backup/AppInfo.java → src/cn/drapl/backup/AppInfo.java

@@ -1,4 +1,4 @@
-package dk.jens.backup;
+package cn.drapl.backup;
 
 import android.graphics.Bitmap;
 import android.os.Parcel;

src/dk/jens/backup/AppInfoHelper.java → src/cn/drapl/backup/AppInfoHelper.java

@@ -1,4 +1,4 @@
-package dk.jens.backup;
+package cn.drapl.backup;
 
 import android.content.Context;
 import android.content.pm.ApplicationInfo;

src/dk/jens/backup/AppInfoSpecial.java → src/cn/drapl/backup/AppInfoSpecial.java

@@ -1,4 +1,4 @@
-package dk.jens.backup;
+package cn.drapl.backup;
 
 import android.os.Parcel;
 import android.os.Parcelable;

src/dk/jens/backup/BackupRestoreHelper.java → src/cn/drapl/backup/BackupRestoreHelper.java

@@ -1,11 +1,9 @@
-package dk.jens.backup;
+package cn.drapl.backup;
 
 import android.content.Context;
 import android.util.Log;
 
 import java.io.File;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
 
 public class BackupRestoreHelper {
     final static String TAG = OAndBackup.TAG;

src/dk/jens/backup/BaseActivity.java → src/cn/drapl/backup/BaseActivity.java

@@ -1,14 +1,13 @@
-package dk.jens.backup;
+package cn.drapl.backup;
 
 import android.app.Activity;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.os.Bundle;
 import android.preference.PreferenceManager;
 import android.util.Log;
-import android.view.MenuItem;
 
-import dk.jens.backup.ui.LanguageHelper;
+import cn.drapl.backup.ui.LanguageHelper;
 import org.openintents.openpgp.util.OpenPgpApi;
 
 public class BaseActivity extends Activity

src/dk/jens/backup/BatchActivity.java → src/cn/drapl/backup/BatchActivity.java

@@ -1,12 +1,9 @@
-package dk.jens.backup;
+package cn.drapl.backup;
 
-import android.app.AlertDialog;
-import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.content.Context;
 import android.os.Bundle;
-import android.os.Message;
 import android.os.PowerManager;
 import android.preference.PreferenceManager;
 import android.util.Log;
@@ -16,14 +13,13 @@
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.widget.*;
-import dk.jens.backup.adapters.BatchAdapter;
-import dk.jens.backup.ui.HandleMessages;
-import dk.jens.backup.ui.NotificationHelper;
-import dk.jens.backup.ui.dialogs.BatchConfirmDialog;
+import cn.drapl.backup.adapters.BatchAdapter;
+import cn.drapl.backup.ui.HandleMessages;
+import cn.drapl.backup.ui.NotificationHelper;
+import cn.drapl.backup.ui.dialogs.BatchConfirmDialog;
 
 import java.io.File;
 import java.util.ArrayList;
-import java.util.Iterator;
 import java.util.List;
 
 public class BatchActivity extends BaseActivity
@@ -83,11 +79,11 @@ public void onCreate(Bundle savedInstanceState)
         Bundle extra = getIntent().getExtras();
         if(extra != null)
         {
-            backupBoolean = extra.getBoolean("dk.jens.backup.backupBoolean");
-            filteringMethodId = extra.getInt("dk.jens.backup.filteringMethodId");
-            sortingMethodId = extra.getInt("dk.jens.backup.sortingMethodId");
+            backupBoolean = extra.getBoolean("cn.drapl.backup.backupBoolean");
+            filteringMethodId = extra.getInt("cn.drapl.backup.filteringMethodId");
+            sortingMethodId = extra.getInt("cn.drapl.backup.sortingMethodId");
         }
-        ArrayList<String> users = getIntent().getStringArrayListExtra("dk.jens.backup.users");
+        ArrayList<String> users = getIntent().getStringArrayListExtra("cn.drapl.backup.users");
         shellCommands = new ShellCommands(prefs, users);
 
         Button bt = (Button) findViewById(R.id.backupRestoreButton);

src/dk/jens/backup/BlacklistContract.java → src/cn/drapl/backup/BlacklistContract.java

@@ -1,4 +1,4 @@
-package dk.jens.backup;
+package cn.drapl.backup;
 
 import android.provider.BaseColumns;
 

src/dk/jens/backup/BlacklistListener.java → src/cn/drapl/backup/BlacklistListener.java

@@ -1,4 +1,4 @@
-package dk.jens.backup;
+package cn.drapl.backup;
 
 public interface BlacklistListener {
     void onBlacklistChanged(CharSequence[] blacklist, int id);

src/dk/jens/backup/BlacklistsDBHelper.java → src/cn/drapl/backup/BlacklistsDBHelper.java

@@ -1,4 +1,4 @@
-package dk.jens.backup;
+package cn.drapl.backup;
 
 import android.content.Context;
 import android.database.Cursor;

src/dk/jens/backup/CommandHandler.java → src/cn/drapl/backup/CommandHandler.java

@@ -1,4 +1,4 @@
-package dk.jens.backup;
+package cn.drapl.backup;
 
 import android.util.Log;
 

src/dk/jens/backup/Compression.java → src/cn/drapl/backup/Compression.java

@@ -1,4 +1,4 @@
-package dk.jens.backup;
+package cn.drapl.backup;
 
 import android.util.Log;
 

src/dk/jens/backup/Constants.java → src/cn/drapl/backup/Constants.java

@@ -1,4 +1,4 @@
-package dk.jens.backup;
+package cn.drapl.backup;
 
 public class Constants {
     public final static String BLACKLIST_ARGS_ID = "blacklistId";

src/dk/jens/backup/Crypto.java → src/cn/drapl/backup/Crypto.java

@@ -1,4 +1,4 @@
-package dk.jens.backup;
+package cn.drapl.backup;
 
 import android.app.Activity;
 import android.app.PendingIntent;

src/dk/jens/backup/FileBrowserEditTextPreference.java → src/cn/drapl/backup/FileBrowserEditTextPreference.java

@@ -1,4 +1,4 @@
-package dk.jens.backup;
+package cn.drapl.backup;
 
 import android.content.Context;
 import android.content.Intent;
@@ -12,7 +12,7 @@
 import android.widget.Button;
 import android.widget.EditText;
 import android.widget.LinearLayout;
-import dk.jens.backup.ui.FileBrowser;
+import cn.drapl.backup.ui.FileBrowser;
 
 public class FileBrowserEditTextPreference extends DialogPreference
 {

src/dk/jens/backup/FileCreationHelper.java → src/cn/drapl/backup/FileCreationHelper.java

@@ -1,4 +1,4 @@
-package dk.jens.backup;
+package cn.drapl.backup;
 
 import android.os.Environment;
 import android.util.Log;

src/dk/jens/backup/FileReaderWriter.java → src/cn/drapl/backup/FileReaderWriter.java

@@ -1,4 +1,4 @@
-package dk.jens.backup;
+package cn.drapl.backup;
 
 import android.util.Log;
 

src/dk/jens/backup/HandleShares.java → src/cn/drapl/backup/HandleShares.java

@@ -1,4 +1,4 @@
-package dk.jens.backup;
+package cn.drapl.backup;
 
 import android.content.Intent;
 import android.net.Uri;

src/dk/jens/backup/LogFile.java → src/cn/drapl/backup/LogFile.java

@@ -1,4 +1,4 @@
-package dk.jens.backup;
+package cn.drapl.backup;
 
 import android.os.Parcel;
 import android.os.Parcelable;

src/dk/jens/backup/LogViewer.java → src/cn/drapl/backup/LogViewer.java

@@ -1,4 +1,4 @@
-package dk.jens.backup;
+package cn.drapl.backup;
 
 import android.os.Bundle;
 import android.view.View;

src/dk/jens/backup/OAndBackup.java → src/cn/drapl/backup/OAndBackup.java

@@ -1,7 +1,6 @@
-package dk.jens.backup;
+package cn.drapl.backup;
 
 import android.app.AlertDialog;
-import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.res.Configuration;
@@ -21,14 +20,14 @@
 import android.widget.SearchView;
 import android.widget.SearchView.OnQueryTextListener;
 import android.widget.Toast;
-import dk.jens.backup.adapters.AppInfoAdapter;
-import dk.jens.backup.schedules.Scheduler;
-import dk.jens.backup.ui.HandleMessages;
-import dk.jens.backup.ui.Help;
-import dk.jens.backup.ui.LanguageHelper;
-import dk.jens.backup.ui.NotificationHelper;
-import dk.jens.backup.ui.dialogs.BackupRestoreDialogFragment;
-import dk.jens.backup.ui.dialogs.ShareDialogFragment;
+import cn.drapl.backup.adapters.AppInfoAdapter;
+import cn.drapl.backup.schedules.Scheduler;
+import cn.drapl.backup.ui.HandleMessages;
+import cn.drapl.backup.ui.Help;
+import cn.drapl.backup.ui.LanguageHelper;
+import cn.drapl.backup.ui.NotificationHelper;
+import cn.drapl.backup.ui.dialogs.BackupRestoreDialogFragment;
+import cn.drapl.backup.ui.dialogs.ShareDialogFragment;
 
 import java.io.File;
 import java.util.ArrayList;
@@ -388,10 +387,10 @@ public boolean onPrepareOptionsMenu(Menu menu)
     public Intent batchIntent(Class batchClass, boolean backup)
     {
         Intent batchIntent = new Intent(this, batchClass);
-        batchIntent.putExtra("dk.jens.backup.backupBoolean", backup);
-        batchIntent.putStringArrayListExtra("dk.jens.backup.users", shellCommands.getUsers());
-        batchIntent.putExtra("dk.jens.backup.filteringMethodId", sorter.getFilteringMethod().getId());
-        batchIntent.putExtra("dk.jens.backup.sortingMethodId", sorter.getSortingMethod().getId());
+        batchIntent.putExtra("cn.drapl.backup.backupBoolean", backup);
+        batchIntent.putStringArrayListExtra("cn.drapl.backup.users", shellCommands.getUsers());
+        batchIntent.putExtra("cn.drapl.backup.filteringMethodId", sorter.getFilteringMethod().getId());
+        batchIntent.putExtra("cn.drapl.backup.sortingMethodId", sorter.getSortingMethod().getId());
         return batchIntent;
     }
     @Override
@@ -418,8 +417,8 @@ public boolean onOptionsItemSelected(MenuItem item)
                 if(backupDir != null)
                 {
                     Intent toolsIntent = new Intent(this, Tools.class);
-                    toolsIntent.putExtra("dk.jens.backup.backupDir", backupDir);
-                    toolsIntent.putStringArrayListExtra("dk.jens.backup.users", shellCommands.getUsers());
+                    toolsIntent.putExtra("cn.drapl.backup.backupDir", backupDir);
+                    toolsIntent.putStringArrayListExtra("cn.drapl.backup.users", shellCommands.getUsers());
                     startActivityForResult(toolsIntent, TOOLS_REQUEST);
                 }
                 break;

src/dk/jens/backup/Preferences.java → src/cn/drapl/backup/Preferences.java

@@ -1,13 +1,13 @@
-package dk.jens.backup;
+package cn.drapl.backup;
 
 import android.content.SharedPreferences;
 import android.os.Bundle;
 import android.preference.ListPreference;
 import android.preference.Preference;
 import android.preference.PreferenceActivity;
-import android.view.MenuItem;
-import dk.jens.backup.ui.FileBrowser;
-import dk.jens.backup.ui.LanguageHelper;
+
+import cn.drapl.backup.ui.FileBrowser;
+import cn.drapl.backup.ui.LanguageHelper;
 
 public class Preferences extends PreferenceActivity implements SharedPreferences.OnSharedPreferenceChangeListener
 {

src/dk/jens/backup/ShellCommands.java → src/cn/drapl/backup/ShellCommands.java

@@ -1,11 +1,10 @@
-package dk.jens.backup;
+package cn.drapl.backup;
 
 import android.app.ActivityManager;
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
-import android.graphics.Bitmap;
 import android.os.Build;
 import android.text.TextUtils;
 import android.util.Log;
@@ -21,7 +20,7 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import static dk.jens.backup.AppInfoHelper.getIcon;
+import static cn.drapl.backup.AppInfoHelper.getIcon;
 
 public class ShellCommands implements CommandHandler.UnexpectedExceptionListener {
     final static String TAG = OAndBackup.TAG;
@@ -127,7 +126,7 @@ public int doBackup(Context context, File backupSubDir, String label, String pac
         }
         if (backupSubDirPath.startsWith(context.getApplicationInfo().dataDir)) {
             /**
-             * if backupDir is set to oab's own datadir (/data/data/dk.jens.backup)
+             * if backupDir is set to oab's own datadir (/data/data/cn.drapl.backup)
              * we need to ensure that the permissions are correct before trying to
              * zip. on the external storage, gid will be sdcard_r (or something similar)
              * without any changes but in the app's own datadir files will have both uid