gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-06-19 19:49:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

Cleanups

Browse Source 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
This commit is contained in:
Mario Danic 2018-06-13 22:47:15 +02:00
parent e3464b65b1
commit 1b728a7c4d
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/com/nextcloud/talk/controllers/CallNotificationController.java
View File

@ -88,7 +88,7 @@ public class CallNotificationController extends BaseController {
@BindView(R.id.avatarImageView) @BindView(R.id.avatarImageView)
ImageView avatarImageView; ImageView avatarImageView;
List<Disposable> disposablesList = new ArrayList<>(); private List<Disposable> disposablesList = new ArrayList<>();
private Bundle originalBundle; private Bundle originalBundle;
private String roomId; private String roomId;
private UserEntity userBeingCalled; private UserEntity userBeingCalled;

4
app/src/main/java/com/nextcloud/talk/controllers/RingtoneSelectionController.java
View File

@ -162,10 +162,13 @@ public class RingtoneSelectionController extends BaseController implements Flexi
abstractFlexibleItemList.add(new NotificationSoundItem(getResources() abstractFlexibleItemList.add(new NotificationSoundItem(getResources()
.getString(R.string.nc_settings_default_ringtone), ringtoneString)); .getString(R.string.nc_settings_default_ringtone), ringtoneString));
boolean foundDefault = false;
String preferencesString = null; String preferencesString = null;
if ((TextUtils.isEmpty((preferencesString = appPreferences.getCallRingtoneUri()))) if ((TextUtils.isEmpty((preferencesString = appPreferences.getCallRingtoneUri())))
|| TextUtils.isEmpty((preferencesString = appPreferences.getMessageRingtoneUri()))) { || TextUtils.isEmpty((preferencesString = appPreferences.getMessageRingtoneUri()))) {
((NotificationSoundItem) abstractFlexibleItemList.get(1)).setSelected(true); ((NotificationSoundItem) abstractFlexibleItemList.get(1)).setSelected(true);
foundDefault = true;
} }
if (getActivity() != null) { if (getActivity() != null) {
@ -181,7 +184,6 @@ public class RingtoneSelectionController extends BaseController implements Flexi
NotificationSoundItem notificationSoundItem; NotificationSoundItem notificationSoundItem;
boolean foundDefault = false;
while (cursor.moveToNext()) { while (cursor.moveToNext()) {
String notificationTitle = cursor.getString(RingtoneManager.TITLE_COLUMN_INDEX); String notificationTitle = cursor.getString(RingtoneManager.TITLE_COLUMN_INDEX);
String notificationUri = cursor.getString(RingtoneManager.URI_COLUMN_INDEX); String notificationUri = cursor.getString(RingtoneManager.URI_COLUMN_INDEX);