- v1.5.2 Beta release

kollerlukas · Jun 15, 2017 · bd08e45 · bd08e45
1 parent d9f63e1
commit bd08e45
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 14 deletions.
diff --git a/app/app-release.apk b/app/app-release.apk
diff --git a/app/build.gradle b/app/build.gradle
@@ -7,8 +7,8 @@ android {
         applicationId "us.koller.cameraroll"
         minSdkVersion 19
         targetSdkVersion 25
-        versionCode 20
-        versionName "v1.5.1 Beta"
+        versionCode 21
+        versionName "v1.5.2 Beta"
         vectorDrawables.useSupportLibrary = true
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }

diff --git a/app/src/main/java/us/koller/cameraroll/ui/AlbumActivity.java b/app/src/main/java/us/koller/cameraroll/ui/AlbumActivity.java
@@ -430,18 +430,20 @@ public void onActivityReenter(int requestCode, Intent data) {
         if (data != null) {
             Bundle tmpReenterState = new Bundle(data.getExtras());
             sharedElementReturnPosition = tmpReenterState.getInt(EXTRA_CURRENT_ALBUM_POSITION);
-            album.getAlbumItems().get(sharedElementReturnPosition).isSharedElement = true;
-            if (recyclerView.getAdapter().getItemCount() > 0) {
-                postponeEnterTransition();
-                recyclerView.addOnLayoutChangeListener(new View.OnLayoutChangeListener() {
-                    @Override
-                    public void onLayoutChange(View v, int l, int t, int r, int b,
-                                               int oL, int oT, int oR, int oB) {
-                        recyclerView.removeOnLayoutChangeListener(this);
-                        startPostponedEnterTransition();
-                    }
-                });
-                recyclerView.scrollToPosition(sharedElementReturnPosition);
+            if (sharedElementReturnPosition != -1) {
+                album.getAlbumItems().get(sharedElementReturnPosition).isSharedElement = true;
+                if (recyclerView.getAdapter().getItemCount() > 0) {
+                    postponeEnterTransition();
+                    recyclerView.addOnLayoutChangeListener(new View.OnLayoutChangeListener() {
+                        @Override
+                        public void onLayoutChange(View v, int l, int t, int r, int b,
+                                                   int oL, int oT, int oR, int oB) {
+                            recyclerView.removeOnLayoutChangeListener(this);
+                            startPostponedEnterTransition();
+                        }
+                    });
+                    recyclerView.scrollToPosition(sharedElementReturnPosition);
+                }
             }
         }
     }