Add Multiple File Upload Support (#37)

- Add Multiple File Upload Support
- Add Previews to Single File Upload
- Improve WebView Handling in Previews

Author: smashedr

README.md

@@ -96,17 +96,15 @@ Additionally, the URL is copied to the clipboard and the preview show in the app
 ### Planned
 
 - Add Default Upload Options.
-- Add Custom Options to Preview page.
-- Option to Disable Preview Page on Open, Share, and for Links.
+- Add File Options to Preview page.
+- Option to Disable Preview Page on Open, Share, and/or for Links.
 - Ability to Authenticate if/when your session (cookie) is expired.
 - File List
-  - Context Menu with Options
-  - Multi-Select with Options
+  - Multi-Select with File Options
   - Response Caching for Infinite Scroll
 - File Preview
-  - File Options
-  - Text/Code Previews
   - PDF Previews
+  - File Options
 
 ### Known Issues
 

TODO.md

@@ -1,25 +1,36 @@
 # TODO
 
+- [Authentication](#Authentication)
+- [Status](#Status)
+
+## Authentication
+
+Options for persistent authentication are:
+
+1. Implement secure scoped token authentication.
+2. Dramatically increase session times and let users manage sessions.
+
 ## Upload
 
 - Add Upload Options to Previews
-- Add Support for Multiple Files
+- Enable Multi for Upload Shortcut
+- Enable Multi for Upload Menu Option
 
 ## File List
 
-- Add Context Menu
 - Add Multi-Select
 - Add Swiper to Preview
 
 ## File Preview
 
-- Add PDF Previews
-- Add Options
+- Add PDF
+- Add File Options
 
 ## Settings
 
 - Overhaul Server Selector
 - Add Default Upload Options
+- Add Fingerprint Authentication
 
 ## Retrofit
 
@@ -28,3 +39,48 @@
 ## Room
 
 - Move Room to Directory
+- Implement Room Active Server
+
+# Status
+
+## Authentication
+
+- Returns a Cookie
+- Uses Cookie to get Token
+
+## File List
+
+Total Cache Size: `700` MB
+
+- Uses `/recent/`
+- Uses Token
+- No Caching
+
+### Glide
+
+**All Images**
+
+- Uses `/raw/?view=gallery`
+- Uses Cookies
+- `250` MB LRU Cache
+- Small Preview Enabled
+
+### ExoPlayer
+
+**All Video and Audio**
+
+- Uses `/raw/?view=gallery`
+- Uses Cookies
+- `350` MB LRU Cache
+- Small Preview Disabled
+
+### Okhttp
+
+**All Plain Text**
+
+Loads the Content into a WebView with highlight.js
+
+- Uses `/raw/?view=gallery`
+- Uses Cookies
+- `100` MB LRU Cache
+- No Small Preview

app/src/main/assets/preview/preview.js

@@ -7,6 +7,11 @@ document.addEventListener('DOMContentLoaded', () => {
     const mediaQuery = window.matchMedia('(prefers-color-scheme: dark)')
     applyTheme(mediaQuery)
     mediaQuery.addEventListener('change', applyTheme)
+
+    if (typeof Android !== 'undefined') {
+        console.log('Android')
+        Android.notifyReady()
+    }
 })
 
 function applyTheme(mediaQuery) {

app/src/main/java/com/djangofiles/djangofiles/MainActivity.kt

@@ -65,7 +65,7 @@ class MainActivity : AppCompatActivity() {
 
         val packageInfo = packageManager.getPackageInfo(this.packageName, 0)
         val versionName = packageInfo.versionName
-        Log.d("Main[onCreate]", "versionName: $versionName")
+        //Log.d("Main[onCreate]", "versionName: $versionName")
 
         val headerView = binding.navigationView.getHeaderView(0)
         val versionTextView = headerView.findViewById<TextView>(R.id.header_version)
@@ -147,7 +147,15 @@ class MainActivity : AppCompatActivity() {
                 }
             }
 
-        handleIntent(intent, savedInstanceState)
+        // Only Handel Intent Once on Startup
+        if (savedInstanceState?.getBoolean("intentHandled") != true) {
+            handleIntent(intent)
+        }
+    }
+
+    override fun onSaveInstanceState(outState: Bundle) {
+        super.onSaveInstanceState(outState)
+        outState.putBoolean("intentHandled", true)
     }
 
     // TODO: Update with a ViewModel...
@@ -162,11 +170,11 @@ class MainActivity : AppCompatActivity() {
     override fun onNewIntent(intent: Intent) {
         super.onNewIntent(intent)
         Log.d("onNewIntent", "intent: $intent")
-        handleIntent(intent, null)
+        handleIntent(intent)
     }
 
-    private fun handleIntent(intent: Intent, savedInstanceState: Bundle?) {
-        Log.d("handleIntent", "intent: $intent")
+    private fun handleIntent(intent: Intent) {
+        //Log.d("handleIntent", "intent: $intent")
         val data = intent.data
         val type = intent.type
         val action = intent.action
@@ -180,11 +188,11 @@ class MainActivity : AppCompatActivity() {
         val sharedPreferences = getSharedPreferences("AppPreferences", MODE_PRIVATE)
         val savedUrl = sharedPreferences.getString("saved_url", null)
         Log.d("handleIntent", "savedUrl: $savedUrl")
-        Log.d("handleIntent", "data?.host: ${data?.host}")
         //val authToken = sharedPreferences.getString("auth_token", null)
         //Log.d("handleIntent", "authToken: $authToken")
 
         Log.d("handleIntent", "data?.host: ${data?.host}")
+
         if (data?.host != "oauth" && savedUrl.isNullOrEmpty()) {
             Log.i("handleIntent", "Missing Saved URL or Token! Showing Login...")
 
@@ -196,7 +204,7 @@ class MainActivity : AppCompatActivity() {
             )
 
         } else if (Intent.ACTION_MAIN == action) {
-            Log.d("handleIntent", "ACTION_MAIN: ${savedInstanceState?.size()}")
+            Log.d("handleIntent", "ACTION_MAIN")
 
             binding.drawerLayout.closeDrawers()
 
@@ -285,11 +293,18 @@ class MainActivity : AppCompatActivity() {
                 Log.w("handleIntent", "fileUris is null")
                 return
             }
-            for (fileUri in fileUris) {
-                Log.d("handleIntent", "MULTI: fileUri: $fileUri")
-            }
-            Toast.makeText(this, "Not Yet Implemented!", Toast.LENGTH_LONG).show()
-            Log.w("handleIntent", "NOT IMPLEMENTED")
+            //fileUris.sort()
+            //Log.d("handleIntent", "fileUris: $fileUris")
+            val bundle = Bundle()
+            bundle.putParcelableArrayList("fileUris", fileUris)
+
+            navController.popBackStack(R.id.nav_graph, true)
+            navController.navigate(
+                R.id.nav_item_upload_multi, bundle, NavOptions.Builder()
+                    .setPopUpTo(R.id.nav_item_home, true)
+                    .setLaunchSingleTop(true)
+                    .build()
+            )
 
         } else if (Intent.ACTION_VIEW == action) {
             Log.d("handleIntent", "ACTION_VIEW")
@@ -335,7 +350,7 @@ class MainActivity : AppCompatActivity() {
 
         navController.popBackStack(R.id.nav_graph, true)
         navController.navigate(
-            R.id.nav_item_preview, bundle, NavOptions.Builder()
+            R.id.nav_item_upload, bundle, NavOptions.Builder()
                 .setPopUpTo(R.id.nav_item_home, true)
                 .setLaunchSingleTop(true)
                 .build()
@@ -464,7 +479,7 @@ object MediaCache {
         if (!::simpleCache.isInitialized) {
             simpleCache = SimpleCache(
                 File(context.cacheDir, "exoCache"),
-                LeastRecentlyUsedCacheEvictor(500 * 1024 * 1024),
+                LeastRecentlyUsedCacheEvictor(350 * 1024 * 1024),
                 StandaloneDatabaseProvider(context)
             )
             cacheDataSourceFactory = CacheDataSource.Factory()

app/src/main/java/com/djangofiles/djangofiles/ui/files/FilesFragment.kt

@@ -79,6 +79,7 @@ class FilesFragment : Fragment() {
     override fun onDestroyView() {
         Log.d("File[onDestroyView]", "ON DESTROY")
         super.onDestroyView()
+        _binding = null
     }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {

app/src/main/java/com/djangofiles/djangofiles/ui/files/FilesPreviewFragment.kt

@@ -56,6 +56,7 @@ class FilesPreviewFragment : Fragment() {
     private var currentPosition: Long = 0
 
     private lateinit var player: ExoPlayer
+    private lateinit var webView: WebView
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -69,17 +70,31 @@ class FilesPreviewFragment : Fragment() {
         container: ViewGroup?,
         savedInstanceState: Bundle?
     ): View {
-        Log.d("FilesPre[onCreateView]", "savedInstanceState: ${savedInstanceState?.size()}")
+        Log.d("FilesPreviewFragment", "onCreateView: ${savedInstanceState?.size()}")
         _binding = FragmentFilesPreviewBinding.inflate(inflater, container, false)
         val root: View = binding.root
         return root
     }
 
+    override fun onDestroyView() {
+        Log.d("FilesPreviewFragment", "onDestroyView")
+        super.onDestroyView()
+        if (::player.isInitialized) {
+            Log.d("FilesPreviewFragment", "player.release")
+            player.release()
+        }
+        if (::webView.isInitialized) {
+            Log.d("FilesPreviewFragment", "webView.destroy")
+            webView.destroy()
+        }
+        _binding = null
+    }
+
     @SuppressLint("SetJavaScriptEnabled")
     @OptIn(UnstableApi::class)
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-        Log.d("FilesPre[onViewCreated]", "savedInstanceState: ${savedInstanceState?.size()}")
+        Log.d("FilesPreviewFragment", "onViewCreated: ${savedInstanceState?.size()}")
 
         binding.goBack.setOnClickListener {
             Log.d("FilesPreviewFragment", "GO BACK")
@@ -214,14 +229,16 @@ class FilesPreviewFragment : Fragment() {
 
         } else if (mimeType?.startsWith("text/") == true || isCodeMime(mimeType!!)) {
             Log.d("FilesPreviewFragment", "WEB VIEW TIME")
+            binding.copyText.visibility = View.VISIBLE
+            webView = WebView(requireContext())
+            binding.previewContainer.addView(webView)
+
             val url = "file:///android_asset/preview/preview.html"
             Log.d("FilesPreviewFragment", "url: $url")
-            binding.webView.visibility = View.VISIBLE
-            binding.copyText.visibility = View.VISIBLE
 
             //val cookieManager = CookieManager.getInstance()
             //cookieManager.setAcceptCookie(true)
-            //cookieManager.setAcceptThirdPartyCookies(binding.webView, true)
+            //cookieManager.setAcceptThirdPartyCookies(webView, true)
 
             lifecycleScope.launch {
                 val content = withContext(Dispatchers.IO) { getContent(viewUrl!!) }
@@ -242,7 +259,7 @@ class FilesPreviewFragment : Fragment() {
                 val jsString = "addContent(${escapedContent});"
                 //Log.d("FilesPreviewFragment", "jsString: $jsString")
                 withContext(Dispatchers.Main) {
-                    binding.webView.apply {
+                    webView.apply {
                         settings.javaScriptEnabled = true
                         loadUrl(url)
                         webViewClient = object : WebViewClient() {
@@ -302,17 +319,17 @@ class FilesPreviewFragment : Fragment() {
     }
 
     //override fun onPause() {
-    //    Log.d("Home[onPause]", "0 - ON PAUSE")
+    //    Log.d("Files[onPause]", "0 - ON PAUSE")
     //    super.onPause()
-    //    binding.webView?.onPause()
-    //    binding.webView?.pauseTimers()
+    //    webView.onPause()
+    //    webView.pauseTimers()
     //}
 
     //override fun onResume() {
     //    Log.d("Home[onResume]", "ON RESUME")
     //    super.onResume()
-    //    binding.webView?.onResume()
-    //    binding.webView?.resumeTimers()
+    //    webView.onResume()
+    //    webView.resumeTimers()
     //}
 
     override fun onStop() {
@@ -326,7 +343,7 @@ class FilesPreviewFragment : Fragment() {
     }
 
     override fun onSaveInstanceState(outState: Bundle) {
-        Log.d("Files[onSave]", "2 - ON SAVE")
+        Log.d("Files[onSave]", "2 - ON SAVE: outState: ${outState.size()}")
         super.onSaveInstanceState(outState)
         if (::player.isInitialized) {
             Log.d("Files[onSave]", "isPlaying: $isPlaying")
@@ -338,15 +355,6 @@ class FilesPreviewFragment : Fragment() {
         }
     }
 
-    override fun onDestroyView() {
-        Log.d("Files[onDestroy]", "3 - ON DESTROY")
-        super.onDestroyView()
-        if (::player.isInitialized) {
-            player.release()
-        }
-        binding.webView.destroy()
-    }
-
     //override fun onStart() {
     //    Log.d("FilesPreviewFragment", "ON START")
     //    super.onStart()