From c4644c73a5f4359dbdebe9454cb074f379e75c9a Mon Sep 17 00:00:00 2001
From: tibbi <tibor@kaputa.sk>
Date: Sun, 4 Dec 2016 18:57:58 +0100
Subject: [PATCH] remove the Undo option of deleting at viewpager, as there is
 a confirmation box

---
 .../gallery/activities/ViewPagerActivity.kt   | 111 ++++--------------
 app/src/main/res/layout/activity_medium.xml   |  10 --
 app/src/main/res/mipmap-hdpi/undo.png         | Bin 477 -> 0 bytes
 app/src/main/res/mipmap-mdpi/undo.png         | Bin 339 -> 0 bytes
 app/src/main/res/mipmap-xhdpi/undo.png        | Bin 606 -> 0 bytes
 app/src/main/res/mipmap-xxhdpi/undo.png       | Bin 894 -> 0 bytes
 app/src/main/res/mipmap-xxxhdpi/undo.png      | Bin 1169 -> 0 bytes
 7 files changed, 25 insertions(+), 96 deletions(-)
 delete mode 100644 app/src/main/res/mipmap-hdpi/undo.png
 delete mode 100644 app/src/main/res/mipmap-mdpi/undo.png
 delete mode 100644 app/src/main/res/mipmap-xhdpi/undo.png
 delete mode 100644 app/src/main/res/mipmap-xxhdpi/undo.png
 delete mode 100644 app/src/main/res/mipmap-xxxhdpi/undo.png

diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/activities/ViewPagerActivity.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/activities/ViewPagerActivity.kt
index 5ec35837e..6c9c9671d 100644
--- a/app/src/main/kotlin/com/simplemobiletools/gallery/activities/ViewPagerActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/gallery/activities/ViewPagerActivity.kt
@@ -10,7 +10,6 @@ import android.support.v4.view.ViewPager
 import android.view.Menu
 import android.view.MenuItem
 import android.view.View
-import android.widget.RelativeLayout
 import com.simplemobiletools.filepicker.asynctasks.CopyMoveTask
 import com.simplemobiletools.filepicker.dialogs.ConfirmationDialog
 import com.simplemobiletools.filepicker.extensions.*
@@ -33,11 +32,8 @@ class ViewPagerActivity : SimpleActivity(), ViewPager.OnPageChangeListener, View
     private var mMedia: MutableList<Medium>? = null
     private var mPath = ""
     private var mDirectory = ""
-    private var mToBeDeleted = ""
-    private var mBeingDeleted = ""
 
     private var mIsFullScreen = false
-    private var mIsUndoShown = false
     private var mPos = 0
 
     override fun onCreate(savedInstanceState: Bundle?) {
@@ -75,11 +71,8 @@ class ViewPagerActivity : SimpleActivity(), ViewPager.OnPageChangeListener, View
 
         mPos = 0
         mIsFullScreen = false
-        mToBeDeleted = ""
-        mBeingDeleted = ""
 
         scanPath(mPath) {}
-        addUndoMargin()
         mDirectory = File(mPath).parent
         mMedia = getMedia()
         if (isDirEmpty())
@@ -88,7 +81,6 @@ class ViewPagerActivity : SimpleActivity(), ViewPager.OnPageChangeListener, View
         updatePagerItems()
         window.decorView.setOnSystemUiVisibilityChangeListener(this)
         updateActionbarTitle()
-        undo_delete.setOnClickListener { undoDeletion() }
     }
 
     override fun onResume() {
@@ -98,14 +90,6 @@ class ViewPagerActivity : SimpleActivity(), ViewPager.OnPageChangeListener, View
         }
     }
 
-    fun undoDeletion() {
-        mIsUndoShown = false
-        mToBeDeleted = ""
-        mBeingDeleted = ""
-        undo_delete.visibility = View.GONE
-        reloadViewPager()
-    }
-
     override fun onCreateOptionsMenu(menu: Menu): Boolean {
         menuInflater.inflate(R.menu.viewpager_menu, menu)
         menu.findItem(R.id.menu_set_as_wallpaper).isVisible = getCurrentMedium().isImage()
@@ -206,59 +190,35 @@ class ViewPagerActivity : SimpleActivity(), ViewPager.OnPageChangeListener, View
 
     private fun askConfirmDelete() {
         ConfirmationDialog(this) {
-            notifyDeletion()
-        }
-    }
-
-    private fun notifyDeletion() {
-        if (isShowingPermDialog(File(mPath)))
-            return
-
-        mToBeDeleted = getCurrentFile().absolutePath
-        if (mMedia!!.size <= 1) {
             deleteFile()
-        } else {
-            toast(R.string.file_deleted)
-            undo_delete.visibility = View.VISIBLE
-            mIsUndoShown = true
-            reloadViewPager()
         }
     }
 
     private fun deleteFile() {
-        if (mToBeDeleted.isEmpty())
+        val file = File(mPath)
+        if (isShowingPermDialog(file))
             return
 
-        mIsUndoShown = false
-        mBeingDeleted = ""
-        var mWasFileDeleted = false
-
-        val file = File(mToBeDeleted)
-        if (needsStupidWritePermissions(mToBeDeleted)) {
+        if (needsStupidWritePermissions(mPath)) {
             if (!isShowingPermDialog(file)) {
-                val document = getFileDocument(mToBeDeleted, mConfig.treeUri)
+                val document = getFileDocument(mPath, mConfig.treeUri)
                 if (document.uri.toString().endsWith(file.absolutePath.getFilenameFromPath()) && !document.isDirectory)
-                    mWasFileDeleted = document.delete()
+                    document.delete()
             }
         } else {
-            mWasFileDeleted = file.delete()
+            file.delete()
         }
 
-        if (!mWasFileDeleted) {
-            try {
-                mWasFileDeleted = file.delete()
-            } catch (ignored: Exception) {
+        try {
+            if (file.exists())
+                file.delete()
+        } catch (ignored: Exception) {
 
-            }
         }
 
-        if (mWasFileDeleted) {
-            mBeingDeleted = mToBeDeleted
-            scanPath(mToBeDeleted) { scanCompleted() }
+        scanFile(file) {
+            reloadViewPager()
         }
-
-        mToBeDeleted = ""
-        undo_delete.visibility = View.GONE
     }
 
     private fun isDirEmpty(): Boolean {
@@ -323,23 +283,21 @@ class ViewPagerActivity : SimpleActivity(), ViewPager.OnPageChangeListener, View
                     val pathIndex = cursor.getColumnIndex(MediaStore.Images.Media.DATA)
                     do {
                         val curPath = cursor.getString(pathIndex) ?: continue
-                        if (curPath != mToBeDeleted && curPath != mBeingDeleted) {
-                            val file = File(curPath)
-                            val size = cursor.getLongValue(MediaStore.Images.Media.SIZE)
+                        val file = File(curPath)
+                        val size = cursor.getLongValue(MediaStore.Images.Media.SIZE)
 
-                            if (size == 0L) {
-                                invalidFiles.add(file)
-                                continue
-                            }
-
-                            // exclude images of subdirectories
-                            if (file.parent != mDirectory)
-                                continue
-
-                            val name = cursor.getStringValue(MediaStore.Images.Media.DISPLAY_NAME)
-                            val timestamp = cursor.getLongValue(MediaStore.Images.Media.DATE_MODIFIED)
-                            media.add(Medium(name, curPath, i == 1, timestamp, size))
+                        if (size == 0L) {
+                            invalidFiles.add(file)
+                            continue
                         }
+
+                        // exclude images of subdirectories
+                        if (file.parent != mDirectory)
+                            continue
+
+                        val name = cursor.getStringValue(MediaStore.Images.Media.DISPLAY_NAME)
+                        val timestamp = cursor.getLongValue(MediaStore.Images.Media.DATE_MODIFIED)
+                        media.add(Medium(name, curPath, i == 1, timestamp, size))
                     } while (cursor.moveToNext())
                 }
             } finally {
@@ -383,19 +341,6 @@ class ViewPagerActivity : SimpleActivity(), ViewPager.OnPageChangeListener, View
 
     private fun getCurrentFile() = File(getCurrentMedium().path)
 
-    private fun addUndoMargin() {
-        val res = resources
-        val params = undo_delete.layoutParams as RelativeLayout.LayoutParams
-        val topMargin = res.getStatusBarHeight() + res.getActionBarHeight(applicationContext)
-        var rightMargin = params.rightMargin
-
-        if (res.configuration.orientation != Configuration.ORIENTATION_PORTRAIT) {
-            rightMargin += res.getNavBarHeight()
-        }
-
-        params.setMargins(params.leftMargin, topMargin, rightMargin, params.bottomMargin)
-    }
-
     override fun onPageScrolled(position: Int, positionOffset: Float, positionOffsetPixels: Int) {
 
     }
@@ -423,16 +368,10 @@ class ViewPagerActivity : SimpleActivity(), ViewPager.OnPageChangeListener, View
     }
 
     private fun scanCompleted() {
-        mBeingDeleted = ""
         runOnUiThread {
             if (mMedia != null && mMedia!!.size <= 1) {
                 reloadViewPager()
             }
         }
     }
-
-    override fun onPause() {
-        super.onPause()
-        deleteFile()
-    }
 }
diff --git a/app/src/main/res/layout/activity_medium.xml b/app/src/main/res/layout/activity_medium.xml
index 4fee5a7ab..cfbab5d0f 100644
--- a/app/src/main/res/layout/activity_medium.xml
+++ b/app/src/main/res/layout/activity_medium.xml
@@ -10,14 +10,4 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"/>
 
-    <ImageView
-        android:id="@+id/undo_delete"
-        android:layout_width="@dimen/undo_size"
-        android:layout_height="@dimen/undo_size"
-        android:layout_alignParentRight="true"
-        android:layout_alignParentTop="true"
-        android:padding="@dimen/undo_padding"
-        android:src="@mipmap/undo"
-        android:visibility="gone"/>
-
 </RelativeLayout>
diff --git a/app/src/main/res/mipmap-hdpi/undo.png b/app/src/main/res/mipmap-hdpi/undo.png
deleted file mode 100644
index 1e1e3d866125bbeceb283decc5ed3b9f0f696bbe..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 477
zcmV<30V4j1P)<h;3K|Lk000e1NJLTq002k;002k`1ONa4|Kxkj0004`Nkl<ZcmeIy
z!K+MR7{~E<bY>D3GFD?@r<9B$_L#^*SyGd&g+Jmb7Sxo&$S^B*)YMEYl&O*2x^<U#
z>UI}yvXEwskcI2a*TTj-XPl1no0^H|`&&J`&+2iOWm%SGS(at}!x7@<J^zGo(LfL`
z8Yn#};24)_&}E$w-x>3b0c$+x9+x;wpo2(B+Ch~TpGoc$kEya<2PKmZ(&Q`Y`$Cfg
z0w|GGrbCv-v?+_A7-<*xiO60=gQ5iTNay%~-h0k!pkJf{b!OLX@(Kv9^NOT?(5J;6
zu5pDM+@(XGh@@V!TL2~WmKrD7HuWu>pvDG&s?VNTgPw7U94>J=j?-q$wBGn64b<ZZ
zF7?X1U|Opb(Ls#3i2LiEXGpvrfeKn?FD}zcye8gF6?7Gsc?BL4?~De5P$1=~Gub<K
zY9N*Lh{<lLAdOUD3BOJDt00Y3Vu;@p9i)*i;1{t^2Wg}(esvwBkq+TEVyh0)NKg5_
zj~vxO8mR&R40yn4@;Du&k+!fxg9<_XQ_p$-Imkc;GLV4`WFP|>$Up`%kb!;z6yinR
TJ@r{w00000NkvXXu0mjf?+@0e

diff --git a/app/src/main/res/mipmap-mdpi/undo.png b/app/src/main/res/mipmap-mdpi/undo.png
deleted file mode 100644
index c4c28d0a4a8bf7746fff7a34a8df15aabc510bc9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 339
zcmV-Z0j&OsP)<h;3K|Lk000e1NJLTq001xm001xu1ONa4{R=S+0003RNkl<ZcmeIx
zzbi#y9LMoP9Nm~0Y|4NMb?)7a@|U>9KVVSO%^j7PWo5BRDgS~&Qbd>xvN%`yeR`YD
z)4BDW`aI<f>ihmI&-SWsJ<(rgS(atdBC2BU0ko<H%88f-+8lF3hm3DtxZ;Qn=7~c9
zKha>1l(JHGNkqUyB%Gpj!n6!HqQ(vxYCmi;AOMb-;F8eJ8CL;#qq`0VG)Wkymp(?Q
z(`28N?w+ZuK(Pmw81!Da#v->AOG(0jPuBdmb?aw^cW^y1rUS1uh=k2>hl?{}70`e8
zC>OYBD?m7LPu>@kI-nD?e2{mj0O7<cc^OkWpc8T7Oj`;NPAmfekE|;|I5EUE+sx5J
l<bZ1SuK)uKFu(u<egR$stOy7pPO<<1002ovPDHLkV1lpZjQaop

diff --git a/app/src/main/res/mipmap-xhdpi/undo.png b/app/src/main/res/mipmap-xhdpi/undo.png
deleted file mode 100644
index 6b10718b9ad10de899e3f46394b0d3e2e55eb055..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 606
zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD0wg^q?%&M7z@+Nw;uuoF`1ZQJ$CN^u;~(c=
zm*@7D(X#A*aX!gK#j)7gTVUGX=&ZuR%npS`8r%nc7ixAW7;jSS&F+}y(bbmSwT*3h
z28Z4$h4mpW?<%*meYd&$@~>UfhsyeG@4rdyKWO=UPVqS?5yQbF5O#T${|nBnhItC?
zFF1=Flw0o3d1#irC%G&0*~$$kcvP3oNNI_llhiJ^LB?sGo!SpS+o>}aOfS=2Q0F8q
zt~qJL6``&#7gsS~ake<1QEYNahySGrW0t_K3dcEGA}@j%HgVpTR8~wAb;}TE2;#8R
z`z-C6s&`RDbb`|jXTj9`8=|}uoGjcWOH->JF()+0IIr>HY<`l&{6P3?=pqOE<(4k<
zdY?piYgh6WPm{KJuKhK1fu-4kGWngy>YRGtKIVGA@@{ri7@xs$TRx#_8~oa4KKw75
z>ByfjFL9gDw2fwY*BtgF?Unk_Gq;6pTkmg`l<!m2WFJVYa|o8ToKLyFp2_EuU&j{T
zp2?xD$y^86uL&%ArzLvnx2Jne!=sNj=apXW6=6_mdFSJ_o<Tt|MnQ3H<}DTm&WBbn
z?+P-wv@m7rZU|?XAYk^nb&DJagVLcup;gffoEZcJ-8{2BfRxn_=TiF!b%qX(<|S8^
zfmHO2rMn6l9o%-D-hcK(%j6sZhLjdPh6m#PFPBAr3*zF;uRQYc&3c^;tI`@6*(4Hh
d5H2_3L*{J%cu`5y9hhzyJYD@<);T3K0RUhY@*MyG

diff --git a/app/src/main/res/mipmap-xxhdpi/undo.png b/app/src/main/res/mipmap-xxhdpi/undo.png
deleted file mode 100644
index a47587c360aa27ca1e669320f796044a10331b4b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 894
zcmeAS@N?(olHy`uVBq!ia0vp^6F``Q1xWh(YZ)^zFuQuXIEGX(zPVs1%AmmD<hbaz
zjPMVG1G37u`GJaH;Ln2P8=uvNE)w-vB<TSn1w9sd&)vJnMf7;0#PQQUDVI#zTHC}t
zxm$HKd7T%vhH#W6nz^=4x}tREkT1thgRF^yWsOTXw4z%yMKz~wF%XYx$z61(g<D(S
zLwDI8AHVc@)7Wm#F`hTGvj2SihsTF?&eg;hFNhFM-8efqX4%v@JA<zI3~Y{ndJK<L
z$6Y*Bxk^LzcA|r!>ZeWfy}vwApQQF;QDae<6_bXV3#UloL`I%BDHqOLavgC9RKIm9
z)U6{;*<|8+_D%jz7Pj>tSydh~S&eOz<CMd`%Q{Lg-$_`@ae^&SZmq<T)e7HFhB8O0
zM;&M8c@*0rW^~oznak-N2Y6PgtxR9ZcVf<pIp<eMr_E<NF-K#r*_<G5?GlI2!cz_V
zCjUC5$9mz9i{7k)Bwv-+4bM8RU1$$}tr*K};vRBB!!K`!u9ZT?36ru}OZsnLd9=9W
zYel4!lAcY<1ZP8bOK;;^pTy;od>joq-<pqyY@Vp%?eD8J|M8Z`>4|@r6@6s*x%0H#
z9qvj4y|SXY`7UuC#@&oBOhp5KoGX32c(TC6u=gno1pGDnUd5k`c_*l{$<JDJ#pJVw
zJ8z^EvopVLwRmK+z|kwY>bv#=@z<=H#X<oMRxyP;<m4Y&hs{o!9NfTmqWd<}L`U{8
z=|ij8xe8gs=ajDzX4w!X-Wj!E{tuPt7iRmC*0Skd(7hS6XI9;slz>Hym-2sU?m6H!
z-y@Jov-8fD#HHC$3aWuZ{Ra9+_;e?H3;!bYna%SWP%fylyHfqCgV!RTV+Pqw{ZbyD
zA%}F*OkXulaWS1Csu0Y-MCH}7HEy;OCTVcnKm7doBC}@aDudO2Kyj}Jybq<1uVoJs
z$~~?#U(Un(iq{XTFAh<QcqLl2PiWarn6_f>hpVp|x45+a*{^W-%~j@=omD@#N6stm
zF;UO`Y_*8%-#hWSA&*M0nXOm#N)>8gIB(JAzQ5bDf5pt@GHE;iKK$TsUE;t5OymkL
z{=Y6`dBiNJ;xR$Nv5AFKs0Bi)cnE-aU||jj)#QgRz#{nPiSm+&bnj|Ve(`kmb6Mw<
G&;$TOr*3@!

diff --git a/app/src/main/res/mipmap-xxxhdpi/undo.png b/app/src/main/res/mipmap-xxxhdpi/undo.png
deleted file mode 100644
index 9959132c610b8a6556c0206a52b4ede0702f9853..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1169
zcmeAS@N?(olHy`uVBq!ia0vp^2SAvE1xWt5x}=AJfhEGz#WAFU@y)?Tpcq5Lg1;-p
zS2BT^=pgNWUHoRP#}<9_f9pJtUH#W#;j?8uY7;l?N#5niuahZgo9S|K(F_F@iJ5<k
zHb!5|pQGkz-(v8pG2{xfCdZ+xNlja(`YMNI33|t*-i_{_7QIvcd)fYKDVK_M)%T0n
z70=!G{=9v`gRgI_u0M^l=@q|MA}202jZ@@+T_cl5V=05`2EGL>*BGZ9&}*n=V%^{$
z;AmXFsd>7khkU%zA&bdpHaN^He)419`k!+S?>Q{@?y=alg3jLz+c<+_T&?vl9@iJS
zEU~wwSbD1;bA-Z&%q7iob?&QV<S(2w?PH8k*wJHl@0t0bSMG63ry6}{IHazzc&=Pp
z=OW3f9kaKrX86P+UD>U<D6i?S$!<;s_kfemHQi_ZHZ^m7XHenDs%+GJbiwjl!A@re
zCYIHf2V@GfW`(aPW^iaoP+dP+z3*vdbEqEU4B;uCZH$lX{A}Yr)0#nz#V%UnaO=5E
zol}Gv*jOa{9tJg=++?4iv}4Be6OW@lmjq{tI&>`Pd|$9t(MXJug~O|2l8v6Zx47yz
z#xCU*i47_xQ=)z|JY&)Q;}s;8+FZ+E+@!;;veHs+15bj(hAHNrN$eiS<r%&iIavI4
z(f|G8fu7lg16-#(A8&5qTD3A=_xfc&@%0}Kmvb(6oEFWt;R4J1%O`u=+K+|aIpTNk
zaeB({wp;(X9U7Bu&RNy$an03@{58{km0*~<`~z;eMAmr^R^2#~$mL<;rM8nn_|0NQ
z{UujFiln>j`?O1iiKn=p<@(B?JEzihw%MOh;eH^J`=eswTQ<9t!lx_zxeiFaJ9xai
z=Jm^T!@1A6zB4X6u}S3oty>Zcf9zXyDYv0~<-yH+Ok#b4bN)`*#Wi8EsJ>eC;li%m
z{j(X^BiqCm#~u+r6Bsi)mf7OG*dB>@QEi&bGNodfB$hGiFI)XY;Hb$Vqi_bhMO^yF
zKHqd@{9NU^lko#j+?#Ui%QLp0Wn@U7_d7R5=<>fOUhE8W6eEsXER$7y%FtlU5?(BJ
zdE03wje{0xe_i*gGzgg(wnnz6Fiu&}8hK_{q?iNeErZuAs+$<RHi&QDc8W>Ek+XJ&
ziQ7({1|gm2>^`@2c^9ypeZqN9W$GmcuM54N)=Pm}rwFs;PuXGuG;ET3Mf6j~DGBBW
zrH@T#3uy8_DY(b_3FDLpaZT5i`4_O*IkV)>%c^8h%}}i9Z)IG-GGA!R<U|GyN9}{r
z`apS2Kfx_I5<tsma+lBXd-d@ULqL;i&&T_`mmFhvq&s?jQ2M{_K%iV|sK|bmsS1bf
zwG9p&Ueog_X_^oZ<Aww3HXgoTwlAKVVC{axZR-(X)wu_rF#gNy=Su<Qa<-q*@=tVI
o1QZw;naCtq6dZtwA3+#!D41?~UzMbqBnYy>)78&qol`;+05aRo_5c6?