tenkuma/jamfish
tenkuma/jamfish
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Two quick bug fixes

Browse source
This commit is contained in:
Karim Abou Zeid 2015-03-25 09:54:37 +01:00
commit 2ae6dd8c91
3 changed files with 8 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/build.gradle
View file

@ -23,8 +23,8 @@ android {
applicationId "com.kabouzeid.gramophone" applicationId "com.kabouzeid.gramophone"
minSdkVersion 16 minSdkVersion 16
targetSdkVersion 22 targetSdkVersion 22
versionCode 5 versionCode 6
versionName "0.9.3b" versionName "0.9.3.1b"
} }
compileOptions { compileOptions {

2
app/src/main/java/com/kabouzeid/gramophone/adapter/songadapter/SongAdapter.java
View file

@ -131,7 +131,7 @@ public class SongAdapter extends RecyclerView.Adapter<SongAdapter.ViewHolder> {
popupMenu.setOnMenuItemClickListener(new PopupMenu.OnMenuItemClickListener() { popupMenu.setOnMenuItemClickListener(new PopupMenu.OnMenuItemClickListener() {
@Override @Override
public boolean onMenuItemClick(MenuItem item) { public boolean onMenuItemClick(MenuItem item) {
final int position = getAdapterPosition(); final int position = getAdapterPosition() - 1;
switch (item.getItemId()) { switch (item.getItemId()) {
case R.id.action_delete_from_disk: case R.id.action_delete_from_disk:
DeleteSongsDialogHelper.getDialog(activity, dataSet.get(position)).show(); DeleteSongsDialogHelper.getDialog(activity, dataSet.get(position)).show();

13
app/src/main/java/com/kabouzeid/gramophone/ui/activities/tageditor/AbsTagEditorActivity.java
View file

@ -354,12 +354,7 @@ public abstract class AbsTagEditorActivity extends ActionBarActivity {
} }
} }
if (deleteArtwork) { if (deleteArtwork) {
String imagePath = MusicUtil.getAlbumArtUri(getId()).toString();
//TODO delete from picasso cache
MusicUtil.deleteAlbumArt(AbsTagEditorActivity.this, getId()); MusicUtil.deleteAlbumArt(AbsTagEditorActivity.this, getId());
} else if (artwork != null) {
String imagePath = MusicUtil.getAlbumArtUri(getId()).toString();
//TODO delete from Picasso cache
} }
progressDialog.dismiss(); progressDialog.dismiss();
rescanMedia(); rescanMedia();
@ -370,17 +365,19 @@ public abstract class AbsTagEditorActivity extends ActionBarActivity {
private void rescanMedia() { private void rescanMedia() {
String[] toBeScanned = new String[songPaths.size()]; String[] toBeScanned = new String[songPaths.size()];
toBeScanned = songPaths.toArray(toBeScanned); toBeScanned = songPaths.toArray(toBeScanned);
final int toBeScannedLength = toBeScanned.length;
MediaScannerConnection.scanFile(this, toBeScanned, null, new MediaScannerConnection.OnScanCompletedListener() { MediaScannerConnection.scanFile(this, toBeScanned, null, new MediaScannerConnection.OnScanCompletedListener() {
boolean refreshed; int i = 0;
@Override @Override
public void onScanCompleted(String s, Uri uri) { public void onScanCompleted(String s, Uri uri) {
runOnUiThread(new Runnable() { runOnUiThread(new Runnable() {
@Override @Override
public void run() { public void run() {
if(!refreshed) { if (i == 0 || i == toBeScannedLength - 1) {
App.bus.post(new DataBaseChangedEvent(DataBaseChangedEvent.DATABASE_CHANGED)); App.bus.post(new DataBaseChangedEvent(DataBaseChangedEvent.DATABASE_CHANGED));
} }
refreshed = true; i++;
} }
}); });
} }