migrate RingtoneSelectionController to kotlin

Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>

app/src/main/java/com/nextcloud/talk/controllers/RingtoneSelectionController.java

@@ -1,300 +0,0 @@
-/*
- * Nextcloud Talk application
- *
- * @author Mario Danic
- * Copyright (C) 2017-2018 Mario Danic <mario@lovelyhq.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package com.nextcloud.talk.controllers;
-
-import android.annotation.SuppressLint;
-import android.content.Context;
-import android.database.Cursor;
-import android.media.MediaPlayer;
-import android.media.RingtoneManager;
-import android.net.Uri;
-import android.os.Bundle;
-import android.os.Handler;
-import android.text.TextUtils;
-import android.util.Log;
-import android.view.LayoutInflater;
-import android.view.MenuItem;
-import android.view.View;
-import android.view.ViewGroup;
-import androidx.annotation.NonNull;
-import androidx.recyclerview.widget.RecyclerView;
-import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
-import autodagger.AutoInjector;
-import butterknife.BindView;
-import com.bluelinelabs.logansquare.LoganSquare;
-import com.nextcloud.talk.R;
-import com.nextcloud.talk.adapters.items.NotificationSoundItem;
-import com.nextcloud.talk.application.NextcloudTalkApplication;
-import com.nextcloud.talk.controllers.base.BaseController;
-import com.nextcloud.talk.models.RingtoneSettings;
-import com.nextcloud.talk.utils.NotificationUtils;
-import com.nextcloud.talk.utils.bundle.BundleKeys;
-import com.nextcloud.talk.utils.preferences.AppPreferences;
-import eu.davidea.flexibleadapter.FlexibleAdapter;
-import eu.davidea.flexibleadapter.SelectableAdapter;
-import eu.davidea.flexibleadapter.common.SmoothScrollLinearLayoutManager;
-import eu.davidea.flexibleadapter.items.AbstractFlexibleItem;
-
-import javax.inject.Inject;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-
-@AutoInjector(NextcloudTalkApplication.class)
-public class RingtoneSelectionController extends BaseController implements FlexibleAdapter.OnItemClickListener {
-
-    private static final String TAG = "RingtoneSelectionController";
-
-    @BindView(R.id.recycler_view)
-    RecyclerView recyclerView;
-
-    @BindView(R.id.swipe_refresh_layout)
-    SwipeRefreshLayout swipeRefreshLayout;
-
-    @Inject
-    AppPreferences appPreferences;
-
-    @Inject
-    Context context;
-
-    private FlexibleAdapter adapter;
-    private RecyclerView.AdapterDataObserver adapterDataObserver;
-    private List<AbstractFlexibleItem> abstractFlexibleItemList = new ArrayList<>();
-
-    private boolean callNotificationSounds;
-    private MediaPlayer mediaPlayer;
-    private Handler cancelMediaPlayerHandler;
-
-    public RingtoneSelectionController(Bundle args) {
-        super(args);
-        setHasOptionsMenu(true);
-        this.callNotificationSounds = args.getBoolean(BundleKeys.INSTANCE.getKEY_ARE_CALL_SOUNDS(), false);
-    }
-
-    @Override
-    protected View inflateView(@NonNull LayoutInflater inflater, @NonNull ViewGroup container) {
-        return inflater.inflate(R.layout.controller_generic_rv, container, false);
-    }
-
-    @Override
-    protected void onViewBound(@NonNull View view) {
-        super.onViewBound(view);
-        NextcloudTalkApplication.Companion.getSharedApplication().getComponentApplication().inject(this);
-
-        if (adapter == null) {
-            adapter = new FlexibleAdapter<>(abstractFlexibleItemList, getActivity(), false);
-
-            adapter.setNotifyChangeOfUnfilteredItems(true)
-                    .setMode(SelectableAdapter.Mode.SINGLE);
-
-            adapter.addListener(this);
-
-            cancelMediaPlayerHandler = new Handler();
-        }
-
-        adapter.addListener(this);
-        prepareViews();
-        fetchNotificationSounds();
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(@NonNull MenuItem item) {
-        if (item.getItemId() == android.R.id.home) {
-            return getRouter().popCurrentController();
-        }
-        return super.onOptionsItemSelected(item);
-    }
-
-    private void prepareViews() {
-        RecyclerView.LayoutManager layoutManager = new SmoothScrollLinearLayoutManager(getActivity());
-        recyclerView.setLayoutManager(layoutManager);
-        recyclerView.setHasFixedSize(true);
-        recyclerView.setAdapter(adapter);
-
-        adapterDataObserver = new RecyclerView.AdapterDataObserver() {
-            @Override
-            public void onChanged() {
-                super.onChanged();
-                findSelectedSound();
-            }
-        };
-
-        adapter.registerAdapterDataObserver(adapterDataObserver);
-        swipeRefreshLayout.setEnabled(false);
-    }
-
-    @SuppressLint("LongLogTag")
-    private void findSelectedSound() {
-        boolean foundDefault = false;
-
-        String preferencesString = null;
-        if ((callNotificationSounds && TextUtils.isEmpty((preferencesString = appPreferences.getCallRingtoneUri())))
-                || (!callNotificationSounds && TextUtils.isEmpty((preferencesString = appPreferences
-                .getMessageRingtoneUri())))) {
-            adapter.toggleSelection(1);
-            foundDefault = true;
-        }
-
-        if (!TextUtils.isEmpty(preferencesString) && !foundDefault) {
-            try {
-                RingtoneSettings ringtoneSettings = LoganSquare.parse(preferencesString, RingtoneSettings.class);
-                if (ringtoneSettings.getRingtoneUri() == null) {
-                    adapter.toggleSelection(0);
-                } else if (ringtoneSettings.getRingtoneUri().toString().equals(getRingtoneString())) {
-                    adapter.toggleSelection(1);
-                } else {
-                    NotificationSoundItem notificationSoundItem;
-                    for (int i = 2; i < adapter.getItemCount(); i++) {
-                        notificationSoundItem = (NotificationSoundItem) adapter.getItem(i);
-                        if (notificationSoundItem.getNotificationSoundUri().equals(ringtoneSettings.getRingtoneUri().toString())) {
-                            adapter.toggleSelection(i);
-                            break;
-                        }
-                    }
-                }
-            } catch (IOException e) {
-                Log.e(TAG, "Failed to parse ringtone settings");
-            }
-        }
-
-        adapter.unregisterAdapterDataObserver(adapterDataObserver);
-        adapterDataObserver = null;
-    }
-
-    private String getRingtoneString() {
-        if (callNotificationSounds) {
-            return NotificationUtils.DEFAULT_CALL_RINGTONE_URI;
-        } else {
-            return NotificationUtils.DEFAULT_MESSAGE_RINGTONE_URI;
-        }
-    }
-
-    private void fetchNotificationSounds() {
-        abstractFlexibleItemList.add(new NotificationSoundItem(getResources().getString(R.string.nc_settings_no_ringtone), null));
-        abstractFlexibleItemList.add(new NotificationSoundItem(getResources()
-                .getString(R.string.nc_settings_default_ringtone), getRingtoneString()));
-
-
-        if (getActivity() != null) {
-            RingtoneManager manager = new RingtoneManager(getActivity());
-
-            if (callNotificationSounds) {
-                manager.setType(RingtoneManager.TYPE_RINGTONE);
-            } else {
-                manager.setType(RingtoneManager.TYPE_NOTIFICATION);
-            }
-
-            Cursor cursor = manager.getCursor();
-
-            NotificationSoundItem notificationSoundItem;
-
-            while (cursor.moveToNext()) {
-                String notificationTitle = cursor.getString(RingtoneManager.TITLE_COLUMN_INDEX);
-                String notificationUri = cursor.getString(RingtoneManager.URI_COLUMN_INDEX);
-                String completeNotificationUri = notificationUri + "/" + cursor.getString(RingtoneManager
-                        .ID_COLUMN_INDEX);
-
-                notificationSoundItem = new NotificationSoundItem(notificationTitle, completeNotificationUri);
-
-                abstractFlexibleItemList.add(notificationSoundItem);
-            }
-        }
-
-        adapter.updateDataSet(abstractFlexibleItemList, false);
-    }
-
-    @Override
-    protected String getTitle() {
-        return getResources().getString(R.string.nc_settings_notification_sounds);
-    }
-
-    @SuppressLint("LongLogTag")
-    @Override
-    public boolean onItemClick(View view, int position) {
-        NotificationSoundItem notificationSoundItem = (NotificationSoundItem) adapter.getItem(position);
-
-        Uri ringtoneUri = null;
-
-        if (!TextUtils.isEmpty(notificationSoundItem.getNotificationSoundUri())) {
-            ringtoneUri = Uri.parse(notificationSoundItem.getNotificationSoundUri());
-
-            endMediaPlayer();
-            mediaPlayer = MediaPlayer.create(getActivity(), ringtoneUri);
-
-            cancelMediaPlayerHandler = new Handler();
-            cancelMediaPlayerHandler.postDelayed(new Runnable() {
-                @Override
-                public void run() {
-                    endMediaPlayer();
-                }
-            }, mediaPlayer.getDuration() + 25);
-            mediaPlayer.start();
-        }
-
-        if (adapter.getSelectedPositions().size() == 0 || adapter.getSelectedPositions().get(0) != position) {
-            RingtoneSettings ringtoneSettings = new RingtoneSettings();
-            ringtoneSettings.setRingtoneName(notificationSoundItem.getNotificationSoundName());
-            ringtoneSettings.setRingtoneUri(ringtoneUri);
-
-            if (callNotificationSounds) {
-                try {
-                    appPreferences.setCallRingtoneUri(LoganSquare.serialize(ringtoneSettings));
-                    adapter.toggleSelection(position);
-                    adapter.notifyDataSetChanged();
-                } catch (IOException e) {
-                    Log.e(TAG, "Failed to store selected ringtone for calls");
-                }
-            } else {
-                try {
-                    appPreferences.setMessageRingtoneUri(LoganSquare.serialize(ringtoneSettings));
-                    adapter.toggleSelection(position);
-                    adapter.notifyDataSetChanged();
-                } catch (IOException e) {
-                    Log.e(TAG, "Failed to store selected ringtone for calls");
-                }
-            }
-        }
-
-        return true;
-    }
-
-    private void endMediaPlayer() {
-        if (cancelMediaPlayerHandler != null) {
-            cancelMediaPlayerHandler.removeCallbacksAndMessages(null);
-        }
-
-        if (mediaPlayer != null) {
-            if (mediaPlayer.isPlaying()) {
-                mediaPlayer.stop();
-            }
-
-            mediaPlayer.release();
-            mediaPlayer = null;
-        }
-    }
-
-    @Override
-    public void onDestroy() {
-        endMediaPlayer();
-        super.onDestroy();
-    }
-
-}

app/src/main/java/com/nextcloud/talk/controllers/RingtoneSelectionController.kt

@@ -0,0 +1,253 @@
+/*
+ * Nextcloud Talk application
+ *
+ * @author Mario Danic
+ * @author Andy Scherzinger
+ * Copyright (C) 2022 Andy Scherzinger <info@andy-scherzinger.de>
+ * Copyright (C) 2017-2018 Mario Danic <mario@lovelyhq.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.nextcloud.talk.controllers
+
+import android.annotation.SuppressLint
+import android.media.MediaPlayer
+import android.media.RingtoneManager
+import android.net.Uri
+import android.os.Bundle
+import android.os.Handler
+import android.text.TextUtils
+import android.util.Log
+import android.view.MenuItem
+import android.view.View
+import androidx.recyclerview.widget.RecyclerView
+import autodagger.AutoInjector
+import com.bluelinelabs.logansquare.LoganSquare
+import com.nextcloud.talk.R
+import com.nextcloud.talk.adapters.items.NotificationSoundItem
+import com.nextcloud.talk.application.NextcloudTalkApplication
+import com.nextcloud.talk.application.NextcloudTalkApplication.Companion.sharedApplication
+import com.nextcloud.talk.controllers.base.NewBaseController
+import com.nextcloud.talk.controllers.util.viewBinding
+import com.nextcloud.talk.databinding.ControllerGenericRvBinding
+import com.nextcloud.talk.models.RingtoneSettings
+import com.nextcloud.talk.utils.NotificationUtils
+import com.nextcloud.talk.utils.bundle.BundleKeys.KEY_ARE_CALL_SOUNDS
+import eu.davidea.flexibleadapter.FlexibleAdapter
+import eu.davidea.flexibleadapter.SelectableAdapter
+import eu.davidea.flexibleadapter.common.SmoothScrollLinearLayoutManager
+import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
+import java.io.IOException
+import java.util.ArrayList
+
+@AutoInjector(NextcloudTalkApplication::class)
+class RingtoneSelectionController(args: Bundle) :
+    NewBaseController(
+        R.layout.controller_generic_rv,
+        args
+    ), FlexibleAdapter.OnItemClickListener {
+    private val binding: ControllerGenericRvBinding by viewBinding(ControllerGenericRvBinding::bind)
+
+    private var adapter: FlexibleAdapter<*>? = null
+    private var adapterDataObserver: RecyclerView.AdapterDataObserver? = null
+    private val abstractFlexibleItemList: MutableList<AbstractFlexibleItem<*>> = ArrayList()
+    private val callNotificationSounds: Boolean
+    private var mediaPlayer: MediaPlayer? = null
+    private var cancelMediaPlayerHandler: Handler? = null
+
+    override fun onViewBound(view: View) {
+        super.onViewBound(view)
+        if (adapter == null) {
+            adapter = FlexibleAdapter(abstractFlexibleItemList, activity, false)
+            adapter!!.setNotifyChangeOfUnfilteredItems(true).mode = SelectableAdapter.Mode.SINGLE
+            adapter!!.addListener(this)
+            cancelMediaPlayerHandler = Handler()
+        }
+        adapter!!.addListener(this)
+        prepareViews()
+        fetchNotificationSounds()
+    }
+
+    override fun onOptionsItemSelected(item: MenuItem): Boolean {
+        return if (item.itemId == android.R.id.home) {
+            router.popCurrentController()
+        } else {
+            super.onOptionsItemSelected(item)
+        }
+    }
+
+    private fun prepareViews() {
+        val layoutManager: RecyclerView.LayoutManager = SmoothScrollLinearLayoutManager(activity)
+        binding.recyclerView.layoutManager = layoutManager
+        binding.recyclerView.setHasFixedSize(true)
+        binding.recyclerView.adapter = adapter
+        adapterDataObserver = object : RecyclerView.AdapterDataObserver() {
+            override fun onChanged() {
+                super.onChanged()
+                findSelectedSound()
+            }
+        }
+        adapter!!.registerAdapterDataObserver(adapterDataObserver!!)
+        binding.swipeRefreshLayout.isEnabled = false
+    }
+
+    @SuppressLint("LongLogTag")
+    private fun findSelectedSound() {
+        var foundDefault = false
+        var preferencesString: String? = null
+        if (callNotificationSounds &&
+            TextUtils.isEmpty(appPreferences!!.callRingtoneUri.also { preferencesString = it }) ||
+            !callNotificationSounds && TextUtils.isEmpty(
+                appPreferences!!.messageRingtoneUri.also { preferencesString = it }
+            )
+        ) {
+            adapter!!.toggleSelection(1)
+            foundDefault = true
+        }
+        if (!TextUtils.isEmpty(preferencesString) && !foundDefault) {
+            try {
+                val ringtoneSettings: RingtoneSettings =
+                    LoganSquare.parse<RingtoneSettings>(preferencesString, RingtoneSettings::class.java)
+                if (ringtoneSettings.getRingtoneUri() == null) {
+                    adapter!!.toggleSelection(0)
+                } else if (ringtoneSettings.getRingtoneUri().toString() == ringtoneString) {
+                    adapter!!.toggleSelection(1)
+                } else {
+                    var notificationSoundItem: NotificationSoundItem?
+                    for (i in 2 until adapter!!.itemCount) {
+                        notificationSoundItem = adapter!!.getItem(i) as NotificationSoundItem?
+                        if (notificationSoundItem!!.notificationSoundUri == ringtoneSettings.getRingtoneUri()
+                                .toString()
+                        ) {
+                            adapter!!.toggleSelection(i)
+                            break
+                        }
+                    }
+                }
+            } catch (e: IOException) {
+                Log.e(TAG, "Failed to parse ringtone settings")
+            }
+        }
+        adapter!!.unregisterAdapterDataObserver(adapterDataObserver!!)
+        adapterDataObserver = null
+    }
+
+    private val ringtoneString: String
+        get() = if (callNotificationSounds) {
+            NotificationUtils.DEFAULT_CALL_RINGTONE_URI
+        } else {
+            NotificationUtils.DEFAULT_MESSAGE_RINGTONE_URI
+        }
+
+    private fun fetchNotificationSounds() {
+        abstractFlexibleItemList.add(
+            NotificationSoundItem(
+                resources!!.getString(R.string.nc_settings_no_ringtone),
+                null
+            )
+        )
+        abstractFlexibleItemList.add(
+            NotificationSoundItem(
+                resources!!.getString(R.string.nc_settings_default_ringtone),
+                ringtoneString
+            )
+        )
+        if (activity != null) {
+            val manager = RingtoneManager(activity)
+            if (callNotificationSounds) {
+                manager.setType(RingtoneManager.TYPE_RINGTONE)
+            } else {
+                manager.setType(RingtoneManager.TYPE_NOTIFICATION)
+            }
+            val cursor = manager.cursor
+            var notificationSoundItem: NotificationSoundItem
+            while (cursor.moveToNext()) {
+                val notificationTitle = cursor.getString(RingtoneManager.TITLE_COLUMN_INDEX)
+                val notificationUri = cursor.getString(RingtoneManager.URI_COLUMN_INDEX)
+                val completeNotificationUri = notificationUri + "/" + cursor.getString(RingtoneManager.ID_COLUMN_INDEX)
+                notificationSoundItem = NotificationSoundItem(notificationTitle, completeNotificationUri)
+                abstractFlexibleItemList.add(notificationSoundItem)
+            }
+        }
+        adapter!!.updateDataSet(abstractFlexibleItemList as List<Nothing>?, false)
+    }
+
+    override fun onItemClick(view: View, position: Int): Boolean {
+        val notificationSoundItem = adapter!!.getItem(position) as NotificationSoundItem?
+        var ringtoneUri: Uri? = null
+        if (!TextUtils.isEmpty(notificationSoundItem!!.notificationSoundUri)) {
+            ringtoneUri = Uri.parse(notificationSoundItem.notificationSoundUri)
+            endMediaPlayer()
+            mediaPlayer = MediaPlayer.create(activity, ringtoneUri)
+            cancelMediaPlayerHandler = Handler()
+            cancelMediaPlayerHandler!!.postDelayed({ endMediaPlayer() }, (mediaPlayer!!.getDuration() + 25).toLong())
+            mediaPlayer!!.start()
+        }
+        if (adapter!!.selectedPositions.size == 0 || adapter!!.selectedPositions[0] != position) {
+            val ringtoneSettings = RingtoneSettings()
+            ringtoneSettings.setRingtoneName(notificationSoundItem.notificationSoundName)
+            ringtoneSettings.setRingtoneUri(ringtoneUri)
+            if (callNotificationSounds) {
+                try {
+                    appPreferences!!.callRingtoneUri = LoganSquare.serialize(ringtoneSettings)
+                    adapter!!.toggleSelection(position)
+                    adapter!!.notifyDataSetChanged()
+                } catch (e: IOException) {
+                    Log.e(TAG, "Failed to store selected ringtone for calls")
+                }
+            } else {
+                try {
+                    appPreferences!!.messageRingtoneUri = LoganSquare.serialize(ringtoneSettings)
+                    adapter!!.toggleSelection(position)
+                    adapter!!.notifyDataSetChanged()
+                } catch (e: IOException) {
+                    Log.e(TAG, "Failed to store selected ringtone for calls")
+                }
+            }
+        }
+        return true
+    }
+
+    private fun endMediaPlayer() {
+        if (cancelMediaPlayerHandler != null) {
+            cancelMediaPlayerHandler!!.removeCallbacksAndMessages(null)
+        }
+        if (mediaPlayer != null) {
+            if (mediaPlayer!!.isPlaying) {
+                mediaPlayer!!.stop()
+            }
+            mediaPlayer!!.release()
+            mediaPlayer = null
+        }
+    }
+
+    public override fun onDestroy() {
+        endMediaPlayer()
+        super.onDestroy()
+    }
+
+    companion object {
+        private const val TAG = "RingtoneSelection"
+    }
+
+    init {
+        setHasOptionsMenu(true)
+        sharedApplication!!.componentApplication.inject(this)
+        callNotificationSounds = args.getBoolean(KEY_ARE_CALL_SOUNDS, false)
+    }
+
+    override val title: String
+        get() =
+            resources!!.getString(R.string.nc_settings_notification_sounds)
+}