ToS

Signed-off-by: tobiasKaminsky <[email protected]>

Author: tobiasKaminsky

Diff for: app/src/main/java/com/owncloud/android/ui/dialog/TermsOfServiceDialog.kt

@@ -12,7 +12,6 @@ import android.os.Bundle
 import android.view.View
 import android.widget.AdapterView
 import android.widget.ArrayAdapter
-import androidx.core.app.ActivityCompat.finishAffinity
 import androidx.fragment.app.DialogFragment
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import com.nextcloud.android.lib.resources.tos.GetTermsRemoteOperation
@@ -26,13 +25,11 @@ import com.nextcloud.utils.extensions.setHtmlContent
 import com.owncloud.android.R
 import com.owncloud.android.databinding.DialogShowTosBinding
 import com.owncloud.android.lib.common.operations.RemoteOperationResult
-import com.owncloud.android.lib.common.utils.Log_OC
 import com.owncloud.android.utils.DisplayUtils
 import com.owncloud.android.utils.theme.ViewThemeUtils
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
-import kotlinx.coroutines.withContext
 import javax.inject.Inject
 
 class TermsOfServiceDialog : DialogFragment(), Injectable {
@@ -64,6 +61,11 @@ class TermsOfServiceDialog : DialogFragment(), Injectable {
     }
 
     private fun updateDialog() {
+        // viewThemeUtils.dialog.colorMaterialAlertDialogBackground(
+        //     binding.root.context,
+        //     builder
+        // )
+
         binding.message.setHtmlContent(terms[0].renderedBody)
 
         val arrayAdapter: ArrayAdapter<String> = ArrayAdapter(
@@ -84,7 +86,9 @@ class TermsOfServiceDialog : DialogFragment(), Injectable {
                     .setHtmlContent(terms[position].renderedBody)
             }
 
-            override fun onNothingSelected(adapterView: AdapterView<*>?) = Unit
+            override fun onNothingSelected(adapterView: AdapterView<*>?) {
+                // nothing to do
+            }
         }
 
         if (terms.size == 1) {
@@ -93,7 +97,6 @@ class TermsOfServiceDialog : DialogFragment(), Injectable {
     }
 
     private fun fetchTerms() {
-        // TODO use viewLifecycleOwner instead
         CoroutineScope(Dispatchers.IO).launch {
             try {
                 client = clientFactory.createNextcloudClient(accountManager.getUser())
@@ -106,12 +109,12 @@ class TermsOfServiceDialog : DialogFragment(), Injectable {
                     languages = result.resultData.languages
                     terms = result.resultData.terms
 
-                    withContext(Dispatchers.Main) {
+                    CoroutineScope(Dispatchers.Main).launch {
                         updateDialog()
                     }
                 }
             } catch (exception: ClientFactory.CreationException) {
-                Log_OC.e(TAG, "Error creating client!")
+                TODO("Add error handling here")
             }
         }
     }
@@ -120,10 +123,10 @@ class TermsOfServiceDialog : DialogFragment(), Injectable {
         return MaterialAlertDialogBuilder(binding.root.context)
             .setView(binding.root)
             .setTitle(R.string.terms_of_service_title)
-            .setNegativeButton(R.string.dialog_close) { _, _ ->
-                activity?.let { finishAffinity(it) }
+            .setNegativeButton(R.string.dialog_close) { dialog, which ->
+                // TODO finishAffinity()
             }
-            .setPositiveButton(R.string.terms_of_services_agree) { dialog, _ ->
+            .setPositiveButton(R.string.terms_of_services_agree) { dialog, which ->
                 dialog.dismiss()
                 Thread {
                     val id = binding.languageDropdown.selectedItemPosition
@@ -136,7 +139,58 @@ class TermsOfServiceDialog : DialogFragment(), Injectable {
             }
     }
 
-    companion object {
-        private const val TAG = "TermsOfServiceDialog"
-    }
+    // private void showTermsOfServiceDialog1()
+    // {
+
+    //                 runOnUiThread(Runnable {
+    //                     viewThemeUtils.dialog.colorMaterialAlertDialogBackground(
+    //                         binding.root.context,
+    //                         builder
+    //                     )
+    //                     builder.create()
+    //
+    //                     binding.message.setHtmlContent(terms[0].renderedBody)
+    //
+    //                     val arrayAdapter: ArrayAdapter<String> = ArrayAdapter(
+    //                         binding.root.context,
+    //                         android.R.layout.simple_spinner_item
+    //                     )
+    //
+    //                     for ((_, _, languageCode) in terms) {
+    //                         arrayAdapter.add(languages[languageCode])
+    //                     }
+    //
+    //                     arrayAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item)
+    //
+    //
+    //                     binding.languageDropdown.adapter = arrayAdapter
+    //                     binding.languageDropdown.onItemSelectedListener = object : AdapterView.OnItemSelectedListener {
+    //                         override fun onItemSelected(
+    //                             adapterView: AdapterView<*>?,
+    //                             view: View,
+    //                             position: Int,
+    //                             l: Long
+    //                         ) {
+    //                             binding.message
+    //                                 .setHtmlContent(terms[position].renderedBody)
+    //                         }
+    //
+    //                         override fun onNothingSelected(adapterView: AdapterView<*>?) {
+    //                             // nothing to do
+    //                         }
+    //                     }
+    //
+    //                     if (terms.size == 1) {
+    //                         binding.languageDropdown.visibility = View.GONE
+    //                     }
+    //                     if (!tosIsShown) {
+    //                         tosIsShown = true
+    //                         builder.create().show()
+    //                     }
+    //                 })
+    //             }
+    //         } catch (e: CreationException) {
+    //             showInfoBox(R.string.sign_tos_failed)
+    //         }
+    //     }.start()
 }