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

Quick fixes

Browse source
This commit is contained in:
Karim Abou Zeid 2015-03-23 23:35:05 +01:00
commit 7c206f5423
10 changed files with 33 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

6
app/src/main/java/com/kabouzeid/gramophone/ui/activities/MainActivity.java
View file

@ -39,7 +39,6 @@ import com.kabouzeid.gramophone.util.NavigationUtil;
import com.kabouzeid.gramophone.util.PreferenceUtils;
import com.kabouzeid.gramophone.util.Util;
import com.kabouzeid.gramophone.util.ViewUtil;
import com.mikepenz.aboutlibraries.Libs;
import com.squareup.picasso.Picasso;
@ -216,7 +215,7 @@ public class MainActivity extends AbsFabActivity
getMenuInflater().inflate(R.menu.menu_playlists, menu);
break;
default:
getMenuInflater().inflate(R.menu.drawer, menu);
getMenuInflater().inflate(R.menu.menu_main, menu);
break;
}
restoreActionBar();
@ -237,9 +236,6 @@ public class MainActivity extends AbsFabActivity
}
int id = item.getItemId();
switch (id) {
case R.id.action_licenses:
new Libs.Builder().withAutoDetect(true).start(this);
return true;
case R.id.action_new_playlist:
CreatePlaylistDialogHelper.getDialog(this).show();
return true;

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

@ -24,6 +24,7 @@ import com.kabouzeid.gramophone.App;
import com.kabouzeid.gramophone.R;
import com.kabouzeid.gramophone.misc.AppKeys;
import com.kabouzeid.gramophone.misc.SmallObservableScrollViewCallbacks;
import com.kabouzeid.gramophone.model.DataBaseChangedEvent;
import com.kabouzeid.gramophone.util.MusicUtil;
import com.kabouzeid.gramophone.util.Util;
import com.kabouzeid.gramophone.util.ViewUtil;
@ -362,7 +363,6 @@ public abstract class AbsTagEditorActivity extends ActionBarActivity {
}
progressDialog.dismiss();
rescanMedia();
restartApp();
}
}).start();
}
@ -370,14 +370,22 @@ public abstract class AbsTagEditorActivity extends ActionBarActivity {
private void rescanMedia() {
String[] toBeScanned = new String[songPaths.size()];
toBeScanned = songPaths.toArray(toBeScanned);
MediaScannerConnection.scanFile(this, toBeScanned, null, null);
}
private void restartApp() {
Intent i = getBaseContext().getPackageManager()
.getLaunchIntentForPackage(getBaseContext().getPackageName());
i.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
startActivity(i);
MediaScannerConnection.scanFile(this, toBeScanned, null, new MediaScannerConnection.OnScanCompletedListener() {
boolean refreshed;
@Override
public void onScanCompleted(String s, Uri uri) {
runOnUiThread(new Runnable() {
@Override
public void run() {
if(!refreshed) {
App.bus.post(new DataBaseChangedEvent(DataBaseChangedEvent.DATABASE_CHANGED));
}
refreshed = true;
}
});
}
});
finish();
}
protected int getId() {