renaming package to net.opendasharchive.openarchive

app/build.gradle

@@ -6,7 +6,7 @@ android {
     buildToolsVersion "21.1.2"
 
     defaultConfig {
-        applicationId "io.scal.openarchive"
+        applicationId "net.opendasharchive.openarchive"
         minSdkVersion 17
         targetSdkVersion 21
         versionCode 2
@@ -46,6 +46,6 @@ dependencies {
 
 apt {
     arguments {
-        schematicOutPackage 'io.scal.openarchive.apt'
+        schematicOutPackage 'net.opendasharchive.openarchive.apt'
     }
 }

app/src/androidTest/java/io/scal/openarchive/ApplicationTest.java

@@ -1,4 +1,4 @@
-package io.scal.openarchive;
+package net.opendasharchive.openarchive;
 
 import android.app.Application;
 import android.test.ApplicationTestCase;
@@ -10,4 +10,4 @@ public class ApplicationTest extends ApplicationTestCase<Application> {
     public ApplicationTest() {
         super(Application.class);
     }
-}
+}

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="io.scal.openarchive" >
+    package="net.opendasharchive.openarchive" >
 
     <uses-sdk
         android:minSdkVersion="17"
@@ -23,7 +23,7 @@
     <uses-permission android:name="android.permission.READ_PHONE_STATE" />
 
     <application
-        android:name=".OpenArchiveApp"
+        android:name="net.opendasharchive.openarchive.OpenArchiveApp"
         android:allowBackup="true"
         android:icon="@drawable/ic_launcher"
         android:label="@string/app_name"
@@ -39,10 +39,10 @@
             android:value="true" />
         <meta-data
             android:name="DOMAIN_PACKAGE_NAME"
-            android:value="io.scal.openarchive.db" />
+            android:value="net.opendasharchive.openarchive.db" />
 
         <activity
-            android:name=".MainActivity"
+            android:name="net.opendasharchive.openarchive.MainActivity"
             android:label="@string/app_name"
             android:screenOrientation="portrait" >
             <intent-filter>
@@ -62,48 +62,48 @@
             </intent-filter>
         </activity>
         <activity
-            android:name=".FirstStartActivity"
+            android:name="net.opendasharchive.openarchive.FirstStartActivity"
             android:label="@string/title_activity_first_start"
             android:screenOrientation="portrait" >
         </activity>
         <activity
-            android:name=".ReviewMediaActivity"
+            android:name="net.opendasharchive.openarchive.ReviewMediaActivity"
             android:label="@string/title_activity_view_media"
             android:screenOrientation="portrait" >
 />
         </activity>
         <activity
-            android:name=".ArchiveSettingsActivity"
+            android:name="net.opendasharchive.openarchive.ArchiveSettingsActivity"
             android:label="@string/title_activity_archive_metadata"
             android:screenOrientation="portrait"
             android:theme="@style/SettingsTheme" >
         </activity>
         <activity
             android:name="io.scal.secureshareui.login.ArchiveLoginActivity"
             android:label="@string/title_activity_login"
-            android:parentActivityName=".FirstStartActivity"
+            android:parentActivityName="net.opendasharchive.openarchive.FirstStartActivity"
             android:screenOrientation="portrait" >
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
-                android:value="io.scal.openarchive.FirstStartActivity" />
+                android:value="net.opendasharchive.openarchive.FirstStartActivity" />
         </activity>
         <activity
-            android:name=".MediaListActivity"
+            android:name="net.opendasharchive.openarchive.MediaListActivity"
             android:label="@string/title_media_list"
-            android:parentActivityName=".MainActivity"
+            android:parentActivityName="net.opendasharchive.openarchive.MainActivity"
             android:screenOrientation="portrait"
             android:theme="@style/SettingsTheme" >
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
-                android:value="io.scal.openarchive.MainActivity" />
+                android:value="net.opendasharchive.openarchive.MainActivity" />
         </activity>
         <activity
-            android:name=".AboutActivity"
+            android:name="net.opendasharchive.openarchive.AboutActivity"
             android:label="@string/title_activity_about"
-            android:parentActivityName=".MainActivity" >
+            android:parentActivityName="net.opendasharchive.openarchive.MainActivity" >
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
-                android:value="io.scal.openarchive.MainActivity" />
+                android:value="net.opendasharchive.openarchive.MainActivity" />
         </activity>
     </application>
 

app/src/main/java/io/scal/openarchive/AboutActivity.java → app/src/main/java/net/opendasharchive/openarchive/AboutActivity.java

@@ -1,11 +1,10 @@
-package io.scal.openarchive;
+package net.opendasharchive.openarchive;
 
 import android.support.v7.app.ActionBarActivity;
 import android.os.Bundle;
 import android.view.Menu;
 import android.view.MenuItem;
 
-
 public class AboutActivity extends ActionBarActivity {
 
     @Override

app/src/main/java/io/scal/openarchive/ArchiveSettingsActivity.java → app/src/main/java/net/opendasharchive/openarchive/ArchiveSettingsActivity.java

@@ -1,11 +1,9 @@
-package io.scal.openarchive;
+package net.opendasharchive.openarchive;
 
 import android.app.Activity;
 import android.app.AlertDialog;
-import android.app.ProgressDialog;
 import android.content.Context;
 import android.content.DialogInterface;
-import android.content.Intent;
 import android.content.SharedPreferences;
 import android.net.Uri;
 import android.os.Bundle;
@@ -14,19 +12,17 @@
 import android.view.MenuItem;
 import android.view.View;
 import android.view.View.OnClickListener;
-import android.widget.Button;
 import android.widget.CompoundButton;
 import android.widget.EditText;
 import android.widget.RadioGroup;
 import android.widget.RadioGroup.OnCheckedChangeListener;
 import android.widget.Switch;
 import android.widget.TextView;
-import android.widget.Toast;
+
+import net.opendasharchive.openarchive.db.Media;
 
 import java.util.HashMap;
-import java.util.List;
 
-import io.scal.openarchive.db.Media;
 import io.scal.secureshareui.controller.SiteController;
 import io.scal.secureshareui.lib.ArchiveMetadataActivity;
 import io.scal.secureshareui.lib.Util;

app/src/main/java/io/scal/openarchive/EulaActivity.java → app/src/main/java/net/opendasharchive/openarchive/EulaActivity.java

@@ -1,4 +1,4 @@
-package io.scal.openarchive;
+package net.opendasharchive.openarchive;
 
 import android.app.Activity;
 import android.app.AlertDialog;

app/src/main/java/io/scal/openarchive/FirstStartActivity.java → app/src/main/java/net/opendasharchive/openarchive/FirstStartActivity.java

@@ -1,4 +1,4 @@
-package io.scal.openarchive;
+package net.opendasharchive.openarchive;
 
 
 import android.app.Activity;
@@ -8,13 +8,12 @@
 import android.content.Intent;
 import android.graphics.drawable.Drawable;
 import android.os.Bundle;
-import android.preference.PreferenceManager;
 import android.view.View;
 import android.view.Window;
 import android.widget.Button;
 import android.widget.Toast;
 
-import io.scal.openarchive.EulaActivity.OnEulaAgreedTo;
+import net.opendasharchive.openarchive.EulaActivity.OnEulaAgreedTo;
 import io.scal.secureshareui.controller.ArchiveSiteController;
 import io.scal.secureshareui.controller.SiteController;
 import io.scal.secureshareui.model.Account;

app/src/main/java/io/scal/openarchive/FragmentMain.java → app/src/main/java/net/opendasharchive/openarchive/FragmentMain.java

@@ -1,4 +1,4 @@
-package io.scal.openarchive;
+package net.opendasharchive.openarchive;
 
 import android.app.Activity;
 import android.app.Fragment;
@@ -16,12 +16,14 @@
 import android.widget.Button;
 import android.widget.Spinner;
 
+import net.opendasharchive.openarchive.db.Media;
+
 import java.io.File;
 import java.io.IOException;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 
-import io.scal.openarchive.db.Media;
+import net.opendasharchive  .openarchive.R;
 
 
 public class FragmentMain extends Fragment {

app/src/main/java/io/scal/openarchive/Globals.java → app/src/main/java/net/opendasharchive/openarchive/Globals.java

@@ -1,4 +1,4 @@
-package io.scal.openarchive;
+package net.opendasharchive.openarchive;
 
 /**
  * Created by micahjlucas on 12/15/14.

app/src/main/java/io/scal/openarchive/MainActivity.java → app/src/main/java/net/opendasharchive/openarchive/MainActivity.java

@@ -1,4 +1,4 @@
-package io.scal.openarchive;
+package net.opendasharchive.openarchive;
 
 import android.app.AlertDialog;
 import android.app.FragmentManager;
@@ -19,8 +19,7 @@
 import android.view.MenuItem;
 import android.widget.Toast;
 
-import io.scal.openarchive.db.Media;
-
+import net.opendasharchive.openarchive.db.Media;
 
 public class MainActivity extends ActionBarActivity
         implements NavigationDrawerFragment.NavigationDrawerCallbacks,

app/src/main/java/io/scal/openarchive/MediaAdapter.java → app/src/main/java/net/opendasharchive/openarchive/MediaAdapter.java

@@ -1,4 +1,4 @@
-package io.scal.openarchive;
+package net.opendasharchive.openarchive;
 
 import android.app.Activity;
 import android.content.Context;
@@ -9,9 +9,9 @@
 import android.widget.ImageView;
 import android.widget.TextView;
 
-import java.util.List;
+import net.opendasharchive.openarchive.db.Media;
 
-import io.scal.openarchive.db.Media;
+import java.util.List;
 
 /**
  * Created by micahjlucas on 1/20/15.

app/src/main/java/io/scal/openarchive/MediaListActivity.java → app/src/main/java/net/opendasharchive/openarchive/MediaListActivity.java

@@ -1,17 +1,8 @@
-package io.scal.openarchive;
+package net.opendasharchive.openarchive;
 
-import android.app.AlertDialog;
-import android.content.Context;
-import android.content.DialogInterface;
-import android.content.Intent;
-import android.net.Uri;
 import android.os.Bundle;
 
 import android.support.v4.app.FragmentActivity;
-import android.widget.Toast;
-
-import io.scal.openarchive.db.Media;
-
 
 public class MediaListActivity extends FragmentActivity {
 

app/src/main/java/io/scal/openarchive/MediaListFragment.java → app/src/main/java/net/opendasharchive/openarchive/MediaListFragment.java

@@ -1,4 +1,4 @@
-package io.scal.openarchive;
+package net.opendasharchive.openarchive;
 
 import android.app.AlertDialog;
 import android.content.DialogInterface;
@@ -10,7 +10,7 @@
 import android.widget.ListView;
 import android.widget.Toast;
 
-import io.scal.openarchive.db.Media;
+import net.opendasharchive.openarchive.db.Media;
 
 public class MediaListFragment extends ListFragment {
 

app/src/main/java/io/scal/openarchive/NavigationDrawerFragment.java → app/src/main/java/net/opendasharchive/openarchive/NavigationDrawerFragment.java

@@ -1,4 +1,4 @@
-package io.scal.openarchive;
+package net.opendasharchive.openarchive;
 
 import android.support.v7.app.ActionBarActivity;
 import android.app.Activity;

app/src/main/java/io/scal/openarchive/OpenArchiveApp.java → app/src/main/java/net/opendasharchive/openarchive/OpenArchiveApp.java

@@ -1,4 +1,4 @@
-package io.scal.openarchive;
+package net.opendasharchive.openarchive;
 
 import android.content.Context;
 import android.support.multidex.MultiDex;

app/src/main/java/io/scal/openarchive/ReviewMediaActivity.java → app/src/main/java/net/opendasharchive/openarchive/ReviewMediaActivity.java

@@ -1,13 +1,11 @@
-package io.scal.openarchive;
+package net.opendasharchive.openarchive;
 
 import android.app.AlertDialog;
 import android.app.ProgressDialog;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.SharedPreferences;
-import android.graphics.Bitmap;
-import android.graphics.BitmapFactory;
 import android.net.Uri;
 import android.os.Bundle;
 import android.os.Handler;
@@ -21,16 +19,12 @@
 import android.widget.ImageView;
 import android.widget.TableRow;
 import android.widget.TextView;
-import android.widget.Toast;
 
-import com.facebook.android.DialogError;
+import net.opendasharchive.openarchive.db.Media;
 
 import java.util.HashMap;
-import java.util.List;
 
-import io.scal.openarchive.db.Media;
 import io.scal.secureshareui.controller.SiteController;
-import io.scal.secureshareui.lib.ArchiveMetadataActivity;
 import io.scal.secureshareui.model.Account;
 
 

app/src/main/java/io/scal/openarchive/Utility.java → app/src/main/java/net/opendasharchive/openarchive/Utility.java

@@ -1,20 +1,15 @@
-package io.scal.openarchive;
+package net.opendasharchive.openarchive;
 
 /**
  * Created by micahjlucas on 12/16/14.
  */
 
 import java.io.File;
-import java.security.SecureRandom;
-import java.util.Random;
 
 //import info.guardianproject.onionkit.ui.OrbotHelper;
 
 import android.app.Activity;
-import android.app.AlertDialog;
 import android.content.Context;
-import android.content.DialogInterface;
-import android.content.Intent;
 import android.database.Cursor;
 import android.net.Uri;
 import android.provider.MediaStore;
@@ -25,7 +20,7 @@
 import android.webkit.WebView;
 import android.widget.Toast;
 
-import io.scal.openarchive.db.Media;
+import net.opendasharchive.openarchive.db.Media;
 
 public class Utility {
 

app/src/main/java/io/scal/openarchive/db/Media.java → app/src/main/java/net/opendasharchive/openarchive/db/Media.java

@@ -1,4 +1,4 @@
-package io.scal.openarchive.db;
+package net.opendasharchive.openarchive.db;
 
 import android.content.Context;
 import android.graphics.Bitmap;
@@ -19,8 +19,8 @@
 import java.util.List;
 import java.util.Locale;
 
-import io.scal.openarchive.R;
-import io.scal.openarchive.Utility;
+import net.opendasharchive.openarchive.R;
+import net.opendasharchive.openarchive.Utility;
 
 /**
  * Created by micahjlucas on 1/11/15.

app/src/main/java/io/scal/openarchive/publish/JobBase.java → app/src/main/java/net/opendasharchive/openarchive/publish/JobBase.java

@@ -1,10 +1,10 @@
-package io.scal.openarchive.publish;
+package net.opendasharchive.openarchive.publish;
 
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.preference.PreferenceManager;
 import android.util.Log;
-import io.scal.openarchive.publish.model.Job;
+import net.opendasharchive.openarchive.publish.model.Job;
 
 public class JobBase {
     private final String TAG = "JobBase";