From b573caa53594995e5587d62e1f4d999452e23a41 Mon Sep 17 00:00:00 2001 From: Scott Jackson Date: Mon, 9 Jun 2014 06:21:04 -0700 Subject: #171 Add more stubs to Admin tab --- res/menu/admin_context.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 res/menu/admin_context.xml (limited to 'res/menu/admin_context.xml') diff --git a/res/menu/admin_context.xml b/res/menu/admin_context.xml new file mode 100644 index 00000000..e4948acd --- /dev/null +++ b/res/menu/admin_context.xml @@ -0,0 +1,16 @@ + + + + + + + + + -- cgit v1.2.3 From de81b9b43c92a6a8a1403c4547dc44dd17b9792e Mon Sep 17 00:00:00 2001 From: Scott Jackson Date: Mon, 9 Jun 2014 22:20:22 -0700 Subject: #171 Add a full UserFragment to view/edit settings --- res/menu/admin_context.xml | 4 - res/menu/user.xml | 14 +++ res/values/strings.xml | 2 + src/github/daneren2005/dsub/domain/User.java | 126 ++++----------------- .../daneren2005/dsub/fragments/AdminFragment.java | 2 - .../daneren2005/dsub/fragments/UserFragment.java | 57 +++++++++- .../dsub/service/CachedMusicService.java | 4 + .../daneren2005/dsub/service/RESTMusicService.java | 17 ++- .../dsub/service/parser/UserParser.java | 28 +++-- src/github/daneren2005/dsub/view/SettingView.java | 68 +++++++++++ .../daneren2005/dsub/view/SettingsAdapter.java | 51 +++++++++ 11 files changed, 250 insertions(+), 123 deletions(-) create mode 100644 res/menu/user.xml create mode 100644 src/github/daneren2005/dsub/view/SettingView.java create mode 100644 src/github/daneren2005/dsub/view/SettingsAdapter.java (limited to 'res/menu/admin_context.xml') diff --git a/res/menu/admin_context.xml b/res/menu/admin_context.xml index e4948acd..8cd04859 100644 --- a/res/menu/admin_context.xml +++ b/res/menu/admin_context.xml @@ -2,10 +2,6 @@ - - diff --git a/res/menu/user.xml b/res/menu/user.xml new file mode 100644 index 00000000..ace011b1 --- /dev/null +++ b/res/menu/user.xml @@ -0,0 +1,14 @@ + + + + + + + \ No newline at end of file diff --git a/res/values/strings.xml b/res/values/strings.xml index add99c11..460e46db 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -448,6 +448,8 @@ Delete Share Update Permissions + Successfully updated permission for %1$s + Failed to update permissions for %1$s Change Password Successfully changed password for %1$s Failed to change password for %1$s diff --git a/src/github/daneren2005/dsub/domain/User.java b/src/github/daneren2005/dsub/domain/User.java index 63ead042..d970366c 100644 --- a/src/github/daneren2005/dsub/domain/User.java +++ b/src/github/daneren2005/dsub/domain/User.java @@ -16,24 +16,15 @@ package github.daneren2005.dsub.domain; import java.io.Serializable; +import java.util.ArrayList; +import java.util.List; public class User implements Serializable { private String username; private String password; private String email; - private Boolean scrobblingEnabled; - - private Boolean adminRole; - private Boolean settingsRole; - private Boolean downloadRole; - private Boolean uploadRole; - private Boolean playlistRole; - private Boolean coverArtRole; - private Boolean commentRole; - private Boolean podcastRole; - private Boolean streamRole; - private Boolean jukeboxRole; - private Boolean shareRole; + + private List settings = new ArrayList(); public User() { @@ -63,99 +54,30 @@ public class User implements Serializable { this.email = email; } - public Boolean getScrobblingEnabled() { - return scrobblingEnabled; - } - - public void setScrobblingEnabled(Boolean scrobblingEnabled) { - this.scrobblingEnabled = scrobblingEnabled; - } - - public Boolean getAdminRole() { - return adminRole; - } - - public void setAdminRole(Boolean adminRole) { - this.adminRole = adminRole; - } - - public Boolean getSettingsRole() { - return settingsRole; - } - - public void setSettingsRole(Boolean settingsRole) { - this.settingsRole = settingsRole; - } - - public Boolean getDownloadRole() { - return downloadRole; - } - - public void setDownloadRole(Boolean downloadRole) { - this.downloadRole = downloadRole; - } - - public Boolean getUploadRole() { - return uploadRole; - } - - public void setUploadRole(Boolean uploadRole) { - this.uploadRole = uploadRole; - } - - public Boolean getPlaylistRole() { - return playlistRole; + public List getSettings() { + return settings; } - - public void setPlaylistRole(Boolean playlistRole) { - this.playlistRole = playlistRole; - } - - public Boolean getCoverArtRole() { - return coverArtRole; + public void addSetting(String name, Boolean value) { + settings.add(new Setting(name, value)); } - public void setCoverArtRole(Boolean coverArtRole) { - this.coverArtRole = coverArtRole; - } - - public Boolean getCommentRole() { - return commentRole; - } + public static class Setting implements Serializable { + String name; + Boolean value; - public void setCommentRole(Boolean commentRole) { - this.commentRole = commentRole; - } - - public Boolean getPodcastRole() { - return podcastRole; - } - - public void setPodcastRole(Boolean podcastRole) { - this.podcastRole = podcastRole; - } - - public Boolean getStreamRole() { - return streamRole; - } - - public void setStreamRole(Boolean streamRole) { - this.streamRole = streamRole; - } - - public Boolean getJukeboxRole() { - return jukeboxRole; - } - - public void setJukeboxRole(Boolean jukeboxRole) { - this.jukeboxRole = jukeboxRole; - } - - public Boolean getShareRole() { - return shareRole; - } + public Setting(String name, Boolean value) { + this.name = name; + this.value = value; + } - public void setShareRole(Boolean shareRole) { - this.shareRole = shareRole; + public String getName() { + return name; + } + public Boolean getValue() { + return value; + } + public void setValue(Boolean value) { + this.value = value; + } } } diff --git a/src/github/daneren2005/dsub/fragments/AdminFragment.java b/src/github/daneren2005/dsub/fragments/AdminFragment.java index f6e8e153..faa7529a 100644 --- a/src/github/daneren2005/dsub/fragments/AdminFragment.java +++ b/src/github/daneren2005/dsub/fragments/AdminFragment.java @@ -61,8 +61,6 @@ public class AdminFragment extends SelectListFragment { User user = objects.get(info.position); switch(menuItem.getItemId()) { - case R.id.admin_update_permissions: - break; case R.id.admin_change_password: changePassword(user); break; diff --git a/src/github/daneren2005/dsub/fragments/UserFragment.java b/src/github/daneren2005/dsub/fragments/UserFragment.java index 3a85c6bb..1f4d4592 100644 --- a/src/github/daneren2005/dsub/fragments/UserFragment.java +++ b/src/github/daneren2005/dsub/fragments/UserFragment.java @@ -16,6 +16,7 @@ package github.daneren2005.dsub.fragments; import android.os.Bundle; +import android.support.v4.widget.SwipeRefreshLayout; import android.view.LayoutInflater; import android.view.Menu; import android.view.MenuInflater; @@ -26,7 +27,14 @@ import android.widget.ListView; import github.daneren2005.dsub.R; import github.daneren2005.dsub.domain.User; +import github.daneren2005.dsub.service.MusicService; +import github.daneren2005.dsub.service.MusicServiceFactory; +import github.daneren2005.dsub.service.OfflineException; +import github.daneren2005.dsub.service.ServerTooOldException; import github.daneren2005.dsub.util.Constants; +import github.daneren2005.dsub.util.SilentBackgroundTask; +import github.daneren2005.dsub.util.Util; +import github.daneren2005.dsub.view.SettingsAdapter; public class UserFragment extends SubsonicFragment{ private ListView listView; @@ -38,8 +46,15 @@ public class UserFragment extends SubsonicFragment{ this.inflater = inflater; rootView = inflater.inflate(R.layout.abstract_list_fragment, container, false); + refreshLayout = (SwipeRefreshLayout) rootView.findViewById(R.id.refresh_layout); + refreshLayout.setEnabled(false); + Bundle args = getArguments(); user = (User) args.getSerializable(Constants.INTENT_EXTRA_NAME_ID); + + listView = (ListView)rootView.findViewById(R.id.fragment_list); + listView.setAdapter(new SettingsAdapter(context, user.getSettings(), true)); + setTitle(user.getUsername()); return rootView; @@ -51,11 +66,49 @@ public class UserFragment extends SubsonicFragment{ return; } - menuInflater.inflate(R.menu.empty, menu); + menuInflater.inflate(R.menu.user, menu); } @Override public boolean onOptionsItemSelected(MenuItem item) { - return super.onOptionsItemSelected(item); + if(super.onOptionsItemSelected(item)) { + return true; + } + + switch (item.getItemId()) { + case R.id.menu_update_permissions: + updateSettings(); + return true; + } + + return false; + } + + private void updateSettings() { + new SilentBackgroundTask(context) { + @Override + protected Void doInBackground() throws Throwable { + MusicService musicService = MusicServiceFactory.getMusicService(context); + musicService.updateUser(user, context, null); + return null; + } + + @Override + protected void done(Void v) { + Util.toast(context, context.getResources().getString(R.string.admin_update_permissions_success, user.getUsername())); + } + + @Override + protected void error(Throwable error) { + String msg; + if (error instanceof OfflineException || error instanceof ServerTooOldException) { + msg = getErrorMessage(error); + } else { + msg = context.getResources().getString(R.string.admin_update_permissions_error, user.getUsername()); + } + + Util.toast(context, msg); + } + }.execute(); } } diff --git a/src/github/daneren2005/dsub/service/CachedMusicService.java b/src/github/daneren2005/dsub/service/CachedMusicService.java index 1f1715c4..86289511 100644 --- a/src/github/daneren2005/dsub/service/CachedMusicService.java +++ b/src/github/daneren2005/dsub/service/CachedMusicService.java @@ -547,6 +547,10 @@ public class CachedMusicService implements MusicService { @Override public void updateUser(User user, Context context, ProgressListener progressListener) throws Exception { musicService.updateUser(user, context, progressListener); + + // Delete cached users if anything updated + File file = new File(context.getCacheDir(), getCacheName(context, "users")); + file.delete(); } @Override diff --git a/src/github/daneren2005/dsub/service/RESTMusicService.java b/src/github/daneren2005/dsub/service/RESTMusicService.java index 20328d54..c2f64dad 100644 --- a/src/github/daneren2005/dsub/service/RESTMusicService.java +++ b/src/github/daneren2005/dsub/service/RESTMusicService.java @@ -1230,7 +1230,22 @@ public class RESTMusicService implements MusicService { @Override public void updateUser(User user, Context context, ProgressListener progressListener) throws Exception { - Reader reader = getReader(context, progressListener, "createUser", null); + checkServerVersion(context, "1.10", "Updating user is not supported"); + + List names = new ArrayList(); + List values = new ArrayList(); + + names.add("username"); + values.add(user.getUsername()); + + for(User.Setting setting: user.getSettings()) { + if(setting.getName().indexOf("Role") != -1) { + names.add(setting.getName()); + values.add(setting.getValue()); + } + } + + Reader reader = getReader(context, progressListener, "updateUser", null, names, values); try { new ErrorParser(context).parse(reader); } finally { diff --git a/src/github/daneren2005/dsub/service/parser/UserParser.java b/src/github/daneren2005/dsub/service/parser/UserParser.java index a66e0b63..5b2f8fc1 100644 --- a/src/github/daneren2005/dsub/service/parser/UserParser.java +++ b/src/github/daneren2005/dsub/service/parser/UserParser.java @@ -46,18 +46,18 @@ public class UserParser extends AbstractParser { user.setUsername(get("username")); user.setEmail(get("email")); - user.setScrobblingEnabled(getBoolean("scrobblingEnabled")); - user.setAdminRole(getBoolean("adminRole")); - user.setSettingsRole(getBoolean("settingsRole")); - user.setDownloadRole(getBoolean("downloadRole")); - user.setUploadRole(getBoolean("uploadRole")); - user.setPlaylistRole(getBoolean("playlistRole")); - user.setCoverArtRole(getBoolean("coverArtRole")); - user.setCommentRole(getBoolean("commentRole")); - user.setPodcastRole(getBoolean("podcastRole")); - user.setStreamRole(getBoolean("streamRole")); - user.setJukeboxRole(getBoolean("jukeboxRole")); - user.setShareRole(getBoolean("shareRole")); + parseSetting(user, "scrobblingEnabled"); + parseSetting(user, "adminRole"); + parseSetting(user, "settingsRole"); + parseSetting(user, "downloadRole"); + parseSetting(user, "uploadRole"); + // Depreciated: parseSetting(user, "playlistRole"); + parseSetting(user, "coverArtRole"); + parseSetting(user, "commentRole"); + parseSetting(user, "podcastRole"); + parseSetting(user, "streamRole"); + parseSetting(user, "jukeboxRole"); + parseSetting(user, "shareRole"); result.add(user); } else if ("error".equals(name)) { @@ -70,4 +70,8 @@ public class UserParser extends AbstractParser { return result; } + + private void parseSetting(User user, String name) { + user.addSetting(name, getBoolean(name)); + } } \ No newline at end of file diff --git a/src/github/daneren2005/dsub/view/SettingView.java b/src/github/daneren2005/dsub/view/SettingView.java new file mode 100644 index 00000000..f2669551 --- /dev/null +++ b/src/github/daneren2005/dsub/view/SettingView.java @@ -0,0 +1,68 @@ +/* + This file is part of Subsonic. + Subsonic 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. + Subsonic 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 Subsonic. If not, see . + Copyright 2014 (C) Scott Jackson +*/ + +package github.daneren2005.dsub.view; + +import android.content.Context; +import android.view.LayoutInflater; +import android.view.View; +import android.widget.CheckedTextView; + +import static github.daneren2005.dsub.domain.User.Setting; + +public class SettingView extends UpdateView { + Setting setting; + + CheckedTextView view; + + public SettingView(Context context) { + super(context); + this.context = context; + LayoutInflater.from(context).inflate(android.R.layout.simple_list_item_multiple_choice, this, true); + + view = (CheckedTextView) findViewById(android.R.id.text1); + } + + protected void setObjectImpl(Object obj, Object editable) { + this.setting = (Setting) obj; + + String display = setting.getName(); + // Can't edit non-role parts + if(display.indexOf("Role") == -1) { + editable = false; + } + display = display.replace("Role", ""); + display = Character.toUpperCase(display.charAt(0)) + display.substring(1); + + view.setText(display); + if(setting.getValue()) { + view.setChecked(setting.getValue()); + } else { + view.setChecked(false); + } + + if((Boolean) editable) { + view.setOnClickListener(new OnClickListener() { + @Override + public void onClick(View v) { + view.toggle(); + setting.setValue(view.isChecked()); + } + }); + } else { + view.setOnClickListener(null); + } + } +} diff --git a/src/github/daneren2005/dsub/view/SettingsAdapter.java b/src/github/daneren2005/dsub/view/SettingsAdapter.java new file mode 100644 index 00000000..88019c00 --- /dev/null +++ b/src/github/daneren2005/dsub/view/SettingsAdapter.java @@ -0,0 +1,51 @@ +/* + This file is part of Subsonic. + Subsonic 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. + Subsonic 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 Subsonic. If not, see . + Copyright 2014 (C) Scott Jackson +*/ + +package github.daneren2005.dsub.view; + +import android.content.Context; +import android.view.View; +import android.view.ViewGroup; +import android.widget.ArrayAdapter; + +import java.util.List; + +import github.daneren2005.dsub.R; + +import static github.daneren2005.dsub.domain.User.Setting; + +public class SettingsAdapter extends ArrayAdapter { + private final Context context; + private final boolean editable; + + public SettingsAdapter(Context context, List settings, boolean editable) { + super(context, R.layout.basic_list_item, settings); + this.context = context; + this.editable = editable; + } + + @Override + public View getView(int position, View convertView, ViewGroup parent) { + Setting entry = getItem(position); + SettingView view; + if (convertView != null && convertView instanceof SettingView) { + view = (SettingView) convertView; + } else { + view = new SettingView(context); + } + view.setObject(entry, editable); + return view; + } +} -- cgit v1.2.3 From 2b079541a39f08be590cb2b37e2d401edcb4f13e Mon Sep 17 00:00:00 2001 From: Scott Jackson Date: Tue, 10 Jun 2014 20:17:37 -0700 Subject: #171 Add ability to change email, email/password to UserFragment --- res/drawable-hdpi/ic_menu_password_dark.png | Bin 0 -> 843 bytes res/drawable-hdpi/ic_menu_password_light.png | Bin 0 -> 958 bytes res/drawable-mdpi/ic_menu_password_dark.png | Bin 0 -> 554 bytes res/drawable-mdpi/ic_menu_password_light.png | Bin 0 -> 676 bytes res/drawable-xhdpi/ic_menu_password_dark.png | Bin 0 -> 1067 bytes res/drawable-xhdpi/ic_menu_password_light.png | Bin 0 -> 1234 bytes res/drawable-xxhdpi/ic_menu_password_dark.png | Bin 0 -> 1610 bytes res/drawable-xxhdpi/ic_menu_password_light.png | Bin 0 -> 1852 bytes res/layout/change_email.xml | 28 ++++ res/menu/admin_context.xml | 4 + res/menu/user.xml | 10 ++ res/menu/user_user.xml | 14 ++ res/values/attrs.xml | 1 + res/values/strings.xml | 5 + res/values/themes.xml | 3 + .../daneren2005/dsub/fragments/AdminFragment.java | 98 +---------- .../daneren2005/dsub/fragments/UserFragment.java | 58 +++---- .../dsub/service/CachedMusicService.java | 9 + .../daneren2005/dsub/service/MusicService.java | 2 + .../dsub/service/OfflineMusicService.java | 5 + .../daneren2005/dsub/service/RESTMusicService.java | 10 ++ src/github/daneren2005/dsub/util/UserUtil.java | 184 ++++++++++++++++++++- 22 files changed, 302 insertions(+), 129 deletions(-) create mode 100644 res/drawable-hdpi/ic_menu_password_dark.png create mode 100644 res/drawable-hdpi/ic_menu_password_light.png create mode 100644 res/drawable-mdpi/ic_menu_password_dark.png create mode 100644 res/drawable-mdpi/ic_menu_password_light.png create mode 100644 res/drawable-xhdpi/ic_menu_password_dark.png create mode 100644 res/drawable-xhdpi/ic_menu_password_light.png create mode 100644 res/drawable-xxhdpi/ic_menu_password_dark.png create mode 100644 res/drawable-xxhdpi/ic_menu_password_light.png create mode 100644 res/layout/change_email.xml create mode 100644 res/menu/user_user.xml (limited to 'res/menu/admin_context.xml') diff --git a/res/drawable-hdpi/ic_menu_password_dark.png b/res/drawable-hdpi/ic_menu_password_dark.png new file mode 100644 index 00000000..67fa3e84 Binary files /dev/null and b/res/drawable-hdpi/ic_menu_password_dark.png differ diff --git a/res/drawable-hdpi/ic_menu_password_light.png b/res/drawable-hdpi/ic_menu_password_light.png new file mode 100644 index 00000000..bd99c01f Binary files /dev/null and b/res/drawable-hdpi/ic_menu_password_light.png differ diff --git a/res/drawable-mdpi/ic_menu_password_dark.png b/res/drawable-mdpi/ic_menu_password_dark.png new file mode 100644 index 00000000..74d0095a Binary files /dev/null and b/res/drawable-mdpi/ic_menu_password_dark.png differ diff --git a/res/drawable-mdpi/ic_menu_password_light.png b/res/drawable-mdpi/ic_menu_password_light.png new file mode 100644 index 00000000..159f7889 Binary files /dev/null and b/res/drawable-mdpi/ic_menu_password_light.png differ diff --git a/res/drawable-xhdpi/ic_menu_password_dark.png b/res/drawable-xhdpi/ic_menu_password_dark.png new file mode 100644 index 00000000..d1fc0a97 Binary files /dev/null and b/res/drawable-xhdpi/ic_menu_password_dark.png differ diff --git a/res/drawable-xhdpi/ic_menu_password_light.png b/res/drawable-xhdpi/ic_menu_password_light.png new file mode 100644 index 00000000..1cbf085c Binary files /dev/null and b/res/drawable-xhdpi/ic_menu_password_light.png differ diff --git a/res/drawable-xxhdpi/ic_menu_password_dark.png b/res/drawable-xxhdpi/ic_menu_password_dark.png new file mode 100644 index 00000000..a7cd1a6d Binary files /dev/null and b/res/drawable-xxhdpi/ic_menu_password_dark.png differ diff --git a/res/drawable-xxhdpi/ic_menu_password_light.png b/res/drawable-xxhdpi/ic_menu_password_light.png new file mode 100644 index 00000000..5670a209 Binary files /dev/null and b/res/drawable-xxhdpi/ic_menu_password_light.png differ diff --git a/res/layout/change_email.xml b/res/layout/change_email.xml new file mode 100644 index 00000000..8b74215c --- /dev/null +++ b/res/layout/change_email.xml @@ -0,0 +1,28 @@ + + + + + + + + + + \ No newline at end of file diff --git a/res/menu/admin_context.xml b/res/menu/admin_context.xml index 8cd04859..922a24a9 100644 --- a/res/menu/admin_context.xml +++ b/res/menu/admin_context.xml @@ -2,6 +2,10 @@ + + diff --git a/res/menu/user.xml b/res/menu/user.xml index ace011b1..aea881fc 100644 --- a/res/menu/user.xml +++ b/res/menu/user.xml @@ -8,6 +8,16 @@ android:icon="?attr/save" compat:showAsAction="always|withText"/> + + + + diff --git a/res/menu/user_user.xml b/res/menu/user_user.xml new file mode 100644 index 00000000..f66aa793 --- /dev/null +++ b/res/menu/user_user.xml @@ -0,0 +1,14 @@ + + + + + + + \ No newline at end of file diff --git a/res/values/attrs.xml b/res/values/attrs.xml index b820c371..ac535487 100644 --- a/res/values/attrs.xml +++ b/res/values/attrs.xml @@ -22,5 +22,6 @@ + diff --git a/res/values/strings.xml b/res/values/strings.xml index 460e46db..d43d8c7b 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -450,6 +450,11 @@ Update Permissions Successfully updated permission for %1$s Failed to update permissions for %1$s + Change Email + Successfully changed email for %1$s + Failed to change email for %1$s + New Email: + Enter a valid email Change Password Successfully changed password for %1$s Failed to change password for %1$s diff --git a/res/values/themes.xml b/res/values/themes.xml index 0f464baa..6611cff7 100644 --- a/res/values/themes.xml +++ b/res/values/themes.xml @@ -25,6 +25,7 @@ @drawable/ic_menu_bookmark_light @drawable/ic_menu_share_light @drawable/ic_menu_add_person_light + @drawable/ic_menu_password_light @array/drawerItemIconsLight @style/DSub.TextViewStyle @style/DSub.ButtonStyle.Light @@ -55,6 +56,7 @@ @drawable/ic_menu_bookmark_dark @drawable/ic_menu_share_dark @drawable/ic_menu_add_person_dark + @drawable/ic_menu_password_dark @array/drawerItemIconsDark @style/DSub.TextViewStyle @style/DSub.ButtonStyle.Dark @@ -88,6 +90,7 @@ @drawable/ic_menu_bookmark_dark @drawable/ic_menu_share_dark @drawable/ic_menu_add_person_dark + @drawable/ic_menu_password_dark @array/drawerItemIconsDark @style/DSub.TextViewStyle @style/DSub.ButtonStyle.Dark diff --git a/src/github/daneren2005/dsub/fragments/AdminFragment.java b/src/github/daneren2005/dsub/fragments/AdminFragment.java index b7f09532..e0989e43 100644 --- a/src/github/daneren2005/dsub/fragments/AdminFragment.java +++ b/src/github/daneren2005/dsub/fragments/AdminFragment.java @@ -53,7 +53,7 @@ public class AdminFragment extends SelectListFragment { super.onCreateContextMenu(menu, view, menuInfo); MenuInflater inflater = context.getMenuInflater(); - if(UserUtil.isCurrentAdmin(context) && Util.checkServerVersion(context, "1.10")) { + if(UserUtil.isCurrentAdmin()) { inflater.inflate(R.menu.admin_context, menu); } else { inflater.inflate(R.menu.admin_context_user, menu); @@ -66,11 +66,14 @@ public class AdminFragment extends SelectListFragment { User user = objects.get(info.position); switch(menuItem.getItemId()) { + case R.id.admin_change_email: + UserUtil.changeEmail(context, user); + break; case R.id.admin_change_password: - changePassword(user); + UserUtil.changePassword(context, user); break; case R.id.admin_delete_user: - deleteUser(user); + UserUtil.deleteUser(context, user, adapter); break; } @@ -79,7 +82,7 @@ public class AdminFragment extends SelectListFragment { @Override public int getOptionsMenu() { - if(UserUtil.isCurrentAdmin(context)) { + if(UserUtil.isCurrentAdmin()) { return R.menu.admin; } else { return R.menu.empty; @@ -125,91 +128,4 @@ public class AdminFragment extends SelectListFragment { replaceFragment(fragment); } - - private void changePassword(final User user) { - View layout = context.getLayoutInflater().inflate(R.layout.change_password, null); - final TextView passwordView = (TextView) layout.findViewById(R.id.new_password); - - AlertDialog.Builder builder = new AlertDialog.Builder(context); - builder.setTitle(R.string.admin_change_password) - .setView(layout) - .setPositiveButton(R.string.common_save, new DialogInterface.OnClickListener() { - @Override - public void onClick(DialogInterface dialog, int id) { - final String password = passwordView.getText().toString(); - // Don't allow blank passwords - if ("".equals(password)) { - Util.toast(context, R.string.admin_change_password_invalid); - return; - } - - new SilentBackgroundTask(context) { - @Override - protected Void doInBackground() throws Throwable { - MusicService musicService = MusicServiceFactory.getMusicService(context); - musicService.changePassword(user.getUsername(), password, context, null); - return null; - } - - @Override - protected void done(Void v) { - Util.toast(context, context.getResources().getString(R.string.admin_change_password_success, user.getUsername())); - } - - @Override - protected void error(Throwable error) { - String msg; - if (error instanceof OfflineException || error instanceof ServerTooOldException) { - msg = getErrorMessage(error); - } else { - msg = context.getResources().getString(R.string.admin_change_password_error, user.getUsername()); - } - - Util.toast(context, msg); - } - }.execute(); - } - }) - .setNegativeButton(R.string.common_cancel, null) - .setCancelable(true); - - AlertDialog dialog = builder.create(); - dialog.show(); - } - - private void deleteUser(final User user) { - Util.confirmDialog(context, R.string.common_delete, user.getUsername(), new DialogInterface.OnClickListener() { - @Override - public void onClick(DialogInterface dialog, int which) { - new SilentBackgroundTask(context) { - @Override - protected Void doInBackground() throws Throwable { - MusicService musicService = MusicServiceFactory.getMusicService(context); - musicService.deleteUser(user.getUsername(), context, null); - return null; - } - - @Override - protected void done(Void v) { - adapter.remove(user); - adapter.notifyDataSetChanged(); - - Util.toast(context, context.getResources().getString(R.string.admin_delete_user_success, user.getUsername())); - } - - @Override - protected void error(Throwable error) { - String msg; - if (error instanceof OfflineException || error instanceof ServerTooOldException) { - msg = getErrorMessage(error); - } else { - msg = context.getResources().getString(R.string.admin_delete_user_error, user.getUsername()); - } - - Util.toast(context, msg); - } - }.execute(); - } - }); - } } diff --git a/src/github/daneren2005/dsub/fragments/UserFragment.java b/src/github/daneren2005/dsub/fragments/UserFragment.java index f2af85fb..6423ebcd 100644 --- a/src/github/daneren2005/dsub/fragments/UserFragment.java +++ b/src/github/daneren2005/dsub/fragments/UserFragment.java @@ -15,6 +15,9 @@ package github.daneren2005.dsub.fragments; +import android.app.Activity; +import android.app.AlertDialog; +import android.content.DialogInterface; import android.os.Bundle; import android.support.v4.widget.SwipeRefreshLayout; import android.view.LayoutInflater; @@ -24,8 +27,10 @@ import android.view.MenuItem; import android.view.View; import android.view.ViewGroup; import android.widget.ListView; +import android.widget.TextView; import github.daneren2005.dsub.R; +import github.daneren2005.dsub.activity.SubsonicActivity; import github.daneren2005.dsub.domain.User; import github.daneren2005.dsub.service.MusicService; import github.daneren2005.dsub.service.MusicServiceFactory; @@ -39,12 +44,10 @@ import github.daneren2005.dsub.view.SettingsAdapter; public class UserFragment extends SubsonicFragment{ private ListView listView; - private LayoutInflater inflater; private User user; @Override public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle bundle) { - this.inflater = inflater; rootView = inflater.inflate(R.layout.abstract_list_fragment, container, false); refreshLayout = (SwipeRefreshLayout) rootView.findViewById(R.id.refresh_layout); @@ -54,23 +57,30 @@ public class UserFragment extends SubsonicFragment{ user = (User) args.getSerializable(Constants.INTENT_EXTRA_NAME_ID); listView = (ListView)rootView.findViewById(R.id.fragment_list); - listView.setAdapter(new SettingsAdapter(context, user.getSettings(), UserUtil.isCurrentAdmin(context))); + listView.setAdapter(new SettingsAdapter(context, user.getSettings(), UserUtil.isCurrentAdmin())); setTitle(user.getUsername()); return rootView; } + @Override + public void onAttach(Activity activity) { + super.onAttach(activity); + activity.invalidateOptionsMenu(); + } + @Override public void onCreateOptionsMenu(Menu menu, MenuInflater menuInflater) { - if(!primaryFragment) { + // For some reason this is called before onAttach + if(!primaryFragment || context == null) { return; } - if(UserUtil.isCurrentAdmin(context)) { + if(UserUtil.isCurrentAdmin() && Util.checkServerVersion(context, "1.10")) { menuInflater.inflate(R.menu.user, menu); } else { - menuInflater.inflate(R.menu.empty, menu); + menuInflater.inflate(R.menu.user_user, menu); } } @@ -82,38 +92,16 @@ public class UserFragment extends SubsonicFragment{ switch (item.getItemId()) { case R.id.menu_update_permissions: - updateSettings(); + UserUtil.updateSettings(context, user); + return true; + case R.id.menu_change_password: + UserUtil.changePassword(context, user); + return true; + case R.id.menu_change_email: + UserUtil.changeEmail(context, user); return true; } return false; } - - private void updateSettings() { - new SilentBackgroundTask(context) { - @Override - protected Void doInBackground() throws Throwable { - MusicService musicService = MusicServiceFactory.getMusicService(context); - musicService.updateUser(user, context, null); - return null; - } - - @Override - protected void done(Void v) { - Util.toast(context, context.getResources().getString(R.string.admin_update_permissions_success, user.getUsername())); - } - - @Override - protected void error(Throwable error) { - String msg; - if (error instanceof OfflineException || error instanceof ServerTooOldException) { - msg = getErrorMessage(error); - } else { - msg = context.getResources().getString(R.string.admin_update_permissions_error, user.getUsername()); - } - - Util.toast(context, msg); - } - }.execute(); - } } diff --git a/src/github/daneren2005/dsub/service/CachedMusicService.java b/src/github/daneren2005/dsub/service/CachedMusicService.java index 86289511..0049e0ac 100644 --- a/src/github/daneren2005/dsub/service/CachedMusicService.java +++ b/src/github/daneren2005/dsub/service/CachedMusicService.java @@ -562,6 +562,15 @@ public class CachedMusicService implements MusicService { file.delete(); } + @Override + public void changeEmail(String username, String email, Context context, ProgressListener progressListener) throws Exception { + musicService.changeEmail(username, email, context, progressListener); + + // Delete cached users if any have been removed from list + File file = new File(context.getCacheDir(), getCacheName(context, "users")); + file.delete(); + } + @Override public void changePassword(String username, String password, Context context, ProgressListener progressListener) throws Exception { musicService.changePassword(username, password, context, progressListener); diff --git a/src/github/daneren2005/dsub/service/MusicService.java b/src/github/daneren2005/dsub/service/MusicService.java index 6f58603c..dc760f86 100644 --- a/src/github/daneren2005/dsub/service/MusicService.java +++ b/src/github/daneren2005/dsub/service/MusicService.java @@ -172,6 +172,8 @@ public interface MusicService { void deleteUser(String username, Context context, ProgressListener progressListener) throws Exception; + void changeEmail(String username, String email, Context context, ProgressListener progressListener) throws Exception; + void changePassword(String username, String password, Context context, ProgressListener progressListener) throws Exception; Bitmap getAvatar(String username, Context context, ProgressListener progressListener) throws Exception; diff --git a/src/github/daneren2005/dsub/service/OfflineMusicService.java b/src/github/daneren2005/dsub/service/OfflineMusicService.java index 9e2b9e13..75a090c6 100644 --- a/src/github/daneren2005/dsub/service/OfflineMusicService.java +++ b/src/github/daneren2005/dsub/service/OfflineMusicService.java @@ -715,6 +715,11 @@ public class OfflineMusicService extends RESTMusicService { throw new OfflineException("Deleting users not available in offline mode"); } + @Override + public void changeEmail(String username, String email, Context context, ProgressListener progressListener) throws Exception { + throw new OfflineException("Changing email not available in offline mode"); + } + @Override public void changePassword(String username, String password, Context context, ProgressListener progressListener) throws Exception { throw new OfflineException("Changing passwords not available in offline mode"); diff --git a/src/github/daneren2005/dsub/service/RESTMusicService.java b/src/github/daneren2005/dsub/service/RESTMusicService.java index c2f64dad..371e309c 100644 --- a/src/github/daneren2005/dsub/service/RESTMusicService.java +++ b/src/github/daneren2005/dsub/service/RESTMusicService.java @@ -1263,6 +1263,16 @@ public class RESTMusicService implements MusicService { } } + @Override + public void changeEmail(String username, String email, Context context, ProgressListener progressListener) throws Exception { + Reader reader = getReader(context, progressListener, "updateUser", null, Arrays.asList("username", "email"), Arrays.asList(username, email)); + try { + new ErrorParser(context).parse(reader); + } finally { + Util.close(reader); + } + } + @Override public void changePassword(String username, String password, Context context, ProgressListener progressListener) throws Exception { Reader reader = getReader(context, progressListener, "changePassword", null, Arrays.asList("username", "password"), Arrays.asList(username, password)); diff --git a/src/github/daneren2005/dsub/util/UserUtil.java b/src/github/daneren2005/dsub/util/UserUtil.java index 5158829c..60243731 100644 --- a/src/github/daneren2005/dsub/util/UserUtil.java +++ b/src/github/daneren2005/dsub/util/UserUtil.java @@ -15,14 +15,24 @@ package github.daneren2005.dsub.util; +import android.app.Activity; +import android.app.AlertDialog; import android.content.Context; +import android.content.DialogInterface; import android.content.SharedPreferences; +import android.view.View; +import android.widget.Adapter; +import android.widget.ArrayAdapter; +import android.widget.TextView; import java.io.File; import github.daneren2005.dsub.R; import github.daneren2005.dsub.domain.User; +import github.daneren2005.dsub.service.MusicService; import github.daneren2005.dsub.service.MusicServiceFactory; +import github.daneren2005.dsub.service.OfflineException; +import github.daneren2005.dsub.service.ServerTooOldException; public final class UserUtil { private static User currentUser; @@ -55,15 +65,15 @@ public final class UserUtil { return getCurrentUsername(context, Util.getActiveServer(context)); } - public static boolean isCurrentAdmin(Context context) { + public static boolean isCurrentAdmin() { if(currentUser == null) { return false; } else { - return isCurrentRole(context, "adminRole"); + return isCurrentRole("adminRole"); } } - public static boolean isCurrentRole(Context context, String role) { + public static boolean isCurrentRole(String role) { if(currentUser == null) { return false; } @@ -76,4 +86,172 @@ public final class UserUtil { return false; } + + public static void changePassword(final Activity context, final User user) { + View layout = context.getLayoutInflater().inflate(R.layout.change_password, null); + final TextView passwordView = (TextView) layout.findViewById(R.id.new_password); + + AlertDialog.Builder builder = new AlertDialog.Builder(context); + builder.setTitle(R.string.admin_change_password) + .setView(layout) + .setPositiveButton(R.string.common_save, new DialogInterface.OnClickListener() { + @Override + public void onClick(DialogInterface dialog, int id) { + final String password = passwordView.getText().toString(); + // Don't allow blank passwords + if ("".equals(password)) { + Util.toast(context, R.string.admin_change_password_invalid); + return; + } + + new SilentBackgroundTask(context) { + @Override + protected Void doInBackground() throws Throwable { + MusicService musicService = MusicServiceFactory.getMusicService(context); + musicService.changePassword(user.getUsername(), password, context, null); + return null; + } + + @Override + protected void done(Void v) { + Util.toast(context, context.getResources().getString(R.string.admin_change_password_success, user.getUsername())); + } + + @Override + protected void error(Throwable error) { + String msg; + if (error instanceof OfflineException || error instanceof ServerTooOldException) { + msg = getErrorMessage(error); + } else { + msg = context.getResources().getString(R.string.admin_change_password_error, user.getUsername()); + } + + Util.toast(context, msg); + } + }.execute(); + } + }) + .setNegativeButton(R.string.common_cancel, null) + .setCancelable(true); + + AlertDialog dialog = builder.create(); + dialog.show(); + } + + public static void updateSettings(final Context context, final User user) { + new SilentBackgroundTask(context) { + @Override + protected Void doInBackground() throws Throwable { + MusicService musicService = MusicServiceFactory.getMusicService(context); + musicService.updateUser(user, context, null); + return null; + } + + @Override + protected void done(Void v) { + Util.toast(context, context.getResources().getString(R.string.admin_update_permissions_success, user.getUsername())); + } + + @Override + protected void error(Throwable error) { + String msg; + if (error instanceof OfflineException || error instanceof ServerTooOldException) { + msg = getErrorMessage(error); + } else { + msg = context.getResources().getString(R.string.admin_update_permissions_error, user.getUsername()); + } + + Util.toast(context, msg); + } + }.execute(); + } + + public static void changeEmail(final Activity context, final User user) { + View layout = context.getLayoutInflater().inflate(R.layout.change_email, null); + final TextView emailView = (TextView) layout.findViewById(R.id.new_email); + + AlertDialog.Builder builder = new AlertDialog.Builder(context); + builder.setTitle(R.string.admin_change_email) + .setView(layout) + .setPositiveButton(R.string.common_save, new DialogInterface.OnClickListener() { + @Override + public void onClick(DialogInterface dialog, int id) { + final String email = emailView.getText().toString(); + // Don't allow blank emails + if ("".equals(email)) { + Util.toast(context, R.string.admin_change_email_invalid); + return; + } + + new SilentBackgroundTask(context) { + @Override + protected Void doInBackground() throws Throwable { + MusicService musicService = MusicServiceFactory.getMusicService(context); + musicService.changeEmail(user.getUsername(), email, context, null); + return null; + } + + @Override + protected void done(Void v) { + Util.toast(context, context.getResources().getString(R.string.admin_change_email_success, user.getUsername())); + } + + @Override + protected void error(Throwable error) { + String msg; + if (error instanceof OfflineException || error instanceof ServerTooOldException) { + msg = getErrorMessage(error); + } else { + msg = context.getResources().getString(R.string.admin_change_email_error, user.getUsername()); + } + + Util.toast(context, msg); + } + }.execute(); + } + }) + .setNegativeButton(R.string.common_cancel, null) + .setCancelable(true); + + AlertDialog dialog = builder.create(); + dialog.show(); + } + + public static void deleteUser(final Context context, final User user, final ArrayAdapter adapter) { + Util.confirmDialog(context, R.string.common_delete, user.getUsername(), new DialogInterface.OnClickListener() { + @Override + public void onClick(DialogInterface dialog, int which) { + new SilentBackgroundTask(context) { + @Override + protected Void doInBackground() throws Throwable { + MusicService musicService = MusicServiceFactory.getMusicService(context); + musicService.deleteUser(user.getUsername(), context, null); + return null; + } + + @Override + protected void done(Void v) { + if(adapter != null) { + adapter.remove(user); + adapter.notifyDataSetChanged(); + } + + Util.toast(context, context.getResources().getString(R.string.admin_delete_user_success, user.getUsername())); + } + + @Override + protected void error(Throwable error) { + String msg; + if (error instanceof OfflineException || error instanceof ServerTooOldException) { + msg = getErrorMessage(error); + } else { + msg = context.getResources().getString(R.string.admin_delete_user_error, user.getUsername()); + } + + Util.toast(context, msg); + } + }.execute(); + } + }); + } } -- cgit v1.2.3