Merge pull request #21 from jonasrottmann/develop

Develop

Author: jonasrottmann

README.md

@@ -27,17 +27,17 @@ The project is available via [JitPack.io](https://jitpack.io/#jonasrottmann/real
 2. **Add the dependency**
   ```
   dependencies {
-      debugCompile 'com.github.jonasrottmann.realm-browser:realm-browser:0.0.13'
-      testCompile 'com.github.jonasrottmann.realm-browser:realm-browser-no-op:0.0.13'
-      releaseCompile 'com.github.jonasrottmann.realm-browser:realm-browser-no-op:0.0.13'
+      debugCompile 'com.github.jonasrottmann.realm-browser:realm-browser:0.0.14'
+      testCompile 'com.github.jonasrottmann.realm-browser:realm-browser-no-op:0.0.14'
+      releaseCompile 'com.github.jonasrottmann.realm-browser:realm-browser-no-op:0.0.14'
   }
   ```
   The no-op version of Realm Browser has empty functions which do nothing. It is not necessary to include this, but you may if you do not want to access Realm Browser in release mode. If you want to use a build of the newest development use `compile "com.github.jonasrottmann.realm-browser:realm-browser:develop-SNAPSHOT"` instead.
 
 3. Exclude support libraries (maybe optional): Realm Browser depends on Android support libraries, so you might want to exclude them from your project if they conflict with the ones you include:
   ```
   depedencies {
-      debugCompile ('com.github.jonasrottmann.realm-browser:realm-browser:0.0.13') {
+      debugCompile ('com.github.jonasrottmann.realm-browser:realm-browser:0.0.14') {
           exclude group: 'com.android.support';
       }
   }

app/build.gradle

@@ -44,6 +44,10 @@ dependencies {
     compile "com.android.support:appcompat-v7:$project.supportLibVersion"
     compile "com.jakewharton.timber:timber:$project.timberVersion"
 
+    debugCompile "com.squareup.leakcanary:leakcanary-android:$project.leakCanaryVersion"
+    releaseCompile "com.squareup.leakcanary:leakcanary-android-no-op:$project.leakCanaryVersion"
+    testCompile "com.squareup.leakcanary:leakcanary-android-no-op:$project.leakCanaryVersion"
+
     androidTestCompile 'com.android.support.test.espresso:espresso-core:2.2.2', {
         exclude group: 'com.android.support', module: 'support-annotations'
     }

app/src/main/java/de/jonasrottmann/realmsample/Application.java

@@ -1,5 +1,7 @@
 package de.jonasrottmann.realmsample;
 
+import com.squareup.leakcanary.LeakCanary;
+
 import de.jonasrottmann.realmbrowser.RealmBrowser;
 import io.realm.Realm;
 import io.realm.RealmConfiguration;
@@ -12,6 +14,12 @@ public class Application extends android.app.Application {
     @Override
     public void onCreate() {
         super.onCreate();
+
+        if (LeakCanary.isInAnalyzerProcess(this)) {
+            return;
+        }
+        LeakCanary.install(this);
+
         Timber.plant(new Timber.DebugTree());
 
         Realm.init(this);

app/src/main/java/de/jonasrottmann/realmsample/MainActivity.java

@@ -1,21 +1,28 @@
 package de.jonasrottmann.realmsample;
 
 import android.app.Activity;
+import android.graphics.Bitmap;
+import android.graphics.drawable.BitmapDrawable;
 import android.os.Bundle;
+import android.support.v4.content.ContextCompat;
 import android.view.View;
 import android.widget.TextView;
+
+import java.io.ByteArrayOutputStream;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.UUID;
+
 import de.jonasrottmann.realmbrowser.RealmBrowser;
 import de.jonasrottmann.realmsample.data.Address;
 import de.jonasrottmann.realmsample.data.Contact;
+import de.jonasrottmann.realmsample.data.Image;
 import de.jonasrottmann.realmsample.data.RealmString;
 import de.jonasrottmann.realmsample.data.User;
 import io.realm.Realm;
 import io.realm.RealmConfiguration;
 import io.realm.RealmList;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.UUID;
 
 public class MainActivity extends Activity implements View.OnClickListener {
 
@@ -82,20 +89,28 @@ public void execute(Realm realm) {
     private void insertUsers(int count) {
         Realm realm = Realm.getDefaultInstance();
 
+        ByteArrayOutputStream stream = new ByteArrayOutputStream();
+        ((BitmapDrawable) ContextCompat.getDrawable(this, R.drawable.beach_mini)).getBitmap().compress(Bitmap.CompressFormat.JPEG, 100, stream);
+
         final List<User> userList = new ArrayList<>();
         for (int i = 0; i < count; i++) {
             Address address = new Address();
             address.setLat(49.8397473);
             address.setLon(24.0233077);
 
+            Image image = new Image();
+            image.setId(i);
+            image.setBytes(stream.toByteArray());
+
             User user = new User();
             user.setName(new RealmString("Jon Doe " + i));
             user.setIsBlocked(Math.random() > 0.5);
             user.setAge(i);
             user.setAddress(address);
             user.setUuid(UUID.randomUUID().toString());
-            user.setByteArray(new byte[] { 1, 2, 3 });
+            user.setByteArray(new byte[]{1, 2, 3});
             user.setCreationDate(new Date(System.currentTimeMillis()));
+            user.setImage(image);
 
             RealmList<RealmString> emailList = new RealmList<>();
             for (int k = 0; k < 5; k++) {

app/src/main/java/de/jonasrottmann/realmsample/data/Image.java

@@ -0,0 +1,24 @@
+package de.jonasrottmann.realmsample.data;
+
+import io.realm.RealmObject;
+
+public class Image extends RealmObject {
+    private int id;
+    private byte[] bytes;
+
+    public int getId() {
+        return id;
+    }
+
+    public void setId(int id) {
+        this.id = id;
+    }
+
+    public byte[] getBytes() {
+        return bytes;
+    }
+
+    public void setBytes(byte[] bytes) {
+        this.bytes = bytes;
+    }
+}

app/src/main/java/de/jonasrottmann/realmsample/data/User.java

@@ -21,13 +21,13 @@ public class User implements RealmModel {
     private RealmList<Contact> contactList;
     private Date creationDate;
     private byte[] byteArray;
+    private Image image;
 
 
     public void setEmailList(RealmList<RealmString> emailList) {
         this.emailList = emailList;
     }
 
-
     public void setAddress(Address address) {
         this.address = address;
     }
@@ -71,4 +71,12 @@ public Date getCreationDate() {
     public void setCreationDate(Date creationDate) {
         this.creationDate = creationDate;
     }
+
+    public Image getImage() {
+        return image;
+    }
+
+    public void setImage(Image image) {
+        this.image = image;
+    }
 }

app/src/main/res/drawable-nodpi/beach_mini.jpg

@@ -11,12 +11,13 @@ buildscript {
 
         // plugins
         androidGradlePluginVersion = '2.3.1'
-        realmVersion = '3.1.4'
+        realmVersion = '3.3.1'
         dexcountVersion = '0.6.4'
 
         // dependencies
         timberVersion = '4.5.1'
         supportLibVersion = '25.3.1'
+        leakCanaryVersion = '1.5.1'
     }
 
     repositories {

app/src/main/res/drawable-nodpi/beach_normal.jpg

@@ -5,7 +5,7 @@
     <application>
         <provider
             android:name=".helper.FileProvider"
-            android:authorities="de.jonasrottmann.realmbrowser"
+            android:authorities="${applicationId}.share"
             android:exported="false"
             android:grantUriPermissions="true">
             <meta-data

app/src/main/res/drawable-nodpi/beach_small.jpg

@@ -12,48 +12,47 @@
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.v4.app.NotificationCompat;
+
+import java.util.Collections;
+
 import de.jonasrottmann.realmbrowser.files.view.FilesActivity;
-import de.jonasrottmann.realmbrowser.helper.RealmHolder;
+import de.jonasrottmann.realmbrowser.helper.DataHolder;
 import de.jonasrottmann.realmbrowser.models.view.ModelsActivity;
 import io.realm.RealmConfiguration;
-import java.util.Collections;
 
+@SuppressWarnings({"unused", "WeakerAccess"})
 public final class RealmBrowser {
 
     private static final int NOTIFICATION_ID = 1000;
 
     /**
      * @param context A valid {@link Context}
      */
-    @SuppressWarnings("WeakerAccess")
     public static void startRealmFilesActivity(@NonNull Context context) {
         context.startActivity(FilesActivity.getIntent(context));
     }
 
     /**
-     * @param context A valid {@link Context}
+     * @param context       A valid {@link Context}
      * @param realmFileName The name of the realm file to open.
      */
-    @SuppressWarnings("WeakerAccess")
     public static void startRealmModelsActivity(@NonNull Context context, @NonNull String realmFileName) {
         RealmConfiguration config = new RealmConfiguration.Builder().name(realmFileName).build();
         startRealmModelsActivity(context, config);
     }
 
     /**
-     * @param context A valid {@link Context}
+     * @param context            A valid {@link Context}
      * @param realmConfiguration The config of the realm to open.
      */
-    @SuppressWarnings("WeakerAccess")
     public static void startRealmModelsActivity(@NonNull Context context, @NonNull RealmConfiguration realmConfiguration) {
-        RealmHolder.getInstance().setRealmConfiguration(realmConfiguration);
+        DataHolder.getInstance().save(DataHolder.DATA_HOLDER_KEY_CONFIG, realmConfiguration);
         context.startActivity(ModelsActivity.getIntent(context));
     }
 
     /**
      * @param context A valid {@link Context}
      */
-    @SuppressWarnings("WeakerAccess")
     public static void showRealmFilesNotification(@NonNull Context context) {
         Intent notifyIntent = new Intent(context, FilesActivity.class);
         notifyIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
@@ -62,22 +61,21 @@ public static void showRealmFilesNotification(@NonNull Context context) {
     }
 
     /**
-     * @param context A valid {@link Context}
+     * @param context            A valid {@link Context}
      * @param realmConfiguration The config of the realm to open.
      */
-    @SuppressWarnings("WeakerAccess")
     public static void showRealmModelsNotification(@NonNull Context context, @NonNull RealmConfiguration realmConfiguration) {
-        RealmHolder.getInstance().setRealmConfiguration(realmConfiguration);
+        DataHolder.getInstance().save(DataHolder.DATA_HOLDER_KEY_CONFIG, realmConfiguration);
         Intent notifyIntent = ModelsActivity.getIntent(context);
         PendingIntent pendingIntent = PendingIntent.getActivity(context, 0, notifyIntent, PendingIntent.FLAG_UPDATE_CURRENT);
         showNotification(context, pendingIntent);
     }
 
     private static void showNotification(@NonNull Context context, @NonNull PendingIntent pendingIntent) {
         NotificationCompat.Builder builder = new NotificationCompat.Builder(context).setSmallIcon(R.drawable.realm_browser_ic_rb)
-            .setContentTitle(context.getString(R.string.realm_browser_title))
-            .setContentText(context.getApplicationContext().getPackageName())
-            .setAutoCancel(false);
+                .setContentTitle(context.getString(R.string.realm_browser_title))
+                .setContentText(context.getApplicationContext().getPackageName())
+                .setAutoCancel(false);
 
         builder.setContentIntent(pendingIntent);
         NotificationManager mNotificationManager = (NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE);
@@ -89,17 +87,16 @@ private static void showNotification(@NonNull Context context, @NonNull PendingI
      * @return The id of the added shortcut (<code>null</code> if this feature is not supported on the device). Is used if you want to remove this shortcut later on.
      */
     @TargetApi(Build.VERSION_CODES.N_MR1)
-    @SuppressWarnings("WeakerAccess")
     @Nullable
     public static String addFilesShortcut(@NonNull Context context) {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N_MR1) {
             final String id = "realm_browser_ac_files";
             final ShortcutManager shortcutManager = context.getSystemService(ShortcutManager.class);
             final ShortcutInfo shortcut = new ShortcutInfo.Builder(context, id).setShortLabel("Files")
-                .setLongLabel("Open realm-browser files activity")
-                .setIcon(Icon.createWithResource(context, R.drawable.realm_browser_shortcut_rb))
-                .setIntent(FilesActivity.getIntent(context).setAction(Intent.ACTION_VIEW))
-                .build();
+                    .setLongLabel("Open realm-browser files activity")
+                    .setIcon(Icon.createWithResource(context, R.drawable.realm_browser_shortcut_rb))
+                    .setIntent(FilesActivity.getIntent(context).setAction(Intent.ACTION_VIEW))
+                    .build();
             shortcutManager.addDynamicShortcuts(Collections.singletonList(shortcut));
             return id;
         } else {
@@ -108,25 +105,24 @@ public static String addFilesShortcut(@NonNull Context context) {
     }
 
     /**
-     * @param context A valid {@link Context}
+     * @param context            A valid {@link Context}
      * @param realmConfiguration The config of the realm to open.
      * @return The id of the added shortcut (<code>null</code> if this feature is not supported on the device). Is used if you want to remove this shortcut later on.
      */
     @TargetApi(Build.VERSION_CODES.N_MR1)
-    @SuppressWarnings("WeakerAccess")
     @Nullable
     public static String addModelsShortcut(@NonNull Context context, @NonNull RealmConfiguration realmConfiguration) {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N_MR1) {
-            RealmHolder.getInstance().setRealmConfiguration(realmConfiguration);
+            DataHolder.getInstance().save(DataHolder.DATA_HOLDER_KEY_CONFIG, realmConfiguration);
             final String id = "realm_browser_ac_models";
             final ShortcutManager shortcutManager = context.getSystemService(ShortcutManager.class);
             final ShortcutInfo shortcut = new ShortcutInfo.Builder(context, id).setShortLabel("Models")
-                .setLongLabel("Open realm-browser models activity")
-                .setIcon(Icon.createWithResource(context, R.drawable.realm_browser_shortcut_rb))
-                .setIntents(new Intent[] {
-                    FilesActivity.getIntent(context).setAction(Intent.ACTION_VIEW), ModelsActivity.getIntent(context).setAction(Intent.ACTION_VIEW)
-                })
-                .build();
+                    .setLongLabel("Open realm-browser models activity")
+                    .setIcon(Icon.createWithResource(context, R.drawable.realm_browser_shortcut_rb))
+                    .setIntents(new Intent[]{
+                            FilesActivity.getIntent(context).setAction(Intent.ACTION_VIEW), ModelsActivity.getIntent(context).setAction(Intent.ACTION_VIEW)
+                    })
+                    .build();
             shortcutManager.addDynamicShortcuts(Collections.singletonList(shortcut));
             return id;
         } else {